diff --git a/language.def_base b/language.def_base index 737d8ad66..0919f1a68 100644 --- a/language.def_base +++ b/language.def_base @@ -653,6 +653,7 @@ D_TETHERFAIL = "The Safety Tether link was obstructed."; D_MASHIRO = "\cjShe knows where you are...\c-"; SWWM_YNYKRONREADY = "Ynykron Artifact ready for firing."; SWWM_SWAPWEAPON = "\cjPress \cfUse\cj to swap \cf%s\cj for \cf%s\cj.\c-"; +SWWM_TODOWEAPON = "\cjThe \cf%s\cj is not let implemented.\c-"; SWWM_TITLEPRESENTSA = "UnSX Team"; SWWM_TITLEPRESENTSB = "presents"; SWWM_TITLEPRESENTS = "presents"; diff --git a/language.es_base b/language.es_base index 99682e397..0900b4b82 100644 --- a/language.es_base +++ b/language.es_base @@ -550,6 +550,8 @@ D_TETHERFAIL = "El vínculo del Enlace de Seguridad fue obstruído."; D_MASHIRO = "\cjSabe donde estás...\c-"; SWWM_YNYKRONREADY = "Artefacto Ynykron listo para disparar."; SWWM_SWAPWEAPON = "\cjPulsa \cfUsar\cj para cambiar \cf%s\cj por \cf%s\cj.\c-"; +SWWM_TODOWEAPON = "\cjEl \cf%s\cj aun no está implementado.\c-"; +SWWM_TODOWEAPON_FEM = "\cjLa \cf%s\cj aun no está implementada.\c-"; SWWM_TITLEPRESENTSB = "presenta"; SWWM_TITLEPRESENTS = "presenta"; SWWM_TITLEMODBYA = "un mod de"; diff --git a/language.version b/language.version index ddc137333..561e81f8b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r161 \cu(Wed 6 Jul 13:10:46 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r161 \cu(2022-07-06 13:10:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r162 \cu(Wed 6 Jul 13:31:23 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r162 \cu(2022-07-06 13:31:23)\c-"; diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index 786b94c42..75c2e5b8a 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -1773,10 +1773,10 @@ Class SWWMUtility } // gendered languages are a fuck - static clearscope bool SellFemaleItem( Inventory i ) + static clearscope bool SellFemaleItem( Inventory i, String loc = "SWWM_SELLEXTRA_FEM" ) { // no gendered string alt - if ( StringTable.Localize("$SWWM_SELLEXTRA_FEM") == "SWWM_SELLEXTRA_FEM" ) + if ( StringTable.Localize("$"..loc) == loc ) return false; if ( i is 'DeepImpact' ) return true; if ( i is 'ExplodiumGun' ) return true; diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index 6e3345a01..fc86018f3 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -57,6 +57,14 @@ Class SWWMWeapon : Weapon abstract override void Touch( Actor toucher ) { + // show message about unimplemented weapons + State ReadyState = FindState('Ready'); + if ( !ReadyState || !ReadyState.ValidateSpriteFrame() ) + { + if ( toucher.CheckLocalView() ) + Console.MidPrint(SmallFont,String.Format(StringTable.Localize(SWWMUtility.SellFemaleItem(self,"SWWM_TODOWEAPON_FEM")?"$SWWM_TODOWEAPON_FEM":"$SWWM_TODOWEAPON"),GetTag())); + return; + } // show prompt to swap weapon, and prevent normal pickup SWWMWeapon sw; if ( bSPECIAL && swwm_swapweapons && (sw = HasSwapWeapon(toucher)) )