Changeset 4066

Timestamp:

Jul 3, 2006, 5:30:14 PM (18 years ago)

Author:

snellen

Message:

spaceship.lua implemented

Location:

data/branches/single_player_map

Files:

• scripts/falldown.lua (modified) (1 diff)
• scripts/floorguy.lua (modified) (1 diff)
• scripts/guard.lua (modified) (3 diffs)
• scripts/prisoner.lua (modified) (1 diff)
• scripts/secondguard.lua (modified) (2 diffs)
• worlds/sp_level_ambush_at_jupiter.oxw (modified) (1 diff)

data/branches/single_player_map/scripts/falldown.lua

@@ -19 +19 @@
 
 function fallDown(timestep)
-dy = dy + timestep*0.1
+dy = dy + timestep
 thisX = fallingguy:getAbsCoorX()
 thisY = fallingguy:getAbsCoorY()

data/branches/single_player_map/scripts/floorguy.lua

@@ -4 +4 @@
 
 programRoute = true
-height = 80
+height = 10
 
 function tick(timestep)

data/branches/single_player_map/scripts/guard.lua

@@ -8 +8 @@
 playerInLock = false
 hangarReached = false
-guardStopped = false
-
-height = 35
+guardStopped = true
+
+height = 29
 
 -- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
@@ -28 +28 @@
 playerZ = Player:getAbsCoorZ()
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarRouteProgrammed then
- --guard:stop()
+
+distance = dist( guardX,guardY,guardZ,playerX, playerY, playerZ)
+
+io.write(distance, " \n")
+
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) > 100 and hangarRouteProgrammed and not guardStopped then
+ io.write("guard stopped\n")
+ guard:stop()
  guardStopped = true
 end
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarRouteProgrammed and guardStopped then
- --guard:continue()
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) < 100 and hangarRouteProgrammed and guardStopped then
+io.write("guard resumed")
+ guard:continue()
  guardStopped = false
 end
@@ -104 +111 @@
 
 if not exitRouteProgrammed then
-guard:walkTo( 162.096558, height, 274.944366)
-guard:walkTo( 161.519516, height, 286.673370)
-guard:walkTo( 161.098618, height, 295.228699)
-guard:walkTo( 160.568466, height, 306.004486)
-guard:walkTo( 160.151169, height, 314.486572)
-guard:walkTo( 159.416641, height, 324.925232)
+guard:runTo( 162.096558, height, 274.944366)
+guard:runTo( 161.519516, height, 286.673370)
+guard:runTo( 161.098618, height, 295.228699)
+guard:runTo( 160.568466, height, 306.004486)
+guard:runTo( 160.151169, height, 314.486572)
+guard:runTo( 159.416641, height, 324.925232)
 guard:walkTo( 158.700073, height, 335.108154)
 guard:walkTo( 157.943298, height, 345.862610)

data/branches/single_player_map/scripts/prisoner.lua

@@ -52 +52 @@
 
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarProgrammed then
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) > 30 and hangarProgrammed then
  prisoner:stop()
  guardStopped = true
 end
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarProgrammed and guardStopped then
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) < 30 and hangarProgrammed and guardStopped then
  --prisoner:continue()
  guardStopped = false

data/branches/single_player_map/scripts/secondguard.lua

@@ -12 +12 @@
 hangarReached = false
 
-height = 29
+height = 80
 
 -- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
@@ -41 +41 @@
 playerZ = Player:getAbsCoorZ()
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarProgrammed then
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) > 30 and hangarProgrammed then
  secondguard:stop()
  guardStopped = true
 end
 
-if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarProgrammed and guardStopped then
+if dist( guardX,guardY,guardZ,playerX, playerY, playerZ) < 30 and hangarProgrammed and guardStopped then
  --secondguard:continue()
  guardStopped = false

data/branches/single_player_map/worlds/sp_level_ambush_at_jupiter.oxw

@@ -144 +144 @@
        <model>models/creatures/doom_guy.md2, 10</model>
        <md2texture>doom_guy.png</md2texture>
-       <abs-coor>440, 29, 180</abs-coor>
+       <abs-coor>440, 80, 180</abs-coor>
        <abs-dir>-3.1, 0, 1, 0</abs-dir>
     </GenericNPC>