Changeset 4057

Timestamp:

Jul 3, 2006, 2:51:25 PM (18 years ago)

Author:

snellen

Message:

spaceship.lua implemented

Location:

data/branches/single_player_map/scripts

Files:

• falldown.lua (modified) (1 diff)
• guard.lua (modified) (2 diffs)
• prisoner.lua (modified) (3 diffs)
• secondguard.lua (modified) (3 diffs)
• spaceship.lua (modified) (1 diff)

data/branches/single_player_map/scripts/falldown.lua

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

data/branches/single_player_map/scripts/guard.lua

@@ -8 +8 @@
 playerInLock = false
 hangarReached = false
-
-height = 80
+guardStopped = false
+
+height = 29
 
 -- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
@@ -18 +19 @@
 
 function observePlayer()
+
+guardX = guard:getAbsCoorX()
+guardY = guard:getAbsCoorY()
+guardZ = guard:getAbsCoorZ()
+
 playerX = Player:getAbsCoorX()
 playerY = Player:getAbsCoorY()
 playerZ = Player:getAbsCoorZ()
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarRouteProgrammed then
+ --guard:stop()
+ guardStopped = true
+end
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarRouteProgrammed and guardStopped then
+ --guard:continue()
+ guardStopped = false
+end
 
 if dist( playerX,playerY,playerZ,167.361526,29,483.163818 ) < 60 then

data/branches/single_player_map/scripts/prisoner.lua

@@ -3 +3 @@
 thisscript:addObject("FPSPlayer", "Player")
 thisscript:addObject("GenericNPC", "secondguard")
+thisscript:addObject("GenericNPC","guard")
 
 
@@ -15 +16 @@
 
 randTime = 0
-height = 80
+height = 29
 
 
@@ -40 +41 @@
 playerZ = Player:getAbsCoorZ()
 
+
+guardX = guard:getAbsCoorX()
+guardY = guard:getAbsCoorY()
+guardZ = guard:getAbsCoorZ()
+
+
 if dist( playerX,playerY,playerZ,161.76,49,358.87 ) < 60 then
 playerInLock = true
 end
 
-end
-
-
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarProgrammed then
+ --prisoner:stop()
+ guardStopped = true
+end
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarProgrammed and guardStopped then
+ --prisoner:continue()
+ guardStopped = false
+end
+
+end
 
 walkProgrammed = false

data/branches/single_player_map/scripts/secondguard.lua

@@ -12 +12 @@
 hangarReached = false
 
-height = 100
+height = 29
 
 -- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
@@ -30 +30 @@
 
 end
+
+function observePlayer()
+
+guardX = guard:getAbsCoorX()
+guardY = guard:getAbsCoorY()
+guardZ = guard:getAbsCoorZ()
+
+playerX = Player:getAbsCoorX()
+playerY = Player:getAbsCoorY()
+playerZ = Player:getAbsCoorZ()
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) > 30 and hangarProgrammed then
+ --secondguard:stop()
+ guardStopped = true
+end
+
+if dist( guardX,guardY,guardZ,playerX, playerX, playerX) < 30 and hangarProgrammed and guardStopped then
+ --secondguard:continue()
+ guardStopped = false
+end
+
+end
+
+
 
 function observePrisoner()
@@ -271 +295 @@
 observePrisoner()
 observeGuard()
+observePlayer()
 
 if not allOk then

data/branches/single_player_map/scripts/spaceship.lua

@@ -126 +126 @@
 
 if playerReachedTrigger then
-moveToLaunchSite(timestep)
+--moveToLaunchSite(timestep)
 end
 
 if spaceshipLaunchReady then
-launchSpaceShip(timestep)
+--launchSpaceShip(timestep)
 end