fixes #141, adds prebuild hints for jenka and numahachi

pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt

@@ -20,52 +20,12 @@
 I've never seen you
 around before.<NOD
 If you bring me my
-five <GIT1014=Puppies=,
-perhaps I'll give you
-something in return...<NOD<END
+five <GIT1014=Puppies=,<NOD<CLR<EVE0201
 
 #0201
-<IT-0014
-<FLJ0594:0224
-<FLJ0593:0223
-<FLJ0592:0222
-<FLJ0591:0221
-<FLJ0590:0220
-<KEY<MSG<FAC0013Oh, my!<NOD<CLR<GIT1014My precious puppy!<NOD<CLR
-<GIT0000<FAC0000Gave her the =Puppy=.<NOD<CLR<CNP0300:0130:0000<DNP0401<FL-0274<FAC0013You brought him back,
-I take it?<NOD
-Many thanks.<NOD<CLRWhat's that?<NOD
-=Red flowers=?<NOD<FAC0000<CLR<CMU0000<MSGHuzzah!<NOD<CLO
-<CNP0400:0009:0000<WAI0010<MYD0002<CNP0300:0132:0002<ANP0300:0100:0002<WAI0120<CMU0011
-<CNP0400:0012:0000
-<MSG<FAC0005How's it going, Jenka?<NOD<CLR<FAC0013Ah, Balrog.<NOD<ANP0300:0120:0002
-You're doing well, I see.<NOD
-And how is my halfwit of
-a daughter faring?<NOD<CLR<FAC0014Hee-hee-hee!<NOD
-Halfwit? You mean Misery?<NOD
-She's fine, just fine.<NOD<CLRA new master has appeared.<NOD
-This time, the earth
-will be ours!<NOD<CLR<FAC0013So once again you two
-plot to...<NOD<CLR<FAC0005I'm not here to give
-you any trouble.<NOD
-I just came to collect the
-key to the storehouse.<NOD<CLRThe one where the flower
-seeds are kept!<NOD<CLR<FAC0013.....<NOD<CLRMy...<NOD
-What on earth are you
-talking about?<NOD<CLR
-<ANP0400:0030:0000<FAC0014Hoho!<NOD<CLRPlaying the fool, are
-you?!<NOD<CLR<FAC0005.....<NOD<CLRI see how it is.<NOD
-So you've chosen to
-betray us.<NOD<CLO<CMU0000
-<WAI0050<FAC0005<MSGYou'll regret it.<NOD<CLO
-<FAC0000<ANP0400:0010:0000<WAI0200<CMU0019
-<MSG<FAC0013<CNP0300:0130:0000A new master...<NOD
-That good-for-nothing.<NOD<MYD0200<CLR.....<NOD<CLRThere are actually four
-others.<NOD
-Four more puppies
-of mine...<NOD<CLRAnd my hips are so weak.<NOD<CLRCould this old woman
-trouble you to find her
-other puppies for her?<NOD<FL+0590<END
+<EVE0000
+
+
 
 #0210
 <KEY<MSG<FAC0013Still four left...<NOD

pre-edited-cs/data/Stage/ScriptSource/Statue.txt

@@ -65,5 +65,12 @@
 
 
 #0300
+<KEY<MSG.....<NOD<EVE0301
+#0301
+<EVE0000
+#0302
+<EVE0000
+#0303
 <KEY<MSG.....<NOD<END
 
+

pre-edited-cs/data/Stage/Statue.tsc

