diff --git a/pre-edited-cs/data/Stage/Jenka1.tsc b/pre-edited-cs/data/Stage/Jenka1.tsc index f7896e8..dc9ab88 100644 --- a/pre-edited-cs/data/Stage/Jenka1.tsc +++ b/pre-edited-cs/data/Stage/Jenka1.tsc @@ -1 +1 @@ -{x{xÞ{x{xÞ{x{xÞ{x{xÞ{x{xÞ{x{xÞ{x{xǪݎӎ㜜{xӎ܎{xҎӜ{xԎՎӎ{xӎŸ᫚{xᎷڎӎ{xՎ܎ܜ{x{x›{x{x{x{x{x{xǪ֚珪Ÿ珪{xžӎӎ竜ێٚ{xӎ⭪{xᜪ⭪{xҎ᫭Þ֏{xůDzůÞ{x{x՚ϭ֚՜{xӎՎښӜ{xҎ{xώխӛӛӏ{x⭎܎筪{xӕӚӜҜ{xӚӎ{xڎӎᏪݎӎ܎{xݜێӎݎ{xӜ{xӎݎ{xݎӎӜӎӎӎӎ{xӎ⏪眜{x܎֎ӎ{xՎ⭪{xݏՎӎښ{x㭏ӎᜪ{xݎӎ܎{xᜪÞ{xůڎ✪{xůÞ{x{xқ՜Dzӎӎ{xᜪ{xӎ{xԎӜҎӎݎٜҎҎ{xӎݎҎ{x୪{x{xǪڎ✜{xҎҎ{xӎݎҎ{x୪{x{xǪӎӎ✪{xҎٜ{x{xǪَ{xӎ܎ώ{xݎ㜪ݎӎݎݜ{x{xǪӎӎݎݜ{x֎{x܎ӎҎᜪ{x{xǪ皎ٜŸҎnӎ{xᜪ{xžӎӎ竜ۜ{xӎώ{xӎӚܕ㜪ܕՎݎ{xԎ{xӎݎҜ{xᎻ{xᜪ{xҎӎ{xҎݎۜҚӎ{xҎ{x܎Ҏᚪ{xҎ܎{xӎ܎ݎ{xَӎᜪҎӎҎ{xҚӎ{xӎҎ窼{xێӎҜӎӎ✪Ҏٜ{x{xǪ֜Ÿᚎᜪ{xӎ{xՎᜪ{xžӎӎ竜َ{xӕӎގݎӎ圜ӎ܎{xҎϭӎҎ{xӎҎ{xҎێ֜{xӎۚҎ{xӎᜪ{xݎ{xҎݎ{x᭪ώҎӜ{xӎҎ{xӎݎ{x܎ᚪ{xҎ{xӜ{xԎӎݎ{xҚ{xݎӎӚ{xӎӜ܎Ԏ{xҎ{xӎ֜{xԎӎӜݎҎ孪{xݎҎ{xӎ{xӭݎӎݎݜ{x{xǪێݎ{xӎ㜪{xܕ{x܎{xҎᜪŸ᜜{xžӎӎ竜{xӎ{xӎ皎ܕ{x㜪{x܎ӎӎ{xӎҎ᜜ܕӎݎ{xӚӎ{xӎ眪{xݎ܎ӎ{xҎӎ{xڎܜӚݚӜӕ{x✪{x{x{x{x{x{x{x{x{x{x{x{xǪԏ{x{xǪԎԏ{x{xǪԎԎԏ{x{xǪޜ{x{xǪӏ{x{x \ No newline at end of file +=:S``i`=:l}~qls}``ailvqy````lu~t=:S``ia=:l}~qls}``ailvqy```alu~t=:S``ib=:l}~qls}``ailvqy```blu~t=:S``ic=:l}~qls}``ailvqy```clu~t=:S``id=:l}~qls}``ailvqy```dlu~t=:S`a``=:lyl``aalt~`a``lvq```dlq``a`j``idj``cej``bf=:S`b``=:l{ul}wlvqs``acPP^^^ol~t=:yWPPP=:P^l~t=:yPPPP=:Plwya`admm\l~tls|luu`b`a=:S`b`a=:luu````=:S`ba`=:l{ul}wlvqs``acPP^^^l~t=:sPPP=:PPPP=:PPPol~tlu~t=:S`baa=:l{ul}wlvqs``acPP^l~t=:wP^l~tlu~t=:S`bab=:l{ul}wlvqs``acyPPP=:PPP=:P^l~tls|PPP^^^l~tlu~t=:S`bac=:l{ul}wlvqs``acPPP^^^l~t=:yPPPP=:PPP^l~tlu~t=:S`bb`=:l{ul}wlvqs``ac}P\PP^l~tls|lwya`adPPPP=:PP^l~tls|=:lwy````ls~`c`aj`ac`j````lt~`d`alvqs````wPPPmm^l~tls|lv|]`bgdlvqs``acx^^^l~t=:WPPP=:P\PWP^l~tls|^^^^^l~tls|yPWPPP=:PPP=:PPPP^l~t=:sP}P=:PP^l~t=:qPPPP=:PPP^l~tls|s\PP}=:PP=:PP\l~t=:PPP=:PPP=:PPP^l~tls|xPPPP=:\PP}P=:PPl~t=:PP^^^l~tls|PP^l~twP^l~tlv|[`eialu~t=:S`bba=:l{ul}wlvqs``ac^l~tls|lwya`ad\P^l~t=:PPPP=:PP^l~tls|=:lwy````ls~`c`bj`ac`j````lt~`d`alvqs0```wPPPmm^l~tls|lv|]`bgdlvqs``acPP^=:WPPPP^^^l~tls|^^^^^l~tls|xPPPP=:P}ol~tls|PP}P=:PPP=:PPP^l~t=:PP\PP=:PPP^l~tls|=:x^^^l~tls|tPPP=:PP=:ol~tls|^^^^^l~tls|yPPPP^^^l~t=:PP}\=:PPP=:PP\l~t=:PP=:^l~t=:yPPPP=:\PP=:PP\l~t=:PP^l~tls|qPPP=:}PP=:P^^^l~t=:yPPP^^^l~tls|tPPPol~t=:tPPP=:PP=:Pol~tls|^^^^^l~tls|PPP^^^l~tlv|[`eiblu~t=:S`bbb=:l{ul}wlvqs``acPPP=:P^l~t=:}PPWP=:PP=:P^l~tls|lwya`ad}P^^^l~tls|=:lwy````lvqs````wPPPmm^l~tls|ls~`c`cj`ac`j````lt~`d`alv|]`bgd=:lvqs``ac^^^^^l~tls|WPP=:P\PW=:^l~t=:PPPP=:PP^^^l~tls|yPWPPP=:\PWPP=:P^l~t=:PPP=:PPP=:PPP^^^l~tls|\P\P^^^l~tls|WPP=:^l~tlv|[`eiclu~t=:S`c``=:lv|z`ei`j`ca`lu~t=:S`c`a=:lv|z`eiaj`caalu~t=:S`c`b=:lv|z`eibj`cablu~t=:S`c`c=:lv|z`eicj`caclu~t=:S`c`d=:lv|z`eidj`cadlu~t=:S`ca`=:l{ul}wqQl~tlu~t=:S`caa=:l{ul}wqPQl~tlu~t=:S`cab=:l{ul}wqPPQl~tlu~t=:S`cac=:l{ul}wr^l~tlu~t=:S`cad=:l{ul}wvQl~tlu~t=:S`d``=:S`d`a \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt b/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt index bcd5568..0635a49 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Jenka1.txt @@ -20,52 +20,12 @@ I've never seen you around before.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-Suvx|-Qnr-jI[\QIR[Q0=??=IXRfIZ`TIab_h-^|r-jI[\QIR[Q0=??>IXRfIZ`TIab_h-a||x|-jI[\QIR[Q0=???IXRfIZ`TIab_h-Xv{t-jI[\QIR[Q0=??@IXRfIZ`TIab_h-Py-Onpr-jI[\QIR[Q0=@==IXRfIZ`T;;;;;I[\QIRcR=@=>0=@=>IRcR====0=@=?IRcR====0=@=@IXRfIZ`T;;;;;I[\QIR[Q \ No newline at end of file diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index dd125ae..6d34754 100644 --- a/src/database/world_graph.lua +++ b/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() diff --git a/src/randomizer.lua b/src/randomizer.lua index ade050c..7c0c19d 100644 --- a/src/randomizer.lua +++ b/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, "