[Orxonox-commit 4196] r8867 - in code/trunk/data/levels: . includes

[jo at orxonox.net]

Author: jo
Date: 2011-08-25 16:10:25 +0200 (Thu, 25 Aug 2011)
New Revision: 8867

Modified:
   code/trunk/data/levels/fightInOurBack.oxw
   code/trunk/data/levels/includes/weaponSettingsAssff.oxi
   code/trunk/data/levels/includes/weaponSettingsTransporter.oxi
Log:
Transporter's weaponsystem updated.

Modified: code/trunk/data/levels/fightInOurBack.oxw
===================================================================
--- code/trunk/data/levels/fightInOurBack.oxw	2011-08-24 13:28:55 UTC (rev 8866)
+++ code/trunk/data/levels/fightInOurBack.oxw	2011-08-25 14:10:25 UTC (rev 8867)
@@ -213,7 +213,7 @@
 
 <?lua for i=0,0,1 do
 x=800
-health=2750
+health=2050
 ?>
     <!--Transporter 1-->
     <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
@@ -285,7 +285,7 @@
              </controller>
         </SpaceShip>
         <!--Second Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,100" lookat="2000,0,-950" health="400" maxhealth="400" initialhealth="400" >
+        <SpaceShip position="0,0,100" lookat="2000,0,-950" health="500" maxhealth="400" initialhealth="400" >
              <templates>
                   <Template link=spaceshipassff />
             </templates>
@@ -302,7 +302,7 @@
              </controller>
         </SpaceShip>
         <!--third Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,-100" lookat="2000,0,-1050" health="400" maxhealth="400" initialhealth="400" >
+        <SpaceShip position="0,0,-100" lookat="2000,0,-1050" health="500" maxhealth="400" initialhealth="400" >
              <templates>
                   <Template link=spaceshipassff />
             </templates>
@@ -366,7 +366,7 @@
     <DistanceTrigger name="activateTeam0No1" position="8000,0,3100" distance="1000" target="Pawn" beaconMode="identify" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
 
 <!--TEAM NO 1 (activationType : distance || killing a spaceship what belongs to TEAM 0 NO 0)-->
-<?lua for i=0,9,1 do
+<?lua for i=0,14,1 do
 x=math.random(-500,500)
 y=math.random(-300,300)
 z=math.random(-300,300)
@@ -379,7 +379,7 @@
                         <Template link=spaceshipassff />
                     </templates>
                     <controller>
-                        <WaypointPatrolController alertnessradius=2000 team=0 active=false>
+                        <WaypointPatrolController alertnessradius=2100 team=0 active=false>
                             <waypoints>
                                 <Model mesh="cube.mesh" scale=0 position="<?lua print(4500+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
                                 <Model mesh="cube.mesh" scale=0 position="<?lua print(x-4000) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />

Modified: code/trunk/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsAssff.oxi	2011-08-24 13:28:55 UTC (rev 8866)
+++ code/trunk/data/levels/includes/weaponSettingsAssff.oxi	2011-08-25 14:10:25 UTC (rev 8867)
@@ -23,7 +23,7 @@
             <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
             <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
           </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+          <HsW01 mode=0z munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
         </Weapon>

Modified: code/trunk/data/levels/includes/weaponSettingsTransporter.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsTransporter.oxi	2011-08-24 13:28:55 UTC (rev 8866)
+++ code/trunk/data/levels/includes/weaponSettingsTransporter.oxi	2011-08-25 14:10:25 UTC (rev 8867)
@@ -13,14 +13,14 @@
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0 damage=2.5 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.1 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset="0,0,0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0"   damage=3.14159 shielddamage=20 />
         </Weapon>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0  damage=2.5 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.1 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0,0,0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0"   damage=3.14159 shielddamage=20 />
         </Weapon>
       </WeaponPack>
     </weapons>