adds bad ending

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

@@ -1 +1 @@
-]Zs€€墍]Z対瀾寭潵€€倕寲憴€€€€寱灁]Zs€€墎]Z対瀾寭潵€€倕寲憴€€€亴暈擼Zs€€墏]Z対瀾寭潵€€倕寲憴€€€倢暈擼Zs€€墐]Z対瀾寭潵€€倕寲憴€€€儗暈擼Zs€€墑]Z対瀾寭潵€€倕寲憴€€€剬暈擼Zs€亐€]Z寷暕寲湚倓唨妧亐亴潱棇ぅ<E6A387>膚胮伎郴荡~]Z懢p等赖履p副郴德p晨偶磒坷稻p鼓~尀煍寱灁]Zs€亐乚Z寲渰€墑€寲渰€墑乚Z專煡€€亖寫灎€亐€妧€€€妧€€倢枒焵€€€尋<E282AC>€€厒妧€墍妧€亣妧€亐]Zs€亗€]Z寷暕專煡€€亖寫灎€亗€妧€€€妧€€倢枒焵€€剬あ憖€厖妧€墑妧€€墛€€€塢Z]Zs€亙€]Z寷暕寵<E69A95>€€儌妧亙亴<E4BA99><E4BAB4>€亖寫灎€亙€妧€€€妧€€倢枒焵€€€尋<E282AC>€€唹妧€墍妧€亝妧€€圿Zs€亙乚Z寷暕寭潵€€€€專煡€€亖寫灎€亙€妧€€€妧€€俔Z寳櫎亐儌寵<E5848C>€€儌寲渰亙噣寲憻€€€€尋<E282AC>€€唹妧€墍妧€亝妧€€圿Zs€亜€]Z寷暕寲憻€€€€対⿺€€€€尋<E282AC>€€墑妧€墍妧€亜妧€€嘳Zs€個€]Z尃<5A>対<EFBFBD>尋ア憄霉肪弻灍攲暈擼Zs€剙€]Z寷暕対<E69A95>尋ア寲憮€€亐櫠p煽舧碌p房咕穚目]Z伎炕p犊聀母祊晨碌|]Z煽舧磒驳媚p概侣蓗尀煍寱灁]Zs€剙乚Z寷暕寭湡寲煘€剚€妧€亞導憴€€厐]Z寭灎€剛€妧亝€妧€€€寴潛]Z寫灎€剙€妧€€儕€€€€導憴€€儌]Z寫灎€剙€妧€€€妧€€倢<E282AC>檧€儌]Z寫灎€剛€妧€厐妧€€€導憴€€儌]Z寫濸€剛€妧€€€妧€€倢<E282AC>檧€儌]Z寯灎€剙€寯灎€剛€]Z寫灎€剚€妧€亐妧€€倢<E282AC>檧個€]Z寫灎€剚€妧€個妧€€倢<E282AC>檧倕€]Z寫灎€剚€妧€亐妧€€倢<E282AC>檧個€]Z対<5A>懢磒每p潜胮煽怕p得潮赖p堵拷]Z母祊姑急敬p门吵得枚偶~導憴€個€寭湤挼犊碌p伎痉|p母祊斂衬柯p驳繁綸Z腹胮蹦谋郴p烤p母祊当履竱p琶咕穄Z母祊都勘墓痉p姑急敬p泵p眕脖玫~導憴€個€寭湤У碌p母祊晨啪穆沟胮慷p母祊当履竇Z辈嫉p目p枪母媚本磒母祊斂衬柯w胅Z泵帽偶膹導憴€個€寭湤寲憻€€€倳鼓傅聀潜蓔p鼓p奖吹p究]Z垂抖德稻车p目p煽舿導憴€個€寭湤た返母德|p吹道p咕p母祊傅甭腯Z慷p母祊娇啪谋咕脇p侗聀堵拷]Z母祊斂衬柯w胮碌背竱導憴€個€寭湤煽舙本磒洷逝奖p僚沟募蓀脊频碷Z颗膒母祊碌媚p慷p煽怕p幢擅~~~導憴€個€寭湤寭潵€€倖]Z尋アpppppppppppppppp}pじ祊暰磒}導憴墘墘]Z寱灁]Zs€剚€]Z寷暕対<E69A95>尋ア椔侣侣聗~~尀煍寱灁]Zs€剛€]Zs€唨€]Z寷暕対<E69A95>じ本幻p犊聀傅祭咕穚枪母p母礭Z吹才贩咕穨尀煍]Zじ姑p姑p泵p侗聀泵p母祊繁降p房得]Z犊聀究莮尀煍]Z檞絧母咕还痉p檞技p奖坏p母姑p镜饶]Z媚狈祊母祊急媚p烤祣尀煍]ZЭ敬德p缚莗侗聀檖潮緋返膒咕]Z号媚p那縫娇灸该~~~尀煍寱灁
+VSlyy倅VS厲棅厡枮yy{~厪姃yyyy厧棈VSlyy倆VS厲棅厡枮yy{~厪姃yyyz厧棈VSlyy倇VS厲棅厡枮yy{~厪姃yyy{厧棈VSlyy倈VS厲棅厡枮yy{~厪姃yyy|厧棈VSlyy倉VS厲棅厡枮yy{~厪姃yyy}厧棈VSlyzyyVS厰帰厪晸{}y儁zyz厲湊厺灈捊p糹蹈<E7B3B9><E8B988>wVS姺i<E5A7BA>巩唤i豹<69><E8B1B9>i<EFBFBD>镜璱腹<E792B1>i步w厳槏厧棈VSlyzyzVS厪晅y倉y厪晅y倉zVS厹槥yyzz厞棛yzyy儁yyy儁yy{厪姌yyyy厺泭yy~{儁y倅儁yz€儁yzyVSlyz{yVS厰帰厹槥yyzz厞棛yz{y儁yyy儁yy{厪姌yyy}厺泭yy~~儁y倉儁yy們yyy俈SVSlyz|yVS厰帰厭潛yy|{儁z|z厹槥yyzz厞棛yz|y儁yyy儁yy{厪姌yyyy厺泭yy們yy倅儁yz~儁yy乂Slyz|zVS厰帰厡枮yyyy厹槥yyzz厞棛yz|y儁yyy儁yy{VS厫挐zy|{厭漹yy|{厪晅z|€y厪姌yyyy厺泭yy們yy倅儁yz~儁yy乂Slyz}yVS厰帰厪姌yyyy厲<79>yyyy厺泭yy倉儁y倅儁yz}儁yy€VSly{yyVS厵洅厲湊厺灈奿疾胺垍棙崊帡峍Sly}yyVS厪晸yy|儁}yzVS厰帰厲湊厺灈厪妼yyzy挴i赂緋划i案卜癷礁VS蹈复i<E5A48D>籭奖甶<E5A596>划uVS赂緋璱<E7B78B>冀i本换聎厳槏厧棈VSly}yzVS厪晸zy亙y}y{VS厰帰厲湊厺灈厪妼yyzy牪奖i奖甶<E5A596>划i冀驳礦S<E7A4A6>妇翻ui奖<69>畃糹犯iVS划<53>阜i礁i<E7A481>耰<EFBFBD>吕碑划w厳槏厧棈VSly}y{VS厰帰厡晿厪槜y}zy儁yz厾姃yy~yVS厡棛y}{y儁z~y儁yyy厬枌VS厞棛y}yy儁yy|儁yyy厾奍yy|{VS厞棛y}yy儁yyy儁yy{厾姃yy|{VS厞棛y}{y儁y~y儁yyy厾姃yy|{VS厞棛y}{y儁yyy儁yy{厾姃yy|{VS厤棛y}yy厤棛y}{yVS厞棛y}zy儁yzy儁yy{厾姃y{yyVS厞棛y}zy儁y{y儁yy{厾姃y{~yVS厞棛y}zy儁yzy儁yy{厾姃y{yyVS厲湊姺璱几i廓糹赂净i<E58780><69>巩i<E5B7A9>付VS奖甶布氮翻i季<69><E5ADA3>集镜w厾姃y{yy厡暃嫯<E69A83>划i蹈钒ui奖甶嵏<E794B6>富i<E5AF8C>蔼稸S辈糹<E8BE88>姜<EFBFBD>i阜i奖甶<E5A596>唤眜i炯卜癡S奖甶<E5A596>釜讲钒i布氮翻i<E7BFBB>i猧<69>籍w厾姃y{yy厡暃牣划i奖甶<E5A596>痉交伯糹腐i奖甶<E5A596>唤盫S<E79BAB>诞i礁i啦奖冀<E5A596>璱奖甶嵏<E794B6>富p糣S<E7B3A3>吉镜綀厾姃y{yy厡暃厪姌yyy{幉奖<E5B989>i廓聈i步i丢<69>i犯VS<56><53><EFBFBD><EFBFBD><EFBFBD>i礁i赂緒厾姃y{yy厡暃澑爱奖<E788B1>ui<75><69>i卜i奖甶碑<E794B6>絍S腐i奖甶陡痉姜卜紆i<E7B486>籭<EFBFBD>付VS奖甶嵏<E794B6>富p糹划<E7B3B9>眜厾姃y{yy厡暃赂緄<E8B582>璱敧镁丢i壕伯降耰挡慨璙S妇絠奖甶划冀i腐i赂净i<E58780>录www厾姃y{yy厡暃厡枮yy{VS厺灈iiiiiiiiiiiiiiiivi澅甶幏璱v厾姃倐倐VS厧棈VSly}zyVS厰帰厲湊厺灈惢换换粀ww厳槏厧棈VSly}{yVSlyyyVS厰帰厲湊澅<E6B98A>醇i<E98687>籭碑倒卜癷啦奖i奖甐S<E79490><53>鞍卜皐厳槏VS澅布i布i<E5B883>i<EFBFBD>籭<EFBFBD>i奖甶蔼懂i案<69>VS<56>籭犯纖厳槏VS抪秈奖卜床钒i抪档i丢串i奖布i樊两VS冀<53>甶奖甶氮冀i阜畐厳槏VS牳翻<E789B3>i备纈<E5A487>籭抜<E7B1AD>穒爱絠卜VS尘冀i嚼竔陡方奔www厳槏厧棈

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

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,

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")))

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"

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' },