Changeset 9269 for code/branches/presentation2012merge/data/levels/includes

Timestamp:

Jun 3, 2012, 4:33:13 PM (13 years ago)

Author:

landauf

Message:

merged presentation2012 to presentation2012merge

Location:

code/branches/presentation2012merge

Files:

• . (modified) (2 props)
• data/levels/includes/pickups.oxi (modified) (1 diff)
• data/levels/includes/towerWeaponSettings.oxi (copied) (copied from code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi)

code/branches/presentation2012merge

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

code/branches/presentation2012merge/data/levels/includes/pickups.oxi

@@ -210 +210 @@
 </PickupRepresentation>
 
+<!-- DamageBoost Pickup -->
+
+<PickupRepresentation
+    pickupName = "Small DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 2."
+    spawnerTemplate = "smalldamageboostpickupRepresentation"
+    inventoryRepresentation = "SmallDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=smalldamageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Medium DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 5."
+    spawnerTemplate = "mediumdamageboostpickupRepresentation"
+    inventoryRepresentation = "MediumDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=mediumdamageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
+<PickupRepresentation
+    pickupName = "Large DamageBoost Pickup"
+    pickupDescription = "Multiplies the ship damage with 7."
+    spawnerTemplate = "largedamageboostpickupRepresentation"
+    inventoryRepresentation = "LargeDamageBoost"
+>
+    <pickup>
+        <DamageBoostPickup template=largedamageboostpickup />
+    </pickup>
+</PickupRepresentation>
+
 <!-- Shrink Pickup -->
 

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies