Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6542


Ignore:
Timestamp:
Mar 17, 2010, 12:14:42 PM (14 years ago)
Author:
ebeier
Message:

made some changes, testlevel should be ready, SpeedPickup.cc/SpeedPickup.h not yet implemented!!

Location:
code/branches/ppspickups1
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi

    r6541 r6542  
    11<PickupRepresentation
    22    name="SpeedBoost"
    3     description="Doubles The ship's speed."
    4     spawnerTemplate="speedboost"
     3    description="Speeds up the Ship for a certain time."
     4    spawnerTemplate="speedboostpickuprepresentation"
    55>
    66    <pickup>
    7         <HealthPickup template="speedboostpickup" />
     7        <SpeedPickup template="speedboostpickup" />
    88    </pickup>
    99</PickupRepresentation>

  • code/branches/ppspickups1/data/levels/pickup_ppstest.oxw

    r6541 r6542  
    22  include("stats.oxo")
    33  include("hudtemplates3.oxo")
    4 ?>
    54
    6 <?lua
    75  include("templates/spaceship_assff.oxt")
    86  include("templates/spaceship_pirate.oxt")
    9   include("templates/pickup_representation_templates.oxt")
     7  -- include("templates/pickup_representation_templates_speed.oxt")
    108?>
    119
    1210<Level
    13  name         = "Sample"
    14  description  = "Just a few tests"
     11 name         = "SpeedPickupTest"
     12 description  = "Test for the new Speed Pickup"
    1513>
    1614  <Scene
    … …  
    2220  include("includes/pickups_speed.oxi")
    2321?>
    24    
     22<!--
    2523    <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
    2624        <pickup>
    27             <MetaPickup metaType="drop" />
     25            <SpeedPickup template="speedboostpickup" />
    2826        </pickup>
    2927    </PickupSpawner>
    30 
     28-->
    3129    <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" />
    3230    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />

  • code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt

    r6541 r6542  
    1 <Template name=speedboostRepresentation>
     1<Template name=speedboostpickupRepresentation>
    22    <PickupRepresentation>
    33        <spawner-representation>
    … …  
    1515</Template>
    1616
    17 <Template name=speedboost>
     17<Template name="speedboostpickup">
    1818  <SpeedPickup
    19     health = 10
    20     healthType = "limited"
     19    speedAddition = "0"
     20    speedMultiplier = "2"
     21    duration = "10"
    2122    activationType = "immediate"
    2223    durationType = "once"

  • code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt

    r6524 r6542  
    11ADD_SOURCE_FILES(PICKUP_SRC_FILES
     2
    23  HealthPickup.cc
     4
     5  SpeedPickup.cc
    36  MetaPickup.cc
     7
    48)
Note: See TracChangeset for help on using the changeset viewer.