Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11052 for code/trunk/data


Ignore:
Timestamp:
Jan 9, 2016, 6:26:20 PM (9 years ago)
Author:
landauf
Message:

merged branch presentationHS15 back to trunk

Location:
code/trunk
Files:
1 deleted
77 edited
20 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/defaultConfig/orxonox.ini

    r10262 r11052  
    44campaignMissions_[2] = "pirateAttack.oxw"
    55campaignMissions_[3] = "iJohnVane_TriptoArea51.oxw"
     6campaignMissions_[4] = "iiJohnVane_Area51UnderFire.oxw"
     7campaignMissions_[5] = "iiiJohnVane_EscapeTheBastards.oxw"
     8campaignMissions_[6] = "expeditionSector.oxw"
     9campaignMissions_[7] = "shuttleAttack.oxw"
     10campaignMissions_[8] = "shuttleRetaliation.oxw"

  • code/trunk/data/gui/layouts/CampaignMenu.layout

    r10262 r11052  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="MenuWidgets/Button" Name="orxonox/MissionOneButton" >
    11             <Property Name="Text" Value="Mission 1" />
     10        <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
     11            <Property Name="Text" Value="Mission One" />
    1212            <Property Name="Visible" Value="False"/>
    1313            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    14             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
    15             <Event Name="Clicked" Function="CampaignMenu.MissionOneButton_clicked"/>
     14            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
     15            <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
    1616        </Window>
    17         <Window Type="MenuWidgets/Button" Name="orxonox/MissionTwoButton" >
    18             <Property Name="Text" Value="Mission 2" />
     17        <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
     18            <Property Name="Text" Value="Fight in our Back" />
    1919            <Property Name="Visible" Value="False"/>
    2020            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    21             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
     21            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
    2222            <Property Name="Disabled" Value="True" />
    23             <Event Name="Clicked" Function="CampaignMenu.MissionTwoButton_clicked"/>
     23            <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
    2424        </Window>
    25         <Window Type="MenuWidgets/Button" Name="orxonox/MissionThreeButton" >
    26             <Property Name="Text" Value="Mission 3" />
     25        <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
     26            <Property Name="Text" Value="Pirate Attack" />
    2727            <Property Name="Visible" Value="False"/>
    2828            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    29             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
     29            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
    3030            <Property Name="Disabled" Value="True" />
    31             <Event Name="Clicked" Function="CampaignMenu.MissionThreeButton_clicked"/>
     31            <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
    3232        </Window>
    33         <Window Type="MenuWidgets/Button" Name="orxonox/MissionFourButton" >
    34             <Property Name="Text" Value="Mission 4" />
     33        <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
     34            <Property Name="Text" Value="Trip to Area 51" />
    3535            <Property Name="Visible" Value="False"/>
    3636            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
    3838            <Property Name="Disabled" Value="True" />
    39             <Event Name="Clicked" Function="CampaignMenu.MissionFourButton_clicked"/>
     39            <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
    4040        </Window>
     41        <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
     42            <Property Name="Text" Value="Area 51 under Fire" />
     43            <Property Name="Visible" Value="False"/>
     44            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     45            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
     46            <Property Name="Disabled" Value="True" />
     47            <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
     48        </Window>
     49        <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
     50            <Property Name="Text" Value="Escape the Bastards" />
     51            <Property Name="Visible" Value="False"/>
     52            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     53            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
     54            <Property Name="Disabled" Value="True" />
     55            <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
     56        </Window>
     57        <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
     58            <Property Name="Text" Value="Expedition to Sector 5C" />
     59            <Property Name="Visible" Value="False"/>
     60            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     61            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
     62            <Property Name="Disabled" Value="True" />
     63            <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
     64        </Window>
     65        <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
     66            <Property Name="Text" Value="Shuttle under Attack" />
     67            <Property Name="Visible" Value="False"/>
     68            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     69            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
     70            <Property Name="Disabled" Value="True" />
     71            <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
     72        </Window>
     73        <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
     74            <Property Name="Text" Value="Retaliation" />
     75            <Property Name="Visible" Value="False"/>
     76            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     77            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
     78            <Property Name="Disabled" Value="True" />
     79            <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>
     80        </Window>
     81
     82
    4183        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
    4284            <Property Name="Text" Value="Back" />
    4385            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    44             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8,0},{0.6,0},{0.85,0}}" />
     86            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
    4587            <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/>
    4688        </Window>

  • code/trunk/data/gui/layouts/InGameMenu.layout

    r7801 r11052  
    99            <Property Name="Text" Value="Return to Game" />
    1010            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     11            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
     12            <Property Name="Alpha" Value="0.9" />
     13            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
     14        </Window>
     15        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReloadLevelButton" >
     16            <Property Name="Text" Value="Reload level" />
     17            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1118            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
    1219            <Property Name="Alpha" Value="0.9" />
    13             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
     20            <Event Name="Clicked" Function="InGameMenu.button_reloadLevel_clicked"/>
    1421        </Window>
    1522        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
    1623            <Property Name="Text" Value="Main Menu" />
    1724            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    18             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
     25            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
    1926            <Property Name="Alpha" Value="0.9" />
    2027            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
    … …  
    2330            <Property Name="Text" Value="Settings" />
    2431            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
     32            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
    2633            <Property Name="Alpha" Value="0.9" />
    2734            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
    … …  
    3037            <Property Name="Text" Value="Quit" />
    3138            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    32             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
     39            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
    3340            <Property Name="Alpha" Value="0.9" />
    3441            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>

  • code/trunk/data/gui/scripts/CampaignMenu.lua

    r10262 r11052  
    88
    99function P.updateButtons()
    10     P.updateButton(0, winMgr:getWindow("orxonox/MissionOneButton"))
    11     P.updateButton(1, winMgr:getWindow("orxonox/MissionTwoButton"))
    12     P.updateButton(2, winMgr:getWindow("orxonox/MissionThreeButton"))
    13     P.updateButton(3, winMgr:getWindow("orxonox/MissionFourButton"))
     10    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
     11    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
     12    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
     13    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
     14    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
     15    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
     16    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
     17    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
     18    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
     19
    1420
    1521    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
    … …  
    5460end
    5561
    56 function P.MissionOneButton_clicked(e)
     62function P.Mission1Button_clicked(e)
    5763    P.loadLevel(P.FindLevel(0))
    5864end
    5965
    60 function P.MissionTwoButton_clicked(e)
     66function P.Mission2Button_clicked(e)
    6167    P.loadLevel(P.FindLevel(1))
    6268end
    6369
    64 function P.MissionThreeButton_clicked(e)
     70function P.Mission3Button_clicked(e)
    6571    P.loadLevel(P.FindLevel(2))
    6672end
    6773
    68 function P.MissionFourButton_clicked(e)
     74function P.Mission4Button_clicked(e)
    6975    P.loadLevel(P.FindLevel(3))
     76end
     77
     78function P.Mission5Button_clicked(e)
     79    P.loadLevel(P.FindLevel(4))
     80end
     81
     82function P.Mission6Button_clicked(e)
     83    P.loadLevel(P.FindLevel(5))
     84end
     85
     86function P.Mission7Button_clicked(e)
     87    P.loadLevel(P.FindLevel(6))
     88end
     89
     90function P.Mission8Button_clicked(e)
     91    P.loadLevel(P.FindLevel(7))
     92end
     93
     94function P.Mission9Button_clicked(e)
     95    P.loadLevel(P.FindLevel(8))
    7096end
    7197

  • code/trunk/data/gui/scripts/InGameMenu.lua

    r9016 r11052  
    77    P.multiplayerMode = "startClient"
    88
    9     --button are arranged in a 4x1 matrix, the left lower item is nil
     9    --button are arranged in a 5x1 matrix, the left lower item is nil
    1010    P:setButton(1, 1, {
    1111            ["button"] = winMgr:getWindow("orxonox/InGameMenu_ReturnButton"),
    … …  
    1414
    1515    P:setButton(2, 1, {
     16            ["button"] = winMgr:getWindow("orxonox/InGameMenu_ReloadLevelButton"),
     17            ["callback"]  = P.button_reloadLevel_clicked
     18    })
     19
     20    P:setButton(3, 1, {
    1621            ["button"] = winMgr:getWindow("orxonox/InGameMenu_MainMenuButton"),
    1722            ["callback"]  = P.button_mainmenu_clicked
    1823    })
    1924
    20     P:setButton(3, 1, {
     25    P:setButton(4, 1, {
    2126            ["button"] = winMgr:getWindow("orxonox/InGameMenu_SettingsButton"),
    2227            ["callback"]  = P.button_settings_clicked
    2328    })
    2429
    25     P:setButton(4, 1, {
     30    P:setButton(5, 1, {
    2631            ["button"] = winMgr:getWindow("orxonox/InGameMenu_QuitButton"),
    2732            ["callback"]  = P.button_quit_clicked
    … …  
    5459end
    5560
     61function P.button_reloadLevel_clicked(e)
     62    hideMenuSheet("InGameMenu")
     63    orxonox.execute("reloadLevel")
     64end
     65
    5666function P.button_return_clicked(e)
    5767    hideMenuSheet("InGameMenu")

  • code/trunk/data/gui/scripts/SheetManager.lua

    r8729 r11052  
    2424        cursor:show()
    2525    end
     26end
     27
     28function getLoadedSheets()
     29    local names = ""
     30    for name, sheet in pairs(loadedSheets) do
     31        names = names .. name
     32        names = names .. ","
     33    end
     34    return names
    2635end
    2736

  • code/trunk/data/levels/FPS_Level_HS14.oxw

    r10262 r11052  
    6767        maxshieldhealth     = "50"
    6868        shieldabsorption    = "0.8"
    69         reloadrate          = "100"
    70         reloadwaittime      = "0.1"
     69        shieldrechargerate  = "100"
     70        shieldrechargewaittime = "0.1"
    7171        name                = "Tanis1"
    7272        radarname           = "Light Destroyer" >
    … …  
    197197        maxshieldhealth     = "200"
    198198        shieldabsorption    = "0.8"
    199         reloadrate          = "1"
    200         reloadwaittime      = "1"
     199        shieldrechargerate  = "1"
     200        shieldrechargewaittime = "1"
    201201        name                = "Tanis0"
    202202        radarname           = "Tanis big ship" >
    … …  
    216216        maxshieldhealth     = "50"
    217217        shieldabsorption    = "0.8"
    218         reloadrate          = "1"
    219         reloadwaittime      = "1"
     218        shieldrechargerate  = "1"
     219        shieldrechargewaittime = "1"
    220220        name                = "Tanis0"
    221221        radarname           = "Pirate1" >
    … …  
    239239        maxshieldhealth     = "50"
    240240        shieldabsorption    = "0.8"
    241         reloadrate          = "1"
    242         reloadwaittime      = "1"
     241        shieldrechargerate  = "1"
     242        shieldrechargewaittime = "1"
    243243        name                = "Tanis0"
    244244        radarname           = "Pirate2" >

  • code/trunk/data/levels/HeavyCruiser.oxw

    r9943 r11052  
    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/trunk/data/levels/emptyLevel.oxw

    r10629 r11052  
    1313
    1414<?lua
    15   include("templates/spaceshipAssff2.oxt")
    16   include("templates/spaceshipPirate.oxt")
    1715  include("templates/spaceshipEscort.oxt")
    18   include("templates/spaceshipRing.oxt")
    19   include("templates/spaceshipSwallow.oxt")
    2016?>
    2117

  • code/trunk/data/levels/iJohnVane_TriptoArea51.oxw

    r10274 r11052  
    169169        maxshieldhealth     = "120"
    170170        shieldabsorption    = "0.8"
    171         reloadrate          = "1"
    172         reloadwaittime      = "1"
     171        shieldrechargerate  = "1"
     172        shieldrechargewaittime = "1"
    173173        name                = "cruiser"
    174174        radarname           = "Spacecruiser" >

  • code/trunk/data/levels/iiiJohnVane_EscapeTheBastards.oxw

    r9992 r11052  
    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/trunk/data/levels/includes/invaderWeapon.oxi

    r9943 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    2525        </links>
    2626      </WeaponPack>
    27     </weapons>
     27    </weaponpacks>
     28    <munition>
     29      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     30    </munition>

  • code/trunk/data/levels/includes/invaderWeaponEnemy.oxi

    r9943 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    2525        </links>
    2626      </WeaponPack>
    27     </weapons>
     27    </weaponpacks>
     28    <munition>
     29      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     30    </munition>

  • code/trunk/data/levels/includes/pickups.oxi

    r9348 r11052  
    7878/>
    7979
     80<PickupRepresentation
     81    name = "destroy"
     82    pickupName = "Destroy Pickup"
     83    pickupDescription = "Destroy all pickups you have."
     84    spawnerTemplate = "destroypickupRepresentation"
     85    inventoryRepresentation = "detroyPickup"
     86/>
     87
     88<PickupRepresentation
     89    name = "destroycarrier"
     90    pickupName = "Destroy Carrier Pickup"
     91    pickupDescription = "destroys you."
     92    spawnerTemplate = "destroycarrierpickupRepresentation"
     93    inventoryRepresentation = "destroyCarrierPickup"
     94/>
     95
    8096<!-- Speed pickups -->
    8197
    … …  
    138154/>
    139155
     156<!-- Munition pickups -->
     157
     158<PickupRepresentation
     159    name = "smallmunitionpickup"
     160    pickupName = "Small munition"
     161    pickupDescription = "Gives a small amount of munition."
     162    spawnerTemplate = "smallmunitionpickupRepresentation"
     163    inventoryRepresentation = "SmallMunition"
     164/>
     165
     166<PickupRepresentation
     167    name = "mediummunitionpickup"
     168    pickupName = "Medium munition"
     169    pickupDescription = "Gives a medium amount of munition."
     170    spawnerTemplate = "mediummunitionpickupRepresentation"
     171    inventoryRepresentation = "MediumMunition"
     172/>
     173
     174<PickupRepresentation
     175    name = "hugemunitionpickup"
     176    pickupName = "Huge munition"
     177    pickupDescription = "Gives a huge amount of munition."
     178    spawnerTemplate = "hugemunitionpickupRepresentation"
     179    inventoryRepresentation = "HugeMunition"
     180/>
     181
    140182<!-- Pickup Collection pickups -->
    141183
    … …  
    175217
    176218<PickupRepresentation
    177     name = "largedamageboostpickup"
    178     pickupName = "Large DamageBoost Pickup"
     219    name = "hugedamageboostpickup"
     220    pickupName = "Huge DamageBoost Pickup"
    179221    pickupDescription = "Multiplies the ship damage with 7."
    180     spawnerTemplate = "largedamageboostpickupRepresentation"
    181     inventoryRepresentation = "LargeDamageBoost"
     222    spawnerTemplate = "hugedamageboostpickupRepresentation"
     223    inventoryRepresentation = "HugeDamageBoost"
    182224/>
    183225
    … …  
    207249    inventoryRepresentation = "HugeShrink"
    208250/>
     251
     252<!-- Boost Pickup -->
     253
     254<PickupRepresentation
     255    name = "smallboostpickup"
     256    pickupName = "Small Boost"
     257    pickupDescription = "Restores the boost by a bit"
     258    spawnerTemplate = "smallboostpickupRepresentation"
     259    inventoryRepresentation = "SmallBoost"
     260/>
     261
     262<PickupRepresentation
     263    name = "mediumboostpickup"
     264    pickupName = "Medium Boost"
     265    pickupDescription = "Restores the boost"
     266    spawnerTemplate = "mediumboostpickupRepresentation"
     267    inventoryRepresentation = "MediumBoost"
     268/>
     269
     270<PickupRepresentation
     271    name = "hugeboostpickup"
     272    pickupName = "Huge Boost"
     273    pickupDescription = "Restores the boost considerably"
     274    spawnerTemplate = "hugeboostpickupRepresentation"
     275    inventoryRepresentation = "HugeBoost"
     276/>

  • code/trunk/data/levels/includes/weaponSettingsAssff.oxi

    r10677 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2424            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
    2525          </attached>
    26           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    27           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     26          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     27          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2828          <LightningGun mode=1 munitionpershot=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    2929        </Weapon>
    … …  
    3434            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
    3535          </attached>
    36           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    37           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     36          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     37          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    3838          <LightningGun mode=1 munitionpershot=1 muzzleoffset="0,0,0" damage=23 />
    3939        </Weapon>
    4040        <Weapon>
    4141          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    42           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     42          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=8 />
    4343        </Weapon>
    4444      </WeaponPack>
    45     </weapons>
     45    </weaponpacks>
     46    <munition>
     47      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=2 replenishinterval=7.5/>
     48      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     49      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     50    </munition>

  • code/trunk/data/levels/includes/weaponSettingsAssff2.oxi

    r10677 r11052  
    99      <WeaponSet firemode=2 />
    1010      <WeaponSet firemode=3 />
    11     </weaponsets>
    12     <weapons>
     11    </weaponsets> 
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2323            <BlinkingBillboard position="-1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
    2424          </attached>
    25           <HsW01 mode=0 munitionpershot=0 delay=0.125 healthamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6,1.3,-2.0" />
    26           <HsW01 mode=0 munitionpershot=0 delay=0 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6,1.3,-2.0" />
     25          <HsW01 mode=0 munitionpershot=1 delay=0.125 healthamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6,1.3,-2.0" />
     26          <HsW01 mode=0 munitionpershot=1 delay=0 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6,1.3,-2.0" />
    2727          <LightningGun mode=1 munitionpershot=1 muzzleoffset="0,0,0" shielddamage=23 />
    2828        </Weapon>
    … …  
    3232            <BlinkingBillboard position="1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
    3333          </attached>
    34           <HsW01 mode=0 munitionpershot=0 delay=0 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6,1.3,-2.0" />
    35           <HsW01 mode=0 munitionpershot=0 delay=0.125 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1,1.6,-2.0" />
     34          <HsW01 mode=0 munitionpershot=1 delay=0 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6,1.3,-2.0" />
     35          <HsW01 mode=0 munitionpershot=1 delay=0.125 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1,1.6,-2.0" />
    3636          <LightningGun mode=1 munitionpershot=1 muzzleoffset="0,0,0" shielddamage=23 />
    3737        </Weapon>
    3838        <Weapon>
    3939          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
    40           <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
     40          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 fuel=10 />
    4141        </Weapon>
    4242      </WeaponPack>
    43     </weapons>
     43    </weaponpacks>
     44    <munition>
     45      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     46      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     47      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     48    </munition>

  • code/trunk/data/levels/includes/weaponSettingsCollateral.oxi

    r9664 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2525            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="90" yaw="-90" position="-1.5, 1, -0.3" scale=0.6 /> <!-- MACHINE GUN -->
    2626          </attached>
    27           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    28           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    29           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
     27          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     28          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     29          <LightningGun mode=1 munitionpershot=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    3030        </Weapon>
    3131
    … …  
    3636            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="90" yaw="-90" position="1.8, 1, -0.3" scale=0.6 /> <!-- MACHINE GUN -->
    3737          </attached>
    38           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    39           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     38          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     39          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    4040          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    4141        </Weapon>
    4242        <Weapon>
    4343          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    44           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     44          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    4545        </Weapon>
    4646      </WeaponPack>
    47     </weapons>
     47    </weaponpacks>
     48    <munition>
     49      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     50      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     51      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     52    </munition>

  • code/trunk/data/levels/includes/weaponSettingsEscort.oxi

    r9763 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    1414        </links>
    1515        <Weapon>
    16           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
    17           <!--HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
     16          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
    1817        </Weapon>
    1918        <Weapon>
    20           <HsW01 mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
    21           <!--HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam2.mesh" /-->
     19          <HsW01 mode=0 munitionpershot=1 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
    2220        </Weapon>
    2321      </WeaponPack>
    … …  
    2725        </links>
    2826      </WeaponPack>
    29     </weapons>
     27    </weaponpacks>
     28    <munition>
     29      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     30    </munition>

  • code/trunk/data/levels/includes/weaponSettingsFPS.oxi

    r9348 r11052  
    1111      <WeaponSet firemode=1 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack firemode=0>
    1515        <links>
    … …  
    4949        /-->
    5050      </WeaponPack>
    51     </weapons>
     51    </weaponpacks>
     52    <munition>
     53      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
     54      <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     55    </munition>

  • code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi

    r10262 r11052  
    1111      <WeaponSet firemode=1 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack firemode=0>
    1515        <links>
    … …  
    4949        /-->
    5050      </WeaponPack>
    51     </weapons>
     51    </weaponpacks>
     52    <munition>
     53      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
     54      <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     55    </munition>

  • code/trunk/data/levels/includes/weaponSettingsFS15.oxi

    r10622 r11052  
    1212  <WeaponSet firemode=4 />
    1313</weaponsets>
    14 <weapons>
     14<weaponpacks>
    1515  <WeaponPack>
    1616    <links>
    … …  
    3838      <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    3939      <RocketFireOld mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    40       <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     40      <RocketFire mode=4 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    4141    </Weapon>
    4242  </WeaponPack>
    … …  
    4949    </Weapon-->
    5050  </WeaponPack>
    51 </weapons>
     51</weaponpacks>
     52<munition>
     53  <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     54  <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     55  <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     56  <GravityBombMunition initialmagazines=3 maxmagazines=3 munitionpermagazine=1 />
     57</munition>

  • code/trunk/data/levels/includes/weaponSettingsGhost.oxi

    r8857 r11052  
    1111      <WeaponSet firemode=2 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack>
    1515        <links>
    … …  
    1919        </links>
    2020        <Weapon>
    21           <HsW01 mode=0 munitionpershot=0 healthdamage=3.14159 delay=0 material="Flares/point_lensflare" />
    22           <HsW01 mode=0 munitionpershot=0 healthdamage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
     21          <HsW01 mode=0 munitionpershot=1 healthdamage=3.14159 delay=0 material="Flares/point_lensflare" />
     22          <HsW01 mode=0 munitionpershot=1 healthdamage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
    2323          <LightningGun mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
    2424        </Weapon>
    2525        <Weapon>
    26           <HsW01 mode=0 munitionpershot=0 damage=3.14159 delay=0  material="Flares/point_lensflare" />
    27           <HsW01 mode=0 munitionpershot=0 damage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
     26          <HsW01 mode=0 munitionpershot=1 damage=3.14159 delay=0  material="Flares/point_lensflare" />
     27          <HsW01 mode=0 munitionpershot=1 damage=3.14159 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
    2828          <LightningGun mode=1 muzzleoffset="0,0,0" damage=30 shielddamage=10 />
    2929        </Weapon>
    3030        <Weapon>
    31           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
     31          <SimpleRocketFire mode=2 munitionpershot=1 muzzleoffset="0,0,0" damage=50 />
    3232        </Weapon>
    3333        <Weapon>
    34           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 delay=0.1 />
     34          <SimpleRocketFire mode=2 munitionpershot=1 muzzleoffset="0,0,0" damage=50 delay=0.1 />
    3535        </Weapon>
    3636      </WeaponPack>
    37     </weapons>
     37    </weaponpacks>
     38    <munition>
     39      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     40      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     41      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     42    </munition>

  • code/trunk/data/levels/includes/weaponSettingsH2.oxi

    r7679 r11052  
    88      <WeaponSet firemode=1 />
    99    </weaponsets>
    10     <weapons>
     10    <weaponpacks>
    1111      <WeaponPack>
    1212        <links>
    … …  
    1818            <Model mesh="hs-w01s.mesh" roll="180" position="0.1, 0.0, 0.0" scale=2 />
    1919          </attached>
    20           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" />
    21           <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" />
     20          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" />
     21          <HsW01 mode=0 munitionpershot=1 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" />
    2222        </Weapon>
    2323        <Weapon>
    … …  
    2626            <Model mesh="hs-w01s.mesh" roll="180" position="-0.1, 0.0, 0.0" scale=2 />
    2727          </attached>
    28           <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" />
    29           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" />
     28          <HsW01 mode=0 munitionpershot=1 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" />
     29          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" />
    3030        </Weapon>
    3131      </WeaponPack>
    … …  
    4242        </Weapon>
    4343      </WeaponPack>
    44     </weapons>
     44    </weaponpacks>
     45    <munition>
     46      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     47    </munition>
    4548

  • code/trunk/data/levels/includes/weaponSettingsHXY.oxi

    r8755 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    2424        </Weapon>
    2525      </WeaponPack>
    26     </weapons>
     26    </weaponpacks>
     27    <munition>
     28      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     29      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     30    </munition>

  • code/trunk/data/levels/includes/weaponSettingsHeartAttack.oxi

    r10622 r11052  
    1111      <WeaponSet firemode=3 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack>
    1515        <links>
    … …  
    2020        </links>
    2121        <Weapon>
    22           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
    23           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
    24           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
    25           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
     22          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
     23          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -11.4, 0, -5" />
     24          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
     25          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 11.4, 0, -5" />
    2626        </Weapon>
    2727        <Weapon>
    28           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
    29           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
    30           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
    31           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
     28          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
     29          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" -15, 1.6, -2" />
     30          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
     31          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 15, 1.6, -2" />
    3232        </Weapon>
    3333        <Weapon>
    34           <LaserFire mode=1 munitionpershot=0 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
    35           <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
    36           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     34          <LaserFire mode=1 munitionpershot=1 muzzleoffset="2.2,6,16" damage=30 shielddamage=20 />
     35          <LaserFire mode=1 munitionpershot=1 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
     36          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    3737          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    3838        </Weapon>
    … …  
    4040        </Weapon>
    4141      </WeaponPack>
    42       <WeaponPack>
    43         <links>
    44           <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
    45         </links>
    46         <!--Weapon>
    47           <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
    48         </Weapon-->
    49       </WeaponPack>
    50     </weapons>
     42    </weaponpacks>
     43    <munition>
     44      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=6.0/>
     45      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     46      <RocketMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=1 />
     47      <GravityBombMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     48    </munition>

  • code/trunk/data/levels/includes/weaponSettingsHeavyCruiser.oxi

    r9943 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2424            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
    2525          </attached>
    26           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    27           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     26          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     27          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2828          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    2929        </Weapon>
    … …  
    3434            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,-10.3" scale=0.6 />
    3535          </attached>
    36           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    37           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     36          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     37          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    3838          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    3939        </Weapon>
    4040        <Weapon>
    4141          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    42           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     42          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    4343        </Weapon>
    4444      </WeaponPack>
    45       <WeaponPack>
    46         <links>
    47           <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
    48         </links>
    49         <!--Weapon>
    50           <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
    51         </Weapon-->
    52       </WeaponPack>
    53     </weapons>
     45    </weaponpacks>
     46    <munition>
     47      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=5.0/>
     48      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     49      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     50    </munition>

  • code/trunk/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi

    r9943 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2121          <attached>
    2222          </attached>
    23           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    24           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     23          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     24          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2525          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    2626        </Weapon>
    … …  
    2828          <attached>
    2929          </attached>
    30           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    31           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     30          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     31          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    3232          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    3333        </Weapon>
    3434        <Weapon>
    3535          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    36           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     36          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    3737        </Weapon>
    3838      </WeaponPack>
    … …  
    4545        </Weapon-->
    4646      </WeaponPack>
    47     </weapons>
     47    </weaponpacks>
     48    <munition>
     49      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
     50      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     51      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     52    </munition>

  • code/trunk/data/levels/includes/weaponSettingsImmTest.oxi

    r8706 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4444        <Weapon>
    4545          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" shielddamage=50 />
    46           <RocketFire mode=3 muzzleoffset="0,0,0" healthdamage=80 shielddamage=20 />
     46          <RocketFire mode=3 muzzleoffset="0,0,0" healthdamage=80 shielddamage=20 fuel=10 />
    4747        </Weapon>
    4848      </WeaponPack>
    … …  
    5555        </Weapon-->
    5656      </WeaponPack>
    57     </weapons>
     57    </weaponpacks>
     58    <munition>
     59      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
     60      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     61      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     62    </munition>

  • code/trunk/data/levels/includes/weaponSettingsPirate.oxi

    r7679 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    1414        </links>
    1515        <Weapon>
    16           <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
    17           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
     16          <HsW01 mode=0 munitionpershot=1 delay=0     damage=2.5 material="Flares/point_lensflare" />
     17          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
    1818        </Weapon>
    1919        <Weapon>
    20           <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
    21           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
     20          <HsW01 mode=0 munitionpershot=1 delay=0     damage=2.5 material="Flares/point_lensflare" />
     21          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
    2222        </Weapon>
    2323      </WeaponPack>
    24     </weapons>
     24    </weaponpacks>
     25    <munition>
     26      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.0/>
     27    </munition>

  • code/trunk/data/levels/includes/weaponSettingsRing.oxi

    r10650 r11052  
    1 <weaponslots>
    2   <WeaponSlot position="11,0,-7" />
    3   <WeaponSlot position="0,0,-7" />
    4   <WeaponSlot position="-11,0,-7" />
    5 </weaponslots>
    6 <weaponsets>
    7   <WeaponSet firemode=0 />
    8   <WeaponSet firemode=1 />
    9 </weaponsets>
    10 <weapons>
    11   <WeaponPack>
    12     <links>
    13       <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
    14       <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
    15     </links>
    16     <Weapon>
    17       <IceGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset="11,0,-3" freezefactor=0.5 freezetime=2.0 />
    18     </Weapon>
    19     <Weapon>
    20       <IceGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 muzzleoffset=" -11,0,-3" freezefactor=0.5 freezetime=2.0 />
    21     </Weapon>
    22     <Weapon>
    23       <GravityBombFire mode=1 munitionpershot=0 delay=0.125 damage=3 muzzleoffset="0,0,-7"/>
    24     </Weapon>
    25   </WeaponPack>
    26 </weapons>
     1    <weaponslots>
     2      <WeaponSlot position="11,0,-7" />
     3      <WeaponSlot position="-11,0,-7" />
     4      <WeaponSlot position="0,0,-7" />
     5    </weaponslots>
     6    <weaponsets>
     7      <WeaponSet firemode=0 />
     8      <WeaponSet firemode=1 />
     9      <WeaponSet firemode=2 />
     10    </weaponsets>
     11    <weaponpacks>
     12      <WeaponPack>
     13        <links>
     14          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
     15          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
     16          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
     17        </links>
     18        <Weapon>
     19          <LaserFire mode=0 munitionpershot=1 damage=10 shielddamage=5 />
     20          <IceGun mode=1 munitionpershot=1 delay=0.125 damage=9.3 muzzleoffset="11,0,-3" freezefactor=0.5 freezetime=2.0 />
     21        </Weapon>
     22        <Weapon>
     23          <LaserFire mode=0 munitionpershot=1 damage=10 shielddamage=5 />
     24          <IceGun mode=1 munitionpershot=1 delay=0.125 damage=9.3 muzzleoffset=" -11,0,-3" freezefactor=0.5 freezetime=2.0 />
     25        </Weapon>
     26        <Weapon>
     27          <GravityBombFire mode=2 munitionpershot=1 delay=0.125 damage=3 muzzleoffset="0,0,-7"/>
     28        </Weapon>
     29      </WeaponPack>
     30    </weaponpacks>
     31    <munition>
     32      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     33      <GravityBombMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=1 />
     34      <IceMunition initialmagazines=16 maxmagazines=16 munitionpermagazine=1 />
     35    </munition>

  • code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi

    r9348 r11052  
    1414      <WeaponSet firemode=3 />
    1515    </weaponsets>
    16     <weapons>
     16    <weaponpacks>
    1717      <WeaponPack>
    1818        <links>
    … …  
    2828            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
    2929          </attached>
    30           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    31           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     30          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     31          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    3232          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    3333        </Weapon>
    … …  
    3838            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
    3939          </attached>
    40           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    41           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     40          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     41          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    4242          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    4343        </Weapon>
    4444        <Weapon>
    4545          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    46           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     46          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    4747        </Weapon>
    4848        <Weapon>
    … …  
    5252            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
    5353          </attached>
    54           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    55           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     54          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     55          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    5656          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    5757        </Weapon>
    … …  
    6262            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
    6363          </attached>
    64           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    65           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     64          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     65          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    6666          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    6767        </Weapon>
    … …  
    7272            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
    7373          </attached>
    74           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    75           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     74          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     75          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    7676          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    7777        </Weapon>
    … …  
    8282            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
    8383          </attached>
    84           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    85           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     84          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     85          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    8686          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    8787        </Weapon>
    8888      </WeaponPack>
    89     </weapons>
     89    </weaponpacks>
     90    <munition>
     91      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     92      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     93      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     94    </munition>

  • code/trunk/data/levels/includes/weaponSettingsSwallow.oxi

    r10629 r11052  
    22      <WeaponSlot position=" 8,1.66,-17.5" />
    33      <WeaponSlot position="-8,1.66,-17.5" />
     4      <WeaponSlot position="0,1.66,-17.5" />
    45    </weaponslots>
    56    <weaponsets>
    … …  
    78      <WeaponSet firemode=1 />
    89    </weaponsets>
    9     <weapons>
     10    <weaponpacks>
    1011      <WeaponPack>
    1112        <links>
    … …  
    1415        </links>
    1516        <Weapon>
    16           <SplitGun mode=0 munitionpershot=0 damage=6.0 muzzleoffset="0.5,0.6,1.7" splittime=0.2 numberofsplits=2 numberofchilds=3 spread=0.1 damagereduction=2.0 />
     17          <SplitGun mode=0 munitionpershot=1 damage=6.0 muzzleoffset="0.5,0.6,1.7" splittime=0.2 numberofsplits=2 numberofchilds=3 spread=0.1 damagereduction=2.0 />
     18          <LaserFire mode=1 munitionpershot=1 damage=10.0 muzzleoffset="0.5,0.6,1.7" />
    1719        </Weapon>
    1820        <Weapon>
    19           <SplitGun mode=0 munitionpershot=0 damage=6.0 muzzleoffset="-0.5,0.6,1.7" splittime=0.2 numberofsplits=2 numberofchilds=3 spread=0.1 damagereduction=2.0 />
    20         </Weapon>
     21          <SplitGun mode=0 munitionpershot=1 damage=6.0 muzzleoffset="-0.5,0.6,1.7" splittime=0.2 numberofsplits=2 numberofchilds=3 spread=0.1 damagereduction=2.0 />
     22          <LaserFire mode=1 munitionpershot=1 damage=10.0 muzzleoffset="-0.5,0.6,1.7" />
     23        </Weapon>       
    2124      </WeaponPack>
    22     </weapons>
     25    </weaponpacks>
     26    <munition>
     27      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     28      <SplitMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     29    </munition>

  • code/trunk/data/levels/includes/weaponSettingsTransporter.oxi

    r8891 r11052  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    1414        </links>
    1515        <Weapon>
    16           <HsW01 mode=0 munitionpershot=0 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    17           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     16          <HsW01 mode=0 munitionpershot=1 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     17          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    1818          <LightningGun mode=1 muzzleoffset="0,0,0"   damage=3.14159 shielddamage=20 />
    1919        </Weapon>
    2020        <Weapon>
    21           <HsW01 mode=0 munitionpershot=0 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    22           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     21          <HsW01 mode=0 munitionpershot=1 delay=0.1   damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     22          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2323          <LightningGun mode=1 muzzleoffset="0,0,0"   damage=3.14159 shielddamage=20 />
    2424        </Weapon>
    2525      </WeaponPack>
    26     </weapons>
     26    </weaponpacks>
     27    <munition>
     28      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     29      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     30    </munition>

  • code/trunk/data/levels/includes/weaponSettingsTurret.oxi

    r10216 r11052  
    55      <WeaponSet firemode=0 />
    66    </weaponsets>
    7     <weapons>
     7    <weaponpacks>
    88      <WeaponPack>
    99        <links>
    … …  
    2020        </Weapon>
    2121      </WeaponPack>
    22     </weapons>
     22    </weaponpacks>
     23    <munition>
     24      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     25    </munition>

  • code/trunk/data/levels/includes/weaponSettingsTurret1.oxi

    r10262 r11052  
    55      <WeaponSet firemode=0 />
    66    </weaponsets>
    7     <weapons>
     7    <weaponpacks>
    88      <WeaponPack>
    99        <links>
    … …  
    2020        </Weapon>
    2121      </WeaponPack>
    22     </weapons>
     22    </weaponpacks>
     23    <munition>
     24      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     25    </munition>

  • code/trunk/data/levels/includes/weaponSettingsbigship.oxi

    r9664 r11052  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    2121          <attached>
    2222          </attached>
    23           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    24           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
     23          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
     24          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    2525          <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
    2626        </Weapon>
    … …  
    2929           
    3030          </attached>
    31           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    32           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
     31          <HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
     32          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    3333          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    3434        </Weapon>
    3535        <Weapon>
    3636          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    37           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     37          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 fuel=10 />
    3838        </Weapon>
    3939      </WeaponPack>
    … …  
    4646        </Weapon-->
    4747      </WeaponPack>
    48     </weapons>
     48    </weaponpacks>
     49    <munition>
     50      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
     51      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     52      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     53    </munition>

  • code/trunk/data/levels/kecks.oxw

    r10262 r11052  
    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/trunk/data/levels/missionOne.oxw

    r9985 r11052  
    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
    … …  
    10801100        maxshieldhealth     = "120"
    10811101        shieldabsorption    = "0.8"
    1082         reloadrate          = "1"
    1083         reloadwaittime      = "1"
     1102        shieldrechargerate  = "1"
     1103        shieldrechargewaittime = "1"
    10841104        name                = "cruiser"
    10851105        radarname           = "Spacecruiser" >
    … …  
    16591679
    16601680<!-- @Triggers: HACK. The attacktrigger6 Event is created, but does not trigger the Script.
    1661 (WTF?) TODO: looks like a BUG 
     1681(WTF?) TODO: looks like a BUG
    16621682Thus a distanceTrigger is created, that gets enabled, when the inner trigger gets activated.
    16631683Due to the large radius it is likely that it actually gets triggered.
    16641684-->
    16651685
    1666   <DistanceTrigger name="testDistanceTrigger" position="0,0,0" distance=10000 target="SpaceShip" stayActive="true" delay=37.0>
     1686  <DistanceTrigger name="testDistanceTrigger" position="0,0,0" distance=10000 target="Pawn" stayActive="true" delay=37.0>
    16671687    <EventTrigger name="testEventTrigger" activations="1" stayactive="true" delay=0.1>
    16681688      <events>

  • code/trunk/data/levels/notifications.oxw

    r9348 r11052  
    1919    <?lua include("includes/notifications.oxi") ?>
    2020
     21    <NotificationQueueCEGUI
     22      name="narrative"
     23      targets="simpleNotification,commandNotification"
     24      size=3
     25      displayTime=3.9
     26      position="0.2, 0, 0.1, 0"
     27      fontSize="23"
     28      fontColor="0.3, 1, 0.2, 0.8"
     29      alignment="HorzCentred"
     30      displaySize="0.6, 0, 0, 0"
     31      />
     32
    2133    <Scene
    2234        ambientlight = "0.5, 0.5, 0.5"
    … …  
    2537
    2638    <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" />
     39    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    2740
    28     <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay toggleVisibility PickupInventory">
     41    <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay show PickupInventory">
    2942        <events>
    3043            <trigger>
    … …  
    4457    <Billboard position="0,0,100" colour="1.0,0,1.0" material="Examples/Flare" />
    4558
    46     <?lua
    47       for i = 1, 10, 1 do
    48     ?>
    49         <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    50     <?lua end ?>
    51 
    5259  </Scene>
    5360</Level>

  • code/trunk/data/levels/pickups.oxw

    r9939 r11052  
    3636    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    3737
     38    <!-- Boost pickup -->
     39   
     40    <PickupSpawner pickup=smallboostpickup position="-25,-125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     41    <PickupSpawner pickup=mediumboostpickup position="0,-125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     42    <PickupSpawner pickup=hugeboostpickup position="25,-125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     43
     44    <!-- DamageBoost pickup -->
     45   
     46    <PickupSpawner pickup=smalldamageboostpickup position="-25,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     47    <PickupSpawner pickup=mediumdamageboostpickup position="0,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     48    <PickupSpawner pickup=hugedamageboostpickup position="25,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     49
     50    <!-- Munition pickups -->
     51
     52    <PickupSpawner pickup=smallmunitionpickup position="-25,-75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     53    <PickupSpawner pickup=mediummunitionpickup position="0,-75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     54    <PickupSpawner pickup=hugemunitionpickup position="25,-75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />   
     55
     56    <!-- Shrink pickup -->
     57
     58    <PickupSpawner pickup=smallshrinkpickup position="-25,-50,-125" triggerDistance="20" respawnTime="60" maxSpawnedItems="5" />
     59    <PickupSpawner pickup=mediumshrinkpickup position="0,-50,-125" triggerDistance="20" respawnTime="60" maxSpawnedItems="5" />
     60    <PickupSpawner pickup=hugeshrinkpickup position="25,-50,-125" triggerDistance="20" respawnTime="60" maxSpawnedItems="5" />   
     61
    3862    <!-- Shield pickups -->
    3963
    … …  
    6387
    6488    <!-- Meta pickups -->
    65 
    66     <Template name=usemetapickup baseclass=MetaPickup>
    67       <MetaPickup representation="use" metaType="use" />
    68     </Template>
    69    
    70     <Template name=dropmetapickup baseclass=MetaPickup>
    71       <MetaPickup representation="drop" metaType="drop" />
    72     </Template>
    73    
    74     <Template name=destroymetapickup baseclass=MetaPickup>
    75       <MetaPickup metaType="destroy" />
    76     </Template>
    77    
    78     <Template name=destroycarriermetapickup baseclass=MetaPickup>
    79       <MetaPickup metaType="destroyCarrier" />
    80     </Template>
    8189   
    8290    <PickupSpawner pickup=usemetapickup position="-25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    … …  
    9199    <!-- Drone pickup -->
    92100   
    93     <PickupSpawner pickup=dronepickup position="-50,50,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    94    
    95     <!-- DamageBoost pickup -->
    96    
    97     <PickupSpawner pickup=smalldamageboostpickup position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    98     <PickupSpawner pickup=mediumdamageboostpickup position="-50,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    99     <PickupSpawner pickup=largedamageboostpickup position="-50,125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     101    <PickupSpawner pickup=dronepickup position="-25,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    100102   
    101103    <!-- Other pickups -->
    … …  
    103105    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    104106    <PickupRepresentation
    105       name = "MediumHealth"
    106       pickupName = "Medium Health Pack"
    107       pickupDescription = "Once used adds a medium amout of health to the ship."
     107      name = "ContinousHealth"
     108      pickupName = "Continous Health Pack"
     109      pickupDescription = "While useing adds a medium amout of health to the ship."
    108110      spawnerTemplate = "mediumhealthpickupRepresentation"
    109111      inventoryRepresentation = "MediumHealth"
    … …  
    111113
    112114    <Template name=continuoushealthpickup baseclass=HealthPickup>
    113       <HealthPickup representation="MediumHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
     115      <HealthPickup representation="ContinousHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
    114116    </Template>
    115117   
    116118    <PickupSpawner pickup=continuoushealthpickup position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    117 
    118     <PickupSpawner pickup="smallshrinkpickup" position="-25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    119     <PickupSpawner pickup="mediumshrinkpickup" position="0,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    120     <PickupSpawner pickup="hugeshrinkpickup" position="25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    121119   
    122120    <!-- @Objects: 4 boxes (uncontrolled pawns) -->
    … …  
    177175    </Pawn>
    178176
    179     <!--StaticEntity position="0,-200,0" direction="0,-1,0" collisionType=static mass=500 friction=0.01 >
    180       <attached>
    181         <Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" />
    182       </attached>
    183       <collisionShapes>
    184         <BoxCollisionShape position="0,0,0" halfExtents="10,10,10" />
    185       </collisionShapes>
    186   </StaticEntity-->
    187 
    188177  </Scene>
    189178</Level>

  • code/trunk/data/levels/presentationHS13.oxw

    r10258 r11052  
    162162        maxshieldhealth     = "120"
    163163        shieldabsorption    = "0.8"
    164         reloadrate          = "1"
    165         reloadwaittime      = "1"
     164        shieldrechargerate  = "1"
     165        shieldrechargewaittime = "1"
    166166        name                = "Tanis1"
    167167        radarname           = "Tanis Cruiser" >

  • code/trunk/data/levels/shieldTest.oxw

    r9016 r11052  
    4343    shieldabsorption= 1
    4444
    45     reloadrate= "10"
    46     reloadwaittime= 1
     45    shieldrechargerate = "10"
     46    shieldrechargewaittime = 1
    4747
    4848>

  • code/trunk/data/levels/templates/FPS.oxt

    r10258 r11052  
    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/trunk/data/levels/templates/FPS_HS14.oxt

    r10262 r11052  
    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/trunk/data/levels/templates/HeavyCruiser.oxt

    r10216 r11052  
    1919   maxshieldhealth     = 50
    2020   shieldabsorption    = 0.8
    21    reloadrate          = 1
    22    reloadwaittime      = 1
     21   shieldrechargerate  = 1
     22   shieldrechargewaittime = 1
    2323
    2424   primaryThrust     = 300
    … …  
    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/trunk/data/levels/templates/HeavyCruiserBody.oxt

    r9943 r11052  
    1717   maxshieldhealth     = 500
    1818   shieldabsorption    = 0.8
    19    reloadrate          = 1
    20    reloadwaittime      = 1
     19   shieldrechargerate  = 1
     20   shieldrechargewaittime = 1
    2121
    2222   primaryThrust     = 300
    … …  
    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/trunk/data/levels/templates/ModularSpaceShipTest.oxt

    r10262 r11052  
    1515   maxshieldhealth     = 50
    1616   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 100
    … …  
    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/trunk/data/levels/templates/bigship.oxt

    r9664 r11052  
    1515   maxshieldhealth     = 50
    1616   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 30
    … …  
    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/trunk/data/levels/templates/enemyInvader.oxt

    r9954 r11052  
    1515   maxshieldhealth     = 10
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 150
    … …  
    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")
    … …  
    7788   maxshieldhealth     = 20
    7889   shieldabsorption    = 0.9
    79    reloadrate          = 1
    80    reloadwaittime      = 1
     90   shieldrechargerate  = 1
     91   shieldrechargewaittime = 1
    8192
    8293   primaryThrust     = 150

  • code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt

    r9348 r11052  
     1<!-- Boost pickups: -->
     2
     3<Template name=smallboostpickupRepresentation>
     4    <PickupRepresentation>
     5        <spawner-representation>
     6            <StaticEntity>
     7                <attached>
     8                    <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Sphere2" scale=0.1>
     9                        <attached>
     10                            <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Flash" scale=0.3 />
     11                        </attached>
     12                    </Billboard>
     13                </attached>
     14            </StaticEntity>
     15        </spawner-representation>
     16    </PickupRepresentation>
     17</Template>
     18
     19<Template name=smallboostpickup baseclass=BoostPickup>
     20  <BoostPickup
     21    representation = "smallboostpickup"
     22    boostrefill = 0.5
     23    activationType = "immediate"
     24    durationType = "once"
     25  />
     26</Template>
     27
     28<Template name=mediumboostpickupRepresentation>
     29    <PickupRepresentation>
     30        <spawner-representation>
     31            <StaticEntity>
     32                <attached>
     33                    <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Sphere2" scale=0.1>
     34                        <attached>
     35                            <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Flash" scale=0.5 />
     36                        </attached>
     37                    </Billboard>
     38                </attached>
     39            </StaticEntity>
     40        </spawner-representation>
     41    </PickupRepresentation>
     42</Template>
     43
     44<Template name=mediumboostpickup baseclass=BoostPickup>
     45  <BoostPickup
     46    representation = "mediumboostpickup"
     47    boostrefill = 0.75
     48    activationType = "immediate"
     49    durationType = "once"
     50  />
     51</Template>
     52
     53<Template name=hugeboostpickupRepresentation>
     54    <PickupRepresentation>
     55        <spawner-representation>
     56            <StaticEntity>
     57                <attached>
     58                    <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Sphere2" scale=0.1>
     59                        <attached>
     60                            <Billboard position="0,0,0" colour="0.0,1.0,0.8" material="Flash" scale=0.7 />
     61                        </attached>
     62                    </Billboard>
     63                </attached>
     64            </StaticEntity>
     65        </spawner-representation>
     66    </PickupRepresentation>
     67</Template>
     68
     69<Template name=hugeboostpickup baseclass=BoostPickup>
     70  <BoostPickup
     71    representation = "hugeboostpickup"
     72    boostrefill = 1.0
     73    activationType = "immediate"
     74    durationType = "once"
     75  />
     76</Template>
     77
    178<!-- Shield pickups: -->
    279
    … …  
    189266</Template>
    190267
     268<!-- Munition pickups: -->
     269
     270<Template name=smallmunitionpickupRepresentation>
     271    <PickupRepresentation>
     272        <spawner-representation>
     273            <StaticEntity>
     274                <attached>
     275                    <Billboard position="0,0,0" colour="0.59,0.30,0.16" material="Sphere2" scale=0.1>
     276                        <attached>
     277                            <Billboard position="0,0,0" colour="0.47,0.24,0.13" material="Munition" scale=0.3 />
     278                        </attached>
     279                    </Billboard>
     280                </attached>
     281            </StaticEntity>
     282        </spawner-representation>
     283    </PickupRepresentation>
     284</Template>
     285
     286<Template name=smallmunitionpickup baseclass=MunitionPickup>
     287  <MunitionPickup
     288    representation = "smallmunitionpickup"
     289    activationType = "immediate"
     290    durationType = "once"
     291  >
     292    <munitioncontainers>
     293        <MunitionContainer munitiontype="LaserMunition" munitionamount=16 magazinesamount=0 />
     294        <MunitionContainer munitiontype="FusionMunition" munitionamount=8 magazinesamount=0 />
     295        <MunitionContainer munitiontype="LightningMunition" munitionamount=8 magazinesamount=0 />
     296    </munitioncontainers>
     297  </MunitionPickup>
     298</Template>
     299
     300<Template name=mediummunitionpickupRepresentation>
     301    <PickupRepresentation>
     302        <spawner-representation>
     303            <StaticEntity>
     304                <attached>
     305                    <Billboard position="0,0,0" colour="0.59,0.30,0.16" material="Sphere2" scale=0.1>
     306                        <attached>
     307                            <Billboard position="0,0,0" colour="0.47,0.24,0.13" material="Munition" scale=0.5 />
     308                        </attached>
     309                    </Billboard>
     310                </attached>
     311            </StaticEntity>
     312        </spawner-representation>
     313    </PickupRepresentation>
     314</Template>
     315
     316<Template name=mediummunitionpickup baseclass=MunitionPickup>
     317  <MunitionPickup
     318    representation = "mediummunitionpickup"
     319    activationType = "immediate"
     320    durationType = "once"
     321  >
     322    <munitioncontainers>
     323        <MunitionContainer munitiontype="LaserMunition" munitionamount=32 magazinesamount=0 />
     324        <MunitionContainer munitiontype="FusionMunition" munitionamount=16 magazinesamount=0 />
     325        <MunitionContainer munitiontype="LightningMunition" munitionamount=16 magazinesamount=0 />       
     326        <MunitionContainer munitiontype="SplitMunition" munitionamount=8 magazinesamount=0 />
     327        <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=2 />
     328        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=2 />
     329    </munitioncontainers>
     330  </MunitionPickup>
     331</Template>
     332
     333<Template name=hugemunitionpickupRepresentation>
     334    <PickupRepresentation>
     335        <spawner-representation>
     336            <StaticEntity>
     337                <attached>
     338                    <Billboard position="0,0,0" colour="0.59,0.30,0.16" material="Sphere2" scale=0.1>
     339                        <attached>
     340                            <Billboard position="0,0,0" colour="0.47,0.24,0.13" material="Munition" scale=0.7 />
     341                        </attached>
     342                    </Billboard>
     343                </attached>
     344            </StaticEntity>
     345        </spawner-representation>
     346    </PickupRepresentation>
     347</Template>
     348
     349<Template name=hugemunitionpickup baseclass=MunitionPickup>
     350  <MunitionPickup
     351    representation = "hugemunitionpickup"
     352    activationType = "immediate"
     353    durationType = "once"
     354  >
     355    <munitioncontainers>
     356        <MunitionContainer munitiontype="LaserMunition" munitionamount=64 magazinesamount=0 />
     357        <MunitionContainer munitiontype="FusionMunition" munitionamount=32 magazinesamount=0 />
     358        <MunitionContainer munitiontype="LightningMunition" munitionamount=32 magazinesamount=0 />       
     359        <MunitionContainer munitiontype="SplitMunition" munitionamount=16 magazinesamount=0 />
     360        <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=10 />
     361        <MunitionContainer munitiontype="IceMunition" munitionamount=0 magazinesamount=10 />
     362        <MunitionContainer munitiontype="GravityBombMunition" munitionamount=0 magazinesamount=10 />
     363        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=10 />
     364    </munitioncontainers>
     365  </MunitionPickup>
     366</Template>
     367
    191368<!-- Meta pickups: -->
    192369
    … …  
    196373            <StaticEntity>
    197374                <attached>
    198                     <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
    199                         <attached>
    200                             <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
    201                         </attached>
    202                     </Billboard>
    203                 </attached>
    204             </StaticEntity>
    205         </spawner-representation>
    206     </PickupRepresentation>
     375                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
     376                        <attached>
     377                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="ArrowUp" scale=0.65 />
     378                        </attached>
     379                    </Billboard>
     380                </attached>
     381            </StaticEntity>
     382        </spawner-representation>
     383    </PickupRepresentation>
     384</Template>
     385
     386<Template name=usemetapickup baseclass=MetaPickup>
     387  <MetaPickup representation="use" metaType="use" />
    207388</Template>
    208389
    … …  
    212393            <StaticEntity>
    213394                <attached>
    214                     <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1>
    215                         <attached>
    216                             <Billboard position="0,0,0" colour="0.95,0.20,0.10" material="Arrow" scale=0.65 />
    217                         </attached>
    218                     </Billboard>
    219                 </attached>
    220             </StaticEntity>
    221         </spawner-representation>
    222     </PickupRepresentation>
     395                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
     396                        <attached>
     397                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="ArrowDown" scale=0.65 />
     398                        </attached>
     399                    </Billboard>
     400                </attached>
     401            </StaticEntity>
     402        </spawner-representation>
     403    </PickupRepresentation>
     404</Template>
     405
     406<Template name=dropmetapickup baseclass=MetaPickup>
     407  <MetaPickup representation="drop" metaType="drop" />
     408</Template>
     409
     410<Template name=destroypickupRepresentation>
     411    <PickupRepresentation>
     412        <spawner-representation>
     413            <StaticEntity>
     414                <attached>
     415                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
     416                        <attached>
     417                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Splash" scale=0.65 />
     418                        </attached>
     419                    </Billboard>
     420                </attached>
     421            </StaticEntity>
     422        </spawner-representation>
     423    </PickupRepresentation>
     424</Template>
     425
     426<Template name=destroymetapickup baseclass=MetaPickup>
     427  <MetaPickup representation="destroy" metaType="destroy" />
     428</Template>
     429
     430<Template name=destroycarrierpickupRepresentation>
     431    <PickupRepresentation>
     432        <spawner-representation>
     433            <StaticEntity>
     434                <attached>
     435                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.1>
     436                        <attached>
     437                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Asterisk" scale=0.65 />
     438                        </attached>
     439                    </Billboard>
     440                </attached>
     441            </StaticEntity>
     442        </spawner-representation>
     443    </PickupRepresentation>
     444</Template>
     445
     446<Template name=destroycarriermetapickup baseclass=MetaPickup>
     447  <MetaPickup representation="destroycarrier" metaType="destroyCarrier" />
    223448</Template>
    224449
    … …  
    232457                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
    233458                        <attached>
    234                             <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageSmall" scale=0.7 />
     459                            <Billboard position="0,0,0" colour="0.70,0.10,0.10" material="Damage" scale=0.3 />
    235460                        </attached>
    236461                    </Billboard>
    … …  
    258483                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
    259484                        <attached>
    260                             <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageMedium" scale=0.7 />
     485                            <Billboard position="0,0,0" colour="0.70,0.10,0.10" material="Damage" scale=0.5 />
    261486                        </attached>
    262487                    </Billboard>
    … …  
    277502</Template>
    278503
    279 <Template name=largedamageboostpickupRepresentation>
     504<Template name=hugedamageboostpickupRepresentation>
    280505    <PickupRepresentation>
    281506        <spawner-representation>
    … …  
    284509                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
    285510                        <attached>
    286                             <Billboard position="0,0,0" colour="0.30,0.30,0.30" material="damageLarge" scale=0.7 />
    287                         </attached>
    288                     </Billboard>
    289                 </attached>
    290             </StaticEntity>
    291         </spawner-representation>
    292     </PickupRepresentation>
    293 </Template>
    294 
    295 <Template name=largedamageboostpickup baseclass=DamageBoostPickup>
     511                            <Billboard position="0,0,0" colour="0.70,0.10,0.10" material="Damage" scale=0.7 />                           
     512                        </attached>
     513                    </Billboard>
     514                </attached>
     515            </StaticEntity>
     516        </spawner-representation>
     517    </PickupRepresentation>
     518</Template>
     519
     520<Template name=hugedamageboostpickup baseclass=DamageBoostPickup>
    296521  <DamageBoostPickup
    297     representation = "largedamageboostpickup"
     522    representation = "hugedamageboostpickup"
    298523    duration = 10.0
    299524    damageMultiplier = 7.0
    … …  
    498723                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
    499724                        <attached>
    500                             <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.4 />
     725                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.35 />
    501726                        </attached>
    502727                    </Billboard>
    … …  
    524749                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
    525750                        <attached>
    526                             <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.7 />
     751                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.55 />
    527752                        </attached>
    528753                    </Billboard>
    … …  
    550775                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
    551776                        <attached>
    552                             <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=1.0 />
     777                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.75 />
    553778                        </attached>
    554779                    </Billboard>
    … …  
    609834        </attached>
    610835        <collisionShapes>
    611             <BoxCollisionShape position="0,0,0"      halfExtents="1, 1, 1" />
     836            <SphereCollisionShape position="0,0,0" radius=5 />
    612837        </collisionShapes>
    613838        <weaponslots>
    614             <WeaponSlot position="    0,   0,0" />
     839            <WeaponSlot position="0,0,0" />
    615840        </weaponslots>
    616841        <weaponsets>
    617842            <WeaponSet firemode=0 />
    618843        </weaponsets>
    619         <weapons>
     844        <weaponpacks>
    620845            <WeaponPack>
    621846                <links>
    … …  
    631856                </Weapon>
    632857            </WeaponPack>
    633         </weapons>
     858        </weaponpacks>
     859        <munition>
     860            <LaserMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     861        </munition>
    634862    </Drone>
    635863</Template>

  • code/trunk/data/levels/templates/spaceshipAssff.oxt

    r9939 r11052  
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    66   spawnparticleduration  = 3
    7    explosionchunks        = 6
    87
    98   health            = 100
    … …  
    1514   maxshieldhealth     = 50
    1615   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     16   shieldrechargerate  = 1
     17   shieldrechargewaittime = 1
    1918
    2019   primaryThrust     = 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/trunk/data/levels/templates/spaceshipAssff2.oxt

    r8860 r11052  
    1515   maxshieldhealth     = 150
    1616   shieldabsorption    = 0.95
    17    reloadrate          = 5
    18    reloadwaittime      = 0.5
     17   shieldrechargerate  = 5
     18   shieldrechargewaittime = 0.5
    1919
    2020   primaryThrust     = 100
    … …  
    3737   linearDamping     = 0.7
    3838   angularDamping    = 0.9999999
     39
     40   explosionSound = "sounds/Explosion2.ogg"
    3941  >
    4042    <engines>
    … …  
    5557      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    5658    </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>
    5770<?lua
    5871  include("../includes/weaponSettingsAssff2.oxi")

  • code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt

    r9664 r11052  
    1616   maxshieldhealth     = 50
    1717   shieldabsorption    = 0.8
    18    reloadrate          = 1
    19    reloadwaittime      = 1
     18   shieldrechargerate  = 1
     19   shieldrechargewaittime = 1
    2020
    2121   primaryThrust     = 100
    … …  
    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/trunk/data/levels/templates/spaceshipDodgeRace.oxt

    r10262 r11052  
    1515   maxshieldhealth     = 20
    1616   shieldabsorption    = 0.1
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 150
    … …  
    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/trunk/data/levels/templates/spaceshipEscort.oxt

    r9664 r11052  
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    66   spawnparticleduration  = 3
    7    explosionchunks        = 4
     7   explosionchunks        = 10
    88
    99   health            = 80
    … …  
    1515   maxshieldhealth     = 60
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 150
    … …  
    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")
    … …  
    92104    <EffectContainer condition="idle">
    93105      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
     106       />
     107      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
     108      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
    94109    </EffectContainer>
    95110    <EffectContainer condition="not idle">
    … …  
    101116    </EffectContainer>
    102117    <EffectContainer condition="normal or boost">
    103       <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    104       <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, 0, 10" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     118      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     119      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    105120    </EffectContainer>
     121
    106122    <EffectContainer condition="boost">
    107123      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />

  • code/trunk/data/levels/templates/spaceshipGhost.oxt

    r8858 r11052  
    1515   maxshieldhealth     = 150
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 3
    18    reloadwaittime      = 0.0
     17   shieldrechargerate  = 3
     18   shieldrechargewaittime = 0.0
    1919
    2020   primaryThrust     = 600
    … …  
    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/trunk/data/levels/templates/spaceshipH2.oxt

    r8858 r11052  
    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/trunk/data/levels/templates/spaceshipHXY.oxt

    r8858 r11052  
    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/trunk/data/levels/templates/spaceshipHXYSL.oxt

    r8858 r11052  
    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/trunk/data/levels/templates/spaceshipHeartAttack.oxt

    r10622 r11052  
    1515   maxshieldhealth     = 800
    1616   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 40
    … …  
    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/trunk/data/levels/templates/spaceshipInvader.oxt

    r9943 r11052  
    1515   maxshieldhealth     = 60
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 150
    … …  
    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/trunk/data/levels/templates/spaceshipPirate.oxt

    r8858 r11052  
    1515   maxshieldhealth     = 40
    1616   shieldabsorption    = 0.6
    17    reloadrate          = 2
    18    reloadwaittime      = 0.5
     17   shieldrechargerate  = 2
     18   shieldrechargewaittime = 0.5
    1919
    2020   primaryThrust     = 100
    … …  
    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/trunk/data/levels/templates/spaceshipRace.oxt

    r9348 r11052  
    1515   maxshieldhealth     = 50
    1616   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 100
    … …  
    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/trunk/data/levels/templates/spaceshipRing.oxt

    r10622 r11052  
    1515   maxshieldhealth     = 60
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 150
    … …  
    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/trunk/data/levels/templates/spaceshipSpacecruiser.oxt

    r9348 r11052  
    1515   maxshieldhealth     = 90
    1616   shieldabsorption    = 0.9
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 90
    … …  
    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/trunk/data/levels/templates/spaceshipSwallow.oxt

    r8858 r11052  
    1515   maxshieldhealth     = 80
    1616   shieldabsorption    = 0.75
    17    reloadrate          = 1.5
    18    reloadwaittime      = 0.2
     17   shieldrechargerate  = 1.5
     18   shieldrechargewaittime = 0.2
    1919
    2020   primaryThrust     = 600;
    … …  
    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/trunk/data/levels/templates/spaceshipTransporter.oxt

    r8858 r11052  
    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/trunk/data/levels/templates/spaceshipTransporterSL.oxt

    r8858 r11052  
    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/trunk/data/levels/templates/spaceshipTurret.oxt

    r9664 r11052  
    1515   maxshieldhealth     = 50
    1616   shieldabsorption    = 0.8
    17    reloadrate          = 1
    18    reloadwaittime      = 1
     17   shieldrechargerate  = 1
     18   shieldrechargewaittime = 1
    1919
    2020   primaryThrust     = 100
    … …  
    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/trunk/data/levels/templates/towerdefensetower.oxt

    r10622 r11052  
    44
    55        explosionchunks        = 6
    6         reloadrate=10
    7         reloadwaittime=5
     6        shieldrechargerate=10
     7        shieldrechargewaittime=5
    88        collisionType="none"
    99        pitch="0"

  • code/trunk/data/levels/towerDefense.oxw

    r10629 r11052  
    3939  <TowerDefenseTower
    4040  explosionchunks=6
    41   reloadrate=10
    42   reloadwaittime=5
     41  shieldrechargerate=10
     42  shieldrechargewaittime=5
    4343  collisionType="none"
    4444  pitch="0"
    … …  
    6060      <WeaponSet firemode=0 />
    6161    </weaponsets>
    62     <weapons>
     62    <weaponpacks>
    6363      <WeaponPack>
    6464        <links>
    … …  
    6969        </Weapon>
    7070      </WeaponPack>
    71     </weapons>
     71    </weaponpacks>
     72    <munition>
     73      <LaserMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
     74    </munition>
    7275  </TowerDefenseTower>
    7376</Template>
    … …  
    7679  <TowerDefenseTower
    7780  explosionchunks=6
    78   reloadrate=10
    79   reloadwaittime=5
     81  shieldrechargerate=10
     82  shieldrechargewaittime=5
    8083  collisionType="none"
    8184  pitch="0"
    … …  
    97100      <WeaponSet firemode=0 />
    98101    </weaponsets>
    99     <weapons>
     102    <weaponpacks>
    100103      <WeaponPack>
    101104        <links>
    … …  
    106109        </Weapon>
    107110      </WeaponPack>
    108     </weapons>
     111    </weaponpacks>
     112    <munition>
     113      <LightningMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     114    </munition>
    109115    <attached>
    110116      <Backlight position="0,0,0" scale=2.0 colour="0.4, 0.0, 1.0" width=10 length=10 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />
    … …  
    116122  <TowerDefenseTower
    117123  explosionchunks=6
    118   reloadrate=10
    119   reloadwaittime=5
     124  shieldrechargerate=10
     125  shieldrechargewaittime=5
    120126  collisionType="none"
    121127  pitch="0"
    … …  
    137143      <WeaponSet firemode=0 />
    138144    </weaponsets>
    139     <weapons>
     145    <weaponpacks>
    140146      <WeaponPack>
    141147        <links>
    … …  
    146152        </Weapon>
    147153      </WeaponPack>
    148     </weapons>
     154    </weaponpacks>
     155    <munition>
     156      <SplitMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     157    </munition>
    149158  </TowerDefenseTower>
    150159</Template>
    … …  
    153162  <TowerDefenseTower
    154163  explosionchunks=6
    155   reloadrate=10
    156   reloadwaittime=5
     164  shieldrechargerate=10
     165  shieldrechargewaittime=5
    157166  collisionType="none"
    158167  pitch="0"
    … …  
    174183      <WeaponSet firemode=0 />
    175184    </weaponsets>
    176     <weapons>
     185    <weaponpacks>
    177186      <WeaponPack>
    178187        <links>
    … …  
    180189        </links>
    181190        <Weapon>
    182           <RocketFire mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 /> 
     191          <RocketFire mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 fuel=10/> 
    183192        </Weapon>
    184193      </WeaponPack>
    185     </weapons>
     194    </weaponpacks>
     195    <munition>
     196      <RocketMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     197    </munition>
    186198      <attached>
    187199      <ParticleSpawner position="0,0,0" source="Orxonox/sparks" lifetime=3.0 autostart=1 loop=1 />
    … …  
    193205  <TowerDefenseTower
    194206  explosionchunks=6
    195   reloadrate=10
    196   reloadwaittime=5
     207  shieldrechargerate=10
     208  shieldrechargewaittime=5
    197209  collisionType="none"
    198210  pitch="0"
    … …  
    214226      <WeaponSet firemode=0 />
    215227    </weaponsets>
    216     <weapons>
     228    <weaponpacks>
    217229      <WeaponPack>
    218230        <links>
    … …  
    223235        </Weapon>
    224236      </WeaponPack>
    225     </weapons>
     237    </weaponpacks>
     238    <munition>
     239      <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     240    </munition>
    226241  </TowerDefenseTower>
    227242</Template>
    … …  
    243258   maxshieldhealth     = 15
    244259   shieldabsorption    = 0.8
    245    reloadrate          = 1
    246    reloadwaittime      = 1
     260   shieldrechargerate  = 1
     261   shieldrechargewaittime = 1
    247262
    248263   primaryThrust     = 1000
    … …  
    308323   maxshieldhealth     = 0
    309324   shieldabsorption    = 0.8
    310    reloadrate          = 1
    311    reloadwaittime      = 1
     325   shieldrechargerate = 1
     326   shieldrechargewaittime = 1
    312327
    313328   primaryThrust     = 100
    … …  
    381396   maxshieldhealth     = 5
    382397   shieldabsorption    = 0.8
    383    reloadrate          = 1
    384    reloadwaittime      = 1
     398   shieldrechargerate  = 1
     399   shieldrechargewaittime = 1
    385400
    386401   primaryThrust     = 100

  • code/trunk/data/overlays/HUDTemplates3.oxo

    r10292 r11052  
    2727</Template>
    2828
     29<Template name="rockethud">
     30  <OverlayGroup name = "rockethud" scale = "1, 1">
     31    <HUDRocketFuelBar
     32     name          = "RocketFuelBar1"
     33     background    = "Orxonox/BarBackground"
     34     size          = "0.40, 0.04"
     35     position      = "0.0 , 1.0 "
     36     pickpoint     = "0, 1"
     37     correctaspect = true
     38     iconmaterial  = "Orxonox/BarIconFuel"
     39    >
     40      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     41      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     42      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     43    </HUDRocketFuelBar>
     44  </OverlayGroup>
     45</Template>
     46
    2947<Template name="spaceshiphud">
    3048  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
    … …  
    3452     name              = "HealthBar1"
    3553     background        = "Orxonox/HealthBarBackground"
    36      size              = "0.35, 0.0875"
    37      position          = "0.0 , 0.9 "
     54     size              = "0.40, 0.08"
     55     position          = "0.0 , 0.85 "
    3856     pickpoint         = "0, 1"
    3957     bartexture        = "healthbar_bar.png"
    4058     textfont          = "VeraMono"
    4159     textusebarcolour  = true
    42      textsize          = 0.039
    43      textoffset        = "0.315, 0.05"
     60     textscale          = 0.4
     61     textoffset        = "0.325, -0.825"
    4462     textpickpoint     = "0, 0"
    4563     textalign         = "right"
    46      correctaspect     = false
    47      textcorrectaspect = false
     64     correctaspect     = true
     65     iconmaterial      = "Orxonox/BarIconHealth"
    4866    >
    4967      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
    … …  
    5169      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
    5270    </HUDHealthBar>
     71
     72    <HUDShieldBar
     73     name          = "ShieldBar1"
     74     background    = "Orxonox/BarBackground"
     75     size          = "0.40, 0.04"
     76     position      = "0.0 , 0.9 "
     77     pickpoint     = "0, 1"
     78     correctaspect = true
     79     iconmaterial  = "Orxonox/BarIconShield"
     80    >
     81      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     82      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     83      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     84    </HUDShieldBar>   
    5385
    5486    <HUDSpeedBar
    5587     name          = "SpeedBar1"
    5688     background    = "Orxonox/BarBackground"
    57      size          = "0.35, 0.05"
     89     size          = "0.40, 0.04"
    5890     position      = "0.0 , 0.95 "
    5991     pickpoint     = "0, 1"
    60      correctaspect = false
     92     correctaspect = true
     93     iconmaterial  = "Orxonox/BarIconSpeed"
    6194    >
    6295      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
    … …  
    67100    <HUDBoostBar
    68101     name          = "BoostBar1"
    69      backgroundtex = "bar1.png"
    70      size          = "0.35, 0.05"
     102     background    = "Orxonox/BarBackground"
     103     size          = "0.40, 0.04"
    71104     position      = "0.0 , 1.0 "
    72105     pickpoint     = "0, 1"
    73      correctaspect = false
     106     correctaspect = true
     107     iconmaterial  = "Orxonox/BarIconBoost"
    74108    >
    75109      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
    … …  
    81115     name              = "EnemyHealthBar"
    82116     background        = "Orxonox/HealthBarBackground"
    83      size              = "0.35, 0.0875"
    84      position          = "1 ,0.1"
    85      pickpoint         = "1, 1"
     117     size              = "0.4, 0.08"
     118     position          = "1 ,0"
     119     pickpoint         = "1, 0"
    86120     bartexture        = "healthbar_bar.png"
    87121     textfont          = "VeraMono"
    88122     textusebarcolour  = true
    89      textsize          = 0.039
    90      textoffset        = "0.315, 0.05"
     123     textscale         = 0.4
     124     textoffset        = "-0.675, 0.175"
    91125     textpickpoint     = "0, 0"
    92126     textalign         = "right"
    93      correctaspect     = false
    94      textcorrectaspect = false
     127     correctaspect     = true
     128     iconmaterial      = "Orxonox/BarIconHealth"
    95129    >
    96130      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
    … …  
    98132      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
    99133    </HUDEnemyHealthBar>
     134
     135    <HUDEnemyShieldBar
     136     name          = "EnemyShieldBar1"
     137     background    = "Orxonox/BarBackground"
     138     size          = "0.40, 0.04"
     139     position      = "1.0 , 0.1 "
     140     pickpoint     = "1, 0"
     141     correctaspect = true
     142     iconmaterial  = "Orxonox/BarIconShield"
     143    >
     144      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     145      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     146      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     147    </HUDEnemyShieldBar>   
    100148
    101149    <HUDNavigation
    … …  
    127175     mapAngle3D                         = 0.6435011
    128176    />
     177
     178    <HUDWeaponSystem
     179     name                   = "WeaponSystem"
     180     correctaspect          = true
     181     position               = "0.01, 0.01"
     182     pickpoint              = "0, 0"
     183     visible                = "true"
     184     weaponModeHUDSize      = "0.09, 0.03"
     185    />
    129186   
    130187    <HUDTimer

  • code/trunk/data/overlays/InvaderHUD.oxo

    r9953 r11052  
    9999     textfont          = "VeraMono"
    100100     textusebarcolour  = true
    101      textsize          = 0.039
    102      textoffset        = "0.315, 0.05"
     101     textscale          = 0.4
     102     textoffset        = "0.325, -0.825"
    103103     textpickpoint     = "0, 0"
    104104     textalign         = "right"
    105      correctaspect     = false
    106      textcorrectaspect = false
     105     correctaspect     = true
     106     iconmaterial      = "Orxonox/BarIconHealth"
    107107    >
    108108      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />

  • code/trunk/data/overlays/jumpHUD.oxo

    r10262 r11052  
    3737     showFuel = false
    3838     showMessages = true
    39     />   
    40 
    41   <HUDBar
    42      name          = "SpeedBar1"
    43      background    = "Orxonox/BarBackground"
    44      size          = "0.35, 0.05"
    45      position      = "0.0 , 1.0 "
    46      pickpoint     = "0, 1"
    47      correctaspect = false
    48 
    49      initialvalue = 50
    50 
    51      >
    52       <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
    53       <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
    54       <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
    55     </HUDBar>
     39    />
    5640
    5741  </OverlayGroup>

  • code/trunk/data/particle/engineglow.particle

    r5781 r11052  
    1 
    21particle_system Orxonox/engineglow
    32{
    4         quota   200
    5         material        PE/bigFlame
    6         particle_width  12
    7         particle_height 12
    8         cull_each       false
    9         renderer        billboard
    10         billboard_type  point
     3        material PE/glowEffect
     4        particle_width 100.0
     5        particle_height 100.0
     6        quota 2000
     7        cull_each false
     8        sorted false
     9        local_space false
     10        iteration_interval 0.0
     11        nonvisible_update_timeout 0.0
     12        billboard_type point
     13        billboard_origin center
     14        billboard_rotation_type texcoord
     15        point_rendering false
     16        accurate_facing false
    1117
    12         emitter HollowEllipsoid
     18        emitter Ring
    1319        {
    14                 angle   0
    15                 colour  0.46875 0.8125 0.93359375 1
    16                 colour_range_start      .6640625 .91796875 .92578125 1
    17                 colour_range_end        .08203125 .7578125 .98046875 1
    18                 direction       0 1 0
    19                 emission_rate   45
    20                 position        0 0 0
    21                 velocity        5
    22                 velocity_min    4
    23                 velocity_max    6
    24                 time_to_live    0.5
    25                 time_to_live_min        0.2
    26                 time_to_live_max        0.9
    27                 duration        0
    28                 duration_min    0
    29                 duration_max    0
    30                 repeat_delay    0
    31                 repeat_delay_min        0
    32                 repeat_delay_max        0
    33                 width   4
    34                 height  2.5
    35                 depth   1.3
    36                 inner_width     0.5
    37                 inner_height    0.3
    38                 inner_depth     0.2
     20                position 0.0 0.0 0.0
     21                direction 0.0 0.0 1.0
     22                angle 0
     23                width 150
     24                height 150
     25                depth 1
     26                inner_width 0.99
     27                inner_height 0.99
     28                emission_rate 30
     29                velocity_min 20
     30                velocity_max 20
     31                time_to_live_min 5
     32                time_to_live_max 5
     33                duration_min 0
     34                duration_max 0
     35                repeat_delay_min 0
     36                repeat_delay_max 0
     37                colour_range_start 0.666667 1 0 1
     38                colour_range_end 0 1 0 1
     39        }
     40
     41        emitter Ring
     42        {
     43                position 0.0 0.0 0.0
     44                direction 0.0 0.0 1.0
     45                angle 0
     46                width 130
     47                height 130
     48                depth 0
     49                inner_width 0.99
     50                inner_height 0.99
     51                emission_rate 10
     52                velocity_min 200
     53                velocity_max 200
     54                time_to_live_min 0.75
     55                time_to_live_max 0.75
     56                duration_min 0
     57                duration_max 0
     58                repeat_delay_min 0
     59                repeat_delay_max 0
     60                colour_range_start 1 1 0 1
     61                colour_range_end 1 1 0.498039 1
     62        }
     63
     64        emitter Ring
     65        {
     66                position 0.0 0.0 0.0
     67                direction 0.0 0.0 1.0
     68                angle 0
     69                width 80
     70                height 80
     71                depth 0
     72                inner_width 0.99
     73                inner_height 0.99
     74                emission_rate 57.89
     75                velocity_min 250
     76                velocity_max 250
     77                time_to_live_min 1
     78                time_to_live_max 1
     79                duration_min 0
     80                duration_max 0
     81                repeat_delay_min 0
     82                repeat_delay_max 0
     83                colour_range_start 1 0.333333 0 1
     84                colour_range_end 1 0.333333 0 1
     85        }
     86
     87        emitter Ring
     88        {
     89                position 0.0 0.0 0.0
     90                direction 0.0 0.0 1.0
     91                angle 0
     92                width 50
     93                height 50
     94                depth 0
     95                inner_width 0.01
     96                inner_height 0.5
     97                emission_rate 37.89
     98                velocity_min 300
     99                velocity_max 300
     100                time_to_live_min 1.5
     101                time_to_live_max 1.5
     102                duration_min 0
     103                duration_max 0
     104                repeat_delay_min 0
     105                repeat_delay_max 0
     106                colour_range_start 1 0 0 1
     107                colour_range_end 1 0 0 1
     108        }
     109
     110        affector Scaler
     111        {
     112                rate -20
    39113        }
    40114}

  • code/trunk/data/particle/rocketfire.particle

    r6417 r11052  
    11particle_system Orxonox/rocketfire
    22{
    3         quota   300
    4         material        PE/explosion
    5         particle_width  15
    6         particle_height 5
    7         cull_each       false
    8         renderer        billboard
    9         sorted  false
    10         local_space     false
    11         iteration_interval      0
    12         nonvisible_update_timeout       0
    13         billboard_type  point
    14         billboard_origin        center
    15         billboard_rotation_type texcoord
    16         common_up_vector        0 1 0
    17         point_rendering false
    18         accurate_facing false
     3        material PE/glowEffect
     4        particle_width 2
     5        particle_height 2
     6        quota 10000
     7        cull_each true
     8        sorted true
     9        local_space true
     10        iteration_interval 0.0
     11        nonvisible_update_timeout 0.0
     12        billboard_type point
     13        billboard_origin center
     14        billboard_rotation_type texcoord
     15        point_rendering false
     16        accurate_facing false
    1917
    2018        emitter Ellipsoid
    2119        {
    22                 angle   2
    23                 colour  1 0.682759 1 1
    24                 colour_range_start      1 0.682759 1 1
    25                 colour_range_end        1 0.682759 1 1
    26                 direction       0 0 1
    27                 emission_rate   1200
    28                 position        0 0 3
    29                 velocity        10
    30                 velocity_min    10
    31                 velocity_max    48
    32                 time_to_live    0.1
    33                 time_to_live_min        0.1
    34                 time_to_live_max        0.2
    35                 duration        0
    36                 duration_min    0
    37                 duration_max    0
    38                 repeat_delay    0
    39                 repeat_delay_min        0
    40                 repeat_delay_max        0
    41                 width   1.5
    42                 height  1.5
    43                 depth   10
     20                position 0.05 0.0 2.0
     21                direction 0.0 0.0 1.0
     22                angle 0
     23                width 0
     24                height 0
     25                depth 0
     26                emission_rate 1200
     27                velocity_min 10
     28                velocity_max 20
     29                time_to_live_min 0.1
     30                time_to_live_max 0.1
     31                duration_min 0
     32                duration_max 0
     33                repeat_delay_min 0
     34                repeat_delay_max 0
     35                colour_range_start 1 0.333333 0 1
     36                colour_range_end 1 0 0 1
     37        }
     38        emitter Ellipsoid
     39        {
     40                position 0.05 0.0 2.0
     41                direction 0.0 0.0 1.0
     42                angle 0
     43                width 0
     44                height 0
     45                depth 0
     46                emission_rate 100
     47                velocity_min 5
     48                velocity_max 10
     49                time_to_live_min 0.1
     50                time_to_live_max 0.1
     51                duration_min 0
     52                duration_max 0
     53                repeat_delay_min 0
     54                repeat_delay_max 0
     55                colour_range_start 0.2 0.5 0.65
     56                colour_range_end 0.25 0.55 0.7
    4457        }
    4558
    4659        affector Scaler
    4760        {
    48                 rate    -20
     61                rate -8
    4962        }
    5063}
Note: See TracChangeset for help on using the changeset viewer.