Changeset 11163 for code/branches/tgidronFS16

Timestamp:

Apr 14, 2016, 1:00:08 PM (9 years ago)

Author:

tgidron

Message:

Pickup Development

Location:

code/branches/tgidronFS16

Files:

• data/levels/Hover.oxw (modified) (2 diffs)
• data/levels/templates/spaceshipHover.oxt (modified) (1 diff)
• data/overlays/HoverHUD.oxo (modified) (1 diff)
• src/modules/hover/FlagHUD.cc (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (5 diffs)
• src/modules/hover/Hover.h (modified) (3 diffs)

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

@@ -25 +25 @@
 ?>
 
+<Template name=destroyhoverpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Asterisk" scale=0.65 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<PickupRepresentation
+    name = "destroyhover"
+    pickupName = "Destroy Carrier Pickup"
+    pickupDescription = "destroys you."
+    spawnerTemplate = "destroyhoverpickupRepresentation"
+    inventoryRepresentation = "destroyCarrierPickup"
+/>
+
+
 <Level
 plugins = hover
@@ -33 +58 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+
+
+
 
   <Scene

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

@@ -20 +20 @@
    primaryThrust     = 100
    auxilaryThrust    = 1
-   rotationThrust    = 30
+   rotationThrust    = 40
 
-   jumpBoost = 90
+   jumpBoost = 120
 
    lift = 1;

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

@@ -45 +45 @@
     </HUDHealthBar>
 
-
+    
     <HUDNavigation
      name          = "Navigation"

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

@@ -54 +54 @@
         this->overlay_->add2D(this->panel_);
 
-        this->flagCount_ = 1;
-        setFlagCount(1);
+        this->flagCount_ = 5;
+        setFlagCount(5);
     }
 

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

@@ -41 +41 @@
 #include "gamestates/GSLevel.h"
 
+#include "pickup/PickupSpawner.h"
+#include "pickup/Pickup.h"
+
 namespace orxonox
 {
@@ -61 +64 @@
         this->setHUDTemplate("HoverHUD");
 
-        
     }
 
@@ -89 +91 @@
             }
 
+
+
             //Generate inner Walls according to levelcode
             for(int y=0; y<numCells; y++){
@@ -103 +107 @@
 
             //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 1; i++ )
+            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 10 Pickups randomly
+            for (int i = 0; i<10; i++)
+            {
+                PickupSpawner* pickup = new PickupSpawner(origin_->getContext());
+                //PickupSpawner(this->getContext());
+                //pickup->createDroppedPickup(this->getContext(), pickup , this, 10);
+                pickups_.push_back(pickup);
             }
 
@@ -117 +131 @@
     void Hover::startLevel(){
         //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 1; i++ )
+            for ( int i = 0; i < 5; i++ )
             {
                 HoverFlag* flag = new HoverFlag(origin_->getContext());

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

@@ -42 +42 @@
 #include "gametypes/Gametype.h"
 #include "HoverOrigin.h"
+#include "pickup/PickupSpawner.h"
 
 namespace orxonox
@@ -61 +62 @@
 
 
+
             inline int getNumberOfFlags() const
                 { return this->numberOfFlags_; }
@@ -76 +78 @@
             int cellHeight;
             int numCells;
+
+            std::vector<PickupSpawner*> pickups_;
     };
 }