[Orxonox-commit 3919] r8593 - in code/branches/presentation/data/levels: . templates
dafrick at orxonox.net
dafrick at orxonox.net
Thu May 26 13:53:53 CEST 2011
Author: dafrick
Date: 2011-05-26 13:53:52 +0200 (Thu, 26 May 2011)
New Revision: 8593
Modified:
code/branches/presentation/data/levels/emptyLevel.oxw
code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
Log:
Adjusting Assff2 to fit new engines.
Modified: code/branches/presentation/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/presentation/data/levels/emptyLevel.oxw 2011-05-26 11:44:06 UTC (rev 8592)
+++ code/branches/presentation/data/levels/emptyLevel.oxw 2011-05-26 11:53:52 UTC (rev 8593)
@@ -11,7 +11,7 @@
?>
<?lua
- include("templates/spaceshipAssff.oxt")
+ include("templates/spaceshipAssff2.oxt")
include("templates/spaceshipPirate.oxt")
?>
@@ -29,7 +29,7 @@
>
<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=spaceshipassff />
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
</Scene>
</Level>
Modified: code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt 2011-05-26 11:44:06 UTC (rev 8592)
+++ code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt 2011-05-26 11:53:52 UTC (rev 8593)
@@ -2,7 +2,6 @@
<SpaceShip
hudtemplate = spaceshiphud
camerapositiontemplate = spaceshipassffcameras2
- engine = spaceshipassffengine2
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
@@ -11,15 +10,34 @@
maxhealth = 100
initialhealth = 50
+ shieldhealth = 130
+ initialshieldhealth = 130
+ maxshieldhealth = 150
+ shieldabsorption = 0.95
+ reloadrate = 5
+ reloadwaittime = 0.5
+
primaryThrust = 100;
auxilaryThrust = 30;
rotationThrust = 25;
+ boostPower = 10
+ boostPowerRate = 1
+ boostRate = 5
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 7
+
collisionType = "dynamic"
mass = 100
linearDamping = 0.7
angularDamping = 0.9999999
>
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine2 />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine2 />
+ </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 />
@@ -76,28 +94,64 @@
<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="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-<!--
- <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
- <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
--->
+ <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 />
</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=" 7.6, 0, 0" 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, 0" 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" />
</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" />
</EffectContainer>
- <EffectContainer condition="brake">
+<!-- <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>
+-->
</MultiStateEngine>
</Template>
+
+<!--Template name=spaceshippirate>
+ <SpaceShip
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ maxspeed = 250
+ maxsecondaryspeed = 50
+ maxrotation = 100
+ transacc = 200
+ rotacc = 140
+ transdamp = 75
+ >
+ <attached>
+ <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+ </attached>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+ <SpaceShip
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ maxspeed = 250
+ maxsecondaryspeed = 50
+ maxrotation = 100
+ transacc = 200
+ rotacc = 140
+ transdamp = 75
+ >
+ <attached>
+ <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+ </attached>
+ </SpaceShip>
+</Template-->
More information about the Orxonox-commit
mailing list