From 6ceb103b151ea78754c79cbfa4145d10f4c31070 Mon Sep 17 00:00:00 2001
From: duncathan <dunc@duncathan.com>
Date: Thu, 27 Feb 2020 23:19:21 -0600
Subject: [PATCH] adds bad ending

---
 pre-edited-cs/data/Stage/Oside.tsc              |  2 +-
 pre-edited-cs/data/Stage/ScriptSource/Oside.txt |  6 ++++++
 src/database/world_graph.lua                    |  4 ++++
 src/randomizer.lua                              | 10 +++++++++-
 src/ui/draw.lua                                 |  6 +++---
 src/ui/settings.lua                             |  2 +-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pre-edited-cs/data/Stage/Oside.tsc b/pre-edited-cs/data/Stage/Oside.tsc
index abd98f2..3b8d159 100644
--- a/pre-edited-cs/data/Stage/Oside.tsc
+++ b/pre-edited-cs/data/Stage/Oside.tsc
@@ -1 +1 @@
-]Zs€€‰€]ZŒ�ž‘Œ“�¥€€‚…Œ–‘™€€€€Œ•ž”]Zs€€‰�]ZŒ�ž‘Œ“�¥€€‚…Œ–‘™€€€�Œ•ž”]Zs€€‰‚]ZŒ�ž‘Œ“�¥€€‚…Œ–‘™€€€‚Œ•ž”]Zs€€‰ƒ]ZŒ�ž‘Œ“�¥€€‚…Œ–‘™€€€ƒŒ•ž”]Zs€€‰„]ZŒ�ž‘Œ“�¥€€‚…Œ–‘™€€€„Œ•ž”]Zs€�€€]ZŒ›•©Œ–œš‚„†€Š€�€�Œ�£—Œ¤¥¢™ÄwÃp¼¿³»µ´~]Z‘¾pµÈÀµÂÄp¸±³»µÂp³¿Å¼´p¿Àµ¾p¹Ä~ŒžŸ”Œ•ž”]Zs€�€�]ZŒ–œ{€‰„€Œ–œ{€‰„�]ZŒ£Ÿ¥€€��Œ‘ž €�€€Š€€€€Š€€€‚Œ–‘Ÿ€€€€Œ¤¢‘€€…‚Š€€‰€Š€€�‡Š€€�€]Zs€�‚€]ZŒ›•©Œ£Ÿ¥€€��Œ‘ž €�‚€Š€€€€Š€€€‚Œ–‘Ÿ€€€„Œ¤¢‘€€……Š€€‰„Š€€€‰Š€€€‰]Z]Zs€�ƒ€]ZŒ›•©Œ™¤š€€ƒ‚Š€�ƒ�Œ£Ÿ¥€€��Œ‘ž €�ƒ€Š€€€€Š€€€‚Œ–‘Ÿ€€€€Œ¤¢‘€€†‰Š€€‰€Š€€�…Š€€€ˆ]Zs€�ƒ�]ZŒ›•©Œ“�¥€€€€Œ£Ÿ¥€€��Œ‘ž €�ƒ€Š€€€€Š€€€‚]ZŒ—™¤�€ƒ‚Œ™¤}€€ƒ‚Œ–œ{�ƒ‡€Œ–‘Ÿ€€€€Œ¤¢‘€€†‰Š€€‰€Š€€�…Š€€€ˆ]Zs€�„€]ZŒ›•©Œ–‘Ÿ€€€€Œ�©”€€€€Œ¤¢‘€€‰„Š€€‰€Š€€�„Š€€€‡]Zs€‚€€]ZŒ ¢™Œ�£—Œ¤¥¢‘pù·¾�ŒžŸ”Œ•ž”]Zs€„€€]ZŒ›•©Œ�£—Œ¤¥¢Œ–‘“€€�€™¶pÉ¿Åwµp·¿¹¾·pÄ¿]Z¼¿¿»p¶¿Âpĸµp³¿Âµ|]ZÉ¿Åw´p²µÃÄp¸ÅÂÂÉ~ŒžŸ”Œ•ž”]Zs€„€�]ZŒ›•©Œ“œŸŒ–Ÿž€„�€Š€€�†Œ§‘™€€…€]ZŒ“ž €„‚€Š€�…€Š€€€€Œ˜�“]ZŒ‘ž €„€€Š€€€ƒŠ€€€€Œ§‘™€€ƒ‚]ZŒ‘ž €„€€Š€€€€Š€€€‚Œ§‘™€€ƒ‚]ZŒ‘ž €„‚€Š€€…€Š€€€€Œ§‘™€€ƒ‚]ZŒ‘žP€„‚€Š€€€€Š€€€‚Œ§‘™€€ƒ‚]ZŒ”ž €„€€Œ”ž €„‚€]ZŒ‘ž €„�€Š€€�€Š€€€‚Œ§‘™€‚€€]ZŒ‘ž €„�€Š€€‚€Š€€€‚Œ§‘™€‚…€]ZŒ‘ž €„�€Š€€�€Š€€€‚Œ§‘™€‚€€]ZŒ�£—‘¾´pÿpDZÃpÉ¿ÅÂpµÃ³±Àµp¶Â¿½]Zĸµp¹Ã¼±¾´pÃų³µÃöż~Œ§‘™€‚€€Œ“œ¢’µ¶¿Âµp¼¿¾·|pĸµp”¿³Ä¿Âp²µ·±¾]Z¸¹Ãp±Äı³»p¿¾pĸµpµ±Âĸ|pÅù¾·]Zĸµp¶¼¿±Ä¹¾·p¹Ã¼±¾´p±Ãp±p²±Ãµ~Œ§‘™€‚€€Œ“œ¢§µÂµpĸµp³¿Å¾Ä¹µÃp¿¶pĸµpµ±Âĸ]Z±²¼µpÄ¿pǹĸÃı¾´pĸµp”¿³Ä¿ÂwÃ]Z±ÃñżÄ�Œ§‘™€‚€€Œ“œ¢Œ–‘Ÿ€€€‚•¹Ä¸µÂpDZÉ|p¹Äp½±´µp¾¿]Z´¹¶¶µÂµ¾³µpÄ¿pÉ¿Å~Œ§‘™€‚€€Œ“œ¢¤¿·µÄ¸µÂ|p´µµÀp¹¾pĸµp¸µ±ÂÄ]Z¿¶pĸµp½¿Å¾Ä±¹¾Ã|p¶±Âp¶Â¿½]Zĸµp”¿³Ä¿ÂwÃpµ±³¸|Œ§‘™€‚€€Œ“œ¢É¿Åp±¾´p›±ÊŽ±pÁŹµÄ¼Ép¼¹Æµ´]Z¿ÅÄpĸµpµÃÄp¿¶pÉ¿ÅÂp´±ÉÃ~~~Œ§‘™€‚€€Œ“œ¢Œ“�¥€€‚†]ZŒ¤¥¢pppppppppppppppp}p¤¸µp•¾´p}Œ§‘™‰‰‰‰]ZŒ•ž”]Zs€„�€]ZŒ›•©Œ�£—Œ¤¥¢—ÂÂÂÂÂÂ~~~ŒžŸ”Œ•ž”]Zs€„‚€]Zs€†€€]ZŒ›•©Œ�£—¤¸±¾»Ãp¶¿Âp¸µ¼À¹¾·pǹĸpĸµ]Z´µ²Å··¹¾·~ŒžŸ”]Z¤¸¹Ãp¹Ãp±Ãp¶±Âp±Ãpĸµp·±½µp·¿µÃ]Z¶¿Âp¾¿Ç~ŒžŸ”]Z™w½pĸ¹¾»¹¾·p™w¼¼p½±»µpĸ¹Ãp¾µÈÄ]ZÃı·µpĸµp¼±ÃÄp¿¾µ~ŒžŸ”]Z§¿¾´µÂp¸¿Çp¶±Âp™p³±¾p·µÄp¹¾]ZºÅÃÄpÄÇ¿p½¿¾Ä¸Ã~~~ŒžŸ”Œ•ž”
\ No newline at end of file
+VSlyy‚yVS…–—Š…Œ–žyy{~…�Š’yyyy…Ž—�VSlyy‚zVS…–—Š…Œ–žyy{~…�Š’yyyz…Ž—�VSlyy‚{VS…–—Š…Œ–žyy{~…�Š’yyy{…Ž—�VSlyy‚|VS…–—Š…Œ–žyy{~…�Š’yyy|…Ž—�VSlyy‚}VS…–—Š…Œ–žyy{~…�Š’yyy}…Ž—�VSlyzyyVS…”Ž¢…�•“{}yƒyzyz…–œ�…�ž›’½p¼iµ¸¬´®­wVSŠ·i®Á¹®»½i±ª¬´®»i¬¸¾µ­i¸¹®·i²½w…—˜�…Ž—�VSlyzyzVS…�•ty‚}y…�•ty‚}zVS…œ˜žyyzz…Š—™yzyyƒyyyyƒyyy{…�Š˜yyyy…�›Šyy~{ƒyy‚yƒyyz€ƒyyzyVSlyz{yVS…”Ž¢…œ˜žyyzz…Š—™yz{yƒyyyyƒyyy{…�Š˜yyy}…�›Šyy~~ƒyy‚}ƒyyy‚ƒyyy‚VSVSlyz|yVS…”Ž¢…’�“yy|{ƒyz|z…œ˜žyyzz…Š—™yz|yƒyyyyƒyyy{…�Š˜yyyy…�›Šyy‚ƒyy‚yƒyyz~ƒyyy�VSlyz|zVS…”Ž¢…Œ–žyyyy…œ˜žyyzz…Š—™yz|yƒyyyyƒyyy{VS…�’�zy|{…’�vyy|{…�•tz|€y…�Š˜yyyy…�›Šyy‚ƒyy‚yƒyyz~ƒyyy�VSlyz}yVS…”Ž¢…�Š˜yyyy…–¢�yyyy…�›Šyy‚}ƒyy‚yƒyyz}ƒyyy€VSly{yyVS…™›’…–œ�…�ž›Ši¼²°·ˆ…—˜�…Ž—�VSly}yyVS…�•“yy|ƒy}yzVS…”Ž¢…–œ�…�ž›…�ŠŒyyzy’¯i¸¾p»®i°¸²·°i½¸VSµ¸¸´i¯¸»i½±®i¬¸»®uVS¸¾p­i«®¼½i±¾»»Âw…—˜�…Ž—�VSly}yzVS…�•“zy�ƒy}y{VS…”Ž¢…–œ�…�ž›…�ŠŒyyzy ²½±i½±®i¬¸»®i¼½²µµVSª»¸¾·­ui½±®»®p¼i·¸iVS»®ª¼¸·i½¸i¯µÂiª·ÂÀ±®»®w…—˜�…Ž—�VSly}y{VS…”Ž¢…Œ•˜…�˜—y}zyƒyyz… Š’yy~yVS…Œ—™y}{yƒyz~yƒyyyy…‘–ŒVS…Š—™y}yyƒyyy|ƒyyyy… ŠIyy|{VS…Š—™y}yyƒyyyyƒyyy{… Š’yy|{VS…Š—™y}{yƒyy~yƒyyyy… Š’yy|{VS…Š—™y}{yƒyyyyƒyyy{… Š’yy|{VS…�—™y}yy…�—™y}{yVS…Š—™y}zyƒyyzyƒyyy{… Š’y{yyVS…Š—™y}zyƒyy{yƒyyy{… Š’y{~yVS…Š—™y}zyƒyyzyƒyyy{… Š’y{yyVS…–œ�Š·­i¼¸iÀª¼i¸¾»i®¼¬ª¹®i¯»¸¶VS½±®i²¼µª·­i¼¾¬¬®¼¼¯¾µw… Š’y{yy…Œ•›‹®¯¸»®iµ¸·°ui½±®i�¸¬½¸»i«®°ª·VS±²¼iª½½ª¬´i¸·i½±®i®ª»½±ui¾¼²·°VS½±®i¯µ¸ª½²·°i²¼µª·­iª¼iªi«ª¼®w… Š’y{yy…Œ•› ®»®i½±®i¬¸¾·½»²®¼i¸¯i½±®i®ª»½±VSª«µ®i½¸iÀ²½±¼½ª·­i½±®i�¸¬½¸»p¼VSª¼¼ª¾µ½ˆ… Š’y{yy…Œ•›…�Š˜yyy{Ž²½±®»iÀªÂui²½i¶ª­®i·¸VS­²¯¯®»®·¬®i½¸i¸¾w… Š’y{yy…Œ•›�¸°®½±®»ui­®®¹i²·i½±®i±®ª»½VS¸¯i½±®i¶¸¾·½ª²·¼ui¯ª»i¯»¸¶VS½±®i�¸¬½¸»p¼i»®ª¬±u… Š’y{yy…Œ•›Â¸¾iª·­i”ªÃ¾¶ªiº¾²®½µÂiµ²¿®­VS¸¾½i½±®i»®¼½i¸¯i¸¾»i­ªÂ¼www… Š’y{yy…Œ•›…Œ–žyy{VS…�ž›iiiiiiiiiiiiiiiivi�±®iŽ·­iv… Š’‚‚‚‚VS…Ž—�VSly}zyVS…”Ž¢…–œ�…�ž›�»»»»»»www…—˜�…Ž—�VSly}{yVSlyyyVS…”Ž¢…–œ��±ª·´¼i¯¸»i±®µ¹²·°iÀ²½±i½±®VS­®«¾°°²·°w…—˜�VS�±²¼i²¼iª¼i¯ª»iª¼i½±®i°ª¶®i°¸®¼VS¯¸»i·¸Àw…—˜�VS’p¶i½±²·´²·°i’pµµi¶ª´®i½±²¼i·®Á½VS¼½ª°®i½±®iµª¼½i¸·®w…—˜�VS ¸·­®»i±¸Ài¯ª»i’i¬ª·i°®½i²·VS³¾¼½i½À¸i¶¸·½±¼www…—˜�…Ž—�
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Oside.txt b/pre-edited-cs/data/Stage/ScriptSource/Oside.txt
index efeab4f..331f092 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Oside.txt
+++ b/pre-edited-cs/data/Stage/ScriptSource/Oside.txt
@@ -34,10 +34,16 @@ An expert hacker could open it.<NOD<END
 <PRI<MSG<TURA sign?<NOD<END
 
 #0400
+<FLJ6003:0401
 <KEY<MSG<TUR<FAC0010If you're going to
 look for the core,
 you'd best hurry.<NOD<END
 #0401
+<FLJ6108:0402
+<KEY<MSG<TUR<FAC0010With the core still
+around, there's no 
+reason to fly anywhere.<NOD<END
+#0402
 <KEY<CLO<FON0410:0016<WAI0050
 <CNP0420:0150:0000<HMC
 <ANP0400:0003:0000<WAI0032
diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua
index 0bf2ce3..03f4d10 100644
--- a/src/database/world_graph.lua
+++ b/src/database/world_graph.lua
@@ -446,6 +446,10 @@ function worldGraph:getObjectiveSpot()
   return {self.regions.firstCave.locations.objective}
 end
 
+function worldGraph:getMALCO()
+  return {self.regions.grasstownEast.locations.malco}
+end
+
 function worldGraph:getPuppySpots()
   return {
     self.regions.upperSandZone.locations.curly,
diff --git a/src/randomizer.lua b/src/randomizer.lua
index e436ab4..dd3f2b4 100644
--- a/src/randomizer.lua
+++ b/src/randomizer.lua
@@ -136,10 +136,18 @@ end
 function C:_shuffleItems(tscFiles)
   -- place the objective scripts in Start Point
   self:_fastFillItems(self:getObjective(), self.worldGraph:getObjectiveSpot())
-  
+
   -- first, fill one of the first cave spots with a weapon that can break blocks
   _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1])
 
+  -- place the bomb on MALCO for bad end
+  if self.obj == "objBadEnd" then
+    self.worldGraph:getMALCO()[1]:setItem(self.itemDeck:getByKey("bomb"))
+  else
+    logWarning(self.obj)
+  end
+
+
   local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true)))
   local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true)))
   local puppies = _.compact(_.shuffle(self.itemDeck:getItemsByAttribute("puppy")))
diff --git a/src/ui/draw.lua b/src/ui/draw.lua
index f5791b9..d8928d0 100644
--- a/src/ui/draw.lua
+++ b/src/ui/draw.lua
@@ -29,9 +29,9 @@ layout.go:onPress(function()
       Randomizer.customseed = settings.customseed.value
     end
 
-    --if settings.bad.value then
-    --  Randomizer.obj = "objBadEnd"
-    if settings.norm.value then
+    if settings.bad.value then
+      Randomizer.obj = "objBadEnd"
+    elseif settings.norm.value then
       Randomizer.obj = "objNormalEnd"
     elseif settings.boss.value then
       Randomizer.obj = "objAllBosses"
diff --git a/src/ui/settings.lua b/src/ui/settings.lua
index 8baf878..5c4409b 100644
--- a/src/ui/settings.lua
+++ b/src/ui/settings.lua
@@ -13,7 +13,7 @@ return { style = 'dialog',
     },
     {
       { type = 'label', text = 'Objective' },
-      -- { type = 'radio', group = 'objective', text = 'Bad ending', id = 'bad' },
+      { type = 'radio', group = 'objective', text = 'Bad ending', id = 'bad' },
       { type = 'radio', group = 'objective', text = 'Normal ending', id = 'norm'},
       { type = 'radio', group = 'objective', text = 'Best ending', id = 'best', value = true },
       { type = 'radio', group = 'objective', text = 'All bosses', id = 'boss' },