Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 13, 2010, 10:16:10 AM (15 years ago)
Author:
dafrick
Message:

Merged pickup4 branch back to trunk.

Location:
code/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

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

    r6524 r6711  
    11<PickupRepresentation
    2     name = "Small Health Boost"
    3     description = "Adds a small amout of health to the ship."
     2    pickupName = "Small Health Boost"
     3    pickupDescription = "Adds a small amout of health to the ship."
     4    inventoryRepresentation = "SmallHealth"
    45    spawnerTemplate = "smallhealthpickupRepresentation"
    56>
    … …  
    1011
    1112<PickupRepresentation
    12     name = "Medium Health Boost"
    13     description = "Adds a medium amout of health to the ship."
     13    pickupName = "Medium Health Boost"
     14    pickupDescription = "Adds a medium amout of health to the ship."
    1415    spawnerTemplate = "mediumhealthpickupRepresentation"
     16    inventoryRepresentation = "MediumHealth"
    1517>
    1618    <pickup>
    … …  
    2022
    2123<PickupRepresentation
    22     name = "Huge Health Boost"
    23     description = "Adds a huge amout of health to the ship."
     24    pickupName = "Huge Health Boost"
     25    pickupDescription = "Adds a huge amout of health to the ship."
    2426    spawnerTemplate = "hugehealthpickupRepresentation"
     27    inventoryRepresentation = "HugeHealth"
    2528>
    2629    <pickup>
    … …  
    3033
    3134<PickupRepresentation
    32     name = "Crazy Madness Health Boost"
    33     description = "Adds a crazy amout of health to the ship."
     35    pickupName = "Crazy Madness Health Boost"
     36    pickupDescription = "Adds a crazy amout of health to the ship."
    3437    spawnerTemplate = "crazyhealthpickupRepresentation"
     38    inventoryRepresentation = "CrazyMadnessHealth"
    3539>
    3640    <pickup>
    … …  
    4044
    4145<PickupRepresentation
    42     name = "Double Pickup"
    43     description = "Does stuff."
     46    pickupName = "Double Pickup"
     47    pickupDescription = "Does stuff."
    4448    spawnerTemplate = "crazyhealthpickupRepresentation"
    4549>
    … …  
    4852    </pickup>
    4953</PickupRepresentation>
     54
     55<PickupRepresentation
     56    pickupName = "Use Pickup"
     57    pickupDescription = "Uses all pickups you have."
     58    spawnerTemplate = "usepickupRepresentation"
     59    inventoryRepresentation = "usePickup"
     60>
     61    <pickup>
     62        <MetaPickup metaType="use" />
     63    </pickup>
     64</PickupRepresentation>
     65
     66<PickupRepresentation
     67    pickupName = "Drop Pickup"
     68    pickupDescription = "Drops all pickups you have."
     69    spawnerTemplate = "droppickupRepresentation"
     70    inventoryRepresentation = "dropPickup"
     71>
     72    <pickup>
     73        <MetaPickup metaType="drop" />
     74    </pickup>
     75</PickupRepresentation>
     76
     77<PickupRepresentation
     78    pickupName = "Huge Health Boost"
     79    pickupDescription = "Adds a huge amout of health to the ship."
     80    spawnerTemplate = "hugehealthpickupRepresentation"
     81    inventoryRepresentation = "HugeHealth"
     82>
     83    <pickup>
     84          <HealthPickup
     85    health = 100
     86    healthType = "limited"
     87    activationType = "onUse"
     88    durationType = "once"
     89  />
     90    </pickup>
     91</PickupRepresentation>

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

    r6524 r6711  
    3737    <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    3838        <pickup>
    39             <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=permanent />
     39            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
    4040        </pickup>
    4141    </PickupSpawner>
    … …  
    7171    </PickupSpawner>
    7272
    73     <!--PickupSpawner position="100,100,100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     73    <PickupSpawner position="100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    7474        <pickup>
    75             <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=limited />
     75              <HealthPickup
     76    health = 100
     77    healthType = "limited"
     78    activationType = "onUse"
     79    durationType = "once"
     80  />
    7681        </pickup>
    77     </PickupSpawner-->
     82    </PickupSpawner>
    7883
    7984    <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/trunk/data/levels/templates/pickup_representation_templates.oxt

    r6524 r6711  
    107107    </PickupCollection>
    108108</Template>
     109
     110<Template name=usepickupRepresentation>
     111    <PickupRepresentation>
     112        <spawner-representation>
     113            <StaticEntity>
     114                <attached>
     115                    <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
     116                        <attached>
     117                            <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
     118                        </attached>
     119                    </Billboard>
     120                </attached>
     121            </StaticEntity>
     122        </spawner-representation>
     123    </PickupRepresentation>
     124</Template>
     125
     126<Template name=droppickupRepresentation>
     127    <PickupRepresentation>
     128        <spawner-representation>
     129            <StaticEntity>
     130                <attached>
     131                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1>
     132                        <attached>
     133                            <Billboard position="0,0,0" colour="0.95,0.20,0.10" material="Arrow" scale=0.65 />
     134                        </attached>
     135                    </Billboard>
     136                </attached>
     137            </StaticEntity>
     138        </spawner-representation>
     139    </PickupRepresentation>
     140</Template>
    109141   
Note: See TracChangeset for help on using the changeset viewer.