Changeset 11171 for code/branches/tgidronFS16

Timestamp:

Apr 21, 2016, 3:37:28 PM (9 years ago)

Author:

tgidron

Message:

Pickups work; Lives Counter and Total Flag Counter

Location:

code/branches/tgidronFS16

Files:

• data/levels/Hover.oxw (modified) (1 diff)
• data/levels/includes/weaponSettingsHover.oxi (modified) (1 diff)
• data/overlays/HoverHUD.oxo (modified) (3 diffs)
• src/modules/hover/CMakeLists.txt (modified) (1 diff)
• src/modules/hover/FlagsAndLivesHUD.cc (added)
• src/modules/hover/FlagsAndLivesHUD.h (added)
• src/modules/hover/Hover.cc (modified) (6 diffs)
• src/modules/hover/Hover.h (modified) (3 diffs)
• src/modules/hover/HoverShip.cc (modified) (2 diffs)
• src/modules/hover/HoverShip.h (modified) (2 diffs)
• src/modules/hover/TotFlagsHUD.cc (deleted)
• src/modules/hover/TotFlagsHUD.h (deleted)

code/branches/tgidronFS16/data/levels/Hover.oxw

@@ -42 +42 @@
 
 <Template name=destroyhoverpickup baseclass=MetaPickup>
-  <MetaPickup representation="destroyhover" metaType="destroy" />
+  <MetaPickup representation="destroyhover" metaType="destroyCarrier" />
 </Template>
 

code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi

@@ -17 +17 @@
     </Weapon>
     <Weapon>
-      <EnergyDrink mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.8, 1, -18.0" projectileMesh="LaserBeam2.mesh" />
+      <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" muzzleoffset=" 0.8, 1, -18.0" projectileMesh="LaserBeam2.mesh" />
     </Weapon>
   </WeaponPack>

code/branches/tgidronFS16/data/overlays/HoverHUD.oxo

@@ -57 +57 @@
 
     <OverlayText
-     position  = "0.02, 0.02"
+     position  = "0.02, 0.08"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
@@ -66 +66 @@
     />
 
-    <TotalFlagsHUD
+    <OverlayText
+     position  = "0.02, 0.12"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Lives: "
+    />
+
+    <FlagsAndLivesHUD
      position  = "0.14, 0.02"
      pickpoint = "0.0, 0.0"
@@ -73 +83 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
+     showLives = false
+     />
 
-     showpoints     = true
-    />
+     <FlagsAndLivesHUD
+     position  = "0.14, 0.04"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     showLives = true
+
+     />
+
   </OverlayGroup>
 

code/branches/tgidronFS16/src/modules/hover/CMakeLists.txt

@@ -8 +8 @@
   FlagHUD.cc
   MazeGenerator.cc
+  FlagsAndLivesHUD.cc
 )
 

code/branches/tgidronFS16/src/modules/hover/Hover.cc

@@ -40 +40 @@
 #include "core/CoreIncludes.h"
 #include "gamestates/GSLevel.h"
+#include "HoverShip.h"
 
 #include "pickup/PickupSpawner.h"
@@ -57 +58 @@
         level = 1; //start at level 1
         flagsTaken = 0;// took 0 flags in the beginning
+        lives = 3;
 
         numCells = 0;
@@ -132 +134 @@
                 pickupSpawners_.push_back(pickupSpawner);
             }
+             //If no lives are left, end game
+            if(lives <= 0){
+                GSLevel::startMainMenu();
+            }
 
             orxout() << this->origin_->getPickupTemplate() << endl;
@@ -153 +159 @@
             for (int i = 0; i<5; i++)
             {
-                PickupSpawner* pickup = new PickupSpawner(origin_->getContext());
-                //PickupSpawner->setPosition(rand()%numCells, rand()%numCells, cellSize);
-                //pickup->createDroppedPickup(this->getContext(), pickup , this, 5);
-                pickupSpawners_.push_back(pickup);
+                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
+                pickupSpawner->setMaxSpawnedItems(5);
+                pickupSpawner->setRespawnTime(30);
+                pickupSpawner->setTriggerDistance(5);
+                // Add pickup spawner to the pickup spawner list
+                pickupSpawners_.push_back(pickupSpawner);
             }
 
@@ -185 +196 @@
         }
         numberOfFlags_ = flags_.size();
+
+        if(lives <= 0){
+                GSLevel::startMainMenu();
+            }
     }
 
@@ -198 +213 @@
         return Vector3(x*cellSize*1.0f + cellSize/2, heightOffset, y*cellSize*1.0f + cellSize/2);
     }
+
+    void Hover::costLife()
+    {
+        lives--;
+        if (lives <= 0)
+            GSLevel::startMainMenu();
+    }
 }

code/branches/tgidronFS16/src/modules/hover/Hover.h

@@ -37 +37 @@
 
 #include "HoverPrereqs.h"
+#include "HoverShip.h"
 
 #include <vector>
@@ -60 +61 @@
             void levelUp();
             void endLevel();
+            void costLife();
 
             inline int getNumberOfFlags() const
@@ -66 +68 @@
             virtual Vector3 get3dCoordinates(int x, int y, float heightOffset);
 
+            inline int getTotFlags() const
+                { return this->totFlags; }
+
+            inline int getLives() const
+                { return this->lives; }
+
         private:
+
             WeakPtr<HoverOrigin> origin_;
             std::vector<HoverFlag*> flags_;

code/branches/tgidronFS16/src/modules/hover/HoverShip.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "Hover.h"
 //#include "NewHumanController.h"
 
@@ -122 +123 @@
         }
     }
+
+    Hover* HoverShip::getGame()
+    {
+        if (game == nullptr)
+        {
+            for (Hover* hover : ObjectList<Hover>())
+                game = hover;
+        }
+        return game;
+    }
+
+    void HoverShip::death()
+    {
+        getGame()->costLife();
+        SpaceShip::death();
+    }
 }

code/branches/tgidronFS16/src/modules/hover/HoverShip.h

@@ -34 +34 @@
 
 #include "HoverPrereqs.h"
+#include "Hover.h"
 
 #include "worldentities/pawns/SpaceShip.h"
@@ -69 +70 @@
             virtual void boost(bool bBoost) override;
 
+        protected:
+            virtual void death() override;
+
         private:
+            Hover* getGame();
+            WeakPtr<Hover> game;
             float jumpBoost_;
             bool isFloor_;