Fix all remaining softlocks (I hope)

Also makes the air tank unequippable in the inventory, and moves
Prof. Booster's trigger to after the Core fight, as originally intended
This commit is contained in:
periwinkle 2019-07-10 16:57:27 -04:00
parent 811a1b73c4
commit d2eff12fee
9 changed files with 35 additions and 86 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,5 @@
#0000
<FRE<WAI9999<END
#1000
<MSG<TURNo weapon.<WAI9999<END
#1001
@ -44,7 +43,6 @@ For advanced players.<WAI9999<END
<MSG<TUR- Spur -
Hold down the button to
fire a laser.<WAI9999<END
#1100
<MSG<TURPuppy<WAI9999<END
#1101
@ -55,7 +53,6 @@ fire a laser.<WAI9999<END
<MSG<TURPuppies<WAI9999<END
#1104
<MSG<TURPuppies<WAI9999<END
#1200
<MSG<TURJenka's pet dog.<WAI9999<END
#1201
@ -66,7 +63,6 @@ fire a laser.<WAI9999<END
<MSG<TURJenka's pet dogs. You have found 4.<WAI9999<END
#1204
<MSG<TURJenka's pet dogs. You have found 5!<WAI9999<END
#5000
<MSG<TURNo item.<WAI9999<END
#5001
@ -152,7 +148,6 @@ fire a laser.<WAI9999<END
<MSG<TURWhimsical Star<WAI9999<END
#5039
<MSG<TURIron Bond<WAI9999<END
#6000
<MSG<TURNo item.<WAI9999<END
#6001
@ -160,7 +155,7 @@ fire a laser.<WAI9999<END
It was hidden near Arthur's
gravestone.<WAI9999<END
#6002
<PRI<EVE7002<MPJ7002<MSGNo data for this floor.<NOD<CLR<END
<PRI<EVE7002
#6003
<MSG<TURThe key to Santa's house.<WAI9999<END
#6004
@ -219,8 +214,12 @@ of weapon energy lost will be halved.<WAI9999<END
<MSG<TURIncreases the rate at which the
machine gun replenishes ammo.<WAI9999<END
#6021
<MSG<TURYou can breathe underwater with
this. Curly used to use it.<WAI9999<END
<FLJ2900:7021
<KEY<MSG<TURYou can breathe underwater with
this. Curly used to use it.<NOD<CLR
Do you want to equip it?
<YNJ0000<EQ+0016<FL+2900<MSG
Equipped Curly's Air Tank.<NOD<WAI0003<FRE<EVE5021
#6022
<MSG<TURA fully automatic stopwatch.
You can't see any buttons.<WAI9999<END
@ -289,7 +288,6 @@ Pride of Itoh, the cowardly man.<WAI9999<END
#6031
<MSG<TURSmall and profoundly heavy.
It has no use.<WAI9999<END
#6032
<MSG<TURHey! We there yet?<WAI9999<END
#6033
@ -319,26 +317,25 @@ Equipped the Whimsical Star.<NOD<WAI0003<FRE<EVE5038
<MSG<TURYour tie to Curly Brace, the only
warrior you would trust your back to.
Surely you will meet again one day...<WAI9999<END
#7002
<MLP<END
#7018
<KEY<MSGDo you want to remove it?
<YNJ0000<EQ-0001<FL-0742<MSG
Deequipped Booster v0.8.<NOD<WAI0003<FRE<EVE5018
#7021
<KEY<MSGDo you want to remove it?
<YNJ0000<EQ-0016<FL-2900<MSG
Deequipped Curly's Air Tank.<NOD<WAI0003<FRE<EVE5021
#7023
<KEY<MSGDo you want to remove it?
<YNJ0000<EQ-0032<FL-0743<MSG
Deequipped Booster v2.0.<NOD<WAI0003<FRE<EVE5023
#7024
<KEY<MSG<TURDo you want to remove it?
<YNJ0000<EQ-0064<FL-1020<MSG
Deequipped Mimiga Mask.<NOD<WAI0003<FRE<EVE5024
#7038
<KEY<MSGDo you want to remove it?
<YNJ0000<EQ-0128<FL-0722<MSG
Deequipped the Whimsical Star.<NOD<WAI0003<FRE<EVE5038

