[Enigma-cvs] enigma/data models-2d.lua, 1.109, 1.110 models.lua, 1.6, 1.7

[Daniel Heck <address@hidden>]

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

Modified Files:
        models-2d.lua models.lua 
Log Message:
Merged changes from 0_80_rc branch

Index: models-2d.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/models-2d.lua,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** models-2d.lua       12 Sep 2003 21:38:56 -0000      1.109
--- models-2d.lua       18 Oct 2003 13:48:59 -0000      1.110
***************
*** 262,266 ****
  def_image("fl-normal")
  def_randfloor_si("fl-hay", 4)
- --def_randfloor("fl-hay",{"fl-hay1", "fl-hay2"})
  def_floors{"fl-floor_001"}
  def_floors{"fl-ice_001"}
--- 262,265 ----
***************
*** 282,286 ****
  def_randfloor_si("fl-gray", 5)
  def_randfloor_si("fl-leaves", 3)
- --def_randfloor_si("fl-metal", 5)
  def_randfloor_si("fl-metal", 6)
  def_randfloor_si("fl-plank", 4)
--- 281,284 ----
***************
*** 300,303 ****
--- 298,302 ----
  def_randfloor_si("fl-samba", 2)
  def_randfloor_si("fl-himalaya", 4)
+ 
  --
  -- Bridges
***************
*** 550,553 ****
--- 549,554 ----
  end
  
+ def_alias("st-explosion", "expl")
+ 
  def_stone2("st-black1")
  def_stone2("st-black2")
***************
*** 624,631 ****
        def_shmodel("st-blocker-shrinking", "blocker-shrinking-fg", 
"blocker-shrinking-bg");
        def_shmodel("st-blocker-growing", "blocker-growing-fg", 
"blocker-growing-bg");
-       def_shmodel("st-vulcano-growing", "blocker-growing-fg", 
"blocker-growing-bg");
     end
  end
  
  -- Rotator stones
  do
--- 625,633 ----
        def_shmodel("st-blocker-shrinking", "blocker-shrinking-fg", 
"blocker-shrinking-bg");
        def_shmodel("st-blocker-growing", "blocker-growing-fg", 
"blocker-growing-bg");
     end
  end
  
+ def_alias("st-volcano-growing", "st-blocker-growing")
+ 
  -- Rotator stones
  do
***************
*** 736,739 ****
--- 738,743 ----
  
  do
+ 
+ 
      local colorspots = framenames("st-oxydbtempl", 2,9)
      local openovls = framenames("st-oxydbtempl", 10,14)
***************
*** 899,916 ****
  
     def_shmodel("st-actorimpulse", namelist[1], shnamelist[1])
- 
- --    frames={}
- --    for i=1,3 do
- --       def_shmodel("st-ai"..i, namelist[i],shnamelist[i])
- --       tinsert(frames,"st-ai"..i);
- --    end
- 
- --    def_anim("st-actorimpulse-anim", pingpong(buildframes(frames,30)));
- --    def_alias("st-actorimpulse", "st-ai1");
- 
- --   def_shmodel("st-actorimpulse", namelist[1], shnamelist[1])
- --   def_anim("actorimpulse-anim", pingpong(buildframes(namelist, 20)))
- --   def_anim("actorimpulse-shanim", pingpong(buildframes(shnamelist, 20)))
- --   def_shmodel("st-actorimpulse-anim", "actorimpulse-anim", 
"actorimpulse-shanim")
  end
  
--- 903,906 ----
***************
*** 919,923 ****
  -- Note: It's important that the duration of the closing animation
  -- (anim2) is longer than the opening animation (anim1). Otherwise
! -- impulse stones do not work porperly!
  
  do
--- 909,913 ----
  -- Note: It's important that the duration of the closing animation
  -- (anim2) is longer than the opening animation (anim1). Otherwise
! -- impulse stones do not work properly!
  
  do
***************
*** 926,933 ****
     frames={}
     for i=1,4 do tinsert(frames, namelist[i]) end
!    def_anim("stoneimpulse-anim1", buildframes(frames, 60))
     def_roundstone("st-stoneimpulse-anim1", "stoneimpulse-anim1")
     tinsert(frames, namelist[4]) -- add 1 frame to make closing anim longer!
!    def_anim("stoneimpulse-anim2", reverseframes(buildframes(frames, 60)))
     def_roundstone("st-stoneimpulse-anim2", "stoneimpulse-anim2")
  end
--- 916,923 ----
     frames={}
     for i=1,4 do tinsert(frames, namelist[i]) end
!    def_anim("stoneimpulse-anim1", buildframes(frames, 55))
     def_roundstone("st-stoneimpulse-anim1", "stoneimpulse-anim1")
     tinsert(frames, namelist[4]) -- add 1 frame to make closing anim longer!
