Changeset 10258 for code/trunk/data/levels/templates

Timestamp:

Feb 5, 2015, 11:47:13 PM (10 years ago)

Author:

landauf

Message:

merged presentationHS14merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/templates/DodgeRacePattern.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/DodgeRacePattern.oxt)
• data/levels/templates/FPS.oxt (modified) (1 diff)
• data/levels/templates/FPS_HS14.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/FPS_HS14.oxt)
• data/levels/templates/enemytowerdefense.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/enemytowerdefense.oxt)
• data/levels/templates/spaceshipDodgeRace.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/spaceshipDodgeRace.oxt)
• data/levels/templates/spacestation_elements.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/spacestation_elements.oxt)
• data/levels/templates/ss_tube01.oxt (copied) (copied from code/branches/presentationHS14merge/data/levels/templates/ss_tube01.oxt)
• data/levels/templates/tower.oxt (modified) (3 diffs)

code/trunk/data/levels/templates/FPS.oxt

@@ -21 +21 @@
    weapon            = "hs-w01.mesh"
   >
-    <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
+    <collisionShapes>                   <!-- old values: position="0,-20,0"  halfExtents="15,25,15"  -->
+      <BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
     </collisionShapes>
 

code/trunk/data/levels/templates/tower.oxt

@@ -1 +1 @@
 <Template name=tower>
-  <Tower
+  <TowerDefenseTower
 
 
@@ -20 +20 @@
         </WaypointPatrolController>
     </controller>
+    
 
 
     <attached>
         <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
+        
+        
     </attached>
 
@@ -33 +36 @@
   include("../includes/towerWeaponSettings.oxi")
 ?>
-  </Tower>
+  </TowerDefenseTower>
 </Template>
 
+
+
+<Template name=towerturret>
+  <TowerDefenseTower
+
+
+   explosionchunks        = 6
+
+   reloadrate          = 10
+   reloadwaittime      = 5
+
+   collisionType     = "dynamic"
+   team = 1
+
+
+  >
+  <attached>
+
+    <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
+
+    <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30>
+
+      <controller>
+        <TurretController/>
+      </controller>
+      <?lua
+        include("../includes/weaponSettingsTurret.oxi")
+      ?>
+    </Turret>
+    
+  </attached>
+    
+
+
+
+    <!--collisionShapes>
+
+    </collisionShapes-->
+
+<?lua
+  include("../includes/towerWeaponSettings.oxi")
+?>
+  </TowerDefenseTower>
+</Template>
+
+
+
+<Template name=towerturret1>
+  <TowerDefenseTower
+
+
+   explosionchunks        = 6
+
+   reloadrate          = 10
+   reloadwaittime      = 5
+
+   collisionType     = "dynamic"
+   team = 1
+
+
+  >
+  <attached>
+
+
+    <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30>
+
+      <controller>
+        <TurretController/>
+      </controller>
+      <?lua
+        include("../includes/weaponSettingsTurret1.oxi")
+      ?>
+    </Turret>
+    
+  </attached>
+    
+
+
+
+    <!--collisionShapes>
+
+    </collisionShapes-->
+
+<?lua
+  include("../includes/towerWeaponSettings.oxi")
+?>
+  </TowerDefenseTower>
+</Template>