enigma-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Enigma-cvs] enigma/data/levels ant15.lua, 1.4, 1.5 ant23.lua, 1.3, 1.4


From: Ralf Westram <address@hidden>
Subject: [Enigma-cvs] enigma/data/levels ant15.lua, 1.4, 1.5 ant23.lua, 1.3, 1.4 duffy1.lua, 1.1, 1.2 duffy23.lua, 1.1, 1.2 duffy26.lua, 1.1, 1.2 meditation15.lua, 1.1, 1.2 meditation16.lua, 1.1, 1.2 meditation9.lua, 1.1, 1.2 ss11.lua, 1.2, 1.3 ss16.lua, 1.2, 1.3 ss17.lua, 1.2, 1.3
Date: Wed, 22 Oct 2003 16:11:38 +0000

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

Modified Files:
        ant15.lua ant23.lua duffy1.lua duffy23.lua duffy26.lua 
        meditation15.lua meditation16.lua meditation9.lua ss11.lua 
        ss16.lua ss17.lua 
Log Message:
- set 'essential' attribute for all balls



Index: ss16.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/ss16.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ss16.lua    18 Oct 2003 13:49:01 -0000      1.2
--- ss16.lua    22 Oct 2003 16:11:36 -0000      1.3
***************
*** 8,29 ****
  cells["b"]=cell{stone="st-actorimpulse"}
  cells["h"]=cell{parent=cells[" "],item="it-hollow"}
! cells["x"]=cell{actor={"ac-blackball",{player=0}}}
  
  level = {
  --  01234567890123456789
!    "#b################b#",--00     
!    "b                  b",--01     
!    "#  h               #",--02     
!    "#                  #",--03     
!    "#                  #",--04     
!    "#                  #",--05     
!    "# x    h           #",--06     
!    "#                  #",--07     
!    "#        h         #",--08     
!    "#                  #",--09     
!    "#            h     #",--10     
!    "b                  b",--11     
!    "#b################b#" --12     
! }   
  set_default_parent(cells[" "])
  
--- 8,29 ----
  cells["b"]=cell{stone="st-actorimpulse"}
  cells["h"]=cell{parent=cells[" "],item="it-hollow"}
! cells["x"]=cell{actor={"ac-blackball",{player=0,essential=1}}}
  
  level = {
  --  01234567890123456789
!    "#b################b#",--00
!    "b                  b",--01
!    "#  h               #",--02
!    "#                  #",--03
!    "#                  #",--04
!    "#                  #",--05
!    "# x    h           #",--06
!    "#                  #",--07
!    "#        h         #",--08
!    "#                  #",--09
!    "#            h     #",--10
!    "b                  b",--11
!    "#b################b#" --12
! }
  set_default_parent(cells[" "])
  
***************
*** 31,38 ****
  
  local top=set_actor("ac-top", 9,5, {mouseforce=0, range=20, force=-10})
! local ac1=set_actor("ac-whiteball-small", 9,6, {player=1, mouseforce=1, 
controllers=1})
! local ac2=set_actor("ac-whiteball-small", 9,7, {player=1, mouseforce=1, 
controllers=1})
! local ac3=set_actor("ac-whiteball-small", 9,8, {player=1, mouseforce=1, 
controllers=1})
! local ac4=set_actor("ac-whiteball-small", 9,9, {player=1, mouseforce=1, 
controllers=1})
  local rotor=set_actor("ac-rotor", 9,11, {mouseforce=2, range=10, force=-10})
  
--- 31,38 ----
  
  local top=set_actor("ac-top", 9,5, {mouseforce=0, range=20, force=-10})
! local ac1=set_actor("ac-whiteball-small", 9,6, {player=1, mouseforce=1, 
controllers=1, essential=1})
! local ac2=set_actor("ac-whiteball-small", 9,7, {player=1, mouseforce=1, 
controllers=1, essential=1})
! local ac3=set_actor("ac-whiteball-small", 9,8, {player=1, mouseforce=1, 
controllers=1, essential=1})
! local ac4=set_actor("ac-whiteball-small", 9,9, {player=1, mouseforce=1, 
controllers=1, essential=1})
  local rotor=set_actor("ac-rotor", 9,11, {mouseforce=2, range=10, force=-10})
  
***************
*** 40,45 ****
  AddRubberBand(ac1, ac2, 6, 1)
  AddRubberBand(ac2, ac3, 6, 1)
! AddRubberBand(ac3, ac4, 6, 1)                               
! AddRubberBand(ac4, rotor, 3, 5)                                               
                 