View file

@ -1,16 +1,13 @@
#0000
<END
#0001
<PRI<MSGEmpty.<NOD<END
#0002
<AMJ0002:0003<PRI<MSG<TUR<GIT0002<AM+0002:0000
Got the =Polar Star=!<WAI0025<NOD<END
#0003
<PRI<MSG<TUR<GIT0013<TAM0002:0013:0000
=Polar Star= became the =Spur=!<WAI0025<NOD<END
#0004
<PRI
<MSG<TUR<GIT0003
@ -25,15 +22,12 @@ Got the =Snake=!<WAI0025<NOD<CLR
<PRI<MSGYou may trade the =Fireball=
with the =Snake= and vice-versa
at the computer in Arthur's House.<WAI0050<NOD<FL+2802<END
#0007
<PRI<MSG<TUR<GIT0007<AM+0007:0100<FL+2820
Got the =Bubbler=!<WAI0025<NOD<END
#0008
<PRI<MSG<TUR<GIT0004<AM+0004:0100
Got the =Machine Gun=!<WAI0025<NOD<END
#0009
<PRI
<MSG<TUR<GIT0009
@ -48,7 +42,6 @@ Got the =Nemesis=!<WAI0025<NOD<CLR
<PRI<MSGYou may trade the =Nemesis=
with the =Blade= and vice-versa
at the computer in Arthur's House.<WAI0050<NOD<FL+2811<END
#0012
<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!<ML+0003
Max health increased by 3!<WAI0025<NOD<END
@ -58,11 +51,9 @@ Max health increased by 4!<WAI0025<NOD<END
#0014
<PRI<MSG<TUR<GIT1006Got a =Life Capsule=!<ML+0005
Max health increased by 5!<WAI0025<NOD<END
#0016
<PRI<MSG<TUR
Do you want to save?<YNJ0000<FL+0431<SVP<CLRGame saved.<NOD<END
#0017
<PRI<SAT<FLJ0201:0018
<LI+1000<SOU0020<AE+<MSG
@ -71,14 +62,12 @@ Health refilled.<NOD<END
<PRI
<LI+1000<SOU0020<AE+<MSG
Health and missiles refilled.<NOD<END
#0019
<KEY<MSG
Do you want to rest?<YNJ0000<FAO0004<CMU0000<WAI0020<CLR.....<NOD<CLO
<WAI0050
<LI+1000<SOU0020<MYD0002<MSG
Health restored.<NOD<CLO<RMU<FAI0004<END
#0020
<FL+0274<SNP0136:0000:0000:0000<IT+0014
<FLJ5004:0024<FLJ5003:0023<FLJ5002:0022<FLJ5001:0021<FL+5001
@ -96,7 +85,6 @@ Got a fourth =Puppy=!<WAI0025<NOD<END
#0024
<PRI<MSG<TUR<GIT1014<FL+5005<FL+0593
Got the last =Puppy=!<WAI0025<NOD<END
#0030
<PRI<FLJ2420:0032<FLJ0201:0031<FL+0201<AM+0005:0010<MSG<TUR
<GIT0005Got the =Missile Launcher=!<WAI0025<NOD<END
@ -120,31 +108,25 @@ Got the =Missile Launcher=!<WAI0025<NOD<END
<PRI<AM+0005:0024<MSG<TUR<GIT0006Max missiles increased by 24!<WAI0025<NOD<END
#0037
<PRI<AM+0010:0024<MSG<TUR<GIT0011Max missiles increased by 24!<WAI0025<NOD<END
#0040
<KEY<CMU0000<WAI0040<PRI<WAI0040<CMU0003
<MSG
You have died.<NOD<CLRWant to retry?<YNJ0049<CLO
<FAO0001<WAI0050<FLJ0431:0048<INI<END
<FAO0001<WAI0050<FLJ0431:0048<INI
#0041
<KEY<CMU0000<HMC<WAI0040<PRI<WAI0040<CMU0003
<MSG
You have drowned.<NOD<CLRWant to retry?<YNJ0049<CLO
<FAO0001<WAI0050<FLJ0431:0048<INI<END
<FAO0001<WAI0050<FLJ0431:0048<INI
#0042
<KEY<CMU0000<WAI0040<PRI<WAI0040<CMU0003
<MSG<HMC
You were never seen again...<NOD<CLRWant to retry?<YNJ0049<CLO
<FAO0001<WAI0050<FLJ0431:0048<INI<END
<FAO0001<WAI0050<FLJ0431:0048<INI
#0048
<SMC<LDP<END
<SMC<LDP
#0049
<CLO<FAO0004<ESC
#0051
<PRI<MSG<TUR<GIT1001<IT+0001
Got =Arthur's Key=!<WAI0025<NOD<END
@ -203,7 +185,7 @@ Got the =Arms Barrier=!<WAI0025<NOD<END
<PRI<MSG<TUR<GIT1020<IT+0020<EQ+0008
Got the =Turbocharge=!<WAI0025<NOD<END
#0071
<PRI<MSG<TUR<GIT1021<IT+0021<EQ+0016
<PRI<MSG<TUR<GIT1021<IT+0021<EQ+0016<FL+2900
Got =Curly's Air Tank=!<WAI0025<NOD<END
#0072
<PRI<MSG<TUR<GIT1022<IT+0022
@ -260,6 +242,3 @@ Got the =Whimsical Star=!<WAI0025<NOD<END
<PRI<MSG<TUR<GIT1039<IT+0039
Got the =Iron Bond=!<WAI0025<NOD<END
XX: head.tsc 4000 - 4099
4000:Almond<6E><64><EFBFBD><EFBFBD>

