Changeset 11189 for code/branches/sagerjFS16/data

Timestamp:

May 19, 2016, 5:04:41 PM (9 years ago)

Author:

sagerj

Message:

done/fixed everything, weaponmode/discharger fully commented only hudchargebar left

Location:

code/branches/sagerjFS16/data

Files:

• levels/emptyLevel.oxw (modified) (2 diffs)
• levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• levels/includes/weaponSettingsEscortDischarger.oxi (added)
• levels/templates/spaceshipEscortDischarger.oxt (added)
• overlays/HUDTemplates3.oxo (modified) (1 diff)

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

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipEscort.oxt")
+  include("templates/spaceshipEscortDischarger.oxt")
 ?>
 
@@ -28 +28 @@
 
     <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 team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescortdischarger />
     
   </Scene>

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

@@ -24 +24 @@
             munitionpershot=1
             delay=0
-            damage=0.5
+            damage=0.8
             material="Flares/point_lensflare"
             muzzleoffset=" 1.6, 1.3, -2.0"

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

@@ -192 +192 @@
      pickpoint     = "0, 1"
      correctaspect = true
-     iconmaterial  = "Orxonox/BarIconSpeed"
+     iconmaterial  = "Orxonox/BarIconCharge"
     >
       <BarColour position = 0.0 colour = "0.7,0.5,0.2" />