/[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.79 by reallysoft, Sat Jun 28 10:50:34 2003 UTC revision 1.80 by reallysoft, Sat Jun 28 17:17:00 2003 UTC
# Line 445  Progress(30) Line 445  Progress(30)
445  -- Stone shadows --  -- Stone shadows --
446  -------------------  -------------------
447  def_image("sh-solid")  def_image("sh-solid")
448    def_image("sh-round")
449    def_image("sh-round2")
450  def_image("sh-grate1")  def_image("sh-grate1")
451  def_image("sh-grate2")  def_image("sh-grate2")
452  def_image("sh-glass")  def_image("sh-glass")
# Line 506  def_stone2("st-beads", "sh-glass") Line 508  def_stone2("st-beads", "sh-glass")
508  def_stone("st-glass1", "sh-glass")  def_stone("st-glass1", "sh-glass")
509  def_stone("st-glass2", "sh-glass")  def_stone("st-glass2", "sh-glass")
510  def_stone("st-glass3", "sh-glass")  def_stone("st-glass3", "sh-glass")
511  def_stone("st-rock1")  def_stone("st-rock1", "sh-round")
512  def_stone("st-rock2")  def_stone("st-rock2")
513  def_stone("st-rock3")  def_stone("st-rock3")
514  def_stone("st-rock4")  def_stone("st-rock4")
515  def_stone("st-rock5")  def_stone("st-rock5")
516  def_stone("st-rock6")  def_stone("st-rock6")
517  def_stone("st-rock7")  def_stone("st-rock7")
518  def_stone("st-rock8")  def_stone("st-rock8", "sh-round")
519  def_stone("st-brownie")  def_stone("st-brownie", "sh-round")
520  def_stone("st-stone1")  def_stone("st-stone1")
521  def_stone("st-stone2")  def_stone("st-stone2")
522    
# Line 540  def_stone("st-blue-sand") Line 542  def_stone("st-blue-sand")
542  -- Wooden stone --  -- Wooden stone --
543  do  do
544      def_subimages("st-wood", {modelname="st-wood-fg",h=2})      def_subimages("st-wood", {modelname="st-wood-fg",h=2})
545      def_shmodel("st-wood1", "st-wood-fg1", "sh-solid")      def_shmodel("st-wood1", "st-wood-fg1", "sh-round")
546      def_shmodel("st-wood2", "st-wood-fg2", "sh-solid")      def_shmodel("st-wood2", "st-wood-fg2", "sh-round")
547    
548      local n=def_subimages("st-wood-growing", {h=4})      local n=def_subimages("st-wood-growing", {h=4})
549      def_anim("st-wood-growing", buildframes(n, 130))      def_anim("st-wood-growing", buildframes(n, 130))
# Line 552  do Line 554  do
554     local n=def_subimages("st-blocker", {h=4})     local n=def_subimages("st-blocker", {h=4})
555     def_anim("st-blocker-shrinking", buildframes(n, 60))     def_anim("st-blocker-shrinking", buildframes(n, 60))
556     def_anim("st-blocker-growing", reverseframes(buildframes(n, 60)))     def_anim("st-blocker-growing", reverseframes(buildframes(n, 60)))
557     def_solidstone("st-blocker", n[1])     def_roundstone("st-blocker", n[1])
558  end  end
559    
560    
# Line 560  end Line 562  end
562  do  do
563      local n=def_subimages("st-rotator-left", {h=8})      local n=def_subimages("st-rotator-left", {h=8})
564      def_anim("st-rotator-left-anim", buildframes(n, 70), FALSE)      def_anim("st-rotator-left-anim", buildframes(n, 70), FALSE)
565      def_solidstone("st-rotator-left", "st-rotator-left-anim")      def_roundstone("st-rotator-left", "st-rotator-left-anim")
566      n=def_subimages("st-rotator-right", {h=8})      n=def_subimages("st-rotator-right", {h=8})
567      def_anim("st-rotator-right-anim", buildframes(n, 70), FALSE)      def_anim("st-rotator-right-anim", buildframes(n, 70), FALSE)
568      def_solidstone("st-rotator-right", "st-rotator-right-anim")      def_roundstone("st-rotator-right", "st-rotator-right-anim")
569  end  end
570    
571  def_stone("st-grate1", "sh-grate1")  def_stone("st-grate1", "sh-grate1")
# Line 574  def_stone("st-swap") Line 576  def_stone("st-swap")
576  def_stone("st-brake", "sh-brake")  def_stone("st-brake", "sh-brake")
577  def_image("it-brake", {filename="st-brake"})  def_image("it-brake", {filename="st-brake"})
578    
579  def_stone("st-greenbrown")  def_stone("st-greenbrown", "sh-round")
580  def_alias("st-greenbrown_hole", "st-greenbrown")  def_alias("st-greenbrown_hole", "st-greenbrown")
581  def_alias("st-greenbrown_move", "st-greenbrown")  def_alias("st-greenbrown_move", "st-greenbrown")
582    
# Line 586  def_stone("st-brick") Line 588  def_stone("st-brick")
588  def_stone("st-woven")  def_stone("st-woven")
589  def_stone("st-brick_magic", nil, {filename="st-brick"})  def_stone("st-brick_magic", nil, {filename="st-brick"})
590  def_subimages("st-switch", {h=2, modelname="st-switchfg"})  def_subimages("st-switch", {h=2, modelname="st-switchfg"})
591  def_solidstone("st-switch1", "st-switchfg1")  def_roundstone("st-switch1", "st-switchfg1")
592  def_solidstone("st-switch2", "st-switchfg2")  def_roundstone("st-switch2", "st-switchfg2")
593  def_stone("st-switch_black2", nil, {filename="st-switch_black2"})  def_stone("st-switch_black2", nil, {filename="st-switch_black2"})
594  def_stone("st-switch_black1", nil, {filename="st-switch_black1"})  def_stone("st-switch_black1", nil, {filename="st-switch_black1"})
595  def_stone("st-switch_white2", nil, {filename="st-switch_white2"})  def_stone("st-switch_white2", nil, {filename="st-switch_white2"})
# Line 596  def_stone("st-fourswitch", nil, {filenam Line 598  def_stone("st-fourswitch", nil, {filenam
598  def_stone("st-fourswitch_e")  def_stone("st-fourswitch_e")
599  def_stone("st-fourswitch_s")  def_stone("st-fourswitch_s")
600  def_stone("st-fourswitch_w")  def_stone("st-fourswitch_w")
601  def_stone("st-floppy0", nil, {filename="st-floppy1"})  def_stone("st-floppy0", "sh-round", {filename="st-floppy1"})
602  def_stone("st-floppy1", nil, {filename="st-floppy2"})  def_stone("st-floppy1", "sh-round", {filename="st-floppy2"})
603    
604  def_image("st-easymode")  def_image("st-easymode")
605    
# Line 610  def_anim_images("laserswitch-blink", Line 612  def_anim_images("laserswitch-blink",
612  def_solidstone("st-laserswitch1", "laserswitch-blink")  def_solidstone("st-laserswitch1", "laserswitch-blink")
613    
614  def_stone("st-wood_001")  def_stone("st-wood_001")
615  def_stone("st-key0", nil, {filename="st-key1"})  def_stone("st-key0", "sh-round", {filename="st-key1"})
616  def_stone("st-key1", nil, {filename="st-key2"})  def_stone("st-key1", "sh-round", {filename="st-key2"})
617  def_stone("st-white1")  def_stone("st-white1")
618  def_stone("st-white2")  def_stone("st-white2")
619  def_stone("st-white3")  def_stone("st-white3")
620  def_stone("st-white4", "sh-white4")  def_stone("st-white4", "sh-white4")
621  def_stone("st-yinyang1")  def_stone("st-yinyang1")
622  def_stone("st-yinyang2")  def_stone("st-yinyang2")
623  def_stone("st-bluegray")  def_stone("st-bluegray", "sh-round")
624  def_stone("st-plain")  def_stone("st-plain")
625  def_stone("st-yellow")  def_stone("st-yellow")
626  def_stone("st-dummy")  def_stone("st-dummy")
# Line 668  do Line 670  do
670          c="st-oxydc-open",          c="st-oxydc-open",
671          d="st-oxydd-open"          d="st-oxydd-open"
672      }      }
673        local shadow = {
674           a="sh-round",
675           b="sh-round",
676           c="sh-solid",
677           d="sh-solid",
678        }
679      local fopening = {      local fopening = {
680          a = buildframes(def_subimages("st-oxyda-opening", {h=9}), 60),          a = buildframes(def_subimages("st-oxyda-opening", {h=9}), 60),
681          b = buildframes(def_subimages("st-oxydb-opening", {h=14}), 40),          b = buildframes(def_subimages("st-oxydb-opening", {h=14}), 40),
# Line 689  do Line 697  do
697          def_overlay(n.."-base", {%baseimg[flavor], %colorspots[color+1]})          def_overlay(n.."-base", {%baseimg[flavor], %colorspots[color+1]})
698          display.DefineComposite(n.."-opening-fg", n.."-base", fadein)          display.DefineComposite(n.."-opening-fg", n.."-base", fadein)
699          display.DefineComposite(n.."-closing-fg", n.."-base", fadeout)          display.DefineComposite(n.."-closing-fg", n.."-base", fadeout)
700          def_shmodel (n.."-opening", n.."-opening-fg", "sh-solid")          def_shmodel (n.."-opening", n.."-opening-fg", %shadow[flavor])
701          def_shmodel (n.."-closing", n.."-closing-fg", "sh-solid")          def_shmodel (n.."-closing", n.."-closing-fg", %shadow[flavor])
702      end      end
703    
704      function mkblink(flavor, color)      function mkblink(flavor, color)
# Line 699  do Line 707  do
707          def_overlay(n..1, img)          def_overlay(n..1, img)
708          def_overlay(n..2, {%baseimg[flavor], %colorspots[color+1]})          def_overlay(n..2, {%baseimg[flavor], %colorspots[color+1]})
709          def_anim(n.."-anim", buildframes({n..1,n..2}, 500), 1)          def_anim(n.."-anim", buildframes({n..1,n..2}, 500), 1)
710          def_shmodel(n, n.."-anim", "sh-solid")          def_shmodel(n, n.."-anim", %shadow[flavor])
711      end      end
712    
713      function mkopened(flavor, color)      function mkopened(flavor, color)
# Line 717  do Line 725  do
725          def_anim(n.."-anim", frames, 1)          def_anim(n.."-anim", frames, 1)
726    
727          -- and finally add a shadow to make the model complete          -- and finally add a shadow to make the model complete
728          def_solidstone(n, n.."-anim")          def_shmodel(n, n.."-anim", %shadow[flavor])
729      end      end
730    
731      function mkoxyd(flavor)      function mkoxyd(flavor)
732          def_stone("st-oxyd"..flavor)          def_stone("st-oxyd"..flavor, %shadow[flavor])
733          def_solidstone("st-likeoxyd"..flavor, "st-oxyd"..flavor)          def_shmodel("st-likeoxyd"..flavor, "st-oxyd"..flavor, %shadow[flavor])
734    --        def_solidstone("st-likeoxyd"..flavor, "st-oxyd"..flavor)
735          img=def_image("st-oxyd"..flavor.."-open")          img=def_image("st-oxyd"..flavor.."-open")
736          def_shmodel("st-likeoxyd"..flavor.."-open", img, "sh-solid")          def_shmodel("st-likeoxyd"..flavor.."-open", img, %shadow[flavor])
737    
738          local fadein = "oxyd"..flavor.."-fadein"          local fadein = "oxyd"..flavor.."-fadein"
739          local fadeout= "oxyd"..flavor.."-fadeout"          local fadeout= "oxyd"..flavor.."-fadeout"
# Line 754  function make_laser(dir) Line 763  function make_laser(dir)
763    
764      -- deactivated laser      -- deactivated laser
765      def_overlay("laser"..dir, {"st-laser-base", laseron[1]})      def_overlay("laser"..dir, {"st-laser-base", laseron[1]})
766      def_solidstone("st-laser"..dir, "laser"..dir)      def_roundstone("st-laser"..dir, "laser"..dir)
767    
768      -- activated laser      -- activated laser
769      names = {}      names = {}
# Line 775  make_laser("-n") Line 784  make_laser("-n")
784  ---------------------  ---------------------
785  -- Fake oxyd stone --  -- Fake oxyd stone --
786  ---------------------  ---------------------
787  def_stone("st-fakeoxyd", nil, {filename="st-oxydb"})  def_stone("st-fakeoxyd", "sh-round", {filename="st-oxydb"})
788  def_anim_images("fakeoxyd-blink",  def_anim_images("fakeoxyd-blink",
789                  repeatanim(pingpong                  repeatanim(pingpong
790                             (buildframes(framenames("st-fakeoxyd-blink", 1,4),                             (buildframes(framenames("st-fakeoxyd-blink", 1,4),
791                                          50))))                                          50))))
792  def_solidstone("st-fakeoxyd-blink", "fakeoxyd-blink")  def_roundstone("st-fakeoxyd-blink", "fakeoxyd-blink")
793    
794  -- Fart stone  -- Fart stone
795  def_stone("st-fart", nil, {filename="st-oxydb"})  def_stone("st-fart", "sh-round", {filename="st-oxydb"})
796  def_anim_images("farting",  def_anim_images("farting",
797                  repeatanim(pingpong                  repeatanim(pingpong
798                             (buildframes(framenames("st-fakeoxyd-blink", 1,4),                             (buildframes(framenames("st-fakeoxyd-blink", 1,4),
799                                          50))))                                          50))))
800  def_solidstone("st-farting", "farting")  def_roundstone("st-farting", "farting")
801    
802  namelist = def_subimages("st-fart-break",{h=6})  namelist = def_subimages("st-fart-break",{h=6})
803  def_anim("fartbreak-anim", buildframes(namelist,50))  def_anim("fartbreak-anim", buildframes(namelist,50))
804  def_solidstone("st-fartbreak-anim", "fartbreak-anim")  def_roundstone("st-fartbreak-anim", "fartbreak-anim")
805    
806  -- st-rock3_movebreak  -- st-rock3_movebreak
807    
# Line 822  end Line 831  end
831    
832  -- Stone impulse stone  -- Stone impulse stone
833  namelist = def_subimages("st-stoneimpulse", {h=4})  namelist = def_subimages("st-stoneimpulse", {h=4})
834  def_solidstone("st-stoneimpulse", namelist[1])  def_roundstone("st-stoneimpulse", namelist[1])
835  def_anim("stoneimpulse-anim1", buildframes(namelist, 60))  def_anim("stoneimpulse-anim1", buildframes(namelist, 60))
836  def_solidstone("st-stoneimpulse-anim1", "stoneimpulse-anim1")  def_roundstone("st-stoneimpulse-anim1", "stoneimpulse-anim1")
837  def_anim("stoneimpulse-anim2", reverseframes(buildframes(namelist, 60)))  def_anim("stoneimpulse-anim2", reverseframes(buildframes(namelist, 60)))
838  def_solidstone("st-stoneimpulse-anim2", "stoneimpulse-anim2")  def_roundstone("st-stoneimpulse-anim2", "stoneimpulse-anim2")
839    
840  namelist = def_subimages("st-stoneimpulse-hollow", {h=4})  namelist = def_subimages("st-stoneimpulse-hollow", {h=4})
841    
# Line 842  def_shmodel("st-stoneimpulse-hollow-anim Line 851  def_shmodel("st-stoneimpulse-hollow-anim
851  do  do
852      local img = def_subimages("st-thief", {h=7})      local img = def_subimages("st-thief", {h=7})
853      def_anim("thief-anim", pingpong(buildframes(img, 80)))      def_anim("thief-anim", pingpong(buildframes(img, 80)))
854      def_solidstone("st-thief", img[1])      def_roundstone("st-thief", img[1])
855      def_solidstone("st-thief-anim", "thief-anim")      def_roundstone("st-thief-anim", "thief-anim")
856  end  end
857    
858  -----------------  -----------------
# Line 852  end Line 861  end
861  do  do
862      local img = def_subimages("st-timer", {h=4})      local img = def_subimages("st-timer", {h=4})
863      def_anim("timer-anim", buildframes(img, 120), 1)      def_anim("timer-anim", buildframes(img, 120), 1)
864      def_solidstone("st-timer", "timer-anim")      def_roundstone("st-timer", "timer-anim")
865      def_solidstone("st-timeroff", "st-timer1")      def_roundstone("st-timeroff", "st-timer1")
866  end  end
867    
868  -----------  -----------
# Line 862  end Line 871  end
871    
872  do  do
873      local n=def_subimages("st-bombs", {h=7})      local n=def_subimages("st-bombs", {h=7})
874      def_solidstone("st-bombs", "st-bombs1")      def_roundstone("st-bombs", "st-bombs1")
875      def_anim("st-bombs-anim", buildframes(n,50))      def_anim("st-bombs-anim", buildframes(n,50))
876  end  end
877    
# Line 877  do Line 886  do
886      def_solidstone("st-mail-w", "st-mail3")      def_solidstone("st-mail-w", "st-mail3")
887  end  end
888    
889  function def_stone_with_anim(name, npictures, frametime)  function def_solidstone_with_anim(name, npictures, frametime)
890      local n=def_subimages(name, {h=npictures})      local n=def_subimages(name, {h=npictures})
891      def_anim(name.."-animfg", buildframes(n,frametime))      def_anim(name.."-animfg", buildframes(n,frametime))
892      def_solidstone(name.."-anim", name.."-animfg")      def_solidstone(name.."-anim", name.."-animfg")
893      def_solidstone(name, n[1])      def_solidstone(name, n[1])
894  end  end
895  def_stone_with_anim ("st-window", 4, 80)  function def_roundstone_with_anim(name, npictures, frametime)
896  def_stone_with_anim ("st-stone_break", 10, 50)      local n=def_subimages(name, {h=npictures})
897  def_stone_with_anim ("st-break_acwhite", 10, 50)      def_anim(name.."-animfg", buildframes(n,frametime))
898  def_stone_with_anim ("st-break_acblack", 10, 50)      def_roundstone(name.."-anim", name.."-animfg")
899  def_stone_with_anim ("st-death", 3, 140)      def_roundstone(name, n[1])
900     end
901    
902    def_solidstone_with_anim ("st-window", 4, 80)
903    def_solidstone_with_anim ("st-stone_break", 10, 50)
904    def_roundstone_with_anim ("st-break_acwhite", 10, 50)
905    def_roundstone_with_anim ("st-break_acblack", 10, 50)
906    def_roundstone_with_anim ("st-death", 3, 140)
907    
908  do  do
909      function def_chargestone(basename)      function def_chargestone(basename)
# Line 953  function make_mirror(basename, baseimg, Line 969  function make_mirror(basename, baseimg,
969      for i=1,4 do      for i=1,4 do
970          mname = basename .. i          mname = basename .. i
971          def_overlay (mname .. "-ovl", {baseimg, overlays[i]})          def_overlay (mname .. "-ovl", {baseimg, overlays[i]})
972          def_shmodel(mname, mname .. "-ovl", "sh-solid")          def_shmodel(mname, mname .. "-ovl", "sh-round2")
973      end      end
974  end  end
975    
# Line 973  make_mirror("st-pmirror-mt", "st-mirror- Line 989  make_mirror("st-pmirror-mt", "st-mirror-
989  make_mirror("st-pmirror-st", "st-mirror-static",  mirrorp_transp)  make_mirror("st-pmirror-st", "st-mirror-static",  mirrorp_transp)
990    
991  -- OneWay --  -- OneWay --
992  def_stones{"st-oneway-n", "st-oneway-e", "st-oneway-w", "st-oneway-s"}  def_roundstones{ "st-oneway-n", "st-oneway-e", "st-oneway-w", "st-oneway-s"}
993  def_stones{"st-oneway_black-n", "st-oneway_black-e", "st-oneway_black-w", "st-oneway_black-s"}  def_stones{ "st-oneway_black-n", "st-oneway_black-e", "st-oneway_black-w", "st-oneway_black-s"}
994  def_stones{"st-oneway_white-n", "st-oneway_white-e", "st-oneway_white-w", "st-oneway_white-s"}  def_stones{ "st-oneway_white-n", "st-oneway_white-e", "st-oneway_white-w", "st-oneway_white-s"}
995    
996  ---------------  ---------------
997  -- Coin slot --  -- Coin slot --
# Line 1112  do Line 1128  do
1128         local animname="st-bolder"..orient.."a"         local animname="st-bolder"..orient.."a"
1129         local frames={%img[start], %img[start+1], %img[start+2]}         local frames={%img[start], %img[start+1], %img[start+2]}
1130         def_anim(animname, buildframes(frames, 120),1)         def_anim(animname, buildframes(frames, 120),1)
1131         def_shmodel("st-bolder-"..orient, animname, "sh-solid")         def_shmodel("st-bolder-"..orient, animname, "sh-round")
1132    
1133         animname="st-bolder-"..orient.."-fall-anim"         animname="st-bolder-"..orient.."-fall-anim"
1134         frames={%imgfall[start],%imgfall[start+1],%imgfall[start+2]}         frames={%imgfall[start],%imgfall[start+1],%imgfall[start+2]}

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.80

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