diff --git a/language.def_base b/language.def_base index 3257316ea..bed93de1a 100644 --- a/language.def_base +++ b/language.def_base @@ -894,13 +894,19 @@ SWWM_PARRY = "Parry"; SWWM_PPARRY = "Perfect Parry"; SWWM_TRESPAWN = "\cu[\cf%ds\c- to respawn\cu]\c-"; // score messages -SWWM_FINDSECRET = "\cf%s\cf found a secret. +%d\c-"; -SWWM_FINDKEY = "\cf%s\cf got the %s\cf. +%d\c-"; -SWWM_LASTSECRET = "\cf%s\cf found the last secret. +%d\c-"; -SWWM_LASTITEM = "\cf%s\cf got the last item. +%d\c-"; -SWWM_LASTMONSTER = "\cf%s\cf killed the last monster. +%d\c-"; +SWWM_FINDSECRET = "\cfYou found a secret, +%d\c-"; +SWWM_FINDSECRETREM = "\cf%s\cf found a secret. +%d\c-"; +SWWM_FINDKEY = "\cfYou got the %s\cf. +%d\c-"; +SWWM_FINDKEYREM = "\cf%s\cf got the %s\cf. +%d\c-"; +SWWM_LASTSECRET = "\cfYou found the last secret. +%d\c-"; +SWWM_LASTSECRETREM = "\cf%s\cf found the last secret. +%d\c-"; +SWWM_LASTITEM = "\cfYou got the last item. +%d\c-"; +SWWM_LASTITEMREM = "\cf%s\cf got the last item. +%d\c-"; +SWWM_LASTMONSTER = "\cfYou killed the last monster. +%d\c-"; +SWWM_LASTMONSTERREM = "\cf%s\cf killed the last monster. +%d\c-"; SWWM_NEWLORE = "New entries have been added to the Library."; -SWWM_SELLEXTRA = "\cf%s\cf sold an extra %s\cf. +%d\c-"; +SWWM_SELLEXTRA = "\cfYou sold an extra %s\cf. +%d\c-"; +SWWM_SELLEXTRAREM = "\cf%s\cf sold an extra %s\cf. +%d\c-"; SWWM_ALLCLEAR = "\cxLevel all clear! \cf+%d\c-"; SWWM_NOTCLEAR = "\cxLevel not clear?\c-"; SWWM_ALLCLEARAGAIN = "\cxLevel all clear... again!? \cf+%d\c-"; diff --git a/language.es_base b/language.es_base index bedf919b0..6884a9e48 100644 --- a/language.es_base +++ b/language.es_base @@ -775,14 +775,21 @@ SWWM_PARRY = "Parada"; SWWM_PPARRY = "Parada Perfecta"; SWWM_TRESPAWN = "\cu[\cf%ds\c- para reaparecer\cu]\c-"; // score messages -SWWM_FINDSECRET = "\cf%s\cf encontró un secreto. +%d\c-"; -SWWM_FINDKEY = "\cf%s\cf obtuvo la %s\cf. +%d\c-"; -SWWM_LASTSECRET = "\cf%s\cf encontró el último secreto. +%d\c-"; -SWWM_LASTITEM = "\cf%s\cf obtuvo el último ítem. +%d\c-"; -SWWM_LASTMONSTER = "\cf%s\cf mató al último enemigo. +%d\c-"; +SWWM_FINDSECRET = "\cfEncontraste un secreto. +%d\c-"; +SWWM_FINDSECRETREM = "\cf%s\cf encontró un secreto. +%d\c-"; +SWWM_FINDKEY = "\cfObtuviste la %s\cf. +%d\c-"; +SWWM_FINDKEYREM = "\cf%s\cf obtuvo la %s\cf. +%d\c-"; +SWWM_LASTSECRET = "\cfEncontraste el último secreto. +%d\c-"; +SWWM_LASTSECRETREM = "\cf%s\cf encontró el último secreto. +%d\c-"; +SWWM_LASTITEM = "\cfObtuviste el último ítem. +%d\c-"; +SWWM_LASTITEMREM = "\cf%s\cf obtuvo el último ítem. +%d\c-"; +SWWM_LASTMONSTER = "\cfMataste al último enemigo. +%d\c-"; +SWWM_LASTMONSTERREM = "\cf%s\cf mató al último enemigo. +%d\c-"; SWWM_NEWLORE = "Hay nuevas entradas disponibles en la Biblioteca."; -SWWM_SELLEXTRA = "\cf%s\cf vendió un %s\cf extra. +%d\c-"; -SWWM_SELLEXTRA_FEM = "\cf%s\cf vendió una %s\cf extra. +%d\c-"; +SWWM_SELLEXTRA = "\cfVendiste un %s\cf extra. +%d\c-"; +SWWM_SELLEXTRA_FEM = "\cfVendiste una %s\cf extra. +%d\c-"; +SWWM_SELLEXTRAREM = "\cf%s\cf vendió un %s\cf extra. +%d\c-"; +SWWM_SELLEXTRAREM_FEM = "\cf%s\cf vendió una %s\cf extra. +%d\c-"; SWWM_ALLCLEAR = "\cx¡Nivel despejado! \cf+%d\c-"; SWWM_NOTCLEAR = "\cx¿Nivel no despejado?\c-"; SWWM_ALLCLEARAGAIN = "\cx¿¡Nivel despejado... otra vez!? \cf+%d\c-"; diff --git a/language.version b/language.version index 1ef12dd57..1dd09b1d9 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r24 \cu(Tue 12 Apr 17:06:07 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r24 \cu(2022-04-12 17:06:07)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r25 \cu(Tue 12 Apr 17:06:20 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r25 \cu(2022-04-12 17:06:20)\c-"; diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index 93ecaf0f7..8ff142a33 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -333,7 +333,8 @@ extend Class SWWMHandler { allkills = true; SWWMCredits.Give(src.player,1000); - Console.Printf(StringTable.Localize("$SWWM_LASTMONSTER"),src.player.GetUserName(),1000); + if ( src.player == players[consoleplayer] ) Console.Printf(StringTable.Localize("$SWWM_LASTMONSTER"),1000); + else Console.Printf(StringTable.Localize("$SWWM_LASTMONSTERREM"),src.player.GetUserName(),1000); SWWMScoreObj.Spawn(1000,src.Vec3Offset(0,0,src.Height/2)); SWWMUtility.AchievementProgressInc("allkills",1,src.player); } diff --git a/zscript/handler/swwm_handler_worldtick.zsc b/zscript/handler/swwm_handler_worldtick.zsc index 54785f37c..78316d47d 100644 --- a/zscript/handler/swwm_handler_worldtick.zsc +++ b/zscript/handler/swwm_handler_worldtick.zsc @@ -55,7 +55,8 @@ extend Class SWWMHandler if ( !deathmatch && !(gameinfo.gametype&GAME_Hexen) && (level.total_items == level.found_items) && !allitems ) { allitems = true; - Console.Printf(StringTable.Localize("$SWWM_LASTITEM"),players[i].GetUserName(),500); + if ( i == consoleplayer ) Console.Printf(StringTable.Localize("$SWWM_LASTITEM"),500); + else Console.Printf(StringTable.Localize("$SWWM_LASTITEMREM"),players[i].GetUserName(),500); score += 490; SWWMUtility.AchievementProgressInc("allitems",1,players[i]); } diff --git a/zscript/items/swwm_baseitem.zsc b/zscript/items/swwm_baseitem.zsc index a8bee4292..fb281e49c 100644 --- a/zscript/items/swwm_baseitem.zsc +++ b/zscript/items/swwm_baseitem.zsc @@ -19,7 +19,10 @@ Mixin Class SWWMAutoUseFix SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); SWWMCredits.Give(Owner.player,sellprice); if ( Owner.player ) - Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),Owner.player.GetUserName(),GetTag(),sellprice); + { + if ( Owner.player == players[consoleplayer] ) Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),GetTag(),sellprice); + else Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRAREM_FEM":"$SWWM_SELLEXTRAREM"),Owner.player.GetUserName(),GetTag(),sellprice); + } } } return Super.HandlePickup(item); diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 4cb8fd1e6..ab57a5c5d 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -1900,7 +1900,10 @@ Class SWWMLamp : Inventory SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); SWWMCredits.Give(Owner.player,sellprice); if ( Owner.player ) - Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),Owner.player.GetUserName(),GetTag(),sellprice); + { + if ( Owner.player == players[consoleplayer] ) Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),GetTag(),sellprice); + else Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRAREM_FEM":"$SWWM_SELLEXTRAREM"),Owner.player.GetUserName(),GetTag(),sellprice); + } } else if ( Charge > 0 ) { diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index f58576884..c703d4f8d 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -2678,11 +2678,16 @@ Class Demolitionist : PlayerPawn { if ( hnd ) hnd.allsecrets = true; score = 1000; - Console.Printf(StringTable.Localize("$SWWM_LASTSECRET"),player.GetUserName(),score); + if ( player == players[consoleplayer] ) Console.Printf(StringTable.Localize("$SWWM_LASTSECRET"),score); + else Console.Printf(StringTable.Localize("$SWWM_LASTSECRETREM"),player.GetUserName(),score); SWWMUtility.AchievementProgressInc("allsecrets",1,player); } - else Console.Printf(StringTable.Localize("$SWWM_FINDSECRET"),player.GetUserName(),score); - if ( CheckLocalView() ) SWWMHandler.AddOneliner("findsecret",2,40); + else if ( player == players[consoleplayer] ) + { + Console.Printf(StringTable.Localize("$SWWM_FINDSECRET"),score); + SWWMHandler.AddOneliner("findsecret",2,40); + } + else Console.Printf(StringTable.Localize("$SWWM_FINDSECRETREM"),player.GetUserName(),score); SWWMCredits.Give(player,score); SWWMScoreObj.Spawn(score,Vec3Offset(0,0,Height/2)); // somehow ongivesecret can be called BEFORE PostBeginPlay (what the fuck) @@ -2726,7 +2731,8 @@ Class Demolitionist : PlayerPawn { // score int score = 100; - Console.Printf(StringTable.Localize("$SWWM_FINDKEY"),player.GetUserName(),item.GetTag(),score); + if ( player == players[consoleplayer] ) Console.Printf(StringTable.Localize("$SWWM_FINDKEY"),item.GetTag(),score); + else Console.Printf(StringTable.Localize("$SWWM_FINDKEYREM"),player.GetUserName(),item.GetTag(),score); SWWMCredits.Give(player,score); SWWMScoreObj.Spawn(100,player.mo.Vec3Offset(0,0,Height/2)); if ( !Random[DemoLines](0,5) && diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc index f40508aba..7fab06a91 100644 --- a/zscript/weapons/swwm_baseweapon.zsc +++ b/zscript/weapons/swwm_baseweapon.zsc @@ -241,7 +241,10 @@ Class SWWMWeapon : Weapon abstract SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); SWWMCredits.Give(Owner.player,sellprice); if ( Owner.player ) - Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),Owner.player.GetUserName(),GetTag(),sellprice); + { + if ( Owner.player == players[consoleplayer] ) Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),GetTag(),sellprice); + else Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRAREM_FEM":"$SWWM_SELLEXTRAREM"),Owner.player.GetUserName(),GetTag(),sellprice); + } item.bPickupGood = true; } // reset the price in case it has to respawn diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index da315d69e..39f47381b 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -55,7 +55,10 @@ Class ExplodiumGun : SWWMWeapon SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); SWWMCredits.Give(Owner.player,sellprice); if ( Owner.player ) - Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),Owner.player.GetUserName(),GetTag(),sellprice); + { + if ( Owner.player == players[consoleplayer] ) Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),GetTag(),sellprice); + else Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRAREM_FEM":"$SWWM_SELLEXTRAREM"),Owner.player.GetUserName(),GetTag(),sellprice); + } item.bPickupGood = true; } // give a spare diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc index db69db7f8..fe0f66be5 100644 --- a/zscript/weapons/swwm_tastytreat.zsc +++ b/zscript/weapons/swwm_tastytreat.zsc @@ -28,7 +28,10 @@ Class CandyGun : SWWMWeapon SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); SWWMCredits.Give(Owner.player,sellprice); if ( Owner.player ) - Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),Owner.player.GetUserName(),GetTag(),sellprice); + { + if ( Owner.player == players[consoleplayer] ) Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRA_FEM":"$SWWM_SELLEXTRA"),GetTag(),sellprice); + else Console.Printf(StringTable.Localize(SWWMUtility.SellFemaleItem(item)?"$SWWM_SELLEXTRAREM_FEM":"$SWWM_SELLEXTRAREM"),Owner.player.GetUserName(),GetTag(),sellprice); + } item.bPickupGood = true; } // reset the price in case it has to respawn