Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10617


Ignore:
Timestamp:
Oct 4, 2015, 2:18:02 PM (4 years ago)
Author:
landauf
Message:

added new levels and modified ship definitions from branch presentationFS15

Location:
code/branches/presentationFS15merge/data
Files:
6 edited
6 copied

Legend:

Unmodified
Added
Removed
  • code/branches/presentationFS15merge/data/defaultConfig/keybindings.ini

    r10281 r10617  
    142142KeyWebStop=
    143143KeyX="selectClosest"
    144 KeyY=
     144KeyY="onpress fire 4"
    145145KeyYen=
    146146KeyZ="selectNext"
  • code/branches/presentationFS15merge/data/gui/scripts/presentation.lua

    r10614 r10617  
    11-- Set some test variables
    2 xm = 1000
    3 ym = 0
    4 zm = 0
     2x0 = 0
     3y0 = 500
     4z0 = 500
    55
    6 xl = -1000
    7 yl = 3000
    8 zl = -1000
     6xo = 2000
     7yo = 0
     8zo = 0
    99
    10 xr = 2000
    11 yr = 500
    12 zr = 2000
     10x1 = 3000
     11y1 = 0
     12z1 = 0
    1313
    14 d = 5
    15 Tabs = 0
    16 
    17 pi = 3.1415
     14x2 = 2000
     15y2 = 2000
     16z2 = 0
    1817
    1918-- Get a local pointer to a scriptcontroller
     
    2322if ctrl ~= nil then
    2423
    25   ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 2)
    2624  ctrl:eventScheduler("idle", 1)
    27   ctrl:eventScheduler("ral", xl, yl, zl, 3, 0, 0, math.pi)
     25  ctrl:eventScheduler("chl", x0, y0, z0, xo, yo, zo, 2)
    2826  ctrl:eventScheduler("idle", 1)
    29   ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
     27  ctrl:eventScheduler("mal", x2, y2, z2, xo, yo, zo, 2)
     28  ctrl:eventScheduler("mal", x1, y1, z1, xo, yo, zo, 2)
    3029  ctrl:eventScheduler("idle", 1)
    31   ctrl:eventScheduler("chl", xl, yl, zl, xr, yr, zr, 2)
     30  ctrl:eventScheduler("ral", xo, yo, zo, 3, 1000, 0, 5)
    3231  ctrl:eventScheduler("idle", 1)
    33   ctrl:eventScheduler("mal", xr + 600,yr,zr, xr,yr,zr, 4)
     32  ctrl:eventScheduler("ral", xo, yo, zo, 2, 1000, 0, 5)
    3433  ctrl:eventScheduler("idle", 1)
    35   ctrl:eventScheduler("chl", xr, yr, zr, xl, yl, zl, 3)
    36   ctrl:eventScheduler("idle", 1)
    37   ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
     34  ctrl:eventScheduler("ral", xo, yo, zo, 1, 1000, 0, 5)
    3835  ctrl:eventScheduler("idle", 1)
    3936
  • code/branches/presentationFS15merge/data/gui/scripts/testscript.lua

    r10614 r10617  
    2525  ctrl:eventScheduler("mal", xl,yl,zl, xl,yl,zl, 2)
    2626  ctrl:eventScheduler("idle", 1)
    27   ctrl:eventScheduler("ral", xl, yl, zl, 3, 0, 0, math.pi)
     27  ctrl:eventScheduler("ral", xl, yl, zl, 3, 3000, 0, math.pi)
    2828  ctrl:eventScheduler("idle", 1)
    2929  ctrl:eventScheduler("mal", 0,0,1000, xl,yl,zl, 3)
     
    3636  ctrl:eventScheduler("idle", 1)
    3737  ctrl:eventScheduler("spi", xm,ym,zm, 0,0,0, 4)
    38   ctrl:eventScheduler("idle", 600)
     38  ctrl:eventScheduler("idle", 1)
    3939
    4040end
  • code/branches/presentationFS15merge/data/levels/clangenb.oxw

    r10610 r10617  
    11<LevelInfo
    2  name = "Empty level"
     2 name = "clangenb"
    33 description = "A level with absolutely nothing in it."
    44 tags = "test"
  • code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi

    r10610 r10617  
    3535          <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
    3636          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     37          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    3738        </Weapon>
    3839        <Weapon>
  • code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt

    r10610 r10617  
    22  <SpaceShip
    33   hudtemplate            = spaceshiphud
    4    camerapositiontemplate = spaceshipassffcameras
     4   camerapositiontemplate = spaceshipheartattackcameras
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    66   spawnparticleduration  = 3
     
    6969</Template>
    7070
    71 <Template name=spaceshipassffcameras defaults=0>
     71<Template name=spaceshipheartattackcameras defaults=0>
    7272  <SpaceShip>
    7373    <camerapositions>
    74       <CameraPosition position="0,10, 40" drag=true mouselook=true />
     74      <CameraPosition position="0,12, 48" drag=true mouselook=true />
    7575      <CameraPosition position="0,20, 80" drag=true mouselook=true />
    7676      <CameraPosition position="0,30,120" drag=true mouselook=true />
Note: See TracChangeset for help on using the changeset viewer.