Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11357 for code/trunk/data


Ignore:
Timestamp:
Mar 9, 2017, 4:09:27 PM (8 years ago)
Author:
patricwi
Message:

big ship merged

Location:
code/trunk
Files:
3 edited
3 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

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

    r11052 r11357  
    3434
    3535<!-- HeavyCruiser and all its parts in one static entity -->
    36     <StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     36    <!--StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
    3737    <attached>
    3838            <Model mesh="HeavyCruiser_body.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
    … …  
    4646            <Model mesh="HeavyCruiser_sidearmRfront.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
    4747           
    48             <!-- bay1 lights -->
    4948            <BlinkingBillboard position="75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
    5049            <BlinkingBillboard position="-75,30,-416" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.05 frequency=0.3 phase=240 quadratic=1 />
    … …  
    5352            <BlinkingBillboard position="73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
    5453            <BlinkingBillboard position="-73,30,-388" material="Examples/Flare" colour="0.8, 0.8, 0, 0.1" amplitude=0.15 frequency=0.3 phase=0 quadratic=1 />
    55             <!-- front position lights -->
     54
    5655            <BlinkingBillboard position="67,-5,-240" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    5756            <BlinkingBillboard position="-67,-5,-240" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    5857            <BlinkingBillboard position="72,51,-380" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    5958            <BlinkingBillboard position="-72,51,-380" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    60             <!-- rear position lights -->
     59
    6160            <BlinkingBillboard position="95,-15,483" material="Examples/Flare" colour="0, 0.7, 0, 0.1" amplitude=0.3 frequency=0.15 phase=360 quadratic=1 />
    6261            <BlinkingBillboard position="-95,-15,483" material="Examples/Flare" colour="0.7, 0, 0, 0.1" amplitude=0.3 frequency=0.15 phase=0 quadratic=1 />
    … …  
    293292        <BoxCollisionShape position="0,18,69" halfExtents="23,12,1" info="HOOKBOX, wide"/>
    294293        <BoxCollisionShape position="0,18,47" halfExtents="23,12,1" info="HOOKBOX, wide"/>
    295        
    296 <!--         <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
    297         <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
    298         <BoxCollisionShape position="-11,18,80" halfExtents="10,10,10" info="HOOK, partL"/>
    299         <BoxCollisionShape position="11,18,80" halfExtents="10,10,10" info="HOOK, partR"/>
    300         <BoxCollisionShape position="-11,18,58" halfExtents="10,10,10" info="HOOK, frontL"/>
    301         <BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="HOOK, frontR"/>-->
    302294    </collisionShapes>
    303     </StaticEntity>
     295    </StaticEntity-->
    304296
    305297    <!-- Width/Height/Lenght--><!-- B=back F=front C=center-->
    306     <StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     298    <!--StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
    307299    <attached>
    308300        <Model position="80,33,-320" mesh="cube.mesh" scale3D="7,11,54" info="frontR"/>
    … …  
    358350        <Model position="153,60,-65" roll="-15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmRfront, top"/>
    359351        <Model position="153,59,-41" roll="-15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmRfront, top"/>
    360 
    361         <!--<Model position="145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmRfront, HOOK"/>-->
    362352
    363353
    … …  
    399389        <Model position="-153,59,-41" roll="15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmLfront, top"/>
    400390
    401         <!--<Model position="-145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmLfront, HOOK"/>-->
    402 
    403391
    404392        <Model position="60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Rwall"/>
    … …  
    544532    <collisionShapes>
    545533    </collisionShapes>
    546     </StaticEntity>
     534    </StaticEntity-->
    547535
    548536
    … …  
    738726    </Pawn>
    739727
    740     <Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
     728    <!--Pawn team=1 health=300 initialhealth=300 maxhealth=300 position="0,300,-2000" yaw="180" direction="0,0,0" collisionType=dynamic mass=1000 name=HeavyCruiser_sidearmL radarname = "HIDDEN" >
    741729
    742730        <explosion>
    … …  
    752740            <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
    753741           
    754             <!-- <BoxCollisionShape position="-109,47,87" halfExtents="29,8,26" info="sidearmL, upper connection"/>
    755             <BoxCollisionShape position="-99,-1,79" roll="15" halfExtents="40,4,9" info="sidearmL, lower connection"/>-->
    756742            <BoxCollisionShape position="-151,47,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontTop"/>
    757743            <BoxCollisionShape position="-136,-7,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontBottom"/>
    … …  
    760746            <BoxCollisionShape position="-145,21,12" roll="15" halfExtents="16,28,2" info="sidearmL, front"/>
    761747            <BoxCollisionShape position="-140,12,261" roll="15" halfExtents="22,41,43" info="sidearmL, back"/>
    762             <!--<BoxCollisionShape position="-145,25,5" roll="15" halfExtents="10,18,5" info="sidearmL, front break"/>-->
    763748            <BoxCollisionShape position="-133,-13,29" roll="15" halfExtents="12,6,17" info="sidearmL, bottom cylinder"/>
    764749            <BoxCollisionShape position="-165,-4,31" roll="15" halfExtents="7,21,13" info="sidearmL, box"/>
    … …  
    816801        <collisionShapes>
    817802            <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
    818 
    819         <!--<BoxCollisionShape position="109,47,87" halfExtents="29,8,26" info="sidearmR, upper connection"/>
    820             <BoxCollisionShape position="99,-1,79" roll="-15" halfExtents="40,4,9" info="sidearmR, lower connection"/>-->
    821803            <BoxCollisionShape position="151,47,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontTop"/>
    822804            <BoxCollisionShape position="136,-7,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontBottom"/>
    … …  
    825807            <BoxCollisionShape position="145,21,12" roll="-15" halfExtents="16,28,2" info="sidearmR, front"/>
    826808            <BoxCollisionShape position="140,12,261" roll="-15" halfExtents="22,41,43" info="sidearmR, back"/>
    827             <!--<BoxCollisionShape position="145,25,5" roll="-15" halfExtents="10,18,5" info="sidearmR, front break"/>-->
    828809            <BoxCollisionShape position="133,-13,29" roll="-15" halfExtents="12,6,17" info="sidearmR, bottom cylinder"/>
    829810            <BoxCollisionShape position="165,-4,31" roll="-15" halfExtents="7,21,13" info="sidearmR, box"/>
    … …  
    930911            <BoxCollisionShape position="96,33,-230" halfExtents="13,17,22" info="partR"/>
    931912        </collisionShapes>
    932     </Pawn>
     913    </Pawn-->
    933914   
    934915
    … …  
    937918
    938919    <SpawnPoint team=0 position="0,0,0" lookat="0,0,-100" spawnclass=SpaceShip pawndesign=HeavyCruiserBody />
    939    
    940     <?lua
    941         --[[
    942             With this lua script, the sub-parts of HeavyCruiser can easily be inserted into a level.
    943             Available functions are:
    944               To place all subparts:
    945                  placeAllSubParts(team, posX, posY, posZ, dirX, dirY, dirZ)
    946               To place individual parts:
    947                  placeFrontL(...)   Use the same arguments as in placeAllSubParts
    948                  placeFrontR(...)
    949                  placePartL(...)
    950                  placePartR(...)
    951                  placeSidearmL(...)
    952                  placeSidearmLfront(...)
    953                  placeSidearmR(...)
    954                  placeSidearmRfront(...)
    955         ]]--
    956 
    957         dofile("includes/HeavyCruiserParts.lua")
    958         placeAllSubParts(0, 0,0,0, 0,0,0)
    959     ?>
    960920   
    961921    <!-- <SpawnPoint team=0 position="0,-200,0" lookat="0,-200,-100" spawnclass=SpaceShip pawndesign=HeavyCruiser /> -->

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

    r11052 r11357  
    11<LevelInfo
    2  name = "Empty level"
     2 name = "emptyLevel"
    33 description = "A level with absolutely nothing in it."
    44 tags = "test"
    … …  
    1010  include("HUDTemplates3.oxo")
    1111  include("templates/lodInformation.oxt")
     12  include("templates/HeavyCruiser.oxt")
    1213?>
    1314
    1415<?lua
    1516  include("templates/spaceshipEscort.oxt")
     17  include("templates/endurancetest_template.oxt")
    1618?>
    1719
    … …  
    2931    <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"/>
    3032    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     33
     34    <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
     35      <templates>
     36        <Template link=endurance />
     37      </templates>
     38    </ModularSpaceShip>
    3139   
    3240  </Scene>
Note: See TracChangeset for help on using the changeset viewer.