Changeset 11208 for code/branches/presentationFS16/data

Timestamp:

May 26, 2016, 4:53:34 PM (9 years ago)

Author:

fvultier

Message:

merged discharger, thats the last one

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• data/defaultConfig/keybindings.ini (modified) (4 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/florin_johnny_presentation.oxw (copied) (copied from code/branches/sagerjFS16/data/levels/florin_johnny_presentation.oxw)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsEscortDischarger.oxi (copied) (copied from code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscortDischarger.oxi)
• data/levels/includes/weaponSettingsFx112.oxi (copied) (copied from code/branches/sagerjFS16/data/levels/includes/weaponSettingsFx112.oxi)
• data/levels/missionOne.oxw (modified) (2 diffs)
• data/levels/templates/spaceshipEscortDischarger.oxt (copied) (copied from code/branches/sagerjFS16/data/levels/templates/spaceshipEscortDischarger.oxt)
• data/levels/templates/spaceshipFx112.oxt (copied) (copied from code/branches/sagerjFS16/data/levels/templates/spaceshipFx112.oxt)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)

code/branches/presentationFS16/data/defaultConfig/keybindings.ini

@@ -122 +122 @@
 KeyStop=
 KeySystemRequest="printScreen"
-KeyT="onpress fire 3"
+KeyT= onpress push 3 | onrelease release 3
 KeyTab="NewHumanController changeMode"
 KeyU=""
@@ -132 +132 @@
 KeyVolumeDown=
 KeyVolumeUp=
-KeyW="scale 1 moveFrontBack"
+KeyW="scale 1 moveFrontBack "
 KeyWake=
 KeyWebBack=
@@ -142 +142 @@
 KeyWebStop=
 KeyX="selectClosest"
-KeyY="onpress fire 4"
+KeyY= onpress push 4 | onrelease release 4
 KeyYen=
 KeyZ="selectNext"
@@ -152 +152 @@
 Button6=
 Button7=
-Left="fire 0"
-Middle="fire 2"
-Right= fire 1 | unfire
+Left= push 0 | release 0
+Middle= push 2 | release 2
+Right= push 1 | release 1
 Wheel1Down="NewHumanController decelerate"
 Wheel1Up="NewHumanController accelerate"

code/branches/presentationFS16/data/gui/scripts/KeyBindMenu.lua

@@ -7 +7 @@
 
     commandList = {}
-    table.insert(commandList, "fire 0")
-    table.insert(commandList, "fire 1 | unfire")
-    table.insert(commandList, "onpress fire 2")
-    table.insert(commandList, "onpress fire 3")
+    table.insert(commandList, "fire 0" | "release 0")
+    table.insert(commandList, "fire 1" | "release 1")
+    table.insert(commandList, "onpress fire 2" | "onrelease release 2")
+    table.insert(commandList, "onpress fire 3" | "onrelease release 3")
     table.insert(commandList, "scale 1 moveFrontBack")
     table.insert(commandList, "scale -1 moveFrontBack")

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

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipEscort.oxt")
+  include("templates/spaceshipEscortDischarger.oxt")
   include("templates/spaceshipHover.oxt")
 ?>
@@ -29 +29 @@
 
     <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 />
 
     <SpaceShip position="0,0,0" lookat="0,0,0" >

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

@@ -1 +1 @@
     <weaponslots>
-      <WeaponSlot position="-9.2,2,-13" />
-      <WeaponSlot position=" 9.2,2,-13" />
+      <WeaponSlot
+        position="-9.2,2,-13"
+      />
     </weaponslots>
+
     <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
+      <WeaponSet
+        firemode=0
+      />
     </weaponsets>
+    
     <weaponpacks>
       <WeaponPack>
         <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+          <DefaultWeaponmodeLink
+            firemode=0
+            weaponmode=0
+          />
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+          <Discharger
+            mode=0
+            munitionpershot=1
+            delay=0
+            damage=0.8
+            material="Flares/point_lensflare"
+            muzzleoffset=" 1.6, 1.3, -2.0"
+            projectileMesh="LaserBeam2.mesh"
+          />
         </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=1 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
-        </Weapon>
+   
       </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-      </WeaponPack>
+
     </weaponpacks>
     <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
+      <LaserMunition
+        initialmagazines=2
+        maxmagazines=2
+        munitionpermagazine=10
+        replenishamount=1
+        replenishinterval=2
+      />
     </munition>

code/branches/presentationFS16/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/presentationFS16/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/BarIconCharge"
+    >
+      <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