Changeset 11645 for code/branches/Asteroid_HS17

Timestamp:

Dec 9, 2017, 1:29:44 PM (7 years ago)

Author:

vyang

Message:

Asteroids2DShip ist 3s immun, nachdem es von einem Asteroiden getroffen wurde. Das Raumschiff hat nun eine Waffe → Richtung der Projektile muss noch angepasst werden

Location:

code/branches/Asteroid_HS17

Files:

• data/levels/includes/asteroids2DWeapon.oxi (added)
• data/levels/templates/spaceshipAsteroids2D.oxt (modified) (5 diffs)
• data/overlays/Asteroids2DHUD.oxo (modified) (2 diffs)
• src/modules/asteroids2D/Asteroids2D.cc (modified) (2 diffs)
• src/modules/asteroids2D/Asteroids2DHUDinfo.cc (modified) (2 diffs)
• src/modules/asteroids2D/Asteroids2DHUDinfo.h (modified) (1 diff)
• src/modules/asteroids2D/Asteroids2DShip.cc (modified) (1 diff)
• src/modules/asteroids2D/Asteroids2DShip.h (modified) (3 diffs)
• src/modules/asteroids2D/Asteroids2DWeapon.cc (added)
• src/modules/asteroids2D/Asteroids2DWeapon.h (added)
• src/modules/asteroids2D/CMakeLists.txt (modified) (1 diff)

code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt

@@ -43 +43 @@
   >
     <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipinvaderengine />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipinvaderengine />
+      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipasteroids2dengine />
+      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipasteroids2dengine />
     </engines>
     <attached>
@@ -72 +72 @@
     </explosion>
 <?lua
-  include("../includes/invaderWeapon.oxi")
+  include("../includes/asteroids2DWeapon.oxi")
 ?>
   </Asteroids2DShip>
@@ -93 +93 @@
 </Template>
 
-<Template name=spaceshipinvaderengine baseclass=MultiStateEngine>
+<Template name=spaceshipasteroids2dengine baseclass=MultiStateEngine>
   <MultiStateEngine
    boostfactor    = 2.2
@@ -111 +111 @@
    accelerationupdown    =  500
   >
+
+  <!-- backlight error if you fly over the edge
     <EffectContainer condition="idle">
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
@@ -130 +132 @@
     </EffectContainer>
 
+  -->
+
   </MultiStateEngine>
 </Template>

code/branches/Asteroid_HS17/data/overlays/Asteroids2DHUD.oxo

@@ -6 +6 @@
 <Template name="Asteroids2DHUD">
   <OverlayGroup name="Asteroids2DHUD" scale = "1, 1">
+
+    <OverlayText
+     position  = "0.02, 0.1"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Lives:   "
+    />
+
+    <Asteroids2DHUDinfo
+     position  = "0.14, 0.1"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showlives     = true
+     showlevel     = false
+     showpoints     = false
+    />
 
     <OverlayText
@@ -28 +51 @@
     />
 
+    <OverlayText
+     position  = "0.02, 0.055"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Level: "
+    />
+
+    <Asteroids2DHUDinfo
+     position  = "0.14, 0.055"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showlives     = false
+     showlevel     = true
+     showpoints     = false
+    />
+
     
   </OverlayGroup>

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc

@@ -52 +52 @@
 
         bEndGame = false;
-        lives = 5;
+        lives = 1000;
         level = 1;
         point = 0;
@@ -158 +158 @@
     };
     
-
+//Funktion wird als erstes im Level aufgerufen
     void Asteroids2D::start()
     {

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.cc

@@ -41 +41 @@
 
         this->Asteroids2DGame = nullptr;
-        this->Ship = nullptr;
+        //this->Ship = nullptr;
         this->bShowPoints_ = true;
         this->bShowHealth_ = true;
@@ -51 +51 @@
 
         XMLPortParam(Asteroids2DHUDinfo,"showPoints", setShowPoints, getShowPoints, xmlelement, mode).defaultValues(false);
-        XMLPortParam(Asteroids2DHUDinfo,"showHealth", setShowHealth, getShowHealth, xmlelement, mode).defaultValues(false);
     }
 

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DHUDinfo.h

@@ -61 +61 @@
         private:
             Asteroids2D* Asteroids2DGame;
-            Asteroids2DShip* Ship;
+            bool bShowLives_;
+            bool bShowLevel_;
             bool bShowPoints_;
             bool bShowHealth_;
+
     };
 }

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -98 +98 @@
     {
 
-        orxout() << "touched" << endl; 
         Asteroids2DStone* stone = orxonox_cast<Asteroids2DStone*>(otherObject);       
-        if(stone != nullptr && (stone != lastStone || lastStone == nullptr))
+        if(stone != nullptr && !bImmune)
         {
             removeHealth(100); 
-            lastStone = stone;
-          
+            this->getGame()->addPoints(10);
+
+            //The ship will be immune for 3 seconds after it has been hit by an asteroid
+            bImmune = true;
+            isimmune.setTimer(3.0f, false, createExecutor(createFunctor(&Asteroids2DShip::toggleImmune, this)));
+            orxout()<< "touched" << endl;
         }
         return false;

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h

@@ -68 +68 @@
             virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction.
 
-
-
             virtual void updateLevel();
 
@@ -77 +75 @@
             bool isFireing;
             void showposition();
+            void toggleImmune()
+            {
+                bImmune = !bImmune;
+            }
 
         protected:
@@ -86 +88 @@
             float width, height;
             WeakPtr<Asteroids2D> game;
-            WeakPtr<Asteroids2DStone> lastStone;
-
+            bool bImmune;
             Timer timer;
+            Timer isimmune;
     };
 }

code/branches/Asteroid_HS17/src/modules/asteroids2D/CMakeLists.txt

@@ -5 +5 @@
 Asteroids2DStone.cc
 Asteroids2DHUDinfo.cc
+Asteroids2DWeapon.cc
 )