[Orxonox-commit 361] r2126 - media/levels

[FelixSchulthess at orxonox.net]

Author: FelixSchulthess
Date: 2009-05-11 15:57:31 +0200 (Mon, 11 May 2009)
New Revision: 2126

Added:
   media/levels/weaponsettings_pirate.oxw
Modified:
   media/levels/spaceshiptemplates_pirate.oxw
Log:
weapons for pirateship

Modified: media/levels/spaceshiptemplates_pirate.oxw
===================================================================
--- media/levels/spaceshiptemplates_pirate.oxw	2009-05-11 13:44:10 UTC (rev 2125)
+++ media/levels/spaceshiptemplates_pirate.oxw	2009-05-11 13:57:31 UTC (rev 2126)
@@ -22,8 +22,10 @@
   >
     <attached>
       <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-      <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 />
+      <BlinkingBillboard position=" 12.6,-3.9,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.051 frequency=1 quadratic=1 />
+      <BlinkingBillboard position="-12.6,-3.9,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.051 frequency=1 quadratic=1 />
+      <BlinkingBillboard position=" 7,-1,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.051 frequency=1 quadratic=1 />
+      <BlinkingBillboard position="-7,-1,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.051 frequency=1 quadratic=1 />
     </attached>
     <collisionShapes>
       <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
@@ -33,8 +35,9 @@
       <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes>
+
 <?lua
-  include("levels/weaponsettings1.oxw")
+  include("levels/weaponsettings_pirate.oxw")
 ?>
   </SpaceShip>
 </Template>
@@ -45,7 +48,7 @@
       <CameraPosition position="0,8, 60" drag=true mouselook=true />
       <CameraPosition position="0,16, 120" drag=true mouselook=true />
       <CameraPosition position="0,24,180" drag=true mouselook=true />
-      <CameraPosition position="0,60,20" pitch="-80" drag=true mouselook=true />
+      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
     </camerapositions>
   </SpaceShip>
 </Template>
@@ -66,9 +69,9 @@
    accelerationupdown    =  125
   >
     <active>
-      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 2, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
       <FadingBillboard mainstate=activity active=false scale=0.02 position=" 0, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.02 position="-2, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position="-1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
     </active>
     <forward>
       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />

Added: media/levels/weaponsettings_pirate.oxw
===================================================================
--- media/levels/weaponsettings_pirate.oxw	                        (rev 0)
+++ media/levels/weaponsettings_pirate.oxw	2009-05-11 13:57:31 UTC (rev 2126)
@@ -0,0 +1,28 @@
+    <weaponslots>
+      <WeaponSlot position=" 4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="-4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack firemode=0>
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+    </weapons>