[Orxonox-commit 4849] r9518 - in code/branches/presentationHS12/data/levels: . includes templates
jo at orxonox.net
jo at orxonox.net
Sat Dec 15 16:44:10 CET 2012
Author: jo
Date: 2012-12-15 16:44:09 +0100 (Sat, 15 Dec 2012)
New Revision: 9518
Modified:
code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw
code/branches/presentationHS12/data/levels/emptyLevel.oxw
code/branches/presentationHS12/data/levels/includes/weaponSettingsEscort.oxi
code/branches/presentationHS12/data/levels/templates/bigship.oxt
code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt
code/branches/presentationHS12/data/levels/templates/spaceshipEscort.oxt
code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt
Log:
Small adjustmenst on the new SpaceShip Templates and Weaponsettings.
Modified: code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw
===================================================================
--- code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/collateralDamageDemo.oxw 2012-12-15 15:44:09 UTC (rev 9518)
@@ -12,7 +12,7 @@
?>
<?lua
- include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipAssff.oxt")
include("templates/spaceshipPirate.oxt")
include("templates/spaceshipCollateralDamage.oxt")
?>
Modified: code/branches/presentationHS12/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/presentationHS12/data/levels/emptyLevel.oxw 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/emptyLevel.oxw 2012-12-15 15:44:09 UTC (rev 9518)
@@ -1,7 +1,7 @@
<LevelInfo
- name = "Empty level"
- description = "A level with absolutely nothing in it."
- tags = "test"
+ name = "Presentation HS 2012"
+ description = "Orxonox Proudly Presents"
+ tags = "presentation"
screenshot = "emptylevel.png"
/>
Modified: code/branches/presentationHS12/data/levels/includes/weaponSettingsEscort.oxi
===================================================================
--- code/branches/presentationHS12/data/levels/includes/weaponSettingsEscort.oxi 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/includes/weaponSettingsEscort.oxi 2012-12-15 15:44:09 UTC (rev 9518)
@@ -13,24 +13,12 @@
<DefaultWeaponmodeLink firemode=1 weaponmode=1 />
</links>
<Weapon>
- <attached>
- <!--Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,0,0" />
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 /-->
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam.mesh" />
+ <!--HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam.mesh" /-->
</Weapon>
<Weapon>
- <attached>
- <!--Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,0,0" />
- <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 /-->
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam.mesh" />
+ <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam.mesh" /-->
</Weapon>
</WeaponPack>
<WeaponPack>
Modified: code/branches/presentationHS12/data/levels/templates/bigship.oxt
===================================================================
--- code/branches/presentationHS12/data/levels/templates/bigship.oxt 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/templates/bigship.oxt 2012-12-15 15:44:09 UTC (rev 9518)
@@ -1,7 +1,7 @@
<Template name=bigship>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipassffcameras
+ camerapositiontemplate = bigshipcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
@@ -24,9 +24,9 @@
lift = 1;
stallSpeed = 220;
- boostPower = 15
- boostPowerRate = 1
- boostRate = 5
+ boostPower = 30
+ boostPowerRate = 1.5
+ boostRate = 4
boostCooldownDuration = 10
shakeFrequency = 15
@@ -38,8 +38,8 @@
angularDamping = 0.9999999
>
<engines>
- <MultiStateEngine position=" 15, 0, 0" template=spaceshipassffengine />
- <MultiStateEngine position="-15, 0, 0" template=spaceshipassffengine />
+ <MultiStateEngine position=" 15, 0, 0" template=bigshipengine />
+ <MultiStateEngine position="-15, 0, 0" template=bigshipengine />
</engines>
<attached>
@@ -88,17 +88,17 @@
</SpaceShip>
</Template>
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=bigshipcameras defaults=0>
<SpaceShip>
<camerapositions>
<CameraPosition position="0,30, 50" drag=true mouselook=true />
- <CameraPosition position="0,40, 80" drag=true mouselook=true />
<CameraPosition position="0,10,80" drag=true mouselook=true />
+ <CameraPosition position="0,40,120" drag=true mouselook=true />
</camerapositions>
</SpaceShip>
</Template>
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+<Template name=bigshipengine baseclass=MultiStateEngine>
<MultiStateEngine
boostfactor = 2
Modified: code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt
===================================================================
--- code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/templates/spaceshipCollateralDamage.oxt 2012-12-15 15:44:09 UTC (rev 9518)
@@ -2,14 +2,14 @@
<Template name=spaceshipcollateraldamage>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipassffcameras
+ camerapositiontemplate = spaceshipCDcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
- health = 100
- maxhealth = 200
- initialhealth = 100
+ health = 200
+ maxhealth = 400
+ initialhealth = 200
shieldhealth = 30
initialshieldhealth = 30
@@ -39,8 +39,8 @@
angularDamping = 0.9999999
>
<engines>
- <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipCDengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipCDengine />
</engines>
<attached>
<Model position="0,0,0" yaw=-90 pitch=0 roll=0 scale=4 mesh="collateralDamage.mesh" />
@@ -70,7 +70,7 @@
</SpaceShip>
</Template>
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=spaceshipCDcameras defaults=0>
<SpaceShip>
<camerapositions>
<CameraPosition position="0,10, 40" drag=true mouselook=true />
@@ -81,7 +81,7 @@
</SpaceShip>
</Template>
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+<Template name=spaceshipCDengine baseclass=MultiStateEngine>
<MultiStateEngine
boostfactor = 5
@@ -117,8 +117,8 @@
</EffectContainer>
<EffectContainer condition="normal or boost">
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 8, 0, 12" colour="1, 0.8, 0, 0.3" width=6 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=3 turnofftime=1 material="Flares/ThrusterFlare2" />
- <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-8, 0, 12" colour="1, 0.8, 0, 0.3" width=6 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=3 turnofftime=1 material="Flares/ThrusterFlare2" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 8, 0, 12" colour="1, 0.8, 0, 0.3" width=6 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=3 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-8, 0, 12" colour="1, 0.8, 0, 0.3" width=6 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=3 turnofftime=1 material="Flares/ThrusterFlare1" />
<FadingBillboard mainstate=activity active=false scale=0.05 position="8, -1, 12" colour="1, 0.8, 0, 0.3" material="Examples/Flare" turnontime=1 turnofftime=0.5 />
<FadingBillboard mainstate=activity active=false scale=0.05 position="-8, -1, 12" colour="1, 0.8, 0, 0.3" material="Examples/Flare" turnontime=1 turnofftime=0.5 />
Modified: code/branches/presentationHS12/data/levels/templates/spaceshipEscort.oxt
===================================================================
--- code/branches/presentationHS12/data/levels/templates/spaceshipEscort.oxt 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/templates/spaceshipEscort.oxt 2012-12-15 15:44:09 UTC (rev 9518)
@@ -1,7 +1,7 @@
<Template name=spaceshipescort>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipassffcameras
+ camerapositiontemplate = spaceshipescortcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 4
@@ -38,8 +38,8 @@
angularDamping = 0.9999999
>
<engines>
- <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
- <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
</engines>
<attached>
<Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
@@ -61,17 +61,17 @@
</SpaceShip>
</Template>
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=spaceshipescortcameras defaults=0>
<SpaceShip>
<camerapositions>
- <CameraPosition position="0,13, 40" drag=true mouselook=true />
- <CameraPosition position="0,20, 80" drag=true mouselook=true />
+ <CameraPosition position="0,15, 60" drag=true mouselook=true />
+ <CameraPosition position="0,20, 90" drag=true mouselook=true />
<CameraPosition position="0,30,120" drag=true mouselook=true />
</camerapositions>
</SpaceShip>
</Template>
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+<Template name=spaceshipescortengine baseclass=MultiStateEngine>
<MultiStateEngine
boostfactor = 2.2
Modified: code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt
===================================================================
--- code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt 2012-12-15 13:41:57 UTC (rev 9517)
+++ code/branches/presentationHS12/data/levels/templates/spaceshipTurret.oxt 2012-12-15 15:44:09 UTC (rev 9518)
@@ -1,7 +1,7 @@
<Template name=spaceshipturret>
<SpaceShip
hudtemplate = spaceshiphud
- camerapositiontemplate = spaceshipassffcameras
+ camerapositiontemplate = spaceshipturretcameras
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
@@ -48,3 +48,13 @@
?>
</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>
More information about the Orxonox-commit
mailing list