Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 21, 2012, 3:34:45 PM (12 years ago)
Author:
landauf
Message:

refactored PickupSpawner - it doesn't clone a sample-pickup anymore, it creates new pickups from a template.
removed DroppedPickup because it is not needed anymore, PickupSpawner has now the same functionality.
the representation of the pickup spawner is now destroyed if the pickup is taken and re-created if it spawns again (instead of changing the visibility). makes it easier to change the pickup in a spawner during the game.
adjusted all level files accordingly

Location:
code/branches/presentation2012merge/data/levels
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2012merge/data/levels/SurfaceRacePresentation.oxw

    r9272 r9319  
    324324
    325325
    326  <PickupSpawner position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8">
    327       <pickup>
    328         <SpeedPickup template=smallspeedpickup />
    329       </pickup>
    330     </PickupSpawner>
    331 
    332    <PickupSpawner position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8">
    333       <pickup>
    334         <SpeedPickup template=mediumspeedpickup />
    335       </pickup>
    336     </PickupSpawner>
    337 
    338     <PickupSpawner position="3000,8050,-4000" triggerDistance="40" respawnTime="60"  maxSpawnedItems="5" scale="8">
    339       <pickup>
    340         <ShrinkPickup template ="mediumshrinkpickup"/>
    341       </pickup>
    342     </PickupSpawner>>
     326   <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
     327   <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
     328   <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60"  maxSpawnedItems="5" scale="8" />
    343329
    344330

  • code/branches/presentation2012merge/data/levels/lastManStanding.oxw

    r9272 r9319  
    5050                    <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
    5151                    <Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
    52                     <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg : invisible pickup is hidden inside the asteroid -->
    53                         <pickup>
    54                             <InvisiblePickup template=hugeinvisiblepickup />
    55                         </pickup>
    56                     </PickupSpawner>
     52                    <PickupSpawner pickup=hugeinvisiblepickup position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15" /><!--EasterEgg : invisible pickup is hidden inside the asteroid -->
    5753                </attached>
    5854            </MovableEntity>

  • code/branches/presentation2012merge/data/levels/lastTeamStanding.oxw

    r9316 r9319  
    4848    </StaticEntity>
    4949
    50     <PickupSpawner position="-160,60,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
    51       <pickup>
    52         <InvisiblePickup template=hugeinvisiblepickup />
    53       </pickup>
    54     </PickupSpawner>
     50    <PickupSpawner pickup=hugeinvisiblepickup position="-160,60,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="10" /><!--EasterEgg-->
    5551    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
    5652      <attached>

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

    r9271 r9319  
    11531153
    11541154<!-- @Objects: Pickup - find better place !! -->
    1155     <PickupSpawner position="-48650,700,100" triggerDistance="70" respawnTime="30" maxSpawnedItems="1">
    1156       <pickup>
    1157         <ShieldPickup template=hugeshieldpickup />
    1158       </pickup>
    1159     </PickupSpawner>
     1155    <PickupSpawner pickup=hugeshieldpickup position="-48650,700,100" triggerDistance="70" respawnTime="30" maxSpawnedItems="1" />
    11601156
    11611157

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

    r9318 r9319  
    3737    <!-- Shield pickups -->
    3838
    39     <PickupSpawner position="-25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    40       <pickup>
    41         <ShieldPickup template=smallshieldpickup />
    42       </pickup>
    43     </PickupSpawner>
    44 
    45     <PickupSpawner position="0,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    46       <pickup>
    47         <ShieldPickup template=mediumshieldpickup />
    48       </pickup>
    49     </PickupSpawner>
    50 
    51     <PickupSpawner position="25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    52       <pickup>
    53         <ShieldPickup template=hugeshieldpickup />
    54       </pickup>
    55     </PickupSpawner>
     39    <PickupSpawner pickup=smallshieldpickup position="-25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     40    <PickupSpawner pickup=mediumshieldpickup position="0,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     41    <PickupSpawner pickup=hugeshieldpickup position="25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    5642
    5743    <!-- Health pickups -->
    5844
    59     <PickupSpawner position="-25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    60       <pickup>
    61         <HealthPickup template=smallhealthpickup />
    62       </pickup>
    63     </PickupSpawner>
    64 
    65     <PickupSpawner position="0,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    66       <pickup>
    67         <HealthPickup template=mediumhealthpickup />
    68       </pickup>
    69     </PickupSpawner>
    70 
    71     <PickupSpawner position="25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    72       <pickup>
    73         <HealthPickup template=hugehealthpickup />
    74       </pickup>
    75     </PickupSpawner>
    76 
    77     <PickupSpawner position="50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    78       <pickup>
    79         <HealthPickup template=crazyhealthpickup />
    80       </pickup>
    81     </PickupSpawner>
     45    <PickupSpawner pickup=smallhealthpickup position="-25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     46    <PickupSpawner pickup=mediumhealthpickup position="0,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     47    <PickupSpawner pickup=hugehealthpickup position="25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     48    <PickupSpawner pickup=crazyhealthpickup position="50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    8249
    8350    <!-- Speed pickups -->
    8451
    85     <PickupSpawner position="-25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    86       <pickup>
    87         <SpeedPickup template=smallspeedpickup />
    88       </pickup>
    89     </PickupSpawner>
    90 
    91     <PickupSpawner position="0,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    92       <pickup>
    93         <SpeedPickup template=mediumspeedpickup />
    94       </pickup>
    95     </PickupSpawner>
    96 
    97     <PickupSpawner position="25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    98       <pickup>
    99         <SpeedPickup template=hugespeedpickup />
    100       </pickup>
    101     </PickupSpawner>
    102 
    103     <PickupSpawner position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    104       <pickup>
    105         <SpeedPickup template=smalljumppickup />
    106       </pickup>
    107     </PickupSpawner>
     52    <PickupSpawner pickup=smallspeedpickup position="-25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
     53    <PickupSpawner pickup=mediumspeedpickup position="0,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
     54    <PickupSpawner pickup=hugespeedpickup position="25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
     55    <PickupSpawner pickup=smalljumppickup position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
    10856
    10957    <!-- Invisible pickups -->
    11058
    111     <PickupSpawner position="-25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    112       <pickup>
    113         <InvisiblePickup template=smallinvisiblepickup />
    114       </pickup>
    115     </PickupSpawner>
    116 
    117     <PickupSpawner position="0,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    118       <pickup>
    119         <InvisiblePickup template=mediuminvisiblepickup />
    120       </pickup>
    121     </PickupSpawner>
    122 
    123     <PickupSpawner position="25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    124       <pickup>
    125         <InvisiblePickup template=hugeinvisiblepickup />
    126       </pickup>
    127     </PickupSpawner>
     59    <PickupSpawner pickup=smallinvisiblepickup position="-25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     60    <PickupSpawner pickup=mediuminvisiblepickup position="0,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     61    <PickupSpawner pickup=hugeinvisiblepickup position="25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    12862
    12963    <!-- Meta pickups -->
    13064
    131     <PickupSpawner position="-25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    132       <pickup>
    133         <MetaPickup representation="use" metaType="use" />
    134       </pickup>
    135     </PickupSpawner>
    136 
    137     <PickupSpawner position="0,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    138       <pickup>
    139         <MetaPickup representation="drop" metaType="drop" />
    140       </pickup>
    141     </PickupSpawner>
    142 
    143     <PickupSpawner position="25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    144       <pickup>
    145         <MetaPickup metaType="destroy" />
    146       </pickup>
    147     </PickupSpawner>
    148 
    149     <PickupSpawner position="50,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    150       <pickup>
    151         <MetaPickup metaType="destroyCarrier" />
    152       </pickup>
    153     </PickupSpawner>
     65    <Template name=usemetapickup baseclass=MetaPickup>
     66      <MetaPickup representation="use" metaType="use" />
     67    </Template>
     68   
     69    <Template name=dropmetapickup baseclass=MetaPickup>
     70      <MetaPickup representation="drop" metaType="drop" />
     71    </Template>
     72   
     73    <Template name=destroymetapickup baseclass=MetaPickup>
     74      <MetaPickup metaType="destroy" />
     75    </Template>
     76   
     77    <Template name=destroycarriermetapickup baseclass=MetaPickup>
     78      <MetaPickup metaType="destroyCarrier" />
     79    </Template>
     80   
     81    <PickupSpawner pickup=usemetapickup position="-25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     82    <PickupSpawner pickup=dropmetapickup position="0,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     83    <PickupSpawner pickup=destroymetapickup position="25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
     84    <PickupSpawner pickup=destroycarriermetapickup position="50,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    15485
    15586    <!-- Pickup Collection pickups -->
    15687
    157     <PickupSpawner position="-50,25,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    158       <pickup>
    159         <PickupCollection template=triplehealthspeedinvisibilitypickup />
    160       </pickup>
    161     </PickupSpawner>
     88    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="-50,25,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    16289   
    16390    <!-- Drone pickup -->
    16491   
    165     <PickupSpawner position="-50,50,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    166       <pickup>
    167         <DronePickup template=dronepickup />
    168       </pickup>
    169     </PickupSpawner>
     92    <PickupSpawner pickup=dronepickup position="-50,50,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    17093   
    17194    <!-- DamageBoost pickup -->
    17295   
    173     <PickupSpawner position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    174       <pickup>
    175         <DamageBoostPickup template=smalldamageboostpickup />
    176       </pickup>
    177     </PickupSpawner>
    178    
    179       <PickupSpawner position="-50,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    180       <pickup>
    181         <DamageBoostPickup template=mediumdamageboostpickup />
    182       </pickup>
    183     </PickupSpawner>
    184    
    185       <PickupSpawner position="-50,125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    186       <pickup>
    187         <DamageBoostPickup template=largedamageboostpickup />
    188       </pickup>
    189     </PickupSpawner>
    190    
     96    <PickupSpawner pickup=smalldamageboostpickup position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     97    <PickupSpawner pickup=mediumdamageboostpickup position="-50,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
     98    <PickupSpawner pickup=largedamageboostpickup position="-50,125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    19199   
    192100    <!-- Other pickups -->
    … …  
    201109    />
    202110
    203     <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    204       <pickup>
    205         <HealthPickup representation="MediumHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
    206       </pickup>
    207     </PickupSpawner>
     111    <Template name=continuoushealthpickup baseclass=HealthPickup>
     112      <HealthPickup representation="MediumHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
     113    </Template>
     114   
     115    <PickupSpawner pickup=continuoushealthpickup position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    208116
    209     <PickupSpawner position="-25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    210       <pickup>
    211         <ShrinkPickup template ="smallshrinkpickup"/>
    212       </pickup>
    213     </PickupSpawner>
    214 
    215     <PickupSpawner position="0,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    216       <pickup>
    217         <ShrinkPickup template ="mediumshrinkpickup"/>
    218       </pickup>
    219     </PickupSpawner>
    220 
    221     <PickupSpawner position="25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    222       <pickup>
    223         <ShrinkPickup template ="hugeshrinkpickup"/>
    224       </pickup>
    225     </PickupSpawner>
     117    <PickupSpawner pickup="smallshrinkpickup" position="-25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
     118    <PickupSpawner pickup="mediumshrinkpickup" position="0,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
     119    <PickupSpawner pickup="hugeshrinkpickup" position="25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    226120   
    227121    <!-- @Objects: 4 boxes (uncontrolled pawns) -->

  • code/branches/presentation2012merge/data/levels/portals.oxw

    r9316 r9319  
    3939    <PortalLink fromID="2" toID="1" />
    4040
    41     <!--PickupSpawner position="-200,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10">
    42       <pickup>
    43         <DronePickup template=dronepickup />
    44       </pickup>
    45     </PickupSpawner-->
     41    <!--PickupSpawner pickup=dronepickup position="-200,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10" /-->
    4642
    4743    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />

  • code/branches/presentation2012merge/data/levels/presentation09b.oxw

    r9318 r9319  
    9494    </SpaceShip>
    9595
    96     <PickupSpawner position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    97       <pickup>
    98         <SpeedPickup template=smalljumppickup />
    99       </pickup>
    100     </PickupSpawner>
     96    <PickupSpawner pickup=smalljumppickup position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    10197
    10298    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    … …  
    109105    />
    110106
    111     <PickupSpawner position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    112       <pickup>
    113         <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
    114       </pickup>
    115     </PickupSpawner>
    116 
    117     <PickupSpawner position="2300, 4300, 2400" respawnTime="5" triggerDistance="20">
    118       <pickup>
    119         <HealthPickup template=mediumhealthpickup />
    120       </pickup>
    121     </PickupSpawner>
     107    <Template name=onusehealthpickup baseclass=HealthPickup>
     108      <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
     109    </Template>
     110
     111    <PickupSpawner pickup=onusehealthpickup position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
     112
     113    <PickupSpawner pickup=mediumhealthpickup position="2300, 4300, 2400" respawnTime="5" triggerDistance="20" />
    122114
    123115    <Billboard position="-2500, 2400, 1500" material="Examples/Flare" />

  • code/branches/presentation2012merge/data/levels/presentationFS10.oxw

    r9318 r9319  
    102102    <?lua end ?>
    103103
    104     <PickupSpawner position="500,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    105       <pickup>
    106         <DronePickup template=dronepickup />
    107       </pickup>
    108     </PickupSpawner>
     104    <PickupSpawner pickup=dronepickup position="500,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    109105
    110106    <!-- Shield pickups -->
    111107
    112     <PickupSpawner position="-25,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    113       <pickup>
    114         <ShieldPickup template=hugeshieldpickup />
    115       </pickup>
    116     </PickupSpawner>
     108    <PickupSpawner pickup=hugeshieldpickup position="-25,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    117109
    118110    <!-- Health pickups -->
    119111
    120     <PickupSpawner position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    121       <pickup>
    122         <HealthPickup template=hugehealthpickup />
    123       </pickup>
    124     </PickupSpawner>
     112    <PickupSpawner pickup=hugehealthpickup position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
    125113
    126114    <!-- Speed pickups -->
    127115
    128     <PickupSpawner position="25,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    129       <pickup>
    130         <SpeedPickup template=hugespeedpickup />
    131       </pickup>
    132     </PickupSpawner>
    133 
    134     <PickupSpawner position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    135       <pickup>
    136         <SpeedPickup template=smalljumppickup />
    137       </pickup>
    138     </PickupSpawner>
     116    <PickupSpawner pickup=hugespeedpickup position="25,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
     117    <PickupSpawner pickup=smalljumppickup position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
    139118
    140119    <!-- Invisible pickups -->
    141120
    142     <PickupSpawner position="0,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    143       <pickup>
    144         <InvisiblePickup template=hugeinvisiblepickup />
    145       </pickup>
    146     </PickupSpawner>
     121    <PickupSpawner pickup=hugeinvisiblepickup position="0,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
    147122
    148123    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    … …  
    155130    />
    156131
    157     <PickupSpawner position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    158       <pickup>
    159         <HealthPickup representation="MediumHealth" health=50 activationType=onUse durationType=once />
    160       </pickup>
    161     </PickupSpawner>
     132    <Template name=onusehealthpickup baseclass=HealthPickup>
     133      <HealthPickup representation="MediumHealth" health=50 activationType=onUse durationType=once />
     134    </Template>
     135
     136    <PickupSpawner pickup=onusehealthpickup position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    162137
    163138  </Scene>

  • code/branches/presentation2012merge/data/levels/presentationFS11.oxw

    r9016 r9319  
    422422    </SimpleNotification>
    423423
    424     <PickupSpawner position="-72487,420,-63" respawnTime="10" triggerDistance="20" maxSpawnedItems="5" active="false">
    425       <pickup>
    426         <ShrinkPickup template ="smallshrinkpickup"/>
    427       </pickup>
     424    <PickupSpawner pickup="smallshrinkpickup" position="-72487,420,-63" respawnTime="10" triggerDistance="20" maxSpawnedItems="5" active="false">
    428425      <events>
    429426        <activity>

  • code/branches/presentation2012merge/data/levels/presentationHS09.oxw

    r9318 r9319  
    9797    <Billboard material="Test/Fog" position="-3800, 2500, 1500" alpha="0.1" color="1, 1, 1, 0.1" scale="0.5" />
    9898
    99     <PickupSpawner position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    100       <pickup>
    101         <SpeedPickup template=smalljumppickup />
    102       </pickup>
    103     </PickupSpawner>
     99    <PickupSpawner pickup=smalljumppickup position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
    104100
    105101    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    … …  
    112108    />
    113109
    114     <PickupSpawner position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    115       <pickup>
    116         <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
    117       </pickup>
    118     </PickupSpawner>
    119 
    120     <PickupSpawner position="2300, 4300, 2400" respawnTime="5" triggerDistance="20">
    121       <pickup>
    122         <HealthPickup template=mediumhealthpickup />
    123       </pickup>
    124     </PickupSpawner>
     110    <Template name=onusehealthpickup baseclass=HealthPickup>
     111      <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
     112    </Template>
     113
     114    <PickupSpawner pickup=onusehealthpickup position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
     115
     116    <PickupSpawner pickup=mediumhealthpickup position="2300, 4300, 2400" respawnTime="5" triggerDistance="20" />
    125117
    126118    <Billboard position="-2500, 2400, 1500" material="Examples/Flare" />

  • code/branches/presentation2012merge/data/levels/surfaceRace.oxw

    r9301 r9319  
    399399
    400400
    401  <PickupSpawner position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8">
    402       <pickup>
    403         <SpeedPickup template=smallspeedpickup />
    404       </pickup>
    405     </PickupSpawner>
    406 
    407    <PickupSpawner position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8">
    408       <pickup>
    409         <SpeedPickup template=mediumspeedpickup />
    410       </pickup>
    411     </PickupSpawner>
    412 
    413     <PickupSpawner position="3000,8050,-4000" triggerDistance="40" respawnTime="60"  maxSpawnedItems="5" scale="8">
    414       <pickup>
    415         <ShrinkPickup template ="mediumshrinkpickup"/>
    416       </pickup>
    417     </PickupSpawner>>
     401   <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
     402   <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
     403   <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60"  maxSpawnedItems="5" scale="8" />
    418404
    419405

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

    r9318 r9319  
    1717</Template>
    1818
    19 <Template name=smallshieldpickup>
     19<Template name=smallshieldpickup baseclass=ShieldPickup>
    2020  <ShieldPickup
    2121    representation = "smallshieldpickup"
    … …  
    4444</Template>
    4545
    46 <Template name=mediumshieldpickup>
     46<Template name=mediumshieldpickup baseclass=ShieldPickup>
    4747  <ShieldPickup
    4848    representation = "mediumshieldpickup"
    … …  
    7272</Template>
    7373
    74 <Template name=hugeshieldpickup>
     74<Template name=hugeshieldpickup baseclass=ShieldPickup>
    7575  <ShieldPickup
    7676    representation = "hugeshieldpickup"
    … …  
    101101</Template>
    102102
    103 <Template name=smallhealthpickup>
     103<Template name=smallhealthpickup baseclass=HealthPickup>
    104104  <HealthPickup
    105105    representation = "smallhealthpickup"
    … …  
    127127</Template>
    128128
    129 <Template name=mediumhealthpickup>
     129<Template name=mediumhealthpickup baseclass=HealthPickup>
    130130  <HealthPickup
    131131    representation = "mediumhealthpickup"
    … …  
    153153</Template>
    154154
    155 <Template name=hugehealthpickup>
     155<Template name=hugehealthpickup baseclass=HealthPickup>
    156156  <HealthPickup
    157157    representation = "hugehealthpickup"
    … …  
    179179</Template>
    180180
    181 <Template name=crazyhealthpickup>
     181<Template name=crazyhealthpickup baseclass=HealthPickup>
    182182  <HealthPickup
    183183    representation = "crazyhealthpickup"
    … …  
    241241</Template>
    242242
    243 <Template name=smalldamageboostpickup>
     243<Template name=smalldamageboostpickup baseclass=DamageBoostPickup>
    244244  <DamageBoostPickup
    245245    representation = "smalldamageboostpickup"
    … …  
    267267</Template>
    268268
    269 <Template name=mediumdamageboostpickup>
     269<Template name=mediumdamageboostpickup baseclass=DamageBoostPickup>
    270270  <DamageBoostPickup
    271271    representation = "mediumdamageboostpickup"
    … …  
    293293</Template>
    294294
    295 <Template name=largedamageboostpickup>
     295<Template name=largedamageboostpickup baseclass=DamageBoostPickup>
    296296  <DamageBoostPickup
    297297    representation = "largedamageboostpickup"
    … …  
    322322</Template>
    323323
    324 <Template name=smallspeedpickup>
     324<Template name=smallspeedpickup baseclass=SpeedPickup>
    325325  <SpeedPickup
    326326    representation = "smallspeedpickup"
    … …  
    349349</Template>
    350350
    351 <Template name=mediumspeedpickup>
     351<Template name=mediumspeedpickup baseclass=SpeedPickup>
    352352  <SpeedPickup
    353353    representation = "mediumspeedpickup"
    … …  
    376376</Template>
    377377
    378 <Template name=hugespeedpickup>
     378<Template name=hugespeedpickup baseclass=SpeedPickup>
    379379  <SpeedPickup
    380380    representation = "hugespeedpickup"
    … …  
    403403</Template>
    404404
    405 <Template name=smalljumppickup>
     405<Template name=smalljumppickup baseclass=SpeedPickup>
    406406  <SpeedPickup
    407407    representation = "smalljumppickup"
    … …  
    432432</Template>
    433433
    434 <Template name=smallinvisiblepickup>
     434<Template name=smallinvisiblepickup baseclass=InvisiblePickup>
    435435  <InvisiblePickup
    436436    representation = "smallinvisiblepickup"
    … …  
    457457</Template>
    458458
    459 <Template name=mediuminvisiblepickup>
     459<Template name=mediuminvisiblepickup baseclass=InvisiblePickup>
    460460  <InvisiblePickup
    461461    representation = "mediuminvisiblepickup"
    … …  
    482482</Template>
    483483
    484 <Template name=hugeinvisiblepickup>
     484<Template name=hugeinvisiblepickup baseclass=InvisiblePickup>
    485485  <InvisiblePickup
    486486    representation = "hugeinvisiblepickup"
    … …  
    507507</Template>
    508508
    509 <Template name=smallshrinkpickup>
     509<Template name=smallshrinkpickup baseclass=ShrinkPickup>
    510510  <ShrinkPickup
    511511    representation = "smallshrinkpickup"
    … …  
    533533</Template>
    534534
    535 <Template name=mediumshrinkpickup>
     535<Template name=mediumshrinkpickup baseclass=ShrinkPickup>
    536536  <ShrinkPickup
    537537    representation = "mediumshrinkpickup"
    … …  
    559559</Template>
    560560
    561 <Template name=hugeshrinkpickup>
     561<Template name=hugeshrinkpickup baseclass=ShrinkPickup>
    562562  <ShrinkPickup
    563563    representation = "hugeshrinkpickup"
    … …  
    589589</Template>
    590590
    591 <Template name=triplehealthspeedinvisibilitypickup>
     591<Template name=triplehealthspeedinvisibilitypickup baseclass=PickupCollection>
    592592    <PickupCollection
    593593        representation = "triplehealthspeedinvisibilitypickup"
    … …  
    651651</Template>
    652652
    653 <Template name=dronepickup>
     653<Template name=dronepickup baseclass=DronePickup>
    654654    <DronePickup representation=dronepickup droneTemplate=droneTemplate />
    655655</Template>
Note: See TracChangeset for help on using the changeset viewer.