From 75eda90182da0070edb5fd30127c3b38d49369cd Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 15 Sep 2022 15:56:44 +0200 Subject: [PATCH] Touch up achievements. I think I was being too generous with some. --- FuturePlans.md | 11 +-- achievements.lst | 108 ++++++++++----------- language.def_base | 132 +++++++++++++------------- language.es_base | 132 +++++++++++++------------- language.version | 4 +- zscript/hud/swwm_hudextra.zsc | 2 +- zscript/kbase/swwm_kbasetab_stats.zsc | 7 +- zscript/menu/swwm_achievementmenu.zsc | 6 +- 8 files changed, 199 insertions(+), 203 deletions(-) diff --git a/FuturePlans.md b/FuturePlans.md index 11b399d35..6ea26fe1c 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -6,7 +6,7 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini * ☐ **DLC Weaponset:** - ✓ [1] Itamex Reinforced Hammer *(UnSX 5)* - - ✓ HAHA DAB *(Gib 200 enemies with the Itamex Hammer)* + - ✓ HAHA DAB *(Gib 300 enemies with the Itamex Hammer)* - [2] Plasma Blaster *(SWWM)* - Blastin' Plasma *(Kill an enemy at full health with a Plasma Blaster charged shot 50 times)* - [3] Puntzer Beta *(SWWM Iridium)* @@ -16,16 +16,16 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini - ✓ [5] Sheen HMG *(SWWM Platinum Ep2)* - ✓ Dakka *(Fire the Sheen HMG at 700 RPM for 30 seconds straight)* - ✓ [6] Quadravol *(UnSX)* - - ✓ Gravely Roast *(Perform 50 bayonet combos with the Quadravol)* + - ✓ Gravely Roast *(Perform 200 bayonet combos with the Quadravol)* - [7] Sparkster x3 *(UnSX 2)* - A Fine Sparking *(Kill 30 enemies at once with a Sparkster Rifle combo shot)* - [8] Ray-Khom *(UnSX)* - - The Most Silent Takedown *(Kill 30 enemies with the Ray-Khom primary without alerting them)* + - The Most Silent Takedown *(Kill 40 enemies with the Ray-Khom primary without alerting them)* - John Romero's Curse *(Fry yourself by discharging an electric weapon in water)* - [9] Mortal Rifle *(UnSX 2)* - - Railed Hard *(Shoot through 16 enemies with a single Mortal Rifle overpressure shot)* + - Railed Hard *(Shoot through 44 enemies with a single Mortal Rifle overpressure shot)* - [0] Rafan-Kos *(UnSX 4)* - - Blasting Ropes *(Melt a grand total of 1000 enemies with the Rafan-Kos)* + - Blasting Ropes *(Melt a grand total of 5000 enemies with the Rafan-Kos)* * ☑ **Additional Voice Acting:** - ✓ Extra lines for item pickups/usage - ✓ Additional taunts and others @@ -66,7 +66,6 @@ Re-animation of old FK models. Plus extra score incentives and achievements. - Dangerous Ball Action *(Land a lead ball crit on yourself)* - Total Ball Destruction *(Kill the Icon of Sin with a lead ball)* - Say The Line Vinny *(Spin attack with the Itamex Hammer for 60 seconds)* - - Whateverbuster *(Use the Wallbuster shuffle function 100 times)* * **Additional Models:** - Gibs - Hexen keys diff --git a/achievements.lst b/achievements.lst index 6d574c2f4..58c43e13f 100644 --- a/achievements.lst +++ b/achievements.lst @@ -7,114 +7,114 @@ # this is a bitfield, where abs(maxval) bits must be set # hasformat: the TXT string has a %d in it to substitute for maxval # gametype: the game this belongs to (any, doom, heretic, hexen, raven, etc.) -acid,40,yes,any +acid,1000,yes,any allcoll,-1,no,any #allinv,-1,yes,any -allitems,30,yes,nothexen -allkills,30,yes,nothexen -allsecrets,30,yes,nothexen +allitems,100,yes,nothexen +allkills,100,yes,nothexen +allsecrets,100,yes,nothexen #allweapons,-20,yes,any -anom,10,yes,any +anom,50,yes,any anone,0,no,any #ara,100,yes,any #arse,-8,yes,any -balls,10,yes,any +balls,200,yes,any #ballself,0,no,any -barrel,500,yes,doom -barrier,20,yes,doom +barrel,1000,yes,doom +barrier,100,yes,doom baseball,0,no,doom blaze,0,no,nothexen -bonk,200,yes,any -bossdash,5,yes,any -brake,10,yes,any -bune,400,yes,any -bustin,40,yes,any -butts,100,yes,any -candy,500,yes,any +bonk,500,yes,any +bossdash,20,yes,any +brake,30,yes,any +bune,5000,yes,any +bustin,200,yes,any +butts,1000,yes,any +candy,1000,yes,any cliffyb,0,no,nothexen clonk,0,no,any #combo,0,no,any -conga,10,yes,any +conga,20,yes,any crush,0,no,any cybully,0,no,doom -cum,500,yes,any -dab,200,yes,any +cum,5000,yes,any +dab,300,yes,any dakka,30,yes,any #dbsucc,0,no,any -deadeye,7,yes,any -deva,10,yes,any +deadeye,8,yes,any +deva,50,yes,any dime,0,no,any -divine,10,yes,any -doodle,20,yes,doom +divine,50,yes,any +doodle,200,yes,doom #engine,0,no,any everything,0,no,any -ezkill,50,yes,doom +ezkill,100,yes,doom ezkill,30,yes,raven flight,2000,yes,any #fluffy,50,yes,any -friend,20,yes,any -fuel,400,yes,any +friend,100,yes,any +fuel,4000,yes,any fuller,0,no,any -gcsandwich,10,yes,any -gepgun,30,yes,any -ghost,20,yes,any -gib,1500,yes,any -golden,24,yes,any -gravity,10,yes,raven -grenade,20,yes,any +gcsandwich,200,yes,any +gepgun,40,yes,any +ghost,50,yes,any +gib,50000,yes,any +golden,100,yes,any +gravity,50,yes,raven +grenade,30,yes,any hnd,6,yes,any hurry,0,no,any -jump,100,yes,any +jump,1000,yes,any kancho,0,no,hexen keen,0,no,doom #kirin,500,yes,hexen lead,1500,yes,any lightning,0,no,any ligma,0,no,any -love,10,yes,any +love,40,yes,any #mashiro,0,no,any matryoshka,0,no,any mbf,0,no,doom -mega,10000,yes,any -moth,30,yes,any +mega,1000000,yes,doom +mega,100000,yes,raven +moth,100,yes,any nice,0,no,nothexen oneguy,0,no,any onehp,10,yes,any onestanding,0,no,nothexen oopsie,0,no,any #pachinko,0,no,any -par,15,yes,doom -parry,100,yes,any +par,50,yes,doom +parry,2000,yes,any peace,0,no,nothexen -plasma,30,yes,any +plasma,50,yes,any plush,10,yes,any puzzle,0,no,hexen -rage,20,yes,any -rail,16,yes,any -reflect,20,yes,any -refresh,30,yes,any -roast,40,yes,any +rage,200,yes,any +rail,44,yes,any +reflect,100,yes,any +refresh,500,yes,any +roast,200,yes,any salt,0,no,any sanic,800,yes,any sekiro,0,no,any shame,0,no,any -shock,30,yes,any -#shuffle,100,yes,any -slayer,40,yes,doom +shock,200,yes,any +slayer,50,yes,doom slayer,20,yes,raven -slemg,100,yes,any -sneaky,10,yes,raven -sneeze,20,yes,any +slemg,500,yes,any +sneaky,20,yes,raven +sneeze,50,yes,any spark,30,yes,any #speen,60,yes,any step,30,yes,any -stomp,40,yes,any -sunny,15,yes,any +stomp,500,yes,any +sunny,100,yes,any #tbd,0,no,doom tele,0,no,any #tennis,0,no,any -thicc,100,yes,any -thruwall,20,yes,any +thicc,1000,yes,any +thruwall,200,yes,any tornado,0,no,heretic trash,0,no,doom travel,1000,yes,any diff --git a/language.def_base b/language.def_base index 2190907ff..b0fcf7694 100644 --- a/language.def_base +++ b/language.def_base @@ -1154,117 +1154,117 @@ SWWM_FANART27 = "Marisa16.jpg"; SWWM_FANART28 = "Marisa17.jpg"; // achievements SWWM_ACHIEVEMENT_ACID_TAG = "Fizzy Goodness"; -SWWM_ACHIEVEMENT_ACID_TXT = "Melt %d enemies with Telebrium Flechettes"; +SWWM_ACHIEVEMENT_ACID_TXT = "Melt %s enemies with Telebrium Flechettes"; SWWM_ACHIEVEMENT_ALLCOLL_TAG = "The Full Set"; SWWM_ACHIEVEMENT_ALLCOLL_TXT = "Obtain all collectibles in a single save"; SWWM_ACHIEVEMENT_ALLITEMS_TAG = "Collector"; -SWWM_ACHIEVEMENT_ALLITEMS_TXT = "Obtain 100%% items in %d maps"; +SWWM_ACHIEVEMENT_ALLITEMS_TXT = "Obtain 100%% items in %s maps"; SWWM_ACHIEVEMENT_ALLKILLS_TAG = "Pest Control"; -SWWM_ACHIEVEMENT_ALLKILLS_TXT = "Obtain 100%% kills in %d maps"; +SWWM_ACHIEVEMENT_ALLKILLS_TXT = "Obtain 100%% kills in %s maps"; SWWM_ACHIEVEMENT_ALLSECRETS_TAG = "Premium Detective"; -SWWM_ACHIEVEMENT_ALLSECRETS_TXT = "Obtain 100%% secrets in %d maps"; +SWWM_ACHIEVEMENT_ALLSECRETS_TXT = "Obtain 100%% secrets in %s maps"; SWWM_ACHIEVEMENT_ANOM_TAG = "Anomalous"; -SWWM_ACHIEVEMENT_ANOM_TXT = "Use %d Mykradvo Artifacts"; +SWWM_ACHIEVEMENT_ANOM_TXT = "Use %s Mykradvo Artifacts"; SWWM_ACHIEVEMENT_ANONE_TAG = "Completely Necessary Use of Force"; SWWM_ACHIEVEMENT_ANONE_TXT = "Use the Mykradvo Artifact against a single non-boss enemy"; SWWM_ACHIEVEMENT_BALLS_TAG = "Slam your Balls"; -SWWM_ACHIEVEMENT_BALLS_TXT = "Land %d Lead Ball crits"; +SWWM_ACHIEVEMENT_BALLS_TXT = "Land %s Lead Ball crits"; SWWM_ACHIEVEMENT_BARREL_TAG = "Environmental Disaster"; -SWWM_ACHIEVEMENT_BARREL_TXT = "Destroy %d barrels"; +SWWM_ACHIEVEMENT_BARREL_TXT = "Destroy %s barrels"; SWWM_ACHIEVEMENT_BARRIER_TAG = "Green Filter"; -SWWM_ACHIEVEMENT_BARRIER_TXT = "Use %d Elemental Barriers"; +SWWM_ACHIEVEMENT_BARRIER_TXT = "Use %s Elemental Barriers"; SWWM_ACHIEVEMENT_BASEBALL_TAG = "Oh That's a Baseball!"; SWWM_ACHIEVEMENT_BASEBALL_TXT = "Perfect parry a Lost Soul with the Silver Bullet"; SWWM_ACHIEVEMENT_BLAZE_TAG = "Blazing It"; SWWM_ACHIEVEMENT_BLAZE_TXT = "Beat a map in 4 minutes and 20 seconds"; SWWM_ACHIEVEMENT_BONK_TAG = "Shock Resistant"; -SWWM_ACHIEVEMENT_BONK_TXT = "Bump into stuff %d times"; +SWWM_ACHIEVEMENT_BONK_TXT = "Bump into stuff %s times"; SWWM_ACHIEVEMENT_BOSSDASH_TAG = "Headstrong"; -SWWM_ACHIEVEMENT_BOSSDASH_TXT = "Kill %d bosses by dashing into them"; +SWWM_ACHIEVEMENT_BOSSDASH_TXT = "Kill %s bosses by dashing into them"; SWWM_ACHIEVEMENT_BRAKE_TAG = "No Brakes"; -SWWM_ACHIEVEMENT_BRAKE_TXT = "Consume your full fuel supply in a single dash %d times"; +SWWM_ACHIEVEMENT_BRAKE_TXT = "Consume your full fuel supply in a single dash %s times"; SWWM_ACHIEVEMENT_BUNE_TAG = "Legendary Lagomorph"; -SWWM_ACHIEVEMENT_BUNE_TXT = "Bunnyhop %d times"; +SWWM_ACHIEVEMENT_BUNE_TXT = "Bunnyhop %s times"; SWWM_ACHIEVEMENT_BUSTIN_TAG = "Makes me Feel Good"; -SWWM_ACHIEVEMENT_BUSTIN_TXT = "Bust %d walls"; +SWWM_ACHIEVEMENT_BUSTIN_TXT = "Bust %s walls"; SWWM_ACHIEVEMENT_BUTTS_TAG = "Let's get to Bashing Butts"; -SWWM_ACHIEVEMENT_BUTTS_TXT = "Kill %d enemies by dashing backwards"; +SWWM_ACHIEVEMENT_BUTTS_TXT = "Kill %s enemies by dashing backwards"; SWWM_ACHIEVEMENT_CANDY_TAG = "Piece of Candy"; -SWWM_ACHIEVEMENT_CANDY_TXT = "Collect %d nuggets"; +SWWM_ACHIEVEMENT_CANDY_TXT = "Collect %s nuggets"; SWWM_ACHIEVEMENT_CLIFFYB_TAG = "Errand Boy Bullshit"; SWWM_ACHIEVEMENT_CLIFFYB_TXT = "Finish a map without collecting any keys"; SWWM_ACHIEVEMENT_CLONK_TAG = "CLONK"; SWWM_ACHIEVEMENT_CLONK_TXT = "Kill a boss with a Lead Ball crit"; SWWM_ACHIEVEMENT_CONGA_TAG = "Conga Line of Death"; -SWWM_ACHIEVEMENT_CONGA_TXT = "Kill %d enemies with a single XSB round"; +SWWM_ACHIEVEMENT_CONGA_TXT = "Kill %s enemies with a single XSB round"; SWWM_ACHIEVEMENT_CRUSH_TAG = "Under Pressure"; SWWM_ACHIEVEMENT_CRUSH_TXT = "Break a crusher"; SWWM_ACHIEVEMENT_CYBULLY_TAG = "Cyberbullying"; SWWM_ACHIEVEMENT_CYBULLY_TXT = "Kill a Cyberdemon with its own rocket"; SWWM_ACHIEVEMENT_CUM_TAG = "Blasting Ropes"; -SWWM_ACHIEVEMENT_CUM_TXT = "Melt a grand total of %d enemies with the Rafan-Kos"; +SWWM_ACHIEVEMENT_CUM_TXT = "Melt a grand total of %s enemies with the Rafan-Kos"; SWWM_ACHIEVEMENT_DAB_TAG = "HAHA DAB"; -SWWM_ACHIEVEMENT_DAB_TXT = "Gib %d enemies with the Itamex Hammer"; +SWWM_ACHIEVEMENT_DAB_TXT = "Gib %s enemies with the Itamex Hammer"; SWWM_ACHIEVEMENT_DAKKA_TAG = "Dakka"; -SWWM_ACHIEVEMENT_DAKKA_TXT = "Fire the Sheen HMG at 700RPM for %d seconds straight"; +SWWM_ACHIEVEMENT_DAKKA_TXT = "Fire the Sheen HMG at 700RPM for %s seconds straight"; SWWM_ACHIEVEMENT_DEADEYE_TAG = "Deadeye"; -SWWM_ACHIEVEMENT_DEADEYE_TXT = "Land %d consecutive Explodium Gun shots without missing"; +SWWM_ACHIEVEMENT_DEADEYE_TXT = "Land %s consecutive Explodium Gun shots without missing"; SWWM_ACHIEVEMENT_DEVA_TAG = "Deva Station"; -SWWM_ACHIEVEMENT_DEVA_TXT = "Use %d Devastation Sigils"; +SWWM_ACHIEVEMENT_DEVA_TXT = "Use %s Devastation Sigils"; SWWM_ACHIEVEMENT_DIME_TAG = "Icarus Dimes"; SWWM_ACHIEVEMENT_DIME_TXT = "Blow yourself up with your own explosives"; SWWM_ACHIEVEMENT_DIVINE_TAG = "Divine Delight"; -SWWM_ACHIEVEMENT_DIVINE_TXT = "Use %d Divine Sprites"; +SWWM_ACHIEVEMENT_DIVINE_TXT = "Use %s Divine Sprites"; SWWM_ACHIEVEMENT_DOODLE_TAG = "Graffiti Master"; -SWWM_ACHIEVEMENT_DOODLE_TXT = "Doodle mustaches on %d demon faces"; +SWWM_ACHIEVEMENT_DOODLE_TXT = "Doodle mustaches on %s demon faces"; SWWM_ACHIEVEMENT_EVERYTHING_TAG = "The Demolitionist"; SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Unlock all achievements"; SWWM_ACHIEVEMENT_EZKILL_TAG = "Misa's Pride"; -SWWM_ACHIEVEMENT_EZKILL_TXT = "Kill %d enemies with a single Ynykron Artifact shot (excluding altfire)"; +SWWM_ACHIEVEMENT_EZKILL_TXT = "Kill %s enemies with a single Ynykron Artifact shot (excluding altfire)"; SWWM_ACHIEVEMENT_FLIGHT_TAG = "Blasting Off Again"; -SWWM_ACHIEVEMENT_FLIGHT_TXT = "Send an enemy flying over %d map units away"; +SWWM_ACHIEVEMENT_FLIGHT_TXT = "Send an enemy flying over %s map units away"; SWWM_ACHIEVEMENT_FRIEND_TAG = "Do You Like Caco?"; $ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TAG = "Друг"; $ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TAG = "Double Dog"; -SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %d Cacodemons with headpats"; -$ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %d Weredragons with headpats"; -$ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %d Ettins with headpats"; +SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %s Cacodemons with headpats"; +$ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %s Weredragons with headpats"; +$ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TXT = "Befriend %s Ettins with headpats"; SWWM_ACHIEVEMENT_FUEL_TAG = "Hydrogenated"; -SWWM_ACHIEVEMENT_FUEL_TXT = "Consume a total of %dL of fuel"; +SWWM_ACHIEVEMENT_FUEL_TXT = "Consume a total of %sL of fuel"; SWWM_ACHIEVEMENT_FULLER_TAG = "You Gained Brouzouf"; SWWM_ACHIEVEMENT_FULLER_TXT = "Unload an entire mag in fuller auto with the Puntzer Gamma without missing a single shot"; SWWM_ACHIEVEMENT_GCSANDWICH_TAG = "A Little Sandwich, as a Treat"; -SWWM_ACHIEVEMENT_GCSANDWICH_TXT = "Use %d Grilled Cheese Sandwiches"; +SWWM_ACHIEVEMENT_GCSANDWICH_TXT = "Use %s Grilled Cheese Sandwiches"; SWWM_ACHIEVEMENT_GEPGUN_TAG = "The Most Silent Takedown"; -SWWM_ACHIEVEMENT_GEPGUN_TXT = "Kill %d enemies with the Ray-Khom primary without alerting them"; +SWWM_ACHIEVEMENT_GEPGUN_TXT = "Kill %s enemies with the Ray-Khom primary without alerting them"; SWWM_ACHIEVEMENT_GHOST_TAG = "Cloak Engaged"; -SWWM_ACHIEVEMENT_GHOST_TXT = "Use %d Ghost Artifacts"; +SWWM_ACHIEVEMENT_GHOST_TXT = "Use %s Ghost Artifacts"; SWWM_ACHIEVEMENT_GIB_TAG = "Gibbitude"; -SWWM_ACHIEVEMENT_GIB_TXT = "Overkill %d enemies"; +SWWM_ACHIEVEMENT_GIB_TXT = "Overkill %s enemies"; SWWM_ACHIEVEMENT_GOLDEN_TAG = "Midas Massacre"; -SWWM_ACHIEVEMENT_GOLDEN_TXT = "Use %d golden shells"; +SWWM_ACHIEVEMENT_GOLDEN_TXT = "Use %s golden shells"; SWWM_ACHIEVEMENT_GRAVITY_TAG = "Decent Ascent"; -SWWM_ACHIEVEMENT_GRAVITY_TXT = "Use %d Gravity Suppressors"; +SWWM_ACHIEVEMENT_GRAVITY_TXT = "Use %s Gravity Suppressors"; SWWM_ACHIEVEMENT_GRENADE_TAG = "Kaboom"; -SWWM_ACHIEVEMENT_GRENADE_TXT = "Kill %d enemies with planted Explodium mags"; +SWWM_ACHIEVEMENT_GRENADE_TXT = "Kill %s enemies with planted Explodium mags"; SWWM_ACHIEVEMENT_HND_TAG = "High Noon"; -SWWM_ACHIEVEMENT_HND_TXT = "Land %d killing shots in a single Puntzer Beta reload"; +SWWM_ACHIEVEMENT_HND_TXT = "Land %s killing shots in a single Puntzer Beta reload"; SWWM_ACHIEVEMENT_HURRY_TAG = "In a Hurry"; SWWM_ACHIEVEMENT_HURRY_TXT = "Beat a map with 0 kills, items and secrets"; SWWM_ACHIEVEMENT_JUMP_TAG = "Verticality"; -SWWM_ACHIEVEMENT_JUMP_TXT = "Walljump %d times"; +SWWM_ACHIEVEMENT_JUMP_TXT = "Walljump %s times"; SWWM_ACHIEVEMENT_KANCHO_TAG = "Extreme Kancho"; SWWM_ACHIEVEMENT_KANCHO_TXT = "Break a stone spike"; SWWM_ACHIEVEMENT_KEEN_TAG = "Goodbye Franchise"; SWWM_ACHIEVEMENT_KEEN_TXT = "Rescue Commander Keen"; SWWM_ACHIEVEMENT_LEAD_TAG = "Lead Delivery"; -SWWM_ACHIEVEMENT_LEAD_TXT = "Hit an enemy dead-on with the Eviscerator secondary from over %d map units away"; +SWWM_ACHIEVEMENT_LEAD_TXT = "Hit an enemy dead-on with the Eviscerator secondary from over %s map units away"; SWWM_ACHIEVEMENT_LIGHTNING_TAG = "John Romero's Curse"; SWWM_ACHIEVEMENT_LIGHTNING_TXT = "Fry yourself by discharging an electric weapon in water"; SWWM_ACHIEVEMENT_LIGMA_TAG = "Who's Steve Jobs?"; SWWM_ACHIEVEMENT_LIGMA_TXT = "Kill an endgame boss with the Ynykron Artifact"; SWWM_ACHIEVEMENT_LOVE_TAG = "Lethal Love"; -SWWM_ACHIEVEMENT_LOVE_TXT = "Kill %d enemies with a blown kiss (not counting insta-kills)"; +SWWM_ACHIEVEMENT_LOVE_TXT = "Kill %s enemies with a blown kiss (not counting insta-kills)"; SWWM_ACHIEVEMENT_MASHIRO_TAG = "Layers of White"; SWWM_ACHIEVEMENT_MASHIRO_TXT = "Summon the White Lady"; SWWM_ACHIEVEMENT_MATRYOSHKA_TAG = "Mishe Trickery"; @@ -1272,80 +1272,80 @@ SWWM_ACHIEVEMENT_MATRYOSHKA_TXT = "A Chancebox inside a Chancebox inside a Chanc SWWM_ACHIEVEMENT_MBF_TAG = "You can Pet the Dog"; SWWM_ACHIEVEMENT_MBF_TXT = "Pet a dog"; SWWM_ACHIEVEMENT_MEGA_TAG = "Mass Massacre"; -SWWM_ACHIEVEMENT_MEGA_TXT = "Kill a grand total of %d enemies"; +SWWM_ACHIEVEMENT_MEGA_TXT = "Kill a grand total of %s enemies"; SWWM_ACHIEVEMENT_MOTH_TAG = "Mother"; -SWWM_ACHIEVEMENT_MOTH_TXT = "Gather %d moths"; +SWWM_ACHIEVEMENT_MOTH_TXT = "Gather %s moths"; SWWM_ACHIEVEMENT_NICE_TAG = "NICE"; SWWM_ACHIEVEMENT_NICE_TXT = "Finish a level with 69 health"; SWWM_ACHIEVEMENT_ONEGUY_TAG = "Fuck that Guy in Particular"; SWWM_ACHIEVEMENT_ONEGUY_TXT = "Use the Ynykron Artifact to kill a single non-boss enemy"; SWWM_ACHIEVEMENT_ONEHP_TAG = "...And a Dream"; -SWWM_ACHIEVEMENT_ONEHP_TXT = "Kill %d enemies while having only 1 HP"; +SWWM_ACHIEVEMENT_ONEHP_TXT = "Kill %s enemies while having only 1 HP"; SWWM_ACHIEVEMENT_ONESTANDING_TAG = "Where Did Everyone Go?"; SWWM_ACHIEVEMENT_ONESTANDING_TXT = "Finish a map with just one enemy left alive"; SWWM_ACHIEVEMENT_OOPSIE_TAG = "Big Oopsie"; SWWM_ACHIEVEMENT_OOPSIE_TXT = "Erase yourself with the Ynykron Artifact"; SWWM_ACHIEVEMENT_PARRY_TAG = "Parry King"; -SWWM_ACHIEVEMENT_PARRY_TXT = "Deflect %d projectiles"; +SWWM_ACHIEVEMENT_PARRY_TXT = "Deflect %s projectiles"; SWWM_ACHIEVEMENT_PAR_TAG = "Fast"; -SWWM_ACHIEVEMENT_PAR_TXT = "Beat the par time in %d maps"; +SWWM_ACHIEVEMENT_PAR_TXT = "Beat the par time in %s maps"; SWWM_ACHIEVEMENT_PEACE_TAG = "Pacifist"; SWWM_ACHIEVEMENT_PEACE_TXT = "Finish a map without dealing damage"; SWWM_ACHIEVEMENT_PLASMA_TAG = "Blastin' Plasma"; -SWWM_ACHIEVEMENT_PLASMA_TXT = "Kill an enemy at full health with a Plasma Blaster charged shot %d times"; +SWWM_ACHIEVEMENT_PLASMA_TXT = "Kill an enemy at full health with a Plasma Blaster charged shot %s times"; SWWM_ACHIEVEMENT_PLUSH_TAG = "Lovestruck"; -SWWM_ACHIEVEMENT_PLUSH_TXT = "Play with the Saya plush %d times in the same save"; -$ifgame(hexen) SWWM_ACHIEVEMENT_PLUSH_TXT = "Play with the Saya or Kirin plushies %d times in the same save"; +SWWM_ACHIEVEMENT_PLUSH_TXT = "Play with the Saya plush %s times in the same save"; +$ifgame(hexen) SWWM_ACHIEVEMENT_PLUSH_TXT = "Play with the Saya or Kirin plushies %s times in the same save"; SWWM_ACHIEVEMENT_PUZZLE_TAG = "Even Kirin is Upset"; SWWM_ACHIEVEMENT_PUZZLE_TXT = "Solve all fractions of \"puzzles\" in the same save"; SWWM_ACHIEVEMENT_RAGE_TAG = "No Talk me Angy"; -SWWM_ACHIEVEMENT_RAGE_TXT = "Use %d Ragekits"; +SWWM_ACHIEVEMENT_RAGE_TXT = "Use %s Ragekits"; SWWM_ACHIEVEMENT_RAIL_TAG = "Railed Hard"; -SWWM_ACHIEVEMENT_RAIL_TXT = "Shoot through %d enemies with a single Mortal Rifle overpressure shot"; +SWWM_ACHIEVEMENT_RAIL_TXT = "Shoot through %s enemies with a single Mortal Rifle overpressure shot"; SWWM_ACHIEVEMENT_REFLECT_TAG = "Return to Sender"; -SWWM_ACHIEVEMENT_REFLECT_TXT = "Kill %d enemies with parried projectiles"; +SWWM_ACHIEVEMENT_REFLECT_TXT = "Kill %s enemies with parried projectiles"; SWWM_ACHIEVEMENT_REFRESH_TAG = "Stay Fresh"; -SWWM_ACHIEVEMENT_REFRESH_TXT = "Use %d Refreshers"; +SWWM_ACHIEVEMENT_REFRESH_TXT = "Use %s Refreshers"; SWWM_ACHIEVEMENT_ROAST_TAG = "Gravely Roast"; -SWWM_ACHIEVEMENT_ROAST_TXT = "Perform %d bayonet combos with the Quadravol"; +SWWM_ACHIEVEMENT_ROAST_TXT = "Perform %s bayonet combos with the Quadravol"; SWWM_ACHIEVEMENT_SALT_TAG = "Maximum Oversalt"; SWWM_ACHIEVEMENT_SALT_TXT = "Shoot 25 Saltshot rounds simultaneously"; SWWM_ACHIEVEMENT_SANIC_TAG = "CHILLI DOGS"; -SWWM_ACHIEVEMENT_SANIC_TXT = "Reach a top speed of %d kph"; +SWWM_ACHIEVEMENT_SANIC_TXT = "Reach a top speed of %s kph"; SWWM_ACHIEVEMENT_SEKIRO_TAG = "Hesitation is Defeat"; SWWM_ACHIEVEMENT_SEKIRO_TXT = "Die and reboot two times in the same map"; SWWM_ACHIEVEMENT_SHAME_TAG = "Shameful"; SWWM_ACHIEVEMENT_SHAME_TXT = "Kill a boss solely by using the Deep Impact primary"; SWWM_ACHIEVEMENT_SHOCK_TAG = "Shockmaster"; -SWWM_ACHIEVEMENT_SHOCK_TXT = "Perform %d Biospark combos"; +SWWM_ACHIEVEMENT_SHOCK_TXT = "Perform %s Biospark combos"; SWWM_ACHIEVEMENT_SLAYER_TAG = "I am Become Death"; -SWWM_ACHIEVEMENT_SLAYER_TXT = "Kill %d enemies with a single Slayer Warhead"; +SWWM_ACHIEVEMENT_SLAYER_TXT = "Kill %s enemies with a single Slayer Warhead"; SWWM_ACHIEVEMENT_SLEMG_TAG = "The Sledge Method"; -SWWM_ACHIEVEMENT_SLEMG_TXT = "Activate %d switches by punching them"; +SWWM_ACHIEVEMENT_SLEMG_TXT = "Activate %s switches by punching them"; SWWM_ACHIEVEMENT_SNEAKY_TAG = "Sneaky Retreat"; -SWWM_ACHIEVEMENT_SNEAKY_TXT = "Use %d Safety Tethers"; +SWWM_ACHIEVEMENT_SNEAKY_TXT = "Use %s Safety Tethers"; SWWM_ACHIEVEMENT_SNEEZE_TAG = "Humiliator"; -SWWM_ACHIEVEMENT_SNEEZE_TXT = "Kill %d enemies with the Deep Impact primary fire"; +SWWM_ACHIEVEMENT_SNEEZE_TXT = "Kill %s enemies with the Deep Impact primary fire"; SWWM_ACHIEVEMENT_SPARK_TAG = "A Fine Sparking"; -SWWM_ACHIEVEMENT_SPARK_TXT = "Kill %d enemies at once with a Sparkster Rifle combo shot"; +SWWM_ACHIEVEMENT_SPARK_TXT = "Kill %s enemies at once with a Sparkster Rifle combo shot"; SWWM_ACHIEVEMENT_STEP_TAG = "Steppy"; -SWWM_ACHIEVEMENT_STEP_TXT = "Stand on a single enemy's head for %d seconds"; +SWWM_ACHIEVEMENT_STEP_TXT = "Stand on a single enemy's head for %s seconds"; SWWM_ACHIEVEMENT_STOMP_TAG = "Italian Plumber Complex"; -SWWM_ACHIEVEMENT_STOMP_TXT = "Kill %d enemies by standing on them"; +SWWM_ACHIEVEMENT_STOMP_TXT = "Kill %s enemies by standing on them"; SWWM_ACHIEVEMENT_SUNNY_TAG = "Sunny D"; -SWWM_ACHIEVEMENT_SUNNY_TXT = "Use %d Invinciballs"; +SWWM_ACHIEVEMENT_SUNNY_TXT = "Use %s Invinciballs"; SWWM_ACHIEVEMENT_TELE_TAG = "A Soldier's Pastime"; SWWM_ACHIEVEMENT_TELE_TXT = "Teleport some bread (a sandwich works too)"; SWWM_ACHIEVEMENT_THICC_TAG = "The Ass was Fat"; -SWWM_ACHIEVEMENT_THICC_TXT = "Kill %d enemies by ground pounding"; +SWWM_ACHIEVEMENT_THICC_TXT = "Kill %s enemies by ground pounding"; SWWM_ACHIEVEMENT_THRUWALL_TAG = "Knock Knock"; -SWWM_ACHIEVEMENT_THRUWALL_TXT = "Kill %d enemies through walls with the Silver Bullet"; +SWWM_ACHIEVEMENT_THRUWALL_TXT = "Kill %s enemies through walls with the Silver Bullet"; SWWM_ACHIEVEMENT_TORNADO_TAG = "What the Fuck?"; SWWM_ACHIEVEMENT_TORNADO_TXT = "Punch a tornado???"; SWWM_ACHIEVEMENT_TRASH_TAG = "Taking out the Trash"; SWWM_ACHIEVEMENT_TRASH_TXT = "Kill all nazis in the Doom 2 secret maps"; SWWM_ACHIEVEMENT_TRAVEL_TAG = "The Longest Journey"; -SWWM_ACHIEVEMENT_TRAVEL_TXT = "Walk a total of %d kilometers"; +SWWM_ACHIEVEMENT_TRAVEL_TXT = "Walk a total of %s kilometers"; SWWM_ACHIEVEMENT_UNTOUCHABLE_TAG = "Untouchable"; SWWM_ACHIEVEMENT_UNTOUCHABLE_TXT = "Finish a map without taking damage"; SWWM_ACHIEVEMENT_WANTDIE_TAG = "How Am I Still Alive?"; diff --git a/language.es_base b/language.es_base index aa1705a48..2d770b0e2 100644 --- a/language.es_base +++ b/language.es_base @@ -1004,113 +1004,113 @@ SWWM_INTERTIP210 = "\"La vida a veces parece ciertamente ser como un videojuego. SWWM_FANART = "Arte: "; // achievements SWWM_ACHIEVEMENT_ACID_TAG = "La Buena Efervescencia"; -SWWM_ACHIEVEMENT_ACID_TXT = "Derrite %d enemigos con Flechettes de Telebrium"; +SWWM_ACHIEVEMENT_ACID_TXT = "Derrite %s enemigos con Flechettes de Telebrium"; SWWM_ACHIEVEMENT_ALLCOLL_TAG = "El Set Completo"; SWWM_ACHIEVEMENT_ALLCOLL_TXT = "Obtén todos los coleccionables en una sola partida"; SWWM_ACHIEVEMENT_ALLITEMS_TAG = "Recolector"; -SWWM_ACHIEVEMENT_ALLITEMS_TXT = "Obtén 100%% ítems en %d mapas"; +SWWM_ACHIEVEMENT_ALLITEMS_TXT = "Obtén 100%% ítems en %s mapas"; SWWM_ACHIEVEMENT_ALLKILLS_TAG = "Control de Plagas"; -SWWM_ACHIEVEMENT_ALLKILLS_TXT = "Obtén 100%% muertes en %d mapas"; +SWWM_ACHIEVEMENT_ALLKILLS_TXT = "Obtén 100%% muertes en %s mapas"; SWWM_ACHIEVEMENT_ALLSECRETS_TAG = "Detective Excelente"; -SWWM_ACHIEVEMENT_ALLSECRETS_TXT = "Obtén 100%% secretos en %d mapas"; +SWWM_ACHIEVEMENT_ALLSECRETS_TXT = "Obtén 100%% secretos en %s mapas"; SWWM_ACHIEVEMENT_ANOM_TAG = "Anómalo"; -SWWM_ACHIEVEMENT_ANOM_TXT = "Usa %d Artefactos Mykradvo"; +SWWM_ACHIEVEMENT_ANOM_TXT = "Usa %s Artefactos Mykradvo"; SWWM_ACHIEVEMENT_ANONE_TAG = "Uso Completamente Necesario de Fuerza"; SWWM_ACHIEVEMENT_ANONE_TXT = "Usa el Artefacto Mykradvo contra un único enemigo no-jefe"; SWWM_ACHIEVEMENT_BALLS_TAG = "Machácate las Bolas"; -SWWM_ACHIEVEMENT_BALLS_TXT = "Consigue %d críticos de Bola de Plomo"; +SWWM_ACHIEVEMENT_BALLS_TXT = "Consigue %s críticos de Bola de Plomo"; SWWM_ACHIEVEMENT_BARREL_TAG = "Desastre Medioambiental"; -SWWM_ACHIEVEMENT_BARREL_TXT = "Destruye %d barriles"; +SWWM_ACHIEVEMENT_BARREL_TXT = "Destruye %s barriles"; SWWM_ACHIEVEMENT_BARRIER_TAG = "Filtro Verde"; -SWWM_ACHIEVEMENT_BARRIER_TXT = "Usa %d Barreras Elementales"; +SWWM_ACHIEVEMENT_BARRIER_TXT = "Usa %s Barreras Elementales"; SWWM_ACHIEVEMENT_BASEBALL_TAG = "¡Oh es un Béisbol!"; SWWM_ACHIEVEMENT_BASEBALL_TXT = "Haz una parada perfecta a un Alma Perdida con el Silver Bullet"; SWWM_ACHIEVEMENT_BLAZE_TAG = "Echando Humo"; SWWM_ACHIEVEMENT_BLAZE_TXT = "Termina un mapa en 4 minutos y 20 segundos"; SWWM_ACHIEVEMENT_BONK_TAG = "Resistente a Choques"; -SWWM_ACHIEVEMENT_BONK_TXT = "Choca %d veces"; +SWWM_ACHIEVEMENT_BONK_TXT = "Choca %s veces"; SWWM_ACHIEVEMENT_BOSSDASH_TAG = "Cabezonería"; -SWWM_ACHIEVEMENT_BOSSDASH_TXT = "Mata %d jefes embistiendo contra ellos"; +SWWM_ACHIEVEMENT_BOSSDASH_TXT = "Mata %s jefes embistiendo contra ellos"; SWWM_ACHIEVEMENT_BRAKE_TAG = "Sin Frenos"; -SWWM_ACHIEVEMENT_BRAKE_TXT = "Consume toda tu capacidad de combustible en una sola embestida %d veces"; +SWWM_ACHIEVEMENT_BRAKE_TXT = "Consume toda tu capacidad de combustible en una sola embestida %s veces"; SWWM_ACHIEVEMENT_BUNE_TAG = "Lagomorfo Legendario"; -SWWM_ACHIEVEMENT_BUNE_TXT = "Realiza %d bunnyhops"; +SWWM_ACHIEVEMENT_BUNE_TXT = "Realiza %s bunnyhops"; SWWM_ACHIEVEMENT_BUSTIN_TAG = "Me Hace Sentir Bien"; -SWWM_ACHIEVEMENT_BUSTIN_TXT = "Revienta %d paredes"; +SWWM_ACHIEVEMENT_BUSTIN_TXT = "Revienta %s paredes"; SWWM_ACHIEVEMENT_BUTTS_TAG = "Esos Glúteos Firmes"; -SWWM_ACHIEVEMENT_BUTTS_TXT = "Mata %d enemigos embistiendo marcha atrás"; +SWWM_ACHIEVEMENT_BUTTS_TXT = "Mata %s enemigos embistiendo marcha atrás"; SWWM_ACHIEVEMENT_CANDY_TAG = "Oh un Caramelo"; -SWWM_ACHIEVEMENT_CANDY_TXT = "Recoge %d pepitas"; +SWWM_ACHIEVEMENT_CANDY_TXT = "Recoge %s pepitas"; SWWM_ACHIEVEMENT_CLIFFYB_TAG = "Mierdas de Recadero"; SWWM_ACHIEVEMENT_CLIFFYB_TXT = "Termina un mapa sin obtener ninguna llave"; SWWM_ACHIEVEMENT_CLONK_TAG = "CLONK"; SWWM_ACHIEVEMENT_CLONK_TXT = "Mata a un jefe con un crítico de Bola de Plomo"; SWWM_ACHIEVEMENT_CONGA_TAG = "Conga de la Muerte"; -SWWM_ACHIEVEMENT_CONGA_TXT = "Mata %d enemigos con una sola bala XSB"; +SWWM_ACHIEVEMENT_CONGA_TXT = "Mata %s enemigos con una sola bala XSB"; SWWM_ACHIEVEMENT_CRUSH_TAG = "Bajo Presión"; SWWM_ACHIEVEMENT_CRUSH_TXT = "Rompe una trituradora"; SWWM_ACHIEVEMENT_CYBULLY_TAG = "Ciberacoso"; SWWM_ACHIEVEMENT_CYBULLY_TXT = "Mata a un Ciberdemonio con su propio cohete"; SWWM_ACHIEVEMENT_CUM_TAG = "Soltando Todo el Chorro"; -SWWM_ACHIEVEMENT_CUM_TXT = "Derrite un total de %d enemigos con la Rafan-Kos"; -SWWM_ACHIEVEMENT_DAB_TXT = "Revienta %d enemigos con el Mazo Itamex"; -SWWM_ACHIEVEMENT_DAKKA_TXT = "Dispara la Ametralladora Sheen a 700RPM durante %d segundos consecutivos"; +SWWM_ACHIEVEMENT_CUM_TXT = "Derrite un total de %s enemigos con la Rafan-Kos"; +SWWM_ACHIEVEMENT_DAB_TXT = "Revienta %s enemigos con el Mazo Itamex"; +SWWM_ACHIEVEMENT_DAKKA_TXT = "Dispara la Ametralladora Sheen a 700RPM durante %s segundos consecutivos"; SWWM_ACHIEVEMENT_DEADEYE_TAG = "En el Blanco"; -SWWM_ACHIEVEMENT_DEADEYE_TXT = "Realiza %d disparos consecutivos con la Pistola de Explodium sin fallar"; -SWWM_ACHIEVEMENT_DEVA_TXT = "Usa %d Marcas de Devastación"; +SWWM_ACHIEVEMENT_DEADEYE_TXT = "Realiza %s disparos consecutivos con la Pistola de Explodium sin fallar"; +SWWM_ACHIEVEMENT_DEVA_TXT = "Usa %s Marcas de Devastación"; SWWM_ACHIEVEMENT_DIME_TXT = "Reviéntate con tus propios explosivos"; SWWM_ACHIEVEMENT_DIVINE_TAG = "Deleite Divino"; -SWWM_ACHIEVEMENT_DIVINE_TXT = "Usa %d Sprites Divinos"; +SWWM_ACHIEVEMENT_DIVINE_TXT = "Usa %s Sprites Divinos"; SWWM_ACHIEVEMENT_DOODLE_TAG = "Maestro del Grafiti"; -SWWM_ACHIEVEMENT_DOODLE_TAG = "Garabatea mostachos en %d caras de demonio"; +SWWM_ACHIEVEMENT_DOODLE_TAG = "Garabatea mostachos en %s caras de demonio"; SWWM_ACHIEVEMENT_EVERYTHING_TAG = "La Demolicionista"; SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Desbloquea todos los logros"; SWWM_ACHIEVEMENT_EZKILL_TAG = "El Orgullo de Misa"; -SWWM_ACHIEVEMENT_EZKILL_TXT = "Mata %d enemigos con un solo disparo de Artefacto Ynykron (excluyendo modo secundario)"; +SWWM_ACHIEVEMENT_EZKILL_TXT = "Mata %s enemigos con un solo disparo de Artefacto Ynykron (excluyendo modo secundario)"; SWWM_ACHIEVEMENT_FLIGHT_TAG = "Despega de Nuevo"; -SWWM_ACHIEVEMENT_FLIGHT_TXT = "Lanza a un enemigo en volandas más allá de %d unidades de mapa"; +SWWM_ACHIEVEMENT_FLIGHT_TXT = "Lanza a un enemigo en volandas más allá de %s unidades de mapa"; SWWM_ACHIEVEMENT_FRIEND_TAG = "¿Te Gusta Caco?"; $ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TAG = "Друг"; // must be duplicated here or it will default to caco $ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TAG = "Perrito Doble"; -SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %d Cacodemonios a base de caricias"; -$ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %d Hombres-Dragón a base de caricias"; -$ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %d Ettins a base de caricias"; +SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %s Cacodemonios a base de caricias"; +$ifgame(heretic) SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %s Hombres-Dragón a base de caricias"; +$ifgame(hexen) SWWM_ACHIEVEMENT_FRIEND_TXT = "Entabla amistad con %s Ettins a base de caricias"; SWWM_ACHIEVEMENT_FUEL_TAG = "Hidrogenado"; -SWWM_ACHIEVEMENT_FUEL_TXT = "Consume un total de %dL de combustible"; +SWWM_ACHIEVEMENT_FUEL_TXT = "Consume un total de %sL de combustible"; SWWM_ACHIEVEMENT_FULLER_TAG = "Has Ganado Brouzouf"; SWWM_ACHIEVEMENT_FULLER_TXT = "Vacía un cargador entero en super-automático con el Puntzer Gamma sin fallar un solo disparo"; SWWM_ACHIEVEMENT_GCSANDWICH_TAG = "Un Poco de Sandwich, de Propina"; -SWWM_ACHIEVEMENT_GCSANDWICH_TXT = "Usa %d Sándwiches de Queso a la Plancha"; +SWWM_ACHIEVEMENT_GCSANDWICH_TXT = "Usa %s Sándwiches de Queso a la Plancha"; SWWM_ACHIEVEMENT_GEPGUN_TAG = "El Derribo Más Silencioso"; -SWWM_ACHIEVEMENT_GEPGUN_TXT = "Mata %d enemigos con el fuego primario de la Ray-Khom sin alertarlos"; +SWWM_ACHIEVEMENT_GEPGUN_TXT = "Mata %s enemigos con el fuego primario de la Ray-Khom sin alertarlos"; SWWM_ACHIEVEMENT_GHOST_TAG = "Camuflaje Activado"; -SWWM_ACHIEVEMENT_GHOST_TXT = "Usa %d Artefactos Fantasma"; +SWWM_ACHIEVEMENT_GHOST_TXT = "Usa %s Artefactos Fantasma"; SWWM_ACHIEVEMENT_GIB_TAG = "Carnaza"; -SWWM_ACHIEVEMENT_GIB_TXT = "Haz overkill a %d enemigos"; +SWWM_ACHIEVEMENT_GIB_TXT = "Haz overkill a %s enemigos"; SWWM_ACHIEVEMENT_GOLDEN_TAG = "Masacre de Midas"; -SWWM_ACHIEVEMENT_GOLDEN_TXT = "Usa %d cartuchos dorados"; +SWWM_ACHIEVEMENT_GOLDEN_TXT = "Usa %s cartuchos dorados"; SWWM_ACHIEVEMENT_GRAVITY_TAG = "Ascenso Decente"; -SWWM_ACHIEVEMENT_GRAVITY_TXT = "Usa %d Supresores de Gravedad"; +SWWM_ACHIEVEMENT_GRAVITY_TXT = "Usa %s Supresores de Gravedad"; SWWM_ACHIEVEMENT_GRENADE_TAG = "Cataplúm"; -SWWM_ACHIEVEMENT_GRENADE_TXT = "Mata %d enemigos con cargadores de Explodium plantados"; +SWWM_ACHIEVEMENT_GRENADE_TXT = "Mata %s enemigos con cargadores de Explodium plantados"; SWWM_ACHIEVEMENT_HND_TAG = "Mediodía"; -SWWM_ACHIEVEMENT_HND_TXT = "Realiza %d disparos mortales en una única recarga de Puntzer Beta"; +SWWM_ACHIEVEMENT_HND_TXT = "Realiza %s disparos mortales en una única recarga de Puntzer Beta"; SWWM_ACHIEVEMENT_HURRY_TAG = "Con Prisas"; SWWM_ACHIEVEMENT_HURRY_TXT = "Termina un mapa con 0 muertes, ítems y secretos"; SWWM_ACHIEVEMENT_JUMP_TAG = "Verticalidad"; -SWWM_ACHIEVEMENT_JUMP_TXT = "Salta paredes %d veces"; +SWWM_ACHIEVEMENT_JUMP_TXT = "Salta paredes %s veces"; SWWM_ACHIEVEMENT_KANCHO_TAG = "Kancho Extremo"; SWWM_ACHIEVEMENT_KANCHO_TXT = "Rompe una estaca de piedra"; SWWM_ACHIEVEMENT_KEEN_TAG = "Adiós Franquicia"; SWWM_ACHIEVEMENT_KEEN_TXT = "Rescata al Comandante Keen"; SWWM_ACHIEVEMENT_LEAD_TAG = "Reparto de Plomo"; -SWWM_ACHIEVEMENT_LEAD_TXT = "Alcanza a un enemigo de lleno con el secundario del Eviscerator desde más de %d unidades de mapa"; +SWWM_ACHIEVEMENT_LEAD_TXT = "Alcanza a un enemigo de lleno con el secundario del Eviscerator desde más de %s unidades de mapa"; SWWM_ACHIEVEMENT_LIGHTNING_TAG = "Maldición de John Romero"; SWWM_ACHIEVEMENT_LIGHTNING_TXT = "Achichárrate descargando un arma eléctrica en el agua"; SWWM_ACHIEVEMENT_LIGMA_TAG = "¿Quien es Steve Jobs?"; SWWM_ACHIEVEMENT_LIGMA_TXT = "Mata a un jefe final con el Artefacto Ynykron"; SWWM_ACHIEVEMENT_LOVE_TAG = "Amor Letal"; -SWWM_ACHIEVEMENT_LOVE_TXT = "Mata %d enemigos con un beso lanzado (sin contar insta-kills)"; +SWWM_ACHIEVEMENT_LOVE_TXT = "Mata %s enemigos con un beso lanzado (sin contar insta-kills)"; SWWM_ACHIEVEMENT_MASHIRO_TAG = "Capas de Blanco"; SWWM_ACHIEVEMENT_MASHIRO_TXT = "Invoca a la Dama Blanca"; SWWM_ACHIEVEMENT_MATRYOSHKA_TAG = "Astucia Mishe"; @@ -1118,77 +1118,77 @@ SWWM_ACHIEVEMENT_MATRYOSHKA_TXT = "Una Caja Afortunada dentro de una Caja Afortu SWWM_ACHIEVEMENT_MBF_TAG = "Puedes Acariciar el Perro"; SWWM_ACHIEVEMENT_MBF_TXT = "Acaricia un perro"; SWWM_ACHIEVEMENT_MEGA_TAG = "Masacre Masiva"; -SWWM_ACHIEVEMENT_MEGA_TXT = "Mata un gran total de %d enemigos"; +SWWM_ACHIEVEMENT_MEGA_TXT = "Mata un gran total de %s enemigos"; SWWM_ACHIEVEMENT_MOTH_TAG = "Madre Polilla"; -SWWM_ACHIEVEMENT_MOTH_TXT = "Reúne %d polillas"; +SWWM_ACHIEVEMENT_MOTH_TXT = "Reúne %s polillas"; SWWM_ACHIEVEMENT_NICE_TXT = "Termina un nivel con 69 de vida"; SWWM_ACHIEVEMENT_ONEGUY_TAG = "A la Mierda el Tío Ese"; SWWM_ACHIEVEMENT_ONEGUY_TXT = "Usa el Artefacto Ynykron para matar a un único enemigo no-jefe"; SWWM_ACHIEVEMENT_ONEHP_TAG = "...Y un Sueño"; -SWWM_ACHIEVEMENT_ONEHP_TXT = "Mata %d enemigos mientras tienes sólo 1 HP"; +SWWM_ACHIEVEMENT_ONEHP_TXT = "Mata %s enemigos mientras tienes sólo 1 HP"; SWWM_ACHIEVEMENT_ONESTANDING_TAG = "¿Adonde Han Ido Todos?"; SWWM_ACHIEVEMENT_ONESTANDING_TXT = "Termina un mapa con solo un enemigo vivo"; SWWM_ACHIEVEMENT_OOPSIE_TAG = "Gran Errorcito"; SWWM_ACHIEVEMENT_OOPSIE_TXT = "Bórrate con el Artefacto Ynykron"; SWWM_ACHIEVEMENT_PARRY_TAG = "Rey del Parry"; -SWWM_ACHIEVEMENT_PARRY_TXT = "Desvía %d proyectiles"; +SWWM_ACHIEVEMENT_PARRY_TXT = "Desvía %s proyectiles"; SWWM_ACHIEVEMENT_PAR_TAG = "Rápido"; -SWWM_ACHIEVEMENT_PAR_TXT = "Supera el tiempo par en %d mapas"; +SWWM_ACHIEVEMENT_PAR_TXT = "Supera el tiempo par en %s mapas"; SWWM_ACHIEVEMENT_PEACE_TAG = "Pacifista"; SWWM_ACHIEVEMENT_PEACE_TXT = "Termina un mapa sin causar daño"; SWWM_ACHIEVEMENT_PLASMA_TAG = "Echando Plasmas"; -SWWM_ACHIEVEMENT_PLASMA_TXT = "Mata un enemigo a 100%% de salud con un disparo cargado del Blaster de Plasma %d veces"; +SWWM_ACHIEVEMENT_PLASMA_TXT = "Mata un enemigo a 100%% de salud con un disparo cargado del Blaster de Plasma %s veces"; SWWM_ACHIEVEMENT_PLUSH_TAG = "Amorcito"; -SWWM_ACHIEVEMENT_PLUSH_TXT = "Juega con el peluche de Saya %d veces en la misma partida"; -$ifgame(hexen) SWWM_ACHIEVEMENT_PLUSH_TXT = "Juega con los peluches de Saya o Kirin %d veces en la misma partida"; +SWWM_ACHIEVEMENT_PLUSH_TXT = "Juega con el peluche de Saya %s veces en la misma partida"; +$ifgame(hexen) SWWM_ACHIEVEMENT_PLUSH_TXT = "Juega con los peluches de Saya o Kirin %s veces en la misma partida"; SWWM_ACHIEVEMENT_PUZZLE_TAG = "Hasta Kirin está Cabreado"; SWWM_ACHIEVEMENT_PUZZLE_TXT = "Resuelve todas las partes de \"puzzles\" en la misma partida"; SWWM_ACHIEVEMENT_RAGE_TAG = "No Hablo me Enfado"; -SWWM_ACHIEVEMENT_RAGE_TXT = "Usa %d Ragekits"; +SWWM_ACHIEVEMENT_RAGE_TXT = "Usa %s Ragekits"; SWWM_ACHIEVEMENT_RAIL_TAG = "Metida de Través"; -SWWM_ACHIEVEMENT_RAIL_TXT = "Atraviesa %d enemigos con un solo disparo a presión del Rifle Mortal"; +SWWM_ACHIEVEMENT_RAIL_TXT = "Atraviesa %s enemigos con un solo disparo a presión del Rifle Mortal"; SWWM_ACHIEVEMENT_REFLECT_TAG = "Devuelto a Remitente"; -SWWM_ACHIEVEMENT_REFLECT_TXT = "Mata %d enemigos con proyectiles desviados"; +SWWM_ACHIEVEMENT_REFLECT_TXT = "Mata %s enemigos con proyectiles desviados"; SWWM_ACHIEVEMENT_REFRESH_TAG = "Siempre Fresco"; -SWWM_ACHIEVEMENT_REFRESH_TXT = "Usa %d Refrescadores"; +SWWM_ACHIEVEMENT_REFRESH_TXT = "Usa %s Refrescadores"; SWWM_ACHIEVEMENT_ROAST_TAG = "Ensarta en los Fuegos del Hades"; -SWWM_ACHIEVEMENT_ROAST_TXT = "Realiza %d combos de bayoneta con la Quadravol"; +SWWM_ACHIEVEMENT_ROAST_TXT = "Realiza %s combos de bayoneta con la Quadravol"; SWWM_ACHIEVEMENT_SALT_TAG = "Sobresalado Máximo"; SWWM_ACHIEVEMENT_SALT_TXT = "Dispara 25 cartuchos de sal al mismo tiempo"; SWWM_ACHIEVEMENT_SANIC_TAG = "PERRITOS DE CHILE"; -SWWM_ACHIEVEMENT_SANIC_TXT = "Alcanza una velocidad punta de %d km/h"; +SWWM_ACHIEVEMENT_SANIC_TXT = "Alcanza una velocidad punta de %s km/h"; SWWM_ACHIEVEMENT_SEKIRO_TAG = "Dudar es Fracasar"; SWWM_ACHIEVEMENT_SEKIRO_TXT = "Muere y reinicia dos veces en el mismo mapa"; SWWM_ACHIEVEMENT_SHAME_TAG = "Vergonzoso"; SWWM_ACHIEVEMENT_SHAME_TXT = "Mata un boss usando solo el modo primario de la Deep Impact"; -SWWM_ACHIEVEMENT_SHOCK_TXT = "Realiza %d combos de Biospark"; +SWWM_ACHIEVEMENT_SHOCK_TXT = "Realiza %s combos de Biospark"; SWWM_ACHIEVEMENT_SLAYER_TAG = "Me he Convertido en Muerte"; -SWWM_ACHIEVEMENT_SLAYER_TXT = "Mata %d enemigos con una sola Cabeza Nuclear Slayer"; +SWWM_ACHIEVEMENT_SLAYER_TXT = "Mata %s enemigos con una sola Cabeza Nuclear Slayer"; SWWM_ACHIEVEMENT_SLEMG_TAG = "El Método Sledge"; -SWWM_ACHIEVEMENT_SLEMG_TXT = "Activa %d interruptores a puñetazos"; +SWWM_ACHIEVEMENT_SLEMG_TXT = "Activa %s interruptores a puñetazos"; SWWM_ACHIEVEMENT_SNEAKY_TAG = "Retiro Furtivo"; -SWWM_ACHIEVEMENT_SNEAKY_TXT = "Usa %d Enlaces de Seguridad"; +SWWM_ACHIEVEMENT_SNEAKY_TXT = "Usa %s Enlaces de Seguridad"; SWWM_ACHIEVEMENT_SNEEZE_TAG = "Humillador"; -SWWM_ACHIEVEMENT_SNEEZE_TXT = "Mata %d enemigos con el fuego primario del Deep Impact"; +SWWM_ACHIEVEMENT_SNEEZE_TXT = "Mata %s enemigos con el fuego primario del Deep Impact"; SWWM_ACHIEVEMENT_SPARK_TAG = "El Buen Chispazo"; -SWWM_ACHIEVEMENT_SPARK_TXT = "Mata %d enemigos a la vez con un disparo combinado del Rifle Sparkster"; +SWWM_ACHIEVEMENT_SPARK_TXT = "Mata %s enemigos a la vez con un disparo combinado del Rifle Sparkster"; SWWM_ACHIEVEMENT_STEP_TAG = "Pisadita"; -SWWM_ACHIEVEMENT_STEP_TXT = "Mantente de pie en la cabeza de un solo enemigo durante %d segundos"; +SWWM_ACHIEVEMENT_STEP_TXT = "Mantente de pie en la cabeza de un solo enemigo durante %s segundos"; SWWM_ACHIEVEMENT_STOMP_TAG = "Complejo de Fontanero Italiano"; -SWWM_ACHIEVEMENT_STOMP_TXT = "Mata %d enemigos saltando encima"; -SWWM_ACHIEVEMENT_SUNNY_TXT = "Usa %d Invincibolas"; +SWWM_ACHIEVEMENT_STOMP_TXT = "Mata %s enemigos saltando encima"; +SWWM_ACHIEVEMENT_SUNNY_TXT = "Usa %s Invincibolas"; SWWM_ACHIEVEMENT_TELE_TAG = "Pasatiempo de Soldado"; SWWM_ACHIEVEMENT_TELE_TXT = "Teletransporta pan (un sandwich también vale)"; SWWM_ACHIEVEMENT_THICC_TAG = "El Culo era Gordo"; -SWWM_ACHIEVEMENT_THICC_TXT = "Mata %d enemigos a base de estampidas en el suelo"; +SWWM_ACHIEVEMENT_THICC_TXT = "Mata %s enemigos a base de estampidas en el suelo"; SWWM_ACHIEVEMENT_THRUWALL_TAG = "Toc Toc"; -SWWM_ACHIEVEMENT_THRUWALL_TXT = "Mata %d enemigos a través de las paredes con el Silver Bullet"; +SWWM_ACHIEVEMENT_THRUWALL_TXT = "Mata %s enemigos a través de las paredes con el Silver Bullet"; SWWM_ACHIEVEMENT_TORNADO_TAG = "¿Que Puñetas?"; SWWM_ACHIEVEMENT_TORNADO_TXT = "¿¿¿Aporrea un tornado???"; SWWM_ACHIEVEMENT_TRASH_TAG = "Sacando la Basura"; SWWM_ACHIEVEMENT_TRASH_TAG = "Mata a todos los nazis en los mapas secretos de Doom 2"; SWWM_ACHIEVEMENT_TRAVEL_TAG = "Un Viaje Muy Largo"; -SWWM_ACHIEVEMENT_TRAVEL_TXT = "Camina un total de %d kilómetros"; +SWWM_ACHIEVEMENT_TRAVEL_TXT = "Camina un total de %s kilómetros"; SWWM_ACHIEVEMENT_UNTOUCHABLE_TAG = "Intocable"; SWWM_ACHIEVEMENT_UNTOUCHABLE_TXT = "Termina un mapa sin recibir daño"; SWWM_ACHIEVEMENT_WANTDIE_TAG = "¿Como Sigo con Vida?"; diff --git a/language.version b/language.version index cee77fae0..e8dd50e34 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r462 \cu(Thu 15 Sep 14:51:51 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r462 \cu(2022-09-15 14:51:51)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r463 \cu(Thu 15 Sep 15:56:44 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r463 \cu(2022-09-15 15:56:44)\c-"; diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 548dc0da7..5a6ea4a56 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -167,7 +167,7 @@ Class SWWMAchievementNotification : HUDMessageBase { tag = StringTable.Localize("$SWWM_ACHIEVEMENT_"..bname.."_TAG"); txt = StringTable.Localize("$SWWM_ACHIEVEMENT_"..bname.."_TXT"); - if ( num ) txt = String.Format(txt,num); + if ( num ) txt = String.Format(txt,SWWMUtility.ThousandsNum(num)); self.icon = icon; frame = TexMan.CheckForTexture("graphics/HUD/AchievementNotification.png",TexMan.Type_Any); holdtics = 150; diff --git a/zscript/kbase/swwm_kbasetab_stats.zsc b/zscript/kbase/swwm_kbasetab_stats.zsc index 9fddea7b6..361c70e38 100644 --- a/zscript/kbase/swwm_kbasetab_stats.zsc +++ b/zscript/kbase/swwm_kbasetab_stats.zsc @@ -724,16 +724,15 @@ Class DemolitionistMenuAchievementItem : DemolitionistMenuListItem String str; if ( a.maxval && (!ShouldObscure || hasprogress) ) { - int val = clamp(a.val,0,a.maxval); + int val = a.val; if ( val < a.maxval ) Screen.DrawTexture(BarTex[0],false,xx,yy+35,DTA_DestWidthF,width,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); Screen.DrawTexture(BarTex[completed?2:1],false,xx,yy+35,DTA_DestWidthF,width*(val/double(a.maxval)),DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - if ( completed ) str = String.Format("%s / %s",SWWMUtility.ThousandsNum(a.maxval),SWWMUtility.ThousandsNum(a.maxval)); - else str = String.Format("%s / %s",SWWMUtility.ThousandsNum(val),SWWMUtility.ThousandsNum(a.maxval)); + str = String.Format("%s / %s",SWWMUtility.ThousandsNum(val),SWWMUtility.ThousandsNum(a.maxval)); int ox = (width-master.mTinyFont.StringWidth(str))/2; Screen.DrawText(master.mTinyFont,completed?Font.CR_GREEN:Font.CR_WHITE,xx+ox,yy+37,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); } else Screen.DrawTexture(BarTex[completed?2:0],false,xx,yy+35,DTA_DestWidthF,width,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true); - str = a.hasformat?String.Format(StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"),a.maxval):StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"); + str = a.hasformat?String.Format(StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"),SWWMUtility.ThousandsNum(a.maxval)):StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"); if ( str != oldstr ) { if ( l ) l.Destroy(); diff --git a/zscript/menu/swwm_achievementmenu.zsc b/zscript/menu/swwm_achievementmenu.zsc index 5a1925727..e4e33e36c 100644 --- a/zscript/menu/swwm_achievementmenu.zsc +++ b/zscript/menu/swwm_achievementmenu.zsc @@ -90,7 +90,7 @@ Class SWWMAchievementMenu : GenericMenu if ( !a.maxval || (ShouldObscure && !hasprogress) ) yy += ((mSmallFont.GetHeight()+2)*CleanYFac_1)/2; Screen.DrawText(mSmallFont,completed?Font.CR_GREEN:Font.CR_DARKGRAY,xx,yy,str,DTA_CleanNoMove_1,true); yy += (mSmallFont.GetHeight()+2)*CleanYFac_1; - str = a.hasformat?String.Format(StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"),a.maxval):StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"); + str = a.hasformat?String.Format(StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"),SWWMUtility.ThousandsNum(a.maxval)):StringTable.Localize("$SWWM_ACHIEVEMENT_"..a.basename.."_TXT"); if ( !completed && !hasprogress && ShouldObscure ) SWWMUtility.ObscureText(str,(MenuTime()/3)+1); xx = (Screen.GetWidth()-mTinyFont.StringWidth(str)*CleanXFac_1)/2; Screen.DrawText(mTinyFont,completed?Font.CR_WHITE:Font.CR_BLACK,xx,yy,str,DTA_CleanNoMove_1,true); @@ -104,9 +104,7 @@ Class SWWMAchievementMenu : GenericMenu val += !!(a.val&(1<