!                                  
!                                  
\ No newline at end of file
--- 40,45 ----
  AddRubberBand(ac1, ac2, 6, 1)
  AddRubberBand(ac2, ac3, 6, 1)
! AddRubberBand(ac3, ac4, 6, 1)
! AddRubberBand(ac4, rotor, 3, 5)
! 
! 

Index: ss17.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/ss17.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ss17.lua    18 Oct 2003 13:49:01 -0000      1.2
--- ss17.lua    22 Oct 2003 16:11:36 -0000      1.3
***************
*** 6,10 ****
  cells[" "]=cell{floor="fl-black"}
  cells["#"]=cell{stone="st-brick"}
! cells["b"]=cell{stone="st-actorimpulse_invisible"} 
  cells["S"]=cell{stone="st-swap"}
  cells["h"]=cell{parent=cells[" "],item="it-hollow"}
--- 6,10 ----
  cells[" "]=cell{floor="fl-black"}
  cells["#"]=cell{stone="st-brick"}
! cells["b"]=cell{stone="st-actorimpulse_invisible"}
  cells["S"]=cell{stone="st-swap"}
  cells["h"]=cell{parent=cells[" "],item="it-hollow"}
***************
*** 12,40 ****
  level = {
  --  01234567890123456789
!    "####################",--00     
!    "#                  #",--01     
!    "# bbb          bbb #",--02     
!    "#  hb          bh  #",--03     
!    "# bbb          bbb #",--04     
!    "#       SDDS       #",--05     
!    "#       SDDS       #",--06     
!    "#       SDDS       #",--07     
!    "# bbb          bbb #",--08     
!    "# bh           bhb #",--09     
!    "# bbb          b b #",--10     
!    "#                  #",--11     
!    "####################" --12     
! }   
  set_default_parent(cells[" "])
  
  create_world_by_map(level,cells)
  
! set_actor("ac-whiteball-small", 8.5,2.5, {player=0, mouseforce=-1})
! set_actor("ac-whiteball-small",11.5,2.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 8.5,10.5, {player=0, mouseforce=-1})
! set_actor("ac-whiteball-small",11.5,10.5, {player=0, mouseforce=1})
  
  
-                                                              
-                                  
-                                  
\ No newline at end of file
--- 12,40 ----
  level = {
  --  01234567890123456789
!    "####################",--00
!    "#                  #",--01
!    "# bbb          bbb #",--02
!    "#  hb          bh  #",--03
!    "# bbb          bbb #",--04
!    "#       SDDS       #",--05
!    "#       SDDS       #",--06
!    "#       SDDS       #",--07
!    "# bbb          bbb #",--08
!    "# bh           bhb #",--09
!    "# bbb          b b #",--10
!    "#                  #",--11
!    "####################" --12
! }
  set_default_parent(cells[" "])
  
  create_world_by_map(level,cells)
  
! set_actor("ac-whiteball-small", 8.5, 2.5, {player=0, mouseforce=-1, 
essential=1})
! set_actor("ac-whiteball-small",11.5, 2.5, {player=0, mouseforce= 1, 
essential=1})
! set_actor("ac-whiteball-small", 8.5,10.5, {player=0, mouseforce=-1, 
essential=1})
! set_actor("ac-whiteball-small",11.5,10.5, {player=0, mouseforce= 1, 
essential=1})
! 
! 
! 
  
  

Index: ant15.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/ant15.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ant15.lua   18 Oct 2003 13:49:00 -0000      1.4
--- ant15.lua   22 Oct 2003 16:11:35 -0000      1.5
***************
*** 9,14 ****
  actors = {}
  bctors = {}
! actor  = cell{{{add_multiactor, "ac-whiteball-small", actors, {player=0, 
mouseforce=0}}}}
! bctor  = cell{{{add_multiactor, "ac-whiteball", bctors, {player=0, 
controllers=1}}}}
  normal = cell{floor="fl-rough"}
  invert = cell{floor="fl-inverse"}
--- 9,14 ----
  actors = {}
  bctors = {}
! actor  = cell{{{add_multiactor, "ac-whiteball-small", actors, {player=0, 
mouseforce=0, essential=1}}}}
! bctor  = cell{{{add_multiactor, "ac-whiteball", bctors, {player=0, 
controllers=1, essential=1}}}}
  normal = cell{floor="fl-rough"}
  invert = cell{floor="fl-inverse"}

Index: meditation15.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/meditation15.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** meditation15.lua    5 Jan 2003 21:15:47 -0000       1.1
--- meditation15.lua    22 Oct 2003 16:11:36 -0000      1.2
***************
*** 76,86 ****
  ac1 (28,21)
  
