- [NEW] Claus i portes funcionant

data/animations.lua

@@ -130,4 +130,39 @@ animations = {
             { frame={x=24,y=0,w=8,h=16}, wait=2 }
         }
     },
+    ["clau"] = {
+        cycle = {1},
+        loop = false,
+        frames = {
+            { frame={x=0,y=0,w=16,h=8}, wait=100 },
+        }
+    },
+    ["porta"] = {
+        cycle = {1},
+        loop = false,
+        frames = {
+            { frame={x=16,y=0,w=8,h=16}, wait=100 },
+        }
+    },
+    ["porta_obrint"] = {
+        cycle = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15},
+        loop = false,
+        frames = {
+            { frame={x=16,y=1,w=8,h=15}, wait=1 },
+            { frame={x=16,y=2,w=8,h=14}, wait=1 },
+            { frame={x=16,y=3,w=8,h=13}, wait=1 },
+            { frame={x=16,y=4,w=8,h=12}, wait=1 },
+            { frame={x=16,y=5,w=8,h=11}, wait=1 },
+            { frame={x=16,y=6,w=8,h=10}, wait=1 },
+            { frame={x=16,y=7,w=8,h=9}, wait=1 },
+            { frame={x=16,y=8,w=8,h=8}, wait=1 },
+            { frame={x=16,y=9,w=8,h=7}, wait=1 },
+            { frame={x=16,y=10,w=8,h=6}, wait=1 },
+            { frame={x=16,y=11,w=8,h=5}, wait=1 },
+            { frame={x=16,y=12,w=8,h=4}, wait=1 },
+            { frame={x=16,y=13,w=8,h=3}, wait=1 },
+            { frame={x=16,y=14,w=8,h=2}, wait=1 },
+            { frame={x=16,y=15,w=8,h=1}, wait=1 },
+        }
+    },
 }

data/editor.lua

