Changeset 11185 for code/branches/sagerjFS16/data

Timestamp:

May 12, 2016, 4:03:47 PM (9 years ago)

Author:

sagerj

Message:

fix the charging during reloadtime, the hudchargebar working so far…

Location:

code/branches/sagerjFS16/data

Files:

• levels/includes/weaponSettingsEscort.oxi (modified) (2 diffs)
• levels/missionOne.oxw (modified) (2 diffs)
• overlays/HUDTemplates3.oxo (modified) (1 diff)

code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi

@@ -24 +24 @@
             munitionpershot=1
             delay=0
-            damage=9.3
+            damage=0.5
             material="Flares/point_lensflare"
             muzzleoffset=" 1.6, 1.3, -2.0"
@@ -36 +36 @@
     <munition>
       <LaserMunition
-        initialmagazines=8
-        maxmagazines=8
+        initialmagazines=2
+        maxmagazines=2
         munitionpermagazine=10
         replenishamount=1
-        replenishinterval=7.5
+        replenishinterval=2
       />
     </munition>

code/branches/sagerjFS16/data/levels/missionOne.oxw

@@ -12 +12 @@
   include("templates/lodInformation.oxt")
   include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipEscort.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipSpacecruiser.oxt")
@@ -57 +58 @@
         <events>
             <trigger>
-                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff>
+                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort>
                   <EventTrigger invert=true>
                     <events>

code/branches/sagerjFS16/data/overlays/HUDTemplates3.oxo

@@ -184 +184 @@
      weaponModeHUDSize      = "0.09, 0.03"
     />
+
+    <HUDChargeBar
+     name                   = "ChargeBar"
+     background    = "Orxonox/BarBackground"
+     size          = "0.40, 0.04"
+     position      = "0.0 , 0.5 "
+     pickpoint     = "0, 1"
+     correctaspect = true
+     iconmaterial  = "Orxonox/BarIconSpeed"
+    >
+      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+    </HUDChargeBar>
     
     <HUDTimer