From ed16f0697b5b775b2a47badec058766ec092da51 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 26 Sep 2019 17:27:39 -0400 Subject: [PATCH] v0.7.5: standardized enemy defense verbs. They are now all 'blocked' or 'dodged' --- .../actors/mobs/npcs/Sheep.java | 10 --------- .../messages/actors/actors.properties | 22 +++++++++---------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java index 03c17a9d9..0b56ae3e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Sheep.java @@ -63,16 +63,6 @@ public class Sheep extends NPC { return 100_000_000; } - //FIXME translate this - @Override - public String defenseVerb() { - if (SPDSettings.language() == Languages.ENGLISH){ - return "Absorbed"; - } else { - return super.defenseVerb(); - } - } - @Override public void damage( int dmg, Object src ) { } diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties index 5777ceab6..5c4aef687 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties @@ -358,6 +358,7 @@ actors.mobs.npcs.blacksmith.un_ided=I need to know what I'm working with, identi actors.mobs.npcs.blacksmith.cursed=I don't work with cursed items! actors.mobs.npcs.blacksmith.degraded=It's junk, the quality is too poor! actors.mobs.npcs.blacksmith.cant_reforge=I can't reforge these items! +actors.mobs.npcs.blacksmith.def_verb=blocked actors.mobs.npcs.blacksmith.desc=This troll blacksmith looks like all trolls look: he is tall and lean, and his skin resembles stone in both color and texture. The troll blacksmith is tinkering with unproportionally small tools. actors.mobs.npcs.ghost.name=sad ghost @@ -367,7 +368,6 @@ actors.mobs.npcs.ghost.gnoll_1=Hello %s... Once I was like you - strong and conf actors.mobs.npcs.ghost.gnoll_2=Please... Help me... Slay the trickster...\n\n_Don't let it hit you... Get near to it..._ actors.mobs.npcs.ghost.crab_1=Hello %s... Once I was like you - strong and confident... But I was slain by an ancient creature... I can't leave this place... Not until I have my revenge... Slay the _great crab,_ that has taken my life...\n\nIt is unnaturally old... With a massive single claw and a thick shell... _Beware its claw, you must surprise the crab or it will block with it..._ actors.mobs.npcs.ghost.crab_2=Please... Help me... Slay the Crustacean...\n\n_It will always block... When it sees you coming..._ -actors.mobs.npcs.ghost.def_verb=evaded actors.mobs.npcs.ghost.find_me=Thank you... come find me... actors.mobs.npcs.ghost.desc=The ghost is barely visible. It looks like a shapeless spot of faint light with a sorrowful face. @@ -378,7 +378,6 @@ actors.mobs.npcs.imp.golems_2=How is your golem safari going? actors.mobs.npcs.imp.monks_2=Oh, you are still alive! I knew that your kung-fu is stronger ;) Just don't forget to grab these monks' tokens. actors.mobs.npcs.imp.cya=See you, %s! actors.mobs.npcs.imp.hey=Psst, %s! -actors.mobs.npcs.imp.def_verb=evaded actors.mobs.npcs.imp.desc=Imps are lesser demons. They are notable for neither their strength nor their magic talent, but they are quite smart and sociable. Many imps prefer to live among non-demons. actors.mobs.npcs.impshopkeeper.name=ambitious imp @@ -403,6 +402,7 @@ actors.mobs.npcs.sheep.baa!=Baa! actors.mobs.npcs.sheep.baa?=Baa? actors.mobs.npcs.sheep.baa.=Baa. actors.mobs.npcs.sheep.baa...=Baa... +actors.mobs.npcs.sheep.def_verb=blocked actors.mobs.npcs.sheep.desc=This is a magic sheep. What's so magical about it? You can't kill it. It will stand there until it magically fades away, all the while chewing cud with a blank stare. actors.mobs.npcs.shopkeeper.name=shopkeeper @@ -423,7 +423,7 @@ actors.mobs.npcs.wandmaker.intro_2=\n\nIf you can get that for me, I'll be happy actors.mobs.npcs.wandmaker.reminder_dust=Any luck with corpse dust, %s? Look for some barricades. actors.mobs.npcs.wandmaker.reminder_ember=Any luck with those embers, %s? You'll need to find four candles and the ritual site. actors.mobs.npcs.wandmaker.reminder_berry=Any luck with a Rotberry seed, %s? Look for a room filled with vegetation. -actors.mobs.npcs.wandmaker.def_verb=absorbed +actors.mobs.npcs.wandmaker.def_verb=blocked actors.mobs.npcs.wandmaker.desc=This old yet hale gentleman wears a slightly confused expression. He is protected by a magic shield. @@ -437,7 +437,6 @@ actors.mobs.albino.desc=This is a rare breed of marsupial rat, with pure white f actors.mobs.bandit.name=crazy bandit actors.mobs.bat.name=vampire bat -actors.mobs.bat.def_verb=evaded actors.mobs.bat.desc=These brisk and tenacious inhabitants of cave domes may defeat much larger opponents by replenishing their health with each successful attack. actors.mobs.bee.name=golden bee @@ -446,19 +445,20 @@ actors.mobs.bee.desc=Despite their small size, golden bees tend to protect their actors.mobs.brute.name=gnoll brute actors.mobs.brute.enraged=enraged +actors.mobs.brute.def_verb=blocked actors.mobs.brute.desc=Brutes are the largest, strongest and toughest of all gnolls. When severely wounded, they go berserk, inflicting even more damage to their enemies. actors.mobs.causticslime.name=caustic slime actors.mobs.causticslime.desc=This slime seems to have been tainted by the dark magic emanating from below. It has lost its usual green color, and drips with caustic ooze. actors.mobs.crab.name=sewer crab -actors.mobs.crab.def_verb=parried actors.mobs.crab.desc=These huge crabs are at the top of the food chain in the sewers. They are extremely fast and their thick carapace can withstand heavy blows. actors.mobs.dm300.name=DM-300 actors.mobs.dm300.notice=Unauthorised personnel detected. actors.mobs.dm300.defeated=Mission failed. Shutting down. actors.mobs.dm300.repair=DM-300 repairs itself! +actors.mobs.dm300.def_verb=blocked actors.mobs.dm300.rankings_desc=Crushed by the DM-300 actors.mobs.dm300.desc=This machine was created by the Dwarves several centuries ago. Later, Dwarves started to replace machines with golems, elementals and even demons. Eventually it led their civilization to the decline. The DM-300 and similar machines were typically used for construction and mining, and in some cases, for city defense. @@ -495,6 +495,7 @@ actors.mobs.goo.desc=Little is known about The Goo. It's quite possible that it actors.mobs.greatcrab.name=great crab actors.mobs.greatcrab.noticed=The crab blocks with its massive claw. actors.mobs.greatcrab.blocked=blocked +actors.mobs.greatcrab.def_verb=blocked actors.mobs.greatcrab.desc=This crab is gigantic, even compared to other sewer crabs. Its blue shell is covered in cracks and barnacles, showing great age. It lumbers around slowly, barely keeping balance with its massive claw.\n\nWhile the crab only has one claw, its size easily compensates. The crab holds the claw in front of any threat, shielding itself behind an impenetrable wall of carapace. However, the crab cannot block attacks it doesn't see coming, or attacks from multiple enemies at once. actors.mobs.guard.name=prison guard @@ -505,7 +506,7 @@ actors.mobs.guard.desc=Once keepers of the prison, these guards have long since actors.mobs.king.name=King of Dwarves actors.mobs.king.notice=How dare you! actors.mobs.king.defeated=You cannot kill me, %s... I am... immortal... -actors.mobs.king.def_verb=parried +actors.mobs.king.def_verb=blocked actors.mobs.king.arise=Arise, slaves! actors.mobs.king.rankings_desc=Fell Before the King of Dwarves actors.mobs.king.desc=The last king of dwarves was known for his deep understanding of processes of life and death. He has persuaded members of his court to participate in a ritual, that should have granted them eternal youthfulness. In the end he was the only one, who got it - and an army of undead as a bonus. @@ -519,7 +520,7 @@ actors.mobs.mimic.desc=Mimics are magical creatures which can take any shape the actors.mobs.necromancer.name=necromancer actors.mobs.necromancer.desc=These apprentice dark mages have flocked to the prison, as it is the perfect place to practise their evil craft.\n\nNecromancers will summon and empower skeletons to fight for them. Killing the necromancer will also kill the skeleton it summons. -actors.mobs.necromancer$necroskeleton.name=Necromancer's Skeleton +actors.mobs.necromancer$necroskeleton.name=necromancer's skeleton actors.mobs.necromancer$necroskeleton.desc=This skeleton has been summoned by a necromancer. It behaves just like a regular skeleton, and will die when the necromancer which summoned it is slain. actors.mobs.mob.died=You hear something die in the distance. @@ -529,7 +530,7 @@ actors.mobs.mob.rankings_desc=Slain by: %s actors.mobs.monk.name=dwarf monk actors.mobs.monk.disarm=The monk knocks the %s from your hands! -actors.mobs.monk.def_verb=parried +actors.mobs.monk.def_verb=blocked actors.mobs.monk.desc=These monks are fanatics, who devoted themselves to protecting their city's secrets from all aliens. They don't use any armor or weapons, relying solely on the art of hand-to-hand combat. actors.mobs.newbornelemental.name=newborn fire elemental @@ -558,7 +559,6 @@ actors.mobs.shaman.zap_kill=The lightning bolt killed you... actors.mobs.shaman.desc=The most intelligent gnolls can master shamanistic magic. Gnoll shamans prefer battle spells to compensate for lack of might, not hesitating to use them on those who question their status in a tribe. actors.mobs.shielded.name=shielded brute -actors.mobs.shielded.def_verb=blocked actors.mobs.skeleton.name=skeleton actors.mobs.skeleton.explo_kill=You were killed by the explosion of bones... @@ -566,6 +566,7 @@ actors.mobs.skeleton.def_verb=blocked actors.mobs.skeleton.desc=Skeletons are composed of corpses bones from unlucky adventurers and inhabitants of the dungeon, animated by emanations of evil magic from the depths below. After they have been damaged enough, they disintegrate in an explosion of bones. actors.mobs.slime.name=slime +actors.mobs.slime.def_verb=blocked actors.mobs.slime.desc=Slimes are strange, slightly magical creatures with a rubbery outer body and a liquid core. The city sewers provide them with an ample supply of water and nutrients.\n\nBecause of their elastic outer membrane, it is difficult to deal more than _6 damage_ to slimes from any one attack. actors.mobs.snake.name=sewer snake @@ -575,13 +576,13 @@ actors.mobs.spinner.name=cave spinner actors.mobs.spinner.desc=These greenish furry cave spiders try to avoid direct combat, preferring to wait in the distance while their victim, entangled in the spinner's excreted cobweb, slowly dies from their poisonous bite. actors.mobs.statue.name=animated statue +actors.mobs.statue.def_verb=blocked actors.mobs.statue.desc=You would think that it's just another one of this dungeon's ugly statues, but its red glowing eyes give it away.\n\nWhile the statue itself is made of stone, the _%s,_ it's wielding, looks real. actors.mobs.succubus.name=succubus actors.mobs.succubus.desc=The succubi are demons that look like seductive (in a slightly gothic way) girls. Using its magic, the succubus can charm a hero, who will become unable to attack anything until the charm wears off. When succubi attack a charmed hero, they will steal their life essence. actors.mobs.swarm.name=swarm of flies -actors.mobs.swarm.def_verb=evaded actors.mobs.swarm.desc=The deadly swarm of flies buzzes angrily. Every non-magical attack will split it into two smaller but equally dangerous swarms. actors.mobs.newtengu.name=Tengu @@ -624,7 +625,6 @@ actors.mobs.warlock.bolt_kill=The shadow bolt killed you... actors.mobs.warlock.desc=When dwarves' interests have shifted from engineering to arcane arts, warlocks have come to power in the city. They started with elemental magic, but soon switched to demonology and necromancy. actors.mobs.wraith.name=wraith -actors.mobs.wraith.def_verb=evaded actors.mobs.wraith.desc=A wraith is a vengeful spirit of a sinner, whose grave or tomb was disturbed. Being an ethereal entity, it is very hard to hit with a regular weapon. actors.mobs.yog.name=Yog-Dzewa