Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10962


Ignore:
Timestamp:
Dec 9, 2015, 4:03:59 PM (9 years ago)
Author:
maxima
Message:

Merged presentation and exlposionChunks branches. Works fine. Added explosion parts to hovership.

Location:
code/branches/presentationHS15
Files:
2 deleted
44 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/branches/presentationHS15

  • code/branches/presentationHS15/data/levels/HeavyCruiser.oxw

    r9943 r10962  
    553553
    554554    <Pawn team=1 health=1000 initialhealth=1000 maxhealth=1000 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=10000 name=HeavyCruiser_body radarname = "HeavyCruiser" >
     555        <explosion>
     556            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_sparks2" scale=2.5 />
     557            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flame2" scale=2.5 />
     558            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" scale=12 />
     559            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" scale=2.5 />
     560
     561            <ExplosionPart offset="50,50,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_sparks2" scale=2.5 delay=0.3 />
     562            <ExplosionPart offset="50,50,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flame2" scale=2.5 delay=0.3 />
     563            <ExplosionPart offset="50,50,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" scale=12 delay=0.3 />
     564            <ExplosionPart offset="50,50,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" scale=2.5 delay=0.3 />
     565
     566            <ExplosionPart offset="50,-50,-50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_sparks2" scale=2.5 delay=0.6 />
     567            <ExplosionPart offset="50,-50,-50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flame2" scale=2.5 delay=0.6 />
     568            <ExplosionPart offset="50,-50,-50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" scale=12 delay=0.6 />
     569            <ExplosionPart offset="50,-50,-50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" scale=2.5 delay=0.6 />
     570
     571            <ExplosionPart offset="-50,0,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_sparks2" scale=2.5 delay=0.9 />
     572            <ExplosionPart offset="-50,0,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flame2" scale=2.5 delay=0.9 />
     573            <ExplosionPart offset="-50,0,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" scale=12 delay=0.9 />
     574            <ExplosionPart offset="-50,0,50" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" scale=2.5 delay=0.9 />
     575        </explosion>
    555576        <attached>
    556577            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_body.mesh" scale="40" />
    … …  
    718739
    719740    <Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
     741
     742        <explosion>
     743            <ExplosionPart offset="-140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     744            <ExplosionPart offset="-140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     745            <ExplosionPart offset="-140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     746        </explosion>
    720747
    721748        <attached>
    … …  
    758785
    759786    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmLfront radarname = "HIDDEN" >
     787
     788        <explosion>
     789            <ExplosionPart offset="-141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     790            <ExplosionPart offset="-141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     791            <ExplosionPart offset="-141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     792        </explosion>
     793
    760794        <attached>
    761795            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmLfront.mesh" scale="40" />
    … …  
    772806
    773807    <Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmR radarname = "HIDDEN" >
     808        <explosion>
     809            <ExplosionPart offset="140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     810            <ExplosionPart offset="140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     811            <ExplosionPart offset="140,0,115" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     812        </explosion>
    774813        <attached>
    775814            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmR.mesh" scale="40" />
    … …  
    811850
    812851    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=sidearmRfront radarname = "HIDDEN" >
     852        <explosion>
     853            <ExplosionPart offset="141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     854            <ExplosionPart offset="141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     855            <ExplosionPart offset="141,15,-53" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     856        </explosion>
    813857        <attached>
    814858            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_sidearmRfront.mesh" scale="40" />
    … …  
    825869
    826870    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_frontL radarname = "HIDDEN" >
     871        <explosion>
     872            <ExplosionPart offset="-80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     873            <ExplosionPart offset="-80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     874            <ExplosionPart offset="-80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     875        </explosion>
    827876        <attached>
    828877            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_frontL.mesh" scale="40" />
    … …  
    836885
    837886    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_frontR radarname = "HIDDEN" >
     887        <explosion>
     888            <ExplosionPart offset="80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     889            <ExplosionPart offset="80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     890            <ExplosionPart offset="80,33,-320" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     891        </explosion>
    838892        <attached>
    839893            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_frontR.mesh" scale="40" />
    … …  
    847901
    848902    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_partL radarname = "HIDDEN" >
     903        <explosion>
     904            <ExplosionPart offset="-94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     905            <ExplosionPart offset="-94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     906            <ExplosionPart offset="-94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     907        </explosion>
    849908        <attached>
    850909            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_partL.mesh" scale="40" />
    … …  
    858917
    859918    <Pawn team=1 health=100 initialhealth=100 maxhealth=100 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_partR radarname = "HIDDEN" >
     919        <explosion>
     920            <ExplosionPart offset="94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     921            <ExplosionPart offset="94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     922            <ExplosionPart offset="94,33,-179" minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     923        </explosion>
    860924        <attached>
    861925            <Model position="0,0,0" direction="-1,0,0" mesh="HeavyCruiser_partR.mesh" scale="40" />

  • code/branches/presentationHS15/data/levels/emptyLevel.oxw

    r10629 r10962  
    1 <LevelInfo
     1 <LevelInfo
    22 name = "Empty level"
    33 description = "A level with absolutely nothing in it."
    … …  
    1313
    1414<?lua
    15   include("templates/spaceshipAssff2.oxt")
    16   include("templates/spaceshipPirate.oxt")
     15  include("templates/spaceshipAssff.oxt")
    1716  include("templates/spaceshipEscort.oxt")
    18   include("templates/spaceshipRing.oxt")
    19   include("templates/spaceshipSwallow.oxt")
     17  include("templates/spaceshipHover.oxt")
    2018?>
    2119
    … …  
    3331    <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"/>
    3432    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     33
     34    <SpaceShip
     35        team                = "1"
     36        position            = "1000,0,0"
     37        >
     38        <templates>
     39          <Template link=spaceshipassff />
     40        </templates>         
     41    </SpaceShip>
     42    <SpaceShip
     43        team                = "1"
     44        position            = "1000,200,0"
     45        >
     46        <templates>
     47          <Template link=spaceshiphover />
     48        </templates>
     49                   
     50    </SpaceShip>
     51    <SpaceShip
     52        team                = "1"
     53        position            = "1000,400,0"
     54        >
     55        <templates>
     56          <Template link=spaceshipescort />
     57        </templates>
     58
     59       
     60                   
     61    </SpaceShip>
    3562   
    3663  </Scene>

  • code/branches/presentationHS15/data/levels/iiiJohnVane_EscapeTheBastards.oxw

    r9992 r10962  
    288288                    </WaypointController>
    289289        </controller>
     290        <explosion >
     291            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     292            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     293            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     294        </explosion>
    290295    </Pawn>
    291296

  • code/branches/presentationHS15/data/levels/kecks.oxw

    r10262 r10962  
    348348
    349349
    350                         <Pawn health=20 position="0, 112900, 0" direction="0,-1,0" name="boxDestroyed" collisionType=dynamic mass=100000  radarname = "Gravitation Box" >
     350                        <Pawn health=20 position="0, 112900, 0" direction="0,-1,0" name="boxDestroyed" collisionType=dynamic mass=100000  radarname = "Gravitation Box" explosionchunks=0 >
    351351                                <attached>
    352352                                        <Model position="0,0,0" scale="10" mesh="CuboidBody.mesh"  />
    … …  
    359359                                        </WaypointController>
    360360                                </controller>
     361                                <explosion >
     362                        <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     363                        <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     364                        <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     365                        </explosion>
    361366                         </Pawn>
    362367

  • code/branches/presentationHS15/data/levels/missionOne.oxw

    r10961 r10962  
    526526            </WaypointController>
    527527        </controller>
     528        <explosion >
     529            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     530            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     531            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     532        </explosion>
    528533    </Pawn>
    529534
    … …  
    544549            </WaypointController>
    545550        </controller>
     551        <explosion >
     552            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     553            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     554            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     555        </explosion>
    546556    </Pawn>
    547557
    … …  
    562572            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
    563573        </collisionShapes>
     574        <explosion >
     575            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     576            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     577            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     578        </explosion>
    564579    </Pawn>
    565580
    … …  
    580595            </WaypointController>
    581596        </controller>
     597        <explosion >
     598            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     599            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     600            <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     601        </explosion>
    582602    </Pawn>
    583603

  • code/branches/presentationHS15/data/levels/templates/FPS.oxt

    r10258 r10962  
    2424      <BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
    2525    </collisionShapes>
     26    <explosion >
     27      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     28      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     29      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     30    </explosion>
    2631
    2732    <camerapositions>

  • code/branches/presentationHS15/data/levels/templates/FPS_HS14.oxt

    r10262 r10962  
    2929      <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
    3030    </camerapositions>
     31    <explosion >
     32      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     33      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     34      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     35    </explosion>
    3136
    3237    <?lua

  • code/branches/presentationHS15/data/levels/templates/HeavyCruiser.oxt

    r10961 r10962  
    383383        <BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="HOOK, frontR"/> -->
    384384    </collisionShapes>
     385    <explosion >
     386      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     387      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     388      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     389    </explosion>
    385390<?lua
    386391  include("../includes/weaponSettingsHeavyCruiser.oxi")

  • code/branches/presentationHS15/data/levels/templates/HeavyCruiserBody.oxt

    r10961 r10962  
    210210        <BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="frontR, HOOK"/> -->
    211211    </collisionShapes>
     212    <explosion >
     213      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     214      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     215      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     216    </explosion>
    212217<?lua
    213218  include("../includes/weaponSettingsHeavyCruiserBody.oxi")

  • code/branches/presentationHS15/data/levels/templates/ModularSpaceShipTest.oxt

    r10961 r10962  
    116116        <BoxCollisionShape position="0,0,0" halfExtents="30,30,30" />
    117117    </collisionShapes>
     118
     119    <explosion >
     120      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     121      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     122      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     123    </explosion>
    118124<?lua
    119125  include("../includes/weaponSettingsAssff.oxi")

  • code/branches/presentationHS15/data/levels/templates/bigship.oxt

    r10961 r10962  
    8383     
    8484    </collisionShapes>
     85
     86    <explosion >
     87      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     88      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     89      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     90
     91      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     92      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     93      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     94      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     95      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     96    </explosion>
    8597<?lua
    8698  include("../includes/weaponSettingsbigship.oxi")

  • code/branches/presentationHS15/data/levels/templates/enemyInvader.oxt

    r10961 r10962  
    5555      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    5656    </collisionShapes>
     57    <explosion >
     58      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     59      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     61
     62      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     63      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     65      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     66      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     67    </explosion>
    5768<?lua
    5869  include("../includes/invaderWeapon.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipAssff.oxt

    r10961 r10962  
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    66   spawnparticleduration  = 3
    7    explosionchunks        = 6
    87
    98   health            = 100
    … …  
    5756      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5857    </collisionShapes>
     58    <explosion>
     59      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     61      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     62
     63      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     65      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     66      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     67    </explosion>
    5968<?lua
    6069  include("../includes/weaponSettingsAssff.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipAssff2.oxt

    r10961 r10962  
    5757      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5858    </collisionShapes>
     59    <explosion >
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     61      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     62      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     63
     64      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     65      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     66      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     67      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     68      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     69    </explosion>
    5970<?lua
    6071  include("../includes/weaponSettingsAssff2.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipCollateralDamage.oxt

    r10961 r10962  
    6262
    6363    </collisionShapes>
     64
     65    <explosion >
     66      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     67      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     68      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     69
     70      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     71      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     72      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     73      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     74      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     75    </explosion>
    6476
    6577

  • code/branches/presentationHS15/data/levels/templates/spaceshipDodgeRace.oxt

    r10961 r10962  
    6060      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    6161    </collisionShapes>
     62    <explosion >
     63      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     64      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     65      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     66
     67      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     68      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     69      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     70      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     71      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     72    </explosion>
    6273<?lua
    6374  include("../includes/invaderWeapon.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt

    r10961 r10962  
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    66   spawnparticleduration  = 3
    7    explosionchunks        = 4
     7   explosionchunks        = 10
    88
    99   health            = 80
    … …  
    5656      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    5757    </collisionShapes>
     58    <explosion>
     59      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     61      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     62
     63      <ExplosionPart mesh="explosionparts/escort_part_1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64      <ExplosionPart mesh="explosionparts/escort_part_2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     65      <ExplosionPart mesh="explosionparts/escort_part_3.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     66      <ExplosionPart mesh="explosionparts/escort_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     67      <ExplosionPart mesh="explosionparts/escort_part_5.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     68      <ExplosionPart mesh="explosionparts/escort_part_6.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     69    </explosion>
    5870<?lua
    5971  include("../includes/weaponSettingsEscort.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipGhost.oxt

    r10961 r10962  
    5252      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5353    </collisionShapes>
     54    <explosion >
     55      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     56      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     57      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     58
     59      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     60      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     61      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     62      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     63      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64    </explosion>
    5465<?lua
    5566  include("../includes/weaponSettingsGhost.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipH2.oxt

    r8858 r10962  
    4141      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    4242    </collisionShapes>
     43    <explosion >
     44      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     45      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     46      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     47
     48      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     49      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     50      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     51      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     52      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     53    </explosion>
    4354
    4455  </SpaceShip>

  • code/branches/presentationHS15/data/levels/templates/spaceshipHXY.oxt

    r8858 r10962  
    3535      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    3636    </collisionShapes>
     37    <explosion >
     38      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     39      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     40      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     41
     42      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     43      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     44      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     45      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     46      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     47    </explosion>
    3748
    3849<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipHXYSL.oxt

    r8858 r10962  
    3434      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    3535    </collisionShapes>
     36    <explosion >
     37      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     38      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     39      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     40
     41      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     42      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     43      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     44      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     45      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     46    </explosion>
    3647
    3748<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipHeartAttack.oxt

    r10961 r10962  
    6363      <BoxCollisionShape position="-5,5,4.3"  halfExtents="1.4, 1.5, 1.4" />
    6464    </collisionShapes>
     65    <explosion >
     66      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     67      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     68      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     69
     70      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     71      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     72      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     73      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     74      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     75    </explosion>
    6576<?lua
    6677  include("../includes/weaponSettingsHeartAttack.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipHover.oxt

    r10960 r10962  
    4949      <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" />
    5050    </collisionShapes>
     51    <explosion>
     52      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     53      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=2 />
     54      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     55
     56      <ExplosionPart mesh="explosionparts/pirate_part_1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     57      <ExplosionPart mesh="explosionparts/pirate_part_2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     58      <ExplosionPart mesh="explosionparts/pirate_part_3.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     59      <ExplosionPart mesh="explosionparts/pirate_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     60    </explosion>
    5161
    5262<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipInvader.oxt

    r10961 r10962  
    5959      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    6060    </collisionShapes>
     61    <explosion >
     62      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     63      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     64      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     65
     66      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     67      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     68      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     69      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     70      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     71    </explosion>
    6172<?lua
    6273  include("../includes/invaderWeapon.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipPirate.oxt

    r10961 r10962  
    5353      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5454    </collisionShapes>
     55    <explosion>
     56      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     57      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=2 />
     58      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     59
     60      <ExplosionPart mesh="explosionparts/pirate_part_1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     61      <ExplosionPart mesh="explosionparts/pirate_part_2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     62      <ExplosionPart mesh="explosionparts/pirate_part_3.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     63      <ExplosionPart mesh="explosionparts/pirate_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64    </explosion>
    5565
    5666<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipRace.oxt

    r10961 r10962  
    5757
    5858    </collisionShapes>
     59    <explosion >
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     61      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     62      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     63
     64      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     65      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     66      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     67      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     68      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     69    </explosion>
    5970<?lua
    6071  include("../includes/weaponSettingsAssff.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipRing.oxt

    r10961 r10962  
    5353      <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
    5454    </collisionShapes>
     55    <explosion >
     56      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     57      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     58      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     59
     60      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     61      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     62      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     63      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     64      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     65    </explosion>
    5566<?lua
    5667  include("../includes/weaponSettingsRing.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipSpacecruiser.oxt

    r10961 r10962  
    6666
    6767    </collisionShapes>
     68    <explosion >
     69      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     70      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     71      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     72
     73      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     74      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     75      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     76      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     77      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     78    </explosion>
    6879<?lua
    6980  include("../includes/weaponSettingsSpacecruiser.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipSwallow.oxt

    r10961 r10962  
    4949      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5050    </collisionShapes>
     51    <explosion >
     52      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     53      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     54      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     55
     56      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     57      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     58      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     59      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     60      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     61    </explosion>
    5162<?lua
    5263  include("../includes/weaponSettingsSwallow.oxi")

  • code/branches/presentationHS15/data/levels/templates/spaceshipTransporter.oxt

    r8858 r10962  
    3434      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    3535    </collisionShapes>
     36    <explosion >
     37      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     38      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     39      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     40
     41      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     42      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     43      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     44      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     45      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     46    </explosion>
    3647
    3748<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipTransporterSL.oxt

    r8858 r10962  
    3434      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    3535    </collisionShapes>
     36    <explosion >
     37      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     38      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     39      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     40
     41      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     42      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     43      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     44      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     45      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     46    </explosion>
    3647
    3748<?lua

  • code/branches/presentationHS15/data/levels/templates/spaceshipTurret.oxt

    r10961 r10962  
    4444        <SphereCollisionShape radius="10"   position = "0,0,0"/>
    4545    </collisionShapes>
     46    <explosion >
     47      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
     48      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
     49      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
     50
     51      <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
     52      <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     53      <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     54      <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     55      <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     56    </explosion>
    4657<?lua
    4758  include("../includes/weaponSettingsTurret.oxi")

  • code/branches/presentationHS15/src/libraries/tools/ParticleInterface.cc

    r10624 r10962  
    233233            this->particleSystem_->setKeepParticlesInLocalSpace(keep);
    234234    }
     235
     236    void ParticleInterface::setDimensions(float scale)
     237    {
     238        this->particleSystem_->setDefaultDimensions(scale * this->particleSystem_->getDefaultWidth(), scale * this->particleSystem_->getDefaultHeight());
     239    }
    235240}

  • code/branches/presentationHS15/src/libraries/tools/ParticleInterface.h

    r10624 r10962  
    7575            void setDetailLevel(unsigned int level);
    7676
     77            void setDimensions(float scale);
     78
    7779        protected:
    7880            virtual void changedTimeFactor(float factor_new, float factor_old);

  • code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.cc

    r10624 r10962  
    7171            for (int i = 0; i < 7; i++)
    7272            {
    73                 BigExplosion* chunk = new BigExplosion(this->center_->getContext());
    74                 chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
    75                 chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
    76                 chunk->setScale(20);
     73                WeakPtr<ExplosionPart> chunk5 = new ExplosionPart(this->center_->getContext());
     74                chunk5->setPosition(Vector3(600, 0, 100.f * i - 300));
     75                chunk5->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
     76                chunk5->setScale(10);
     77                chunk5->setEffect1("Orxonox/explosion2b");
     78                chunk5->setEffect2("Orxonox/smoke6");
     79                chunk5->Explode();
     80
    7781            }
    7882        }

  • code/branches/presentationHS15/src/modules/dodgerace/DodgeRace.h

    r10624 r10962  
    5656
    5757#include "core/command/ConsoleCommand.h"
    58 #include "worldentities/BigExplosion.h"
    5958
    6059#include "gametypes/Deathmatch.h"

  • code/branches/presentationHS15/src/modules/invader/Invader.cc

    r10624 r10962  
    5151
    5252#include "core/command/ConsoleCommand.h"
    53 #include "worldentities/BigExplosion.h"
     53#include "worldentities/ExplosionPart.h"
    5454
    5555namespace orxonox
    … …  
    8282            for (int i = 0; i < 7; i++)
    8383            {
    84                 BigExplosion* chunk = new BigExplosion(this->center_->getContext());
    85                 chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
    86                 chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
    87                 chunk->setScale(20);
     84
     85                WeakPtr<ExplosionPart> chunk5 = new ExplosionPart(this->center_->getContext());
     86                chunk5->setPosition(this->center_->getPosition());
     87                chunk5->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
     88                chunk5->setScale(10);
     89                chunk5->setEffect1("Orxonox/explosion2b");
     90                chunk5->setEffect2("Orxonox/smoke6");
     91                chunk5->setMinSpeed(0);
     92                chunk5->setMaxSpeed(0);
     93                chunk5->Explode();
     94
    8895            }
    8996        }

  • code/branches/presentationHS15/src/orxonox/OrxonoxPrereqs.h

    r10961 r10962  
    176176
    177177    // worldentities
    178     class BigExplosion;
    179178    class CameraPosition;
    180179    class ControllableEntity;

  • code/branches/presentationHS15/src/orxonox/items/ShipPart.cc

    r10624 r10962  
    4141#include "worldentities/StaticEntity.h"
    4242#include "items/PartDestructionEvent.h"
    43 #include "worldentities/BigExplosion.h"
    4443#include "chat/ChatManager.h"
    4544
    … …  
    105104    void ShipPart::explode()
    106105    {
    107         BigExplosion* chunk = new BigExplosion(this->getContext());
    108         chunk->setPosition(this->parent_->getPosition() + this->parent_->getOrientation() * (this->explosionPosition_));
    109         //chunk->setPosition(this->parent_->getPosition() + this->parent_->getOrientation() * Vector3(this->entityList_[0]->getLocalInertia()));
    110         chunk->setVelocity(this->parent_->getVelocity());
     106        // BigExplosion* chunk = new BigExplosion(this->getContext());
     107        // chunk->setPosition(this->parent_->getPosition() + this->parent_->getOrientation() * (this->explosionPosition_));
     108        // //chunk->setPosition(this->parent_->getPosition() + this->parent_->getOrientation() * Vector3(this->entityList_[0]->getLocalInertia()));
     109        // chunk->setVelocity(this->parent_->getVelocity());
    111110
    112111        // this->explosionSound_->setPosition(this->parent_->getPosition());

  • code/branches/presentationHS15/src/orxonox/worldentities/CMakeLists.txt

    r8706 r10962  
    66  ControllableEntity.cc
    77  Drone.cc
    8   BigExplosion.cc
    98  EffectContainer.cc
    109  ExplosionChunk.cc
    … …  
    1211  SpawnPoint.cc
    1312  TeamSpawnPoint.cc
     13  ExplosionPart.cc
    1414)
    1515

  • code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.cc

    r10961 r10962  
    4141#include "graphics/ParticleSpawner.h"
    4242#include "worldentities/ExplosionChunk.h"
    43 #include "worldentities/BigExplosion.h"
     43#include "worldentities/ExplosionPart.h"
    4444#include "weaponsystem/WeaponSystem.h"
    4545#include "weaponsystem/WeaponSlot.h"
    … …  
    8484        this->aimPosition_ = Vector3::ZERO;
    8585
     86        //this->explosionPartList_ = NULL;
     87
    8688        if (GameMode::isMaster())
    8789        {
    … …  
    136138        XMLPortParam(Pawn, "spawnparticlesource", setSpawnParticleSource, getSpawnParticleSource, xmlelement, mode);
    137139        XMLPortParam(Pawn, "spawnparticleduration", setSpawnParticleDuration, getSpawnParticleDuration, xmlelement, mode).defaultValues(3.0f);
    138         XMLPortParam(Pawn, "explosionchunks", setExplosionChunks, getExplosionChunks, xmlelement, mode).defaultValues(7);
     140        XMLPortParam(Pawn, "explosionchunks", setExplosionChunks, getExplosionChunks, xmlelement, mode).defaultValues(0);
    139141
    140142        XMLPortObject(Pawn, WeaponSlot, "weaponslots", addWeaponSlot, getWeaponSlot, xmlelement, mode);
    … …  
    145147        XMLPortParam(Pawn, "shieldrechargerate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
    146148        XMLPortParam(Pawn, "shieldrechargewaittime", setShieldRechargeWaitTime, getShieldRechargeWaitTime, xmlelement, mode).defaultValues(1.0f);
     149        XMLPortObject(Pawn, ExplosionPart, "explosion", addExplosionPart, getExplosionPart, xmlelement, mode);
    147150
    148151        XMLPortParam(Pawn, "explosionSound",  setExplosionSound,  getExplosionSound,  xmlelement, mode);
    … …  
    164167    void Pawn::tick(float dt)
    165168    {
     169        //BigExplosion* chunk = new BigExplosion(this->getContext());
    166170        SUPER(Pawn, tick, dt);
    167171
    … …  
    368372            if (GameMode::isMaster())
    369373            {
    370                 this->deatheffect();
    371374                this->goWithStyle();
    372375            }
    … …  
    375378    void Pawn::goWithStyle()
    376379    {
     380
    377381        this->bAlive_ = false;
    378382        this->setDestroyWhenPlayerLeft(false);
    379383
    380         BigExplosion* chunk = new BigExplosion(this->getContext());
    381         chunk->setPosition(this->getPosition());
    382         chunk->setVelocity(this->getVelocity());
     384        while(!explosionPartList_.empty())
     385        {
     386            explosionPartList_.back()->setPosition(this->getPosition());
     387            explosionPartList_.back()->setVelocity(this->getVelocity());
     388            explosionPartList_.back()->setOrientation(this->getOrientation());
     389            explosionPartList_.back()->Explode();
     390            explosionPartList_.pop_back();
     391        }
     392
     393        for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
     394        {
     395            ExplosionChunk* chunk = new ExplosionChunk(this->getContext());
     396            chunk->setPosition(this->getPosition());
     397        }
    383398
    384399        this->explosionSound_->setPosition(this->getPosition());
    385400        this->explosionSound_->play();
    386     }
    387     void Pawn::deatheffect()
    388     {
    389         // play death effect
    390         /*{
    391             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    392             effect->setPosition(this->getPosition());
    393             effect->setOrientation(this->getOrientation());
    394             effect->setDestroyAfterLife(true);
    395             effect->setSource("Orxonox/explosion2b");
    396             effect->setLifetime(4.0f);
    397         }
    398         {
    399             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    400             effect->setPosition(this->getPosition());
    401             effect->setOrientation(this->getOrientation());
    402             effect->setDestroyAfterLife(true);
    403             effect->setSource("Orxonox/smoke6");
    404             effect->setLifetime(4.0f);
    405         }
    406         {
    407             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    408             effect->setPosition(this->getPosition());
    409             effect->setOrientation(this->getOrientation());
    410             effect->setDestroyAfterLife(true);
    411             effect->setSource("Orxonox/sparks");
    412             effect->setLifetime(4.0f);
    413         }*/
    414        
    415        
    416         {
    417             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    418             effect->setPosition(this->getPosition());
    419             effect->setOrientation(this->getOrientation());
    420             effect->setDestroyAfterLife(true);
    421             effect->setSource("orxonox/explosion_flash2");
    422             effect->setLifetime(5.0f);
    423         }
    424         {
    425             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    426             effect->setPosition(this->getPosition());
    427             effect->setOrientation(this->getOrientation());
    428             effect->setDestroyAfterLife(true);
    429             effect->setSource("orxonox/explosion_flame2");
    430             effect->setLifetime(5.0f);
    431         }
    432         {
    433             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    434             effect->setPosition(this->getPosition());
    435             effect->setOrientation(this->getOrientation());
    436             effect->setDestroyAfterLife(true);
    437             effect->setSource("orxonox/explosion_shockwave2");
    438             effect->scale(20);
    439             effect->setLifetime(5.0f);
    440         }{
    441             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    442             effect->setPosition(this->getPosition());
    443             effect->setOrientation(this->getOrientation());
    444             effect->setDestroyAfterLife(true);
    445             effect->setSource("orxonox/explosion_sparks2");
    446             effect->setLifetime(5.0f);
    447         }
    448         {
    449             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    450             effect->setPosition(this->getPosition());
    451             effect->setOrientation(this->getOrientation());
    452             effect->setDestroyAfterLife(true);
    453             effect->setSource("orxonox/explosion_streak2");
    454             effect->setLifetime(5.0f);
    455         }
    456         {
    457             ParticleSpawner* effect = new ParticleSpawner(this->getContext());
    458             effect->setPosition(this->getPosition());
    459             effect->setOrientation(this->getOrientation());
    460             effect->setDestroyAfterLife(true);
    461             effect->setSource("orxonox/explosion_afterglow");
    462             effect->scale(20);
    463             effect->setLifetime(5.0f);
    464         }
    465        
    466        
    467         for (unsigned int i = 0; i < this->numexplosionchunks_; ++i)
    468         {
    469             ExplosionChunk* chunk = new ExplosionChunk(this->getContext());
    470             chunk->setPosition(this->getPosition());
    471         }
    472401    }
    473402
    … …  
    476405        Check whether the Pawn has a @ref Orxonox::WeaponSystem and fire it with the specified firemode if it has one.
    477406    */
     407
    478408    void Pawn::fired(unsigned int firemode)
    479409    {
    … …  
    488418            this->spawneffect();
    489419    }
     420
     421
     422    void Pawn::addExplosionPart(ExplosionPart* ePart)
     423    {this->explosionPartList_.push_back(ePart);}
     424
     425
     426    ExplosionPart * Pawn::getExplosionPart()
     427    {return this->explosionPartList_.back();}
     428
     429
    490430
    491431    /* WeaponSystem:

  • code/branches/presentationHS15/src/orxonox/worldentities/pawns/Pawn.h

    r10961 r10962  
    3333
    3434#include <string>
     35#include <vector>
    3536#include "interfaces/PickupCarrier.h"
    3637#include "interfaces/RadarViewable.h"
    3738#include "worldentities/ControllableEntity.h"
     39#include "worldentities/ExplosionPart.h"
    3840
    3941
    … …  
    142144            virtual void fired(unsigned int firemode);
    143145            virtual void postSpawn();
     146
     147            void addExplosionPart(ExplosionPart* ePart);
     148            ExplosionPart * getExplosionPart();
    144149
    145150            void addWeaponSlot(WeaponSlot * wSlot);
    … …  
    206211            virtual Controller* getSlave();
    207212            virtual void goWithStyle();
    208             virtual void deatheffect();
    209213            virtual void spawneffect();
    210214
    … …  
    241245            unsigned int numexplosionchunks_;
    242246
     247            std::vector<ExplosionPart*> explosionPartList_;
     248
    243249        private:
    244250            void registerVariables();

  • code/branches/presentationHS15/src/orxonox/worldentities/pawns/SpaceShip.cc

    r10961 r10962  
    115115
    116116        XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode);
     117
     118       
    117119    }
    118120
Note: See TracChangeset for help on using the changeset viewer.