Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6712 for code/trunk


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

Merged pickup_representation_templates into one.
Merged pickups.oxi into one.
Adjusted pickup.oxw to showcase all currently existing (and working) pickups.

Location:
code/trunk/data/levels
Files:
4 deleted
5 edited

Legend:

Unmodified
Added
Removed

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

    r6711 r6712  
     1
     2<!-- Health pickups -->
     3
    14<PickupRepresentation
    25    pickupName = "Small Health Boost"
    … …  
    4346</PickupRepresentation>
    4447
    45 <PickupRepresentation
    46     pickupName = "Double Pickup"
    47     pickupDescription = "Does stuff."
    48     spawnerTemplate = "crazyhealthpickupRepresentation"
    49 >
    50     <pickup>
    51         <PickupCollection template=doublepickup />
    52     </pickup>
    53 </PickupRepresentation>
     48<!-- Meta pickups -->
    5449
    5550<PickupRepresentation
    … …  
    7570</PickupRepresentation>
    7671
     72<!-- Speed pickups -->
     73
    7774<PickupRepresentation
    78     pickupName = "Huge Health Boost"
    79     pickupDescription = "Adds a huge amout of health to the ship."
    80     spawnerTemplate = "hugehealthpickupRepresentation"
    81     inventoryRepresentation = "HugeHealth"
     75    name = "Small Speed Boost"
     76    description = "Multiplies Speed of the Ship by a small amount."
     77    spawnerTemplate = "smallspeedpickupRepresentation"
    8278>
    8379    <pickup>
    84           <HealthPickup
    85     health = 100
    86     healthType = "limited"
    87     activationType = "onUse"
    88     durationType = "once"
    89   />
     80        <SpeedPickup template=smallspeedpickup />
    9081    </pickup>
    9182</PickupRepresentation>
     83
     84<PickupRepresentation
     85    name = "Medium Speed Boost"
     86    description = "Multiplies Speed of the Ship by a bigger amount."
     87    spawnerTemplate = "mediumspeedpickupRepresentation"
     88>
     89    <pickup>
     90        <SpeedPickup template=mediumspeedpickup />
     91    </pickup>
     92</PickupRepresentation>
     93
     94<PickupRepresentation
     95    name = "Huge Speed Boost"
     96    description = "Multiplies Speed of the Ship by a huge amount."
     97    spawnerTemplate = "hugespeedpickupRepresentation"
     98>
     99    <pickup>
     100        <SpeedPickup template=hugespeedpickup />
     101    </pickup>
     102</PickupRepresentation>
     103
     104<PickupRepresentation
     105    name = "Small Jump Boost"
     106    description = "Boosts the Ship with a massive amount for a very short time."
     107    spawnerTemplate = "smalljumppickupRepresentation"
     108>
     109    <pickup>
     110        <SpeedPickup template=smalljumppickup />
     111    </pickup>
     112</PickupRepresentation>
     113
     114<!-- Invisible pickups -->
     115
     116<PickupRepresentation
     117    name = "small Invisibility"
     118    description = "Makes you invisible for 5 seconds."
     119    spawnerTemplate = "smallinvisiblepickupRepresentation"
     120>
     121    <pickup>
     122        <InvisiblePickup template=smallinvisiblepickup />
     123    </pickup>
     124</PickupRepresentation>
     125
     126<PickupRepresentation
     127    name = "medium Invisibility"
     128    description = "Makes you invisible for 10 seconds."
     129    spawnerTemplate = "mediuminvisiblepickupRepresentation"
     130>
     131    <pickup>
     132        <InvisiblePickup template=mediuminvisiblepickup />
     133    </pickup>
     134</PickupRepresentation>
     135
     136<PickupRepresentation
     137    name = "hunge Invisibility"
     138    description = "Makes you invisible for 20 seconds."
     139    spawnerTemplate = "hugeinvisiblepickupRepresentation"
     140>
     141    <pickup>
     142        <InvisiblePickup template=hugeinvisiblepickup />
     143    </pickup>
     144</PickupRepresentation>
     145
     146<!-- Pickup Collection pickups -->
     147
     148<PickupRepresentation
     149    pickupName = "Triple Pickup"
     150    pickupDescription = "Adds health, speed and invisibility."
     151    spawnerTemplate = "triplehealthspeedinvisibilitypickupRepresentation"
     152>
     153    <pickup>
     154        <PickupCollection template=triplehealthspeedinvisibilitypickup />
     155    </pickup>
     156</PickupRepresentation>
     157

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

    r6711 r6712  
    2323?>
    2424   
    25     <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    26         <pickup>
    27             <MetaPickup metaType="drop" />
    28         </pickup>
    29     </PickupSpawner>
    30    
    31     <PickupSpawner position="-75,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    32         <pickup>
    33             <MetaPickup metaType="use" />
    34         </pickup>
    35     </PickupSpawner>
     25    <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" />
     26    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    3627
    37     <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    38         <pickup>
    39             <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
    40         </pickup>
    41     </PickupSpawner>
     28    <!-- Health pickups -->
    4229   
    4330    <PickupSpawner position="-25,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    … …  
    6552    </PickupSpawner>
    6653   
    67     <PickupSpawner position="75,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     54    <!-- Speed pickups -->
     55   
     56    <PickupSpawner position="-25,25,-100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    6857        <pickup>
    69             <PickupCollection template=doublepickup />
     58            <SpeedPickup template=smallspeedpickup />
    7059        </pickup>
    7160    </PickupSpawner>
    7261
    73     <PickupSpawner position="100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     62    <PickupSpawner position="0,25,-100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
    7463        <pickup>
    75               <HealthPickup
    76     health = 100
    77     healthType = "limited"
    78     activationType = "onUse"
    79     durationType = "once"
    80   />
     64            <SpeedPickup template=mediumspeedpickup />
    8165        </pickup>
    8266    </PickupSpawner>
    8367
    84     <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" />
    85     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     68    <PickupSpawner position="25,25,-100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
     69        <pickup>
     70            <SpeedPickup template=hugespeedpickup />
     71        </pickup>
     72    </PickupSpawner>
     73
     74    <PickupSpawner position="50,25,-100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
     75        <pickup>
     76            <SpeedPickup template=smalljumppickup />
     77        </pickup>
     78    </PickupSpawner>
     79   
     80    <!-- Invisible pickups -->
     81   
     82    <PickupSpawner position="-25,50,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     83        <pickup>
     84            <InvisiblePickup template=smallinvisiblepickup />
     85        </pickup>
     86    </PickupSpawner>
     87
     88    <PickupSpawner position="0,50,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     89        <pickup>
     90            <InvisiblePickup template=mediuminvisiblepickup />
     91        </pickup>
     92    </PickupSpawner>
     93
     94    <PickupSpawner position="25,50,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     95        <pickup>
     96            <InvisiblePickup template=hugeinvisiblepickup />
     97        </pickup>
     98    </PickupSpawner>
     99   
     100    <!-- Meta pickups -->
     101   
     102    <PickupSpawner position="-25,75,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     103        <pickup>
     104            <MetaPickup metaType="use" />
     105        </pickup>
     106    </PickupSpawner>
     107
     108    <PickupSpawner position="0,75,-100" triggerDistance="10" respawnTime="5" maxSpawnedItems="10">
     109        <pickup>
     110            <MetaPickup metaType="drop" />
     111        </pickup>
     112    </PickupSpawner>
     113   
     114    <!-- Pickup Collection pickups -->
     115   
     116    <PickupSpawner position="0,-25,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
     117        <pickup>
     118            <PickupCollection template=triplehealthspeedinvisibilitypickup />
     119        </pickup>
     120    </PickupSpawner>
     121   
    86122  </Scene>
    87123</Level>

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

    r6710 r6712  
    77  include("templates/spaceship_assff.oxt")
    88  include("templates/spaceship_pirate.oxt")
    9   include("templates/pickup_representation_templates_invisible.oxt")
     9  include("templates/pickup_representation_templates.oxt")
    1010?>
    1111
    … …  
    2020
    2121<?lua
    22   include("includes/pickups_invisible.oxi")
     22  include("includes/pickups.oxi")
    2323?>
    2424

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

    r6709 r6712  
    77  include("templates/spaceship_assff.oxt")
    88  include("templates/spaceship_pirate.oxt")
    9   include("templates/pickup_representation_templates_speed.oxt")
     9  include("templates/pickup_representation_templates.oxt")
    1010?>
    1111
    … …  
    2020
    2121<?lua
    22   include("includes/pickups_speed.oxi")
     22  include("includes/pickups.oxi")
    2323?>
    2424

  • code/trunk/data/levels/templates/pickup_representation_templates.oxt

    r6711 r6712  
     1
     2<!-- Health pickups: -->
     3
    14<Template name=smallhealthpickupRepresentation>
    25    <PickupRepresentation>
    … …  
    99102</Template>
    100103
    101 <Template name=doublepickup>
     104<!-- Meta pickups: -->
     105
     106<Template name=usepickupRepresentation>
     107    <PickupRepresentation>
     108        <spawner-representation>
     109            <StaticEntity>
     110                <attached>
     111                    <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
     112                        <attached>
     113                            <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
     114                        </attached>
     115                    </Billboard>
     116                </attached>
     117            </StaticEntity>
     118        </spawner-representation>
     119    </PickupRepresentation>
     120</Template>
     121
     122<Template name=droppickupRepresentation>
     123    <PickupRepresentation>
     124        <spawner-representation>
     125            <StaticEntity>
     126                <attached>
     127                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1>
     128                        <attached>
     129                            <Billboard position="0,0,0" colour="0.95,0.20,0.10" material="Arrow" scale=0.65 />
     130                        </attached>
     131                    </Billboard>
     132                </attached>
     133            </StaticEntity>
     134        </spawner-representation>
     135    </PickupRepresentation>
     136</Template>
     137
     138<!-- Speed pickups -->
     139
     140<Template name=smallspeedpickupRepresentation>
     141    <PickupRepresentation>
     142        <spawner-representation>
     143            <StaticEntity>
     144                <attached>
     145                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
     146                        <attached>
     147                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.3 />
     148                        </attached>
     149                    </Billboard>
     150                </attached>
     151            </StaticEntity>
     152        </spawner-representation>
     153    </PickupRepresentation>
     154</Template>
     155
     156<Template name=smallspeedpickup>
     157  <SpeedPickup
     158    duration = 10.0
     159    speedAdd = 0.0
     160    SpeedMultiply = 10.0
     161    activationType = "immediate"
     162    durationType = "once"
     163  />
     164</Template>
     165
     166<Template name=mediumspeedpickupRepresentation>
     167    <PickupRepresentation>
     168        <spawner-representation>
     169            <StaticEntity>
     170                <attached>
     171                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
     172                        <attached>
     173                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.5 />
     174                        </attached>
     175                    </Billboard>
     176                </attached>
     177            </StaticEntity>
     178        </spawner-representation>
     179    </PickupRepresentation>
     180</Template>
     181
     182<Template name=mediumspeedpickup>
     183  <SpeedPickup
     184    duration = 10.0
     185    speedAdd = 0.0
     186    SpeedMultiply = 25.0
     187    activationType = "immediate"
     188    durationType = "once"
     189  />
     190</Template>
     191
     192<Template name=hugespeedpickupRepresentation>
     193    <PickupRepresentation>
     194        <spawner-representation>
     195            <StaticEntity>
     196                <attached>
     197                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
     198                        <attached>
     199                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
     200                        </attached>
     201                    </Billboard>
     202                </attached>
     203            </StaticEntity>
     204        </spawner-representation>
     205    </PickupRepresentation>
     206</Template>
     207
     208<Template name=hugespeedpickup>
     209  <SpeedPickup
     210    duration = 10.0
     211    speedAdd = 0.0
     212    SpeedMultiply = 50.0
     213    activationType = "immediate"
     214    durationType = "once"
     215  />
     216</Template>
     217
     218<Template name=smalljumppickupRepresentation>
     219    <PickupRepresentation>
     220        <spawner-representation>
     221            <StaticEntity>
     222                <attached>
     223                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
     224                        <attached>
     225                            <Billboard position="0,0,0" colour="1,0,0" material="3arrowsup" scale=0.3 />
     226                        </attached>
     227                    </Billboard>
     228                </attached>
     229            </StaticEntity>
     230        </spawner-representation>
     231    </PickupRepresentation>
     232</Template>
     233
     234<Template name=smalljumppickup>
     235  <SpeedPickup
     236    duration = 0.7
     237    speedAdd = 5000.0
     238    SpeedMultiply = 1.0
     239    activationType = "immediate"
     240    durationType = "once"
     241  />
     242</Template>
     243
     244<!-- Invisible pickups -->
     245
     246<Template name=smallinvisiblepickupRepresentation>
     247    <PickupRepresentation>
     248        <spawner-representation>
     249            <StaticEntity>
     250                <attached>
     251                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
     252                        <attached>
     253                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.5 />
     254                        </attached>
     255                    </Billboard>
     256                </attached>
     257            </StaticEntity>
     258        </spawner-representation>
     259    </PickupRepresentation>
     260</Template>
     261
     262<Template name=smallinvisiblepickup>
     263  <InvisiblePickup
     264    duration = 5.0
     265    activaionType = "immediate"
     266    durationType = "once"
     267  />
     268</Template>
     269
     270<Template name=mediuminvisiblepickupRepresentation>
     271    <PickupRepresentation>
     272        <spawner-representation>
     273            <StaticEntity>
     274                <attached>
     275                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
     276                        <attached>
     277                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.7 />
     278                        </attached>
     279                    </Billboard>
     280                </attached>
     281            </StaticEntity>
     282        </spawner-representation>
     283    </PickupRepresentation>
     284</Template>
     285
     286<Template name=mediuminvisiblepickup>
     287  <InvisiblePickup
     288    duration = 10.0
     289    activaionType = "immediate"
     290    durationType = "once"
     291  />
     292</Template>
     293
     294<Template name=hugeinvisiblepickupRepresentation>
     295    <PickupRepresentation>
     296        <spawner-representation>
     297            <StaticEntity>
     298                <attached>
     299                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
     300                        <attached>
     301                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.9 />
     302                        </attached>
     303                    </Billboard>
     304                </attached>
     305            </StaticEntity>
     306        </spawner-representation>
     307    </PickupRepresentation>
     308</Template>
     309
     310<Template name=hugeinvisiblepickup>
     311  <InvisiblePickup
     312    duration = 20.0
     313    activaionType = "immediate"
     314    durationType = "once"
     315  />
     316</Template>
     317
     318<!-- Pickup Collection pickups -->
     319
     320<Template name=triplehealthspeedinvisibilitypickupRepresentation>
     321    <PickupRepresentation>
     322        <spawner-representation>
     323            <StaticEntity>
     324                <attached>
     325                    <Billboard position="0,0,0" colour="0.95,0.85,0.27" material="Sphere2" scale=0.1>
     326                        <attached>
     327                            <Billboard position="0,20,0" colour="0.36,0.81,0.10" material="Cross" scale=0.25 />
     328                            <Billboard position="-20,-10,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.25 />
     329                            <Billboard position="20,-10,0" colour="0.06,0.14,0.63" material="Eye" scale=0.35 />
     330                        </attached>
     331                    </Billboard>
     332                </attached>
     333            </StaticEntity>
     334        </spawner-representation>
     335    </PickupRepresentation>
     336</Template>
     337
     338<Template name=triplehealthspeedinvisibilitypickup>
    102339    <PickupCollection>
    103340        <pickupables>
    104             <HealthPickup template=smallhealthpickup />
    105             <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=limited />
     341            <HealthPickup template=mediumhealthpickup />
     342            <SpeedPickup template=mediumspeedpickup />
     343            <InvisiblePickup template=mediuminvisiblepickup />
    106344        </pickupables>
    107345    </PickupCollection>
    108346</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>
    141347   
Note: See TracChangeset for help on using the changeset viewer.