[Orxonox-commit 2271] r6987 - in code/branches/dynamicmatch: data/levels data/overlays src/orxonox/gametypes
jo at orxonox.net
jo at orxonox.net
Thu May 27 20:46:00 CEST 2010
Author: jo
Date: 2010-05-27 20:46:00 +0200 (Thu, 27 May 2010)
New Revision: 6987
Modified:
code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw
code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo
code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc
Log:
additional infomassages, improved level
Modified: code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw
===================================================================
--- code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw 2010-05-27 17:52:28 UTC (rev 6986)
+++ code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw 2010-05-27 18:46:00 UTC (rev 6987)
@@ -17,21 +17,24 @@
>
<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" />
-<!-- Planet braucht noch Collisionshape und evtl. Gravitation-->
+<!-- ------------------Planet needs gravity----------------- -->
<Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
<StaticEntity position="0,0,0" collisionType=static>
<collisionShapes>
- <SphereCollisionShape radius="500" />
+ <SphereCollisionShape radius="499" />
</collisionShapes>
</StaticEntity>
-<!-- Die Spawnpoints sollten auf der Oberlaeche des Planeten sein, so verteilt, dass Spieler sich nicht sehen; spaeter: Teamspawnpoints fuer chaser!!-->
+<!-- -----------12-Spawnpoints around the planet------------- -->
<TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,-1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,0,1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,0,-1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<!--outer Spawnpoints -->
+<TeamSpawnPoint team=0 position="2000,0,0" lookat="0,0,1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="-2000,0,0" lookat="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,2000,0" lookat="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,-2000,0" lookat="0,-1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
<TeamSpawnPoint team=0 position="0,0,2000" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
@@ -40,7 +43,7 @@
<?lua
dofile("includes/CuboidSpaceStation.lua")
?>
-<!--Rotating satellite -->
+<!-- ----------------Rotating satellite--------------- -->
<MovableEntity position="1,1,1" rotationrate="-4.5" rotationaxis="0,0,1">
<attached>
<StaticEntity position="-2500,0,0" yaw=90 pitch=90>
@@ -56,31 +59,7 @@
</attached>
</MovableEntity>
-<!--particleTest
- <ParticleEmitter position="800,800,800" source="Orxonox/Steam" >
- </ParticleEmitter>
- <ParticleEmitter position="900,900,900" source="Orxonox/Steam" >
- </ParticleEmitter>
- <ParticleEmitter position="700,700,700" source="Orxonox/Steam" >
- </ParticleEmitter>
- <ParticleEmitter position="770,770,770" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,760,760" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,760,760" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,900,600" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,900,700" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,900,800" source="Orxonox/Steam" >
- </ParticleEmitter>
-<ParticleEmitter position="760,900,900" source="Orxonox/Steam" >
- </ParticleEmitter>
--->
-
-
-<!-- asteroid ellypse-->
+<!-- ---------------asteroid ellypse----------------- -->
<?lua
max = 20
for i = 1, max, 1
@@ -95,14 +74,18 @@
j = math.random()
?>
- <MovableEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" <?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) ?>">
+ <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>
+ </Model>
</attached>
<?lua if i == 5 then ?><collisionShapes>
<SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes> <?lua end ?>
- </MovableEntity>
+ </StaticEntity>
<?lua
end
?>
@@ -115,26 +98,22 @@
</visibility>
</events>
</GlobalShader>
-
-<!--
+<!-- ----------------random fog --- not in use
<?lua
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) ?>">
+ <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
<attached>
- <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
</attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
- </collisionShapes>
- </MovableEntity>
+ </StaticEntity>
+
<?lua
end
?>
-->
-
</Scene>
</Level>
Modified: code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo
===================================================================
--- code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo 2010-05-27 17:52:28 UTC (rev 6986)
+++ code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo 2010-05-27 18:46:00 UTC (rev 6987)
@@ -5,17 +5,17 @@
name = "staticmessage"
position = "0.5, 0.01"
font = "VeraMono"
- caption = "Instructions"
- textsize = 0.035
+ caption = ""
+ textsize = 0.033
colour = "1.0, 1.0, 0.5, 1.0"
align = "center"
/>
<GametypeFadingMessage
name = "fadingmessage"
- position = "0.25, 0.5"
+ position = "0.5, 0.05"
font = "VeraMono"
- textsize = 0.035
+ textsize = 0.04
colour = "1.0, 1.0, 0.5, 1.0"
align = "center"
/>
Modified: code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc 2010-05-27 17:52:28 UTC (rev 6986)
+++ code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc 2010-05-27 18:46:00 UTC (rev 6987)
@@ -125,6 +125,7 @@
if (it2 != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
}
}
if (notEnoughKillers) //reward the originator
@@ -139,6 +140,7 @@
if (it3 != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
}
}
}
@@ -167,6 +169,7 @@
if (it3 != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
}
}
evaluatePlayerParties(); //check if the party change has to trigger futher party changes
@@ -185,8 +188,10 @@
{
if (numberOf[killer]>0)
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID());
+
else
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it3->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a chaser.",it3->first->getClientID());
}
}
evaluatePlayerParties(); //check if the party change has to trigger futher party changes
@@ -228,11 +233,13 @@
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
else
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
}
std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
if (it2 != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
}
}
//Give new pig boost
@@ -260,11 +267,13 @@
if (it != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
}
std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
if (it2 != this->players_.end())
{
this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID());
+ this->gtinfo_->sendFadingMessage("You're now a killer.",it2->first->getClientID());
}
}
}
@@ -456,11 +465,18 @@
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
else
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
}
else if (it->second==piggy)
+ {
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
+ }
else if (it->second==killer)
+ {
this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+ }
}
}
@@ -498,11 +514,18 @@
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
else
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
}
else if (it->second==piggy)
+ {
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
+ }
else if (it->second==killer)
+ {
this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+ }
}
}
@@ -541,11 +564,18 @@
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
else
this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
}
else if (it->second==piggy)
+ {
this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
+ }
else if (it->second==killer)
+ {
this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+ //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+ }
}
}
More information about the Orxonox-commit
mailing list