@@ -1 +1 @@
-?<Ubbkb?<n€snu‡bbbbnxs{bbbbnw€v?<Ubbkc?<n€snu‡bbbbnxs{bbbcnw€v?<Ubbkd?<n€s?<ns€‚bdbblbbbblbbfb?<ns€‚bdbclbbbblbbeb?<ns€‚bdbdlbbbblbbdb?<nx~|cgeflbbkg?<ns€‚bdbelbbbblbbbb?<nu‡bbbbnxs{bbbdnw€v?<Ubbke?<n€snu‡bbbbnxs{bbbenw€v?<Ubbkf?<n€snu‡bbbbnxs{bbbfnw€v?<Ubbkg?<ns€‚bdbelbbbblbbcbn‰s{bbbc?<ns€‚bdbblbbcblbbfb?<ns€‚bdbclbbcblbbeb?<ns€‚bdbdlbbcblbbdb?<ns€‚bdbelbbcblbbcb?<nxs{bbbdnw€v?<Ubcbb?<n}w‹n…<6E>‡bbccns€‚bcbblbbbblbbbd?<nxs<78>bbbbnx~|cgeflbcbc?<nu‡bbdfn†„sbbjflbbkblbbcklbb2c?<Ubcbc?<n†„sbbjglbbkhlbbcklbbdc?<Ubdbb?<Ubdbc?<Ubdbd?<Ubdbe?<Ubdcb?<n}w‹nx~|cgkblbddbn…yn†‡„?<ŤRz“ž–“RŹn€<6E>vnw€v?<Ubdcc?<n}w‹nx~|cgkclbddcn…yn†‡„?<ŤRs  “•š˘ˇ “—RŹn€<6E>vnw€v?<Ubdcd?<n}w‹nx~|cgkdlbdddn…yn†‡„?<ŤR›“ť›–RŹn€<6E>vnw€v?<Ubdce?<n}w‹nx~|cgkelbdden…yn†‡„?<ŤRx§«§š›ťˇRv“¦—RŹn€<6E>vnw€v?<Ubddb?<n}w‹n…yn†‡„?<ŤR<C5A4>§ˇ¦—RŹn€<6E>vnw€v?<Ubddc?<n}w‹n…yn†‡„?<ŤR†ˇ¤ˇťˇRŹn€<6E>vnw€v?<Ubddd?<n}w‹n…yn†‡„?<ŤR}› ™RŹn€<6E>vnw€v?<Ubdde?<n}w‹n…yn†‡„?<ŤRu§¤ž«Rt¤“•—RŹn€<6E>vnw€v?<Ubebb?<n}w‹n…y`````n€<6E>vnw€v
+0==F=IZ[NIPZb====ISNV====IR[Q0==F>IZ[NIPZb====ISNV===>IR[Q0==F?IZ[NIN[]=?==G====G==A=IN[]=?=>G====G==@=IN[]=?=?G====G==?=ISYW>B@AG==FBIN[]=?=@G====G====IPZb====ISNV===?IR[Q0==F@IZ[NIPZb====ISNV===@IR[Q0==FAIZ[NIPZb====ISNV===AIR[Q0==FBIN[]=?=@G====G==>=IdNV===>IN[]=?==G==>=G==A=IN[]=?=>G==>=G==@=IN[]=?=?G==>=G==?=IN[]=?=@G==>=G==>=ISNV===?IR[Q0=>==IXRfI`\b==>>IN[]=>==G====G===?ISN\====ISYW>B@AG=>=>IPZb==?AIa_N==EAG==F=G==>FG==?>0=>=>Ia_N==EBG==FCG==>FG==?>
0=?==0=?=>0=?=?0=?=@0=?>=IXRfISYW>BF=G=??=IZ`TIab_h-Unyqn-jI[\QIR[Q0=?>>IXRfISYW>BF>G=??>IZ`TIab_h-N{{npu}|{nr-jI[\QIR[Q0=?>?IXRfISYW>BF?G=???IZ`TIab_h-Zvnxvq-jI[\QIR[Q0=?>@IXRfISYW>BF@G=??@IZ`TIab_h-S‚†‚uvx|-Qn<51>r-jI[\QIR[Q0=??=IXRfIZ`TIab_h-^‚|<7C>r-jI[\QIR[Q0=??>IXRfIZ`TIab_h-a||x|-jI[\QIR[Q0=???IXRfIZ`TIab_h-Xv{t-jI[\QIR[Q0=??@IXRfIZ`TIab_h-P‚y†-Onpr-jI[\QIR[Q0=@==IXRfIZ`T;;;;;I[\QIRcR=@=>0=@=>IRcR====0=@=?IRcR====0=@=@IXRfIZ`T;;;;;I[\QIR[Q

src/database/world_graph.lua

@@ -245,6 +245,8 @@ function lowerSandZone:new(worldGraph)
     return _count(items, "puppy", 5) and _has(items, "weaponBoss")
   end
   self.locations.eventToroko:setItem(self.world.items:getByKey("eventToroko"))
+
+  self.locations.jenka.getPrebuiltHint = function(self) return ("perhaps I'll give you %s in return..."):format(self.item.hints[love.math.random(#self.item.hints)]) end
 end
 
 local labyrinthW = Region:extend()
@@ -447,6 +449,13 @@ function endgame:new(worldGraph)
     hellB3 = Location("Hell B3 Chest", "Hell3", "0400", self)
   }
 
+  local function prebuilt(self)
+    local s = self.item.hints[love.math.random(#self.item.hints)]
+    return ("%s."):format(s:sub(1,1):upper() .. s:sub(2)) -- make first character uppercase
+  end
+  self.locations.hellB1.getPrebuiltHint = prebuilt
+  self.locations.hellB3.getPrebuiltHint = prebuilt
+
   self.requirements = function(self, items)
     return _has(items, "eventSue") and _has(items, "ironBond") and self.world.regions.lastCave:canAccess(items)
   end
@@ -466,12 +475,18 @@ function hintRegion:new(worldGraph)
     bluebotMaze = Location("Blue Robot (Labyrinth I #1)", "MazeI", "0500", self),
     bluebotMaze2 = Location("Blue Robot (Labyrinth I #2)", "MazeI", "0502", self),
     mrsLittle = Location("Mrs. Little", "Little", "0212", self),
-    malco = Location("MALCO", "Malco", "0306", self)
+    malco = Location("MALCO", "Malco", "0306", self),
+    jenka = Location("Jenka", "Jenka1", "0201", self),
+    numahachi1 = Location("Numahachi 1", "Statue", "0300", self),
+    numahachi2 = Location("Numahachi 2", "Statue", "0301", self)
   }
 
   -- they'll appear as filled so they get left out of the regular hints
   self.locations.mrsLittle.item = {}
   self.locations.malco.item = {}
+  self.locations.jenka.item = {}
+  self.locations.numahachi1.item = {}
+  self.locations.numahachi2.item = {}
 end
 
 local worldGraph = Class:extend()

src/randomizer.lua

@@ -253,6 +253,9 @@ function C:_generateHints()
   end
   self.worldGraph.hintregion.locations.mrsLittle.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.outerWall.locations.littleHouse)
   self.worldGraph.hintregion.locations.malco.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.grasstownEast.locations.malco)
+  self.worldGraph.hintregion.locations.numahachi1.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.endgame.locations.hellB1, "<CLR<EVE0302")
+  self.worldGraph.hintregion.locations.numahachi2.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.endgame.locations.hellB3, "<CLR<EVE0303")
+  self.worldGraph.hintregion.locations.jenka.item = self.worldGraph.items:prebuiltHint(self.worldGraph.regions.lowerSandZone.locations.jenka)
 end
 
 function C:_writeModifiedData(tscFiles)