Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10791


Ignore:
Timestamp:
Nov 9, 2015, 5:55:42 PM (8 years ago)
Author:
fvultier
Message:

Munition may and must now be defined for each pawn separately. This way a heavy cruiser may carry more munition than a drone.

Location:
code/branches/fabienHS15
Files:
1 deleted
58 edited

Legend:

Unmodified
Added
Removed

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

    r9943 r10791  
    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/branches/fabienHS15/data/levels/includes/invaderWeaponEnemy.oxi

    r9943 r10791  
    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/branches/fabienHS15/data/levels/includes/weaponSettingsAssff.oxi

    r10688 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4343        </Weapon>
    4444      </WeaponPack>
    45     </weapons>
     45    </weaponpacks>
     46    <munition>
     47      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     48      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     49      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     50    </munition>   

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

    r10688 r10791  
    99      <WeaponSet firemode=2 />
    1010      <WeaponSet firemode=3 />
    11     </weaponsets>
    12     <weapons>
     11    </weaponsets> 
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4141        </Weapon>
    4242      </WeaponPack>
    43     </weapons>
     43    </weaponpacks>
     44    <munition>
     45      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     46      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     47      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     48    </munition>

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

    r10724 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4545        </Weapon>
    4646      </WeaponPack>
    47     </weapons>
     47    </weaponpacks>
     48    <munition>
     49      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     50      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     51      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     52    </munition>   

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

    r10724 r10791  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    1515        <Weapon>
    1616          <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" /-->
    1817        </Weapon>
    1918        <Weapon>
    2019          <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" /-->
    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=0.5/>
     30    </munition>     

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

    r9348 r10791  
    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=0.5/>
     54      <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     55    </munition>   

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

    r10262 r10791  
    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=0.5/>
     54      <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
     55    </munition>     

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

    r10622 r10791  
    1212  <WeaponSet firemode=4 />
    1313</weaponsets>
    14 <weapons>
     14<weaponpacks>
    1515  <WeaponPack>
    1616    <links>
    … …  
    4949    </Weapon-->
    5050  </WeaponPack>
    51 </weapons>
     51</weaponpacks>
     52<munition>
     53  <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.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/branches/fabienHS15/data/levels/includes/weaponSettingsGhost.oxi

    r10724 r10791  
    1111      <WeaponSet firemode=2 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack>
    1515        <links>
    … …  
    3535        </Weapon>
    3636      </WeaponPack>
    37     </weapons>
     37    </weaponpacks>
     38    <munition>
     39      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     40      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     41      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     42    </munition>

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

    r10724 r10791  
    88      <WeaponSet firemode=1 />
    99    </weaponsets>
    10     <weapons>
     10    <weaponpacks>
    1111      <WeaponPack>
    1212        <links>
    … …  
    4242        </Weapon>
    4343      </WeaponPack>
    44     </weapons>
     44    </weaponpacks>
     45    <munition>
     46      <LaserMunition initialmagazines=10 maxmagazines=10 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     47    </munition>
    4548

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

    r8755 r10791  
    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=0.5/>
     29      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     30    </munition>

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

    r10724 r10791  
    1111      <WeaponSet firemode=3 />
    1212    </weaponsets>
    13     <weapons>
     13    <weaponpacks>
    1414      <WeaponPack>
    1515        <links>
    … …  
    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=0.25/>
     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/branches/fabienHS15/data/levels/includes/weaponSettingsHeavyCruiser.oxi

    r10724 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    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=0.3/>
     48      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     49      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     50    </munition>

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

    r10724 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4545        </Weapon-->
    4646      </WeaponPack>
    47     </weapons>
     47    </weaponpacks>
     48    <munition>
     49      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
     50      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     51      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     52    </munition>

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

    r8706 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    5555        </Weapon-->
    5656      </WeaponPack>
    57     </weapons>
     57    </weaponpacks>
     58    <munition>
     59      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
     60      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     61      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     62    </munition>

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

    r10724 r10791  
    77      <WeaponSet firemode=1 />
    88    </weaponsets>
    9     <weapons>
     9    <weaponpacks>
    1010      <WeaponPack>
    1111        <links>
    … …  
    2222        </Weapon>
    2323      </WeaponPack>
    24     </weapons>
     24    </weaponpacks>
     25    <munition>
     26      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.3/>
     27    </munition>

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

    r10724 r10791  
    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   <WeaponSet firemode=2 />
    10 </weaponsets>
    11 <weapons>
    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 </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=0.3/>
     33      <GravityBombMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=1 />
     34      <IceMunition initialmagazines=16 maxmagazines=16 munitionpermagazine=1 />
     35    </munition>

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

    r10724 r10791  
    1414      <WeaponSet firemode=3 />
    1515    </weaponsets>
    16     <weapons>
     16    <weaponpacks>
    1717      <WeaponPack>
    1818        <links>
    … …  
    8787        </Weapon>
    8888      </WeaponPack>
    89     </weapons>
     89    </weaponpacks>
     90    <munition>
     91      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.2/>
     92      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     93      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     94    </munition>

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

    r10724 r10791  
    88      <WeaponSet firemode=1 />
    99    </weaponsets>
    10     <weapons>
     10    <weaponpacks>
    1111      <WeaponPack>
    1212        <links>
    … …  
    2323        </Weapon>       
    2424      </WeaponPack>
    25     </weapons>
     25    </weaponpacks>
     26    <munition>
     27      <LaserMunition initialmagazines=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     28      <SplitMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     29    </munition>

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

    r10724 r10791  
    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=20 maxmagazines=20 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     29      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     30    </munition>

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

    r10216 r10791  
    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=0.5/>
     25    </munition>

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

    r10262 r10791  
    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=0.5/>
     25    </munition>

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

    r10724 r10791  
    1010      <WeaponSet firemode=3 />
    1111    </weaponsets>
    12     <weapons>
     12    <weaponpacks>
    1313      <WeaponPack>
    1414        <links>
    … …  
    4646        </Weapon-->
    4747      </WeaponPack>
    48     </weapons>
     48    </weaponpacks>
     49    <munition>
     50      <LaserMunition initialmagazines=12 maxmagazines=12 munitionpermagazine=10 replenishamount=1 replenishinterval=0.4/>
     51      <LightningMunition initialmagazines=4 maxmagazines=4 munitionpermagazine=8 />
     52      <RocketMunition initialmagazines=5 maxmagazines=5 munitionpermagazine=1 />
     53    </munition>

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

    r10746 r10791  
    839839            <WeaponSet firemode=0 />
    840840        </weaponsets>
    841         <weapons>
     841        <weaponpacks>
    842842            <WeaponPack>
    843843                <links>
    … …  
    853853                </Weapon>
    854854            </WeaponPack>
    855         </weapons>
     855        </weaponpacks>
     856        <munition>
     857            <LaserMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
     858        </munition>
    856859    </Drone>
    857860</Template>

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

    r10629 r10791  
    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>
    … …  
    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 />
    … …  
    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>
    … …  
    174183      <WeaponSet firemode=0 />
    175184    </weaponsets>
    176     <weapons>
     185    <weaponpacks>
    177186      <WeaponPack>
    178187        <links>
    … …  
    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 />
    … …  
    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>

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

    r10739 r10791  
    7373        this->textOverlayLeft_ = new OverlayText(this->getContext());
    7474        assert(this->textOverlayLeft_.get());
    75         this->textOverlayLeft_->setCaption("???");
     75        this->textOverlayLeft_->setCaption("?");
    7676        textOverlayLeft_->setPickPoint(Vector2(0.0f,0.0f));
    7777        textOverlayLeft_->setVisible(true);
    … …  
    8383       
    8484        this->textOverlayRight_ = new OverlayText(this->getContext());
    85         assert(this->textOverlayLeft_.get());
    86         this->textOverlayRight_->setCaption("???");
     85        assert(this->textOverlayRight_.get());
     86        this->textOverlayRight_->setCaption("?");
    8787        textOverlayRight_->setPickPoint(Vector2(0.0f,0.0f));
    8888        textOverlayRight_->setVisible(true);
    … …  
    9393        textOverlayRight_->setZOrder(600);
    9494
    95         materialNameState_ = "Orxonox/WSHUD_Reloading";
     95        materialNameState_ = "Orxonox/WSHUD_Empty";
    9696
    9797        overlayElementReplenish_->setMaterialName("Orxonox/WSHUD_Replenish");
    … …  
    155155                    materialNameState_ = "Orxonox/WSHUD_Empty";
    156156                }
    157             }
    158 
    159             if (munition->isA(Class(ReplenishingMunition)))
    160             {
    161                 ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
    162 
    163                 if (replenishingMunition->canAddMunition(1))
    164                 {
    165                     float progress = 1.0f - replenishingMunition->getProgress();
    166                     overlayElementReplenish_->setDimensions(1.0f,progress);                   
    167                 }
    168                 else
    169                 {
    170                     overlayElementReplenish_->setDimensions(1.0f,1.0f);
     157
     158                if (munition->isA(Class(ReplenishingMunition)))
     159                {
     160                    ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
     161
     162                    if (replenishingMunition->canAddMunition(1))
     163                    {
     164                        float progress = 1.0f - replenishingMunition->getProgress();
     165                        overlayElementReplenish_->setDimensions(1.0f,progress);                   
     166                    }
     167                    else
     168                    {
     169                        overlayElementReplenish_->setDimensions(1.0f,1.0f);
     170                    }
    171171                }
    172172            }

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

    r10713 r10791  
    3434#include "FusionMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5657        this->reloadTime_ = 0.5f;
    5758    }
     59
     60    void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     61    {
     62        SUPER(FusionMunition, XMLPort, xmlelement, mode);
     63    }
    5864}

  • code/branches/fabienHS15/src/modules/weapons/munitions/FusionMunition.h

    r9667 r10791  
    5353            FusionMunition(Context* context);
    5454            virtual ~FusionMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10713 r10791  
    77#include "GravityBombMunition.h"
    88#include "core/CoreIncludes.h"
     9#include "core/XMLPort.h"
    910
    1011namespace orxonox
    … …  
    2728    }
    2829
     30    void GravityBombMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     31    {
     32        SUPER(GravityBombMunition, XMLPort, xmlelement, mode);
     33    }
    2934}
    3035

  • code/branches/fabienHS15/src/modules/weapons/munitions/GravityBombMunition.h

    r10622 r10791  
    2828            GravityBombMunition(Context* context);
    2929            virtual ~GravityBombMunition() {}
     30            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    3031    };
    3132

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

    r10715 r10791  
    3434#include "IceMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5455        this->reloadTime_ = 0.5f;
    5556    }
     57
     58    void IceMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     59    {
     60        SUPER(IceMunition, XMLPort, xmlelement, mode);
     61    }
    5662}

  • code/branches/fabienHS15/src/modules/weapons/munitions/IceMunition.h

    r10629 r10791  
    5353            IceMunition(Context* context);
    5454            virtual ~IceMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10724 r10791  
    3434#include "LaserMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5354
    5455        this->replenishInterval_ = 0.5f;
    55         this->replenishMunitionAmount_ = 1;
     56        this->replenishAmount_ = 1;
    5657
    5758        this->reloadTime_ = 0.5f;
    5859    }
     60
     61    void LaserMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     62    {
     63        SUPER(LaserMunition, XMLPort, xmlelement, mode);
     64    }
    5965}

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

    r10688 r10791  
    5353            LaserMunition(Context* context);
    5454            virtual ~LaserMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10713 r10791  
    3434#include "LightningMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5455        this->reloadTime_ = 0.5f;   
    5556    }
     57
     58    void LightningMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     59    {
     60        SUPER(LightningMunition, XMLPort, xmlelement, mode);
     61    }
    5662}

  • code/branches/fabienHS15/src/modules/weapons/munitions/LightningMunition.h

    r10688 r10791  
    5353            LightningMunition(Context* context);
    5454            virtual ~LightningMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10715 r10791  
    3434#include "RocketMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5455        this->reloadTime_ = 0.5f;
    5556    }
     57
     58    void RocketMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     59    {
     60        SUPER(RocketMunition, XMLPort, xmlelement, mode);
     61    }
    5662}

  • code/branches/fabienHS15/src/modules/weapons/munitions/RocketMunition.h

    r9667 r10791  
    5353            RocketMunition(Context* context);
    5454            virtual ~RocketMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10715 r10791  
    3434#include "SplitMunition.h"
    3535#include "core/CoreIncludes.h"
     36#include "core/XMLPort.h"
    3637
    3738namespace orxonox
    … …  
    5455        this->reloadTime_ = 0.5f;
    5556    }
     57
     58    void SplitMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     59    {
     60        SUPER(SplitMunition, XMLPort, xmlelement, mode);
     61    }
    5662}

  • code/branches/fabienHS15/src/modules/weapons/munitions/SplitMunition.h

    r10629 r10791  
    5353            SplitMunition(Context* context);
    5454            virtual ~SplitMunition() {}
     55            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    5556    };
    5657}

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

    r10724 r10791  
    2424 *      Fabian 'x3n' Landau
    2525 *   Co-authors:
    26  *      ...
     26 *      Fabien Vultier
    2727 *
    2828 */
    … …  
    3232#include "core/CoreIncludes.h"
    3333#include "core/command/Executor.h"
     34#include "core/XMLPort.h"
    3435
    3536namespace orxonox
    … …  
    5859        for (std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.begin(); it != this->currentMagazines_.end(); ++it)
    5960            delete it->second;
     61    }
     62
     63    void Munition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     64    {
     65        SUPER(Munition, XMLPort, xmlelement, mode);
     66
     67        XMLPortParam(Munition, "initialmagazines", setNumMagazines, getNumMagazines, xmlelement, mode);
     68        XMLPortParam(Munition, "maxmagazines", setMaxMagazines, getMaxMagazines, xmlelement, mode);
     69        XMLPortParam(Munition, "munitionpermagazine", setMaxMunitionPerMagazine, getMaxMunitionPerMagazine, xmlelement, mode);
    6070    }
    6171
    … …  
    121131    }
    122132
     133    void Munition::setNumMagazines(unsigned int numMagazines)
     134    {
     135        this->magazines_ = numMagazines;
     136    }
     137
    123138    unsigned int Munition::getMaxMunition() const
    124139    {
    … …  
    138153            // If we stack munition, we don't care about the current magazine - we just need enough munition in total
    139154            if (deployment_ == MunitionDeployment::Stack)
     155            {
    140156                munition += this->maxMunitionPerMagazine_ * this->magazines_;
     157            }
    141158
    142159            if (munition == 0)
     160            {
    143161                // Absolutely no munition - no chance to take munition
    144162                return false;
     163            }
    145164            else if (this->bAllowMultiMunitionRemovementUnderflow_)
     165            {
    146166                // We're not empty AND we allow underflow, so this will always work
    147167                return true;
     168            }
    148169            else
     170            {
    149171                // We don't allow underflow, so we have to check the amount
    150172                return (munition >= amount);
     173            }
     174
    151175        }
    152176        return false;
    … …  
    200224    {
    201225        // As long as we have enough magazines (and don't stack munition) we can reload
    202         return (this->magazines_ > 0 && !deployment_ == MunitionDeployment::Stack);
     226        return (this->magazines_ > 0 && deployment_ != MunitionDeployment::Stack);
    203227    }
    204228
    … …  
    236260
    237261        // If we don't use separate magazines, set user to 0
    238         if (!deployment_ == MunitionDeployment::Separate)
    239             user = 0;
     262        if (deployment_ != MunitionDeployment::Separate)
     263        {
     264            user = NULL;
     265        }
    240266
    241267        // Remove the current magazine for the given user
    … …  
    289315        {
    290316            // Stacking munition means, if a magazine gets full, the munition adds to a new magazine
    291             Magazine* magazine = this->getMagazine(0);
     317            Magazine* magazine = this->getMagazine(NULL);
    292318            if (magazine)
    293319            {
    … …  
    386412
    387413        // If zero or less magazines are needed, we definitively don't need more magazines (unless we stack munition - then a magazine contributes directly to the munition)
    388         if (needed_magazines <= 0 && !deployment_ == MunitionDeployment::Stack)
     414        if (needed_magazines <= 0 && deployment_ != MunitionDeployment::Stack)
    389415            return false;
    390416
    … …  
    470496
    471497        // If we don't use separate magazines, set user to 0
    472         if (!deployment_ == MunitionDeployment::Separate)
    473             user = 0;
     498        if (deployment_ != MunitionDeployment::Separate)
     499            user = NULL;
    474500
    475501        // Remove the current magazine for the given user

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

    r10724 r10791  
    2424 *      Fabian 'x3n' Landau
    2525 *   Co-authors:
    26  *      ...
     26 *      Fabien Vultier
    2727 *
    2828 */
    … …  
    6868            Munition(Context* context);
    6969            virtual ~Munition();
     70
     71            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    7072
    7173            unsigned int getNumMunition(WeaponMode* user) const;
    … …  
    118120        private:
    119121            Magazine* getMagazine(WeaponMode* user) const;
     122            inline void setMaxMagazines(unsigned int maxMagazines)
     123                { this->maxMagazines_ = maxMagazines; }
     124            inline void setMaxMunitionPerMagazine(unsigned int maxMunitionPerMagazine)
     125                { this->maxMunitionPerMagazine_ = maxMunitionPerMagazine; }
     126            void setNumMagazines(unsigned int numMagazines);
    120127    };
    121128}

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

    r10688 r10791  
    3636#include "core/CoreIncludes.h"
    3737#include "core/command/Executor.h"
     38#include "core/XMLPort.h"
    3839
    3940namespace orxonox
    … …  
    4647
    4748        this->replenishInterval_ = 1.0f;
    48         this->replenishMunitionAmount_ = 1;
     49        this->replenishAmount_ = 1;
    4950
    5051        // Use the timer to initialize itself after the first tick (because the real values for
    … …  
    5354        this->replenishingTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer, this)));
    5455    }
     56
     57    void ReplenishingMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     58    {
     59        SUPER(ReplenishingMunition, XMLPort, xmlelement, mode);
     60
     61        XMLPortParam(ReplenishingMunition, "replenishamount", setReplenishAmount, getReplenishAmount, xmlelement, mode);
     62        XMLPortParam(ReplenishingMunition, "replenishinterval", setReplenishInterval, getReplenishInterval, xmlelement, mode);
     63    }   
    5564
    5665    float ReplenishingMunition::getProgress()
    … …  
    6776    void ReplenishingMunition::replenish()
    6877    {
    69         if (this->canAddMunition(this->replenishMunitionAmount_))
     78        if (this->canAddMunition(this->replenishAmount_))
    7079        {
    7180            // Make a temporary copy of bAllowMunitionRefilling_, because this might be disallowed in every
    … …  
    7584
    7685            // Replenish munition
    77             this->addMunition(this->replenishMunitionAmount_);
     86            this->addMunition(this->replenishAmount_);
    7887
    7988            // Write back the temporary value

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

    r10688 r10791  
    5353            ReplenishingMunition(Context* context);
    5454            virtual ~ReplenishingMunition() {}
     55
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     57           
    5558            virtual float getProgress();
    56             inline float getReplenishingMunitionAmount() const
    57                 { return replenishMunitionAmount_; }
     59            inline float getReplenishAmount() const
     60                { return replenishAmount_; }
     61            inline float getReplenishInterval() const
     62                { return replenishInterval_; }
    5863
    5964        protected:                         
    6065            float replenishInterval_; //!< The interval in which the munition is replenished.
    61             unsigned int replenishMunitionAmount_; //!< The amount by which it is replenished.
     66            unsigned int replenishAmount_; //!< The amount by which it is replenished.
    6267
    6368        private:
    … …  
    6671
    6772            Timer replenishingTimer_; //!< Timer to do the replenishing.
     73
     74            inline void setReplenishAmount(unsigned int replenishAmount)
     75                { this->replenishAmount_ = replenishAmount; }
     76            inline void setReplenishInterval(float replenishInterval)
     77                { this->replenishInterval_ = replenishInterval; }             
    6878    };
    6979}

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

    r10688 r10791  
    155155            it->second->setWeapon(this);
    156156    }
     157
     158    void Weapon::updateMunition()
     159    {
     160        for (std::multimap<unsigned int, WeaponMode*>::iterator it = this->weaponmodes_.begin(); it != this->weaponmodes_.end(); ++it)
     161            it->second->updateMunition();
     162    }
    157163}

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

    r10688 r10791  
    7979            inline WeaponSlot * getWeaponSlot() const
    8080                { return this->weaponSlot_; }
     81            void updateMunition();
    8182
    8283        private:

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

    r10688 r10791  
    243243        }
    244244        else
    245             this->munition_ = 0;
     245        {
     246            this->munition_ = NULL;
     247        }
    246248    }
    247249

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

    r10688 r10791  
    153153                { return this->hudImageString_; }           
    154154
     155            void updateMunition();
    155156        protected:
    156157            virtual void fire() = 0;
    … …  
    171172            std::string hudImageString_;
    172173
    173         private:
    174             void updateMunition();
     174        private:           
    175175            void reloaded();
    176176
    … …  
    189189
    190190            WorldSound* defSndWpnFire_;
    191             bool        bSoundAttached_;
     191            bool bSoundAttached_;
    192192    };
    193193}

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

    r10688 r10791  
    161161            (*it)->setWeaponPack(this);
    162162    }
     163
     164    void WeaponPack::updateMunition()
     165    {
     166        for (std::vector<Weapon *>::const_iterator it = this->weapons_.begin(); it != this->weapons_.end(); ++it)
     167            (*it)->updateMunition();
     168    }
    163169}

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

    r10688 r10791  
    6666            inline WeaponSystem * getWeaponSystem() const
    6767                { return this->weaponSystem_; }
     68            void updateMunition();
    6869
    6970        private:

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

    r10688 r10791  
    315315            return it->second;
    316316        }
    317         else if (identifier->getIdentifier()->isA(Class(Munition)))
    318         {
    319             Munition* munition = identifier->fabricate(this->getContext());
    320             this->munitions_[identifier->getIdentifier()] = munition;
    321             return munition;
    322         }
    323317        else
    324318        {
    325             return 0;
     319            return NULL;
     320        }
     321    }
     322
     323    void WeaponSystem::addMunition(Munition* munition)
     324    {
     325        if (munition == NULL)
     326        {
     327            return;
     328        }
     329
     330        SubclassIdentifier<Munition> identifier = munition->getIdentifier();
     331
     332        if (identifier)
     333        {
     334            this->munitions_[identifier] = munition;
     335            updateMunition();
     336        }
     337        else
     338        {
     339            orxout(internal_warning) << "Adding munition failed. identifier == NULL " << endl;
     340        }
     341    }
     342
     343    void WeaponSystem::updateMunition()
     344    {
     345        for (std::vector<WeaponPack*>::iterator it = this->weaponPacks_.begin(); it != this->weaponPacks_.end(); ++it)
     346        {
     347            (*it)->updateMunition();
    326348        }
    327349    }

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

    r10688 r10791  
    7777
    7878            Munition * getMunition(SubclassIdentifier<Munition> * identifier);
     79            void addMunition(Munition* munition);
    7980
    8081            inline void setPawn(Pawn * pawn)
    … …  
    9697
    9798        private:
     99            void updateMunition();
     100           
    98101            std::map<unsigned int, WeaponSet *> weaponSets_;
    99102            std::vector<WeaponSlot *> weaponSlots_;

  • code/branches/fabienHS15/src/orxonox/worldentities/MobileEntity.h

    r10437 r10791  
    4747        linear velocity. Then the linear velocity is multiplied by the time since the last call of tick and then added to the position. The same happens with
    4848        the angular acceleration and velocity. With this procedure MobileEntities can change their position and orientation with time.
     49
     50        A MobileEntity can only have the collisition type WorldEntity::None, WorldEntity::Dynamic or WorldEntity::Kinematic. The collsion type WorldEntity::Static is illegal.
    4951    */
    5052

  • code/branches/fabienHS15/src/orxonox/worldentities/StaticEntity.h

    r10437 r10791  
    4444        it is called StaticEntity. It will keep the same position (always with respect to its parent) forever unless you call the
    4545        function @see setPosition to changee it.
     46
     47        A StaticEntity can only have the collisition type WorldEntity::None or WorldEntity::Static. The collsion types WorldEntity::Dynamic and WorldEntity::Kinematic are illegal.
    4648    */
    4749

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

    r10746 r10791  
    4646#include "weaponsystem/WeaponPack.h"
    4747#include "weaponsystem/WeaponSet.h"
     48#include "weaponsystem/Munition.h"
    4849#include "sound/WorldSound.h"
    4950
    … …  
    139140        XMLPortObject(Pawn, WeaponSlot, "weaponslots", addWeaponSlot, getWeaponSlot, xmlelement, mode);
    140141        XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode);
    141         XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode);
     142        XMLPortObject(Pawn, WeaponPack, "weaponpacks", addWeaponPackXML, getWeaponPack, xmlelement, mode);
     143        XMLPortObject(Pawn, Munition, "munition", addMunitionXML, getMunitionXML, xmlelement, mode);
    142144
    143145        XMLPortParam(Pawn, "reloadrate", setShieldRechargeRate, getShieldRechargeRate, xmlelement, mode).defaultValues(0);
    … …  
    557559    }
    558560
     561    void Pawn::addMunitionXML(Munition* munition)
     562    {
     563        if (this->weaponSystem_ && munition)
     564        {
     565            this->weaponSystem_->addMunition(munition);
     566        }
     567    }
     568
     569    Munition* Pawn::getMunitionXML() const
     570    {
     571        return NULL;
     572    }
     573
    559574    Munition* Pawn::getMunition(SubclassIdentifier<Munition> * identifier)
    560575    {
    … …  
    570585    void Pawn::startLocalHumanControl()
    571586    {
    572 //        SUPER(ControllableEntity, changedPlayer());
     587//        SUPER(ControllableEntity, startLocalHumanControl());
    573588        ControllableEntity::startLocalHumanControl();
    574589        this->isHumanShip_ = true;

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

    r10746 r10791  
    151151            WeaponPack * getWeaponPack(unsigned int index) const;
    152152            std::vector<WeaponPack *> * getAllWeaponPacks();
     153
     154            void addMunitionXML(Munition* munition);
     155            Munition* getMunitionXML() const;
    153156           
    154             Munition * getMunition(SubclassIdentifier<Munition> * identifier);
     157            Munition* getMunition(SubclassIdentifier<Munition> * identifier);
    155158
    156159            virtual void addedWeaponPack(WeaponPack* wPack) {}

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

    r10746 r10791  
    5454        - The <b>boost shaking</b>, when the SpaceShip boosts, the camera shakes to create a more immersive effect. Two parameters can be used to adjust the effect. The <b>shakeFrequency</b> is the frequency with which the camera shakes. And the <b>shakeAmplitude</b> is the amount with which the camera shakes. Again these parameters must bee non-negative.
    5555        - The <b>lift</b> creates a more natural flight feeling through the addition of a lift force. There are again two parameters that can be specified. The <b>lift</b> which is the lift force that is applied. And the <b>stallSpeed</b> which is the forward speed after which no more lift is generated.
     56
     57        A spaceship always needs to have the collision type "dynamic". Other collision types are illegal.
    5658
    5759        As mentioned @ref orxonox::Engine Engines can be mounted on the SpaceShip. Here is a (primitive) example of a SpaceShip defined in XML:
Note: See TracChangeset for help on using the changeset viewer.