Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10724


Ignore:
Timestamp:
Oct 30, 2015, 7:51:49 PM (9 years ago)
Author:
fvultier
Message:

The weapon system HUD rescales properly if the window size changes.

Location:
code/branches/fabienHS15
Files:
2 added
32 edited

Legend:

Unmodified
Added
Removed

  • code/branches/fabienHS15/data/levels/includes/pickups.oxi

    r10692 r10724  
    249249    inventoryRepresentation = "HugeShrink"
    250250/>
     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/branches/fabienHS15/data/levels/includes/weaponSettingsCollateral.oxi

    r9664 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsEscort.oxi

    r9763 r10724  
    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" />
     17          <!--HsW01 mode=0 munitionpershot=1 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" projectileMesh="LaserBeam2.mesh" /-->
    1818        </Weapon>
    1919        <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" /-->
     20          <HsW01 mode=0 munitionpershot=1 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
     21          <!--HsW01 mode=0 munitionpershot=1 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" projectileMesh="LaserBeam2.mesh" /-->
    2222        </Weapon>
    2323      </WeaponPack>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi

    r8857 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsH2.oxi

    r7679 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsHeartAttack.oxi

    r10622 r10724  
    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 />
     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 />
    3636          <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
    3737          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi

    r9943 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiserBody.oxi

    r9943 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsPirate.oxi

    r7679 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsRing.oxi

    r10721 r10724  
    77  <WeaponSet firemode=0 />
    88  <WeaponSet firemode=1 />
     9  <WeaponSet firemode=2 />
    910</weaponsets>
    1011<weapons>
    … …  
    1314      <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
    1415      <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
     16      <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
    1517    </links>
    1618    <Weapon>
    17       <IceGun mode=0 munitionpershot=1 delay=0.125 damage=9.3 muzzleoffset="11,0,-3" freezefactor=0.5 freezetime=2.0 />
     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 />
    1821    </Weapon>
    1922    <Weapon>
    20       <IceGun mode=0 munitionpershot=1 delay=0.125 damage=9.3 muzzleoffset=" -11,0,-3" freezefactor=0.5 freezetime=2.0 />
     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 />
    2125    </Weapon>
    2226    <Weapon>
    23       <GravityBombFire mode=1 munitionpershot=1 delay=0.125 damage=3 muzzleoffset="0,0,-7"/>
     27      <GravityBombFire mode=2 munitionpershot=1 delay=0.125 damage=3 muzzleoffset="0,0,-7"/>
    2428    </Weapon>
    2529  </WeaponPack>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsSpacecruiser.oxi

    r9348 r10724  
    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>
    … …  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsSwallow.oxi

    r10688 r10724  
    1616        <Weapon>
    1717          <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=0 damage=10.0 muzzleoffset="0.5,0.6,1.7" />
     18          <LaserFire mode=1 munitionpershot=1 damage=10.0 muzzleoffset="0.5,0.6,1.7" />
    1919        </Weapon>
    2020        <Weapon>
    2121          <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=0 damage=10.0 muzzleoffset="-0.5,0.6,1.7" />
     22          <LaserFire mode=1 munitionpershot=1 damage=10.0 muzzleoffset="-0.5,0.6,1.7" />
    2323        </Weapon>       
    2424      </WeaponPack>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsTransporter.oxi

    r8891 r10724  
    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>

  • code/branches/fabienHS15/data/levels/includes/weaponSettingsbigship.oxi

    r9664 r10724  
    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>

  • code/branches/fabienHS15/data/levels/pickups.oxw

    r10692 r10724  
    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
    3844    <!-- DamageBoost pickup -->
    3945   
    4046    <PickupSpawner pickup=smalldamageboostpickup position="-25,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    4147    <PickupSpawner pickup=mediumdamageboostpickup position="0,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    42     <PickupSpawner pickup=hugedamageboostpickup position="25,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />         
     48    <PickupSpawner pickup=hugedamageboostpickup position="25,-100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    4349
    4450    <!-- Munition pickups -->

  • code/branches/fabienHS15/data/levels/templates/pickupRepresentationTemplates.oxt

    r10721 r10724  
     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

  • code/branches/fabienHS15/data/overlays/HUDTemplates3.oxo

    r10721 r10724  
    134134     pickpoint              = "0, 0"
    135135     visible                = "true"
    136      weaponModeHUDSize      = "0.12, 0.04"
     136     weaponModeHUDSize      = "0.09, 0.03"
    137137    />
    138138   

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc

    r10721 r10724  
    2929#include "HUDWeapon.h"
    3030
    31 #include <OgreOverlayManager.h>
    32 #include <OgrePanelOverlayElement.h>
    33 
    3431#include "core/CoreIncludes.h"
    3532#include "core/XMLPort.h"
    36 #include "tools/TextureGenerator.h"
    3733#include "util/Convert.h"
    3834#include "core/class/Super.h"
    … …  
    186182            (*it)->setWeaponIndex(this->weaponIndex_);
    187183            (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
    188             (*it)->positionHUDChilds();
    189184
    190185            ++ positionIndex;

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.h

    r10721 r10724  
    3737
    3838#include <OgreOverlayManager.h>
    39 #include <OgreMaterialManager.h>
    40 #include <OgreTechnique.h>
    41 #include <OgrePass.h>
    4239#include <OgrePanelOverlayElement.h>
    4340
    4441#include "overlays/OrxonoxOverlay.h"
    45 #include "overlays/OverlayText.h"
    4642#include "tools/interfaces/Tickable.h"
    4743#include "worldentities/pawns/Pawn.h"
    … …  
    7975            { weaponIndex_ = index;
    8076              this->updatePosition();
    81             }
    82 
    83         virtual void positionHUDChilds();
     77            }       
    8478
    8579    private:
    8680        virtual void createHUDChilds();
    87        
     81        virtual void positionHUDChilds();
    8882        virtual void destroyHUDChilds();
    8983        virtual void updateWeaponModeList();

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc

    r10721 r10724  
    2121 *
    2222 *   Author:
    23  *      Yuning Chai
    24  *      Felix Schulthess
     23 *      Fabien Vultier
    2524 *   Co-authors:
    26  *      Reto Grieder
    27  *      Wolfgang Roenninger
     25 *      ...
    2826 *
    2927 */
    3028
    3129#include "HUDWeaponMode.h"
    32 
    33 #include <OgreOverlayManager.h>
    34 #include <OgrePanelOverlayElement.h>
    3530
    3631#include "core/CoreIncludes.h"
    3732#include "core/XMLPort.h"
    38 #include "tools/TextureGenerator.h"
    39 #include "weaponsystem/WeaponMode.h"
    40 #include "weaponsystem/Munition.h"
    4133#include "util/Convert.h"
     34#include "core/class/Super.h"
    4235
    4336namespace orxonox
    … …  
    8780        textOverlayLeft_->setColour(ColourValue(0.21,0.70,0.21,1.0));
    8881        textOverlayLeft_->setAspectCorrection(false);
     82        textOverlayLeft_->setZOrder(600);
    8983       
    9084        this->textOverlayRight_ = new OverlayText(this->getContext());
    … …  
    9791        textOverlayRight_->setColour(ColourValue(0.21,0.70,0.21,1.0));
    9892        textOverlayRight_->setAspectCorrection(false);
     93        textOverlayRight_->setZOrder(600);
    9994
    10095        materialNameState_ = "Orxonox/WSHUD_Reloading";
    … …  
    137132            if (munition != NULL)
    138133            {
    139                 bool useSeparateMagazines = munition->getUseSeparateMagazines();
    140                 bool stackMunition = munition->getStackMunition();
    141 
    142                 if (!useSeparateMagazines && !stackMunition)
     134                MunitionDeployment::Value deployment = munition->getMunitionDeployment();
     135
     136                if (deployment == MunitionDeployment::Share)
    143137                {
    144138                    this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
    145139                    this->textOverlayRight_->setCaption(multi_cast<std::string>(munition->getNumMagazines()));
    146140                }
    147                 else if (!useSeparateMagazines && stackMunition)
     141                else if (deployment == MunitionDeployment::Stack)
    148142                {
    149143                    this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunition(weaponMode_)));
    150144                    this->textOverlayRight_->setCaption("");
    151145                }
    152                 else if (useSeparateMagazines && !stackMunition)
     146                else if (deployment == MunitionDeployment::Separate)
    153147                {
    154148                    this->textOverlayLeft_->setCaption(multi_cast<std::string>(munition->getNumMunitionInCurrentMagazine(weaponMode_)));
    … …  
    245239        if (munition != NULL)
    246240        {
    247             bool useSeparateMagazines = munition->getUseSeparateMagazines();
    248             bool stackMunition = munition->getStackMunition();
    249 
    250             if (!useSeparateMagazines && !stackMunition)
     241            MunitionDeployment::Value deployment = munition->getMunitionDeployment();
     242
     243            if (deployment == MunitionDeployment::Share)
    251244            {
    252245                overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionShare");
    253246            }
    254             else if (!useSeparateMagazines && stackMunition)
     247            else if (deployment == MunitionDeployment::Stack)
    255248            {
    256249                overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionStack");
    257250            }
    258             else if (useSeparateMagazines && !stackMunition)
     251            else if (deployment == MunitionDeployment::Separate)
    259252            {
    260253                overlayElementMunition_->setMaterialName("Orxonox/WSHUD_MunitionSeparate");

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.h

    r10721 r10724  
    3838
    3939#include <OgreOverlayManager.h>
    40 #include <OgreMaterialManager.h>
    41 #include <OgreTechnique.h>
    42 #include <OgrePass.h>
    4340#include <OgrePanelOverlayElement.h>
    4441
    … …  
    4946#include "overlays/OverlayGroup.h"
    5047#include "weaponsystem/ReplenishingMunition.h"
     48#include "weaponsystem/WeaponMode.h"
     49#include "weaponsystem/Munition.h"
    5150
    5251namespace orxonox
    … …  
    8483            }
    8584
    86         virtual void positionHUDChilds();
    87 
    8885    private:
    8986        virtual void updateSize();
    9087        virtual void updatePosition();
     88        virtual void positionHUDChilds();
    9189
    9290        WeakPtr<Pawn> owner_;

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.cc

    r10721 r10724  
    2121 *
    2222 *   Author:
    23  *      Yuning Chai
    24  *      Felix Schulthess
     23 *      Fabien Vultier
    2524 *   Co-authors:
    26  *      Reto Grieder
    27  *      Wolfgang Roenninger
     25 *      ...
    2826 *
    2927 */
    … …  
    3129#include "HUDWeaponSystem.h"
    3230
    33 #include <OgreOverlayManager.h>
    34 #include <OgrePanelOverlayElement.h>
    35 
    3631#include "core/CoreIncludes.h"
    3732#include "core/XMLPort.h"
    38 #include "tools/TextureGenerator.h"
    3933#include "weaponsystem/WeaponSystem.h"
    4034#include "weaponsystem/WeaponPack.h"
    … …  
    7367    }
    7468
    75     void HUDWeaponSystem::tick(float dt)
    76     {
    77         SUPER(HUDWeaponSystem, tick, dt);
    78 
    79         if (this->owner_)
    80         {
    81 
    82         }
    83     } 
    84 
    8569    void HUDWeaponSystem::positionChanged()
    8670    {
    … …  
    11195    {
    11296        SUPER(HUDWeaponSystem, changedOverlayGroup);
    113 
    114         //this->getOverlayGroup()->addElement(this->textOverlay_.get());
    11597    }   
    11698
    … …  
    118100    {
    119101        SUPER(HUDWeaponSystem, changedVisibility);
    120 
    121         //this->textOverlay_->setVisible(this->isVisible());
    122102    }
    123103
    … …  
    125105    {
    126106        SUPER(HUDWeaponSystem, changedName);
    127 
    128         //this->textOverlay_->setName(this->getName() + "text");
    129107    } 
    130108
    … …  
    178156    {
    179157        int positionIndex = 0;
    180         //this->setSize(weaponModeHUDSize_);
    181         // this->weaponModeHUDActualSize_ = this->getActualSize();
    182158
    183159        for (std::vector<WeakPtr<HUDWeapon> >::iterator it = hudWeapons_.begin(); it != hudWeapons_.end(); ++it)
    … …  
    185161            (*it)->setWeaponIndex(positionIndex);
    186162            (*it)->setWeaponModeHUDActualSize(this->weaponModeHUDActualSize_);
    187             (*it)->positionHUDChilds();           
    188163
    189164            ++ positionIndex;

  • code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponSystem.h

    r10721 r10724  
    3636#include <string>
    3737
    38 #include <OgreOverlayManager.h>
    39 #include <OgreMaterialManager.h>
    40 #include <OgreTechnique.h>
    41 #include <OgrePass.h>
    42 #include <OgrePanelOverlayElement.h>
    43 
    4438#include "overlays/OrxonoxOverlay.h"
    45 #include "overlays/OverlayText.h"
    46 #include "tools/interfaces/Tickable.h"
    4739#include "worldentities/pawns/Pawn.h"
    4840#include "overlays/OverlayGroup.h"
    … …  
    5143namespace orxonox
    5244{
    53     class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay, public Tickable
     45    class _OverlaysExport HUDWeaponSystem : public OrxonoxOverlay
    5446    {
    5547    public:
    … …  
    5850
    5951        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    60         virtual void tick(float dt);
    6152        virtual void changedOwner();
    6253        virtual void changedOverlayGroup();

  • code/branches/fabienHS15/src/modules/pickup/items/CMakeLists.txt

    r10715 r10724  
    88  ShrinkPickup.cc
    99  DamageBoostPickup.cc
     10  BoostPickup.cc
    1011  MunitionPickup.cc
    1112  MunitionContainer.cc

  • code/branches/fabienHS15/src/modules/pickup/items/MunitionPickup.cc

    r10721 r10724  
    111111            this->Pickupable::destroy();
    112112
    113 
    114113        // If the pickup has transited to used.
    115114        if(this->isUsed())

  • code/branches/fabienHS15/src/modules/weapons/munitions/LaserMunition.cc

    r10713 r10724  
    4343        RegisterObject(LaserMunition);
    4444
    45         this->maxMunitionPerMagazine_ = 10;
     45        this->maxMunitionPerMagazine_ = 20;
    4646        this->maxMagazines_ = 10;
    4747        this->magazines_ = 10;
    … …  
    5555        this->replenishMunitionAmount_ = 1;
    5656
    57         this->reloadTime_ = 0.8f;
     57        this->reloadTime_ = 0.5f;
    5858    }
    5959}

  • code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.cc

    r10624 r10724  
    450450        tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
    451451    }
     452
     453    void OrxonoxOverlay::setZOrder(unsigned short order)
     454    {
     455        if (this->overlay_)
     456        {
     457            this->overlay_->setZOrder(order);
     458        }
     459    }
    452460}

  • code/branches/fabienHS15/src/orxonox/overlays/OrxonoxOverlay.h

    r10721 r10724  
    186186        virtual void changedOverlayGroup()
    187187            { this->changedVisibility(); }
     188        virtual void setZOrder(unsigned short order);
    188189
    189190    protected:

  • code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.cc

    r10721 r10724  
    351351
    352352                // If there was no change in a loop, all magazines are full (or locked due to loading)
    353                 // Because the first loop does not stat at the beginning of the map we have to treat is separately
     353                // Because the first loop does not start at the beginning of the map we have to treat is separately
    354354                if (!change && !firstLoop)
    355355                {

  • code/branches/fabienHS15/src/orxonox/weaponsystem/Munition.h

    r10713 r10724  
    7878            inline unsigned int getMaxMunitionPerMagazine() const
    7979                { return this->maxMunitionPerMagazine_; }
    80             inline bool getUseSeparateMagazines() const
    81                 { return deployment_ == MunitionDeployment::Separate; }
    82             inline bool getStackMunition() const
    83                 { return deployment_ == MunitionDeployment::Stack; }
     80            inline MunitionDeployment::Value getMunitionDeployment() const
     81                { return deployment_; }
     82
    8483
    8584            bool canTakeMunition(unsigned int amount, WeaponMode* user) const;

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

    r10216 r10724  
    297297        }
    298298    }
     299
     300    void SpaceShip::gainBoostPower(float gainedBoostPower)
     301    {
     302        this->boostPower_ += gainedBoostPower;
     303       
     304        if (this->boostPower_ > this->initialBoostPower_)
     305        {
     306            this->boostPower_ = this->initialBoostPower_;
     307        }
     308
     309        // If the booster is in cooldown mode and we gained boost power, the abort the cooldown.
     310        if (this->isBoostCoolingDown() && this->boostPower_ > 0.0f)
     311        {
     312            timer_.stopTimer();
     313            this->boostCooledDown();
     314        }
     315    }
     316
    299317    /**
    300318    @brief

  • code/branches/fabienHS15/src/orxonox/worldentities/pawns/SpaceShip.h

    r10437 r10724  
    250250            inline float getShakeAmplitude() const
    251251                { return this->shakeAmplitude_; }
     252            /**
     253            @brief Add boost power. Is non-negative.
     254            @return Returns the current boost power.
     255            */
     256            void gainBoostPower(float gainedBoostPower);
    252257
    253258        protected:
Note: See TracChangeset for help on using the changeset viewer.