From e1811934d4c3f21a9f2379f8ce0ce8c61747f6e7 Mon Sep 17 00:00:00 2001 From: duncathan Date: Fri, 28 Feb 2020 15:52:01 -0600 Subject: [PATCH 01/10] regions get logged in proper order --- src/database/region.lua | 2 ++ src/database/world_graph.lua | 11 ++++++++++- src/randomizer.lua | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/database/region.lua b/src/database/region.lua index 31e335f..446a609 100644 --- a/src/database/region.lua +++ b/src/database/region.lua @@ -4,6 +4,8 @@ function C:new(worldGraph, name) self.locations = {} self.world = worldGraph self.name = name + self.order = worldGraph.order + worldGraph.order = worldGraph.order + 1 end function C:canAccess(items) diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index 03f4d10..efecb14 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -409,6 +409,7 @@ local worldGraph = Class:extend() function worldGraph:new(items) self.items = items + self.order = 0 self.regions = { firstCave = firstCave(self), @@ -550,7 +551,15 @@ function worldGraph.locationsArray(locations) end function worldGraph:logLocations() - for k,r in pairs(self.regions) do + local array = {} + for k,v in pairs(self.regions) do + table.insert(array, v) + end + local function sort(a,b) + return a.order < b.order + end + + for k,r in ipairs(_.sort(array,sort)) do if next(r.locations) then logSpoiler("") logSpoiler("Region: " .. r.name) diff --git a/src/randomizer.lua b/src/randomizer.lua index bf7aa4f..4dcc730 100644 --- a/src/randomizer.lua +++ b/src/randomizer.lua @@ -37,6 +37,7 @@ function C:new() self.obj = "" self.sharecode = "" self.mychar = "" + self.spawn = "" end function C:setPath(path) From d2ec0d633f197e781ca0947e25eb3c5afac14798 Mon Sep 17 00:00:00 2001 From: duncathan Date: Fri, 28 Feb 2020 16:58:29 -0600 Subject: [PATCH 02/10] adds two spawn points, arthur's house and camp --- src/database/items.lua | 8 ++--- src/database/world_graph.lua | 63 +++++++++++++++++++++++++++++------- src/randomizer.lua | 14 +++++--- 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/src/database/items.lua b/src/database/items.lua index 4e17a77..cce047e 100644 --- a/src/database/items.lua +++ b/src/database/items.lua @@ -359,10 +359,10 @@ local function _itemData() ---------------- -- GAME MODES -- ---------------- - objBadEnd = objective("Bad Ending", " Date: Fri, 28 Feb 2020 17:23:21 -0600 Subject: [PATCH 03/10] implements UI and increases randomness --- src/database/world_graph.lua | 4 ++-- src/randomizer.lua | 42 +++++++++++++++++++++++------------- src/ui/draw.lua | 12 ++++++++++- src/ui/settings.lua | 6 ++++++ 4 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index 1712603..d09f6c2 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -20,9 +20,9 @@ function firstCave:new(worldGraph) } self.requirements = function(self, items) - if world:StartPoint() then + if self.world:StartPoint() then return true - else + elseif self.world:Arthur() or self.world:Camp() then return _has(items, "flight") and self.world.regions.mimigaVillage:canAccess(items) end end diff --git a/src/randomizer.lua b/src/randomizer.lua index e1daca4..13de009 100644 --- a/src/randomizer.lua +++ b/src/randomizer.lua @@ -144,18 +144,26 @@ function C:getObjective() end function C:_shuffleItems(tscFiles) - local obj = self:getObjective() - obj.name = obj.name .. (", %s"):format(worldGraph.spawn) - obj.script = obj.script .. worldGraph:getSpawnScript() + -- ensure unique randomization between settings with the same seed + local function shuffle(t) + if self.obj == "objBadEnd" then return _.shuffle(_.shuffle(t)) end + if self.obj == "objNormalEnd" then return _.shuffle(_.shuffle(_.shuffle(t))) end + if self.obj == "objAllBosses" then return _.shuffle(_.shuffle(_.shuffle(_.shuffle(t)))) end + return _.shuffle(t) + end + + local obj = self:getObjective()[1] + obj.name = obj.name .. (", %s"):format(self.worldGraph.spawn) + obj.script = obj.script .. self.worldGraph:getSpawnScript() -- place the objective scripts in Start Point - self:_fastFillItems(self:getObjective(), self.worldGraph:getObjectiveSpot()) + self:_fastFillItems({obj}, self.worldGraph:getObjectiveSpot()) if self.worldGraph:StartPoint() then -- 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]) + _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1]) elseif self.worldGraph:Camp() then -- give Dr. Gero a strong weapon... you'll need it - self.worldGraph:getDrGero()[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponStrong"))[1]) + self.worldGraph:getDrGero()[1]:setItem(shuffle(self.itemDeck:getItemsByAttribute("weaponStrong"))[1]) end -- place the bomb on MALCO for bad end @@ -163,24 +171,24 @@ function C:_shuffleItems(tscFiles) self.worldGraph:getMALCO()[1]:setItem(self.itemDeck:getByKey("bomb")) 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"))) + local mandatory = _.compact(shuffle(self.itemDeck:getMandatoryItems(true))) + local optional = _.compact(shuffle(self.itemDeck:getOptionalItems(true))) + local puppies = _.compact(shuffle(self.itemDeck:getItemsByAttribute("puppy"))) if not self.puppy then -- then fill puppies, for normal gameplay - self:_fastFillItems(puppies, _.shuffle(self.worldGraph:getPuppySpots())) + self:_fastFillItems(puppies, shuffle(self.worldGraph:getPuppySpots())) else -- for puppysanity, shuffle puppies in with the mandatory items - mandatory = _.shuffle(_.append(mandatory, puppies)) + mandatory = shuffle(_.append(mandatory, puppies)) puppies = {} end -- next fill hell chests, which cannot have mandatory items - self:_fastFillItems(optional, _.shuffle(self.worldGraph:getHellSpots())) + self:_fastFillItems(optional, shuffle(self.worldGraph:getHellSpots())) -- place mandatory items with assume fill - self:_fillItems(mandatory, _.shuffle(_.reverse(self.worldGraph:getEmptyLocations()))) + self:_fillItems(mandatory, shuffle(_.reverse(self.worldGraph:getEmptyLocations()))) -- place optional items with a simple random fill local opt = #optional @@ -188,7 +196,7 @@ function C:_shuffleItems(tscFiles) if opt > loc then logWarning(("Trying to fill more optional items than there are locations! Items: %d Locations: %d"):format(opt, loc)) end - self:_fastFillItems(optional, _.shuffle(self.worldGraph:getEmptyLocations())) + self:_fastFillItems(optional, shuffle(self.worldGraph:getEmptyLocations())) self.worldGraph:writeItems(tscFiles) self.worldGraph:logLocations() @@ -276,6 +284,8 @@ function C:_unmountDirectory(path) end function C:_logSettings() + -- these random calls are a hacky way to make sure that + -- randomization changes between seeds if settings change local obj = "Best Ending" if self.obj == "objBadEnd" then obj = "Bad Ending" @@ -285,8 +295,10 @@ function C:_logSettings() obj = "All Bosses" end + local spawn = (", %s"):format(self.worldGraph.spawn) + local puppy = self.puppy and ", Puppysanity" or "" - logNotice(("Game settings: %s"):format(obj .. puppy)) + logNotice(("Game settings: %s"):format(obj .. spawn .. puppy)) end function C:_updateSettings() diff --git a/src/ui/draw.lua b/src/ui/draw.lua index cb0e964..16f7a9a 100644 --- a/src/ui/draw.lua +++ b/src/ui/draw.lua @@ -19,7 +19,7 @@ function C:setup() layout:show() end -function C:loadSettings(puppy, obj, seed, mychar) +function C:loadSettings(puppy, obj, seed, mychar, spawn) settings.puppy.value = puppy if obj == "objBadEnd" or obj == 1 then @@ -55,6 +55,15 @@ function C:loadSettings(puppy, obj, seed, mychar) settings.mychar.index = 7 end settings.mychar.value = "override" + + if spawn == "Start Point" then + settings.spawn.index = 1 + elseif spawn == "Arthur's House" then + settings.spawn.index = 2 + elseif spawn == "Camp" then + settings.spawn.index = 3 + end + settings.spawn.value = "override" end layout.version.text = 'Cave Story Randomizer [Open Mode] v' .. VERSION @@ -74,6 +83,7 @@ layout.go:onPress(function() Randomizer.obj = settings.objective.value Randomizer.puppy = settings.puppy.value Randomizer.mychar = settings.mychar.value + Randomizer.worldGraph.spawn = settings.spawn.value C:setStatus(Randomizer:randomize()) diff --git a/src/ui/settings.lua b/src/ui/settings.lua index bd5d9d7..5b12c0a 100644 --- a/src/ui/settings.lua +++ b/src/ui/settings.lua @@ -29,6 +29,12 @@ return { style = 'dialog', { text = " King", value = "assets/myChar/King.bmp", icon = "assets/icon/King.png" }, { text = " Kanpachi", value = "assets/myChar/Kanpachi.bmp", icon = "assets/icon/Kanpachi.png" }, { text = " Frog", value = "assets/myChar/Frog.bmp", icon = "assets/icon/Frog.png" } + }, + { type = 'label', text = 'Spawn Location', minheight = 32 }, + { type = 'stepper', id = 'spawn', align = 'middle left', height = 48, width = 200, + { text = "Start Point", value = "Start Point" }, + { text = "Arthur's House", value = "Arthur's House" }, + { text = "Camp", value = "Camp" } } }, }, From ed6234a1c0c6549990a8b9ec55d0ecfcd3f4834a Mon Sep 17 00:00:00 2001 From: duncathan Date: Fri, 28 Feb 2020 17:31:24 -0600 Subject: [PATCH 04/10] possible to backtrack from mimiga village to labyrinth through waterway --- pre-edited-cs/data/Stage/Drain.tsc | 2 +- pre-edited-cs/data/Stage/Pool.pxe | Bin 200 -> 212 bytes pre-edited-cs/data/Stage/Pool.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/Drain.txt | 5 +++-- pre-edited-cs/data/Stage/ScriptSource/Pool.txt | 4 ++++ .../data/Stage/ScriptSource/Stream.txt | 6 +++++- pre-edited-cs/data/Stage/Stream.tsc | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pre-edited-cs/data/Stage/Drain.tsc b/pre-edited-cs/data/Stage/Drain.tsc index 2983181..8dc3130 100644 --- a/pre-edited-cs/data/Stage/Drain.tsc +++ b/pre-edited-cs/data/Stage/Drain.tsc @@ -1 +1 @@ -roˆ••ž•ro¡²³¦¡«±¯•••Ÿ••žš¡¨²º•••¡«¦®••••¡ª³©roˆ••ž–ro¡²³¦¡¨²º•••¡«¦®•••–¡ª³©roˆ••ž—ro¡²³¦¡«±¯•••Ÿ••ž›¡¨²º•••¡«¦®•••—¡ª³©roˆ••ž˜ro¡²³¦¡¨²º•••¡«¦®•••˜¡ª³©roˆ••ž™ro¡²³¦¡¨²º•••¡«¦®•••™¡ª³©roˆ••žšro¡¨²º••—˜¡«¦®••••¡ª³©roˆ••ž›ro¡¨²º••—˜¡«¦®•••—¡ª³©roˆ•–••ro¡°ª¾¡¸´º••––¡¦³µ•–••Ÿ••••Ÿ•••—¡«¦´••••¡¹·¦••™šŸ••ž•Ÿ••–Ÿ••š˜roˆ•–•–ro¡°ª¾¡²¸¬®Ù…ÜÔӌمÔÕÊÓ“¡³´©¡ª³©roˆ•––•ro¡°ª¾¡«±¯•œ•Ÿ•–––¡²¸¬‡©ÆÓÌÊ׆‡…ØÎÌÓØ…Æ×Ê…ÕÑÆØÙÊ×ÊÉroÆÑÑ…ÔÛÊ×…ÙÍÊ…ÉÔÔד¡³´©ro®ÙŒØ…Õ×ÔÇÆÇÑÞ…ÓÔÙ…Æ…ÌÔÔÉ…ÎÉÊÆroÙÔ…ÊÓÙÊ×…ÆÑÔÓÊ“““¡³´©¡ª³©roˆ•–––ro¡°ª¾¡¸´º••––¡¦³µ•––•Ÿ••••Ÿ•••—¡«¦´•••—¡¹·¦••™œŸ••ž—Ÿ•••™Ÿ••–œroˆ•–—•ro¡®¹¯••—–Ÿ•–—–ro¡°ª¾¡²¸¬¾ÔÚ…ÍÊÆ×…ÙÍÊ…ØÔÚÓÉ…ÔË…×ÚØÍÎÓÌroÜÆÙÊ×…Ë×ÔÒ…ÜÎÙÍÎÓ“¡³´©ro®Ù…ÜÔÚÑÉӌمÇÊ…Æ…ÌÔÔÉ…ÎÉeÆ…ÙÔ…ÍÊÆÉroÎÓ…ÜÎÙÍÔÚÙ…ÆÓ…ÆÎ×…ÙÆÓГ¡³´©¡ª³©roˆ•–—–ro¡°ª¾¡«¦´•••˜¡¹·¦••™Ÿ••ž˜Ÿ•–ššŸ•••–roroˆ•–š•ro¡°ª¾¡²³¦¡¨²º•••¡¼¦®•••š¡¨³µ•˜••Ÿ•––œŸ•••—¡«¦®•••—ro¡¼¦®••–•ro¡¦³µ•˜••Ÿ•••˜Ÿ•••—¡¼¦®••–›ro¡¦³µ•˜••Ÿ•••–Ÿ•••—ro¡²¸¬¡¹º·¡«¦¨••—š¦×Ê…ÜÊ…ØÙÎÑÑ…ÎÓ…ÙÍÊro±ÆÇÞ×ÎÓÙͤ¡³´©¡«¦¨••••¡¨±´ro¡¦³µ•˜••Ÿ•••˜Ÿ•••—¡¼¦®••›™ro¡¦³µ•˜••Ÿ••—•Ÿ•••—¡¼¦®••š•ro¡¦³µ•˜••Ÿ•••–Ÿ•••—¡¼¦®••–•ro¡¦³µ•˜••Ÿ•••˜Ÿ•••—¡¼¦®•–™–ro¡¦³µ•˜••Ÿ••—•Ÿ•••—¡¼¦®••–•ro¡¸´º••––¡¦³µ•––•Ÿ••••Ÿ•••—¡¼¦®••—•ro¡©³µ•˜••¡¼¦®••—•ro¡¸´º••––¡¦³µ•––•Ÿ••••Ÿ••••¡«±•—•¡ª³©roˆ•˜••roˆ•˜˜•ro¡µ·®¡²¸¬¾ÔÚ…ØÊÊ…Æ…ÇÚÙÙÔÓ“¡³´©¡¸´º••™˜¡¨±·¡²¸¬µ×ÊØØÊÉ…ÎÙ“¡³´©¡¨±´ro¡¼¦®••š•ro¡¸´º••œ–ro¡¨²µ•••œŸ••˜šŸ••••ro¡¨²µ•••Ÿ••˜šŸ••••ro¡¨²µ••—›Ÿ••˜–Ÿ•–––ro¡¼¦®••š•¡ª³©ro \ No newline at end of file +„š§§°§„³ÄŸ³½ÃÁ§¯§§±§§°¬³ºÄ̧§§¯³½¸À§§§§³¼Å»„š§§°¨„³ÄŸ³ºÄ̧§§¯³½¸À§§§¨³¼Å»„š§§°©„³ÄŸ³½ÃÁ§¯§§±§§°­³ºÄ̧§§¯³½¸À§§§©³¼Å»„š§§°ª„³ÄŸ³ºÄ̧§§¯³½¸À§§§ª³¼Å»„š§§°«„³ÄŸ³½ÃÁ§¯§§±§§°®³ºÄ̧§§¯³½¸À§§§«³¼Å»„š§§°¬„³ºÄ̧§©ª³½¸À§§§§³¼Å»„š§§°­„³ºÄ̧§©ª³½¸À§§§©³¼Å»„š§§°®„³ºÄ̧§©ª³½¸À§§§«³¼Å»„š§¨§§„³Â¼Ð³ÊÆ̧§¨¨³¸Åǧ¨§§±§§§§±§§§©³½¸Æ§§§§³Ëɸ§§«¬±§§°§±§§¯¨±§§¬ª„š§¨§¨„³Â¼Ð³ÄʾÀë—îæåžë—æçÜ女ÅÆ»³¼Å»„š§¨¨§„³Â¼Ð³½ÃÁ§®¯§±§¨¨¨³Äʾ™»ØåÞÜ阙—êàÞåê—ØéÜ—çãØêëÜéÜÛ„Øãã—æíÜé—ëßÜ—Ûææ饳ÅÆ»„Àëžê—çéæÙØÙãð—åæë—Ø—ÞææÛ—àÛÜØ„ëæ—ÜåëÜé—ØãæåÜ¥¥¥³ÅÆ»³¼Å»„š§¨¨¨„³Â¼Ð³ÊÆ̧§¨¨³¸Åǧ¨¨§±§§§§±§§§©³½¸Æ§§§©³Ëɸ§§«®±§§°©±§§§«±§§¨®„š§¨©§„³ÀËÁ§§©¨±§¨©¨„³Â¼Ð³ÄʾÐæì—ßÜØé—ëßÜ—êæìåÛ—æÝ—éìêßàåÞ„îØëÜé—Ýéæä—îàëßà女ÅÆ»„Àë—wæìãÛåžë—ÙÜ—Ø—ÞææÛ—àÛÜØ—ëæ—ßÜØÛ„àå—îàëßæìë—Øå—Øàé—ëØå⥳ÅÆ»³¼Å»„š§¨©¨„³Â¼Ð³½¸Æ§§§ª³Ëɸ§§«¯±§§°ª±§¨¬¬±§§§¨„„š§¨¬§„³Â¼Ð³ÄŸ³ºÄ̧§§¯³Î¸À§§§¬³ºÅǧª§§±§¨¨®±§§§©³½¸À§§§©„³Î¸À§§¨§„³¸Åǧª§§±§§§ª±§§§©³Î¸À§§¨­„³¸Åǧª§§±§§§¨±§§§©„³Äʾ³ËÌɳ½¸º§§©¬¸éÜ—îÜ—êëàãã—àå—ëßÜ„ÃØÙðéàåë߶³ÅÆ»³½¸º§§§§³ºÃÆ„³¸Åǧª§§±§§§ª±§§§©³Î¸À§§­«„³¸Åǧª§§±§§©§±§§§©³Î¸À§§¬§„³¸Åǧª§§±§§§¨±§§§©³Î¸À§§¨§„³¸Åǧª§§±§§§ª±§§§©³Î¸À§¨«¨„³¸Åǧª§§±§§©§±§§§©³Î¸À§§¨§„³ÊÆ̧§¨¨³¸Åǧ¨¨§±§§§§±§§§©³Î¸À§§©§„³»Åǧª§§³Î¸À§§©§„³ÊÆ̧§¨¨³¸Åǧ¨¨§±§§§§±§§§§³½Ã¢§¯©§³¼Å»„š§ª§§„š§ªª§„³ÇÉÀ³ÄʾÐæì—êÜÜ—Ø—Ùìëëæ女ÅÆ»³ÊÆ̧§«ª³ºÃɳÄʾÇéÜêêÜÛ—à륳ÅÆ»³ºÃÆ„³Î¸À§§¬§„³ÊÆ̧§®¨„³ºÄǧ§§®±§§ª¬±§§§§„³ºÄǧ§§¯±§§ª¬±§§§§„³ºÄǧ§©­±§§ª¨±§¨¨¨„³Î¸À§§¬§³¼Å»„ \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pool.pxe b/pre-edited-cs/data/Stage/Pool.pxe index 86f833b179bb37efdcf5ec76807a1a07ecd281cc..5bf2ad43e52d8dddaf612c0ea6ae5c0569ec283f 100644 GIT binary patch delta 26 hcmX@Xc!iNQAi|YFa3bqr9&QF6hB*>n7~L2cGyq<@1~mWx delta 13 Ucmcb@c!H5NAi|YFU?S^b037lI`Tzg` diff --git a/pre-edited-cs/data/Stage/Pool.tsc b/pre-edited-cs/data/Stage/Pool.tsc index a1adb80..60e291f 100644 --- a/pre-edited-cs/data/Stage/Pool.tsc +++ b/pre-edited-cs/data/Stage/Pool.tsc @@ -1 +1 @@ -roˆ••ž•ro¡²³¦¡«±¯•˜™–Ÿ••žš¡¨²º•••ž¡«¦®••••¡ª³©roˆ••ž–ro¡²³¦¡«±¯•˜™–Ÿ••ž›¡¨²º•••ž¡«¦®•••–¡ª³©roˆ••ž—ro¡²³¦¡«±¯•˜™–Ÿ••žœ¡¨²º•••ž¡«¦®•••—¡ª³©roˆ••ž˜ro¡²³¦¡«±¯•˜™–Ÿ••ž¡¨²º•••ž¡«¦®•••˜¡ª³©roˆ••ž™ro¡²³¦¡«±¯•˜™–Ÿ••žž¡¨²º•••ž¡«¦®•••™¡ª³©roˆ••žšro¡¨²º••—¡«¦®••••¡ª³©roˆ••ž›ro¡¨²º••—¡«¦®•••–¡ª³©roˆ••žœro¡¨²º••—¡«¦®•••—¡ª³©roˆ••žro¡¨²º••—¡«¦®•••˜¡ª³©roˆ••žžro¡¨²º••—¡«¦®•••™¡ª³©roˆ•–••ro¡µ·®¡«¦´•••—¡¹·¦••––Ÿ••ž—Ÿ•••–Ÿ••˜roˆ•–•–ro¡µ·®¡«¦´•••—¡¹·¦••––Ÿ•˜•Ÿ•••–Ÿ••˜roˆ•—••ro¡°ª¾¡²¸¬¸Úʤ¡³´©¡¨±·¾ÊÆÍ‘…®…ÐÓÔÜ…ÍÊד¡³´©ro¹ÍÆٌ؅ÙÍÊ…ÈÚÙÊ…ÌÎ×Ñ…ÜÍÔ…ØÙÆÞØroÈÔÔÕÊÉ…ÚÕ…ÎÓ…¦×ÙÍÚ׌؅ÍÔÚØÊroÆÑÑ…ÙÍÊ…ÙÎÒÊ‘…×ÎÌÍÙ¤¡³´©ro¸Íe…ØÍÔÜÊÉ…ÚÕ…ÍÊ×Ê…ÓÔÙ…ÙÔÔroÑÔÓÌ…ÆÌÔ“¡³´©ro¼Ê…ËÔÚÓÉ…ÍÊ×…ÜÆØÍÊÉ…ÚÕ…×ÎÌÍÙroÍÊ×Ê…ÎÓ…ÙÍÊ…×ÊØÊ×ÛÔÎד¡³´©ro¸ÍÊ…ÉÔÊØӌمØÊÊÒ…ÙÔ…ÑÎÐÊ…ÚØroÒÚÈÍ“““¡³´©ro®…ÉÔӌمÐÓÔÜ…ÜÍÞ‘…ØÎÓÈÊ…ØÍÊŒØroÆ…²ÎÒÎÌÆ…ÏÚØÙ…ÑÎÐÊ…ÚØ“¡³´©¡ª³©roˆ•˜••ro¡µ·®ro¡«±•˜—›¡«±•˜œ–¡«±’•˜—–¡«±•˜›—ro¡©³µ•˜••¡ª»ª•˜•–roˆ•˜•–ro¡ª»ª••š™roˆ•™••ro¡ª³©roˆ•™•–ro¡°ª¾¡²¾©•••—¡©³µ•™••¡²¸¬¡«¦¨•••›¦Í†¡³´©¡¨±´ro¡¦³µ•™•—Ÿ•••›Ÿ•••—¡¼¦®••œ¡©³µ•™•—¡«±•˜œ–¡ª³©roˆ•™•—roˆ•™–•ro¡°ª¾¡¨²º••••¡­²¨¡²¾©•••—ro¡¨³µ•™–•Ÿ•–š•Ÿ••••¡¼¦®•••–ro¡¦³µ•™–•Ÿ••––Ÿ•••—¡¼¦®•–š•ro¡«¦®•••–¡¼¦®•–••ro¡¸²¨¡©³µ•™–•¡¼¦®••š•¡¨²º••—¡ª»ª•™––roˆ•™––ro¡«±¯—™•™Ÿ••••¡«±—™•™¡ª»ª•™–—roˆ•™–—ro¡ª»ª••› \ No newline at end of file +|y’ŸŸ¨Ÿ|y«¼½°«µ»¹Ÿ¢£ ©ŸŸ¨¤«²¼ÄŸŸŸ¨«µ°¸ŸŸŸŸ«´½³|y’ŸŸ¨ |y«¼½°«µ»¹Ÿ¢£ ©ŸŸ¨¥«²¼ÄŸŸŸ¨«µ°¸ŸŸŸ «´½³|y’ŸŸ¨¡|y«¼½°«µ»¹Ÿ¢£ ©ŸŸ¨¦«²¼ÄŸŸŸ¨«µ°¸ŸŸŸ¡«´½³|y’ŸŸ¨¢|y«¼½°«µ»¹Ÿ¢£ ©ŸŸ¨§«²¼ÄŸŸŸ¨«µ°¸ŸŸŸ¢«´½³|y’ŸŸ¨£|y«¼½°«µ»¹Ÿ¢£ ©ŸŸ¨¨«²¼ÄŸŸŸ¨«µ°¸ŸŸŸ£«´½³|y’ŸŸ¨¤|y«²¼ÄŸŸ¡§«µ°¸ŸŸŸŸ«´½³|y’ŸŸ¨¥|y«²¼ÄŸŸ¡§«µ°¸ŸŸŸ «´½³|y’ŸŸ¨¦|y«²¼ÄŸŸ¡§«µ°¸ŸŸŸ¡«´½³|y’ŸŸ¨§|y«²¼ÄŸŸ¡§«µ°¸ŸŸŸ¢«´½³|y’ŸŸ¨¨|y«²¼ÄŸŸ¡§«µ°¸ŸŸŸ£«´½³|y’Ÿ ŸŸ|y«¿Á¸«µ°¾ŸŸŸ¡«ÃÁ°ŸŸ  ©ŸŸ¨¡©ŸŸŸ ©ŸŸ¢§|y’Ÿ Ÿ |y«¿Á¸«µ°¾ŸŸŸ¡«ÃÁ°ŸŸ  ©Ÿ¢Ÿ§©ŸŸŸ ©ŸŸ¢§|y’Ÿ¡ŸŸ|y«º´È«¼Â¶ÂäÔ®«½¾³«²»ÁÈÔÐ×›¸ÚÝÞæ×Ô᫽¾³|yÃ×Ðã–âã×ÔÒäãÔÖØáÛæ×ÞâãÐèâ|yÒÞÞßÔÓäßØÝ°áã×äá–â×ÞäâÔ|yÐÛÛã×ÔãØÜÔ›áØÖ×㮫½¾³|yÂ×Ôâ×ÞæÔÓäß×ÔáÔÝÞããÞÞ|yÛÞÝÖÐÖÞ«½¾³|yÆÔÕoäÝÓ×ÔáæÐâ×ÔÓäßáØÖ×ã|y×ÔáÔØÝã×ÔáÔâÔáåÞØ᫽¾³|yÂ×ÔÓÞÔâÝ–ãâÔÔÜãÞÛØÚÔäâ|yÜäÒ׫½¾³|y¸ÓÞÝ–ãÚÝÞææ×è›âØÝÒÔâ×Ô–â|yмØÜØÖÐÙäâãÛØÚÔä⫽¾³«´½³|y’Ÿ¢ŸŸ|y«¿Á¸|y«µ»šŸ¢¡¥«µ»šŸ¢¦ «µ»œŸ¢¡ «µ»šŸ¢¥¡|y«³½¿Ÿ¢ŸŸ«´Å´Ÿ¢Ÿ |y’Ÿ¢Ÿ |y«´Å´ŸŸ¤£|y’Ÿ£ŸŸ|y«´½³|y’Ÿ£Ÿ |y«º´È«¼È³ŸŸŸ¡«³½¿Ÿ£ŸŸ«¼Â¶«µ°²ŸŸŸ¥°×«½¾³«²»¾|y«°½¿Ÿ£Ÿ¡©ŸŸŸ¥©ŸŸŸ¡«Æ°¸ŸŸ¦§«³½¿Ÿ£Ÿ¡«µ»šŸ¢¦ «´½³|y’Ÿ£Ÿ¡|y’Ÿ£ Ÿ|y«º´È«²¼ÄŸŸŸŸ«·¼²«¼È³ŸŸŸ¡|y«²½¿Ÿ£ Ÿ©Ÿ ¤Ÿ©ŸŸŸŸ«Æ°¸ŸŸŸ |y«°½¿Ÿ£ Ÿ©ŸŸ  ©ŸŸŸ¡«Æ°¸Ÿ ¤Ÿ|y«µ°¸ŸŸŸ «Æ°¸Ÿ ŸŸ|y«Â¼²«³½¿Ÿ£ Ÿ«Æ°¸ŸŸ¤Ÿ«²¼ÄŸŸ¡§«´Å´Ÿ£  |y’Ÿ£  |y«µ»¹¡£Ÿ£©ŸŸŸŸ«µ»š¡£Ÿ£«´Å´Ÿ£ ¡|y’Ÿ£ ¡|y«´Å´ŸŸ§¥|y’Ÿ¤ŸŸ|y«º´È«¼Â¶«ÃÄÁ¶ÞÑÐÒÚãÞã×ÔÛÐÑèáØÝã×®«È½¹ŸŸŸŸ|y«¿Á¸«µ°¾ŸŸŸ£«ÃÁ°ŸŸ£¥©ŸŸ¨£©ŸŸŸ§©ŸŸŸ¨ \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/Drain.txt b/pre-edited-cs/data/Stage/ScriptSource/Drain.txt index 660582c..c434488 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Drain.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Drain.txt @@ -8,12 +8,14 @@ #0093 Date: Fri, 28 Feb 2020 17:50:30 -0600 Subject: [PATCH 05/10] generation works! --- src/database/items.lua | 6 +++--- src/database/world_graph.lua | 6 +++++- src/randomizer.lua | 25 ++++++++++++++++++++----- src/settings.lua | 2 ++ src/ui/draw.lua | 11 ++++++----- 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/database/items.lua b/src/database/items.lua index cce047e..d9f410b 100644 --- a/src/database/items.lua +++ b/src/database/items.lua @@ -88,17 +88,17 @@ local function _itemData() machineGun = { name = "Machine Gun", script = " Date: Sat, 29 Feb 2020 04:29:03 -0600 Subject: [PATCH 06/10] gives hp, locks arthur's front door --- pre-edited-cs/data/Stage/MazeW.tsc | 2 +- pre-edited-cs/data/Stage/Pens1.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/MazeW.txt | 12 +++++++----- pre-edited-cs/data/Stage/ScriptSource/Pens1.txt | 7 +++++++ src/database/world_graph.lua | 6 +++--- src/randomizer.lua | 4 +++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pre-edited-cs/data/Stage/MazeW.tsc b/pre-edited-cs/data/Stage/MazeW.tsc index df03473..b0364b2 100644 --- a/pre-edited-cs/data/Stage/MazeW.tsc +++ b/pre-edited-cs/data/Stage/MazeW.tsc @@ -1 +1 @@ -=:S``i`=:l}~qls}…``cglvqy````lu~t=:S``ia=:l}~qls}…``cglvqy```alu~t=:S``ib=:l}~qls}…``cglvqy```blu~t=:S``ic=:l}~qls}…``cglvqy```clu~t=:S``id=:l}~qls}…``cglvqy```dlu~t=:S`a``=:l€‚ylvq```bl„‚q``chj``ibj```ej```c=:S`a`a=:S`a`b=:l€‚ylƒ…``aalt~€`a`blvq```dl„‚q``d`j``ibj```dj```e=:S`a`c=:lv|z`fhaj`a`e=:ly„z``agj`a`d=:l€‚yl}ƒw|Ÿ“›•”^l~tlu~t=:S`a`d=:l€‚ylƒ…``bblwy„a`aglv|[`fhaly„]``ag=:l}ƒwl„…‚…£•”P¤˜•Pmsœ™ž™“P{•©m^l~tls|lu†u`a`e=:S`a`e=:l€‚ylƒ…``aalt~€`a`clvq````l„‚q``daj``i`j``aej```i=:S`a`f=:l{u‰lƒ…``aalq~€`a`fj``0`j```blvq```dl„‚q``dbj``idj```ej```i=:S`aa`=:lu†u`aaa=:S`aaa=:l{u‰lƒ…``aalq~€`aa`j````j```blvq```bl„‚q``dcj``ibj```dj``ac=:S`ab`=:l{u‰lvq```dl„‚q``d`j``idj``abj```b=:S`c``=:S`c`a=:lt~€`c`alrq```alv|]`fh`lu~t=:S`c`b=:lt~€`c`bls}…```glrq``a`ls~€`c``j``acj````lrƒ|````lu~t=:Sa```=:l{u‰lvr````j``afl‡qy`be`ls}…````=:l}ƒcl„…‚ls}…``ae=:t•–•‘¤•”P}Ÿž£¤•¢Pˆ^lv}``afl‡qy`af`lv|[fa`fl~tls|ls}…``cg=:ls~€`c``j````j````lv|[`fh`lu~t=:Sab``=:l{u‰lq~€ab``j``b`j```b=:lv~ab``j``aflvqy```a=:l‡qy`a``lvq```al„‚q``dgjab``j``chj``af \ No newline at end of file +>;Taaja>;m~rmt~†aadhmwrzaaaamw}{gcackaajfmvu>;Taajb>;m~rmt~†aadhmwrzaaabmw}{gcackaajfmvu>;Taajc>;m~rmt~†aadhmwrzaaacmw}{gcackaajfmvu>;Taajd>;m~rmt~†aadhmwrzaaadmw}{gcackaajfmvu>;Taaje>;m~rmt~†aadhmwrzaaaemw}{gcackaajfmvu>;Taajf>;mt~aaiakaaagkaabgmvu>;Tabaa>;mƒzmwr€aaacm…ƒraadikaajckaaafkaaad>;Tabab>;Tabac>;mƒzm„€†aabbmuabacmwr€aaaem…ƒraaeakaajckaaaekaaaf>;Tabad>;mw}{agibkabaf>;mz…{aabhkabae>;mƒzm~„x} ”œ–•_m€umvu>;Tabae>;mƒzm„€†aaccmxz…babhmw}\agibmz…^aabh>;m~„xm…†ƒ†¤–•Q¥™–QntšŸš”Q|–ªn_m€umt}€mv‡vabaf>;Tabaf>;mƒzm„€†aabbmuabadmwr€aaaam…ƒraae1kaajakaabfkaaaj>;Tabag>;m|vŠm„€†aabbmrabagkaaaakaaacmwr€aaaem…ƒraaeckaajekaaafkaaaj>;Tabba>;mv‡vabbb>;Tabbb>;m|vŠm„€†aabbmrabbakaaaakaaacmwr€aaacm…ƒraaedkaajckaaaekaabd>;Tabca>;m|vŠmwr€aaaem…ƒraaeakaajekaabckaaac>;Tadaa>;Tadab>;muadabms€raaabmw}^agiamvu>;Tadac>;muadacmt~†aaahms€raabamtadaakaabdkaaaams„}aaaamvu>;Tbaaa>;m|vŠmw€saaaakaabgmˆrzacfamt~†aaaa>;m~„dm…†ƒmt~†aabf>;u–—–’¥–•Q~ Ÿ¤¥–£Q‰_mw€~aabgmˆrzabgamw}\gbagm€umt}€mt~†aadh>;mtadaakaaaakaaaamw}\agiamvu>;Tbcaa>;m|vŠmrbcaakaacakaaac>;mw€bcaakaabgmwrzaaab>;mˆrzabaamwr€aaabm…ƒraaehkbcaakaadikaabg \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pens1.tsc b/pre-edited-cs/data/Stage/Pens1.tsc index 3ecf584..99a48a5 100644 --- a/pre-edited-cs/data/Stage/Pens1.tsc +++ b/pre-edited-cs/data/Stage/Pens1.tsc @@ -1 +1 @@ -=:S``i`=:l}~qls}…```blvqy````lu~t=:S``ia=:l}~qls}…```blvqy```alu~t=:S``ib=:l}~qls}…```blvqy```blu~t=:S``ic=:l}~qls}…```blvqy```clu~t=:S``id=:l}~qlv|z`cdaj``iels}…```blvqy```dlu~t=:S``ie=:ls}…``adlvqy```dlu~t=:S``ih=:ls}…``ad=:lq~€`e``j```aj````lvqy```d=:ls~€`c`aj`aabj```bl‡qy`a``=:lq~€`e``j````j````=:l}‰t```blƒ}slt~€`c`alu~t=:S``ii=:l{u‰l}~qlv|z`cdaj``ihls}…```b=:lq~€`e``j```aj````lvqy```d=:ls~€`c`aj`aabj```bl‡qy`a``=:lq~€`e``j````j````=:l}‰t```blƒ}slt~€`c`alu~t=:S`a``=:l€‚ylvq```dl„‚q``a`j``idj``ahj``cb=:S`a`a=:l€‚ylvq```dl„‚q``abj``idj``cgj``aa=:S`a`b=:l€‚ylƒ…``aalt~€`a`blvq```dl„‚q``aaj``idj``afj``ec=:S`b``=:l{u‰=:lƒq„l}ƒwq¢¤˜¥¢W£Pq¢£•ž‘œjl~t=:lq}z```aj`b`a=:lq}z```cj`b`b=:lu†u`b`e=:S`b`a=:lv|zbh`bj`b`clu†u`b`e=:S`b`b=:lv|zbh`bj`b`dlu†u`b`e=:S`b`c=:l{u‰l}ƒwlwy„```c„¢‘”•P©Ÿ¥¢Pƒž‘›•P–Ÿ¢P‘Pv™¢•’‘œœol‰~z`b`el„q}```aj```cj````lu†u`b`e=:S`b`d=:l{u‰l}ƒwlwy„```a„¢‘”•P©Ÿ¥¢Pv™¢•’‘œœP–Ÿ¢P‘Pƒž‘›•ol‰~z`b`el„q}```cj```aj````lu†u`b`e=:S`b`e=:lq}z```ij`b`f=:lq}z``abj`b`g=:lu†u`baa=:S`b`f=:lv|zbhaaj`b`hlu†u`baa=:S`b`g=:lv|zbhaaj`b`ilu†u`baa=:S`b`h=:l{u‰l}ƒwlwy„``ab„¢‘”•P©Ÿ¥¢Prœ‘”•P–Ÿ¢P‘P~••£™£ol‰~z`baal„q}```ij``abj````lu†u`baa=:S`b`i=:l{u‰l}ƒwlwy„```i„¢‘”•P©Ÿ¥¢P~••£™£P–Ÿ¢P‘Prœ‘”•ol‰~z`baal„q}``abj```ij````lu†u`baa=:S`ba`=:l{u‰l}ƒwvœŸ§•¢£^^^ol~tlu~t=:S`baa=:lv|zbhb`j`bablu†u`bad=:S`bab=:lq}z```gj`bac=:l{u‰l}ƒwlwy„```g€™“›P¥ P©Ÿ¥¢Pr¥’’œ•¢ol‰~z`badlq}[```gj`a``lu†u`bad=:S`bac=:l{u‰l}ƒwlwy„```gt¢Ÿ PŸ––P©Ÿ¥¢Pr¥’’œ•¢ol‰~z`badlq}]```glu†u`bad=:S`bad=:l{u‰l}ƒw~ŸPŸ¢•P§•‘ Ÿž£P¤ŸP¤¢‘”•^l~tlu~t=:S`c``=:S`c`a=:S`c`c=:S`e``=:l€ƒ[```ajf``al€ƒ[```bjf``bl€ƒ[```cjf``cl€ƒ[```djf``dl€ƒ[```ejf``e=:l{u‰lƒq„l}ƒwqP¤•œ• Ÿ¢¤•¢^l~tlƒ|€l~tlu~t=:S`f``=:lv|z`cbej`f`a=:l{u‰l}ƒwlvqs```i‡•œ“Ÿ•P’‘“›^l~tls|‚ƒ¥•W£P’‘“›^l~t=:ƒ˜•W£P’••žPœŸ“›•”P¥ P™ž=:¤˜•P“‘—•PŸ¥¤£™”•^l~t=:‡˜•žP¤˜•PtŸ“¤Ÿ¢W£P–œ¥ž›™•£=:“Ÿ•\P§•W¢•P—Ÿ™ž—P¤ŸP¤¢©=:¤ŸP—•¤P„Ÿ¢Ÿ›ŸP’‘“›^l~t=:yžP•¨“˜‘ž—•P–Ÿ¢Pƒ¥•\=:©Ÿ¥P£••^l~tls|‚y¤W£PžŸ¤P¦•¢©Pž™“•\PyP›žŸ§\=:’¥¤P„Ÿ¢Ÿ›ŸP™£PŸž•PŸ–P¥£^l~t=:„˜‘¤W£P§˜‘¤P©Ÿ¥P—•¤P§˜•ž=:©Ÿ¥P‘“¤P‘œŸž•^l~tlu~t=:S`f`a=:l{u‰l}ƒwlvqs```iyP˜Ÿ •P„Ÿ¢Ÿ›ŸW£P£‘–•^^^l~tlu~t=:S`fb`=:l{u‰ls}…````lv|[`aeflv|[`ddd=:lq~€`e``j```aj````=:l‡qy```bls~€`fbbj``eej````l‡qy``a`=:lvqy```d=:ls~€`fbaj`aacj````=:lq~€`fbaj``c`j````l‡qy`a``=:l}ƒwlvqs``ahŸŸŸ˜˜^^^l~tls|‚lvqs``a`^^^q¢•P©Ÿ¥PŸ›‘©ol~tls|lvqs````=:l‡qy``c`lq~€`fbaj````j```b=:l}ƒwlvqs``ah^^^}^l~tls|‚}©Pœ™–•P–œ‘£˜•”P’•–Ÿ¢•=:©P•©•£^l~tls|‚lvqs``a`^^^^^l~tls|lvqs````=:lq~€`e``j````j````l‡qy``c`=:lq~€`a`bj````j```blƒ…``aa=:ls~€`fbej``dbj````=:l}ƒwlvqs```a{‘ª¥‘QQl~tlq~€`fbbj````j```bls|‚qž”P€¢Ÿ–•££Ÿ¢PrŸŸ£¤•¢Ql~tls|‚lvqs``ah˜Ql~tls|lvqs````=:lq~€`fbaj```cj```bl‡qy``h`=:lq~€`fbaj````j```b=:l}ƒwlvqs``ah‰Ÿ¥W¢•P‘œœP¢™—˜¤\P¤˜•žoQl~tls|‚lvqs```a‡•œœ\PŸ¢•PŸ¢Pœ•££^l~tls|lvqs````=:ls~€`fbdj``faj````=:lq~€`fbej```cj````l‡qy``af=:lq~€`fbdj```hj````l‡qy``af=:lq~€`fbdj````j````=:lƒ…``aalq~€`a`bj````j````l‡qy``dh=:lq~€`fbej````j````=:l}ƒwlvqs```g^^^^^l~tls|‚lvqs``ah‡˜ŸW£P¤˜‘¤P}™™—‘ol~tls|lvqs````=:l‡qy``c`=:lq~€`fbej````j```bl‡qy``c`=:lq~€`fbdj````j```bl‡qy``e`=:lq~€`fbej````j````l‡qy``b`=:l}ƒwlvqs```a„˜‘¤W£P{™ž—^l~tls|‚qP–¢™•ž”PŸ–P™ž•P˜•¢•P™ž=:¤˜•P¦™œœ‘—•^l~tls|‚„˜•¢•P¥£•”P¤ŸP’•P¤Ÿž£PŸ–=:}™™—‘£P˜•¢•^l~t=:~•‘¢œ©P‘œœPŸ–P¤˜•\=:¤˜Ÿ¥—˜\P˜‘¦•P’••žP›™”ž‘  •”=:’©P¤˜•PtŸ“¤Ÿ¢W£P—ŸŸž£^l~tls|‚u¦•žP{™ž—P˜‘£PœŸ£¤=:–¢™•ž”£^^^l~tls|=:ls}…```b=:lq~€`e``j```aj````=:ls~€`c`aj`aabj```bl‡qy`a``=:lq~€`e``j````j````=:l}‰t```blƒ}slt~€`c`alv|]`aeglu~t=:S`fba=:l{u‰lv|z`aehj`fcal}ƒwlvqs``ah„˜•PtŸ“¤Ÿ¢W£P œ‘ž£P‘¢•=: ¢Ÿ“••”™ž—P•¨‘“¤œ©PŸž=:£“˜•”¥œ•^^^l~t=:y–P§•P”ŸžW¤P”ŸP£Ÿ•¤˜™ž—=:£ŸŸž^^^l~tlu~t=:S`fbb=:l{u‰lv|z`aehj`fcbl}ƒwlvqs``a`„˜‘ž›£P–Ÿ¢P©Ÿ¥¢P˜•œ ^l~tls|‚¥¢P¤¢‘ž£ Ÿ¢¤‘¤™ŸžP”™”žW¤=:¢•‘œœ©P£¥¢¦™¦•\P’¥¤P‘¤=:œ•‘£¤P§•P”™”^l~tlu~t=:S`fbd=:l{u‰lv|z`aehj`fcdl}ƒwlvqs```g„Ÿ¢Ÿ›ŸP‘£P‘P”•‘¤˜=:§•‘ Ÿž^^^l~t=:~ŸQPyWœœPž•¦•¢P‘œœŸ§P™¤Ql~tlu~t=:S`fbe=:l{u‰lv|z`aehj`fcel}‰r````l‡qy``c`l}‰t````lq~€`fbej````j```bl}ƒw=:lvqs```a‡•œ“Ÿ•P’‘“›Ql~tls|‚|ŸŸ›£Pœ™›•PyPŸ§•P©Ÿ¥=:‘žŸ¤˜•¢PŸž•^l~t=:‡™¤˜P©P’¢Ÿ¤˜•¢W£P˜•œ \l~t=:§•P£˜Ÿ¥œ”P’•P‘’œ•P¤ŸP—•¤=:‘¢Ÿ¥ž”P¤˜•P ‘££§Ÿ¢”P–Ÿ¢=:¤˜‘¤P•——^l~tls|lvqs````=:lq~€`fbej```cj````l‡qy```h=:lq~€`fbej````j````l}ƒwlvqs0``arŸŸ£¤•¢Ql~tls|‚s‘žP§•P¤‘›•P¤˜™£Pœ™¤¤œ•=:—¥©P§™¤˜P¥£P§˜•žP§•P—Ÿol~tls|lvqs````=:lq~€`fbbj```cj```bl‡qy``ae=:lq~€`fbbj```ej```b=:l}ƒwlvqs``ahls}…````^^^^^l~tls|‚=:lvqs``a`€¢Ÿ–•££Ÿ¢^l~tls|‚lvqs```aoool~tls|‚lvqs``ahƒ¥•\P©P”•‘¢^^^l~t=:‡•P˜‘¦•P¤ŸP£¥£ •ž”PŸ¥¢=:•£“‘ •^l~tls|‚„˜•PtŸ“¤Ÿ¢P˜‘£PœŸ“‘¤•”=:¤˜•P¢•”P–œŸ§•¢£^l~tlq~€`fbdj````j````ls|‚=:lvqs```gQQQl~tls|‚lvqs```a‡˜‘¤ol~tls|‚lvqs``ah‡˜™œ•P˜•P˜‘£PžŸ¤P©•¤=:‘“¡¥™¢•”P¤˜•\P™¤P™£PŸžœ©=:‘P‘¤¤•¢PŸ–P¤™•^l~t=:„˜•PœŸ“‘¤™ŸžP™£P¤˜•Pƒ‘ž”=:ŠŸž•^l~tls|‚„˜•P–œŸ§•¢£P‘¢•P‘  ‘¢•ž¤œ©=:¤ŸP’•P–Ÿ¥ž”P£Ÿ•§˜•¢•P™ž=:¤˜•Pƒ‘ž”PŠŸž•^l~tls|‚=:lvqs```g„˜•Pƒ‘ž”PŠŸž•ol~tls|‚‰Ÿ¥P•‘ž\P¤˜‘¤W£P§˜•¢•=:§•WœœP–™ž”P¤˜•PtŸ“¤Ÿ¢ol~tls|‚lvqs``ah‡•œœ\l~tPŸ¢•Pœ™›•œ©PŸž•=:Ÿ–P˜™£P£•¢¦‘ž¤£^l~t=:y–P§•P”ŸžW¤P”•£¤¢Ÿ©P¤˜Ÿ£•=:–œŸ§•¢£P’•–Ÿ¢•P¤˜•©P—•¤=:¤˜•™¢P˜‘ž”£PŸžP¤˜•^^^l~tls|‚xŸ§•¦•¢\P¤˜•Pƒ‘ž”PŠŸž•P™£=:•¨“••”™ž—œ©P”‘ž—•¢Ÿ¥£^l~t=:u¦•žP£¥  Ÿ£™ž—P§•P‘”•P¤˜•=:¤¢™ \l~t=:¤˜•¢•W£PžŸP—¥‘¢‘ž¤••P¤˜‘¤=:§•P§Ÿ¥œ”P¢•¤¥¢žP‘œ™¦•^^^l~tls|‚=:lvqs```g‰Ÿ¥W¢•P—™¦™ž—P¥ ol~tls|‚lvqs``ahq“¤¥‘œœ©^^^l~tls|‚„˜•¢•W£PŸž•PŸ–P¥£P§˜ŸW£=:‘P •¢–•“¤P‘¤“˜P–Ÿ¢P¤˜™£=:šŸ’^l~tls|lvqs````=:lq~€`fbaj```cj```blq~€`fbej```cj````l‡qy``b`=:lq~€`fbaj````j```bl‡qy```blq~€`fbej````j```b=:l}ƒwlvqs``ahy¤W£P©Ÿ¥^l~tls|‚=:ls}…```blvqs``a`^^^‡˜ŸPyƒP˜•ol~tls|‚lvqs``ahyžP–‘“¤^^^l~tls|‚„˜™£P™£PŸž•PŸ–P¤˜•P‘¢•”=:£“Ÿ¥¤P¢Ÿ’Ÿ¤£P¤˜‘¤P§•¢•=:”™£ ‘¤“˜•”P¤ŸP¤˜™£P™£œ‘ž”l~t=:a`P©•‘¢£P‘—Ÿ^l~tls|‚lvqs``a`qP¢Ÿ’Ÿ¤oQl~tls|‚lvqs``ah}©P™ ¢•££™ŸžP§‘£P¤˜‘¤=:¤˜•©P˜‘”P’••žP“Ÿ œ•¤•œ©=:§™ •”PŸ¥¤\lq~€`fbaj````j````l~t=:’¥¤PyP”ŸPžŸ¤P›žŸ§P¤˜•=: ‘¢¤™“¥œ‘¢£^l~t=:y¤W£P•ž¤™¢•œ©P Ÿ££™’œ•P¤˜‘¤=:Ÿž•PŸ–P¤˜•P“Ÿ¥œ”P˜‘¦•^^^l~tls|‚lvqs``a`€¢Ÿ–•££Ÿ¢^l~t=:yW¦•P“Ÿžž•“¤•”P¤ŸP¤˜•Pƒ‘ž”=:ŠŸž•^l~tls|‚lvqs``ahyP£••^l~tls|lvqs````=:lq~€`fbbj```cj````l‡qy``ae=:lq~€`fbbj````j```b=:lq~€`fbaj````j```bl‡qy``c`l}ƒwlvqs``ah‰Ÿ¥P‘¢•P¤˜•PŸ£¤P£¥™¤•”=:¤ŸP•¨ œŸ¢™ž—P¤˜™£P™£œ‘ž”^l~tls|‚€œ•‘£•^Pw™¦•P¥£P©Ÿ¥¢P‘™”^l~tlv|[`aehl€ƒ[```cjf``clu~t=:S`fca=:l{u‰l}ƒwlvqs``ah‰Ÿ¥P“‘žP¢•‘“˜P¤˜•Pƒ‘ž”=:ŠŸž•P¦™‘P¤˜•P¤•œ• Ÿ¢¤•¢^l~t=:v™ž”P¤˜•P¢•”P–œŸ§•¢£P‘ž”=:’¥¢žP•¦•¢©P£™ž—œ•PŸž•PŸ–=:¤˜•^l~tlu~t=:S`fcb=:l{u‰l}ƒwlvqs``a`ƒŸP©Ÿ¥W¢•PŸž•PŸ–P¤˜•^^^l~tls|‚yP˜‘”žW¤P•¦•žPžŸ¤™“•”^l~tls|‚}©\P©\P©Ÿ¥P“•¢¤‘™žœ©P‘¢•=:§•œœ]’¥™œ¤^l~tlu~t=:S`fcd=:l{u‰l}ƒwlvqs```g„˜•Pƒ‘ž”PŠŸž•^^^l~tlu~t=:S`fce=:l{u‰l}ƒwlvqs```ay–P©Ÿ¥P—•¤P¢™”PŸ–P¤˜•=:–œŸ§•¢£\P§•WœœP’•P‘’œ•P¤Ÿ=: ¢•¦•ž¤P¤˜•P§‘¢P–Ÿ¢PžŸ§^l~tls|‚y¤W£P‘P’™—P¢•£ Ÿž£™’™œ™¤©^l~tlu~t=:S`fe`=:l{u‰l}ƒwlvqs``ah„‘›•Pƒ¥•P§™¤˜P©Ÿ¥P‘ž”=:–œ••P¤˜™£P™£œ‘ž”^^^l~t=:yP’•—P©Ÿ¥^^^l~tlu~t=:S`fea=:lt~€`feal{u‰l}‰t````=:lq~€`e``j```aj````l‡qy``e`=:l}~€`fe`j```fj```gj```b=:ls~€`fe`j`aacj```b=:lq~€`fe`j``c`j```bl‡qy`a``=:lq~€`fe`j````j```b=:lq~€`e``j````j````l‡qy``e`=:lq~€`fe`j```cj```bl‡qy``fd=:lq~€`fe`j````j````=:l‡qy``a`=:lq~€`fe`j````j```bl‡qy``e`=:lq~€`fe`j```cj```bl‡qy``bb=:lq~€`fe`j```ej```b=:lv|[`gddlv|[`afb=:lq~€`fe`j````j```b=:lv|]`af`lv|[`afalv|[`gdalu†u`feb=:S`feb=:lu†u``gc=:S`ff`=:l{u‰lv|za`b`j`ffal}ƒwlvqs``ah„‘›•Pƒ¥•P§™¤˜P©Ÿ¥P‘ž”=:–œ••P¤˜™£P™£œ‘ž”^^^l~t=:yP’•—P©Ÿ¥^^^l~tlu~t=:S`ffa=:l{u‰l}ƒwlvqs``ahyWP¤¢¥œ©P£Ÿ¢¢©P–Ÿ¢P¤˜•=:“˜‘Ÿ£P¤˜‘¤P˜‘£P’•–‘œœ•ž=:©Ÿ¥¢P™£œ‘ž”^l~tls|‚‡•P˜¥‘ž£P¥£¤P¤‘›•P¤˜•=:’œ‘•^l~tlu~t=:S`g``=:l{u‰ls}…````lvq```dl„‚q``bdj`g``j```bj````=:Sf``a=:l€‚yl}ƒwl„…‚tŸP©Ÿ¥P§‘ž¤P¤ŸP—ŸP¤ŸP¤˜•=:u——PsŸ¢¢™”Ÿ¢ol‰~z````ls|=:l{u‰ls~€`c``j`aaaj```blx}sl‡qy``f`lq~€`e``j```aj````=:l‡qy`a``lv|z`aeijf`aalu†uf`a`=:Sf``b=:l€‚yl}ƒwl„…‚tŸP©Ÿ¥P§‘ž¤P¤ŸP—ŸP¤ŸPw¢‘££¤Ÿ§žol‰~z````ls|=:l{u‰ls~€`c``j`aaaj```blx}sl‡qy``f`lq~€`e``j```aj````=:l‡qy`a``lvq```dl„‚q```fj``ihj```dj``ah=:Sf``c=:l€‚yl}ƒwl„…‚tŸP©Ÿ¥P§‘ž¤P¤ŸP—ŸP¤ŸP¤˜•=:ƒ‘ž”PŠŸž•ol‰~z````ls|=:l{u‰ls~€`c``j`aaaj```blx}sl‡qy``f`lq~€`e``j```aj````=:l‡qy`a``lvq```dl„‚q``a`j``iij``cfj``cc=:Sf``d=:l€‚yl}ƒwl„…‚tŸP©Ÿ¥P§‘ž¤P¤ŸP—ŸP¤ŸP¤˜•=:|‘’©¢™ž¤˜ol‰~z````ls|=:l{u‰ls~€`c``j`aaaj```blx}sl‡qy``f`lq~€`e``j```aj````=:l‡qy`a``lvq```dl„‚q``dcj``iij``a`j``cd=:Sf``e=:l€‚yl}ƒwl„…‚tŸP©Ÿ¥P§‘ž¤P¤ŸP—ŸP¤ŸP¤˜•=:€œ‘ž¤‘¤™Ÿžol‰~z````ls|=:l{u‰ls~€`c``j`aaaj```blx}sl‡qy``f`lq~€`e``j```aj````=:l‡qy`a``lvq```dl„‚q``f`j``iij```ij```i=:Sf`a`=:l{u‰lvq```dl„‚q```bj``iij```ej```f=:Sf`aa=:l{u‰l}ƒwl„…‚‚¥™ž•”ol‰~zf`a`lvq```dl„‚q``dij``iij```gj```f=: \ No newline at end of file +0==F=IZ[NIPZb===?ISNV====IR[Q0==F>IZ[NIPZb===?ISNV===>IR[Q0==F?IZ[NIPZb===?ISNV===?IR[Q0==F@IZ[NIPZb===?ISNV===@IR[Q0==FAIZ[NISYW=@A>G==FBIPZb===?ISNV===AIR[Q0==FBIPZb==>AISNV===AIR[Q0==FEIPZb==>AIN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0==FFIXRfIZ[NISYW=@A>G==FEIPZb===?IN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0=>==I]_VISN\===AIa_N==>=G==FAG==>EG==@?0=>=>I]_VISN\===AIa_N==>?G==FAG==@DG==>>0=>=?I]_VISYW=@?AG=>=@IVaW===>G=>=>IZ`TY|pxrq;I[\QIR[Q0=>=@I`\b==??ITVa>==>ISY8=@?AISY8=AA>IZ`TIab_b€rq-JNu‚4€-Xr†J;I[\QIVa:===>ITVa====IPY\IRcR=>=A0=>=AI]_VI`\b==>>IQ[]=>=?ISN\===AIa_N==>>G==FAG==>CG==B@0=?==IXRfI`NaIZ`TNu‚4€-N€r{nyGI[\QINZW===>G=?=>INZW===@G=?=?IRcR=?=B0=?=>ISYW?E=?G=?=@IRcR=?=B0=?=?ISYW?E=?G=?=AIRcR=?=B0=?=@IXRfIZ`TITVa===@anqr-†|‚-`{nxr-s|-n-SvronyyLIf[W=?=BIaNZ===>G===@G====IRcR=?=B0=?=AIXRfIZ`TITVa===>anqr-†|‚-Svronyy-s|-n-`{nxrLIf[W=?=BIaNZ===@G===>G====IRcR=?=B0=?=BINZW===FG=?=CINZW==>?G=?=DIRcR=?>>0=?=CISYW?E>>G=?=EIRcR=?>>0=?=DISYW?E>>G=?=FIRcR=?>>0=?=EIXRfIZ`TITVa==>?anqr-†|‚-Oynqr-s|-n-[rzr€v€LIf[W=?>>IaNZ===FG==>?G====IRcR=?>>0=?=FIXRfIZ`TITVa===Fanqr-†|‚-[rzr€v€-s|-n-OynqrLIf[W=?>>IaNZ==>?G===FG====IRcR=?>>0=?>=IXRfIZ`TSy|„r€;;;LI[\QIR[Q0=?>>ISYW?E?=G=?>?IRcR=?>A0=?>?INZW===DG=?>@IXRfIZ`TITVa===D]vpx-‚}-†|‚-O‚ooyrLIf[W=?>AINZ8===DG=>==IRcR=?>A0=?>@IXRfIZ`TITVa===DQ|}-|ss-†|‚-O‚ooyrLIf[W=?>AINZ:===DIRcR=?>A0=?>AIXRfIZ`T[|-z|r-„rn}|{€-|-nqr;I[\QIR[Q0=@==0=@=>0=@=@0=B==I]`8===>GC==>I]`8===?GC==?I]`8===@GC==@I]`8===AGC==AI]`8===BGC==BIXRfI`NaIZ`TN-ryr}|r;I[\QI`Y]I[\QIR[Q0=C==ISYW=@?BG=C=>IXRfIZ`TISNP===Fdryp|zr-onpx;I[\QIPY_`‚r4€-onpx;I[\Q`ur4€-orr{-y|pxrq-‚}-v{ur-pntr-|‚€vqr;I[\Qdur{-ur-Q|p|4€-sy‚{xvr€p|zr9-„r4r-t|v{t-|-†|-tr-a||x|-onpx;I[\QV{-r…pun{tr-s|-`‚r9†|‚-€rr;I[\QIPY_V4€-{|-ƒr†-{vpr9-V-x{|„9o‚-a||x|-v€-|{r-|s-‚€;I[\Qaun4€-„un-†|‚-tr-„ur{†|‚-np-ny|{r;I[\QIR[Q0=C=>IXRfIZ`TISNP===FV-u|}r-a||x|4€-€nsr;;;I[\QIR[Q0=C?=IXRfIPZb====ISY8=>BCISY8=AAAIN[]=B==G===>G====IdNV===?IP[]=C??G==BBG====IdNV==>=ISNV===AIP[]=C?>G=>>@G====IN[]=C?>G==@=G====IdNV=>==IZ`TISNP==>E\|||uu;;;I[\QIPY_ISNP==>=;;;Nr-†|‚-|xn†LI[\QIPY\ISNP====IdNV==@=IN[]=C?>G====G===?IZ`TISNP==>E;;;Zzz;I[\QIPY_Z†-yvsr-syn€urq-ors|rz†-r†r€;I[\QIPY_ISNP==>=;;;;;I[\QIPY\ISNP====IN[]=B==G====G====IdNV==@=IN[]=>=?G====G===?I`\b==>>IP[]=C?BG==A?G====IZ`TISNP===>Xn‡‚zn..I[\QIN[]=C??G====G===?IPY_N{q-]|sr€€|-O||€r.I[\QIPY_ISNP==>E\u.I[\QIPY\ISNP====IN[]=C?>G===@G===?IdNV==E=IN[]=C?>G====G===?IZ`TISNP==>Ef|‚4r-nyy-vtu9-ur{L.I[\QIPY_ISNP===>dryy9-z|r-|-yr€€;I[\QIPY\ISNP====IP[]=C?AG==C>G====IN[]=C?BG===@G====IdNV==>CIN[]=C?AG===EG====IdNV==>CIN[]=C?AG====G====I`\b==>>IN[]=>=?G====G====IdNV==AEIN[]=C?BG====G====IZ`TISNP===D;;;;;I[\QIPY_ISNP==>Edu|4€-un-ZvzvtnLI[\QIPY\ISNP====IdNV==@=IN[]=C?BG====G===?IdNV==@=IN[]=C?AG====G===?IdNV==B=IN[]=C?BG====G====IdNV==?=IZ`TISNP===>aun4€-Xv{t;I[\QIPY_N-svr{q-|s-zv{r-urr-v{ur-ƒvyyntr;I[\QIPY_aurr-‚€rq-|-or-|{€-|sZvzvtn€-urr;I[\Q[rny†-nyy-|s-urz9u|‚tu9-unƒr-orr{-xvq{n}}rqo†-ur-Q|p|4€-t||{€;I[\QIPY_Rƒr{-Xv{t-un€-y|€svr{q€;;;I[\QIPY\IPZb===?IN[]=B==G===>G====IP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>ISY:=>BDIR[Q0=C?>IXRfISYW=>BEG=C@>IZ`TISNP==>Eaur-Q|p|4€-}yn{€-nr}|prrqv{t-r…npy†-|{€purq‚yr;;;I[\QVs-„r-q|{4-q|-€|zruv{t€||{;;;I[\QIR[Q0=C??IXRfISYW=>BEG=C@?IZ`TISNP==>=aun{x€-s|-†|‚-ury};I[\QIPY_\‚-n{€}|nv|{-qvq{4rnyy†-€‚ƒvƒr9-o‚-nyrn€-„r-qvq;I[\QIR[Q0=C?AIXRfISYW=>BEG=C@AIZ`TISNP===Da||x|-n€-n-qrnu„rn}|{;;;I[\Q[|.-V4yy-{rƒr-nyy|„-v.I[\QIR[Q0=C?BIXRfISYW=>BEG=C@BIZfO====IdNV==@=IZfQ====IN[]=C?BG====G===?IZ`TISNP===>dryp|zr-onpx.I[\QIPY_Y||x€-yvxr-V-|„r-†|‚n{|ur-|{r;I[\Qdvu-z†-o|ur4€-ury}9I[\Q„r-€u|‚yq-or-noyr-|-trn|‚{q-ur-}n€€„|q-s| un-rtt;I[\QIPY\ISNP====IN[]=C?BG===@G====IdNV===EIN[]=C?BG====G====IZ`TISNP===>O||€r.I[\QIPY_Pn{-„r-nxr-uv€-yvyrt‚†-„vu-‚€-„ur{-„r-t|LI[\QIPY\ISNP====IN[]=C??G===@G===?IdNV==>BIN[]=C??G===BG===?IZ`TISNP==>EIPZb====;;;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QIPY_ISNP===>LLLI[\QIPY_ISNP==>E`‚r9-z†-qrn;;;I[\Qdr-unƒr-|-€‚€}r{q-|‚r€pn}r;I[\QIPY_aur-Q|p|-un€-y|pnrqur-rq-sy|„r€;I[\QIN[]=C?AG====G====IPY_ISNP===D...I[\QIPY_ISNP===>dunLI[\QIPY_ISNP==>Eduvyr-ur-un€-{|-†rnp~‚vrq-urz9-v-v€-|{y†n-znr-|s-vzr;I[\Qaur-y|pnv|{-v€-ur-`n{qg|{r;I[\QIPY_aur-sy|„r€-nr-n}}nr{y†|-or-s|‚{q-€|zr„urr-v{ur-`n{q-g|{r;I[\QIPY_ISNP===Daur-`n{q-g|{rLI[\QIPY_f|‚-zrn{9-un4€-„urr„r4yy-sv{q-ur-Q|p|LI[\QIPY_ISNP==>Edryy9I[\Q-z|r-yvxry†-|{r|s-uv€-€rƒn{€;I[\QVs-„r-q|{4-qr€|†-u|€rsy|„r€-ors|r-ur†-trurv-un{q€-|{-urz;;;I[\QIPY_U|„rƒr9-ur-`n{q-g|{r-v€r…prrqv{ty†-qn{tr|‚€;I[\QRƒr{-€‚}}|€v{t-„r-znqr-urv}9I[\Qurr4€-{|-t‚nn{rr-un„r-„|‚yq-r‚{-nyvƒr;;;I[\QIPY_ISNP===Df|‚4r-tvƒv{t-‚}LI[\QIPY_ISNP==>ENp‚nyy†;;;I[\QIPY_aurr4€-|{r-|s-‚€-„u|4€n-}rsrp-znpu-s|-uv€w|o;I[\QIPY\ISNP====IN[]=C?>G===@G===?IN[]=C?BG===@G====IdNV==?=IN[]=C?>G====G===?IdNV===?IN[]=C?BG====G===?IZ`TISNP==>EV4€-†|‚;I[\QIPY_IPZb===?ISNP==>=;;;du|-V`-urLI[\QIPY_ISNP==>EV{-snp;;;I[\QIPY_auv€-v€-|{r-|s-ur-nzrq€p|‚-|o|€-un-„rrqv€}npurq-|-uv€-v€yn{qI[\Q>=-†rn€-nt|;I[\QIPY_ISNP==>=N-|o|L.I[\QIPY_ISNP==>EZ†-vz}r€€v|{-„n€-unur†-unq-orr{-p|z}yrry†„v}rq-|‚9IN[]=C?>G====G====I[\Qo‚-V-q|-{|-x{|„-ur}nvp‚yn€;I[\QV4€-r{vry†-}|€€voyr-un|{r-|s-urz-p|‚yq-unƒr;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QV4ƒr-p|{{rprq-|-ur-`n{qg|{r;I[\QIPY_ISNP==>EV-€rr;I[\QIPY\ISNP====IN[]=C??G===@G====IdNV==>BIN[]=C??G====G===?IN[]=C?>G====G===?IdNV==@=IZ`TISNP==>Ef|‚-nr-ur-z|€-€‚vrq|-r…}y|v{t-uv€-v€yn{q;I[\QIPY_]yrn€r;-Tvƒr-‚€-†|‚-nvq;I[\QISY8=>BEI]`8===@GC==@IR[Q0=C@>IXRfIZ`TISNP==>Ef|‚-pn{-rnpu-ur-`n{qg|{r-ƒvn-ur-ryr}|r;I[\QSv{q-ur-rq-sy|„r€-n{qo‚{-rƒr†-€v{tyr-|{r-|surz;I[\QIR[Q0=C@?IXRfIZ`TISNP==>=`|-†|‚4r-|{r-|s-ur;;;I[\QIPY_V-unq{4-rƒr{-{|vprq;I[\QIPY_Z†9-z†9-†|‚-prnv{y†-nr„ryy:o‚vy;I[\QIR[Q0=C@AIXRfIZ`TISNP===Daur-`n{q-g|{r;;;I[\QIR[Q0=C@BIXRfIZ`TISNP===>Vs-†|‚-tr-vq-|s-ursy|„r€9-„r4yy-or-noyr-|}rƒr{-ur-„n-s|-{|„;I[\QIPY_V4€-n-ovt-r€}|{€vovyv†;I[\QIR[Q0=CB=IXRfIZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CB>IQ[]=CB>IXRfIZfQ====IN[]=B==G===>G====IdNV==B=IZ[]=CB=G===CG===DG===?IP[]=CB=G=>>@G===?IN[]=CB=G==@=G===?IdNV=>==IN[]=CB=G====G===?IN[]=B==G====G====IdNV==B=IN[]=CB=G===@G===?IdNV==CAIN[]=CB=G====G====IdNV==>=IN[]=CB=G====G===?IdNV==B=IN[]=CB=G===@G===?IdNV==??IN[]=CB=G===BG===?ISY8=DAAISY8=>C?IN[]=CB=G====G===?ISY:=>C=ISY8=>C>ISY8=DA>IRcR=CB?0=CB?IRcR==D@0=CC=IXRfISYW>=?=G=CC>IZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CC>IXRfIZ`TISNP==>EV4z-‚y†-€|†-s|-urpun|€-un-un€-orsnyyr{†|‚-v€yn{q;I[\QIPY_dr-u‚zn{€-z‚€-nxr-uroynzr;I[\QIR[Q0=D==IXRfIPZb====ISN\===AIa_N==?AG=D==G===?G====0C==>I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urRtt-P|vq|LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISYW=>BFGC=>>IRcRC=>=0C==?I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-Tn€€|„{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===CG==FEG===AG==>E0C==@I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur`n{q-g|{rLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==>=G==FFG==@CG==@@0C==AI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urYno†v{uLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==A@G==FFG==>=G==@A0C==BI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur]yn{nv|{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==C=G==FFG===FG===F0C=>=IXRfISN\===AIa_N===?G==FFG===BG===C0C=>>IXRfIZ`TIab__‚v{rqLIf[WC=>=ISN\===AIa_N==AFG==FFG===DG===C \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt b/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt index d36c54e..3c36035 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt @@ -1,14 +1,16 @@ #0090 - Date: Sat, 29 Feb 2020 04:50:31 -0600 Subject: [PATCH 07/10] adds icons to startpoints --- src/assets/icon/Arthur2.png | Bin 0 -> 1273 bytes src/assets/icon/Camp.png | Bin 0 -> 1267 bytes src/assets/icon/StartPoint2.png | Bin 0 -> 1265 bytes src/ui/settings.lua | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/assets/icon/Arthur2.png create mode 100644 src/assets/icon/Camp.png create mode 100644 src/assets/icon/StartPoint2.png diff --git a/src/assets/icon/Arthur2.png b/src/assets/icon/Arthur2.png new file mode 100644 index 0000000000000000000000000000000000000000..a0dc4dc3e1082f2c2d284702750c7fa0f05f2c91 GIT binary patch literal 1273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WMyDrW(e>JaRrJqFbK?u@;cm|{QhXq|3CM@BBR7;2#kmj==GV@2h1l7B|(0{ z|3@}p2>#Bl3XF8l0*}aI1_r*vAk26?e?!5; ze2b%Z4||?cx7zopr0QrPlegFUf literal 0 HcmV?d00001 diff --git a/src/assets/icon/Camp.png b/src/assets/icon/Camp.png new file mode 100644 index 0000000000000000000000000000000000000000..81d29337473c4ad853f57aa52e6cfaacbd55552e GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WMyDrW(e>JaRrJCFfd4VC|2K6oU``e`&W;EBBNk51V%^*FsHa?0`mz&NswRg z|B($Cg1@t?0;8R?z$3Dlfr0NZ2s0kfUy%Y7Ebw%346*QkI>C{z)qsQb=%K&;F_QQH zZ#?E=nCCOcH9Em5dRg7U?v`n1P8zP_Tsw2(pT!=hrnhvM+B-b!bGU5lF)xI*Tu50Y zGMmX?=-qy2rL}4we52fE1YU})jum(;8XzvQ+U<0~_KqlDi^nT3{AQYAwsy-L*(I%@ Obm-~o=d#Wzp$P!C3szkK literal 0 HcmV?d00001 diff --git a/src/assets/icon/StartPoint2.png b/src/assets/icon/StartPoint2.png new file mode 100644 index 0000000000000000000000000000000000000000..36f45caa9126f763465113cfb424948d93ca5541 GIT binary patch literal 1265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WMyDrW(e>JaRrJqFes{;1{r#lm-nm$b4Q8M5Ev;T;Ii-Id0;+aC<*cl{y(w- zL-2QYRbaex7I;J!GcfQS24TkI`72U@f_a`Ujv*HQS0_61H5hQP=>GVxuN>_a#VhFJ ze=f5zljEf#XXwKa9ovh($ literal 0 HcmV?d00001 diff --git a/src/ui/settings.lua b/src/ui/settings.lua index 5b12c0a..dcede9a 100644 --- a/src/ui/settings.lua +++ b/src/ui/settings.lua @@ -32,9 +32,9 @@ return { style = 'dialog', }, { type = 'label', text = 'Spawn Location', minheight = 32 }, { type = 'stepper', id = 'spawn', align = 'middle left', height = 48, width = 200, - { text = "Start Point", value = "Start Point" }, - { text = "Arthur's House", value = "Arthur's House" }, - { text = "Camp", value = "Camp" } + { text = " Start\r\n Point", value = "Start Point", icon = "assets/icon/StartPoint2.png" }, + { text = " Arthur's\r\n House", value = "Arthur's House", icon = "assets/icon/Arthur2.png" }, + { text = " Camp", value = "Camp", icon = "assets/icon/Camp.png" } } }, }, From 6d1c805c56da77b4a9f8d99f9f989e0e61656413 Mon Sep 17 00:00:00 2001 From: duncathan Date: Sat, 29 Feb 2020 19:45:49 -0600 Subject: [PATCH 08/10] more map fixes, backtracks, etc --- pre-edited-cs/data/Stage/Cave.pxe | Bin 1064 -> 1064 bytes pre-edited-cs/data/Stage/Cave.tsc | 2 +- pre-edited-cs/data/Stage/Pens1.tsc | 2 +- pre-edited-cs/data/Stage/Pixel.pxe | Bin 140 -> 152 bytes pre-edited-cs/data/Stage/Pixel.tsc | 2 +- .../data/Stage/ScriptSource/Pens1.txt | 4 ++-- .../data/Stage/ScriptSource/Pixel.txt | 4 ++++ src/database/world_graph.lua | 4 ++-- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pre-edited-cs/data/Stage/Cave.pxe b/pre-edited-cs/data/Stage/Cave.pxe index cf3565491faa8b7d59cf048c3699339be74a8fdd..250f4b7c0e6f31cb0f7bb0513e1e5ccc40024233 100644 GIT binary patch delta 12 TcmZ3%v4UfQ6(h$+>$l7R8nOfs delta 12 TcmZ3%v4UfQ6(i?H>$l7R8n*-y diff --git a/pre-edited-cs/data/Stage/Cave.tsc b/pre-edited-cs/data/Stage/Cave.tsc index 4b9d647..31d9eac 100644 --- a/pre-edited-cs/data/Stage/Cave.tsc +++ b/pre-edited-cs/data/Stage/Cave.tsc @@ -1 +1 @@ ->;Taaja>;m~rmt~†aaaimwrzaaaamvu>;Taajb>;m~rmt~†aaaimwrzaaabmvu>;Taajc>;m~rmt~†aaaimwrzaaacmvu>;Taajd>;m~rmt~†aaaimwrzaaadmvu>;Taaje>;m~rmt~†aaaimwrzaaaemvu>;>;Taajj>;mt~†aaaimwrzaaaemvu>;>;>;Tabab>;mƒzmtababkaaaakaaaam„€†aabbmwr€aaadm…ƒraabdkaajdkaabakaaad>;>;Tabac>;mƒzmw}{adackabaemw}{adabkabadm~„xpRm€umvu>;Tabad>;mƒz>;mw}{adaekabafm~„xm…†ƒw £˜–¥¥šŸ˜Q¤ ž–¥™šŸ˜pm€umvu>;Tabae>;m|vŠmwr€aaacm…ƒraa1bkaajekaaaikaaag>;Tabaf>;mw}{bgeakabagm~„xm…†ƒw £˜–¥¥šŸ˜Q¤ ž–¥™šŸ˜pm€umvu>;Tabag>;mwr€aaacmw}\adacmw}\bgebmw}\bgec>;m~Šuaaacm…ƒraabbkadackaaaikaaag>;>;Tabba>;m|vŠmwr€aaaem…ƒraajakaajckaaahkaaaj>;>;>;Tabfa>;m|vŠm~Šuaaaamt~†aaaimwrzaaae>;mˆrzaada>;m„€†aabcmt~aafakaadfkaaghmˆrzaaca>;m„€†aabcmt~aafakaadgkaaghmˆrzaaca>;mvu>;>;Tacaa>;mvu>;Tacab>;mvu>;>;>;Taeaa>;mƒzm„€†aaccmuaeaamv‡vaeab>;>;Taeab>;mv‡vaabc>;>; \ No newline at end of file +a^w„„„a^¡¢•—¡©„„„Œš•„„„„™¢˜a^w„„…a^¡¢•—¡©„„„Œš•„„„…™¢˜a^w„„†a^¡¢•—¡©„„„Œš•„„„†™¢˜a^w„„‡a^¡¢•—¡©„„„Œš•„„„‡™¢˜a^w„„ˆa^¡¢•—¡©„„„Œš•„„„ˆ™¢˜a^w„„a^—¡©„„„Œš•„„„ˆ™¢˜a^w„…„…a^¤¦—¢¤„…„…Ž„„„„Ž„„„„§£©„„……š•£„„„‡¨¦•„„…‡Ž„„‡Ž„„…„Ž„„„‡a^w„…„†a^¤¦š ž„‡„†Ž„…„ˆš ž„‡„…Ž„…„‡¡§›“u¢£˜™¢˜a^w„…„‡a^¤¦a^š ž„‡„ˆŽ„…„‰¡§›¨©¦šÃÆ»¹ÈȽ»tÇÃÁ¹È¼½Â»“¢£˜™¢˜a^w„…„ˆa^Ÿ™­š•£„„„†T¦•„„……Ž„„ˆŽ„„„ŒŽ„„„Ša^w„…„‰a^š ž…Šˆ„Ž„…„Š¡§›¨©¦šÃÆ»¹ÈȽ»tÇÃÁ¹È¼½Â»“¢£˜™¢˜a^w„…„Ša^š•£„„„†š „‡„†š …Šˆ…š …Šˆ†a^¡­˜„„„†¨¦•„„……Ž„‡„†Ž„„„ŒŽ„„„Ša^w„……„a^Ÿ™­š•£„„„ˆ¨¦•„„„Ž„„†Ž„„„‹Ž„„„a^w„…‰„a^Ÿ™­¡­˜„„„„—¡©„„„Œš•„„„ˆa^«•„„‡„a^§£©„„…†—¡¤„„‰„Ž„„‡‰Ž„„Š‹«•„„†„a^§£©„„…†—¡¤„„‰„Ž„„‡ŠŽ„„Š‹«•„„†„a^™¢˜a^w„†„„a^™¢˜a^w„†„…a^™¢˜a^w„ˆ„„a^¤¦§£©„„††˜¢¤„ˆ„„™ª™„ˆ„…a^w„ˆ„…a^™ª™„„…† \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pens1.tsc b/pre-edited-cs/data/Stage/Pens1.tsc index 99a48a5..37bfa76 100644 --- a/pre-edited-cs/data/Stage/Pens1.tsc +++ b/pre-edited-cs/data/Stage/Pens1.tsc @@ -1 +1 @@ -0==F=IZ[NIPZb===?ISNV====IR[Q0==F>IZ[NIPZb===?ISNV===>IR[Q0==F?IZ[NIPZb===?ISNV===?IR[Q0==F@IZ[NIPZb===?ISNV===@IR[Q0==FAIZ[NISYW=@A>G==FBIPZb===?ISNV===AIR[Q0==FBIPZb==>AISNV===AIR[Q0==FEIPZb==>AIN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0==FFIXRfIZ[NISYW=@A>G==FEIPZb===?IN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0=>==I]_VISN\===AIa_N==>=G==FAG==>EG==@?0=>=>I]_VISN\===AIa_N==>?G==FAG==@DG==>>0=>=?I]_VISYW=@?AG=>=@IVaW===>G=>=>IZ`TY|pxrq;I[\QIR[Q0=>=@I`\b==??ITVa>==>ISY8=@?AISY8=AA>IZ`TIab_b€rq-JNu‚4€-Xr†J;I[\QIVa:===>ITVa====IPY\IRcR=>=A0=>=AI]_VI`\b==>>IQ[]=>=?ISN\===AIa_N==>>G==FAG==>CG==B@0=?==IXRfI`NaIZ`TNu‚4€-N€r{nyGI[\QINZW===>G=?=>INZW===@G=?=?IRcR=?=B0=?=>ISYW?E=?G=?=@IRcR=?=B0=?=?ISYW?E=?G=?=AIRcR=?=B0=?=@IXRfIZ`TITVa===@anqr-†|‚-`{nxr-s|-n-SvronyyLIf[W=?=BIaNZ===>G===@G====IRcR=?=B0=?=AIXRfIZ`TITVa===>anqr-†|‚-Svronyy-s|-n-`{nxrLIf[W=?=BIaNZ===@G===>G====IRcR=?=B0=?=BINZW===FG=?=CINZW==>?G=?=DIRcR=?>>0=?=CISYW?E>>G=?=EIRcR=?>>0=?=DISYW?E>>G=?=FIRcR=?>>0=?=EIXRfIZ`TITVa==>?anqr-†|‚-Oynqr-s|-n-[rzr€v€LIf[W=?>>IaNZ===FG==>?G====IRcR=?>>0=?=FIXRfIZ`TITVa===Fanqr-†|‚-[rzr€v€-s|-n-OynqrLIf[W=?>>IaNZ==>?G===FG====IRcR=?>>0=?>=IXRfIZ`TSy|„r€;;;LI[\QIR[Q0=?>>ISYW?E?=G=?>?IRcR=?>A0=?>?INZW===DG=?>@IXRfIZ`TITVa===D]vpx-‚}-†|‚-O‚ooyrLIf[W=?>AINZ8===DG=>==IRcR=?>A0=?>@IXRfIZ`TITVa===DQ|}-|ss-†|‚-O‚ooyrLIf[W=?>AINZ:===DIRcR=?>A0=?>AIXRfIZ`T[|-z|r-„rn}|{€-|-nqr;I[\QIR[Q0=@==0=@=>0=@=@0=B==I]`8===>GC==>I]`8===?GC==?I]`8===@GC==@I]`8===AGC==AI]`8===BGC==BIXRfI`NaIZ`TN-ryr}|r;I[\QI`Y]I[\QIR[Q0=C==ISYW=@?BG=C=>IXRfIZ`TISNP===Fdryp|zr-onpx;I[\QIPY_`‚r4€-onpx;I[\Q`ur4€-orr{-y|pxrq-‚}-v{ur-pntr-|‚€vqr;I[\Qdur{-ur-Q|p|4€-sy‚{xvr€p|zr9-„r4r-t|v{t-|-†|-tr-a||x|-onpx;I[\QV{-r…pun{tr-s|-`‚r9†|‚-€rr;I[\QIPY_V4€-{|-ƒr†-{vpr9-V-x{|„9o‚-a||x|-v€-|{r-|s-‚€;I[\Qaun4€-„un-†|‚-tr-„ur{†|‚-np-ny|{r;I[\QIR[Q0=C=>IXRfIZ`TISNP===FV-u|}r-a||x|4€-€nsr;;;I[\QIR[Q0=C?=IXRfIPZb====ISY8=>BCISY8=AAAIN[]=B==G===>G====IdNV===?IP[]=C??G==BBG====IdNV==>=ISNV===AIP[]=C?>G=>>@G====IN[]=C?>G==@=G====IdNV=>==IZ`TISNP==>E\|||uu;;;I[\QIPY_ISNP==>=;;;Nr-†|‚-|xn†LI[\QIPY\ISNP====IdNV==@=IN[]=C?>G====G===?IZ`TISNP==>E;;;Zzz;I[\QIPY_Z†-yvsr-syn€urq-ors|rz†-r†r€;I[\QIPY_ISNP==>=;;;;;I[\QIPY\ISNP====IN[]=B==G====G====IdNV==@=IN[]=>=?G====G===?I`\b==>>IP[]=C?BG==A?G====IZ`TISNP===>Xn‡‚zn..I[\QIN[]=C??G====G===?IPY_N{q-]|sr€€|-O||€r.I[\QIPY_ISNP==>E\u.I[\QIPY\ISNP====IN[]=C?>G===@G===?IdNV==E=IN[]=C?>G====G===?IZ`TISNP==>Ef|‚4r-nyy-vtu9-ur{L.I[\QIPY_ISNP===>dryy9-z|r-|-yr€€;I[\QIPY\ISNP====IP[]=C?AG==C>G====IN[]=C?BG===@G====IdNV==>CIN[]=C?AG===EG====IdNV==>CIN[]=C?AG====G====I`\b==>>IN[]=>=?G====G====IdNV==AEIN[]=C?BG====G====IZ`TISNP===D;;;;;I[\QIPY_ISNP==>Edu|4€-un-ZvzvtnLI[\QIPY\ISNP====IdNV==@=IN[]=C?BG====G===?IdNV==@=IN[]=C?AG====G===?IdNV==B=IN[]=C?BG====G====IdNV==?=IZ`TISNP===>aun4€-Xv{t;I[\QIPY_N-svr{q-|s-zv{r-urr-v{ur-ƒvyyntr;I[\QIPY_aurr-‚€rq-|-or-|{€-|sZvzvtn€-urr;I[\Q[rny†-nyy-|s-urz9u|‚tu9-unƒr-orr{-xvq{n}}rqo†-ur-Q|p|4€-t||{€;I[\QIPY_Rƒr{-Xv{t-un€-y|€svr{q€;;;I[\QIPY\IPZb===?IN[]=B==G===>G====IP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>ISY:=>BDIR[Q0=C?>IXRfISYW=>BEG=C@>IZ`TISNP==>Eaur-Q|p|4€-}yn{€-nr}|prrqv{t-r…npy†-|{€purq‚yr;;;I[\QVs-„r-q|{4-q|-€|zruv{t€||{;;;I[\QIR[Q0=C??IXRfISYW=>BEG=C@?IZ`TISNP==>=aun{x€-s|-†|‚-ury};I[\QIPY_\‚-n{€}|nv|{-qvq{4rnyy†-€‚ƒvƒr9-o‚-nyrn€-„r-qvq;I[\QIR[Q0=C?AIXRfISYW=>BEG=C@AIZ`TISNP===Da||x|-n€-n-qrnu„rn}|{;;;I[\Q[|.-V4yy-{rƒr-nyy|„-v.I[\QIR[Q0=C?BIXRfISYW=>BEG=C@BIZfO====IdNV==@=IZfQ====IN[]=C?BG====G===?IZ`TISNP===>dryp|zr-onpx.I[\QIPY_Y||x€-yvxr-V-|„r-†|‚n{|ur-|{r;I[\Qdvu-z†-o|ur4€-ury}9I[\Q„r-€u|‚yq-or-noyr-|-trn|‚{q-ur-}n€€„|q-s| un-rtt;I[\QIPY\ISNP====IN[]=C?BG===@G====IdNV===EIN[]=C?BG====G====IZ`TISNP===>O||€r.I[\QIPY_Pn{-„r-nxr-uv€-yvyrt‚†-„vu-‚€-„ur{-„r-t|LI[\QIPY\ISNP====IN[]=C??G===@G===?IdNV==>BIN[]=C??G===BG===?IZ`TISNP==>EIPZb====;;;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QIPY_ISNP===>LLLI[\QIPY_ISNP==>E`‚r9-z†-qrn;;;I[\Qdr-unƒr-|-€‚€}r{q-|‚r€pn}r;I[\QIPY_aur-Q|p|-un€-y|pnrqur-rq-sy|„r€;I[\QIN[]=C?AG====G====IPY_ISNP===D...I[\QIPY_ISNP===>dunLI[\QIPY_ISNP==>Eduvyr-ur-un€-{|-†rnp~‚vrq-urz9-v-v€-|{y†n-znr-|s-vzr;I[\Qaur-y|pnv|{-v€-ur-`n{qg|{r;I[\QIPY_aur-sy|„r€-nr-n}}nr{y†|-or-s|‚{q-€|zr„urr-v{ur-`n{q-g|{r;I[\QIPY_ISNP===Daur-`n{q-g|{rLI[\QIPY_f|‚-zrn{9-un4€-„urr„r4yy-sv{q-ur-Q|p|LI[\QIPY_ISNP==>Edryy9I[\Q-z|r-yvxry†-|{r|s-uv€-€rƒn{€;I[\QVs-„r-q|{4-qr€|†-u|€rsy|„r€-ors|r-ur†-trurv-un{q€-|{-urz;;;I[\QIPY_U|„rƒr9-ur-`n{q-g|{r-v€r…prrqv{ty†-qn{tr|‚€;I[\QRƒr{-€‚}}|€v{t-„r-znqr-urv}9I[\Qurr4€-{|-t‚nn{rr-un„r-„|‚yq-r‚{-nyvƒr;;;I[\QIPY_ISNP===Df|‚4r-tvƒv{t-‚}LI[\QIPY_ISNP==>ENp‚nyy†;;;I[\QIPY_aurr4€-|{r-|s-‚€-„u|4€n-}rsrp-znpu-s|-uv€w|o;I[\QIPY\ISNP====IN[]=C?>G===@G===?IN[]=C?BG===@G====IdNV==?=IN[]=C?>G====G===?IdNV===?IN[]=C?BG====G===?IZ`TISNP==>EV4€-†|‚;I[\QIPY_IPZb===?ISNP==>=;;;du|-V`-urLI[\QIPY_ISNP==>EV{-snp;;;I[\QIPY_auv€-v€-|{r-|s-ur-nzrq€p|‚-|o|€-un-„rrqv€}npurq-|-uv€-v€yn{qI[\Q>=-†rn€-nt|;I[\QIPY_ISNP==>=N-|o|L.I[\QIPY_ISNP==>EZ†-vz}r€€v|{-„n€-unur†-unq-orr{-p|z}yrry†„v}rq-|‚9IN[]=C?>G====G====I[\Qo‚-V-q|-{|-x{|„-ur}nvp‚yn€;I[\QV4€-r{vry†-}|€€voyr-un|{r-|s-urz-p|‚yq-unƒr;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QV4ƒr-p|{{rprq-|-ur-`n{qg|{r;I[\QIPY_ISNP==>EV-€rr;I[\QIPY\ISNP====IN[]=C??G===@G====IdNV==>BIN[]=C??G====G===?IN[]=C?>G====G===?IdNV==@=IZ`TISNP==>Ef|‚-nr-ur-z|€-€‚vrq|-r…}y|v{t-uv€-v€yn{q;I[\QIPY_]yrn€r;-Tvƒr-‚€-†|‚-nvq;I[\QISY8=>BEI]`8===@GC==@IR[Q0=C@>IXRfIZ`TISNP==>Ef|‚-pn{-rnpu-ur-`n{qg|{r-ƒvn-ur-ryr}|r;I[\QSv{q-ur-rq-sy|„r€-n{qo‚{-rƒr†-€v{tyr-|{r-|surz;I[\QIR[Q0=C@?IXRfIZ`TISNP==>=`|-†|‚4r-|{r-|s-ur;;;I[\QIPY_V-unq{4-rƒr{-{|vprq;I[\QIPY_Z†9-z†9-†|‚-prnv{y†-nr„ryy:o‚vy;I[\QIR[Q0=C@AIXRfIZ`TISNP===Daur-`n{q-g|{r;;;I[\QIR[Q0=C@BIXRfIZ`TISNP===>Vs-†|‚-tr-vq-|s-ursy|„r€9-„r4yy-or-noyr-|}rƒr{-ur-„n-s|-{|„;I[\QIPY_V4€-n-ovt-r€}|{€vovyv†;I[\QIR[Q0=CB=IXRfIZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CB>IQ[]=CB>IXRfIZfQ====IN[]=B==G===>G====IdNV==B=IZ[]=CB=G===CG===DG===?IP[]=CB=G=>>@G===?IN[]=CB=G==@=G===?IdNV=>==IN[]=CB=G====G===?IN[]=B==G====G====IdNV==B=IN[]=CB=G===@G===?IdNV==CAIN[]=CB=G====G====IdNV==>=IN[]=CB=G====G===?IdNV==B=IN[]=CB=G===@G===?IdNV==??IN[]=CB=G===BG===?ISY8=DAAISY8=>C?IN[]=CB=G====G===?ISY:=>C=ISY8=>C>ISY8=DA>IRcR=CB?0=CB?IRcR==D@0=CC=IXRfISYW>=?=G=CC>IZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CC>IXRfIZ`TISNP==>EV4z-‚y†-€|†-s|-urpun|€-un-un€-orsnyyr{†|‚-v€yn{q;I[\QIPY_dr-u‚zn{€-z‚€-nxr-uroynzr;I[\QIR[Q0=D==IXRfIPZb====ISN\===AIa_N==?AG=D==G===?G====0C==>I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urRtt-P|vq|LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISYW=>BFGC=>>IRcRC=>=0C==?I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-Tn€€|„{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===CG==FEG===AG==>E0C==@I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur`n{q-g|{rLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==>=G==FFG==@CG==@@0C==AI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urYno†v{uLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==A@G==FFG==>=G==@A0C==BI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur]yn{nv|{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==C=G==FFG===FG===F0C=>=IXRfISN\===AIa_N===?G==FFG===BG===C0C=>>IXRfIZ`TIab__‚v{rqLIf[WC=>=ISN\===AIa_N==AFG==FFG===DG===C \ No newline at end of file +0==F=IZ[NIPZb===?ISNV====IR[Q0==F>IZ[NIPZb===?ISNV===>IR[Q0==F?IZ[NIPZb===?ISNV===?IR[Q0==F@IZ[NIPZb===?ISNV===@IR[Q0==FAIZ[NISYW=@A>G==FBIPZb===?ISNV===AIR[Q0==FBIPZb==>AISNV===AIR[Q0==FEIPZb==>AIN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0==FFIXRfIZ[NISYW=@A>G==FEIPZb===?IN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0=>==I]_VISN\===AIa_N==>=G==FAG==>EG==@?0=>=>I]_VISN\===AIa_N==>?G==FAG==@DG==>>0=>=?I]_VISYW=@?AG=>=AIVaW===>G=>=@IZ`TY|pxrq;I[\QIR[Q0=>=@I`\b==??ITVa>==>ISY8=@?AISY8=AA>IZ`TIab_b€rq-JNu‚4€-Xr†J;I[\QIVa:===>ITVa====IPY\IRcR=>=A0=>=AI]_VI`\b==>>IQ[]=>=?ISN\===AIa_N==>>G==FAG==>CG==B@0=?==IXRfI`NaIZ`TNu‚4€-N€r{nyGI[\QINZW===>G=?=>INZW===@G=?=?IRcR=?=B0=?=>ISYW?E=?G=?=@IRcR=?=B0=?=?ISYW?E=?G=?=AIRcR=?=B0=?=@IXRfIZ`TITVa===@anqr-†|‚-`{nxr-s|-n-SvronyyLIf[W=?=BIaNZ===>G===@G====IRcR=?=B0=?=AIXRfIZ`TITVa===>anqr-†|‚-Svronyy-s|-n-`{nxrLIf[W=?=BIaNZ===@G===>G====IRcR=?=B0=?=BINZW===FG=?=CINZW==>?G=?=DIRcR=?>>0=?=CISYW?E>>G=?=EIRcR=?>>0=?=DISYW?E>>G=?=FIRcR=?>>0=?=EIXRfIZ`TITVa==>?anqr-†|‚-Oynqr-s|-n-[rzr€v€LIf[W=?>>IaNZ===FG==>?G====IRcR=?>>0=?=FIXRfIZ`TITVa===Fanqr-†|‚-[rzr€v€-s|-n-OynqrLIf[W=?>>IaNZ==>?G===FG====IRcR=?>>0=?>=IXRfIZ`TSy|„r€;;;LI[\QIR[Q0=?>>ISYW?E?=G=?>?IRcR=?>A0=?>?INZW===DG=?>@IXRfIZ`TITVa===D]vpx-‚}-†|‚-O‚ooyrLIf[W=?>AINZ8===DG=>==IRcR=?>A0=?>@IXRfIZ`TITVa===DQ|}-|ss-†|‚-O‚ooyrLIf[W=?>AINZ:===DIRcR=?>A0=?>AIXRfIZ`T[|-z|r-„rn}|{€-|-nqr;I[\QIR[Q0=@==0=@=>0=@=@0=B==I]`8===>GC==>I]`8===?GC==?I]`8===@GC==@I]`8===AGC==AI]`8===BGC==BIXRfI`NaIZ`TN-ryr}|r;I[\QI`Y]I[\QIR[Q0=C==ISYW=@?BG=C=>IXRfIZ`TISNP===Fdryp|zr-onpx;I[\QIPY_`‚r4€-onpx;I[\Q`ur4€-orr{-y|pxrq-‚}-v{ur-pntr-|‚€vqr;I[\Qdur{-ur-Q|p|4€-sy‚{xvr€p|zr9-„r4r-t|v{t-|-†|-tr-a||x|-onpx;I[\QV{-r…pun{tr-s|-`‚r9†|‚-€rr;I[\QIPY_V4€-{|-ƒr†-{vpr9-V-x{|„9o‚-a||x|-v€-|{r-|s-‚€;I[\Qaun4€-„un-†|‚-tr-„ur{†|‚-np-ny|{r;I[\QIR[Q0=C=>IXRfIZ`TISNP===FV-u|}r-a||x|4€-€nsr;;;I[\QIR[Q0=C?=IXRfIPZb====ISY8=>BCISY8=AAAIN[]=B==G===>G====IdNV===?IP[]=C??G==BBG====IdNV==>=ISNV===AIP[]=C?>G=>>@G====IN[]=C?>G==@=G====IdNV=>==IZ`TISNP==>E\|||uu;;;I[\QIPY_ISNP==>=;;;Nr-†|‚-|xn†LI[\QIPY\ISNP====IdNV==@=IN[]=C?>G====G===?IZ`TISNP==>E;;;Zzz;I[\QIPY_Z†-yvsr-syn€urq-ors|rz†-r†r€;I[\QIPY_ISNP==>=;;;;;I[\QIPY\ISNP====IN[]=B==G====G====IdNV==@=IN[]=>=?G====G===?I`\b==>>IP[]=C?BG==A?G====IZ`TISNP===>Xn‡‚zn..I[\QIN[]=C??G====G===?IPY_N{q-]|sr€€|-O||€r.I[\QIPY_ISNP==>E\u.I[\QIPY\ISNP====IN[]=C?>G===@G===?IdNV==E=IN[]=C?>G====G===?IZ`TISNP==>Ef|‚4r-nyy-vtu9-ur{L.I[\QIPY_ISNP===>dryy9-z|r-|-yr€€;I[\QIPY\ISNP====IP[]=C?AG==C>G====IN[]=C?BG===@G====IdNV==>CIN[]=C?AG===EG====IdNV==>CIN[]=C?AG====G====I`\b==>>IN[]=>=?G====G====IdNV==AEIN[]=C?BG====G====IZ`TISNP===D;;;;;I[\QIPY_ISNP==>Edu|4€-un-ZvzvtnLI[\QIPY\ISNP====IdNV==@=IN[]=C?BG====G===?IdNV==@=IN[]=C?AG====G===?IdNV==B=IN[]=C?BG====G====IdNV==?=IZ`TISNP===>aun4€-Xv{t;I[\QIPY_N-svr{q-|s-zv{r-urr-v{ur-ƒvyyntr;I[\QIPY_aurr-‚€rq-|-or-|{€-|sZvzvtn€-urr;I[\Q[rny†-nyy-|s-urz9u|‚tu9-unƒr-orr{-xvq{n}}rqo†-ur-Q|p|4€-t||{€;I[\QIPY_Rƒr{-Xv{t-un€-y|€svr{q€;;;I[\QIPY\IPZb===?IN[]=B==G===>G====IP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>ISY:=>BDIR[Q0=C?>IXRfISYW=>BEG=C@>IZ`TISNP==>Eaur-Q|p|4€-}yn{€-nr}|prrqv{t-r…npy†-|{€purq‚yr;;;I[\QVs-„r-q|{4-q|-€|zruv{t€||{;;;I[\QIR[Q0=C??IXRfISYW=>BEG=C@?IZ`TISNP==>=aun{x€-s|-†|‚-ury};I[\QIPY_\‚-n{€}|nv|{-qvq{4rnyy†-€‚ƒvƒr9-o‚-nyrn€-„r-qvq;I[\QIR[Q0=C?AIXRfISYW=>BEG=C@AIZ`TISNP===Da||x|-n€-n-qrnu„rn}|{;;;I[\Q[|.-V4yy-{rƒr-nyy|„-v.I[\QIR[Q0=C?BIXRfISYW=>BEG=C@BIZfO====IdNV==@=IZfQ====IN[]=C?BG====G===?IZ`TISNP===>dryp|zr-onpx.I[\QIPY_Y||x€-yvxr-V-|„r-†|‚n{|ur-|{r;I[\Qdvu-z†-o|ur4€-ury}9I[\Q„r-€u|‚yq-or-noyr-|-trn|‚{q-ur-}n€€„|q-s| un-rtt;I[\QIPY\ISNP====IN[]=C?BG===@G====IdNV===EIN[]=C?BG====G====IZ`TISNP===>O||€r.I[\QIPY_Pn{-„r-nxr-uv€-yvyrt‚†-„vu-‚€-„ur{-„r-t|LI[\QIPY\ISNP====IN[]=C??G===@G===?IdNV==>BIN[]=C??G===BG===?IZ`TISNP==>EIPZb====;;;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QIPY_ISNP===>LLLI[\QIPY_ISNP==>E`‚r9-z†-qrn;;;I[\Qdr-unƒr-|-€‚€}r{q-|‚r€pn}r;I[\QIPY_aur-Q|p|-un€-y|pnrqur-rq-sy|„r€;I[\QIN[]=C?AG====G====IPY_ISNP===D...I[\QIPY_ISNP===>dunLI[\QIPY_ISNP==>Eduvyr-ur-un€-{|-†rnp~‚vrq-urz9-v-v€-|{y†n-znr-|s-vzr;I[\Qaur-y|pnv|{-v€-ur-`n{qg|{r;I[\QIPY_aur-sy|„r€-nr-n}}nr{y†|-or-s|‚{q-€|zr„urr-v{ur-`n{q-g|{r;I[\QIPY_ISNP===Daur-`n{q-g|{rLI[\QIPY_f|‚-zrn{9-un4€-„urr„r4yy-sv{q-ur-Q|p|LI[\QIPY_ISNP==>Edryy9I[\Q-z|r-yvxry†-|{r|s-uv€-€rƒn{€;I[\QVs-„r-q|{4-qr€|†-u|€rsy|„r€-ors|r-ur†-trurv-un{q€-|{-urz;;;I[\QIPY_U|„rƒr9-ur-`n{q-g|{r-v€r…prrqv{ty†-qn{tr|‚€;I[\QRƒr{-€‚}}|€v{t-„r-znqr-urv}9I[\Qurr4€-{|-t‚nn{rr-un„r-„|‚yq-r‚{-nyvƒr;;;I[\QIPY_ISNP===Df|‚4r-tvƒv{t-‚}LI[\QIPY_ISNP==>ENp‚nyy†;;;I[\QIPY_aurr4€-|{r-|s-‚€-„u|4€n-}rsrp-znpu-s|-uv€w|o;I[\QIPY\ISNP====IN[]=C?>G===@G===?IN[]=C?BG===@G====IdNV==?=IN[]=C?>G====G===?IdNV===?IN[]=C?BG====G===?IZ`TISNP==>EV4€-†|‚;I[\QIPY_IPZb===?ISNP==>=;;;du|-V`-urLI[\QIPY_ISNP==>EV{-snp;;;I[\QIPY_auv€-v€-|{r-|s-ur-nzrq€p|‚-|o|€-un-„rrqv€}npurq-|-uv€-v€yn{qI[\Q>=-†rn€-nt|;I[\QIPY_ISNP==>=N-|o|L.I[\QIPY_ISNP==>EZ†-vz}r€€v|{-„n€-unur†-unq-orr{-p|z}yrry†„v}rq-|‚9IN[]=C?>G====G====I[\Qo‚-V-q|-{|-x{|„-ur}nvp‚yn€;I[\QV4€-r{vry†-}|€€voyr-un|{r-|s-urz-p|‚yq-unƒr;;;I[\QIPY_ISNP==>=]|sr€€|;I[\QV4ƒr-p|{{rprq-|-ur-`n{qg|{r;I[\QIPY_ISNP==>EV-€rr;I[\QIPY\ISNP====IN[]=C??G===@G====IdNV==>BIN[]=C??G====G===?IN[]=C?>G====G===?IdNV==@=IZ`TISNP==>Ef|‚-nr-ur-z|€-€‚vrq|-r…}y|v{t-uv€-v€yn{q;I[\QIPY_]yrn€r;-Tvƒr-‚€-†|‚-nvq;I[\QISY8=>BEI]`8===@GC==@IR[Q0=C@>IXRfIZ`TISNP==>Ef|‚-pn{-rnpu-ur-`n{qg|{r-ƒvn-ur-ryr}|r;I[\QSv{q-ur-rq-sy|„r€-n{qo‚{-rƒr†-€v{tyr-|{r-|surz;I[\QIR[Q0=C@?IXRfIZ`TISNP==>=`|-†|‚4r-|{r-|s-ur;;;I[\QIPY_V-unq{4-rƒr{-{|vprq;I[\QIPY_Z†9-z†9-†|‚-prnv{y†-nr„ryy:o‚vy;I[\QIR[Q0=C@AIXRfIZ`TISNP===Daur-`n{q-g|{r;;;I[\QIR[Q0=C@BIXRfIZ`TISNP===>Vs-†|‚-tr-vq-|s-ursy|„r€9-„r4yy-or-noyr-|}rƒr{-ur-„n-s|-{|„;I[\QIPY_V4€-n-ovt-r€}|{€vovyv†;I[\QIR[Q0=CB=IXRfIZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CB>IQ[]=CB>IXRfIZfQ====IN[]=B==G===>G====IdNV==B=IZ[]=CB=G===CG===DG===?IP[]=CB=G=>>@G===?IN[]=CB=G==@=G===?IdNV=>==IN[]=CB=G====G===?IN[]=B==G====G====IdNV==B=IN[]=CB=G===@G===?IdNV==CAIN[]=CB=G====G====IdNV==>=IN[]=CB=G====G===?IdNV==B=IN[]=CB=G===@G===?IdNV==??IN[]=CB=G===BG===?ISY8=DAAISY8=>C?IN[]=CB=G====G===?ISY:=>C=ISY8=>C>ISY8=DA>IRcR=CB?0=CB?IRcR==D@0=CC=IXRfISYW>=?=G=CC>IZ`TISNP==>Eanxr-`‚r-„vu-†|‚-n{qsyrr-uv€-v€yn{q;;;I[\QV-ort-†|‚;;;I[\QIR[Q0=CC>IXRfIZ`TISNP==>EV4z-‚y†-€|†-s|-urpun|€-un-un€-orsnyyr{†|‚-v€yn{q;I[\QIPY_dr-u‚zn{€-z‚€-nxr-uroynzr;I[\QIR[Q0=D==IXRfIPZb====ISN\===AIa_N==?AG=D==G===?G====0C==>I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urRtt-P|vq|LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISYW=>BFGC=>>IRcRC=>=0C==?I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-Tn€€|„{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===CG==FEG===AG==>E0C==@I]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur`n{q-g|{rLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==>=G==FFG==@CG==@@0C==AI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-urYno†v{uLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==A@G==FFG==>=G==@A0C==BI]_VIZ`TIab_Q|-†|‚-„n{-|-t|-|-ur]yn{nv|{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==C=G==FFG===FG===F0C=>=IXRfISN\===AIa_N===?G==FFG===BG===C0C=>>IXRfIZ`TIab__‚v{rqLIf[WC=>=ISN\===AIa_N==AFG==FFG===DG===C \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pixel.pxe b/pre-edited-cs/data/Stage/Pixel.pxe index 3364dd55e4cf45e7d0c4eb5b4d3bb6e0a942e2ff..20ac9027d716f14e6a0a316ecb6b33ecaa1b93e1 100644 GIT binary patch delta 38 scmeBSoWaN%5aG(eGm+Jt!$RT?0}yCTbn)O}Vc=x2kodsh#=wvO0GXl(Y5)KL delta 25 fcmbQi*u%&g5aG(eJ(1O%gMr}=0}v=obnyTHMI8ka diff --git a/pre-edited-cs/data/Stage/Pixel.tsc b/pre-edited-cs/data/Stage/Pixel.tsc index 06bbe8d..9e3231e 100644 --- a/pre-edited-cs/data/Stage/Pixel.tsc +++ b/pre-edited-cs/data/Stage/Pixel.tsc @@ -1 +1 @@ -|y’ŸŸ¨Ÿ|y«¼½°«²¼ÄŸŸ £«µ°¸ŸŸŸŸ«´½³|y’ŸŸ¨ |y«¼½°«²¼ÄŸŸ £«µ°¸ŸŸŸ «´½³|y’ŸŸ¨¡|y«¼½°«²¼ÄŸŸ £«µ°¸ŸŸŸ¡«´½³|y’ŸŸ¨¢|y«¼½°«²¼ÄŸŸ £«µ°¸ŸŸŸ¢«´½³|y’ŸŸ¨£|y«¼½°«²¼ÄŸŸ £«µ°¸ŸŸŸ£«´½³|y’ŸŸ¨¤|y«µ°¸ŸŸŸ «´½³|y’Ÿ ŸŸ|y«º´È«°½¿Ÿ ŸŸ©ŸŸŸŸ©ŸŸŸ¡«Â¾ÄŸŸ  |y«µ°¾ŸŸŸ£«²Â«ÃÁ°ŸŸ£§©ŸŸ¨£©Ÿ ¤¢©ŸŸ ¥|y’Ÿ¡ŸŸ|y«º´È«Â°Ã|y«µ»¹ ££ ©Ÿ¡Ÿ¢|y«µ»¹ ££Ÿ©Ÿ¡Ÿ¡|y«µ»¹Ÿ§¢¤©Ÿ¡Ÿ |y«¼Â¶«ÃÄÁÆÞáÓâÛØÖ×ãäßã×ÔâÒáÔÔÝ«½¾³«²»Á|yŸ£œŸ§œŸ§ÆØÕÔÑÞáÔÒ×ØÛÓ«½¾³«´½³|y’Ÿ¡Ÿ |y«º´È«¼Â¶«ÃÄÁÆÞáÓâÛØÖ×ãäßã×ÔâÒáÔÔÝ«½¾³«²»Á|y«ÃÄÁÆ×èÓÞÝ–ãèÞäãÐÚÔÐáÔâ㮫½¾³«´½³|y’Ÿ¡Ÿ¡|y«º´È«µ»š ££¤«¼Â¶«ÃÄÁÆÞáÓâÛØÖ×ãäßã×ÔâÒáÔÔÝ«½¾³«²»Á«ÃÄÁÈÞäÚÝÞ書ÞÕãÔÝáÔÒÞáÓÔÓæ×Ðã|y¸ÛÔÐáÝÔÓØÝã×ÐãÝÞãÔÑÞÞÚ«½¾³«´½³|y’Ÿ¡Ÿ¢|y«º´È«¼Â¶ÆÞáÓâÛØÖ×ãäßã×ÔâÒáÔÔÝ«½¾³«²»Á|y«ÃÄÁ¸ßáÐèÕÞáèÞäáåØÒãÞá諽¾³«´½³|y’Ÿ¡ Ÿ|y’Ÿ¡¡Ÿ|y«º´È«¼Â¶ÈÞäÕØÝÓÝÞã×ØÝÖÞÕØÝãÔáÔâ㫽¾³«´½³|y’Ÿ¡¡ |y«º´È«Â°Ã«¼Â¶Ã×ÔáÔ–âÐÝÞãÔÑÞÞÚ›ÒÞåÔáÔÓ|yØÝÓäâ㫽¾³«µ»¹ ££ ©Ÿ¡¡¢«µ»¹ ££¤©Ÿ¡¡¡«´½³|y’Ÿ¡¡¡|y«º´È«¼Â¶«ÃÄÁ|y³ÞèoäæÐÝããÞÞßÔÝã×ÔÝÞãÔÑÞÞÚ®«È½¹ŸŸŸŸ«µ»š ££ |y«²»Á«²¼ÄŸŸ Ÿ»ÔÐáÝÔÓ×ÞæãÞãáÔÐãÕÛÞÞÓÔÓ|yáÞÑÞãâ«Æ°¸Ÿ ¥Ÿ«½¾³«Á¼Ä«´½³|y’Ÿ¡¡¢|y«º´È«¼Â¶½Þã×ØÝÖÔÛâÔ×ÔáÔÐßßÔÐáâ|yÔâßÔÒØÐÛÛèäâÔÕäÛ«½¾³«´½³|y’Ÿ¡¤Ÿ|y«º´È|y«Â°Ã|y«µ»¹ £££©Ÿ¡¤¦|y«µ»¹ ££¡©Ÿ¡¤£|y«µ»¹ ££ ©Ÿ¡¤¢|y«µ»¹ ££Ÿ©Ÿ¡¤¡|y«µ»¹Ÿ§¢¥©Ÿ¡¤ «´Å´ŸŸ ¨|y’Ÿ¡¤ |y«º´È«¼Â¶|y³ÞèÞäæÐÝããÞáÔâ㮫Ƚ¹ŸŸŸŸ«µ°¾ŸŸŸ£«²¼ÄŸŸŸŸ«Æ°¸ŸŸ¡Ÿ«²»Á|y«½¾³«²»¾|y«Æ°¸Ÿ ŸŸ«»¸š ŸŸŸ|y«³½¿Ÿ¡ Ÿ«µ»œŸ§¢¥«µ»š ££Ÿ«¼È³ŸŸŸ¡«Á¼Ä|y«ÃÁ°ŸŸ¦¢©ŸŸ¨¤©ŸŸ ¡©ŸŸŸ¨|y’Ÿ¡¤¡|y«º´È«¼Â¶«ÃÄÁÂ×ÔØâÝ–ãÜÞåØÝÖ›ÑäãØãÛÞÞÚâ|yÛØÚÔâ×Ô–ââãØÛÛÐÛØåÔ«½¾³«´½³|y’Ÿ¡¤¢|y«º´È«¼Â¶«ÃÄÁ³ÞèÞäæÐÝããÞÓáÐØÝã×ÔæÐãÔá|yÕáÞܲäáÛ讫Ƚ¹ŸŸŸŸ«²»¾|y«µ»š ££¡«µ°¾ŸŸŸ «²¼ÄŸŸŸŸ«Æ°¸Ÿ ŸŸ«µ°¸ŸŸŸ |y«Æ°¸ŸŸ¥Ÿ|y«²¼ÄŸŸ £«°½¿Ÿ¡¥Ÿ©ŸŸŸ ©ŸŸŸ¡«Æ°¸ŸŸ£Ÿ«°½¿Ÿ¡¥Ÿ©ŸŸŸ ©ŸŸŸŸ|y«Æ°¸ŸŸ¤Ÿ|y«¼Â¶«ÃÄÁÂ×ÔÕÔÛÛâÞäÝÓÐâÛÔÔß«½¾³|y«´½³|y’Ÿ¡¤£|y«º´È«²½¿Ÿ¡¥Ÿ©Ÿ¡¤¨©ŸŸŸŸ«µ»šŸ§¢¥«µ»š Ÿ£¡«µ»œ ££Ÿ«µ»š £££«Æ°¸ŸŸ Ÿ«´½³|y’Ÿ¡¤¦|y«º´È«¼Â¶Ã×ÔÑÔÓ–ââÞßßØÝÖæÔ㫽¾³«´½³|y’Ÿ¡¥Ÿ \ No newline at end of file +0==F=IZ[NIPZb==>AISNV====IR[Q0==F>IZ[NIPZb==>AISNV===>IR[Q0==F?IZ[NIPZb==>AISNV===?IR[Q0==F@IZ[NIPZb==>AISNV===@IR[Q0==FAIZ[NIPZb==>AISNV===AIR[Q0==FBISNV===>IR[Q0=>==IXRfIN[]=>==G====G===?I`\b==>>ISN\===AIP``Ia_N==AEG==FAG=>B@G==>C0=?==IXRfI`NaISYW>AA>G=?=@ISYW>AA=G=?=?ISYW=E@BG=?=>IZ`TIab_d|q€-yvtu-‚}-ur-€prr{;I[\QIPY_=A:=E:=E-dvsr-o|r-puvyq;I[\QIR[Q0=?=>IXRfIZ`TIab_d|q€-yvtu-‚}-ur-€prr{;I[\QIPY_Iab_du†-q|{4-†|‚-nxr-n-r€LI[\QIR[Q0=?=?IXRfISY8>AABIZ`TIab_d|q€-yvtu-‚}-ur-€prr{;I[\QIPY_Iab_f|‚-x{|„9-V-|sr{-rp|qrq-„unV-yrn{rq-v{-un-{|ro||x;;;I[\QIR[Q0=?=@IXRfIZ`Td|q€-yvtu-‚}-ur-€prr{;I[\QIPY_Iab_V-}n†-s|-†|‚-ƒvp|†;I[\QIR[Q0=?>=0=??=IXRfIZ`Tf|‚-sv{q-{|uv{t-|s-v{rr€;;;I[\QIR[Q0=??>IXRfI`NaIZ`Taurr4€-n-{|ro||x9-p|ƒrrqv{-q‚€;;;I[\QISYW>AA>G=??@ISYW>AABG=???IR[Q0=???IXRfIZ`TIab_Q|-†|‚-„n{-|-|}r{-ur-{|ro||xLIf[W====ISY8>AA> IPY_IPZb==>=Yrn{rq-u|„-|-rn-sy||qrq|o|€.IdNV=>C=I[\QI_ZbIR[Q0=??@IXRfIZ`T[|uv{t-ry€r-urr-n}}rn€r€}rpvnyy†-‚€rs‚y;;;I[\QIR[Q0=?A=IXRfIZ`TIab_T|-onpx-|-ur-yno†v{uLIf[W====I]_VISN\===AIa_N==ACG==FAG===EG===F0=?B=IXRfI`NaISYW>AAAG=?BDISYW>AA?G=?BAISYW>AA>G=?B@ISYW>AA=G=?B?ISYW=E@CG=?B>IRcR==>F0=?B>IXRfIZ`TQ|-†|‚-„n{-|-r€LIf[W====ISN\===AIPZb====IdNV==?=IPY_;;;;;I[\QIPY\IdNV=>==IYV8>===IQ[]=?>=ISY:=E@CISY8>AA=IZfQ===?I_ZbIa_N==D@G==FBG==>?G===F0=?B?IXRfIZ`TIab_`ur-v€{4-z|ƒv{t9-o‚-v-y||x€yvxr-€ur4€-€vyy-nyvƒr;I[\QIR[Q0=?B@IXRfIZ`TIab_Q|-†|‚-„n{-|-qnv{-ur-„nrs|z-P‚y†LIf[W====IPY\ISY8>AA?ISN\===>IPZb====IdNV=>==ISNV===>IdNV==C=IPZb==>AIN[]=?C=G===>G===?IdNV==A=IN[]=?C=G===>G====IdNV==B=IZ`TIab_`ur-sryy-€|‚{q-n€yrr};I[\QIR[Q0=?BAIXRfIP[]=?C=G=?BFG====ISY8=E@CISY8>=A?ISY:>AA=ISY8>AAAIdNV==>=IR[Q0=?BDIXRfIZ`Taur-orq4€-€|}}v{t-„r;I[\QIR[Q0=?C= \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt b/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt index 93a2990..a5c68d4 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt @@ -28,8 +28,8 @@ #0101 Date: Sat, 29 Feb 2020 22:28:38 -0600 Subject: [PATCH 09/10] makes weapons other than MG successfully generate, adds snake (camp) --- src/database/items.lua | 2 +- src/database/world_graph.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/database/items.lua b/src/database/items.lua index d9f410b..944e66b 100644 --- a/src/database/items.lua +++ b/src/database/items.lua @@ -78,7 +78,7 @@ local function _itemData() snake = { name = "Snake", script = " Date: Sat, 29 Feb 2020 22:31:06 -0600 Subject: [PATCH 10/10] updates a couple weapon reqs --- src/database/world_graph.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index 24e089c..1e42740 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -107,6 +107,7 @@ function eggCorridor1:new(worldGraph) self.requirements = function(self, items) return self.world.regions.arthur:canAccess(items) end + self.locations.cthulhu.requirements = function(self, items) return _has(items, "weaponSN") or _has(items, "flight") end self.locations.eventSue.requirements = function(self, items) return _has(items, "idCard") and _has(items, "weaponBoss") end self.locations.eventSue:setItem(self.world.items:getByKey("eventSue")) end @@ -345,7 +346,7 @@ function eggCorridor2:new(worldGraph) return false end - self.locations.dragonChest.requirements = function(self, items) return _has(items, "weapon") end + self.locations.dragonChest.requirements = function(self, items) return _has(items, "weaponSN") or _has(items, "eventCore") end self.locations.sisters.requirements = function(self, items) return _has(items, "weaponBoss") end end