[Orxonox-commit 5938] r10597 - in code/branches/clangenb/data/levels: includes templates
landauf at orxonox.net
landauf at orxonox.net
Sun Sep 27 13:56:59 CEST 2015
Author: landauf
Date: 2015-09-27 13:56:58 +0200 (Sun, 27 Sep 2015)
New Revision: 10597
Modified:
code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi
code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt
Log:
cleanup: tabs->spaces
Modified: code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi
===================================================================
--- code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi 2015-09-27 10:32:52 UTC (rev 10596)
+++ code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi 2015-09-27 11:56:58 UTC (rev 10597)
@@ -1,8 +1,8 @@
<weaponslots>
- <WeaponSlot position=" 0, 0, 0" />
- <WeaponSlot position=" 0, 0, 0" />
- <WeaponSlot position=" 0, 0, 0" />
- <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
+ <WeaponSlot position=" 0, 0, 0" />
</weaponslots>
<weaponsets>
<WeaponSet firemode=0 />
@@ -19,27 +19,24 @@
<DefaultWeaponmodeLink firemode=3 weaponmode=3 />
</links>
<Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
</Weapon>
<Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
</Weapon>
<Weapon>
- <LaserFire mode=1 munitionpershot=0 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
- <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
-
+ <LaserFire mode=1 munitionpershot=0 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
+ <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
</Weapon>
- <Weapon>
-
-
- </Weapon>
+ <Weapon>
+ </Weapon>
</WeaponPack>
<WeaponPack>
<links>
Modified: code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt
===================================================================
--- code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt 2015-09-27 10:32:52 UTC (rev 10596)
+++ code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt 2015-09-27 11:56:58 UTC (rev 10597)
@@ -49,18 +49,18 @@
<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 /-->
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,0.8,6" halfExtents="12, 3, 10" />
- <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
- <BoxCollisionShape position="4.7,1,-8" halfExtents="2, 3, 5" />
- <BoxCollisionShape position="-4.7,1,-8" halfExtents="2, 3, 5" />
- <BoxCollisionShape position="13.5,1,5" halfExtents="1.4, 3, 7" />
- <BoxCollisionShape position="-13.5,1,5" halfExtents="1.4, 3, 7" />
- <BoxCollisionShape position="16,2,4" halfExtents="1.4, 1.5, 4" />
- <BoxCollisionShape position="-16,2,4" halfExtents="1.4, 1.5, 4" />
- <BoxCollisionShape position="-2.8,5,4" halfExtents="1.4, 1.5, 2" />
- <BoxCollisionShape position="2.8,5,4" halfExtents="1.4, 1.5, 2" />
- <BoxCollisionShape position="5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
- <BoxCollisionShape position="-5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
+ <BoxCollisionShape position="0,0.8,6" halfExtents="12, 3, 10" />
+ <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
+ <BoxCollisionShape position="4.7,1,-8" halfExtents="2, 3, 5" />
+ <BoxCollisionShape position="-4.7,1,-8" halfExtents="2, 3, 5" />
+ <BoxCollisionShape position="13.5,1,5" halfExtents="1.4, 3, 7" />
+ <BoxCollisionShape position="-13.5,1,5" halfExtents="1.4, 3, 7" />
+ <BoxCollisionShape position="16,2,4" halfExtents="1.4, 1.5, 4" />
+ <BoxCollisionShape position="-16,2,4" halfExtents="1.4, 1.5, 4" />
+ <BoxCollisionShape position="-2.8,5,4" halfExtents="1.4, 1.5, 2" />
+ <BoxCollisionShape position="2.8,5,4" halfExtents="1.4, 1.5, 2" />
+ <BoxCollisionShape position="5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
+ <BoxCollisionShape position="-5,5,4.3" halfExtents="1.4, 1.5, 1.4" />
</collisionShapes>
<?lua
include("../includes/weaponSettingsHeartAttack.oxi")
More information about the Orxonox-commit
mailing list