From 1e82cf6b0901ed7c1c6626758d3797aacd047c10 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 24 Mar 2021 18:10:17 +0100 Subject: [PATCH] Remove the 'Mx. Worldwide' achievement, it can't work due to cvars being split between games. Adjust how the 'Full Set' achievement is handled, for the same reasons. Don't split the Demolitionist Menu help text, it just complicates code. --- achievements.lst | 1 - cvarinfo.txt | 2 - graphics/Achievements/AchievementIWAD.png | Bin 2522 -> 0 bytes language.def_base | 2 - language.def_menu | 10 +-- language.es_base | 1 - language.es_menu | 10 +-- language.version | 4 +- zscript/items/swwm_collectibles.zsc | 14 ++-- zscript/kbase/swwm_kbase.zsc | 93 +++------------------- 10 files changed, 28 insertions(+), 109 deletions(-) delete mode 100644 graphics/Achievements/AchievementIWAD.png diff --git a/achievements.lst b/achievements.lst index 224813653..dcfd42bf5 100644 --- a/achievements.lst +++ b/achievements.lst @@ -42,7 +42,6 @@ gib,1000,yes golden,24,yes gravity,25,yes #hnd,6,yes -iwad,7,no jump,100,yes lead,1500,yes #lightning,0,no diff --git a/cvarinfo.txt b/cvarinfo.txt index b8fdc1c56..87d9622ea 100644 --- a/cvarinfo.txt +++ b/cvarinfo.txt @@ -183,7 +183,6 @@ nosave int swwm_achievement_gib = 0; nosave int swwm_achievement_golden = 0; nosave int swwm_achievement_gravity = 0; nosave int swwm_achievement_hnd = 0; -nosave int swwm_achievement_iwad = 0; nosave int swwm_achievement_jump = 0; nosave int swwm_achievement_lead = 0; nosave int swwm_achievement_lightning = 0; @@ -251,7 +250,6 @@ nosave int swwm_progress_gib = 0; nosave int swwm_progress_golden = 0; nosave int swwm_progress_gravity = 0; nosave int swwm_progress_hnd = 0; -nosave int swwm_progress_iwad = 0; nosave int swwm_progress_jump = 0; nosave int swwm_progress_lead = 0; nosave int swwm_progress_love = 0; diff --git a/graphics/Achievements/AchievementIWAD.png b/graphics/Achievements/AchievementIWAD.png deleted file mode 100644 index 66bbea8ee2b9a5f6d4fa01394cfb4740977ee82e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2522 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 KKbLh*2~7aWq{M6h diff --git a/language.def_base b/language.def_base index 2ec9d4ad6..5c9721ec3 100644 --- a/language.def_base +++ b/language.def_base @@ -902,8 +902,6 @@ SWWM_ACHIEVEMENT_GRAVITY_TAG = "Decent Ascent"; SWWM_ACHIEVEMENT_GRAVITY_TXT = "Use %d Gravity Suppressors"; SWWM_ACHIEVEMENT_HND_TAG = "High Noon"; SWWM_ACHIEVEMENT_HND_TXT = "Land %d killing shots in a single Puntzer Beta reload"; -SWWM_ACHIEVEMENT_IWAD_TAG = "Mx. Worldwide"; -SWWM_ACHIEVEMENT_IWAD_TXT = "Play on all supported games"; SWWM_ACHIEVEMENT_JUMP_TAG = "Verticality"; SWWM_ACHIEVEMENT_JUMP_TXT = "Walljump %d times"; SWWM_ACHIEVEMENT_LEAD_TAG = "Lead Delivery"; diff --git a/language.def_menu b/language.def_menu index 128b63eea..379cf893f 100644 --- a/language.def_menu +++ b/language.def_menu @@ -532,9 +532,8 @@ SWWM_HELPTXT = "\n" "\cfArrow Keys:\c- Navigate\n" "\cfEnter/Left Click:\c- Sell\n" -"\cfBackspace/Right Click:\c- Switch to buying"; -SWWM_HELPTXT_TRADING = -"\n\n" +"\cfBackspace/Right Click:\c- Switch to buying\n" +"\n" "\cxTrading Tab - Controls (Main)\c-\n" "\cx---------------------------\c-\n" "\n" @@ -553,9 +552,8 @@ SWWM_HELPTXT_TRADING = "\cx------------------------------\c-\n" "\n" "\cfUp/Down:\c- Scroll\n" -"\cfBackspace/Right Click:\c- Return"; -SWWM_HELPTXT_CHAT = -"\n\n" +"\cfBackspace/Right Click:\c- Return\n" +"\n" "\cxChat Log Tab - Controls\c-\n" "\cx---------------------\c-\n" "\n" diff --git a/language.es_base b/language.es_base index fb6af21ff..c871d49d4 100644 --- a/language.es_base +++ b/language.es_base @@ -802,7 +802,6 @@ SWWM_ACHIEVEMENT_GRAVITY_TAG = "Ascenso Decente"; SWWM_ACHIEVEMENT_GRAVITY_TXT = "Usa %d Supresores de Gravedad"; SWWM_ACHIEVEMENT_HND_TAG = "Mediodía"; SWWM_ACHIEVEMENT_HND_TXT = "Realiza %d disparos mortales en una única recarga de Puntzer Beta"; -SWWM_ACHIEVEMENT_IWAD_TXT = "Juega en todos los juegos soportados"; SWWM_ACHIEVEMENT_JUMP_TAG = "Verticalidad"; SWWM_ACHIEVEMENT_JUMP_TXT = "Salta paredes %d veces"; SWWM_ACHIEVEMENT_LEAD_TAG = "Reparto de Plomo"; diff --git a/language.es_menu b/language.es_menu index dbc256c66..56df22eee 100644 --- a/language.es_menu +++ b/language.es_menu @@ -529,9 +529,8 @@ SWWM_HELPTXT = "\n" "\cfFlechas:\c- Navegar\n" "\cfEnter/Click Izdo.:\c- Vender\n" -"\cfRetroceso/Click Dcho.:\c- Cambiar a compra"; -SWWM_HELPTXT_TRADING = -"\n\n" +"\cfRetroceso/Click Dcho.:\c- Cambiar a compra\n" +"\n" "\cxPestaña de Intercambio - Controles (Principal)\c-\n" "\cx---------------------------\c-\n" "\n" @@ -550,9 +549,8 @@ SWWM_HELPTXT_TRADING = "\cx--------------------------------------------\c-\n" "\n" "\cfArriba/Abajo:\c- Scroll\n" -"\cfRetroceso/Click Dcho.:\c- Volver"; -SWWM_HELPTXT_CHAT = -"\n\n" +"\cfRetroceso/Click Dcho.:\c- Volver\n" +"\n" "\cxPestaña de Historial de Chat - Controles\c-\n" "\cx--------------------------------------\c-\n" "\n" diff --git a/language.version b/language.version index 63aabc2b7..bb67feb3c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r401 \cu(Wed 24 Mar 17:46:46 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r401 \cu(2021-03-24 17:46:46)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r402 \cu(Wed 24 Mar 18:10:17 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r402 \cu(2021-03-24 18:10:17)\c-"; diff --git a/zscript/items/swwm_collectibles.zsc b/zscript/items/swwm_collectibles.zsc index 6c559b8d8..89e072b15 100644 --- a/zscript/items/swwm_collectibles.zsc +++ b/zscript/items/swwm_collectibles.zsc @@ -81,28 +81,24 @@ Class SWWMCollectible : Inventory abstract { Super.AttachToOwner(other); // count how many we have, set progress accordingly - int nc = 0, tnc = 0, cnc = 0; + int nc = 0, cnc = 0; for ( int i=0; i)(AllActorClasses[i]); if ( !c || (c == 'SWWMCollectible') ) continue; let def = GetDefaultByType(c); - tnc++; // check that we can collect it in this IWAD if ( !def.ValidGame() ) continue; nc++; } for ( Inventory i=other.inv; i; i=i.inv ) { - if ( i is 'SWWMCollectible' ) - cnc++; + if ( !(i is 'SWWMCollectible') ) continue; + cnc++; } - // force progress to be "total collectibles" so this doesn't get unset on other IWADs that may have more - if ( cnc == nc ) SWWMUtility.AchievementProgress('swwm_progress_allcoll',tnc,other.player); - else SWWMUtility.AchievementProgress('swwm_progress_allcoll',cnc,other.player); + SWWMUtility.AchievementProgress('swwm_progress_allcoll',cnc,other.player); // we're only attaching to the other players - if ( propagated ) - return; + if ( propagated ) return; // give credit if ( other.player && (Stamina > 0) ) { diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc index 410541d08..359795ece 100644 --- a/zscript/kbase/swwm_kbase.zsc +++ b/zscript/kbase/swwm_kbase.zsc @@ -509,17 +509,10 @@ Class DemolitionistMenu : GenericMenu case MKEY_DOWN: if ( tabs[curtab] == TAB_HELP ) { - String str = StringTable.Localize("$SWWM_HELPTXT"); - for ( int i=0; i 0) ) - str = str..StringTable.Localize("$SWWM_HELPTXT_CHAT"); + String kstr; + if ( mkey[1] != "" ) kstr = mkey[0].."/"..mkey[1]; + else kstr = mkey[0]; + str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr); BrokenLines l = fnt.BreakLines(str,629); if ( l.Count() > 28 ) l = fnt.BreakLines(str,620); if ( (l.Count() > 28) && (sel0 < l.Count()-28) ) @@ -1528,21 +1521,10 @@ Class DemolitionistMenu : GenericMenu else if ( (tabs[curtab] == TAB_HELP) && !isrclick ) { // are we clicking where the scrollbar should be? - if ( mpos.x < 632 ) return res; String kstr; if ( mkey[1] != "" ) kstr = mkey[0].."/"..mkey[1]; else kstr = mkey[0]; str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr); - for ( int i=0; i 0) ) - str = str..StringTable.Localize("$SWWM_HELPTXT_CHAT"); BrokenLines l = fnt.BreakLines(str,629); if ( l.Count() > 28 ) l = fnt.BreakLines(str,620); else return res; // no scrollbar @@ -1777,16 +1759,6 @@ Class DemolitionistMenu : GenericMenu [k1, k2] = bindings.GetKeysForCommand("openmenu SWWMKnowledgeBaseMenu"); String kstr = bindings.NameKeys(k1,k2); str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr); - for ( int i=0; i 0) ) - str = str..StringTable.Localize("$SWWM_HELPTXT_CHAT"); BrokenLines l = fnt.BreakLines(str,629); if ( l.Count() > 28 ) l = fnt.BreakLines(str,620); else return res; // no scrollbar @@ -2182,33 +2154,13 @@ Class DemolitionistMenu : GenericMenu double afactor = adone?1.:0., bfactor = bdone?1.:0.; if ( a.progress ) { - int val = a.progress.GetInt(); - int mval = a.maxval; - if ( a.basename == "iwad" ) - { - // special case - mval = 3; - int bits = val; - val = 0; - for ( int i=0; i<3; i++ ) if ( bits&(1< 0) ) - str = str..StringTable.Localize("$SWWM_HELPTXT_CHAT"); BrokenLines l = fnt.BreakLines(str,629); if ( l.Count() > 28 ) l = fnt.BreakLines(str,620); xx = 6;