[Orxonox-commit 1972] r6689 - in code/branches/ppspickups2/data/levels: . includes templates

[benedict at orxonox.net]

Author: benedict
Date: 2010-04-12 15:17:17 +0200 (Mon, 12 Apr 2010)
New Revision: 6689

Modified:
   code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi
   code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw
   code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt
Log:
fixed some issues with the templates

Modified: code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi
===================================================================
--- code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi	2010-04-12 13:15:44 UTC (rev 6688)
+++ code/branches/ppspickups2/data/levels/includes/pickups_invisible.oxi	2010-04-12 13:17:17 UTC (rev 6689)
@@ -1,9 +1,29 @@
 <PickupRepresentation
-    name = "Invisibility"
-    description = "Makes you invisible."
-    spawnerTemplate = "invisiblepickupRepresentation"
+    name = "small Invisibility"
+    description = "Makes you invisible for 5 seconds."
+    spawnerTemplate = "smallinvisiblepickupRepresentation"
 >
     <pickup>
-        <InvisiblePickup template=invisiblepickup />
+        <InvisiblePickup template=smallinvisiblepickup />
     </pickup>
 </PickupRepresentation>
+
+<PickupRepresentation
+    name = "medium Invisibility"
+    description = "Makes you invisible for 10 seconds."
+    spawnerTemplate = "mediuminvisiblepickupRepresentation"
+>
+    <pickup>
+        <InvisiblePickup template=mediuminvisiblepickup />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    name = "hunge Invisibility"
+    description = "Makes you invisible for 20 seconds."
+    spawnerTemplate = "hugeinvisiblepickupRepresentation"
+>
+    <pickup>
+        <InvisiblePickup template=hugeinvisiblepickup />
+    </pickup>
+</PickupRepresentation>
\ No newline at end of file

Modified: code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw
===================================================================
--- code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw	2010-04-12 13:15:44 UTC (rev 6688)
+++ code/branches/ppspickups2/data/levels/pickup_pps_invi.oxw	2010-04-12 13:17:17 UTC (rev 6689)
@@ -24,11 +24,22 @@
 
     <PickupSpawner position="-75,0,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
         <pickup>
-            <InvisiblePickup template=invisiblepickup />
+            <InvisiblePickup template=smallinvisiblepickup />
         </pickup>
     </PickupSpawner>
 
+    <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
+        <pickup>
+            <InvisiblePickup template=mediuminvisiblepickup />
+        </pickup>
+    </PickupSpawner>
 
+    <PickupSpawner position="-25,0,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
+        <pickup>
+            <InvisiblePickup template=hugeinvisiblepickup />
+        </pickup>
+    </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 />
   </Scene>

Modified: code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt
===================================================================
--- code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt	2010-04-12 13:15:44 UTC (rev 6688)
+++ code/branches/ppspickups2/data/levels/templates/pickup_representation_templates_invisible.oxt	2010-04-12 13:17:17 UTC (rev 6689)
@@ -5,7 +5,7 @@
                 <attached>
                     <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
                         <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.1 />
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.5 />
                         </attached>
                     </Billboard>
                 </attached>
@@ -14,7 +14,7 @@
     </PickupRepresentation>
 </Template>
 
-<Template name=smalltinvisiblepickup>
+<Template name=smallinvisiblepickup>
   <InvisiblePickup 
     duration = 5.0
     activaionType = "immediate"
@@ -29,7 +29,7 @@
                 <attached>
                     <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
                         <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.1 />
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.7 />
                         </attached>
                     </Billboard>
                 </attached>
@@ -53,7 +53,7 @@
                 <attached>
                     <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
                         <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.1 />
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.9 />
                         </attached>
                     </Billboard>
                 </attached>