! set_actor("ac-whiteball-small", 28.5, 14.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 29.5, 14.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 28.5, 15.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 29.5, 15.5, {player=0, mouseforce=1})
  
! set_actor("ac-whiteball-small", 28.5, 21.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 29.5, 21.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 28.5, 22.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 29.5, 22.5, {player=0, mouseforce=1})
--- 76,86 ----
  ac1 (28,21)
  
! set_actor("ac-whiteball-small", 28.5, 14.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 29.5, 14.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 28.5, 15.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 29.5, 15.5, {player=0, mouseforce=1, 
essential=1})
  
! set_actor("ac-whiteball-small", 28.5, 21.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 29.5, 21.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 28.5, 22.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 29.5, 22.5, {player=0, mouseforce=1, 
essential=1})

Index: duffy1.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/duffy1.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** duffy1.lua  30 Jan 2003 20:23:09 -0000      1.1
--- duffy1.lua  22 Oct 2003 16:11:36 -0000      1.2
***************
*** 88,92 ****
  hollow(18,2)
  
! set_actor("ac-whiteball-small", 8,2, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 2,9, {player=0, mouseforce=1})
  
--- 88,92 ----
  hollow(18,2)
  
! set_actor("ac-whiteball-small", 8,2, {player=0, mouseforce=1, essential=1})
! set_actor("ac-whiteball-small", 2,9, {player=0, mouseforce=1, essential=1})
  

Index: duffy26.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/duffy26.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** duffy26.lua 27 Aug 2003 18:25:35 -0000      1.1
--- duffy26.lua 22 Oct 2003 16:11:36 -0000      1.2
***************
*** 14,18 ****
                        oxyd( i-1, line)
                elseif c=="w" then
!                       set_actor("ac-whiteball-small", i-.5,line+.5, 
{player=0, mouseforce=1})
                elseif c=="H" then
                   hollow(i-1,line)
--- 14,18 ----
                        oxyd( i-1, line)
                elseif c=="w" then
!                       set_actor("ac-whiteball-small", i-.5,line+.5, 
{player=0, mouseforce=1, essential=1})
                elseif c=="H" then
                   hollow(i-1,line)
***************
*** 57,61 ****
                        set_floor("fl-gradient",  i-1,  line, {type=4})
  end
!       end     
  end
  
--- 57,61 ----
                        set_floor("fl-gradient",  i-1,  line, {type=4})
  end
!       end
  end
  
***************
*** 86,88 ****
  enigma.SendMessage(doorb,"openclose",nil)
  enigma.SendMessage(doorc,"openclose",nil)
! enigma.SendMessage(doord,"openclose",nil)
\ No newline at end of file
--- 86,88 ----
  enigma.SendMessage(doorb,"openclose",nil)
  enigma.SendMessage(doorc,"openclose",nil)
! enigma.SendMessage(doord,"openclose",nil)

Index: ss11.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/ss11.lua,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ss11.lua    18 Oct 2003 13:49:01 -0000      1.2
--- ss11.lua    22 Oct 2003 16:11:36 -0000      1.3
***************
*** 1,4 ****
  -- Sven Siggelkow 2003
!                                                                
  world.DefineSimpleStoneMovable("invisible_move", "st-metal", 0)
  
--- 1,4 ----
  -- Sven Siggelkow 2003
! 
  world.DefineSimpleStoneMovable("invisible_move", "st-metal", 0)
  
***************
*** 14,18 ****
  cells["S"]=cell{parent=cells[" "],stone="st-swap"}
  cells["i"]=cell{parent=cells[" "],stone="invisible_move"}
! cells["x"]=cell{actor={"ac-whiteball-small", {player=0, mouseforce=1}}}
  
  level = {
--- 14,18 ----
  cells["S"]=cell{parent=cells[" "],stone="st-swap"}
  cells["i"]=cell{parent=cells[" "],stone="invisible_move"}
! cells["x"]=cell{actor={"ac-whiteball-small", {player=0, mouseforce=1, 
essential=1}}}
  
  level = {
***************
*** 30,44 ****
     "#h  i              #",
     "####################"
! }   
!     
!     
  set_default_parent(cells[" "])
!     
  create_world_by_map(level,cells)
  
!                                  
!                              
!                                  
!                                  
!                                  
!                                  
\ No newline at end of file
--- 30,44 ----
     "#h  i              #",
     "####################"
! }
! 
! 
  set_default_parent(cells[" "])
