Changeset 10961 for code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi

Timestamp:

Dec 9, 2015, 2:45:58 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and fabiens branch. Had to modify hoverHUD and invaderHUD, because the text of the healthbar wasn't correctly displayed and the weapon settings of the hovership.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponSettingsFPS.oxi (modified) (2 diffs)

code/branches/presentationHS15/data/levels/includes/weaponSettingsFPS.oxi

@@ -11 +11 @@
       <WeaponSet firemode=1 />
     </weaponsets>
-    <weapons>
+    <weaponpacks>
       <WeaponPack firemode=0>
         <links>
@@ -49 +49 @@
         /-->
       </WeaponPack>
-    </weapons>
+    </weaponpacks>
+    <munition>
+      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
+      <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
+    </munition>