From 09e4883acf27d10ce23228c6d0c55c0375a9459c Mon Sep 17 00:00:00 2001
From: duncathan <dunc@duncathan.com>
Date: Wed, 26 Feb 2020 01:22:50 -0600
Subject: [PATCH] initial setup for objectives

---
 pre-edited-cs/data/Stage/Blcny1.tsc           |  2 +-
 .../data/Stage/ScriptSource/Blcny1.txt        | 72 +++++++++++++++++--
 src/database/items.lua                        | 18 ++++-
 src/ui/settings.lua                           | 23 ++++--
 4 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/pre-edited-cs/data/Stage/Blcny1.tsc b/pre-edited-cs/data/Stage/Blcny1.tsc
index 93577b5..641e90f 100644
--- a/pre-edited-cs/data/Stage/Blcny1.tsc
+++ b/pre-edited-cs/data/Stage/Blcny1.tsc
@@ -1 +1 @@
-S``i`=:l{u�lv|]aai`lv|]aaialv|[aaibl}~qls}�``c`lvqy````lu~t=:S``ia=:l{u�lv|[aai`lv|]aaialv|]aaibl}~qls}�``c`lvqy```alu~t=:S``ib=:l{u�l}~qls}�``c`lvqy```blu~t=:S``ic=:l{u�l}~qls}�``c`lvqy```clu~t=:S``id=:l{u�lv|]aai`lv|[aaialv|]aaibl}~qls}�``c`lvqy```dlu~t=:S``ie=:l{u�lvqy```dlu~t=:S`a``=:l{u�l��``aalq~�`a``j````j```blvq```c=:ly�z``bcj`a`al��q``fcj``icj```ij```d=:S`a`a=:l{u�l��q``fgj``icj```ij```d=:S`aa`=:l��ylvq```bl��q``fdj``ibj```aj``aa=:S`ab`=:l{u�lq~�`ab`j````j```bl��``aalvq```dl��q``ffj``idj``a`j```h=:S`ac`=:l��yl}�w����P����P��P���P����������=:���P���P���P������P����P��P��^^^l~tlu~t=:S`aii=:l��yl}�w~���P���^l~tlu~t=:=:S`b``=:l{u�l}�t````lt~�0b``l�q�l}�wq��P�������P���P���W��=:�����P��P����Ql~tlu~t=:S`b`a=:l��yl}�wl���=:PPPPPPPPPPPP�xq�W�Pq||\Pv|{�Ql~tlu~t=:S`ba`=:l��ylv|zaaiaj`baalv|zaaibj`bab=:l��ylvq```dl}�t```bl�qy``e`l��q``fbj``iej```gj``gd=:S`baa=:l��ylvq```dl}�t```bl�qy``e`l��q``fbj``iej``gij``gc=:S`bab=:l��ylvq```dl}�t````l�qy``e`l��q``fbj``iej`aagj``fb=:S`bii=:lt~�`biilv|zbiiij````lu�u`c``=:S`c``=:ly�z``cij`c`alu�u`c`c=:S`c`a=:lv|zbh``j`c`blu�u`c`c=:S`c`b=:lv|qlt~q``aclt~�`biilt~�`c``l��``celu~t=:S`c`c=:l{u�lv~`c``j``afl}�r```bl}�wlvqs``balwy�a`cil���r����P��P���P����P���Pu��=:s�������P��P����P��P���P=:my���Pr���mQl~tls|����P����P����PyP�����P����=:�������^l~tlv}```hlu~t
\ No newline at end of file
+0==F=IXRfISY:>>F=ISY:>>F>ISY8>>F?IZ[NIPZb==@=ISNV====IR[Q0==F>IXRfISY8>>F=ISY:>>F>ISY:>>F?IZ[NIPZb==@=ISNV===>IR[Q0==F?IXRfIZ[NIPZb==@=ISNV===?IR[Q0==F@IXRfIZ[NIPZb==@=ISNV===@IR[Q0==FAIXRfISY:>>F=ISY8>>F>ISY:>>F?IZ[NIPZb==@=ISNV===AIR[Q0==FBIXRfISNV===AIR[Q0=>==IXRfI`\b==>>IN[]=>==G====G===?ISN\===@IVaW==?@G=>=>Ia_N==C@G==F@G===FG===A0=>=>IXRfIa_N==CDG==F@G===FG===A0=>>=I]_VISN\===?Ia_N==CAG==F?G===>G==>>0=>?=IXRfIN[]=>?=G====G===?I`\b==>>ISN\===AIa_N==CCG==FAG==>=G===E0=>@=I]_VIZ`Tauv�-z���-or-�ur-uryvp|}�r`�r-n{q-�ur-|�ur�-pnzr-v{-|{;;;I[\QIR[Q0=>FFI]_VIZ`T[vpr-w|o;I[\QIR[Q0=?==IXRfIZfQ====IQ[]=?==IdN`IZ`TN{�-s��ur-n{q-�|�4rt|v{t-�|-snyy.I[\QIR[Q0=?=>I]_VIZ`TIab_------------aUNa4`-NYY9-S\YX`.I[\QIR[Q0=?>=I]_VISYW>>F>G=?>>ISYW>>F?G=?>?I]_VISN\===AIZfQ===?IdNV==B=Ia_N==C?G==FBG===DG==DA0=?>>I]_VISN\===AIZfQ===?IdNV==B=Ia_N==C?G==FBG==DFG==D@0=?>?I]_VISN\===AIZfQ====IdNV==B=Ia_N==C?G==FBG=>>DG==C?0=?FFIQ[]=?FFISYW?FFFG====IRcR=@==0=@==ISYWC===G=@=>ISYWC==>G=@=>ISYWC==?G=@=>IXRfIS\[=@==G==>CIZfO===?IZ`TISNP==?>Iab_aurr-v�-{|�uv{t-s|-�|�urr.I[\QIPY_Syrr-�ur-v�yn{q-�uvyr�|�-��vyy-pn{;;;I[\QIS\Z===EIR[Q
0=@=>ISYW?E==G=@=?IRcR=@=@0=@=?ISYWC==>G=A=>ISYWC==?G=A=>IRcR=C==0=@=@ISYWC==>G=A=@ISYWC==?G=B>AIXRfIS\[=@==G==>CIZfO===?IZ`TISNP==?>ITVa>=@FIab_Ov{t-zr-`�r-s|z-�ur-RttP|vq|.I[\QIPY_\{y�-�ur{-�vyy-V-ornx-�uv�onvr;I[\QIS\Z===EIR[Q0=A=>IVaW==@FG=A=?IRcR=A=@0=A=?ISYWC==?G=B=>IRcR=C==0=A=@ISYWC==?G=B>AIXRfIS\[=@==G==>CIZfO===?IZ`TISNP==?>Iab_Ov{t-zr-`�r-s|z-�ur-RttP|vq|9-�ur-JV|{-O|{qJ9n{q-�ur-JO||��r-?;=J.I[\QIPY_\{y�-�ur{-�vyy-V-ornx-�uv�onvr;I[\QIS\Z===EIR[Q0=B=>ISYWC>==G=B=?IRcR=B>A0=B=?ISYWC>=>G=B=@IRcR=B>A0=B=@ISYWC>=?G=B=AIRcR=B>A0=B=AISYWC>=@G=B=BIRcR=B>A0=B=BISYWC>=AG=B=CIRcR=B>A0=B=CISYWC>=BG=B=DIRcR=B>A0=B=DISYWC>=CG=B=EIRcR=B>A0=B=EISYWC>=DG=B=FIRcR=B>A0=B=FISYWC>=EG=B>=IRcR=B>A0=B>=ISYWC>=FG=B>>IRcR=B>A0=B>>ISYWC>>=G=B>?IRcR=B>A0=B>?ISYWC>>>G=B>@IRcR=B>A0=B>@IRcR=C==0=B>AIXRfIS\[=@==G==>CIZfO===?IZ`TISNP==?>Iab_f|�-z���-qrsrn�-nyy-|s-z�o|��-z|{��r�-ors|r-snpv{tzr-urr9-n{qGI[\QIPY_Ov{t-zr-`�r-s|z-�ur-RttP|vq|9-�ur-JV|{-O|{qJ9n{q-�ur-JO||��r-?;=J.I[\QIPY_\{y�-�ur{-�vyy-V-ornx-�uv�onvr;I[\QIS\Z===EIR[Q0=C==ISYNIQ[N==>@IQ[]=?FFIQ[]=@==I`\b==@BIR[Q
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt b/pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt
index 30f2763..e475579 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt
+++ b/pre-edited-cs/data/Stage/ScriptSource/Blcny1.txt
@@ -55,16 +55,74 @@ going to fall!<NOD<END
 #0299
 <DNP0299<FLJ2999:0000<EVE0300
 #0300
-<ITJ0039:0301<EVE0303
+<FLJ6000:0301<FLJ6001:0301<FLJ6002:0301
+
+<KEY<FON0300:0016<MYB0002<MSG<FAC0021<TURThere is nothing for you
+here!<NOD<CLRFlee the island while
+you still can...<NOD<FOM0008<END
+
+Normal ending, flag 6000
 #0301
-<FLJ2800:0302<EVE0303
-
+<FLJ2800:0302<EVE0303 Check for Sue being saved
 #0302
-<FLA<DNA0013<DNP0299<DNP0300<SOU0035<END
-
+<FLJ6001:0401<FLJ6002:0401<EVE0600 Keep checking if it's best end or all bosses
 #0303
+<FLJ6001:0403<FLJ6002:0514
 <KEY<FON0300:0016<MYB0002<MSG<FAC0021<GIT1039<TURBring me Sue from the Egg
-Corridor as well as the 
-=Iron Bond=!<NOD<CLROnly then will I break this
+Corridor!<NOD<CLROnly then will I break this
 barrier.<NOD<FOM0008<END
 
+Best ending, flag 6001
+#0401
+<ITJ0039:0402<EVE0403 Check for Iron Bond
+#0402
+<FLJ6002:0501<EVE0600 Keep checking if it's all bosses
+#0403
+<FLJ6002:0514
+<KEY<FON0300:0016<MYB0002<MSG<FAC0021<TURBring me Sue from the Egg
+Corridor, the =Iron Bond=,
+and the =Booster 2.0=!<NOD<CLROnly then will I break this
+barrier.<NOD<FOM0008<END
+
+All bosses, flag 6002
+#0501
+<FLJ6100:0502<EVE0514 Balrog 1
+#0502
+<FLJ6101:0503<EVE0514 Igor
+#0503
+<FLJ6102:0504<EVE0514 Balrog 2
+#0504
+<FLJ6103:0505<EVE0514 Balfrog
+#0505
+<FLJ6104:0506<EVE0514 Omega
+#0506
+<FLJ6105:0507<EVE0514 Toroko+
+#0507
+<FLJ6106:0508<EVE0514 Monster X
+#0508
+<FLJ6107:0509<EVE0514 Balrog 3
+#0509
+<FLJ6108:0510<EVE0514 The Core
+#0510
+<FLJ6109:0511<EVE0514 Ironhead
+#0511
+<FLJ6110:0512<EVE0514 The Sisters
+#0512
+<FLJ6111:0513<EVE0514 Red Demon
+#0513
+<EVE0600
+#0514
+<KEY<FON0300:0016<MYB0002
+<MSG<FAC0021<TURYou must defeat all of my
+boss monsters before facing
+me here, and:<NOD<CLR
+Bring me Sue from the Egg
+Corridor, the =Iron Bond=,
+and the =Booster 2.0=!<NOD<CLROnly then will I break this
+barrier.<NOD<FOM0008<END
+
+#0600
+<FLA<DNA0013<DNP0299<DNP0300<SOU0035<END
+
+
+
diff --git a/src/database/items.lua b/src/database/items.lua
index da509b2..c93daa3 100644
--- a/src/database/items.lua
+++ b/src/database/items.lua
@@ -36,6 +36,14 @@ local function event(n)
   }
 end
 
+local function gameMode(n, eve)
+  return {
+    name = "Game Mode: " .. n,
+    attributes = {"gamemode"},
+    placed = true,
+    script = eve
+  }
+
 local function _itemData()
   local data = {
     -------------
@@ -345,7 +353,15 @@ local function _itemData()
     eventToroko = event("Defeated Toroko+"),
     eventCore = event("Defeated the Core"),
     eventCurly = event("Saved Curly"),
-    eventRocket = event("Built Rocket")
+    eventRocket = event("Built Rocket"),
+
+    ----------------
+    -- GAME MODES --
+    ----------------
+    gameBadEnd = gameMode("Bad Ending", "<FL+6003<EVE0091"),
+    gameNormalEnd = gameMode("Normal Ending", "<FL+6000<EVE0091"),
+    gameBestEnd = gameMode("Best Ending", "<FL+6001<EVE0091"),
+    gameAllBosses = gameMode("All Bosses", "<FL+6002<EVE0091")
   }
 
   local array = {}
diff --git a/src/ui/settings.lua b/src/ui/settings.lua
index 5fbad75..537b6e4 100644
--- a/src/ui/settings.lua
+++ b/src/ui/settings.lua
@@ -1,14 +1,23 @@
 return { style = 'dialog',
   { style = 'dialogHead', text = 'Settings' },
-  { style = 'dialogBody', padding = 24,
-    { type = 'label', text = 'Seed' },
+  { style = 'dialogBody', padding = 24, flow = 'x',
     {
-      { type = 'radio', group = 'seed', text = 'Use random seed', value = true },
-      { flow = 'y', { type = 'radio', group = 'seed', text = 'Use custom seed', id = 'seedselect'}, { type = 'text', id = 'customseed', width = 150 }, {height = false} }
+      { type = 'label', text = 'Seed' },
+      {
+        { type = 'radio', group = 'seed', text = 'Use random seed', value = true },
+        { flow = 'y', { type = 'radio', group = 'seed', text = 'Use custom seed', id = 'seedselect'}, { type = 'text', id = 'customseed', width = 150 }, {height = false} }
+      },
+      { type = 'label', text = 'Randomization Options' },
+      { type = 'check', value = false, id = 'puppy', text = "Puppysanity"},
+      { height = false },
+    },
+    {
+      { type = 'label', text = 'Objective' },
+      { type = 'radio', group = 'objective', text = 'Bad ending' },
+      { type = 'radio', group = 'objective', text = 'Normal ending' },
+      { type = 'radio', group = 'objective', text = 'Best ending', value = true },
+      { type = 'radio', group = 'objective', text = 'All bosses' },
     },
-    { type = 'label', text = 'Randomization Options' },
-    { type = 'check', value = false, id = 'puppy', text = "Puppysanity"},
-    { height = false },
   },
   { style = 'dialogFoot',
     {},