!    def_anim("stoneimpulse-anim2", reverseframes(buildframes(frames, 55)))
     def_roundstone("st-stoneimpulse-anim2", "stoneimpulse-anim2")
  end
***************
*** 938,945 ****
     frames={}
     for i=1,4 do tinsert(frames, namelist[i]) end
!    def_anim("stoneimpulse-hollow-anim1", buildframes(frames, 60))
     def_shmodel("st-stoneimpulse-hollow-anim1", "stoneimpulse-hollow-anim1", 
"sh-glass")
     tinsert(frames, namelist[4]) -- add 1 frame to make closing anim longer!
!    def_anim("stoneimpulse-hollow-anim2", reverseframes(buildframes(namelist, 
65)))
     def_shmodel("st-stoneimpulse-hollow-anim2", "stoneimpulse-hollow-anim2", 
"sh-glass")
  end
--- 928,935 ----
     frames={}
     for i=1,4 do tinsert(frames, namelist[i]) end
!    def_anim("stoneimpulse-hollow-anim1", buildframes(frames, 55))
     def_shmodel("st-stoneimpulse-hollow-anim1", "stoneimpulse-hollow-anim1", 
"sh-glass")
     tinsert(frames, namelist[4]) -- add 1 frame to make closing anim longer!
!    def_anim("stoneimpulse-hollow-anim2", reverseframes(buildframes(frames, 
55)))
     def_shmodel("st-stoneimpulse-hollow-anim2", "stoneimpulse-hollow-anim2", 
"sh-glass")
  end
***************
*** 950,956 ****
  do
      local img = def_subimages("st-thief", {h=7})
!     def_anim("thief-anim", pingpong(buildframes(img, 80)))
      def_roundstone("st-thief", img[1])
!     def_roundstone("st-thief-anim", "thief-anim")
  end
  
--- 940,949 ----
  do
      local img = def_subimages("st-thief", {h=7})
!     local f = buildframes(img, 80)
!     def_anim("thief-emerge", f)
!     def_anim("thief-retreat", reverseframes(f))
      def_roundstone("st-thief", img[1])
!     def_roundstone("st-thief-emerge", "thief-emerge")
!     def_roundstone("st-thief-retreat", "thief-retreat")
  end
  
***************
*** 1104,1110 ****
  do
      def_stone("st-coinslot")
!     local img=def_subimages("st-coin2slot", {h=20})
      def_anim("st-coin2slot-anim", buildframes(img, 20))
      def_solidstone("st-coin2slot", "st-coin2slot-anim")
  end
  
--- 1097,1104 ----
  do
      def_stone("st-coinslot")
!     local img=def_subimages("st-coin2slot", {h=18})
      def_anim("st-coin2slot-anim", buildframes(img, 20))
      def_solidstone("st-coin2slot", "st-coin2slot-anim")
+     def_solidstone("st-coinslot-active", "st-coin2slot18")
  end
  
***************
*** 1172,1180 ****
      def_shmodel("st-doorh-closing", "doorh-closing-fg", "doorh-closing-bg")
  
- --     f=buildframes(img, 60)
- --     def_anim("doorh-opening", reverseframes(f))
- --     def_anim("doorh-closing", f)
- --     def_shmodel("st-doorh-opening", "doorh-opening", sh[4]);
- --     def_shmodel("st-doorh-closing", "doorh-closing", sh[4]);
  
      img=def_subimages("st-doorv", {w=7})
--- 1166,1169 ----
***************
*** 1188,1196 ****
      def_anim("doorv-closing-bg", buildframes(sh, 60))
      def_shmodel("st-doorv-closing", "doorv-closing-fg", "doorv-closing-bg")
- --     f = buildframes(img,60)
- --     def_anim("doorv-opening", reverseframes(f))
- --     def_anim("doorv-closing", f)
- --     def_shmodel("st-doorv-opening", "doorv-opening", sh[4]);
- --     def_shmodel("st-doorv-closing", "doorv-closing", sh[4]);
  end
  
--- 1177,1180 ----

Index: models.lua
===================================================================
RCS file: /cvsroot/enigma/enigma/data/models.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** models.lua  12 Sep 2003 21:39:50 -0000      1.6
--- models.lua  18 Oct 2003 13:49:00 -0000      1.7
***************
*** 123,126 ****
--- 123,130 ----
  end
  
+ 
+ -- Generate multiple image models by tiling a big image into many
+ -- smaller subimages.  The parameters are currently hardcoded, see
+ -- "items.png" for an example image.
  function def_tiles(big_image, modelnames)
      local xoff = 0
***************
*** 152,157 ****
      shmodel = shmodel or "sh-solid"
      display.DefineShadedModel (model, model.."#", shmodel)
- --    def_alias (model, model.."#")
- --    def_alias (model.."-sh", shmodel)
  end
  
--- 156,159 ----