Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10711 for code


Ignore:
Timestamp:
Oct 26, 2015, 8:30:26 PM (9 years ago)
Author:
paulsc
Message:

Fixed some errors, fixed teams. @bhatiab: Commenting out lua tags in XML is ineffective as they are parsed beforehand. Using lua comments works however.

Location:
code/branches/campaignHS15/data/levels
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/campaignHS15/data/levels/Campaign1.oxw

    r10710 r10711  
    5353    >
    5454
    55     <SpawnPoint name="playerSpawn" team=1 position="6000,-4000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
     55    <SpawnPoint name="playerSpawn" team=0 position="6000,-4000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
    5656
    5757    <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
    … …  
    321321    </SimpleNotification>
    322322
    323     <!--STRUCTURE -->
     323    <!--STATIONS -->
    324324
    325325    <!-- (Temporary) Template for stations. Used to define common features of all Stations. -->
    … …  
    351351    </Template>
    352352
    353     <Dock position="5000,-3000,0" active=true >
    354         <animations>
    355             <MoveToDockingTarget target="dockA" />
    356         </animations>
    357         <effects>
    358             <DockToShip target="newSpaceShip" />
    359         </effects>
    360         <events>
    361             <execute>
    362                 <EventListener event="dockMe" />
    363             </execute>
    364         </events>
     353    <!-- A, Coordinates are approx. (cos(29pi/16), sin(29pi/16), 0)*3000 -->
     354    <Pawn name="statA" team=0 radarname="Station A" position="5000,-3000,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
     355        <templates>
     356            <Template link="station" />
     357        </templates>
    365358        <attached>
    366             <DistanceTrigger position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockMe" />
    367             <Billboard position="0,0,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />
     359            <DockingTarget name="dockTargetA" />
     360            <Dock position="0,0,0" active=true>
     361                <animations>
     362                    <MoveToDockingTarget target="dockTargetA" />
     363                </animations>
     364                <effects>
     365                    <DockToShip target="newSpaceShip" />
     366                </effects>
     367                <events>
     368                    <execute>
     369                        <EventListener event="dockA" />
     370                    </execute>
     371                </events>
     372                <attached>
     373                    <DistanceTrigger position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockA" />
     374                    <Billboard position="0,0,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />
     375                </attached>
     376            </Dock>
    368377        </attached>
    369     </Dock>
    370 
     378    </Pawn>
     379
     380    <!-- B, Coordinates are approx. (-cos(29pi/16), sin(29pi/16), 0)*3000 -->
     381    <Pawn name="statB" team=0 radarname="Station B" position="-5000,-3000,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
     382        <templates>
     383            <Template link="station" />
     384        </templates>
     385        <attached>
     386            <DockingTarget name="dockTargetB" />
     387            <Dock position="0,0,0" active=true>
     388                <animations>
     389                    <MoveToDockingTarget target="dockTargetB" />
     390                </animations>
     391                <effects>
     392                    <DockToShip target="newSpaceShip" />
     393                </effects>
     394                <events>
     395                    <execute>
     396                        <EventListener event="dockB" />
     397                    </execute>
     398                </events>
     399                <attached>
     400                    <DistanceTrigger position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockB" />
     401                    <Billboard position="0,0,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />
     402                </attached>
     403            </Dock>
     404        </attached>
     405    </Pawn>
     406
     407    <!-- C -->
     408    <Pawn name="statC" team=0 radarname="Station C" position="0,-2300,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
     409        <templates>
     410            <Template link="station" />
     411        </templates>
     412        <attached>
     413            <DockingTarget name="dockTargetC" />
     414            <Dock position="0,0,0" active=true>
     415                <animations>
     416                    <MoveToDockingTarget target="dockTargetC" />
     417                </animations>
     418                <effects>
     419                    <DockToShip target="fpsMode" />
     420                </effects>
     421                <events>
     422                    <execute>
     423                        <EventListener event="dockC" />
     424                    </execute>
     425                </events>
     426                <attached>
     427                    <DistanceTrigger position="0,0,0" distance="200" target="SpaceShip" beaconMode="exclude" targetname="NPC" name="dockC" />
     428                    <Billboard position="0,0,0" amplitude=1 material="Flares/lensflare" colour="1,0,0.05" />
     429                </attached>
     430            </Dock>
     431        </attached>
     432    </Pawn>
     433
     434    <!-- New SpaceShip as destination of dock C-->
    371435    <SpaceShip
    372436        template            = "spaceshipassff2"
    … …  
    390454    </SpaceShip>
    391455
    392     <!-- FPS Player as destination of the dock -->
    393     <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-19900,0" >
     456    <!-- FPS Player as destination of dock C-->
     457    <FpsPlayer template = "fps" radarname = "First Person Player" position = "0,-2300,640" lookat="0,0,0" >
    394458        <attached>
    395             <DockingTarget name="newSpaceShip" />
    396             <DistanceTriggerBeacon name="NPC" />
     459            <DockingTarget name="fpsMode" />
     460            <DistanceTriggerBeacon name="fpsPlayer" />
    397461        </attached>
    398462    </FpsPlayer>
    399463
    400     <!-- A, Coordinates are approx. (cos(29pi/16), sin(29pi/16), 0)*3000 -->
    401     <Pawn name="statA" radarname="Station A" position="5000,-3000,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
    402         <templates>
    403             <Template link="station" />
    404         </templates>
    405         <attached>
    406             <DockingTarget name="dockA" />
    407         </attached>
    408     </Pawn>
    409 
    410     <!-- B, Coordinates are approx. (-cos(29pi/16), sin(29pi/16), 0)*3000 -->
    411     <Pawn name="statB" radarname="Station B" position="-5000,-3000,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
    412         <templates>
    413             <Template link="station" />
    414         </templates>
    415     </Pawn>
    416 
    417     <!-- C -->
    418     <Pawn name="statC" radarname="Station C" position="0,-2500,0" direction="0,1,0" initialhealth=10000 maxhealth=10000>
    419         <templates>
    420             <Template link="station" />
    421         </templates>
    422     </Pawn>
    423 
    424464    <!--ELEMENTS -->
    425465
    … …  
    428468        asteroidBelt(0,-2000, 0, 30, 0, 5, 20, 40, 500, 3300, 75, 0)
    429469    ?>
    430     <!--
    431     <?lua
    432         dofile("includes/fog.lua")
    433        generateFog(-1000,-1000,0,20,0.9)
    434     ?>
    435     -->
    436 
     470
     471    <?lua
     472    --[[
     473    dofile("includes/fog.lua")
     474    generateFog(-1000,-1000,0,20,0.9)
     475    ]]--
     476    ?>
    437477
    438478    <!-- Enemies. Outer loop defines waves, inner loop defines enemies in every wave. -->
    … …  
    447487    y = math.sin(math.pi/8*(i+1))*1500
    448488    ?>
    449     <SpaceShip visible=false active=flase name="attackers<?lua print(k)?>" radarname="Attacker" position="<?lua print(x)?>,<?lua print(y)?>,<?lua print(math.pow(-1,i)*250) ?>" lookat="0,0,0" team=2>
     489    <SpaceShip visible=false active=flase name="attackers<?lua print(k)?>" radarname="Attacker" position="<?lua print(x)?>,<?lua print(y)?>,<?lua print(math.pow(-1,i)*250) ?>" lookat="0,0,0" team=1>
    450490        <templates>
    451491            <Template link="spaceshippirate" />
    … …  
    478518    <?lua end ?>
    479519
    480     <!-- Transporter, starting Point is near A, end Point near B, the circle parameters for the waypoints are: Center = (0, -887, 0), r = 2613 --
    481     <SpaceShip position="5000,-3000,0" lookat="-2494, -1667, 0" team=1 name="transporter" radarname="Shuttle">
     520    <!-- Transporter, starting Point is near A, end Point near B, the circle parameters for the waypoints are: Center = (0, -887, 0), r = 2613 -->
     521    <SpaceShip position="5000,-3000,0" lookat="-2494, -1667, 0" team=0 name="transporter" radarname="Shuttle">
    482522        <templates>
    483523            <Template link="spaceshipTransporter" />
    … …  
    487527        </attached>
    488528        <controller>
    489             <WaypointController accuracy=10>
     529            <WaypointController accuracy=10 team=0>
    490530                <waypoints>
    491                     !-- A to B --
     531                    <!-- A to B -->
    492532                    <?lua
    493533                    max = 5
    … …  
    500540                    <?lua end ?>
    501541
    502                     !-- Return Point --
     542                    <!-- Return Point -->
    503543                    <Billboard position="-5000, -3000, 0" amplitude=1 material="Flares/lensflare" colour="1,1,0.05"/>
    504544
    505                     !-- B to A --
     545                    <!-- B to A -->
    506546                    <?lua
    507547                    max = 5
    … …  
    514554                    <?lua end ?>
    515555
    516                     !-- Start Point --
     556                    <!-- Start Point -->
    517557                    <Billboard position="5000,-3000,0" amplitude=1 material="Flares/lensflare" colour="1,1,0.05"/>
    518558                </waypoints>
    519559            </WaypointController>
    520560        </controller>
    521     </SpaceShip/> -->
     561    </SpaceShip>
    522562
    523563    </Scene>

  • code/branches/campaignHS15/data/levels/missionOne.oxw

    r9985 r10711  
    16591659
    16601660<!-- @Triggers: HACK. The attacktrigger6 Event is created, but does not trigger the Script.
    1661 (WTF?) TODO: looks like a BUG 
     1661(WTF?) TODO: looks like a BUG
    16621662Thus a distanceTrigger is created, that gets enabled, when the inner trigger gets activated.
    16631663Due to the large radius it is likely that it actually gets triggered.
    16641664-->
    16651665
    1666   <DistanceTrigger name="testDistanceTrigger" position="0,0,0" distance=10000 target="SpaceShip" stayActive="true" delay=37.0>
     1666  <DistanceTrigger name="testDistanceTrigger" position="0,0,0" distance=10000 target="Pawn" stayActive="true" delay=37.0>
    16671667    <EventTrigger name="testEventTrigger" activations="1" stayactive="true" delay=0.1>
    16681668      <events>
Note: See TracChangeset for help on using the changeset viewer.