[Orxonox-commit 5536] r10199 - code/branches/presentationFS14/data/levels/templates

[landauf at orxonox.net]

Author: landauf
Date: 2015-01-25 15:43:11 +0100 (Sun, 25 Jan 2015)
New Revision: 10199

Added:
   code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt
Removed:
   code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt
Log:
reverted spaceshipTurret.oxt to the old (and correct) version of r10071

Deleted: code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt
===================================================================
--- code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt	2015-01-25 14:39:30 UTC (rev 10198)
+++ code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt	2015-01-25 14:43:11 UTC (rev 10199)
@@ -1,40 +0,0 @@
-<Template name=standardturret>
-  <Turret collisionType="dynamic">
-    <attached>
-      <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" pitch=-90/>
-      <Model position="0,0,0" mesh="turretSocketIn.mesh" scale3D="10,10,10" pitch=-90/>
-      <Model position="0,0,0" mesh="turretSocketTop.mesh" scale3D="10,10,10" pitch=-90/>
-      <Model position="0,0,0" mesh="turretSocketLeft.mesh" scale3D="10,10,10" pitch=-90/>
-      <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" pitch=-90/>
-
-      <Turret position="0,0,-10" collisionType="dynamic" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
-        <attached>
-          <Model position="0,0,0" pitch="-90" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/>
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="10"   position = "0,0,0"/>
-        </collisionShapes>
-        <controller>
-          <TurretController/>
-        </controller>
-        <?lua
-          include("../includes/weaponSettingsTurret.oxi")
-        ?>
-      </Turret>
-    </attached>
-    
-    <controller>
-      <TeamTargetProxy/>
-    </controller>
-  </Turret>
-</Template>
-
-<Template name=spaceshipturretcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
-      <CameraPosition position="0,20, 80" drag=true mouselook=true />
-      <CameraPosition position="0,30,120" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
\ No newline at end of file

Copied: code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt (from rev 10071, code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt)
===================================================================
--- code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt	                        (rev 0)
+++ code/branches/presentationFS14/data/levels/templates/spaceshipTurret.oxt	2015-01-25 14:43:11 UTC (rev 10199)
@@ -0,0 +1,60 @@
+<Template name=spaceshipturret>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipturretcameras
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   shieldhealth        = 30
+   initialshieldhealth = 30
+   maxshieldhealth     = 50
+   shieldabsorption    = 0.8
+   reloadrate          = 1
+   reloadwaittime      = 1
+
+   primaryThrust     = 100
+   auxilaryThrust    = 30
+   rotationThrust    = 50
+
+   lift = 1;
+   stallSpeed = 220;
+
+   boostPower            = 15
+   boostPowerRate        = 1
+   boostRate             = 5
+   boostCooldownDuration = 10
+
+   shakeFrequency = 15
+   shakeAmplitude = 9
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+        <Model position="0,0,0" yaw="90" roll="-90" mesh="turretHead.mesh" scale3D="10,10,10"/>
+    </attached>
+    <collisionShapes>
+        <SphereCollisionShape radius="10"   position = "0,0,0"/>
+    </collisionShapes>
+<?lua
+  include("../includes/weaponSettingsTurret.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipturretcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,10, 40" drag=true mouselook=true />
+      <CameraPosition position="0,20, 80" drag=true mouselook=true />
+      <CameraPosition position="0,30,120" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>