@@ -299,9 +299,13 @@ editor = {
             local mx, my = mouse.pos()
             local x,y = 0,0
             for i,k in pairs(items) do
-                local w = math.max(k.visual.w, #k.name*4)
+                local w = math.max(k.visual.w, #k.label*4)
+                if x+w > 160 then
+                    y=y+32
+                    x=0
+                end
                 local ox = (w-k.visual.w)/2
-                draw.text(k.name, x, y, 15)
+                draw.text(k.label, x, y, 15)
                 draw.surf(k.visual.x, k.visual.y, k.visual.w, k.visual.h, x+ox, y+7)
                 if mx>x and mx<x+w and my>y and my<y+7+k.visual.h then
                     draw.rect(x+ox, y+7, k.visual.w, k.visual.h, 28)

data/items.lua

@@ -1,14 +1,57 @@
 items = {
     [1] = {
         name="mummy",
+        label="momia",
         visual = {x=0,y=24,w=16,h=16}
     },
     [2] = {
         name="coin",
+        label="moneda",
         visual = {x=0,y=40,w=8,h=8}
     },
     [3] = {
         name="torxa",
+        label="torxa",
         visual = {x=0,y=48,w=8,h=16}
-    }
+    },
+    [4] = {
+        name="clau verda",
+        label="clau",
+        visual = {x=16,y=48,w=16,h=8}
+    },
+    [5] = {
+        name="clau groga",
+        label="clau",
+        visual = {x=16,y=56,w=16,h=8}
+    },
+    [6] = {
+        name="clau roja",
+        label="clau",
+        visual = {x=32,y=48,w=16,h=8}
+    },
+    [7] = {
+        name="clau blava",
+        label="clau",
+        visual = {x=32,y=56,w=16,h=8}
+    },
+    [8] = {
+        name="porta verda",
+        label="porta",
+        visual = {x=48,y=48,w=8,h=16}
+    },
+    [9] = {
+        name="porta groga",
+        label="porta",
+        visual = {x=56,y=48,w=8,h=16}
+    },
+    [10] = {
+        name="porta roja",
+        label="porta",
+        visual = {x=64,y=48,w=8,h=16}
+    },
+    [11] = {
+        name="porta blava",
+        label="porta",
+        visual = {x=72,y=48,w=8,h=16}
+    },
 }

data/score.lua

@@ -2,14 +2,21 @@ score = {
     points = 0,
     color = 28,
     zoom = 1,
+    surf = nil,
 
     init = function()
         score.points = 0
+        score.surf = surf.load("sprites.gif")
     end,
 
     draw = function()
         draw.rectf(0,0,160,8,1)
-        draw.text(string.format("%03d", score.points),0,0,score.color)
+        draw.text(string.format("%03d", score.points),1,1,score.color)
+        surf.source(score.surf)
+        if sprites.hero.keys["verda"] then draw.surf(16,48,16,8, 32,-1) end
+        if sprites.hero.keys["groga"] then draw.surf(16,56,16,8, 32,-1) end
+        if sprites.hero.keys["roja"]  then draw.surf(32,48,16,8, 32,-1) end
+        if sprites.hero.keys["blava"] then draw.surf(32,56,16,8, 32,-1) end
     end,
 
     inc = function(value)

data/sprites.lua

@@ -65,6 +65,7 @@ sprites = {
             cooldown = 0,
             jump_throttle = 0,
             lives = 4,
+            keys = {},
             stairs = false
         }
         --table.insert(sprites.list, templates.create("mummy", {pos={x=100, y=4*12*8+71},flipped=true}))
@@ -134,7 +135,7 @@ sprites = {
         end
     end,
 
-    hit_hero = function(live)
+    hero_hit = function(live)
         live = live or sprites.hero.lives-1
         local light_table = {[0]=20, 30, 50, 80, 100}
         local red_table = {[0]=0, 0.25, 0.5, 0.75, 1}
@@ -164,6 +165,13 @@ sprites = {
         end
     end,
 
+    hero_give_key = function(color)
+        if sprites.hero.keys[color] then return false end
+        sprites.hero.keys[color] = true
+        tweening.add(1,0,0.25,easing.linear,function(value,n,finished)palfade.fade_white(value)end)
+        return true
+    end,
+
     lights_out = function()
         for i,spr in ipairs(sprites.list) do
             if spr.light then
@@ -194,7 +202,7 @@ sprites = {
                 local x2,y2,w2,h2 = util.aabb(sprites.hero) -- el aabb del heroi
                 -- Si toca al heroi...
                 if util.check_aabb_collision(x1,y1,w1,h1, x2,y2,w2,h2) then
-                    sprites.hit_hero()
+                    sprites.hero_hit()
                 end
             end
 
@@ -266,8 +274,6 @@ sprites = {
     update_coin = function(spr)
         if spr.state == templates.ALIVE then
             local x1,y1,w1,h1 = util.aabb(spr)
-            --for i,v in ipairs(sprites.list) do
-                --if v.type == "hero" then
             local x2,y2,w2,h2 = util.aabb(sprites.hero)
             if util.check_aabb_collision(x1,y1,w1,h1, x2,y2,w2,h2) then
                 local tx, ty = (spr.pos.x)>>3, (spr.pos.y)>>3
@@ -282,8 +288,6 @@ sprites = {
                 score.inc(10)
                 return
             end
-                --end
-            --end
         elseif spr.state == templates.DYING then
             spr.pos.y = spr.pos.y - 0.5
             spr.timer = spr.timer + 1
@@ -299,7 +303,7 @@ sprites = {
             local x1,y1,w1,h1 = util.aabb(spr)
             local x2,y2,w2,h2 = util.aabb(sprites.hero)
             if util.check_aabb_collision(x1,y1,w1,h1, x2,y2,w2,h2) then
-                sprites.hit_hero(4)
+                sprites.hero_hit(4)
                 spr.state = templates.DYING
                 spr.timer = 0
                 return
@@ -307,9 +311,48 @@ sprites = {
         elseif spr.state == templates.DYING then
             spr.timer = spr.timer + 1
             if spr.timer == 32 then
+                spr.state = templates.ALIVE
+            end
+        end
+    end,
+
+    update_clau = function(spr)
+        if spr.state == templates.ALIVE then
+            local x1,y1,w1,h1 = util.aabb(spr)
+            local x2,y2,w2,h2 = util.aabb(sprites.hero)
+            if util.check_aabb_collision(x1,y1,w1,h1, x2,y2,w2,h2) then
+                if sprites.hero_give_key(spr.color) then
+                    local tx, ty = (spr.pos.x)>>3, (spr.pos.y)>>3
+                    map.surf(rooms.surf_items)
+                    map.tile(tx,ty,0)
+                    sprites.remove(spr)
+                end
+            end
+        end
+    end,
+
+    update_porta = function(spr)
+        if spr.state == templates.ALIVE then
+            local x1,y1,w1,h1 = util.aabb(spr)
+            local x2,y2,w2,h2 = util.aabb(sprites.hero)
+            if util.check_aabb_collision(x1,y1,w1,h1, x2,y2,w2,h2) then
+                if sprites.hero.keys[spr.color] then
+                    sprites.hero.keys[spr.color] = nil
+                    sprites.set_animation(spr, "porta_obrint")
                     spr.state = templates.DYING
                 end
             end
+        elseif spr.state == templates.DYING then
+            if spr.current_frame == 15 then
+                local tx, ty = (spr.pos.x)>>3, (spr.pos.y)>>3
+                map.surf(rooms.surf_items)
+                map.tile(tx,ty,0)
+                map.surf(rooms.surf_foreground)
+                map.tile(tx,ty,0)
+                map.tile(tx,ty+1,0)
+                sprites.remove(spr)
+            end
+        end
     end,
 
     update_brick = function(spr)
@@ -446,7 +489,7 @@ sprites = {
                         game.change_room(0,1)
                     else
                         if sprites.hero.pos.y >= 742 then
-                            sprites.hit_hero(0)
+                            sprites.hero_hit(0)
                             return
                         end
                         sprites.hero.pos.y = sprites.hero.pos.y + 2

data/templates.lua

@@ -6,9 +6,11 @@ templates = {
 
     create = function(type, options)
         local sprite
-        if type == "mummy" then
+        local key, value = type:match("^(%S+)%s*(.*)$")
+
+        if key == "mummy" then
             sprite = {
-                type = type,
+                type = key,
                 pos = options.pos,--{ x=100, y=4*12*8+71 },
                 size = { w=16,h=16 },
                 bbo = { left=3, top=2, right=3, bottom=0 },
@@ -22,9 +24,9 @@ templates = {
                 room = options.room,
                 ia = sprites.update_mummy
             }
-        elseif type == "bullet" then
+        elseif key == "bullet" then
             sprite = {
-                type = type,
+                type = key,
                 pos = options.pos,--{ x=100, y=4*12*8+71 },
                 size = { w=4,h=3 },
                 bbo = { left=0, top=0, right=0, bottom=0 },
@@ -35,9 +37,9 @@ templates = {
                 animation = "bullet",
                 ia = sprites.update_bullet
             }
-        elseif type == "coin" then
+        elseif key == "coin" then
             sprite = {
-                type = type,
+                type = key,
                 pos = options.pos,--{ x=100, y=4*12*8+71 },
                 size = { w=8,h=8 },
                 bbo = { left=0, top=0, right=0, bottom=0 },
@@ -52,9 +54,9 @@ templates = {
                 light_oy = 4,
                 ia = sprites.update_coin
             }
-        elseif type == "brick" then
+        elseif key == "brick" then
             sprite = {
-                type = type,
+                type = key,
                 pos = options.pos,--{ x=100, y=4*12*8+71 },
                 size = { w=8,h=8 },
                 bbo = { left=0, top=0, right=0, bottom=0 },
@@ -67,9 +69,9 @@ templates = {
                 timeout = 10,
                 ia = sprites.update_brick
             }
-        elseif type == "torxa" then
+        elseif key == "torxa" then
             sprite = {
-                type = type,
+                type = key,
                 pos = options.pos,--{ x=100, y=4*12*8+71 },
                 size = { w=8,h=16 },
                 bbo = { left=0, top=0, right=0, bottom=0 },
@@ -85,6 +87,39 @@ templates = {
                 no_shadow = true,
                 ia = sprites.update_torxa
             }
+        elseif key == "clau" then
+            sprite = {
+                type = key,
+                color = value,
+                pos = options.pos,--{ x=100, y=4*12*8+71 },
+                size = { w=16,h=8 },
+                bbo = { left=0, top=0, right=0, bottom=0 },
+                current_frame = 1,
+                current_wait = 1,
+                flipped = options.flipped,
+                surf = surf.load(value..".gif"),
+                animation = "clau",
+                state = templates.ALIVE,
+                light = 15,
+                light_ox = 7,
+                light_oy = 4,
+                ia = sprites.update_clau
+            }
+        elseif key == "porta" then
+            sprite = {
+                type = key,
+                color = value,
+                pos = options.pos,--{ x=100, y=4*12*8+71 },
+                size = { w=8,h=16 },
+                bbo = { left=0, top=0, right=0, bottom=0 },
+                current_frame = 1,
+                current_wait = 1,
+                flipped = options.flipped,
+                surf = surf.load(value..".gif"),
+                animation = "porta",
+                state = templates.ALIVE,
+                ia = sprites.update_porta
+            }
         else
             error("Template not recognized")
         end