Changeset 11499 for code/branches/HUD_HS16/data/levels

Timestamp:

Oct 23, 2017, 2:56:00 PM (7 years ago)

Author:

patricwi

Message:

reset back in time

Location:

code/branches/HUD_HS16

Files:

• . (modified) (1 prop)
• data/levels/DialogueShowcase.oxw (deleted)
• data/levels/Endurancefinal.oxw (deleted)
• data/levels/HeavyCruiser.oxw (modified) (14 diffs)
• data/levels/MilleniumFalconTest.oxw (deleted)
• data/levels/SOB.oxw (deleted)
• data/levels/Spacerace2.oxw (copied) (copied from code/branches/HUD_HS16/data/levels/Spacerace2.oxw)
• data/levels/StoryModeMap.oxw (deleted)
• data/levels/SurfaceRacePresentation.oxw (copied) (copied from code/branches/HUD_HS16/data/levels/SurfaceRacePresentation.oxw)
• data/levels/emptyLevel.oxw (modified) (3 diffs)
• data/levels/events.oxw (modified) (2 diffs)
• data/levels/includes/MFalconWeapon.oxi (deleted)
• data/levels/newnewnewspacerace.oxw (deleted)
• data/levels/spaceRace.oxw (copied) (copied from code/branches/HUD_HS16/data/levels/spaceRace.oxw)
• data/levels/surfaceRace.oxw (copied) (copied from code/branches/HUD_HS16/data/levels/surfaceRace.oxw)
• data/levels/templates/MFalcon.oxt (deleted)
• data/levels/templates/StoryMode.oxt (deleted)
• data/levels/templates/endurancetest_template.oxt (deleted)
• data/levels/templates/fastship.oxt (deleted)
• data/levels/templates/test11.oxt (deleted)

code/branches/HUD_HS16/data/levels/HeavyCruiser.oxw

@@ -34 +34 @@
 
 <!-- HeavyCruiser and all its parts in one static entity -->
-    <!--StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
+    <StaticEntity position="-300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     <attached>
             <Model mesh="HeavyCruiser_body.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
@@ -46 +46 @@
             <Model mesh="HeavyCruiser_sidearmRfront.mesh" direction="-1,0,0" position="0,0,0" scale="40"/>
             
+            <!-- bay1 lights -->
             <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 />
             <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 />
@@ -52 +53 @@
             <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 />
             <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 />
-
+            <!-- front position lights -->
             <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 />
             <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 />
             <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 />
             <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 />
-
+            <!-- rear position lights -->
             <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 />
             <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 />
@@ -292 +293 @@
         <BoxCollisionShape position="0,18,69" halfExtents="23,12,1" info="HOOKBOX, wide"/>
         <BoxCollisionShape position="0,18,47" halfExtents="23,12,1" info="HOOKBOX, wide"/>
+        
+<!--         <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
+        <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
+        <BoxCollisionShape position="-11,18,80" halfExtents="10,10,10" info="HOOK, partL"/>
+        <BoxCollisionShape position="11,18,80" halfExtents="10,10,10" info="HOOK, partR"/>
+        <BoxCollisionShape position="-11,18,58" halfExtents="10,10,10" info="HOOK, frontL"/>
+        <BoxCollisionShape position="11,18,58" halfExtents="10,10,10" info="HOOK, frontR"/>-->
     </collisionShapes>
-    </StaticEntity-->
+    </StaticEntity>
 
     <!-- Width/Height/Lenght--><!-- B=back F=front C=center-->
-    <!--StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
+    <StaticEntity position="300,0,-2000" direction="0,0,0" yaw="180" collisionType=static mass=100000 friction=0.01 >
     <attached>
         <Model position="80,33,-320" mesh="cube.mesh" scale3D="7,11,54" info="frontR"/>
@@ -350 +358 @@
         <Model position="153,60,-65" roll="-15" mesh="cube.mesh" scale3D="4,3,4" info="sidearmRfront, top"/>
         <Model position="153,59,-41" roll="-15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmRfront, top"/>
+
+        <!--<Model position="145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmRfront, HOOK"/>-->
 
 
@@ -389 +399 @@
         <Model position="-153,59,-41" roll="15" mesh="cube.mesh" scale3D="8,2,11" info="sidearmLfront, top"/>
 
