Changeset 11168 for code

Timestamp:

Apr 14, 2016, 4:05:48 PM (9 years ago)

Author:

tgidron

Message:

Pickups + Flags HUD

Location:

code/branches/tgidronFS16

Files:

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

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

@@ -3 +3 @@
  description = "Level for Minigame Hover"
  tags = "minigame"
- screenshot = "emptylevel.png"
+ screenshot = "Hover.png"
 />
 
@@ -25 +25 @@
 ?>
 
+<?lua
+    include("templates/pickupRepresentationTemplates.oxt") 
+    include("includes/pickups.oxi") 
+ ?>
+
 <Template name=destroyhoverpickupRepresentation>
     <PickupRepresentation>
@@ -39 +44 @@
         </spawner-representation>
     </PickupRepresentation>
+</Template>
+
+<Template name=destroymetapickup baseclass=MetaPickup>
+  <MetaPickup representation="destroy" metaType="destroy" />
 </Template>
 
@@ -74 +83 @@
           cellSize="<?lua print(MAZE_CELL_SIZE)?>"
           cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
+          pickuptemplate=destroyhoverpickupRepresentation
+          pickupbase=destroymetapickup
         />
         <Model

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

@@ -14 +14 @@
     </links>
     <Weapon>
-      <IceGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+      <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1, 1,-18 " projectileMesh="LaserBeam2.mesh" />
     </Weapon>
     <Weapon>
-      <IceGun mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.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>
@@ -27 +27 @@
 </weaponpacks>  
 <munition>
-  <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
+  <LaserMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
+  <FusionMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
 </munition>

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

@@ -18 +18 @@
    reloadwaittime      = 0.5
 
-   primaryThrust     = 100
+   primaryThrust     = 200
    auxilaryThrust    = 1
-   rotationThrust    = 40
+   rotationThrust    = 45
 
-   jumpBoost = 120
+   jumpBoost = 110
 
    lift = 1;

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

@@ -55 +55 @@
     />
 
+
+    <OverlayText
+     position  = "0.02, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Total Flags: "
+    />
+
+    <TotalFlagsHUD
+     position  = "0.14, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showpoints     = true
+    />
+
+    
+  </OverlayGroup>
+
  </OverlayGroup>
+
+
 </Template>
+
+
+  
+

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

@@ -17 +17 @@
     objects
     overlays
+    pickup
   SOURCE_FILES ${Hover_SRC_FILES}
 )

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

@@ -62 +62 @@
         cellHeight = 0;
 
+        totFlags = 0;
+
         this->setHUDTemplate("HoverHUD");
 
@@ -115 +117 @@
             
 
-            //Generate 10 Pickups randomly
-            for (int i = 0; i<10; i++)
+            //Generate 5 PickupSpawners randomly
+            for (int i = 0; i<5; i++)
             {
                 PickupSpawner* pickup = new PickupSpawner(origin_->getContext());
-                //PickupSpawner(this->getContext());
-                //pickup->createDroppedPickup(this->getContext(), pickup , this, 10);
+                pickup->setPosition(rand()%numCells, rand()%numCells, cellSize);
+                //pickup->setPickupTemplateName(origin_->getPickupMeta());
+                //pickup->setPickupTemplateName("destroymetapickup");
+                pickup->setMaxSpawnedItems(5);
+                pickup->setRespawnTime(30);
+                pickup->setTriggerDistance(5);
+                //pickup->createDroppedPickup(this->getContext(), pickup , this, 5);
                 pickups_.push_back(pickup);
             }
+
 
         } 
@@ -138 +146 @@
             }
 
+        //Generate 5 PickupSpawners randomly
+            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);
+                pickups_.push_back(pickup);
+            }
+
     }
 
@@ -150 +167 @@
                 flags_[i]->destroyLater();
                 flags_.erase (flags_.begin()+i);
+                totFlags++;
                 if(flags_.size()<=0){
                     ChatManager::message("Level Up!");

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

@@ -79 +79 @@
             int numCells;
 
+            int totFlags;
+
             std::vector<PickupSpawner*> pickups_;
     };

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

@@ -54 +54 @@
         XMLPortParam(HoverOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode);
         XMLPortParam(HoverOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuptemplate", setPickup, getPickup, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickupbase", setPickupMeta, getPickupMeta, xmlelement, mode);
     }
 

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

@@ -66 +66 @@
                 { return this->cellHeight_; }
 
+            inline void setPickup(std::string pickuptemplate)
+                { this->pickupTemplate_ = pickuptemplate; }
+            inline std::string getPickup() const
+                { return this->pickupTemplate_; }
+
+            inline void setPickupMeta(std::string pickupbase)
+                { this->pickupMeta_ = pickupbase; }
+            inline std::string getPickupMeta() const
+                { return this->pickupMeta_; }
+
         private:
             void checkGametype();
@@ -72 +82 @@
             int cellSize_;
             int cellHeight_;
+            std::string pickupTemplate_;
+            std::string pickupMeta_;
     };
 }

code/branches/tgidronFS16/src/modules/pickup/PickupSpawner.h

@@ -114 +114 @@
                 {return this->pickupTemplate_; }
 
+
+            void setPickupTemplateName(const std::string& name);
+            void setPickupTemplate(Template* temp);
+
+
+/**
+            @brief Set the distance in which to trigger.
+            @param value The new distance in which to trigger.
+            */
+            inline void setTriggerDistance(float value)
+                { this->triggerDistance_ = value; }
+            /**
+            @brief Set the time to respawn.
+            @param time New time after which this gets re-actived.
+            */
+            inline void setRespawnTime(float time)
+                { this->respawnTime_ = time; }
+
+            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
+
         private:
             void initialize(void);
@@ -131 +151 @@
                 { this->blocked_.insert(std::pair<PickupCarrier*, std::time_t>(carrier, std::time(0)+time)); }
 
-            /**
-            @brief Set the distance in which to trigger.
-            @param value The new distance in which to trigger.
-            */
-            inline void setTriggerDistance(float value)
-                { this->triggerDistance_ = value; }
-            /**
-            @brief Set the time to respawn.
-            @param time New time after which this gets re-actived.
-            */
-            inline void setRespawnTime(float time)
-                { this->respawnTime_ = time; }
+            
+            
 
-            void setMaxSpawnedItems(int items); //!< Sets the maximum number of spawned items.
-
-            void setPickupTemplateName(const std::string& name);
-            void setPickupTemplate(Template* temp);
 
             Pickupable* createPickup(void); //!< Creates a new Pickupable.