[Orxonox-commit 3271] r7962 - code/branches/usability/data/levels
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Feb 26 06:40:45 CET 2011
Author: rgrieder
Date: 2011-02-26 06:40:44 +0100 (Sat, 26 Feb 2011)
New Revision: 7962
Modified:
code/branches/usability/data/levels/FPSTest.oxw
code/branches/usability/data/levels/asteroids.oxw
code/branches/usability/data/levels/dynamicMatch.oxw
code/branches/usability/data/levels/fightInOurBack.oxw
code/branches/usability/data/levels/lastManStanding.oxw
code/branches/usability/data/levels/presentation09.oxw
code/branches/usability/data/levels/presentation09b.oxw
code/branches/usability/data/levels/presentationDM.oxw
code/branches/usability/data/levels/presentationHS09.oxw
code/branches/usability/data/levels/presentationHS09b.oxw
code/branches/usability/data/levels/teamBaseMatch.oxw
code/branches/usability/data/levels/testSwallow.oxw
code/branches/usability/data/levels/underAttack.oxw
Log:
Added some meaningless quotation marks. Does not make a difference at all...
Modified: code/branches/usability/data/levels/FPSTest.oxw
===================================================================
--- code/branches/usability/data/levels/FPSTest.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/FPSTest.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -56,7 +56,7 @@
?>
<MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 100) ?>" />
Modified: code/branches/usability/data/levels/asteroids.oxw
===================================================================
--- code/branches/usability/data/levels/asteroids.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/asteroids.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -34,12 +34,12 @@
collisionType = dynamic
linearDamping = 0.8
angularDamping = 0
- scale = <?lua print(j * 150)?>
+ scale = "<?lua print(j * 150)?>"
collisiondamage = 1
enablecollisiondamage = true
>
<attached>
- <Model mass=<?lua print(j * 1000) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model mass="<?lua print(j * 1000) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 350) ?>" />
Modified: code/branches/usability/data/levels/dynamicMatch.oxw
===================================================================
--- code/branches/usability/data/levels/dynamicMatch.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/dynamicMatch.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -79,9 +79,9 @@
j = math.random()
?>
- <StaticEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" scale=<?lua print(j * 5) ?> >
+ <StaticEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" scale="<?lua print(j * 5) ?>" >
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
<attached><!-- ---------asteroid fog----- -->
<ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
</attached>
Modified: code/branches/usability/data/levels/fightInOurBack.oxw
===================================================================
--- code/branches/usability/data/levels/fightInOurBack.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/fightInOurBack.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -171,7 +171,7 @@
<EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
<events>
<trigger>
- <SpaceShip position="<?lua print(3800-i*x) ?>,0,3000" lookat="<?lua print(4800-i*x) ?>,0,4000" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
+ <SpaceShip position="<?lua print(3800-i*x) ?>,0,3000" lookat="<?lua print(4800-i*x) ?>,0,4000" health="<?lua print(health) ?>" maxhealth="<?lua print(health) ?>" initialhealth="<?lua print(health) ?>" >
<templates>
<Template link=spaceshipTransporter />
</templates>
@@ -198,7 +198,7 @@
<EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
<events>
<trigger>
- <SpaceShip position="<?lua print(2600+x) ?>,0,<?lua print(3150-z) ?>" lookat="<?lua print(3500+x) ?>,0,<?lua print(4150-z) ?>" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
+ <SpaceShip position="<?lua print(2600+x) ?>,0,<?lua print(3150-z) ?>" lookat="<?lua print(3500+x) ?>,0,<?lua print(4150-z) ?>" health="<?lua print(health) ?>" maxhealth="<?lua print(health) ?>" initialhealth="<?lua print(health) ?>" >
<templates>
<Template link=spaceshipTransporter />
</templates>
@@ -283,7 +283,7 @@
?>
<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>">
<attached>
- <Model scale=<?lua print(scale) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
+ <Model scale="<?lua print(scale) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
@@ -302,7 +302,7 @@
?>
<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>" >
<attached>
- <Model scale=<?lua print(math.random(20,70)) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
+ <Model scale="<?lua print(math.random(20,70)) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
Modified: code/branches/usability/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/usability/data/levels/lastManStanding.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/lastManStanding.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -75,7 +75,7 @@
<SpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
</Model>
@@ -85,7 +85,7 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
</Model>
@@ -95,7 +95,7 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
</Model>
@@ -105,7 +105,7 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
</Model>
@@ -115,7 +115,7 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
</Model>
@@ -126,7 +126,7 @@
</StaticEntity>
<!-- ---------Top Asteroid----------- -->
- <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale=<?lua print(j * 2.1) ?> pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
+ <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale="<?lua print(j * 2.1) ?>" pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
<attached>
<Model position="0,0,0" scale=25 mesh="ast6.mesh">
</Model>
Modified: code/branches/usability/data/levels/presentation09.oxw
===================================================================
--- code/branches/usability/data/levels/presentation09.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/presentation09.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -46,9 +46,9 @@
j = math.random()
?>
- <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass="<?lua print(j * 50) ?>" <?lua end ?> scale="<?lua print(j * 5) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<?lua if i == 5 then ?><collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
Modified: code/branches/usability/data/levels/presentation09b.oxw
===================================================================
--- code/branches/usability/data/levels/presentation09b.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/presentation09b.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -280,7 +280,7 @@
position="<?lua print(200-270/8*i)?> ,15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -290,7 +290,7 @@
position="<?lua print(200-270/8*i)?>,-15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -356,7 +356,7 @@
?>
<MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(s) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
</MovableEntity>
<?lua end ?>
Modified: code/branches/usability/data/levels/presentationDM.oxw
===================================================================
--- code/branches/usability/data/levels/presentationDM.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/presentationDM.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -45,9 +45,9 @@
for i = 1, 100, 1 do
j = math.random()
?>
- <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass="<?lua print(j * 50) ?>" scale="<?lua print(j * 5) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
Modified: code/branches/usability/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/usability/data/levels/presentationHS09.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/presentationHS09.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -192,7 +192,7 @@
<Template link=spaceshipassff />
</templates>
<controller>
- <WaypointPatrolController name=attacker alertnessradius=<?lua print(math.random() * 2000) ?> team=0 active=false>
+ <WaypointPatrolController name=attacker alertnessradius="<?lua print(math.random() * 2000) ?>" team=0 active=false>
<waypoints>
<StaticEntity position="<?lua print(2800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(1500 + math.random() * 500 - 250) ?>" />
<StaticEntity position="<?lua print(5000 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>" />
@@ -283,7 +283,7 @@
position="<?lua print(200-270/8*i)?> ,15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -293,7 +293,7 @@
position="<?lua print(200-270/8*i)?>,-15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -367,7 +367,7 @@
?>
<MovableEntity mass=90000 position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(s) ?> mesh="<?lua print(elements[e])?>" />
+ <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="<?lua print(elements[e])?>" />
</attached>
</MovableEntity>
<?lua end ?>
Modified: code/branches/usability/data/levels/presentationHS09b.oxw
===================================================================
--- code/branches/usability/data/levels/presentationHS09b.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/presentationHS09b.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -45,9 +45,9 @@
z = math.random() * 2000 - 1000
s = math.random() * 100
?>
- <MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
+ <MovableEntity collisiontype=dynamic mass="<?lua print(s*10)?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_UV.mesh" />
+ <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="asteroid_UV.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
@@ -144,7 +144,7 @@
position="<?lua print(200-270/8*i)?> ,15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -154,7 +154,7 @@
position="<?lua print(200-270/8*i)?>,-15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -202,9 +202,9 @@
z = math.random() * 2000 - 1000
s = math.random() * 100
?>
- <MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
+ <MovableEntity collisiontype=dynamic mass="<?lua print(s*10)?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_ice.mesh" />
+ <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="asteroid_ice.mesh" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="<?lua print(s*0.9)?>" />
Modified: code/branches/usability/data/levels/teamBaseMatch.oxw
===================================================================
--- code/branches/usability/data/levels/teamBaseMatch.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/teamBaseMatch.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -55,7 +55,7 @@
<?lua
for i = 1, 10, 1 do
?>
- <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+ <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay="<?lua print(math.random()) ?>" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events>
<spawn>
<EventListener event="base 1" />
@@ -96,7 +96,7 @@
<?lua
for i = 1, 10, 1 do
?>
- <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+ <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay="<?lua print(math.random()) ?>" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events>
<spawn>
<EventListener event="base 2" />
@@ -137,7 +137,7 @@
<?lua
for i = 1, 10, 1 do
?>
- <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+ <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay="<?lua print(math.random()) ?>" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events>
<spawn>
<EventListener event="base 3" />
@@ -177,7 +177,7 @@
<?lua
for i = 1, 10, 1 do
?>
- <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+ <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay="<?lua print(math.random()) ?>" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events>
<spawn>
<EventListener event="base 4" />
@@ -218,7 +218,7 @@
<?lua
for i = 1, 10, 1 do
?>
- <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+ <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay="<?lua print(math.random()) ?>" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
<events>
<spawn>
<EventListener event="base 5" />
Modified: code/branches/usability/data/levels/testSwallow.oxw
===================================================================
--- code/branches/usability/data/levels/testSwallow.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/testSwallow.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -45,9 +45,9 @@
j = math.random()
?>
- <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass="<?lua print(j * 50) ?>" <?lua end ?> scale="<?lua print(j * 5) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
</attached>
<?lua if i == 5 then ?><collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
Modified: code/branches/usability/data/levels/underAttack.oxw
===================================================================
--- code/branches/usability/data/levels/underAttack.oxw 2011-02-25 04:02:13 UTC (rev 7961)
+++ code/branches/usability/data/levels/underAttack.oxw 2011-02-26 05:40:44 UTC (rev 7962)
@@ -35,7 +35,7 @@
/>
</attached>
<collisionShapes>
- <SphereCollisionShape radius=<?lua print(x) ?> position="0,0,0" />
+ <SphereCollisionShape radius="<?lua print(x) ?>" position="0,0,0" />
</collisionShapes>
</MovableEntity>
<?lua end ?>
@@ -98,7 +98,7 @@
position="<?lua print(200-270/8*i)?> ,15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
@@ -108,7 +108,7 @@
position="<?lua print(200-270/8*i)?>,-15,2"
material="Examples/Flare"
colour="1.0, 0.5, 0.3"
- phase=<?lua print(-360/8*i)?>
+ phase="<?lua print(-360/8*i)?>"
amplitude=0.1
frequency=0.5
quadratic=1
More information about the Orxonox-commit
mailing list