From 1fac09e2b632860122953e1c420df4ba2f4dd791 Mon Sep 17 00:00:00 2001
From: shru <toromi@protonmail.com>
Date: Sat, 15 Dec 2018 13:53:12 -0500
Subject: [PATCH] Added all Life Capsules, except the ones which will require
 label-aware replacement.

---
 .gitignore             |   1 +
 src/database/items.lua | 112 ++++++++++++++++++++++++++++++-----------
 src/main.lua           |   5 +-
 src/tsc_file.lua       |   4 +-
 4 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 60baa9c..772e1fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 data/*
+notes/*
diff --git a/src/database/items.lua b/src/database/items.lua
index b8d0d7c..e05470a 100644
--- a/src/database/items.lua
+++ b/src/database/items.lua
@@ -17,8 +17,10 @@ function lifeCapsule(t)
     name = ("Life Capsule (+%d)"):format(t.hp),
     map = t.map,
     getText = {
+      -- Replacement string. Does not literally appear in game.
       ("Got a =Life Capsule=!<WAI0160<NOD\n\r Max health increased by %d!"):format(t.hp),
       "Got a =Life Capsule=!<WAI0160<NOD", -- erase the extra wait for most things.
+      "Got a =Life Capsule=!<NOD", -- Hell1 capsule does not have waiting period for some reason.
     },
     command = ("<ML+000%d"):format(t.hp),
     displayCmd = "<GIT1006",
@@ -50,48 +52,68 @@ return {
   lFirstCave = lifeCapsule({
     hp = 3,
     map = "Cave",
+    label = "????"
   }),
   lYamashitaFarm = lifeCapsule({
     hp = 3,
     map = "Plant",
+    label = "????"
   }),
   lEggCorridorA = lifeCapsule({
     hp = 3,
     map = "Eggs",
+    label = "????"
   }),
   -- !!!! Can't randomize this one until I do some label-aware shit !!!!
-  -- Egg Corridor: Go through Cthulhu's Abode and out the top door. +4 HP.
+  -- [Egg Corridor] Go through Cthulhu's Abode and out the top door. +4 HP.
   -- lEggCorridorB = lifeCapsule({
   --   hp = 4,
-  --   map = "Plant",
+  --   map = "Eggs",
   -- }),
-
-  -- Bushlands: Just past where you found Santa's Key, go east to a set of two
-  -- horizontal rows of star blocks, jump on them and to the left.  +5 HP.
-
-  -- Bushlands: In the Execution Chamber, the tall building with the skull on it
-  -- to the right of Kazuma's shack.  +5 HP.
-
-  -- Sand Zone: East of Curly's House and past the Sun Stones, it's in the top of
-  -- the first thick pillar made up of star blocks.  Try not to blow up all the star
-  -- blocks when fighting the Polishes to create a path and reach it.  +5 HP.
-
-  -- Sand Zone: At the end of the hidden path behind a pawpad block on the far
-  -- right wall between the Sun Stones and Jenka's house, behind a line of star
-  -- blocks.  Found next to a chest containing one of Jenka's dogs.  +5 HP.
-
-  -- Labyrinth: Nestled next to the left wall of the first room of the labyrinth
-  -- when you're sent there, a ways up into the room.  +5 HP.
-
-  -- Plantation: Sitting on a platform hanging from the far upper-left ceiling.
-  -- +4 HP.
-
-  -- Plantation: Talk to the puppy that appears on the left platform just under
-  -- the red skull signs on the top right section of the Plantation after Momorin's
-  -- finished the rocket.  +5 HP.
-
-  -- Sanctuary: Bonus life capsule.  Found in plain sight as you make your
-  -- initial descent.  +5 HP.
+  lGrasstown = lifeCapsule({
+    hp = 5,
+    map = "Weed",
+    label = "????"
+  }),
+  lGrasstownExecution = lifeCapsule({
+    hp = 5,
+    map = "WeedD",
+    label = "????"
+  }),
+  lSandZoneA = lifeCapsule({
+    hp = 5,
+    map = "Sand",
+    label = "0500"
+  }),
+  -- !!!! Can't randomize this one until I do some label-aware shit !!!!
+  -- [Sand Zone] At the end of the hidden path behind a pawpad block on the far right. +5 HP.
+  -- lSandZoneB = lifeCapsule({
+  --   hp = 4,
+  --   map = "Sand",
+  --   label = "0501"
+  -- }),
+  lLabyrinth = lifeCapsule({
+    hp = 5,
+    map = "MazeI",
+    label = "????"
+  }),
+  lPlantationA = lifeCapsule({
+    hp = 5,
+    map = "Cent",
+    label = "0450"
+  }),
+  -- !!!! Can't randomize this one until I do some label-aware shit !!!!
+  -- [Plantation] Sitting on a platform hanging from the far upper-left ceiling. +4 HP.
+  -- lPlantationB = lifeCapsule({
+  --   hp = 4,
+  --   map = "Cent",
+  --   label = "0500"
+  -- }),
+  lHell = lifeCapsule({
+    hp = 5,
+    map = "Hell1",
+    label = "0400"
+  }),
 
   -----------
   -- ITEMS --
@@ -131,6 +153,38 @@ Max health increased by 3!<NOD<END
 <MSG<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0003
 Max health increased by 3!<NOD<END
 
+#0305
+<PRI<DNP0305<SOU0022<CMU0016
+<MSG<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0005
+Max health increased by 5!<NOD<END
+
+#0304
+<PRI<DNP0304<SOU0022<CMU0016
+<MSG<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0005
+Max health increased by 5!<NOD<END
+
+#0300
+<PRI<SOU0022<DNP0300<CMU0016
+<MSG<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0005
+Max health increased by 5!<NOD<END
+
+#0450
+<PRI<FLJ1040:0451<FL+1040<MSGLong time no arf!<NOD<CLRI was told to bring this
+to you...<NOD<CLR<SOU0022<CMU0016<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0005
+Max health increased by 5!<NOD<GIT0000<ITJ0015:0451<CLROh, she said to give you
+this, too...<NOD<CLR
+<CMU0010<GIT1015<IT+0015<GIT1015Got a =Life Pot=!<WAI0160<NOD<GIT0000<RMU<EVE0451
+<END
+
+#0500
+<PRI<SOU0022<DNP0500<CMU0016
+<MSG<GIT1006Got a =Life Capsule=!<WAI0160<NOD<RMU<ML+0004
+Max health increased by 4!<NOD<END
+
+#0400
+<PRI<SOU0022<DNP0400
+<MSG<GIT1006Got a =Life Capsule=!<NOD<ML+0005
+Max health increased by 5!<NOD<END
 
 <KEY<DNP0420<MSG<GIT1035<IT+0035
 Found Curly's Panties.<NOD<END
diff --git a/src/main.lua b/src/main.lua
index 784f656..01514f6 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -60,8 +60,9 @@ function love.directorydropped(path)
   local ItemDeck = require 'item_deck'
   local itemDeck = ItemDeck()
 
-  -- Place random weapon in Hermit Gunsmith.
-  tscFiles['Pole.tsc']:replaceItem(itemDeck:getWeapon())
+  -- Place random weapon in either First Cave or Hermit Gunsmith.
+  local firstArea = _.sample({'Cave.tsc', 'Pole.tsc'})
+  tscFiles[firstArea]:replaceItem(itemDeck:getWeapon())
 
   -- Replace all items.
   for _, tscFile in pairs(tscFiles) do
diff --git a/src/tsc_file.lua b/src/tsc_file.lua
index 8d70324..32415c4 100644
--- a/src/tsc_file.lua
+++ b/src/tsc_file.lua
@@ -82,8 +82,8 @@ function C:_replaceAttribute(original, replacement, attribute)
     end
   end
 
-  local template = 'Unable to replace original "%s" for %s.'
-  logWarning(template:format(attribute, original.name))
+  local template = 'Unable to replace original "%s" for [%s] %s.'
+  logWarning(template:format(attribute, original.map, original.name))
 end
 
 function C:_stringReplace(text, needle, replacement)