[Enigma-cvs] enigma/data/levels nat4.lua,1.1,1.2

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/data/levels
In directory subversions:/tmp/cvs-serv27407/data/levels

Modified Files:
        nat4.lua 
Log Message:
changes from Nat


Index: nat4.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/nat4.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nat4.lua    5 Jan 2003 21:15:47 -0000       1.1
--- nat4.lua    20 Oct 2003 18:53:43 -0000      1.2
***************
*** 62,92 ****
  -- Ferry terminal
  
! ferry_started = nil
! ferry_x = 45
! ferry_y = 17
  ferry_width = 4
  ferry_height = 3
! ferry_end = 80
! ferry_floor = "fl-hay"
  
! function move_ferry()
      fill_floor( "fl-water", ferry_x, ferry_y, 1, ferry_height )
      fill_floor( ferry_floor, ferry_x+ferry_width, ferry_y, 1, ferry_height )
      ferry_x = ferry_x + 1
  end
  
! function timer_callback()
!     if ferry_started and ferry_x < ferry_end then
!         move_ferry()
      end
  end
  
  function start_ferry()
!     if not ferry_started then
!         move_ferry()
          send_message( "timer", "on" )
          send_message( "laser_timer1", "on" )
          send_message( "laser_timer2", "on" )
-         ferry_started = 1
      end
  end
--- 62,104 ----
  -- Ferry terminal
  
! ferry_movement = nil
! ferry_start = 45
! ferry_end = 80
  ferry_width = 4
  ferry_height = 3
! ferry_x = ferry_start
! ferry_y = 17
! ferry_floor = "fl-samba"
  
! function ferry_move_right()
      fill_floor( "fl-water", ferry_x, ferry_y, 1, ferry_height )
      fill_floor( ferry_floor, ferry_x+ferry_width, ferry_y, 1, ferry_height )
+     
      ferry_x = ferry_x + 1
+     if ferry_x == ferry_end then
+         ferry_movement = ferry_move_left
+     end
  end
  
! function ferry_move_left()
!     fill_floor( "fl-water", ferry_x+ferry_width-1, ferry_y, 1, ferry_height )
!     fill_floor( ferry_floor, ferry_x-1, ferry_y, 1, ferry_height )
!     
!     ferry_x = ferry_x - 1
!     if ferry_x == ferry_start then
!         ferry_movement = ferry_move_right
      end
  end
  
+ function move_ferry()
+     ferry_movement()
+ end
+ 
  function start_ferry()
!     if not ferry_movement then
!         ferry_movement = ferry_move_right
          send_message( "timer", "on" )
          send_message( "laser_timer1", "on" )
          send_message( "laser_timer2", "on" )
      end
  end
***************
*** 95,99 ****
  
  set_stone( "st-timer", 42, 18,
!            {target="timer_callback", action="callback",
              name="timer", interval=0.75} )
  send_message( "timer", "off" )
--- 107,111 ----
  
  set_stone( "st-timer", 42, 18,
!            {target="move_ferry", action="callback",
              name="timer", interval=0.75} )
  send_message( "timer", "off" )
***************
*** 270,274 ****
  
  -- To test the ferry start
! --set_actor( "ac-blackball", 46.5, 18.5, {player=0} )
  --set_stone( "st-wood", 45, 18 )
  
--- 282,286 ----
  
  -- To test the ferry start
! --set_actor( "ac-blackball", 43.5, 18.5, {player=0} )
  --set_stone( "st-wood", 45, 18 )
  
***************
*** 276,278 ****
--- 288,303 ----
  --set_actor( "ac-blackball", 84.5, 18.5, {player=0} )
  --fill_floor( ferry_floor, ferry_end, ferry_y, ferry_width, ferry_height )
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+