File diff suppressed because one or more lines are too long

View file

@ -9,7 +9,6 @@
<MNA<CMU0023<FAI0003<END
#0094
<MNA<CMU0023<FAI0004<END
#0097
<ANP0253:0020:0000<FAI0002<END
#0098
@ -18,15 +17,12 @@
<MNP0410:0001:0002:0000
<ANP0410:0000:0000
<FAI0002<END
#0100
<KEY<FLJ0839:0101
<SOU0011<ANP0100:0000:0002
<FAO0000<TRA0046:0090:0017:0009
#0101
<KEY<MSG<TURIt won't open...<NOD<END
#0200
<KEY<SAT
<FLJ0832:0204
@ -65,7 +61,6 @@ LIFT IS LOWERED<NOD<END
#0204
<KEY<MSG
ERROR<NOD<END
#0210
<KEY<SAT<FLJ0830:0212<FLJ0825:0211<MSG
OPEN SHUTTER?<YNJ0000<CLR<FL+0825
@ -79,9 +74,8 @@ SHUTTER OPENED<NOD<END
#0212
<KEY<MSG<TUR
ERROR<NOD<END
#0240
<PRI<FLJ0828:0241<DNP0240<FL+0839<EVE0243
<PRI<FLJ0828:0241<DNP0240<FLJ0830:0244<FL+0839<EVE0243
#0241
<PRI<MSG<TUR
...?<NOD<END
@ -90,7 +84,8 @@ ERROR<NOD<END
You can't get it loose...<NOD<END
#0243
<EVE0080
#0244
<EVE0243
#0250
#0251
#0252
@ -99,12 +94,9 @@ You can't get it loose...<NOD<END
#0255
<PRI<MSG<TURA broken robot.<NOD
It's severely damaged.<NOD<END
#0256
#0257
#0258
#0300
<KEY<MSG<FAC0019Weird place, eh?<NOD
I wonder if this was
@ -120,17 +112,12 @@ All this security makes
me wonder just what's down
here.<NOD
Don't you think?<NOD<END
#0304
<PRI<MSGI...<NOD<END
#0305
<PRI<MSGKnocked out?<NOD<END
#0306
<PRI<MSGThere is no reply...<NOD<ITJ0030:0307<END
#0307
<PRI<SAT<MSGShe isn't moving, but it looks
like she's still alive.<NOD<CLR
@ -138,7 +125,6 @@ like she's still alive.<NOD<CLR
<CNP0306:0259:0000
<FL+0835<FL+0836<FL-0829
<MSGTied the rope to her body.<NOD<END
#0340
<KEY<DNP0340<WAI0010<SOU0022<WAI0010
<MSG<TURYou hear something give.<NOD<CLO<WAI0050<ANP0253:0010:0001
@ -146,7 +132,6 @@ like she's still alive.<NOD<CLR
<ANP0301:0003:0002<WAI0128
<ANP0301:0001:0002
<FL-0822<FL+0823<FL+0826<END
#0350
<FLJ0825:0351<END
#0351
@ -155,17 +140,14 @@ like she's still alive.<NOD<CLR
<DNP0302
<FL-0822<FL-0826<FL+0827
<CNP0450:0117:0002<END
#0360
<FLJ0830:0361<END
#0361
<KEY<DNP0360<CMU0023<END
#0400
#0401
#0402
#0410
#0450
<KEY<SKJ0006:0451<SK+0006<EVE0452
#0451
@ -204,14 +186,8 @@ RETREAT!!<NOD<CLO
<DNP0500<BOA0200<CMU0022<BSL0000
<CNP0450:0180:0002<ANP0450:0040:0002
<ANP0410:0020:0000<END
#0500
<DNP0500<BOA0200<CMU0022<BSL0000<END
#1000
<KEY<BOA0500
<MYD0401<FL-0828
@ -235,29 +211,25 @@ laboratory at once!<NOD<CLO<FAC0000
<ANP0450:0020:0002<DNA0181<DNA0182
<CMP0040:0015:0047<CMP0040:0016:0047
<WAI0100<CMU0000<FOM0016
<FL+4000<FL+0832<FL+0341<FL+0783<FL+0837<EQ-0016<END
<FL+4000<FL+0832<FL+0341<FL+0783<FL+0837<EQ-0016<FL-2900<END
#1100
<KEY<FL-4000<FAO0004<WAI0050
<MSG<TURYour senses dim, and the world
grows dark...<NOD<CLO
<DNP0450
<FL+0160
<FL+0830<FL+0829<FL-0827
<FL+0800<FL+0801<FL+0372<FL+0411
<FL+0340<FL+0159<FL+0838
<FL-1642<FL+1643<FL-0839
<ITJ0021:1101<EVE1102
#1101
<MNP0410:0001:0002:0000
<ANP0410:0000:0000
<EQ+0016<EVE1110
<EQ+0016<FL+2900<EVE1110
#1102
<MNP0410:0001:0022:0000
<ANP0410:0000:0000<EVE1110
#1110
<CNP0306:0117:0002
<ANP0306:0032:0002
@ -265,11 +237,8 @@ grows dark...<NOD<CLO
<WAI0050
<MOV0055:0018
<DNA0183<MSG<TUR......?<NOD<CLR<FAI0004<WAI0050<EVE1111
#1111
<EVE0071
#1200
<KEY<ANP1200:0020:0002
<FLJ0829:1201<EVE1202
@ -278,4 +247,3 @@ grows dark...<NOD<CLO
#1202
<FON1200:0016<FAI0001
<WAI0100<FAO0001<TRA0056:1200:0069:0076

