From 69404d765ec75dd43d5bbbb0fbbca9d1b718d04c Mon Sep 17 00:00:00 2001 From: shru Date: Wed, 19 Dec 2018 23:24:00 -0500 Subject: [PATCH] Fixed bug where music would revert to previous track after collecting panties or rouge. --- .gitlab-ci.yml | 2 +- README.md | 8 ++++++++ src/item_deck.lua | 5 +++++ src/main.lua | 1 - src/tsc_file.lua | 4 ++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c96f918..0a9d3f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ build-depoy: # II. Release - cd releases - - FILE=$(ls *-win64.zip) ; butler push "$FILE" "$ITCHIO_USER/$ITCHIO_GAME:win64-$CHANNEL" + # - FILE=$(ls *-win64.zip) ; butler push "$FILE" "$ITCHIO_USER/$ITCHIO_GAME:win64-$CHANNEL" - FILE=$(ls *-win32.zip) ; butler push "$FILE" "$ITCHIO_USER/$ITCHIO_GAME:win32-$CHANNEL" # - FILE=$(ls *-macosx.zip) ; zip -ur "$FILE" "Cave Story Randomizer.app" ; butler push "$FILE" "$ITCHIO_USER/$ITCHIO_GAME:osx-$CHANNEL" # # Workaround for issue where butler renames *.love to *.zip. diff --git a/README.md b/README.md index ae295c8..dfc0a19 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Cave Story Randomizer Todo ---- +- Update to Love 11.2 +- Remove Love files... lovec.exe, readme, etc. - Trade Sequence Step B: Require random obtainable weapon, instead of always polar star and fireball. - Randomize Booster v0.8 / v2.0 @@ -15,6 +17,12 @@ Issues - Hell Missile Upgrade uses a unique script and won't be easy to replace. - Trading back the Nemesis for the Blade almost certainly will be weird. +Bugs +---- +- Broken Egg Observation Room (Log/Included) +- Sleeping with Chaco seemed to do nothing +- Jellyfish juice box told me I got a life capsule, then it said "Max HP increased by 5! Max HP increased by 3!" and then gave me the juice and my HP was actually the same. It's doing this every time I get the juice. + Credits ------- diff --git a/src/item_deck.lua b/src/item_deck.lua index ec64869..b318ea9 100644 --- a/src/item_deck.lua +++ b/src/item_deck.lua @@ -22,6 +22,11 @@ function C:getAnyExceptMissiles() return self:_getItem(_filterAnyExceptMissiles) end +function C:getByKey(key) + local filterByKey = function(item) return item.key == key end + return self:_getItem(filterByKey) +end + function C:getWeapon() return self:_getItem(_filterWeapon) end diff --git a/src/main.lua b/src/main.lua index bbf3f21..983ff5e 100644 --- a/src/main.lua +++ b/src/main.lua @@ -14,7 +14,6 @@ U = require 'util' local LOG_LEVEL, _logCounts, _logLines = 3, nil, nil local function _log(level, prefix, text, ...) - if LOG_LEVEL >= level then local text = prefix .. text print(text, ...) diff --git a/src/tsc_file.lua b/src/tsc_file.lua index 1ff79ee..cadb61b 100644 --- a/src/tsc_file.lua +++ b/src/tsc_file.lua @@ -90,6 +90,10 @@ function C:_replaceAttribute(original, replacement, attribute) if type(replaceText) == 'table' then replaceText = replaceText[1] end + -- Fix: After collecting Curly's Panties or Chako's Rouge, music would go silent. + if attribute == 'music' and replaceText == '' then + replaceText = "