[Orxonox-commit 5836] r10496 - in code/branches/presentationFS15: data/levels data/levels/includes data/levels/templates src/modules/weapons/weaponmodes
maxima at orxonox.net
maxima at orxonox.net
Wed May 27 10:21:55 CEST 2015
Author: maxima
Date: 2015-05-27 10:21:55 +0200 (Wed, 27 May 2015)
New Revision: 10496
Added:
code/branches/presentationFS15/data/levels/clangenb.oxw
code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi
code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt
Modified:
code/branches/presentationFS15/data/levels/emptyLevel.oxw
code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi
code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc
code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc
Log:
clangenb: new spaceship heartattack merged to presentation
Copied: code/branches/presentationFS15/data/levels/clangenb.oxw (from rev 10495, code/branches/clangenb/data/levels/clangenb.oxw)
===================================================================
--- code/branches/presentationFS15/data/levels/clangenb.oxw (rev 0)
+++ code/branches/presentationFS15/data/levels/clangenb.oxw 2015-05-27 08:21:55 UTC (rev 10496)
@@ -0,0 +1,55 @@
+<LevelInfo
+ name = "clangenb"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipHeartAttack.oxt")
+?>
+
+<Level>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipHeartAttack />
+ <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate">
+ <events>
+ <visibility>
+ <EventListener event="boxtrigger4" />
+ </visibility>
+ </events>
+ <templates>
+ <Template link=spaceshippirate />
+ </templates>
+ <controller>
+ <WaypointController team=1>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=8 position=" 0,1700,-200" />
+ <Model mesh="cube.mesh" scale=8 position=" 0,1700,-700" />
+ <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
+ <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+ </Scene>
+</Level>
+
Modified: code/branches/presentationFS15/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/presentationFS15/data/levels/emptyLevel.oxw 2015-05-27 08:07:27 UTC (rev 10495)
+++ code/branches/presentationFS15/data/levels/emptyLevel.oxw 2015-05-27 08:21:55 UTC (rev 10496)
@@ -14,7 +14,7 @@
<?lua
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipPirate.oxt")
- include("templates/spaceshipEscort.oxt")
+ include("templates/spaceshipHeartAttack.oxt")
?>
<Level>
Modified: code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi 2015-05-27 08:07:27 UTC (rev 10495)
+++ code/branches/presentationFS15/data/levels/includes/weaponSettingsAssff.oxi 2015-05-27 08:21:55 UTC (rev 10496)
@@ -24,6 +24,7 @@
<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" />
+ <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="2,-0.2,-1" />
<HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
<LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
</Weapon>
Copied: code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (from rev 10494, code/branches/clangenb/data/levels/includes/weaponSettingsHeartAttack.oxi)
===================================================================
--- code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi (rev 0)
+++ code/branches/presentationFS15/data/levels/includes/weaponSettingsHeartAttack.oxi 2015-05-27 08:21:55 UTC (rev 10496)
@@ -0,0 +1,52 @@
+ <weaponslots>
+ <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 />
+ <WeaponSet firemode=1 />
+ <WeaponSet firemode=2 />
+ <WeaponSet firemode=3 />
+ </weaponsets>
+ <weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+ <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" />
+ </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" />
+ </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 />
+
+ </Weapon>
+ <Weapon>
+
+
+ </Weapon>
+ </WeaponPack>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+ </links>
+ <!--Weapon>
+ <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
+ </Weapon-->
+ </WeaponPack>
+ </weapons>
Copied: code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (from rev 10494, code/branches/clangenb/data/levels/templates/spaceshipHeartAttack.oxt)
===================================================================
--- code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt (rev 0)
+++ code/branches/presentationFS15/data/levels/templates/spaceshipHeartAttack.oxt 2015-05-27 08:21:55 UTC (rev 10496)
@@ -0,0 +1,125 @@
+<Template name=spaceshipHeartAttack>
+ <SpaceShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipassffcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 6
+
+ health = 200
+ maxhealth = 300
+ initialhealth = 150
+
+ shieldhealth = 50
+ initialshieldhealth = 50
+ maxshieldhealth = 800
+ shieldabsorption = 0.8
+ reloadrate = 1
+ reloadwaittime = 1
+
+ primaryThrust = 40
+ auxilaryThrust = 30
+ rotationThrust = 35
+
+ 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
+
+ explosionSound = "sounds/Explosion2.ogg"
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 19" template=spaceshipheartattackengine />
+ <MultiStateEngine position="-7.6, 0, 19" template=spaceshipheartattackengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="HeartAttack.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 /-->
+ </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" />
+ </collisionShapes>
+<?lua
+ include("../includes/weaponSettingsHeartAttack.oxi")
+?>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras 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>
+
+<Template name=spaceshipheartattackengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 2
+
+ speedfront = 150
+ speedback = 50
+ speedleftright = 50
+ speedupdown = 50
+
+ defEngineSndNormal = "sounds/Engine_low.ogg"
+ defEngineSndBoost = "sounds/Engine_high.ogg"
+
+ accelerationfront = 420
+ accelerationbrake = 420
+ accelerationback = 125
+ accelerationleftright = 125
+ accelerationupdown = 125
+ >
+ <EffectContainer condition="idle">
+ <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+ </EffectContainer>
+ <EffectContainer condition="not idle">
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="4, 1.9, 19" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="-4, 1.9, 19" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+ <EffectContainer condition="normal or brake">
+
+ </EffectContainer>
+ <EffectContainer condition="normal or boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 4, 1.9, 19" colour="0.6, 0.2, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-4, 1.9, 19" colour="0.6, 0.2, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ </EffectContainer>
+ <EffectContainer condition="boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 4, 1.9, 19" colour="1, 0, 0, 0.5" width=20 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-4, 1.9, 19" colour="1, 0, 0, 1" width=20 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ </EffectContainer>
+ <EffectContainer condition="brake">
+ <FadingBillboard mainstate=activity active=false scale=0.3 position=" 4, 1.9, 19" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.3 position="-4, 1.9, 19" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position=" 4, 1.9, 19" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position="-4, 1.9, 19" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+
+ </MultiStateEngine>
+</Template>
Modified: code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc 2015-05-27 08:07:27 UTC (rev 10495)
+++ code/branches/presentationFS15/src/modules/weapons/weaponmodes/EnergyDrink.cc 2015-05-27 08:21:55 UTC (rev 10496)
@@ -107,6 +107,7 @@
projectile->attach(model);
model->setScale(5);
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
projectile->setOrientation(this->getMuzzleOrientation());
projectile->setPosition(this->getMuzzlePosition());
projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
Modified: code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc 2015-05-27 08:07:27 UTC (rev 10495)
+++ code/branches/presentationFS15/src/modules/weapons/weaponmodes/FusionFire.cc 2015-05-27 08:21:55 UTC (rev 10496)
@@ -66,7 +66,8 @@
void FusionFire::fire()
{
BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
-
+
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
projectile->setOrientation(this->getMuzzleOrientation());
projectile->setPosition(this->getMuzzlePosition());
projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
Modified: code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc 2015-05-27 08:07:27 UTC (rev 10495)
+++ code/branches/presentationFS15/src/modules/weapons/weaponmodes/LaserFire.cc 2015-05-27 08:21:55 UTC (rev 10496)
@@ -65,6 +65,7 @@
{
ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
projectile->setOrientation(this->getMuzzleOrientation());
projectile->setPosition(this->getMuzzlePosition());
projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
More information about the Orxonox-commit
mailing list