From bf4c2f4ec6220e123fab20161b7c46413c01d8fd Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 12 Feb 2022 18:50:15 +0100 Subject: [PATCH] Remove "Unchecked Capitalism" achievement. As funny as the joke was at first, it's a real detriment for completionists. --- achievements.lst | 1 - graphics/Achievements/AchievementDosh.png | Bin 2512 -> 0 bytes language.def_base | 2 -- language.es_base | 2 -- language.version | 4 ++-- zscript/swwm_thinkers_player.zsc | 5 ----- 6 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 graphics/Achievements/AchievementDosh.png diff --git a/achievements.lst b/achievements.lst index ea8ad314f..5dc0fcec8 100644 --- a/achievements.lst +++ b/achievements.lst @@ -39,7 +39,6 @@ deva,10,yes,any dime,0,no,any divine,10,yes,any doodle,20,yes,doom -dosh,1000000000,no,any everything,0,no,any ezkill,50,yes,doom ezkill,30,yes,raven diff --git a/graphics/Achievements/AchievementDosh.png b/graphics/Achievements/AchievementDosh.png deleted file mode 100644 index c726fb809b62b35455950f9810f4d52550da0f4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2512 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 FCIA;-^5Osh diff --git a/language.def_base b/language.def_base index 1edb81250..5b7dde30d 100644 --- a/language.def_base +++ b/language.def_base @@ -1188,8 +1188,6 @@ SWWM_ACHIEVEMENT_DIVINE_TAG = "Divine Delight"; SWWM_ACHIEVEMENT_DIVINE_TXT = "Use %d Divine Sprites"; SWWM_ACHIEVEMENT_DOODLE_TAG = "Graffiti Master"; SWWM_ACHIEVEMENT_DOODLE_TXT = "Doodle mustaches on %d demon faces"; -SWWM_ACHIEVEMENT_DOSH_TAG = "Unchecked Capitalism"; -SWWM_ACHIEVEMENT_DOSH_TXT = "Accumulate ¥1,000,000,000 across your playthroughs"; SWWM_ACHIEVEMENT_EVERYTHING_TAG = "The Demolitionist"; SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Unlock all achievements"; SWWM_ACHIEVEMENT_EZKILL_TAG = "Misa's Pride"; diff --git a/language.es_base b/language.es_base index ddbf7d46a..b57addea3 100644 --- a/language.es_base +++ b/language.es_base @@ -1039,8 +1039,6 @@ SWWM_ACHIEVEMENT_DIVINE_TAG = "Deleite Divino"; SWWM_ACHIEVEMENT_DIVINE_TXT = "Usa %d Sprites Divinos"; SWWM_ACHIEVEMENT_DOODLE_TAG = "Maestro del Grafiti"; SWWM_ACHIEVEMENT_DOODLE_TAG = "Garabatea mostachos en %d caras de demonio"; -SWWM_ACHIEVEMENT_DOSH_TAG = "Capitalismo Desenfrenado"; -SWWM_ACHIEVEMENT_DOSH_TXT = "Acumula ¥1.000.000.000 entre todas tus partidas"; SWWM_ACHIEVEMENT_EVERYTHING_TAG = "La Demolicionista"; SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Desbloquea todos los logros"; SWWM_ACHIEVEMENT_EZKILL_TAG = "El Orgullo de Misa"; diff --git a/language.version b/language.version index fc5f35aa8..c4862f761 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r145 \cu(Sat 12 Feb 18:45:17 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.2pre r145 \cu(2022-02-12 18:45:17)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r146 \cu(Sat 12 Feb 18:50:15 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.2pre r146 \cu(2022-02-12 18:50:15)\c-"; diff --git a/zscript/swwm_thinkers_player.zsc b/zscript/swwm_thinkers_player.zsc index 35f69909a..e5f2ebf90 100644 --- a/zscript/swwm_thinkers_player.zsc +++ b/zscript/swwm_thinkers_player.zsc @@ -226,11 +226,6 @@ Class SWWMCredits : Thinker s.hhiscore = c.hcredits; } SWWMLoreLibrary.Add(p,"ScoreSystem"); - if ( cheat ) return; - int curamt = SWWMUtility.GetAchievementProgress("dosh"); - if ( (hamount > 0) || (curamt+amount < curamt) || (curamt+amount >= 1000000000) ) - SWWMUtility.AchievementProgress("dosh",1000000000,p); - else SWWMUtility.AchievementProgress("dosh",curamt+amount,p); } static clearscope bool CanTake( PlayerInfo p, int amount, int hamount = 0 )