Changeset 11177 for code/branches

Timestamp:

Apr 28, 2016, 4:04:42 PM (9 years ago)

Author:

tgidron

Message:

New Pickups (speed); Level Counter and Crate spawn (not working)

Location:

code/branches/tgidronFS16

Files:

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

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

@@ -24 +24 @@
 MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
 ?>
+<!--
+<Template name=mediumdamagehoverpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.70,0.10,0.10" material="Damage" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=damagehover baseclass=DamageBoostPickup>
+  <DamageBoostPickup
+    representation = "mediumdamagehoverpickup"
+    duration = 10.0
+    damageMultiplier = 5.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template> -->
+
+<Template name=hugespeedpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=hugespeedpickup baseclass=SpeedPickup>
+  <SpeedPickup
+    representation = "hugespeedpickup"
+    duration = 10.0
+    speedAdd = 0.0
+    SpeedMultiply = 50.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+
 
 <Template name=destroyhoverpickupRepresentation>
@@ -45 +100 @@
 </Template>
 
+<Template name=obstacle baseclass=Pawn>
+    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+        <attached>
+            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
+        </collisionShapes>
+    </Pawn>
+</Template>
+
+
 <Level
 plugins = hover
@@ -72 +139 @@
     />
 
+    <PickupRepresentation
+      name = "hugespeedpickup"
+      pickupName = "Huge Speed Boost"
+      pickupDescription = "Multiplies Speed of the Ship by a huge amount."
+      spawnerTemplate = "hugespeedpickupRepresentation"
+      inventoryRepresentation = "HugeSpeed"
+    />
+<!--
+    <PickupRepresentation
+      name = "damagehover"
+      pickupName = "Medium Damage Hover Pickup"
+      pickupDescription = "Multiplies the ship damage with 5."
+      spawnerTemplate = "mediumdamagehoverpickupRepresentation"
+      inventoryRepresentation = "MediumDamageHover"
+    /> -->
+
     <StaticEntity position="0,0,0" collisionType="static">
       <attached>
@@ -78 +161 @@
           cellSize="<?lua print(MAZE_CELL_SIZE)?>"
           cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
+          obstacletemplate=obstacle
           pickuptemplate=destroyhoverpickup
           pickuprepresentationtemplate=destroyhoverpickupRepresentation
+          pickuptemplatedam=hugespeedpickup
+          pickuprepresentationtemplatedam=hugespeedpickupRepresentation
         />
         <Model

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

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

code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt

@@ -79 +79 @@
    boostfactor    = 2
 
-   speedfront     = 120
+   speedfront     = 150
    speedback      =  40
    speedleftright =  40

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

@@ -76 +76 @@
     />
 
-    <FlagsAndLivesHUD
+    <OverlayText
+     position  = "0.02, 0.16"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Level: "
+    />
+
+    <TFlagsLivesLevelHUD
      position  = "0.14, 0.02"
      pickpoint = "0.0, 0.0"
@@ -83 +93 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
+     showFlags = true
      showLives = false
+     showLevel = false
+
      />
 
-     <FlagsAndLivesHUD
+     <TFlagsLivesLevelHUD
      position  = "0.14, 0.04"
      pickpoint = "0.0, 0.0"
@@ -93 +106 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
+     showFlags = false
      showLives = true
+     showLevel = false
 
      />
+
+     <TFlagsLivesLevelHUD
+     position  = "0.14, 0.06"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     showFlags = false
+     showLives = false
+     showLevel = true
+
+     />
+
 
   </OverlayGroup>

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

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

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

@@ -121 +121 @@
             
 
-            //Generate 5 PickupSpawners randomly
+            //Generate 5 PickupSpawners randomly (destroy hover pickup)
             for (int i = 0; i<5; i++)
             {
@@ -134 +134 @@
                 pickupSpawners_.push_back(pickupSpawner);
             }
-             //If no lives are left, end game
-            if(lives <= 0){
-                GSLevel::startMainMenu();
-            }
-
-            orxout() << this->origin_->getPickupTemplate() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
-        } 
-    }
-
-
-    // Rename/delete this function.
-    void Hover::startLevel()
-    {
-        //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
-            }
-
-        //Generate 5 PickupSpawners randomly
+            
+            //Generate 5 PickupSpawners randomly (damage pickup)
             for (int i = 0; i<5; i++)
             {
@@ -162 +141 @@
 
                 pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateDam());
                 pickupSpawner->setMaxSpawnedItems(5);
                 pickupSpawner->setRespawnTime(30);
