Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 18, 2012, 10:36:24 PM (12 years ago)
Author:
landauf
Message:

removed PickupIdentifier for a number of reasons (I talked to Damian about it before)
a pickup now references the PickupRepresentation by name with the "representation" attribute

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

Legend:

Unmodified
Added
Removed

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

    r9269 r9318  
    33
    44<PickupRepresentation
     5    name = "smallshieldpickup"
    56    pickupName = "Small Shield Pickup"
    67    pickupDescription = "Gives you a small-sized shield for 30 seconds."
    78    inventoryRepresentation = "SmallShield"
    89    spawnerTemplate = "smallshieldpickupRepresentation"
    9 >
    10     <pickup>
    11         <ShieldPickup template=smallshieldpickup />
    12     </pickup>
    13 </PickupRepresentation>
    14 
    15 <PickupRepresentation
     10/>
     11
     12<PickupRepresentation
     13    name = "mediumshieldpickup"
    1614    pickupName = "Medium Shield Pickup"
    1715    pickupDescription = "Gives you a medium-sized shield for 30 seconds."
    1816    inventoryRepresentation = "MediumShield"
    1917    spawnerTemplate = "mediumshieldpickupRepresentation"
    20 >
    21     <pickup>
    22         <ShieldPickup template=mediumshieldpickup />
    23     </pickup>
    24 </PickupRepresentation>
    25 
    26 <PickupRepresentation
     18/>
     19
     20<PickupRepresentation
     21    name = "hugeshieldpickup"
    2722    pickupName = "Huge Shield Pickup"
    2823    pickupDescription = "Gives you a big shield for 60 seconds."
    2924    inventoryRepresentation = "HugeShield"
    3025    spawnerTemplate = "hugeshieldpickupRepresentation"
    31 >
    32     <pickup>
    33         <ShieldPickup template=hugeshieldpickup />
    34     </pickup>
    35 </PickupRepresentation>
     26/>
    3627
    3728<!-- Health pickups -->
    3829
    3930<PickupRepresentation
     31    name = "smallhealthpickup"
    4032    pickupName = "Small Health Boost"
    4133    pickupDescription = "Adds a small amout of health to the ship."
    4234    inventoryRepresentation = "SmallHealth"
    4335    spawnerTemplate = "smallhealthpickupRepresentation"
    44 >
    45     <pickup>
    46         <HealthPickup template=smallhealthpickup />
    47     </pickup>
    48 </PickupRepresentation>
    49 
    50 <PickupRepresentation
     36/>
     37
     38<PickupRepresentation
     39    name = "mediumhealthpickup"
    5140    pickupName = "Medium Health Boost"
    5241    pickupDescription = "Adds a medium amout of health to the ship."
    5342    spawnerTemplate = "mediumhealthpickupRepresentation"
    5443    inventoryRepresentation = "MediumHealth"
    55 >
    56     <pickup>
    57         <HealthPickup template=mediumhealthpickup />
    58     </pickup>
    59 </PickupRepresentation>
    60 
    61 <PickupRepresentation
     44/>
     45
     46<PickupRepresentation
     47    name = "hugehealthpickup"
    6248    pickupName = "Huge Health Boost"
    6349    pickupDescription = "Adds a huge amout of health to the ship."
    6450    spawnerTemplate = "hugehealthpickupRepresentation"
    6551    inventoryRepresentation = "HugeHealth"
    66 >
    67     <pickup>
    68         <HealthPickup template=hugehealthpickup />
    69     </pickup>
    70 </PickupRepresentation>
    71 
    72 <PickupRepresentation
     52/>
     53
     54<PickupRepresentation
     55    name = "crazyhealthpickup"
    7356    pickupName = "Crazy Madness Health Boost"
    7457    pickupDescription = "Adds a crazy amout of health to the ship."
    7558    spawnerTemplate = "crazyhealthpickupRepresentation"
    7659    inventoryRepresentation = "CrazyMadnessHealth"
    77 >
    78     <pickup>
    79         <HealthPickup template=crazyhealthpickup />
    80     </pickup>
    81 </PickupRepresentation>
     60/>
    8261
    8362<!-- Meta pickups -->
    8463
    8564<PickupRepresentation
     65    name = "use"
    8666    pickupName = "Use Pickup"
    8767    pickupDescription = "Uses all pickups you have."
    8868    spawnerTemplate = "usepickupRepresentation"
    8969    inventoryRepresentation = "usePickup"
    90 >
    91     <pickup>
    92         <MetaPickup metaType="use" />
    93     </pickup>
    94 </PickupRepresentation>
    95 
    96 <PickupRepresentation
     70/>
     71
     72<PickupRepresentation
     73    name = "drop"
    9774    pickupName = "Drop Pickup"
    9875    pickupDescription = "Drops all pickups you have."
    9976    spawnerTemplate = "droppickupRepresentation"
    10077    inventoryRepresentation = "dropPickup"
    101 >
    102     <pickup>
    103         <MetaPickup metaType="drop" />
    104     </pickup>
    105 </PickupRepresentation>
     78/>
    10679
    10780<!-- Speed pickups -->
    10881
    10982<PickupRepresentation
     83    name = "smallspeedpickup"
    11084    pickupName = "Small Speed Boost"
    11185    pickupDescription = "Multiplies Speed of the Ship by a small amount."
    11286    spawnerTemplate = "smallspeedpickupRepresentation"
    11387    inventoryRepresentation = "SmallSpeed"
    114 >
    115     <pickup>
    116         <SpeedPickup template=smallspeedpickup />
    117     </pickup>
    118 </PickupRepresentation>
    119 
    120 <PickupRepresentation
     88/>
     89
     90<PickupRepresentation
     91    name = "mediumspeedpickup"
    12192    pickupName = "Medium Speed Boost"
    12293    pickupDescription = "Multiplies Speed of the Ship by a bigger amount."
    12394    spawnerTemplate = "mediumspeedpickupRepresentation"
    12495    inventoryRepresentation = "MediumSpeed"
    125 >
    126     <pickup>
    127         <SpeedPickup template=mediumspeedpickup />
    128     </pickup>
    129 </PickupRepresentation>
    130 
    131 <PickupRepresentation
     96/>
     97
     98<PickupRepresentation
     99    name = "hugespeedpickup"
    132100    pickupName = "Huge Speed Boost"
    133101    pickupDescription = "Multiplies Speed of the Ship by a huge amount."
    134102    spawnerTemplate = "hugespeedpickupRepresentation"
    135103    inventoryRepresentation = "HugeSpeed"
    136 >
    137     <pickup>
    138         <SpeedPickup template=hugespeedpickup />
    139     </pickup>
    140 </PickupRepresentation>
    141 
    142 <PickupRepresentation
     104/>
     105
     106<PickupRepresentation
     107    name = "smalljumppickup"
    143108    pickupName = "Small Jump Boost"
    144109    pickupDescription = "Boosts the Ship with a massive amount for a very short time."
    145110    spawnerTemplate = "smalljumppickupRepresentation"
    146111    inventoryRepresentation = "SmallSpeed"
    147 >
    148     <pickup>
    149         <SpeedPickup template=smalljumppickup />
    150     </pickup>
    151 </PickupRepresentation>
     112/>
    152113
    153114<!-- Invisible pickups -->
    154115
    155116<PickupRepresentation
     117    name = "smallinvisiblepickup"
    156118    pickupName = "Small Invisibility"
    157119    pickupDescription = "Makes you invisible for 5 seconds."
    158120    spawnerTemplate = "smallinvisiblepickupRepresentation"
    159121    inventoryRepresentation = "SmallInvisible"
    160 >
    161     <pickup>
    162         <InvisiblePickup template=smallinvisiblepickup />
    163     </pickup>
    164 </PickupRepresentation>
    165 
    166 <PickupRepresentation
     122/>
     123
     124<PickupRepresentation
     125    name = "mediuminvisiblepickup"
    167126    pickupName = "Medium Invisibility"
    168127    pickupDescription = "Makes you invisible for 10 seconds."
    169128    spawnerTemplate = "mediuminvisiblepickupRepresentation"
    170129    inventoryRepresentation = "MediumInvisible"
    171 >
    172     <pickup>
    173         <InvisiblePickup template=mediuminvisiblepickup />
    174     </pickup>
    175 </PickupRepresentation>
    176 
    177 <PickupRepresentation
     130/>
     131
     132<PickupRepresentation
     133    name = "hugeinvisiblepickup"
    178134    pickupName = "Huge Invisibility"
    179135    pickupDescription = "Makes you invisible for 20 seconds."
    180136    spawnerTemplate = "hugeinvisiblepickupRepresentation"
    181137    inventoryRepresentation = "HugeInvisible"
    182 >
    183     <pickup>
    184         <InvisiblePickup template=hugeinvisiblepickup />
    185     </pickup>
    186 </PickupRepresentation>
     138/>
    187139
    188140<!-- Pickup Collection pickups -->
    189141
    190142<PickupRepresentation
     143    name = "triplehealthspeedinvisibilitypickup"
    191144    pickupName = "Tri Pickup"
    192145    pickupDescription = "Adds health, speed and invisibility."
    193146    spawnerTemplate = "triplehealthspeedinvisibilitypickupRepresentation"
    194 >
    195     <pickup>
    196         <PickupCollection template=triplehealthspeedinvisibilitypickup />
    197     </pickup>
    198 </PickupRepresentation>
     147/>
    199148
    200149<!-- Drone Pickup -->
    201150
    202151<PickupRepresentation
     152    name = "dronepickup"
    203153    pickupName = "Drone Pickup"
    204154    pickupDescription = "Adds a Drone to the Player's Spaceship"
    205155    spawnerTemplate = "dronepickupRepresentation"
    206 >
    207     <pickup>
    208         <DronePickup template=dronepickup />
    209     </pickup>
    210 </PickupRepresentation>
     156/>
    211157
    212158<!-- DamageBoost Pickup -->
    213159
    214160<PickupRepresentation
     161    name = "smalldamageboostpickup"
    215162    pickupName = "Small DamageBoost Pickup"
    216163    pickupDescription = "Multiplies the ship damage with 2."
    217164    spawnerTemplate = "smalldamageboostpickupRepresentation"
    218165    inventoryRepresentation = "SmallDamageBoost"
    219 >
    220     <pickup>
    221         <DamageBoostPickup template=smalldamageboostpickup />
    222     </pickup>
    223 </PickupRepresentation>
    224 
    225 <PickupRepresentation
     166/>
     167
     168<PickupRepresentation
     169    name = "mediumdamageboostpickup"
    226170    pickupName = "Medium DamageBoost Pickup"
    227171    pickupDescription = "Multiplies the ship damage with 5."
    228172    spawnerTemplate = "mediumdamageboostpickupRepresentation"
    229173    inventoryRepresentation = "MediumDamageBoost"
    230 >
    231     <pickup>
    232         <DamageBoostPickup template=mediumdamageboostpickup />
    233     </pickup>
    234 </PickupRepresentation>
    235 
    236 <PickupRepresentation
     174/>
     175
     176<PickupRepresentation
     177    name = "largedamageboostpickup"
    237178    pickupName = "Large DamageBoost Pickup"
    238179    pickupDescription = "Multiplies the ship damage with 7."
    239180    spawnerTemplate = "largedamageboostpickupRepresentation"
    240181    inventoryRepresentation = "LargeDamageBoost"
    241 >
    242     <pickup>
    243         <DamageBoostPickup template=largedamageboostpickup />
    244     </pickup>
    245 </PickupRepresentation>
     182/>
    246183
    247184<!-- Shrink Pickup -->
    248185
    249186<PickupRepresentation
     187    name = "smallshrinkpickup"
    250188    pickupName = "Small Shrink"
    251189    pickupDescription = "Shrinks the Ship by a bit"
    252190    spawnerTemplate = "smallshrinkpickupRepresentation"
    253191    inventoryRepresentation = "SmallShrink"
    254 >
    255     <pickup>
    256         <ShrinkPickup template=smallshrinkpickup />
    257     </pickup>
    258 </PickupRepresentation>
    259 
    260 <PickupRepresentation
     192/>
     193
     194<PickupRepresentation
     195    name = "mediumshrinkpickup"
    261196    pickupName = "Medium Shrink"
    262197    pickupDescription = "Shrinks the Ship"
    263198    spawnerTemplate = "mediumshrinkpickupRepresentation"
    264199    inventoryRepresentation = "MediumShrink"
    265 >
    266     <pickup>
    267         <ShrinkPickup template=mediumshrinkpickup />
    268     </pickup>
    269 </PickupRepresentation>
    270 
    271 <PickupRepresentation
     200/>
     201
     202<PickupRepresentation
     203    name = "hugeshrinkpickup"
    272204    pickupName = "Huge Shrink"
    273205    pickupDescription = "Shrinks the Ship considerably"
    274206    spawnerTemplate = "hugeshrinkpickupRepresentation"
    275207    inventoryRepresentation = "HugeShrink"
    276 >
    277     <pickup>
    278         <ShrinkPickup template=hugeshrinkpickup />
    279     </pickup>
    280 </PickupRepresentation>
    281 
     208/>

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

    r9291 r9318  
    131131    <PickupSpawner position="-25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    132132      <pickup>
    133         <MetaPickup metaType="use" />
     133        <MetaPickup representation="use" metaType="use" />
    134134      </pickup>
    135135    </PickupSpawner>
    … …  
    137137    <PickupSpawner position="0,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
    138138      <pickup>
    139         <MetaPickup metaType="drop" />
     139        <MetaPickup representation="drop" metaType="drop" />
    140140      </pickup>
    141141    </PickupSpawner>
    … …  
    194194    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    195195    <PickupRepresentation
     196      name = "MediumHealth"
    196197      pickupName = "Medium Health Pack"
    197198      pickupDescription = "Once used adds a medium amout of health to the ship."
    198199      spawnerTemplate = "mediumhealthpickupRepresentation"
    199200      inventoryRepresentation = "MediumHealth"
    200     >
    201       <pickup>
    202         <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
    203       </pickup>
    204     </PickupRepresentation>
     201    />
    205202
    206203    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    207204      <pickup>
    208         <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
     205        <HealthPickup representation="MediumHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
    209206      </pickup>
    210207    </PickupSpawner>

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

    r9316 r9318  
    102102    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    103103    <PickupRepresentation
     104      name = "MediumHealth"
    104105      pickupName = "Medium Health Pack"
    105106      pickupDescription = "Once used adds a medium amout of health to the ship."
    106107      spawnerTemplate = "mediumhealthpickupRepresentation"
    107108      inventoryRepresentation = "MediumHealth"
    108     >
    109       <pickup>
    110         <HealthPickup health=100 activationType="onUse" durationType="once" />
    111       </pickup>
    112     </PickupRepresentation>
     109    />
    113110
    114111    <PickupSpawner position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    115112      <pickup>
    116         <HealthPickup health=100 activationType=onUse durationType=once />
     113        <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
    117114      </pickup>
    118115    </PickupSpawner>

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

    r9016 r9318  
    148148    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    149149    <PickupRepresentation
     150      name = "MediumHealth"
    150151      pickupName = "Medium Health Pack"
    151152      pickupDescription = "Once used adds a medium amout of health to the ship."
    152153      spawnerTemplate = "mediumhealthpickupRepresentation"
    153154      inventoryRepresentation = "MediumHealth"
    154     >
    155       <pickup>
    156         <HealthPickup health=50 activationType="onUse" durationType="once" />
    157       </pickup>
    158     </PickupRepresentation>
     155    />
    159156
    160157    <PickupSpawner position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    161158      <pickup>
    162         <HealthPickup health=50 activationType=onUse durationType=once />
     159        <HealthPickup representation="MediumHealth" health=50 activationType=onUse durationType=once />
    163160      </pickup>
    164161    </PickupSpawner>

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

    r9316 r9318  
    105105    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
    106106    <PickupRepresentation
     107      name = "MediumHealth"
    107108      pickupName = "Medium Health Pack"
    108109      pickupDescription = "Once used adds a medium amout of health to the ship."
    109110      spawnerTemplate = "mediumhealthpickupRepresentation"
    110111      inventoryRepresentation = "MediumHealth"
    111     >
    112       <pickup>
    113         <HealthPickup health=100 activationType="onUse" durationType="once" />
    114       </pickup>
    115     </PickupRepresentation>
     112    />
    116113
    117114    <PickupSpawner position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
    118115      <pickup>
    119         <HealthPickup health=100 activationType=onUse durationType=once />
     116        <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
    120117      </pickup>
    121118    </PickupSpawner>

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

    r9303 r9318  
    1919<Template name=smallshieldpickup>
    2020  <ShieldPickup
     21    representation = "smallshieldpickup"
    2122    duration = 10
    2223    shieldabsorption = 0.7
    … …  
    4546<Template name=mediumshieldpickup>
    4647  <ShieldPickup
     48    representation = "mediumshieldpickup"
    4749    duration = 30
    4850    shieldabsorption = 0.8
    … …  
    7274<Template name=hugeshieldpickup>
    7375  <ShieldPickup
     76    representation = "hugeshieldpickup"
    7477    duration = 60
    7578    shieldabsorption = 0.95
    … …  
    100103<Template name=smallhealthpickup>
    101104  <HealthPickup
     105    representation = "smallhealthpickup"
    102106    health = 10
    103107    healthType = "limited"
    … …  
    125129<Template name=mediumhealthpickup>
    126130  <HealthPickup
     131    representation = "mediumhealthpickup"
    127132    health = 50
    128133    healthType = "limited"
    … …  
    150155<Template name=hugehealthpickup>
    151156  <HealthPickup
     157    representation = "hugehealthpickup"
    152158    health = 100
    153159    healthType = "limited"
    … …  
    175181<Template name=crazyhealthpickup>
    176182  <HealthPickup
     183    representation = "crazyhealthpickup"
    177184    health = 1000
    178185    healthType = "permanent"
    … …  
    236243<Template name=smalldamageboostpickup>
    237244  <DamageBoostPickup
     245    representation = "smalldamageboostpickup"
    238246    duration = 10.0
    239247    damageMultiplier = 2.0
    … …  
    261269<Template name=mediumdamageboostpickup>
    262270  <DamageBoostPickup
     271    representation = "mediumdamageboostpickup"
    263272    duration = 10.0
    264273    damageMultiplier = 5.0
    … …  
    286295<Template name=largedamageboostpickup>
    287296  <DamageBoostPickup
     297    representation = "largedamageboostpickup"
    288298    duration = 10.0
    289299    damageMultiplier = 7.0
    … …  
    314324<Template name=smallspeedpickup>
    315325  <SpeedPickup
     326    representation = "smallspeedpickup"
    316327    duration = 10.0
    317328    speedAdd = 0.0
    … …  
    340351<Template name=mediumspeedpickup>
    341352  <SpeedPickup
     353    representation = "mediumspeedpickup"
    342354    duration = 10.0
    343355    speedAdd = 0.0
    … …  
    366378<Template name=hugespeedpickup>
    367379  <SpeedPickup
     380    representation = "hugespeedpickup"
    368381    duration = 10.0
    369382    speedAdd = 0.0
    … …  
    392405<Template name=smalljumppickup>
    393406  <SpeedPickup
     407    representation = "smalljumppickup"
    394408    duration = 0.7
    395409    speedAdd = 5000.0
    … …  
    420434<Template name=smallinvisiblepickup>
    421435  <InvisiblePickup
     436    representation = "smallinvisiblepickup"
    422437    duration = 5.0
    423438    activaionType = "immediate"
    … …  
    444459<Template name=mediuminvisiblepickup>
    445460  <InvisiblePickup
     461    representation = "mediuminvisiblepickup"
    446462    duration = 10.0
    447463    activaionType = "immediate"
    … …  
    468484<Template name=hugeinvisiblepickup>
    469485  <InvisiblePickup
     486    representation = "hugeinvisiblepickup"
    470487    duration = 20.0
    471488    activaionType = "immediate"
    … …  
    492509<Template name=smallshrinkpickup>
    493510  <ShrinkPickup
     511    representation = "smallshrinkpickup"
    494512    duration = 10.0
    495513    shrinkFactor = 2.5
    … …  
    517535<Template name=mediumshrinkpickup>
    518536  <ShrinkPickup
     537    representation = "mediumshrinkpickup"
    519538    duration = 30.0
    520539    shrinkFactor = 5.0
    … …  
    542561<Template name=hugeshrinkpickup>
    543562  <ShrinkPickup
     563    representation = "hugeshrinkpickup"
    544564    duration = 60.0
    545565    shrinkFactor = 10.0
    … …  
    570590
    571591<Template name=triplehealthspeedinvisibilitypickup>
    572     <PickupCollection>
     592    <PickupCollection
     593        representation = "triplehealthspeedinvisibilitypickup"
     594    >
    573595        <pickupables>
    574596            <HealthPickup template=mediumhealthpickup />
    … …  
    630652
    631653<Template name=dronepickup>
    632     <DronePickup droneTemplate=droneTemplate />
    633 </Template>
    634 
     654    <DronePickup representation=dronepickup droneTemplate=droneTemplate />
     655</Template>
     656
Note: See TracChangeset for help on using the changeset viewer.