[Orxonox-commit 1984] r6701 - in code/branches/pickup4/data/levels: . includes templates

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-04-12 22:24:30 +0200 (Mon, 12 Apr 2010)
New Revision: 6701

Modified:
   code/branches/pickup4/data/levels/includes/pickups.oxi
   code/branches/pickup4/data/levels/pickup.oxw
   code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt
Log:
Added a new health pickup.


Modified: code/branches/pickup4/data/levels/includes/pickups.oxi
===================================================================
--- code/branches/pickup4/data/levels/includes/pickups.oxi	2010-04-12 19:10:16 UTC (rev 6700)
+++ code/branches/pickup4/data/levels/includes/pickups.oxi	2010-04-12 20:24:30 UTC (rev 6701)
@@ -1,6 +1,7 @@
 <PickupRepresentation
     pickupName = "Small Health Boost"
     pickupDescription = "Adds a small amout of health to the ship."
+    inventoryRepresentation = "SmallHealth"
     spawnerTemplate = "smallhealthpickupRepresentation"
 >
     <pickup>
@@ -12,6 +13,7 @@
     pickupName = "Medium Health Boost"
     pickupDescription = "Adds a medium amout of health to the ship."
     spawnerTemplate = "mediumhealthpickupRepresentation"
+    inventoryRepresentation = "MediumHealth"
 >
     <pickup>
         <HealthPickup template=mediumhealthpickup />
@@ -22,6 +24,7 @@
     pickupName = "Huge Health Boost"
     pickupDescription = "Adds a huge amout of health to the ship."
     spawnerTemplate = "hugehealthpickupRepresentation"
+    inventoryRepresentation = "HugeHealth"
 >
     <pickup>
         <HealthPickup template=hugehealthpickup />
@@ -32,6 +35,7 @@
     pickupName = "Crazy Madness Health Boost"
     pickupDescription = "Adds a crazy amout of health to the ship."
     spawnerTemplate = "crazyhealthpickupRepresentation"
+    inventoryRepresentation = "CrazyMadnessHealth"
 >
     <pickup>
         <HealthPickup template=crazyhealthpickup />
@@ -47,3 +51,41 @@
         <PickupCollection template=doublepickup />
     </pickup>
 </PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Use Pickup"
+    pickupDescription = "Uses all pickups you have."
+    spawnerTemplate = "usepickupRepresentation"
+    inventoryRepresentation = "usePickup"
+>
+    <pickup>
+        <MetaPickup metaType="use" />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Drop Pickup"
+    pickupDescription = "Drops all pickups you have."
+    spawnerTemplate = "droppickupRepresentation"
+    inventoryRepresentation = "dropPickup"
+>
+    <pickup>
+        <MetaPickup metaType="drop" />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Huge Health Boost"
+    pickupDescription = "Adds a huge amout of health to the ship."
+    spawnerTemplate = "hugehealthpickupRepresentation"
+    inventoryRepresentation = "HugeHealth"
+>
+    <pickup>
+          <HealthPickup
+    health = 100
+    healthType = "limited"
+    activationType = "onUse"
+    durationType = "once"
+  />
+    </pickup>
+</PickupRepresentation>
\ No newline at end of file

Modified: code/branches/pickup4/data/levels/pickup.oxw
===================================================================
--- code/branches/pickup4/data/levels/pickup.oxw	2010-04-12 19:10:16 UTC (rev 6700)
+++ code/branches/pickup4/data/levels/pickup.oxw	2010-04-12 20:24:30 UTC (rev 6701)
@@ -40,12 +40,6 @@
         </pickup>
     </PickupSpawner>
     
-    <PickupSpawner position="-50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
-        <pickup>
-            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
-        </pickup>
-    </PickupSpawner>
-    
     <PickupSpawner position="-25,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
         <pickup>
             <HealthPickup template=smallhealthpickup />
@@ -76,11 +70,16 @@
         </pickup>
     </PickupSpawner>
 
-    <!--PickupSpawner position="100,100,100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
         <pickup>
-            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=limited />
+              <HealthPickup
+    health = 100
+    healthType = "limited"
+    activationType = "onUse"
+    durationType = "once"
+  />
         </pickup>
-    </PickupSpawner-->
+    </PickupSpawner>
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />

Modified: code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt
===================================================================
--- code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt	2010-04-12 19:10:16 UTC (rev 6700)
+++ code/branches/pickup4/data/levels/templates/pickup_representation_templates.oxt	2010-04-12 20:24:30 UTC (rev 6701)
@@ -106,4 +106,36 @@
         </pickupables>
     </PickupCollection>
 </Template>
+
+<Template name=usepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=droppickupRepresentation>
+    <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.95,0.20,0.10" material="Arrow" scale=0.65 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
     
\ No newline at end of file