@@ -170 +149 @@
             }
 
+            //*****************************************************************************
+
+            Pawn* crate = new Pawn(origin_->getContext());
+
+            crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
+            crate->addTemplate(origin_->getObstacleTemplate());
+
+
+
+
+             //If no lives are left, end game
+            if(lives <= 0){
+                GSLevel::startMainMenu();
+            }
+
+            orxout() << this->origin_->getPickupTemplate() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
+
+            orxout() << this->origin_->getPickupTemplateDam() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplateDam() << endl;
+        } 
+    }
+
+
+    // Start new level
+    void Hover::newLevel()
+    {
+        //Generate 5 flags randomly (test only 1 flag)
+            for ( int i = 0; i < 5; i++ )
+            {
+                HoverFlag* flag = new HoverFlag(origin_->getContext());
+                flag->init(rand()%numCells, rand()%numCells, cellSize);
+                flags_.push_back(flag);
+            }
             
     }
@@ -187 +200 @@
                 totFlags++;
                 if(flags_.size()<=0){
-                    ChatManager::message("Level Up!");
+                    //ChatManager::message("Level Up!");
                     
                     levelUp();
@@ -205 +218 @@
     {
         level++;
-        startLevel();
+        //increment lives after every 4 levels
+        if(level%4 == 0)
+        {
+            lives++;
+        }
+        newLevel();
 
     }

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

@@ -58 +58 @@
 
             void start();
-            void startLevel();
+            void newLevel();
             void levelUp();
             void endLevel();
@@ -73 +73 @@
             inline int getLives() const
                 { return this->lives; }
+
+            inline int getLevel() const
+                { return this->level; }
 
         private:

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

@@ -48 +48 @@
         pickupTemplate_ = "";
         pickupRepresentationTemplate_ = "";
+
+        pickupTemplateDam_ = "";
+        pickupRepresentationTemplateDam_ = "";
     }
 
@@ -59 +62 @@
         XMLPortParam(HoverOrigin, "pickuptemplate", setPickupTemplate, getPickupTemplate, xmlelement, mode);
         XMLPortParam(HoverOrigin, "pickuprepresentationtemplate", setPickupRepresentationTemplate, getPickupRepresentationTemplate, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuptemplatedam", setPickupTemplateDam, getPickupTemplateDam, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuprepresentationtemplatedam", setPickupRepresentationTemplateDam, getPickupRepresentationTemplateDam, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "obstacletemplate", setObstacleTemplate, getObstacleTemplate, xmlelement, mode);
     }
+
 
     void HoverOrigin::checkGametype()

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

@@ -66 +66 @@
                 { return this->cellHeight_; }
 
+            //pickup template set and get for destroy hover pickup
+
             inline void setPickupTemplate(std::string pickupTemplate)
                 { this->pickupTemplate_ = pickupTemplate; }
@@ -76 +78 @@
                 { return this->pickupRepresentationTemplate_; }
 
+            //pickup template get and set for damage hover pickup
+
+            inline void setPickupTemplateDam(std::string pickupTemplateDam)
+                { this->pickupTemplateDam_ = pickupTemplateDam; }
+            inline std::string getPickupTemplateDam() const
+                { return this->pickupTemplateDam_; }
+
+            inline void setPickupRepresentationTemplateDam(std::string pickupRepresenationaTemplateDam)
+                { this->pickupRepresentationTemplateDam_ = pickupRepresenationaTemplateDam; }
+            inline std::string getPickupRepresentationTemplateDam() const
+                { return this->pickupRepresentationTemplateDam_; }
+
+            //get and set for obstacle template
+
+            inline void setObstacleTemplate(std::string obstacleTemplate)
+                { this->obstacleTemplate_ = obstacleTemplate; }
+            inline std::string getObstacleTemplate() const
+                { return this->obstacleTemplate_; }        
+
         private:
             void checkGametype();
+
        
             int numCells_;
@@ -86 +108 @@
             std::string pickupTemplate_;
             std::string pickupRepresentationTemplate_;
+
+            // Tempaltes for the damage hover pickup
+            std::string pickupTemplateDam_;
+            std::string pickupRepresentationTemplateDam_;
+
+            //Template for crate obstacle
+            std::string obstacleTemplate_;
     };
 }