/[enigma]/enigma/data/models-2d.lua
ViewVC logotype

Diff of /enigma/data/models-2d.lua

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.76 by dheck, Thu Jun 26 17:07:23 2003 UTC revision 1.77 by dheck, Thu Jun 26 17:50:27 2003 UTC
# Line 134  do Line 134  do
134    
135      -- Sinking      -- Sinking
136      img=def_subimages("ac-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})      img=def_subimages("ac-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})
137      sh =def_subimages("sh-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})      sh =def_subimages("sh-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-6,yoff=-6})
138      for i=0,2 do      for i=1,getn(img) do
139         def_image("sh-bb-sink"..i, { xoff=-6-i, yoff=-6-i, filename="sh-blackball" })          def_shmodel("ac-blackball-sink"..(i-1), img[i], sh[i])
        def_shmodel("ac-blackball-sink"..i, img[1], "sh-bb-sink"..i)  
     end  
     for i=3,3+getn(img)-1 do  
        def_shmodel("ac-blackball-sink"..i, img[i-2], sh[i-2])  
140      end      end
   
141      def_alias("ac-blackball-sunk", "invisible")      def_alias("ac-blackball-sunk", "invisible")
142    
143      img=def_subimages("ac-drowned",{h=5,imgw=19,imgh=19,xoff=-9,yoff=-9});      img=def_subimages("ac-drowned",{h=5,imgw=19,imgh=19,xoff=-9,yoff=-9});
# Line 181  do Line 176  do
176    
177      -- Sinking      -- Sinking
178      img=def_subimages("ac-whiteball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})      img=def_subimages("ac-whiteball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})
179      sh =def_subimages("sh-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-9,yoff=-9})      sh =def_subimages("sh-blackball-sinkdown",{h=7,imgw=19,imgh=19,xoff=-6,yoff=-6})
180      for i=0,2 do      for i=1,getn(img) do
181         def_image("sh-bb-sink"..i, { xoff=-6-i, yoff=-6-i, filename="sh-blackball" })          def_shmodel("ac-whiteball-sink"..(i-1), img[i], sh[i])
        def_shmodel("ac-whiteball-sink"..i, img[1], "sh-bb-sink"..i)  
     end  
     for i=3,3+getn(img)-1 do  
        def_shmodel("ac-whiteball-sink"..i, img[i-2], sh[i-2])  
182      end      end
   
183      def_alias("ac-whiteball-sunk", "invisible")      def_alias("ac-whiteball-sunk", "invisible")
184    
185  --    img=def_subimages("ac-drowned",{h=5,imgw=19,imgh=19,xoff=-9,yoff=-9});  --    img=def_subimages("ac-drowned",{h=5,imgw=19,imgh=19,xoff=-9,yoff=-9});
# Line 260  def_randfloor_si("fl-hay", 4) Line 250  def_randfloor_si("fl-hay", 4)
250  def_floors{"fl-floor_001"}  def_floors{"fl-floor_001"}
251  def_floors{"fl-ice_001"}  def_floors{"fl-ice_001"}
252  def_floors{"fl-stone"}  def_floors{"fl-stone"}
253  def_floors{"fl-normal_x"}  def_alias("fl-normal_x", "fl-normal")
254  def_floors{"fl-dummy"}  def_floors{"fl-dummy"}
255  def_floors{"fl-light"}  def_floors{"fl-light"}
256  def_randfloor_si("fl-concrete", 4)  def_randfloor_si("fl-concrete", 4)
# Line 497  do Line 487  do
487          "st-black2#",          "st-black2#",
488          "st-black3#",          "st-black3#",
489          "st-black4#",          "st-black4#",
490          "st-idontknowwhattonameit1",          "st-block#",
491          "st-idontknowwhattonameit2",          "st-idontknowwhattonameit2",
492          "st-beads#"          "st-beads#"
493      }      }
# Line 508  def_stone2("st-black1") Line 498  def_stone2("st-black1")
498  def_stone2("st-black2")  def_stone2("st-black2")
499  def_stone2("st-black3")  def_stone2("st-black3")
500  def_stone2("st-black4", "sh-white4")  def_stone2("st-black4", "sh-white4")
501    def_stone2("st-block")
502  def_stone2("st-beads", "sh-glass")  def_stone2("st-beads", "sh-glass")
503    
504    
# Line 583  def_stone("st-greenbrown") Line 574  def_stone("st-greenbrown")
574  def_alias("st-greenbrown_hole", "st-greenbrown")  def_alias("st-greenbrown_hole", "st-greenbrown")
575  def_alias("st-greenbrown_move", "st-greenbrown")  def_alias("st-greenbrown_move", "st-greenbrown")
576    
577  def_stone("st-block")  Progress(40)
578    
579    
580    --def_stone("st-block")
581  def_stone("st-brick")  def_stone("st-brick")
582  def_stone("st-woven")  def_stone("st-woven")
583  def_stone("st-brick_magic", nil, {filename="st-brick"})  def_stone("st-brick_magic", nil, {filename="st-brick"})
584  def_stone("st-switch0", nil, {filename="st-switch2"})  def_subimages("st-switch", {h=2, modelname="st-switchfg"})
585  def_stone("st-switch1", nil, {filename="st-switch1"})  def_solidstone("st-switch1", "st-switchfg1")
586  def_stone("st-switch_black0", nil, {filename="st-switch_black2"})  def_solidstone("st-switch2", "st-switchfg2")
587    def_stone("st-switch_black2", nil, {filename="st-switch_black2"})
588  def_stone("st-switch_black1", nil, {filename="st-switch_black1"})  def_stone("st-switch_black1", nil, {filename="st-switch_black1"})
589  def_stone("st-switch_white0", nil, {filename="st-switch_white2"})  def_stone("st-switch_white2", nil, {filename="st-switch_white2"})
590  def_stone("st-switch_white1", nil, {filename="st-switch_white1"})  def_stone("st-switch_white1", nil, {filename="st-switch_white1"})
591  def_stone("st-fourswitch", nil, {filename="st-fourswitch_n"})  def_stone("st-fourswitch", nil, {filename="st-fourswitch_n"})
592  def_stone("st-fourswitch_e")  def_stone("st-fourswitch_e")
# Line 602  def_stone("st-floppy1", nil, {filename=" Line 597  def_stone("st-floppy1", nil, {filename="
597    
598  def_image("st-easymode")  def_image("st-easymode")
599    
 Progress(40)  
   
600    
601  def_stone("st-laserswitch0", nil, {filename="st-oxydb"})  def_stone("st-laserswitch0", nil, {filename="st-oxydb"})
602  def_anim_images("laserswitch-blink",  def_anim_images("laserswitch-blink",
# Line 1156  end Line 1149  end
1149  Progress(100)  Progress(100)
1150    
1151  do  do
1152      local f = buildframes(framenames("ring-anim", 1,8), 50)      local img=def_subimages("ring-anim", {h=8,xoff=-8,yoff=-8, imgw=16, imgh=16})
1153      def_anim_images("ring-anim", f, {xoff=-16,yoff=-16})      def_anim("ring-anim", buildframes(img, 50))
1154  end  end

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.77

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26