diff --git a/dev-assets/doodads/crumbly-floor/crumbly-floor.js b/dev-assets/doodads/crumbly-floor/crumbly-floor.js index 97c2be0..c7bdf08 100644 --- a/dev-assets/doodads/crumbly-floor/crumbly-floor.js +++ b/dev-assets/doodads/crumbly-floor/crumbly-floor.js @@ -1,6 +1,6 @@ // Crumbly Floor. function main() { - Self.SetHitbox(0, 0, 65, 7); + Self.SetHitbox(0, 0, 98, 11); Self.AddAnimation("shake", 100, ["shake1", "shake2", "floor", "shake1", "shake2", "floor"]); Self.AddAnimation("fall", 100, ["fall1", "fall2", "fall3", "fall4"]); diff --git a/dev-assets/doodads/crumbly-floor/fall1.png b/dev-assets/doodads/crumbly-floor/fall1.png index bc9710c..fdc1616 100644 Binary files a/dev-assets/doodads/crumbly-floor/fall1.png and b/dev-assets/doodads/crumbly-floor/fall1.png differ diff --git a/dev-assets/doodads/crumbly-floor/fall2.png b/dev-assets/doodads/crumbly-floor/fall2.png index 1524b6d..ac135c2 100644 Binary files a/dev-assets/doodads/crumbly-floor/fall2.png and b/dev-assets/doodads/crumbly-floor/fall2.png differ diff --git a/dev-assets/doodads/crumbly-floor/fall3.png b/dev-assets/doodads/crumbly-floor/fall3.png index 5b05d93..cad059d 100644 Binary files a/dev-assets/doodads/crumbly-floor/fall3.png and b/dev-assets/doodads/crumbly-floor/fall3.png differ diff --git a/dev-assets/doodads/crumbly-floor/fall4.png b/dev-assets/doodads/crumbly-floor/fall4.png index 97e8ee0..11f6c98 100644 Binary files a/dev-assets/doodads/crumbly-floor/fall4.png and b/dev-assets/doodads/crumbly-floor/fall4.png differ diff --git a/dev-assets/doodads/crumbly-floor/fallen.png b/dev-assets/doodads/crumbly-floor/fallen.png index dd5e57f..6c16dd0 100644 Binary files a/dev-assets/doodads/crumbly-floor/fallen.png and b/dev-assets/doodads/crumbly-floor/fallen.png differ diff --git a/dev-assets/doodads/crumbly-floor/floor.png b/dev-assets/doodads/crumbly-floor/floor.png index f89f16e..c592c09 100644 Binary files a/dev-assets/doodads/crumbly-floor/floor.png and b/dev-assets/doodads/crumbly-floor/floor.png differ diff --git a/dev-assets/doodads/crumbly-floor/shake1.png b/dev-assets/doodads/crumbly-floor/shake1.png index 4881adf..b59c251 100644 Binary files a/dev-assets/doodads/crumbly-floor/shake1.png and b/dev-assets/doodads/crumbly-floor/shake1.png differ diff --git a/dev-assets/doodads/crumbly-floor/shake2.png b/dev-assets/doodads/crumbly-floor/shake2.png index 42e770d..83723ef 100644 Binary files a/dev-assets/doodads/crumbly-floor/shake2.png and b/dev-assets/doodads/crumbly-floor/shake2.png differ diff --git a/dev-assets/doodads/doors/build.sh b/dev-assets/doodads/doors/build.sh index 52d6e18..384d486 100755 --- a/dev-assets/doodads/doors/build.sh +++ b/dev-assets/doodads/doors/build.sh @@ -18,13 +18,9 @@ doodad convert -t "Yellow Door" yellow-closed.png yellow-unlocked.png yellow-rig doodad edit-doodad -q --tag color=yellow door-yellow.doodad doodad install-script colored-door.js door-yellow.doodad -# doodad convert -t "Green Door" green1.png green2.png door-green.doodad -# doodad edit-doodad -q --tag color=green door-green.doodad -# doodad install-script locked-door.js door-green.doodad -# -# doodad convert -t "Yellow Door" yellow1.png yellow2.png door-yellow.doodad -# doodad edit-doodad -q --tag color=yellow door-yellow.doodad -# doodad install-script locked-door.js door-yellow.doodad +doodad convert -t "Small Key Door" small-closed.png small-unlocked.png small-right.png small-left.png small-key-door.doodad +doodad edit-doodad -q --tag color=small small-key-door.doodad +doodad install-script colored-door.js small-key-door.doodad doodad convert -t "Red Key" red-key.png key-red.doodad doodad edit-doodad -q --tag color=red key-red.doodad @@ -42,7 +38,11 @@ doodad convert -t "Yellow Key" yellow-key.png key-yellow.doodad doodad edit-doodad -q --tag color=yellow key-yellow.doodad doodad install-script keys.js key-yellow.doodad +doodad convert -t "Small Key" small-key.png small-key.doodad +doodad edit-doodad -q --tag color=small small-key.doodad +doodad install-script keys.js small-key.doodad + doodad convert -t "Electric Door" electric{1,2,3,4}.png door-electric.doodad doodad install-script electric-door.js door-electric.doodad -cp door-*.doodad key-*.doodad ../../../assets/doodads/ +cp door-*.doodad key-*.doodad small-*.doodad ../../../assets/doodads/ diff --git a/dev-assets/doodads/doors/colored-door.js b/dev-assets/doodads/doors/colored-door.js index eaa1bcf..0bfba60 100644 --- a/dev-assets/doodads/doors/colored-door.js +++ b/dev-assets/doodads/doors/colored-door.js @@ -1,6 +1,6 @@ function main() { var color = Self.GetTag("color"); - var keyname = "key-" + color + ".doodad"; + var keyname = color === "small" ? "small-key.doodad" : "key-" + color + ".doodad"; // Layers in the doodad image. var layer = { @@ -46,7 +46,12 @@ function main() { if (e.Settled) { unlocked = true; Self.ShowLayer(enterSide < 0 ? layer.right : layer.left); - Sound.Play("unlock.wav") + Sound.Play("unlock.wav"); + + // If a Small Key door, consume a small key. + if (color === "small") { + e.Actor.RemoveItem(keyname, 1) + } } } }); diff --git a/dev-assets/doodads/doors/keys.js b/dev-assets/doodads/doors/keys.js index 00cc6d7..593b871 100644 --- a/dev-assets/doodads/doors/keys.js +++ b/dev-assets/doodads/doors/keys.js @@ -1,10 +1,11 @@ function main() { var color = Self.GetTag("color"); + var quantity = color === "small" ? 1 : 0; Events.OnCollide(function(e) { if (e.Settled) { Sound.Play("item-get.wav") - e.Actor.AddItem(Self.Filename, 0); + e.Actor.AddItem(Self.Filename, quantity); Self.Destroy(); } }) diff --git a/dev-assets/doodads/doors/small-closed.png b/dev-assets/doodads/doors/small-closed.png new file mode 100644 index 0000000..b97ae46 Binary files /dev/null and b/dev-assets/doodads/doors/small-closed.png differ diff --git a/dev-assets/doodads/doors/small-key.png b/dev-assets/doodads/doors/small-key.png new file mode 100644 index 0000000..11e4eca Binary files /dev/null and b/dev-assets/doodads/doors/small-key.png differ diff --git a/dev-assets/doodads/doors/small-left.png b/dev-assets/doodads/doors/small-left.png new file mode 100644 index 0000000..273786f Binary files /dev/null and b/dev-assets/doodads/doors/small-left.png differ diff --git a/dev-assets/doodads/doors/small-right.png b/dev-assets/doodads/doors/small-right.png new file mode 100644 index 0000000..4f55056 Binary files /dev/null and b/dev-assets/doodads/doors/small-right.png differ diff --git a/dev-assets/doodads/doors/small-unlocked.png b/dev-assets/doodads/doors/small-unlocked.png new file mode 100644 index 0000000..5596796 Binary files /dev/null and b/dev-assets/doodads/doors/small-unlocked.png differ