[Orxonox-commit 5838] r10498 - in code/branches/presentationFS15/data/levels: . includes templates
maxima at orxonox.net
maxima at orxonox.net
Wed May 27 13:11:01 CEST 2015
Author: maxima
Date: 2015-05-27 13:11:01 +0200 (Wed, 27 May 2015)
New Revision: 10498
Modified:
code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi
code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi
code/branches/presentationFS15/data/levels/presentationFS15.oxw
code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt
code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt
code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt
Log:
Pres level modified
Modified: code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi
===================================================================
--- code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi 2015-05-27 11:11:01 UTC (rev 10498)
@@ -1,56 +1,51 @@
- <weaponslots>
- <WeaponSlot position="-15.0,-1.5,0" />
- <WeaponSlot position=" 15.0,-1.5,0" />
- <WeaponSlot position=" 0, 0,0" />
- </weaponslots>
- <weaponsets>
- <WeaponSet firemode=0 />
- <WeaponSet firemode=1 />
- <WeaponSet firemode=2 />
- <WeaponSet firemode=3 />
- <WeaponSet firemode=4 />
- </weaponsets>
- <weapons>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
- <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
- <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
- <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
- <DefaultWeaponmodeLink firemode=4 weaponmode=4 />
- </links>
- <Weapon>
- <attached>
- <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
- </Weapon>
- <Weapon>
- <attached>
- <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
- <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
- </Weapon>
- <Weapon>
- <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFireOld mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
- <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
- </Weapon>
- </WeaponPack>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
- </links>
- <!--Weapon>
- <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
- </Weapon-->
- </WeaponPack>
- </weapons>
+<weaponslots>
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+</weaponslots>
+<weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+ <WeaponSet firemode=2 />
+ <WeaponSet firemode=3 />
+ <WeaponSet firemode=4 />
+</weaponsets>
+<weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+ <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
+ <DefaultWeaponmodeLink firemode=4 weaponmode=4 />
+ </links>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
+ </Weapon>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
+ </Weapon>
+ <Weapon>
+ <LaserFire mode=1 munitionpershot=0 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
+ <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
+ <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+ <RocketFireOld mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ </Weapon>
+ </WeaponPack>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+ </links>
+ <!--Weapon>
+ <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
+ </Weapon-->
+ </WeaponPack>
+</weapons>
\ No newline at end of file
Modified: code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi
===================================================================
--- code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi 2015-05-27 11:11:01 UTC (rev 10498)
@@ -1,28 +1,22 @@
- <weaponslots>
- <WeaponSlot position="11,0,-7" />
- <WeaponSlot position="-11,0,-7" />
- </weaponslots>
- <weaponsets>
- <WeaponSet firemode=0 />
- <WeaponSet firemode=1 />
- </weaponsets>
- <weapons>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
- <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
- </links>
- <Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.4,-3" projectileMesh="LaserBeam2.mesh" />
-
- </Weapon>
- <Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset="0.1, 1.4, -3" projectileMesh="LaserBeam2.mesh" />
- </Weapon>
- </WeaponPack>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
- </links>
- </WeaponPack>
- </weapons>
+<weaponslots>
+ <WeaponSlot position="11,0,-7" />
+ <WeaponSlot position="-11,0,-7" />
+</weaponslots>
+<weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+</weaponsets>
+<weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ </links>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.4,-3" projectileMesh="LaserBeam2.mesh" />
+ </Weapon>
+ <Weapon>
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset="0.1, 1.4, -3" projectileMesh="LaserBeam2.mesh" />
+ </Weapon>
+ </WeaponPack>
+</weapons>
Modified: code/branches/presentationFS15/data/levels/presentationFS15.oxw
===================================================================
--- code/branches/presentationFS15/data/levels/presentationFS15.oxw 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/presentationFS15.oxw 2015-05-27 11:11:01 UTC (rev 10498)
@@ -12,9 +12,7 @@
?>
<?lua
- include("templates/spaceshipPirate.oxt")
- include("templates/spaceshipEscort.oxt")
- include("templates/spaceshipAssff.oxt")
+ include("templates/spaceshipRing.oxt")
include("templates/spaceshipFS15.oxt")
?>
@@ -31,16 +29,37 @@
>
<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=spaceshipfs15 />
+ <SpawnPoint team=0 position="-2000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipfs15/>
-
- <SpaceShip position="0,500,500" lookat="0,0,0" team=1 >
+ <SpaceShip position="0,500,500" lookat="0,1000,0" >
+ <attached>
+ <DistanceTriggerBeacon name="bcnDestroyer" />
+ <DockingTarget name="destroyer" />
+ </attached>
<templates>
- <Template link=spaceshipassff />
+ <Template link=spaceshipring />
</templates>
</SpaceShip>
-
+
+ <!-- Docking -->
+ <Dock position="-1000,0,0" roll=0 yaw=0 >
+ <attached>
+ <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
+ <DistanceTrigger position="0,0,0" distance="200" target="Pawn" beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"/>
+ </attached>
+ <animations>
+ <MoveToDockingTarget target="destroyer" />
+ </animations>
+ <effects>
+ <DockToShip target="destroyer" />
+ </effects>
+ <events>
+ <execute>
+ <EventListener event="dockMe" />
+ </execute>
+ </events>
+ </Dock>
</Scene>
</Level>
Modified: code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt
===================================================================
--- code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt 2015-05-27 11:11:01 UTC (rev 10498)
@@ -6,20 +6,20 @@
spawnparticleduration = 3
explosionchunks = 6
- health = 100
- maxhealth = 200
- initialhealth = 100
+ health = 200
+ maxhealth = 300
+ initialhealth = 150
- shieldhealth = 30
- initialshieldhealth = 30
- maxshieldhealth = 50
+ shieldhealth = 50
+ initialshieldhealth = 50
+ maxshieldhealth = 800
shieldabsorption = 0.8
reloadrate = 1
reloadwaittime = 1
- primaryThrust = 100
+ primaryThrust = 40
auxilaryThrust = 30
- rotationThrust = 50
+ rotationThrust = 35
lift = 1;
stallSpeed = 220;
@@ -40,21 +40,27 @@
explosionSound = "sounds/Explosion2.ogg"
>
<engines>
- <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipfs15engine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipfs15engine />
+ <MultiStateEngine position=" 7.6, 0, 19" template=spaceshipfs15engine />
+ <MultiStateEngine position="-7.6, 0, 19" template=spaceshipfs15engine />
</engines>
<attached>
- <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
- <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
- <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+ <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="HeartAttack.mesh" />
+ <!--BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+ <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 /-->
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 3, 5" />
- <BoxCollisionShape position="13,-1.3,0" halfExtents="3, 1, 2" />
- <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
- <BoxCollisionShape position="0,0,7" halfExtents="3, 2, 2" />
- <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
- <BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
+ <BoxCollisionShape position="0,0.8,6" halfExtents="12, 3, 10" />
+ <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
+ <BoxCollisionShape position="4.7,1,-8" halfExtents="2, 3, 5" />
+ <BoxCollisionShape position="-4.7,1,-8" halfExtents="2, 3, 5" />
+ <BoxCollisionShape position="13.5,1,5" halfExtents="1.4, 3, 7" />
+ <BoxCollisionShape position="-13.5,1,5" halfExtents="1.4, 3, 7" />
+ <BoxCollisionShape position="16,2,4" halfExtents="1.4, 1.5, 4" />
+ <BoxCollisionShape position="-16,2,4" halfExtents="1.4, 1.5, 4" />
+ <BoxCollisionShape position="-2.8,5,4" halfExtents="1.4, 1.5, 2" />
+ <BoxCollisionShape position="2.8,5,4" halfExtents="1.4, 1.5, 2" />
+ <BoxCollisionShape position="5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
+ <BoxCollisionShape position="-5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
</collisionShapes>
<?lua
include("../includes/weaponSettingsFS15.oxi")
@@ -65,7 +71,7 @@
<Template name=spaceshipfs15cameras 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 />
</camerapositions>
@@ -84,8 +90,8 @@
defEngineSndNormal = "sounds/Engine_low.ogg"
defEngineSndBoost = "sounds/Engine_high.ogg"
- accelerationfront = 500
- accelerationbrake = 500
+ accelerationfront = 420
+ accelerationbrake = 420
accelerationback = 125
accelerationleftright = 125
accelerationupdown = 125
@@ -94,26 +100,26 @@
<WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
</EffectContainer>
<EffectContainer condition="not idle">
- <FadingBillboard mainstate=activity active=false scale=0.1 position="7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.1 position="-7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="4, 1.9, 19" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="-4, 1.9, 19" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
</EffectContainer>
<EffectContainer condition="normal or brake">
</EffectContainer>
<EffectContainer condition="normal or boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 4, 1.9, 19" colour="0.6, 0.2, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-4, 1.9, 19" colour="0.6, 0.2, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
</EffectContainer>
<EffectContainer condition="boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 4, 1.9, 19" colour="1, 0, 0, 0.5" width=20 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-4, 1.9, 19" colour="1, 0, 0, 1" width=20 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
</EffectContainer>
-<!-- <EffectContainer condition="brake">
- <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.15 position=" 8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ <EffectContainer condition="brake">
+ <FadingBillboard mainstate=activity active=false scale=0.3 position=" 4, 1.9, 19" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.3 position="-4, 1.9, 19" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position=" 4, 1.9, 19" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position="-4, 1.9, 19" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
</EffectContainer>
--->
+
</MultiStateEngine>
</Template>
Modified: code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt
===================================================================
--- code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-05-27 11:11:01 UTC (rev 10498)
@@ -1,7 +1,7 @@
<Template name=spaceshipHeartAttack>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipassffcameras
+ camerapositiontemplate = spaceshipheartattackcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
@@ -68,10 +68,10 @@
</SpaceShip>
</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 />
</camerapositions>
Modified: code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt
===================================================================
--- code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt 2015-05-27 08:45:56 UTC (rev 10497)
+++ code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt 2015-05-27 11:11:01 UTC (rev 10498)
@@ -1,7 +1,7 @@
<Template name=spaceshipring>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipescortcameras
+ camerapositiontemplate = spaceshipringcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 4
@@ -38,8 +38,8 @@
angularDamping = 0.9999999
>
<engines>
- <MultiStateEngine position=" 7.6, 0, 0" template=spaceshipescortengine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
+ <MultiStateEngine position=" 7.6, 0, 0" template=spaceshipringengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipringengine />
</engines>
<attached>
<Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="ship.mesh" />
@@ -62,7 +62,7 @@
</SpaceShip>
</Template>
-<Template name=spaceshipescortcameras defaults=0>
+<Template name=spaceshipringcameras defaults=0>
<SpaceShip>
<camerapositions>
<CameraPosition position="0,15, 60" drag=true mouselook=true />
@@ -72,7 +72,7 @@
</SpaceShip>
</Template>
-<Template name=spaceshipescortengine baseclass=MultiStateEngine>
+<Template name=spaceshipringengine baseclass=MultiStateEngine>
<MultiStateEngine
boostfactor = 2.2
More information about the Orxonox-commit
mailing list