View file

@ -28,7 +28,7 @@
<UNI0000<CSS<EVE1001
#1001
<FL+0160<EVE1002
<EVE1002
#1002
<CMU0000<EVE1010

View file

@ -1 +1 @@
`]v<><76>Ś<EFBFBD>`]Ź ˇ”Ź ¨<C2A0><C2A8>Ź¨ˇś<CB87><C59B><EFBFBD>„Ź ¬—<C2AC><E28094><EFBFBD><EFBFBD>Ź™”ś<E2809D><C59B><EFBFBD><EFBFBD>Ź<EFBFBD>ˇ—`]v<><76>Ś„`]Ź ˇ”Ź ¨<C2A0><C2A8>Ź¨ˇś<CB87><C59B><EFBFBD>„Ź ¬—<C2AC><E28094><EFBFBD><EFBFBD>Ź™”ś<E2809D><C59B><EFBFBD>„Ź<E2809E>ˇ—`]v<><76>Ś…`]Ź ˇ”Ź ¨<C2A0><C2A8>Ź¨ˇś<CB87><C59B><EFBFBD>„Ź ¬—<C2AC><E28094><EFBFBD>…Ź™”ś<E2809D><C59B><EFBFBD>…Ź•¦ź<C2A6><C5BA><EFBFBD><EFBFBD>Ź<EFBFBD>ˇ—`]v<><76>Ś†`]Ź ˇ”Ź ¨<C2A0><C2A8>Ź¨ˇś<CB87><C59B><EFBFBD>„Ź ¬—<C2AC><E28094><EFBFBD><EFBFBD>Ź™”ś<E2809D><C59B><EFBFBD>†Ź<E280A0>ˇ—`]v<><76>Ś‡`]Ź ˇ”Ź ¨<C2A0><C2A8>Ź¨ˇś<CB87><C59B><EFBFBD>„Ź ¬—<C2AC><E28094><EFBFBD><EFBFBD>Ź™”ś<E2809D><C59B><EFBFBD>‡Ź<E280A1>ˇ—`]v<><76>Ś<EFBFBD>`]Ź ¨<C2A0><C2A8>…†Ź™”ś<E2809D><C59B><EFBFBD><EFBFBD>Ź<EFBFBD>ˇ—`]v<><EFBFBD><E2809E>`]Źž<C5B9>¬Ź™”˘<E2809D><CB98><EFBFBD>„ŹS¦Ź§Ą”<C484><E2809D>‡ŠŤ<C5A0><C5A4>Ś„Ť<E2809E><C5A4><EFBFBD>Ť<E280B9><C5A4><EFBFBD>Ś`]v<><EFBFBD><E280A6>`]v<>…„<E280A6>`]v„<76><E2809E><EFBFBD>`]Źž<C5B9>¬Ź•˘”„<E2809D><E2809E><EFBFBD>`]Ź”ˇŁ<CB87><EFBFBD><E280A6>Ť<EFBFBD><C5A4><EFBFBD>Ť<EFBFBD><C5A4><EFBFBD><EFBFBD>`]Ź”ˇŁ<CB87>…„<E280A6>Ť<EFBFBD><C5A4><EFBFBD>Ť<EFBFBD><C5A4><EFBFBD><EFBFBD>`]ŹŞ”ś<E2809D><EFBFBD><E280A0>Ź™”˘<E2809D><CB98><EFBFBD>…`]Ź¨ˇś<CB87><C59B><EFBFBD><EFBFBD>Ź¦¦Ź<C2A6>©<EFBFBD><EFBFBD><E2809E>„`]v„<76><E2809E>„`]Ź™ź~<7E>„‰<E2809E>Ź<EFBFBD>©<EFBFBD><EFBFBD><E2809E>…`]v„<76><E2809E>…`]Ź ¨<C2A0><C2A8><EFBFBD><EFBFBD>Ź<EFBFBD>©<EFBFBD><EFBFBD><EFBFBD>`]v„<76><E2809E>†`]Ź™ź€<C5BA>†‰`]Ź<>©<EFBFBD><EFBFBD><EFBFBD>`]v„<76><EFBFBD>`]Źˇť<E28093>††‰Ť„<C5A4>„„`]Ź§Ą”<C484><E2809D><EFBFBD>Ť<EFBFBD>‡„<E280A1>Ť<EFBFBD><C5A4>„‰Ť<E280B0><C5A4>„…`]v„<76>„„`]Źś§~<7E><><EFBFBD><EFBFBD>`]Ź§Ą”<C484><E2809D><EFBFBD>Ť<EFBFBD>‡„<E280A1>Ť<EFBFBD><C5A4>„‰Ť<E280B0><C5A4>„…
=:S``i`=:l}~qls}…``ahl…~y```al}‰t````lvqy````lu~t=:S``ia=:l}~qls}…``ahl…~y```al}‰t````lvqy```alu~t=:S``ib=:l}~qls}…``ahl…~y```al}‰t```blvqy```blrƒ|````lu~t=:S``ic=:l}~qls}…``ahl…~y```al}‰t````lvqy```clu~t=:S``id=:l}~qls}…``ahl…~y```al}‰t````lvqy```dlu~t=:S``ie=:ls}…``bclvqy````lu~t=:S`a``=:l{u‰lvq``0alsƒƒl„q``dgj``iaj```hj```i=:S`b``=:S`ba`=:Sa```=:l{u‰lrqa```=:lq~€`b``j``a`j````=:lq~€`ba`j``a`j````=:l‡qy`c``lvq```b=:l…~y````lsƒƒlu†ua``a=:Sa``a=:lu†ua``b=:Sa``b=:ls}…````lu†ua`a`=:Sa``c=:lv|]`hcf=:lu†ua`a`=:Sa`a`=:l~sz`ccfja`aa=:l„q``aej`da`j``afj``ab=:Sa`aa=:ly„[```e=:l„q``aej`da`j``afj``ab