+        <!--<Model position="-145,21,50" mesh="cube.mesh" scale3D="10,10,20" info="sidearmLfront, HOOK"/>-->
+
 
         <Model position="60,35,-310" mesh="cube.mesh" scale3D="13,28,60" info="body, bay1, Rwall"/>
@@ -532 +544 @@
     <collisionShapes>
     </collisionShapes>
-    </StaticEntity-->
+    </StaticEntity>
 
 
@@ -726 +738 @@
     </Pawn>
 
-    <!--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" >
+    <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" >
 
         <explosion>
@@ -740 +752 @@
             <BoxCollisionShape position="-11,18,102" halfExtents="10,10,10" info="HOOK, sidearmL"/>
             
+            <!-- <BoxCollisionShape position="-109,47,87" halfExtents="29,8,26" info="sidearmL, upper connection"/>
+            <BoxCollisionShape position="-99,-1,79" roll="15" halfExtents="40,4,9" info="sidearmL, lower connection"/>-->
             <BoxCollisionShape position="-151,47,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontTop"/>
             <BoxCollisionShape position="-136,-7,115" roll="15" halfExtents="16,2,105" info="sidearmL, frontBottom"/>
@@ -746 +760 @@
             <BoxCollisionShape position="-145,21,12" roll="15" halfExtents="16,28,2" info="sidearmL, front"/>
             <BoxCollisionShape position="-140,12,261" roll="15" halfExtents="22,41,43" info="sidearmL, back"/>
+            <!--<BoxCollisionShape position="-145,25,5" roll="15" halfExtents="10,18,5" info="sidearmL, front break"/>-->
             <BoxCollisionShape position="-133,-13,29" roll="15" halfExtents="12,6,17" info="sidearmL, bottom cylinder"/>
             <BoxCollisionShape position="-165,-4,31" roll="15" halfExtents="7,21,13" info="sidearmL, box"/>
@@ -801 +816 @@
         <collisionShapes>
             <BoxCollisionShape position="11,18,102" halfExtents="10,10,10" info="HOOK, sidearmR"/>
+
+        <!--<BoxCollisionShape position="109,47,87" halfExtents="29,8,26" info="sidearmR, upper connection"/>
+            <BoxCollisionShape position="99,-1,79" roll="-15" halfExtents="40,4,9" info="sidearmR, lower connection"/>-->
             <BoxCollisionShape position="151,47,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontTop"/>
             <BoxCollisionShape position="136,-7,115" roll="-15" halfExtents="16,2,105" info="sidearmR, frontBottom"/>
@@ -807 +825 @@
             <BoxCollisionShape position="145,21,12" roll="-15" halfExtents="16,28,2" info="sidearmR, front"/>
             <BoxCollisionShape position="140,12,261" roll="-15" halfExtents="22,41,43" info="sidearmR, back"/>
+            <!--<BoxCollisionShape position="145,25,5" roll="-15" halfExtents="10,18,5" info="sidearmR, front break"/>-->
             <BoxCollisionShape position="133,-13,29" roll="-15" halfExtents="12,6,17" info="sidearmR, bottom cylinder"/>
             <BoxCollisionShape position="165,-4,31" roll="-15" halfExtents="7,21,13" info="sidearmR, box"/>
@@ -911 +930 @@
             <BoxCollisionShape position="96,33,-230" halfExtents="13,17,22" info="partR"/>
         </collisionShapes>
-    </Pawn-->
+    </Pawn>
     
 
@@ -918 +937 @@
 
     <SpawnPoint team=0 position="0,0,0" lookat="0,0,-100" spawnclass=SpaceShip pawndesign=HeavyCruiserBody />
