[Orxonox-commit 5291] r9954 - in code/trunk/data/levels: . templates
landauf at orxonox.net
landauf at orxonox.net
Fri Jan 3 15:54:05 CET 2014
Author: landauf
Date: 2014-01-03 15:54:05 +0100 (Fri, 03 Jan 2014)
New Revision: 9954
Removed:
code/trunk/data/levels/templates/enemyInvaderShooter.oxt
Modified:
code/trunk/data/levels/Invaders.oxw
code/trunk/data/levels/templates/enemyInvader.oxt
Log:
moved all invader enemy templates into one file. fixed warning about duplicate definition of "spaceshipescortengine"
Modified: code/trunk/data/levels/Invaders.oxw
===================================================================
--- code/trunk/data/levels/Invaders.oxw 2014-01-03 14:45:57 UTC (rev 9953)
+++ code/trunk/data/levels/Invaders.oxw 2014-01-03 14:54:05 UTC (rev 9954)
@@ -14,7 +14,6 @@
include("templates/spaceshipPirate.oxt")
include("templates/spaceshipInvader.oxt")
include("templates/enemyInvader.oxt")
- include("templates/enemyInvaderShooter.oxt")
include("overlays/InvaderHUD.oxo")
?>
Modified: code/trunk/data/levels/templates/enemyInvader.oxt
===================================================================
--- code/trunk/data/levels/templates/enemyInvader.oxt 2014-01-03 14:45:57 UTC (rev 9953)
+++ code/trunk/data/levels/templates/enemyInvader.oxt 2014-01-03 14:54:05 UTC (rev 9954)
@@ -47,14 +47,6 @@
<attached>
<Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="swallow_mat.mesh" />
<Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
-<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
-
-swallow_mat.mesh
-"ghost.mesh"
-
-<Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
-<Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />
-<Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
</attached>
<collisionShapes>
<BoxCollisionShape position="0 ,0 , 3" halfExtents="10, 4,8" />
@@ -68,17 +60,68 @@
</InvaderEnemy>
</Template>
-<!-- <Template name=spaceshipescortcameras defaults=0>
- <InvaderEnemy>
- <camerapositions>
- <CameraPosition position="0,15, 60" drag=true mouselook=true />
- <CameraPosition position="0,20, 90" drag=true mouselook=true />
- <CameraPosition position="0,30,120" drag=true mouselook=true />
- <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false mouselook=true />
- </camerapositions>
- </InvaderEnemy>
-</Template> -->
+<Template name=enemyinvadershooter>
+ <InvaderEnemyShooter
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+ health = 20
+ maxhealth = 20
+ initialhealth = 20
+
+ shieldhealth = 20
+ initialshieldhealth = 20
+ maxshieldhealth = 20
+ shieldabsorption = 0.9
+ reloadrate = 1
+ reloadwaittime = 1
+
+ primaryThrust = 150
+ auxilaryThrust = 30
+ rotationThrust = 50
+
+ lift = 1;
+ stallSpeed = 220;
+
+ boostPower = 20
+ boostPowerRate = 1
+ boostRate = 5
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 6
+
+ collisionType = "dynamic"
+ mass = 100
+ linearDamping = 0
+ angularDamping = 0
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="ghost.mesh" />
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0 ,0 , 3" halfExtents="10, 4,8" />
+ <BoxCollisionShape position="12.6 ,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
+ </collisionShapes>
+<?lua
+ include("../includes/invaderWeaponEnemy.oxi")
+?>
+ </InvaderEnemyShooter>
+</Template>
+
<Template name=spaceshipescortengine baseclass=MultiStateEngine>
<MultiStateEngine
boostfactor = 2.2
Deleted: code/trunk/data/levels/templates/enemyInvaderShooter.oxt
===================================================================
--- code/trunk/data/levels/templates/enemyInvaderShooter.oxt 2014-01-03 14:45:57 UTC (rev 9953)
+++ code/trunk/data/levels/templates/enemyInvaderShooter.oxt 2014-01-03 14:54:05 UTC (rev 9954)
@@ -1,120 +0,0 @@
-<Template name=enemyinvadershooter>
- <InvaderEnemyShooter
- hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipescortcameras
- spawnparticlesource = "Orxonox/fairytwirl"
- spawnparticleduration = 3
- explosionchunks = 4
-
- health = 20
- maxhealth = 20
- initialhealth = 20
-
- shieldhealth = 20
- initialshieldhealth = 20
- maxshieldhealth = 20
- shieldabsorption = 0.9
- reloadrate = 1
- reloadwaittime = 1
-
- primaryThrust = 150
- auxilaryThrust = 30
- rotationThrust = 50
-
- lift = 1;
- stallSpeed = 220;
-
- boostPower = 20
- boostPowerRate = 1
- boostRate = 5
- boostCooldownDuration = 10
-
- shakeFrequency = 15
- shakeAmplitude = 6
-
- collisionType = "dynamic"
- mass = 100
- linearDamping = 0
- angularDamping = 0
-
- collisiondamage = 100
- enablecollisiondamage = true
- >
- <engines>
- <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
- </engines>
- <attached>
- <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="ghost.mesh" />
- <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
-<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
-
-swallow_mat.mesh
-"ghost.mesh"
-
-<Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
-<Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />
-<Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0 ,0 , 3" halfExtents="10, 4,8" />
- <BoxCollisionShape position="12.6 ,-2, 3" halfExtents="2.8,2.8,11"/>
- <BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
- <BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
- </collisionShapes>
-<?lua
- include("../includes/invaderWeaponEnemy.oxi")
-?>
- </InvaderEnemyShooter>
-</Template>
-
-<!-- <Template name=spaceshipescortcameras defaults=0>
- <InvaderEnemyShooter>
- <camerapositions>
- <CameraPosition position="0,15, 60" drag=true mouselook=true />
- <CameraPosition position="0,20, 90" drag=true mouselook=true />
- <CameraPosition position="0,30,120" drag=true mouselook=true />
- <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false mouselook=true />
- </camerapositions>
- </InvaderEnemyShooter>
-</Template> -->
-
-<Template name=spaceshipescortengine baseclass=MultiStateEngine>
- <MultiStateEngine
- boostfactor = 2.2
-
- speedfront = 200
- speedback = 70
- speedleftright = 70
- speedupdown = 70
-
- defEngineSndNormal = "sounds/Engine_low.ogg"
- defEngineSndBoost = "sounds/Engine_high.ogg"
-
- accelerationfront = 700
- accelerationbrake = 700
- accelerationback = 125
- accelerationleftright = 125
- accelerationupdown = 125
- >
- <EffectContainer condition="idle">
- <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
- </EffectContainer>
- <EffectContainer condition="not idle">
- <FadingBillboard mainstate=activity active=false scale=0.09 position="12, -2, 13" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
- <FadingBillboard mainstate=activity active=false scale=0.09 position="-12, -2, 13" colour="0.2, 1.0, 0.65, 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.33 name=bltest position=" 12, 0, 10" colour="0.2, 1.0, 0.65, 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.33 name=bltest position="-12, 0, 10" colour="0.2, 1.0, 0.65, 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.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
- </EffectContainer>
-
- </MultiStateEngine>
-</Template>
More information about the Orxonox-commit
mailing list