Changeset 3946 for data/branches

Timestamp:

Jun 29, 2006, 3:59:58 PM (18 years ago)

Author:

snellen

Message:

continued implementation…

Location:

data/branches/single_player_map/scripts

Files:

• guard.lua (modified) (3 diffs)
• prisoner.lua (modified) (5 diffs)
• secondguard.lua (modified) (3 diffs)
• secondprisoner.lua (added)

data/branches/single_player_map/scripts/guard.lua

@@ -5 +5 @@
 hangarReached = false
 
+-- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
+function dist( x1,x2,x3, y1,y2,y3 )
+
+return math.sqrt( (x1-y1)^2 + (x2-y2)^2 + (x3-y3)^2 )
+
+end
 
 function stopWalkRouteOne(timestep)
@@ -11 +17 @@
 end
 
-function playerReachedLock(timestep)
-playerInLock = true
-return true
+function observePlayer()
+playerX = Player:getAbsCoorX()
+playerY = Player:getAbsCoorY()
+playerZ = Player:getAbsCoorZ()
+
+playerInLock = false
 end
 
@@ -39 +48 @@
 
 function tick(timestep)
+--io.write("Guard called \n")
+observePlayer()
 
 if walkingRouteOne then

data/branches/single_player_map/scripts/prisoner.lua

@@ -1 @@
-cellDoorOpend = false
+cellDoorOpened = false
+walkinCellFinished = false
+cellExitReached = false
 exitReached = false
 hangarReached = false
@@ -5 +7 @@
 spaceShipEntered = false
 
+randTime = 0
 
 function setCellDoor(timestep)
@@ -14 +17 @@
 function walkInCell(timestep)
 
+if cellDoorOpened then
+
+if randTime == 0 then
+randTime = 30 * math.random()
+else
+randTime = randTime - timestep
+end
+
+if randTime < 0 then
+-- goto cellexit
+-- if exit reached: return true
+end 
+
+end
+
+
+return false
+
 end
 
@@ -19 +40 @@
 
 function goToExit(timestep)
--- do not forget to make him wait untill the player triggeres the trip to the hangar
+-- do not forget to make him wait until the player triggeres the trip to the hangar
 
 return false
@@ -49 +70 @@
 function tick(timestep)
 
+--io.write("Prisoner called \n")
+
 if not cellDoorOpend then
-walkInCell(timestep)
+walkinCellFinished = walkInCell(timestep)
 end
 
-if cellDoorOpened and not exitReached then
+if walkinCellFinished and not exitReached then
 exitReached = goToExit(timestep)
 end

data/branches/single_player_map/scripts/secondguard.lua

@@ -6 +6 @@
 hangarReached = false
 
+
+-- Returns the distance between (x1,x2,x3) and (y1,y2,y3)
+function dist( x1,x2,x3, y1,y2,y3 )
+
+return math.sqrt( (x1-y1)^2 + (x2-y2)^2 + (x3-y3)^2 )
+
+end
+
+
 function alert(timestep)
 allOk = false
@@ -11 +20 @@
 end
 
-function prisonerInLock(timestep)
+function observePrisoner()
 
-return true
+--prisonerX = Prisoner:getAbsCoorX()
+--prisonerY = Prisoner:getAbsCoorY()
+--prisonerZ = Prisoner:getAbsCoorZ()
+
 end
 
@@ -32 +44 @@
 
 function tick(timestep)
+--io.write("Secondguard called \n")
+ 
+observePrisoner()
 
 if not allOk then