Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 23, 2011, 11:40:58 PM (13 years ago)
Author:
dafrick
Message:

Merging pickup branch into presentation branch.

Location:
code/branches/presentation
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation

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

    r7163 r8556  
    202202<PickupRepresentation
    203203    pickupName = "Drone Pickup"
    204     pickupDescription = "Adds a Drone to the Players Spaceship"
     204    pickupDescription = "Adds a Drone to the Player's Spaceship"
    205205    spawnerTemplate = "dronepickupRepresentation"
    206206>
    … …  
    210210</PickupRepresentation>
    211211
     212<!-- Shrink Pickup -->
     213
     214<PickupRepresentation
     215    pickupName = "Small Shrink"
     216    pickupDescription = "Shrinks the Ship by a bit"
     217    spawnerTemplate = "smallshrinkpickupRepresentation"
     218>
     219    <pickup>
     220        <ShrinkPickup template=smallshrinkpickup />
     221    </pickup>
     222</PickupRepresentation>
     223
     224<PickupRepresentation
     225    pickupName = "Medium Shrink"
     226    pickupDescription = "Shrinks the Ship"
     227    spawnerTemplate = "mediumshrinkpickupRepresentation"
     228>
     229    <pickup>
     230        <ShrinkPickup template=mediumshrinkpickup />
     231    </pickup>
     232</PickupRepresentation>
     233
     234<PickupRepresentation
     235    pickupName = "Huge Shrink"
     236    pickupDescription = "Shrinks the Ship considerably"
     237    spawnerTemplate = "hugeshrinkpickupRepresentation"
     238>
     239    <pickup>
     240        <ShrinkPickup template=hugeshrinkpickup />
     241    </pickup>
     242</PickupRepresentation>
     243

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

    r7679 r8556  
    190190    </PickupSpawner>
    191191
     192    <PickupSpawner position="-25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
     193      <pickup>
     194        <ShrinkPickup template ="smallshrinkpickup"/>
     195      </pickup>
     196    </PickupSpawner>
     197
     198    <PickupSpawner position="0,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
     199      <pickup>
     200        <ShrinkPickup template ="mediumshrinkpickup"/>
     201      </pickup>
     202    </PickupSpawner>
     203
     204    <PickupSpawner position="25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
     205      <pickup>
     206        <ShrinkPickup template ="hugeshrinkpickup"/>
     207      </pickup>
     208    </PickupSpawner>
     209
     210    <!--StaticEntity position="0,-200,0" direction="0,-1,0" collisionType=static mass=500 friction=0.01 >
     211      <attached>
     212        <Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" />
     213      </attached>
     214      <collisionShapes>
     215        <BoxCollisionShape position="0,0,0" halfExtents="10,10,10" />
     216      </collisionShapes>
     217  </StaticEntity-->
     218
    192219  </Scene>
    193220</Level>

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

    r7679 r8556  
    391391  <InvisiblePickup
    392392    duration = 20.0
     393    activaionType = "immediate"
     394    durationType = "continuous"
     395  />
     396</Template>
     397
     398<Template name=smallshrinkpickupRepresentation>
     399    <PickupRepresentation>
     400        <spawner-representation>
     401            <StaticEntity>
     402                <attached>
     403                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     404                        <attached>
     405                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.4 />
     406                        </attached>
     407                    </Billboard>
     408                </attached>
     409            </StaticEntity>
     410        </spawner-representation>
     411    </PickupRepresentation>
     412</Template>
     413
     414<Template name=smallshrinkpickup>
     415  <InvisiblePickup
     416    duration = 10.0
     417    shrinkFactor = 2.5
     418    activaionType = "immediate"
     419    durationType = "continuous"
     420  />
     421</Template>
     422
     423<Template name=mediumshrinkpickupRepresentation>
     424    <PickupRepresentation>
     425        <spawner-representation>
     426            <StaticEntity>
     427                <attached>
     428                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     429                        <attached>
     430                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.7 />
     431                        </attached>
     432                    </Billboard>
     433                </attached>
     434            </StaticEntity>
     435        </spawner-representation>
     436    </PickupRepresentation>
     437</Template>
     438
     439<Template name=mediumshrinkpickup>
     440  <InvisiblePickup
     441    duration = 30.0
     442    shrinkFactor = 5.0
     443    activaionType = "immediate"
     444    durationType = "continuous"
     445  />
     446</Template>
     447
     448<Template name=hugeshrinkpickupRepresentation>
     449    <PickupRepresentation>
     450        <spawner-representation>
     451            <StaticEntity>
     452                <attached>
     453                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
     454                        <attached>
     455                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=1.0 />
     456                        </attached>
     457                    </Billboard>
     458                </attached>
     459            </StaticEntity>
     460        </spawner-representation>
     461    </PickupRepresentation>
     462</Template>
     463
     464<Template name=hugeshrinkpickup>
     465  <InvisiblePickup
     466    duration = 60.0
     467    shrinkFactor = 10.0
    393468    activaionType = "immediate"
    394469    durationType = "continuous"
Note: See TracChangeset for help on using the changeset viewer.