diff --git a/input/kh1/enemies/air-pirate.toml b/input/kh1/enemies/air-pirate.toml index 8369e0a..9e0e929 100644 --- a/input/kh1/enemies/air-pirate.toml +++ b/input/kh1/enemies/air-pirate.toml @@ -2,6 +2,7 @@ name = "Air Pirate" [[world]] name = "Neverland" +rooms = ["Pirate Ship"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/air-soldier.toml b/input/kh1/enemies/air-soldier.toml index 6fb7c7a..7b65e44 100644 --- a/input/kh1/enemies/air-soldier.toml +++ b/input/kh1/enemies/air-soldier.toml @@ -2,6 +2,11 @@ name = "Air Soldier" [[world]] name = "Wonderland" +rooms = ["Lotus Forest"] + +[[world]] +name = "End of the World" +rooms = ["World Terminus | Olympus Coliseum"] [[drops]] name = "Potion" diff --git a/input/kh1/enemies/angel-star.toml b/input/kh1/enemies/angel-star.toml index 41a7311..8b65d59 100644 --- a/input/kh1/enemies/angel-star.toml +++ b/input/kh1/enemies/angel-star.toml @@ -2,6 +2,7 @@ name = "Angel Star" [[world]] name = "End of the World" +rooms = ["Linked Worlds"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/aquatank.toml b/input/kh1/enemies/aquatank.toml index 7fa241f..68d4a23 100644 --- a/input/kh1/enemies/aquatank.toml +++ b/input/kh1/enemies/aquatank.toml @@ -3,6 +3,10 @@ name = "Aquatank" [[world]] name = "Atlantica" +[[world]] +name = "End of the World" +rooms = ["World Terminus | Atlantica"] + [[drops]] name = "Mega-Potion" kind = "item" diff --git a/input/kh1/enemies/bandit.toml b/input/kh1/enemies/bandit.toml index fafd23b..e953f93 100644 --- a/input/kh1/enemies/bandit.toml +++ b/input/kh1/enemies/bandit.toml @@ -9,6 +9,7 @@ name = "Monstro" [[world]] name = "End of the World" +rooms = ["World Terminus | Agrabah"] [[drops]] name = "Potion" diff --git a/input/kh1/enemies/barrel-spider.toml b/input/kh1/enemies/barrel-spider.toml index 20ef3d9..f8fdc07 100644 --- a/input/kh1/enemies/barrel-spider.toml +++ b/input/kh1/enemies/barrel-spider.toml @@ -8,6 +8,7 @@ name = "Neverland" [[world]] name = "End of the World" +rooms = ["World Terminus | Neverland"] [[drops]] name = "Camping Set" diff --git a/input/kh1/enemies/battleship.toml b/input/kh1/enemies/battleship.toml index 1d69cdd..19923c3 100644 --- a/input/kh1/enemies/battleship.toml +++ b/input/kh1/enemies/battleship.toml @@ -2,6 +2,7 @@ name = "Battleship" [[world]] name = "Neverland" +rooms = ["Pirate Ship"] [[drops]] name = "Elixir" diff --git a/input/kh1/enemies/black-ballade.toml b/input/kh1/enemies/black-ballade.toml index 578e573..53cf093 100644 --- a/input/kh1/enemies/black-ballade.toml +++ b/input/kh1/enemies/black-ballade.toml @@ -2,6 +2,7 @@ name = "Black Ballade" [[world]] name = "Deep Jungle" +rooms = ["Bamboo Thicket"] [[drops]] name = "Lightning Stone" diff --git a/input/kh1/enemies/blue-rhapsody.toml b/input/kh1/enemies/blue-rhapsody.toml index 98afed0..4392c8b 100644 --- a/input/kh1/enemies/blue-rhapsody.toml +++ b/input/kh1/enemies/blue-rhapsody.toml @@ -5,15 +5,18 @@ name = "Traverse Town" [[world]] name = "Wonderland" +rooms = ["Lotus Forest"] [[world]] name = "Monstro" [[world]] name = "Hollow Bastion" +rooms = ["Entrance Hall"] [[world]] name = "End of the World" +rooms = ["World Terminus | Wonderland"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/bouncywild.toml b/input/kh1/enemies/bouncywild.toml index 1b87e6a..dd6a81c 100644 --- a/input/kh1/enemies/bouncywild.toml +++ b/input/kh1/enemies/bouncywild.toml @@ -9,6 +9,7 @@ rooms = ["Bowels", "Stomach"] [[world]] name = "End of the World" +rooms = ["World Terminus | Deep Jungle"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/chimera.toml b/input/kh1/enemies/chimera.toml index b29ac2c..dae29f4 100644 --- a/input/kh1/enemies/chimera.toml +++ b/input/kh1/enemies/chimera.toml @@ -2,6 +2,7 @@ name = "Chimera" [[world]] name = "Halloween Town" +rooms = ["Manor Ruins"] [[drops]] name = "Blazing Stone" diff --git a/input/kh1/enemies/darkball.toml b/input/kh1/enemies/darkball.toml index f082b87..7c49b59 100644 --- a/input/kh1/enemies/darkball.toml +++ b/input/kh1/enemies/darkball.toml @@ -2,12 +2,24 @@ name = "Darkball" [[world]] name = "Traverse Town" -rooms = ["3rd District", "Gizmo Shop"] +rooms = ["3rd District", "Gizmo Shop", "Alleyway"] [[world]] name = "Agrabah" rooms = ["Bazaar", "Palace Gates"] +[[world]] +name = "Deep Jungle" +rooms = ["Bamboo Thicket"] + +[[world]] +name = "Wonderland" +rooms = ["Lotus Forest"] + +[[world]] +name = "Halloween Town" +rooms = ["Moonlight Hill"] + [[world]] name = "Hollow Bastion" diff --git a/input/kh1/enemies/defender.toml b/input/kh1/enemies/defender.toml index 3072c09..2dfe0be 100644 --- a/input/kh1/enemies/defender.toml +++ b/input/kh1/enemies/defender.toml @@ -6,9 +6,11 @@ rooms = ["3rd District", "Hotel Hallway", "Gizmo Shop"] [[world]] name = "Hollow Bastion" +rooms = ["Entrance Hall"] [[world]] name = "End of the World" +rooms = ["World Terminus | Olympus Coliseum"] [[drops]] name = "Elixir" diff --git a/input/kh1/enemies/fat-bandit.toml b/input/kh1/enemies/fat-bandit.toml index 0ba490a..57f1e80 100644 --- a/input/kh1/enemies/fat-bandit.toml +++ b/input/kh1/enemies/fat-bandit.toml @@ -8,6 +8,7 @@ name = "Monstro" [[world]] name = "End of the World" +rooms = ["World Terminus | Agrabah"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/gargoyle.toml b/input/kh1/enemies/gargoyle.toml index 009d91e..d93fefd 100644 --- a/input/kh1/enemies/gargoyle.toml +++ b/input/kh1/enemies/gargoyle.toml @@ -1,10 +1,12 @@ name = "Gargoyle" [[world]] -name = "Holloween Town" +name = "Halloween Town" +rooms = ["Graveyard"] [[world]] name = "End of the World" +rooms = ["World Terminus | Halloween Town"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/gigas-shadow.toml b/input/kh1/enemies/gigas-shadow.toml index 589560d..80c2027 100644 --- a/input/kh1/enemies/gigas-shadow.toml +++ b/input/kh1/enemies/gigas-shadow.toml @@ -2,6 +2,7 @@ name = "Gigas Shadow" [[world]] name = "Wonderland" +rooms = ["Bizzare Room"] [[drops]] name = "Lucid Shard" diff --git a/input/kh1/enemies/green-requiem.toml b/input/kh1/enemies/green-requiem.toml index f583d5e..d288dbf 100644 --- a/input/kh1/enemies/green-requiem.toml +++ b/input/kh1/enemies/green-requiem.toml @@ -11,13 +11,14 @@ name = "Monstro" [[world]] name = "Deep Jungle" -rooms = ["Jungle: Cliff"] +rooms = ["Cliff"] [[world]] name = "Hollow Bastion" [[world]] name = "End of the World" +rooms = ["World Terminus | Wonderland"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/invisible.toml b/input/kh1/enemies/invisible.toml index e1e617d..aa7de6a 100644 --- a/input/kh1/enemies/invisible.toml +++ b/input/kh1/enemies/invisible.toml @@ -2,6 +2,7 @@ name = "Invisible" [[world]] name = "End of the World" +rooms = ["Linked Worlds"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/jet-balloon.toml b/input/kh1/enemies/jet-balloon.toml index 98f389f..5a9fbc4 100644 --- a/input/kh1/enemies/jet-balloon.toml +++ b/input/kh1/enemies/jet-balloon.toml @@ -2,6 +2,7 @@ name = "Jet Balloon" [[world]] name = "Neverland" +rooms = ["Pirate Ship"] [[drops]] name = "Dazzling Stone" diff --git a/input/kh1/enemies/large-body.toml b/input/kh1/enemies/large-body.toml index 359c0e6..c84ca7b 100644 --- a/input/kh1/enemies/large-body.toml +++ b/input/kh1/enemies/large-body.toml @@ -15,9 +15,11 @@ name = "Monstro" [[world]] name = "Hollow Bastion" +rooms = ["Entrance Hall", "Grand Hall"] [[world]] name = "End of the World" +rooms = ["World Terminus | Traverse Town"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/neoshadow.toml b/input/kh1/enemies/neoshadow.toml index 82d6c42..d395f3a 100644 --- a/input/kh1/enemies/neoshadow.toml +++ b/input/kh1/enemies/neoshadow.toml @@ -2,6 +2,7 @@ name = "Neoshadow" [[world]] name = "End of the World" +rooms = ["Linked Worlds"] [[drops]] name = "Stormy Stone" diff --git a/input/kh1/enemies/pirate.toml b/input/kh1/enemies/pirate.toml index b7a8736..6377560 100644 --- a/input/kh1/enemies/pirate.toml +++ b/input/kh1/enemies/pirate.toml @@ -9,6 +9,7 @@ name = "Monstro" [[world]] name = "End of the World" +rooms = ["World Terminus | Neverland"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/powerwild.toml b/input/kh1/enemies/powerwild.toml index 8723a59..3b86ab0 100644 --- a/input/kh1/enemies/powerwild.toml +++ b/input/kh1/enemies/powerwild.toml @@ -2,6 +2,7 @@ name = "Powerwild" [[world]] name = "Deep Jungle" +rooms = ["Camp", "Cliff"] [[world]] name = "Monstro" @@ -9,6 +10,7 @@ rooms = ["Chamber 5", "Chamber 6"] [[world]] name = "End of the World" +rooms = ["World Terminus | Deep Jungle"] [[drops]] name = "Potion" diff --git a/input/kh1/enemies/red-nocturne.toml b/input/kh1/enemies/red-nocturne.toml index bbd1151..e7530dc 100644 --- a/input/kh1/enemies/red-nocturne.toml +++ b/input/kh1/enemies/red-nocturne.toml @@ -4,8 +4,13 @@ name = "Red Nocturne" name = "Monstro" rooms = ["Chamber 6"] +[[world]] +name = "Hollow Bastion" +rooms = ["Castle Gates"] + [[world]] name = "End of the World" +rooms = ["World Terminus | Wonderland"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/screwdiver.toml b/input/kh1/enemies/screwdiver.toml index 1881950..af6f12f 100644 --- a/input/kh1/enemies/screwdiver.toml +++ b/input/kh1/enemies/screwdiver.toml @@ -5,6 +5,7 @@ name = "Atlantica" [[world]] name = "End of the World" +rooms = ["World Terminus | Atlantica"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/sea-neon.toml b/input/kh1/enemies/sea-neon.toml index 876f314..992878f 100644 --- a/input/kh1/enemies/sea-neon.toml +++ b/input/kh1/enemies/sea-neon.toml @@ -5,6 +5,7 @@ name = "Atlantica" [[world]] name = "End of the World" +rooms = ["World Terminus | Atlantica"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/search-ghost.toml b/input/kh1/enemies/search-ghost.toml index fc81fcf..6edff59 100644 --- a/input/kh1/enemies/search-ghost.toml +++ b/input/kh1/enemies/search-ghost.toml @@ -8,12 +8,14 @@ name = "Monstro" [[world]] name = "Traverse Town" +rooms = ["2nd District"] [[world]] name = "Atlantica" [[world]] name = "End of the World" +rooms = ["World Terminus | Halloween Town"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/sheltering-zone.toml b/input/kh1/enemies/sheltering-zone.toml index 5fb8760..8cc96b0 100644 --- a/input/kh1/enemies/sheltering-zone.toml +++ b/input/kh1/enemies/sheltering-zone.toml @@ -5,6 +5,7 @@ name = "Atlantica" [[world]] name = "End of the World" +rooms = ["World Terminus | Atlantica"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/sniperwild.toml b/input/kh1/enemies/sniperwild.toml index 21442b4..50c4bb5 100644 --- a/input/kh1/enemies/sniperwild.toml +++ b/input/kh1/enemies/sniperwild.toml @@ -2,6 +2,7 @@ name = "Sniperwild" [[world]] name = "Traverse Town" +rooms = ["2nd District"] [[drops]] name = "Power Stone" diff --git a/input/kh1/enemies/soldier.toml b/input/kh1/enemies/soldier.toml index 33b8ed4..0c709e2 100644 --- a/input/kh1/enemies/soldier.toml +++ b/input/kh1/enemies/soldier.toml @@ -4,6 +4,10 @@ name = "Soldier" name = "Agrabah" rooms = ["Main Street"] +[[world]] +name = "End of the World" +rooms = ["World Terminus | Traverse Town"] + [[drops]] name = "Spirit Shard" kind = "material" diff --git a/input/kh1/enemies/stealth-soldier.toml b/input/kh1/enemies/stealth-soldier.toml index e9bd2ce..1aa4651 100644 --- a/input/kh1/enemies/stealth-soldier.toml +++ b/input/kh1/enemies/stealth-soldier.toml @@ -2,6 +2,7 @@ name = "Stealth Soldier" [[world]] name = "Hollow Bastion" +rooms = ["Entrance Hall", "Grand Hall"] [[drops]] name = "Energy Stone" diff --git a/input/kh1/enemies/wight-knight.toml b/input/kh1/enemies/wight-knight.toml index db93b69..4564aaf 100644 --- a/input/kh1/enemies/wight-knight.toml +++ b/input/kh1/enemies/wight-knight.toml @@ -1,10 +1,12 @@ name = "Wight Knight" [[world]] -name = "Holloween Town" +name = "Halloween Town" +rooms = ["Graveyard", "Manor Ruins"] [[world]] name = "End of the World" +rooms = ["World Terminus | Halloween Town"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/wizard.toml b/input/kh1/enemies/wizard.toml index c1c1932..ba0c77c 100644 --- a/input/kh1/enemies/wizard.toml +++ b/input/kh1/enemies/wizard.toml @@ -5,18 +5,25 @@ name = "Holloween Town" [[world]] name = "Traverse Town" +rooms = ["Alleyway", "Hotel Hallway"] [[world]] name = "Wonderland" [[world]] name = "Deep Jungle" +rooms = ["Camp", "Bamboo Thicket"] [[world]] name = "Agrabah" +[[world]] +name = "Hollow Bastion" +rooms = ["Castle Gates", "Entrance Hall", "Grand Hall"] + [[world]] name = "End of the World" +rooms = ["World Terminus | Wonderland"] [[drops]] name = "Ether" diff --git a/input/kh1/enemies/wyvern.toml b/input/kh1/enemies/wyvern.toml index 8590142..4a9ca59 100644 --- a/input/kh1/enemies/wyvern.toml +++ b/input/kh1/enemies/wyvern.toml @@ -5,15 +5,18 @@ name = "Hollow Bastion" [[world]] name = "Traverse Town" +rooms = ["2nd District"] [[world]] name = "Deep Jungle" +rooms = ["Camp", "Cliff"] [[world]] name = "Agrabah" [[world]] name = "End of the World" +rooms = ["World Terminus | Olympus Coliseum"] [[drops]] name = "Hi-Potion" diff --git a/input/kh1/enemies/yellow-opera.toml b/input/kh1/enemies/yellow-opera.toml index 3c718b7..55f32fc 100644 --- a/input/kh1/enemies/yellow-opera.toml +++ b/input/kh1/enemies/yellow-opera.toml @@ -4,7 +4,8 @@ name = "Yellow Opera" name = "Traverse Town" [[world]] -name = "Neverland" +name = "Wonderland" +rooms = ["Lotus Forest"] [[world]] name = "Agrabah" @@ -17,6 +18,7 @@ name = "Monstro" [[world]] name = "End of the World" +rooms = ["World Terminus | Wonderland"] [[drops]] name = "Ether" diff --git a/public/assets/materials/evanescent/crystal.webp b/public/assets/materials/evanescent/crystal.webp new file mode 100644 index 0000000..df553fe Binary files /dev/null and b/public/assets/materials/evanescent/crystal.webp differ diff --git a/public/assets/materials/sinister/crystal.webp b/public/assets/materials/sinister/crystal.webp new file mode 100644 index 0000000..04ebc62 Binary files /dev/null and b/public/assets/materials/sinister/crystal.webp differ diff --git a/public/assets/materials/sinister/gem.webp b/public/assets/materials/sinister/gem.webp new file mode 100644 index 0000000..a9a3baa Binary files /dev/null and b/public/assets/materials/sinister/gem.webp differ diff --git a/public/assets/materials/sinister/shard.webp b/public/assets/materials/sinister/shard.webp new file mode 100644 index 0000000..82c9d97 Binary files /dev/null and b/public/assets/materials/sinister/shard.webp differ diff --git a/public/assets/materials/sinister/stone.webp b/public/assets/materials/sinister/stone.webp new file mode 100644 index 0000000..277421e Binary files /dev/null and b/public/assets/materials/sinister/stone.webp differ diff --git a/public/assets/worlds/agrabah.webp b/public/assets/worlds/agrabah.webp new file mode 100644 index 0000000..9bfbb06 Binary files /dev/null and b/public/assets/worlds/agrabah.webp differ diff --git a/public/assets/worlds/atlantica.webp b/public/assets/worlds/atlantica.webp new file mode 100644 index 0000000..2ec6fd6 Binary files /dev/null and b/public/assets/worlds/atlantica.webp differ diff --git a/public/assets/worlds/deep-jungle.webp b/public/assets/worlds/deep-jungle.webp new file mode 100644 index 0000000..e2d5538 Binary files /dev/null and b/public/assets/worlds/deep-jungle.webp differ diff --git a/public/assets/worlds/end-of-the-world.webp b/public/assets/worlds/end-of-the-world.webp new file mode 100644 index 0000000..3c73ae3 Binary files /dev/null and b/public/assets/worlds/end-of-the-world.webp differ diff --git a/public/assets/worlds/halloween-town.webp b/public/assets/worlds/halloween-town.webp new file mode 100644 index 0000000..acb7e94 Binary files /dev/null and b/public/assets/worlds/halloween-town.webp differ diff --git a/public/assets/worlds/hollow-bastion.webp b/public/assets/worlds/hollow-bastion.webp new file mode 100644 index 0000000..a9d142f Binary files /dev/null and b/public/assets/worlds/hollow-bastion.webp differ diff --git a/public/assets/worlds/monstro.webp b/public/assets/worlds/monstro.webp new file mode 100644 index 0000000..140c421 Binary files /dev/null and b/public/assets/worlds/monstro.webp differ diff --git a/public/assets/worlds/neverland.webp b/public/assets/worlds/neverland.webp new file mode 100644 index 0000000..97367bb Binary files /dev/null and b/public/assets/worlds/neverland.webp differ diff --git a/public/assets/worlds/traverse-town.webp b/public/assets/worlds/traverse-town.webp new file mode 100644 index 0000000..487366b Binary files /dev/null and b/public/assets/worlds/traverse-town.webp differ diff --git a/public/assets/worlds/wonderland.webp b/public/assets/worlds/wonderland.webp new file mode 100644 index 0000000..0318398 Binary files /dev/null and b/public/assets/worlds/wonderland.webp differ diff --git a/public/scripts/common/enemy-worlds.js b/public/scripts/common/enemy-worlds.js index ac9a923..5ef6b09 100644 --- a/public/scripts/common/enemy-worlds.js +++ b/public/scripts/common/enemy-worlds.js @@ -14,26 +14,35 @@ function toggleWorldDisplay(display) { const enemyWorlds = display.querySelector(".worlds"); const worldsWrapper = display.querySelectorAll(".worlds > div"); - const worldsIcons = display.querySelectorAll(".worlds > div > img"); + const worldsIcons = display.querySelectorAll(".worlds > div > .icon"); + const worldsNames = display.querySelectorAll(".worlds > div > .info"); if (!showWorlds) { enemyWorlds.style.width = "32px"; for (const wrapper of worldsWrapper) { wrapper.style.height = "32px"; + wrapper.style["margin-bottom"] = "16px"; } for (const icon of worldsIcons) { icon.width = "32"; icon.height = "32"; } + for (const name of worldsNames) { + name.style.display = "none"; + } } else { enemyWorlds.style.width = "256px"; for (const wrapper of worldsWrapper) { wrapper.style.height = "auto"; + wrapper.style["margin-bottom"] = "0px"; } for (const icon of worldsIcons) { icon.width = "64"; icon.height = "64"; } + for (const name of worldsNames) { + name.style.display = "block"; + } } display.dataset["showWorlds"] = !showWorlds; diff --git a/public/styles/common/drops.css b/public/styles/common/drops.css index 08006ad..1b22f71 100644 --- a/public/styles/common/drops.css +++ b/public/styles/common/drops.css @@ -55,14 +55,32 @@ overflow-x: hidden; overflow-y: auto; + :first-child { + margin-top: 16px; + } + div { display: inline-flex; margin-bottom: 16px; font-size: 14px; align-items: center; - p { + .icon { + background-repeat: no-repeat; + background-position: center; + background-size: contain; + width: 64px; + height: 64px; + } + + .info { margin-left: 8px; + margin-bottom: 0px; + + ul { + padding-left: 24px; + margin-bottom: 0; + } } } } diff --git a/templates/macros/common/macros.html b/templates/macros/common/macros.html index 993020e..f28a43e 100644 --- a/templates/macros/common/macros.html +++ b/templates/macros/common/macros.html @@ -27,29 +27,20 @@
{% for spawn in drop.spawns %} - {% if spawn.rooms.len() > 0 %} - {% for room in spawn.rooms %} -
- -

- {{ spawn.name +}} - {{+ room }} -

-
- {% endfor %} - {% else %} -
- +
+
+

{{ spawn.name }}

+
    + {% for room in spawn.rooms %} +
  • {{+ room }}
    • + {% endfor %} +
- {% endif %} +
{% endfor %}