Changeset 9372 for code/branches

Timestamp:

Sep 6, 2012, 3:00:38 PM (12 years ago)

Author:

jo

Message:

Small improvements; adjusting values for better playfeeling. An irregular error occured concerning the SpaceBoundaries. Hopefully attaching the SpaceBoundary to the Transporter solves the problem.

Location:

code/branches/release2012

Files:

• data/levels/underAttack.oxw (modified) (2 diffs)
• src/orxonox/gametypes/UnderAttack.cc (modified) (1 diff)

code/branches/release2012/data/levels/underAttack.oxw

@@ -46 +46 @@
     <?lua end ?>
 
-<!--- A SpaceBoundary moving along with the transporter, in order to filter out bots that are too far away from the transporter ---->
-      <MovableEntity
-          position="0,0,0"
-          velocity="-35,0,0"
-      >
-        <attached>
-            <SpaceBoundaries position="1,2,3" maxDistance="1600" warnDistance="300" showDistance="300" reactionMode="1" healthDecrease="5.0" />
-          <BlinkingBillboard
-            position="0,0,0"
-            material="Flares/ringflare2"
-            colour="1.0, 0.5, 0.3"
-            phase="-180"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-        </attached>
-      </MovableEntity>
-
 
     <Destroyer
@@ -79 +60 @@
 
       <attached>
+        <SpaceBoundaries position="1,2,3" maxDistance="1600" warnDistance="300" showDistance="300" reactionMode="1" healthDecrease="5.0" />
         <TeamSpawnPoint team=1 position="200,0,20" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
         <TeamSpawnPoint team=1 position="50,0,100" lookat="-1,0,0" roll="90"  yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <TeamSpawnPoint team=1 position="-200,0,20" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <TeamSpawnPoint team=1 position="-200,0,-60" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
         <TeamSpawnPoint team=1 position="100,0,-50" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
         <TeamSpawnPoint team=1 position="400,0,20" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />

code/branches/release2012/src/orxonox/gametypes/UnderAttack.cc

@@ -207 +207 @@
             //Each defender prevents 500 damage. If human 2000 damage will be additionally be prevented.
             //TODO: use gametime and the damage dealt so far in order to calculate the transporter's life more precisely
-            float health = this->getTeamSize(attacker_)*3500.0f + this->getHumansInTeam(attacker_)*1500.0f - this->getTeamSize(defender_)*500.0f - this->getHumansInTeam(defender_)*2000.0f ;
+            float health = this->getTeamSize(attacker_)*2000.0f + this->getHumansInTeam(attacker_)*3000.0f - this->getTeamSize(defender_)*500.0f - this->getHumansInTeam(defender_)*2000.0f ;
             this->destroyer_->setHealth(std::max(health, 5000.0f)); //the destoyer should have at least 5000.0f life. 
         }