View file

@ -174,7 +174,12 @@ function upperSandZone:new(worldGraph)
return self.world.regions.arthur:canAccess(items)
end
self.locations.curly.requirements = function(self, items) return _has(items, "polarStar") end
self.locations.curly.requirements = function(self, items)
return _has(items, "polarStar") and _has(items, "weaponBoss")
end
self.locations.panties.requirements = function(self, items) return _has(items, "weaponBoss") end
self.locations.curlyPup.requirements = function(self, items) return _has(items, "weaponBoss") end
self.locations.eventOmega.requirements = function(self, items) return _has(items, "weaponBoss") end
self.locations.eventOmega:setItem(self.world.items:getByKey("eventOmega"))
@ -223,7 +228,7 @@ function labyrinthW:new(worldGraph)
self.requirements = function(self, items)
if not self.world.regions.arthur:canAccess(items) then return false end
if _has(items, "eventToroko") and self.world.regions.lowerSandZone:canAccess(items) then return true end
if _has(items, "flight") and self.world.regions.labyrinthB:canAccess(items) then return true end
if _has(items, "flight") and _has(items, "weaponBoss") and self.world.regions.labyrinthB:canAccess(items) then return true end
return false
end
@ -363,7 +368,7 @@ function plantation:new(worldGraph)
return false
end
self.locations.jail1.requirements = function(self, items) return _has(items, "letter") end
self.locations.jail1.requirements = function(self, items) return _has(items, "letter") and _has(items, "teleportKey") end
self.locations.momorin.requirements = function(self, items) return _has(items, "letter") and _has(items, "booster") end
self.locations.sprinkler.requirements = function(self, items) return _has(items, "mask") end
self.locations.megane.requirements = function(self, items) return _has(items, "brokenSprinkler") and _has(items, "mask") end