Changeset 9118 for code/branches

Timestamp:

Apr 27, 2012, 2:36:52 PM (13 years ago)

Author:

lkevin

Message:

First working version. Default damage increase is
currently set to 20. Now fixing things and documenting.

Location:

code/branches/pickup2012

Files:

• data/levels/pickups.oxw (modified) (2 diffs)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/pickup2012/data/levels/pickups.oxw

@@ -168 +168 @@
       </pickup>
     </PickupSpawner>
+    
+    <!-- DamageBoost pickup -->
+    
+    <PickupSpawner position="-100,300,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+      <pickup>
+        <DamageBoostPickup template=normaldamageboostpickup />
+      </pickup>
+    </PickupSpawner>
+    
     
     <!-- Other pickups -->
@@ -206 +215 @@
       </pickup>
     </PickupSpawner>
+    
+    <!-- @Objects: 4 boxes (uncontrolled pawns) -->
+    <Pawn team=1 health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <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>
+
+    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 3">
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <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>
+
+    <Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 2">
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <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>
+
+    <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 1">
+        <events>
+          <visibility>
+            <EventListener event="flying4" />
+          </visibility>
+        </events>
+        <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>
 
     <!--StaticEntity position="0,-200,0" direction="0,-1,0" collisionType=static mass=500 friction=0.01 >

code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -225 +225 @@
                     <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5>
                         <attached>
-                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="asterisk" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smallspeedpickup>
-  <SpeedPickup
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=normaldamageboostpickup>
+  <DamageBoostPickup
     duration = 10.0
-    damageBoost = damageBoost*2
     activationType = "immediate"
     durationType = "continuous"

code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc

@@ -232 +232 @@
     {
         // apply multiplier
-        damage *= originator->getDamageMultiplier();
+        Pawn *test = dynamic_cast<Pawn *>(originator);
+        if( test != NULL )
+          damage *= originator->getDamageMultiplier();
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))