+    
+    <?lua
+        --[[
+            With this lua script, the sub-parts of HeavyCruiser can easily be inserted into a level.
+            Available functions are:
+              To place all subparts:
+                 placeAllSubParts(team, posX, posY, posZ, dirX, dirY, dirZ)
+              To place individual parts:
+                 placeFrontL(...)   Use the same arguments as in placeAllSubParts
+                 placeFrontR(...)
+                 placePartL(...)
+                 placePartR(...)
+                 placeSidearmL(...)
+                 placeSidearmLfront(...)
+                 placeSidearmR(...)
+                 placeSidearmRfront(...)
+        ]]--
+
+        dofile("includes/HeavyCruiserParts.lua")
+        placeAllSubParts(0, 0,0,0, 0,0,0)
+    ?>
     
     <!-- <SpawnPoint team=0 position="0,-200,0" lookat="0,-200,-100" spawnclass=SpaceShip pawndesign=HeavyCruiser /> -->

code/branches/HUD_HS16/data/levels/emptyLevel.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "emptyLevel"
+ name = "Empty level"
  description = "A level with absolutely nothing in it."
  tags = "test"
@@ -10 +10 @@
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
-  include("templates/HeavyCruiser.oxt")
 ?>
 
 <?lua
   include("templates/spaceshipEscort.oxt")
-  include("templates/endurancetest_template.oxt")
 ?>
 
@@ -31 +29 @@
     <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"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-    <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
-      <templates>
-        <Template link=endurance />
-      </templates>
-    </ModularSpaceShip>
     
   </Scene>

code/branches/HUD_HS16/data/levels/events.oxw

@@ -57 +57 @@
     -->
 
-    <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true" />
-    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
-    
-    <NextQuestion  question="Continue?" a1="yes" a2="no" >
-     <possibleQuestions> 
-        <NextQuestion  question="Are you sure?" a1="yep let me continue" a2="no actually not" />
-        <NextQuestion  question="Why?" a1="Got a dentist's appointment" a2="this sucks" >
-        <possibleQuestions>
-          <NextQuestion  question="Are your teeth that bad mate?" a1="yep" a2="leave me alone godammit" />
-          <NextQuestion  question="You suck" a1="..." a2="Im going now okay" />
-        </possibleQuestions>
-      </NextQuestion>
-      </possibleQuestions>    
+
+    <!-- red -->
+    <!--
+      Standard:
+      Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
+      Every fired event of the source is mapped to the "visibility" state of the listener.
+
+      This is a 1:1 mapping between event-listener and event-source.
+    -->
+    <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
+      <events>
+        <visibility>
+          <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
+        </visibility>
+      </events>
+    </Billboard>
+
+    <!-- HELLO THERE ................................................................ ITS ME -->
+    <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
+    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
+    <DDDialogue string="Hello World3" >
       <events>
         <execute>
@@ -75 +83 @@
         </execute>
       </events>
-    </NextQuestion>
-
-    <DistanceTrigger name="test1" position="100,300,0" target="Pawn" distance=25 stayActive="true" />
-    <Backlight position="100,300,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,1"/>
-    
-    <NextQuestion  question="Wazzp bud?" a1="yes" a2="no" >
-     <possibleQuestions> 
-        <NextQuestion  question="Do you like fish" a1="yep let me continue" a2="no actually not" />
-        <NextQuestion  question="Whats your favourite pastime?" a1="Got a dentist's appointment" a2="this sucks" >
-        <possibleQuestions>
-          <NextQuestion  question="Whatever?" a1="yep" a2="leave me alone godammit" />
-          <NextQuestion  question="Turtles then?" a1="..." a2="Im going now okay" />
-        </possibleQuestions>
-      </NextQuestion>
-      </possibleQuestions>    
-      <events>
-        <execute>
-           <EventListener event="test1" />
-        </execute>
-      </events>
-    </NextQuestion>
-
-
-    <!-- red -->
-    <!--
-      Standard:
-      Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
-      Every fired event of the source is mapped to the "visibility" state of the listener.
-
-      This is a 1:1 mapping between event-listener and event-source.
-    -->
-    <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
-      <events>
-        <visibility>
-          <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
-        </visibility>
-      </events>
-    </Billboard>
-
-    <!-- HELLO THERE ................................................................ ITS ME -->
-    <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
-    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
-    <DialogueManager question="Hello World3">
-      <events>
-        <execute>
-           <EventListener event="test" />
-        </execute>
-      </events>
-    </DialogueManager>
-
+    </DDDialogue>
 
     <!-- orange -->