! 
  create_world_by_map(level,cells)
  
! 
! 
! 
! 
! 
! 

Index: duffy23.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/duffy23.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** duffy23.lua 27 Aug 2003 18:25:35 -0000      1.1
--- duffy23.lua 22 Oct 2003 16:11:36 -0000      1.2
***************
*** 25,29 ****
                        oneway(i-1,line, enigma.WEST)
                elseif c=="w" then
!                       set_actor("ac-whiteball-small", i-1,line, {player=0, 
mouseforce=1})
                elseif c=="H" then
                   hollow(i-1,line)
--- 25,29 ----
                        oneway(i-1,line, enigma.WEST)
                elseif c=="w" then
!                       set_actor("ac-whiteball-small", i-1,line, {player=0, 
mouseforce=1, essential=1})
                elseif c=="H" then
                   hollow(i-1,line)
***************
*** 33,37 ****
                   draw_stones("st-grate1",{i-1,line}, {1,1}, 1)
                end
!       end     
  end
  
--- 33,37 ----
                   draw_stones("st-grate1",{i-1,line}, {1,1}, 1)
                end
!       end
  end
  
***************
*** 42,46 ****
  renderLine(00,"#######################################")
  renderLine(01,"# gggg#gggggg#gggg l                  #")
! renderLine(02,"# gHg +  $Hg +  Hg l  w   w   w   w   #") 
  renderLine(03,"# g gg#ggg gg#gg g l                  #")
  renderLine(04,"###+######+#####+###                  #")
--- 42,46 ----
  renderLine(00,"#######################################")
  renderLine(01,"# gggg#gggggg#gggg l                  #")
! renderLine(02,"# gHg +  $Hg +  Hg l  w   w   w   w   #")
  renderLine(03,"# g gg#ggg gg#gg g l                  #")
  renderLine(04,"###+######+#####+###                  #")
***************
*** 54,56 ****
  renderLine(12,"#######################################")
  
! oxyd_shuffle()
\ No newline at end of file
--- 54,56 ----
  renderLine(12,"#######################################")
  
! oxyd_shuffle()

Index: meditation9.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/meditation9.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** meditation9.lua     5 Jan 2003 21:15:47 -0000       1.1
--- meditation9.lua     22 Oct 2003 16:11:36 -0000      1.2
***************
*** 46,51 ****
  set_item("it-hollow", 17,10)
  
! set_actor("ac-whiteball-small",  7.5, 3.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small",  13.5,2.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 8.5, 9.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 11.5,10.5, {player=0, mouseforce=1})
--- 46,51 ----
  set_item("it-hollow", 17,10)
  
! set_actor("ac-whiteball-small",  7.5, 3.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small",  13.5,2.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 8.5, 9.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 11.5,10.5, {player=0, mouseforce=1, 
essential=1})

Index: meditation16.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/meditation16.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** meditation16.lua    12 Jan 2003 19:53:21 -0000      1.1
--- meditation16.lua    22 Oct 2003 16:11:36 -0000      1.2
***************
*** 43,48 ****
  basis (32,16)
  
! set_actor("ac-whiteball-small", 24.5, 17.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 27.5, 19.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 30.5, 17.5, {player=0, mouseforce=1})
! set_actor("ac-whiteball-small", 33.5, 19.5, {player=0, mouseforce=1})
--- 43,48 ----
  basis (32,16)
  
! set_actor("ac-whiteball-small", 24.5, 17.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 27.5, 19.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 30.5, 17.5, {player=0, mouseforce=1, 
essential=1})
! set_actor("ac-whiteball-small", 33.5, 19.5, {player=0, mouseforce=1, 
essential=1})

Index: ant23.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/levels/ant23.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ant23.lua   21 Feb 2003 18:01:59 -0000      1.3
--- ant23.lua   22 Oct 2003 16:11:35 -0000      1.4
***************
*** 30,34 ****
  actors = {};
  cells["W"]=cell{parent={{add_multistone, "st-block", blocks}}}
! cells["o"]=cell{parent={{add_multiactor, "ac-whiteball-small", actors, 
{player=0, mouseforce=1}}}}
  
  level = {
--- 30,34 ----
  actors = {};
  cells["W"]=cell{parent={{add_multistone, "st-block", blocks}}}
! cells["o"]=cell{parent={{add_multiactor, "ac-whiteball-small", actors, 
{player=0, mouseforce=1, essential=1}}}}
  
  level = {





reply via email to

[Prev in Thread] Current Thread [Next in Thread]