Changeset 10044 for code/branches/turretFS14/data

Timestamp:

May 6, 2014, 11:07:07 AM (11 years ago)

Author:

muemart

Message:

Move everything back to the Turret class, set the correct team, and (re)arm the turret. Also, hide it from the radar.

Location:

code/branches/turretFS14/data/levels

Files:

• includes/weaponSettingsTurretTest.oxi (modified) (1 diff)
• templates/spaceshipAssff.oxt (modified) (1 diff)
• templates/spaceshipTurretTest.oxt (modified) (1 diff)
• turretTest.oxw (modified) (2 diffs)

code/branches/turretFS14/data/levels/includes/weaponSettingsTurretTest.oxi

@@ -14 +14 @@
             <Model mesh="sphere.mesh" position="3,3,-2.2" scale=0.6 />
           </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset=" 3, 3,-2.2" />
-          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset=" 3,-3,-2.2" />
-          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset="-3, 3,-2.2" />
-          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset="-3,-3,-2.2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset=" 30, 3,-2.2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset=" 30,-3,-2.2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset="-30, 3,-2.2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0 damage=0 material="Flares/point_lensflare" muzzleoffset="-30,-3,-2.2" />
         </Weapon>
       </WeaponPack>

code/branches/turretFS14/data/levels/templates/spaceshipAssff.oxt

@@ -48 +48 @@
       <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
       <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-
-               <!-- <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
-            <templates>
-              <Template link=spaceshipturrettest />
-            </templates>
-            <controller>
-              <TurretController team=10 />
-            </controller>
-        </Turret> -->
-
     </attached>
     <collisionShapes>

code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt

@@ -7 +7 @@
         <SphereCollisionShape radius="10"   position = "0,0,0"/>
     </collisionShapes>
-  </Turret>
 <?lua
   include("../includes/weaponSettingsTurretTest.oxi")
 ?>
+  </Turret>
 </Template>
 

code/branches/turretFS14/data/levels/turretTest.oxw

@@ -59 +59 @@
     </attached>
 </SpaceShip> -->
+
+
 <StaticEntity position="100,0,0">
   <attached>
@@ -67 +69 @@
     <Model mesh="sphere.mesh" position="0,0,30" scale=2/>
   </attached>
+  
 </StaticEntity>
 <SpaceShip position="100,0,0" yaw=0 pitch=90>