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 66bbea8ee..000000000 Binary files a/graphics/Achievements/AchievementIWAD.png and /dev/null differ 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;