Changeset 10617 for code/branches/presentationFS15merge

Timestamp:

Oct 4, 2015, 2:18:02 PM (9 years ago)

Author:

landauf

Message:

added new levels and modified ship definitions from branch presentationFS15

Location:

code/branches/presentationFS15merge/data

Files:

• defaultConfig/keybindings.ini (modified) (1 diff)
• gui/scripts/presentation.lua (modified) (2 diffs)
• gui/scripts/testscript.lua (modified) (2 diffs)
• levels/clangenb.oxw (modified) (1 diff)
• levels/includes/weaponSettingsFS15.oxi (copied) (copied from code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi)
• levels/includes/weaponSettingsHeartAttack.oxi (modified) (1 diff)
• levels/includes/weaponSettingsRing.oxi (copied) (copied from code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi)
• levels/presentationFS15.oxw (copied) (copied from code/branches/presentationFS15/data/levels/presentationFS15.oxw)
• levels/simone.oxw (copied) (copied from code/branches/presentationFS15/data/levels/simone.oxw)
• levels/templates/spaceshipFS15.oxt (copied) (copied from code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt)
• levels/templates/spaceshipHeartAttack.oxt (modified) (2 diffs)
• levels/templates/spaceshipRing.oxt (copied) (copied from code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt)

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

@@ -142 +142 @@
 KeyWebStop=
 KeyX="selectClosest"
-KeyY=
+KeyY="onpress fire 4"
 KeyYen=
 KeyZ="selectNext"

code/branches/presentationFS15merge/data/gui/scripts/presentation.lua

@@ -1 +1 @@
 -- Set some test variables
-xm = 1000 
-ym = 0
-zm = 0
+x0 = 0
+y0 = 500
+z0 = 500
 
-xl = -1000 
-yl = 3000 
-zl = -1000
+xo = 2000 
+yo = 0
+zo = 0
 
-xr = 2000
-yr = 500
-zr = 2000
+x1 = 3000
+y1 = 0 
+z1 = 0
 
-d = 5
-Tabs = 0
-
-pi = 3.1415
+x2 = 2000
+y2 = 2000 
+z2 = 0
 
 -- Get a local pointer to a scriptcontroller
@@ -23 +22 @@
 if ctrl ~= nil then
 
-  ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 2)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("ral", xl, yl, zl, 3, 0, 0, math.pi)
+  ctrl:eventScheduler("chl", x0, y0, z0, xo, yo, zo, 2)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
+  ctrl:eventScheduler("mal", x2, y2, z2, xo, yo, zo, 2)
+  ctrl:eventScheduler("mal", x1, y1, z1, xo, yo, zo, 2)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("chl", xl, yl, zl, xr, yr, zr, 2)
+  ctrl:eventScheduler("ral", xo, yo, zo, 3, 1000, 0, 5)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("mal", xr + 600,yr,zr, xr,yr,zr, 4)
+  ctrl:eventScheduler("ral", xo, yo, zo, 2, 1000, 0, 5)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("chl", xr, yr, zr, xl, yl, zl, 3)
-  ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
+  ctrl:eventScheduler("ral", xo, yo, zo, 1, 1000, 0, 5)
   ctrl:eventScheduler("idle", 1)
 

code/branches/presentationFS15merge/data/gui/scripts/testscript.lua

@@ -25 +25 @@
   ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 2)
   ctrl:eventScheduler("idle", 1)
-  ctrl:eventScheduler("ral", xl, yl, zl, 3, 0, 0, math.pi)
+  ctrl:eventScheduler("ral", xl, yl, zl, 3, 3000, 0, math.pi)
   ctrl:eventScheduler("idle", 1)
   ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
@@ -36 +36 @@
   ctrl:eventScheduler("idle", 1)
   ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
-  ctrl:eventScheduler("idle", 600)
+  ctrl:eventScheduler("idle", 1)
 
 end

code/branches/presentationFS15merge/data/levels/clangenb.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "Empty level"
+ name = "clangenb"
  description = "A level with absolutely nothing in it."
  tags = "test"

code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi

@@ -35 +35 @@
           <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
         </Weapon>
         <Weapon>

code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt

@@ -2 +2 @@
   <SpaceShip
    hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
+   camerapositiontemplate = spaceshipheartattackcameras
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
@@ -69 +69 @@
 </Template>
 
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=spaceshipheartattackcameras defaults=0>
   <SpaceShip>
     <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
+      <CameraPosition position="0,12, 48" drag=true mouselook=true />
       <CameraPosition position="0,20, 80" drag=true mouselook=true />
       <CameraPosition position="0,30,120" drag=true mouselook=true />