From 985babea4288bd128be8a5e378e008308e529134 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 13:24:36 -0800 Subject: [PATCH 001/335] Dropped article for "miserable stealth" for more idiomatic English description of dwarves. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index afd856f1..f7addd5a 100644 --- a/src/birth.c +++ b/src/birth.c @@ -168,7 +168,7 @@ static concptr race_jouhou[MAX_RACES] = "Gnomes are smaller than dwarves but larger than Halflings. They, like the hobbits, live in the earth in burrow-like homes. Gnomes make excellent mages, and have very good saving throws. They are good at searching, disarming, perception, and stealth. They have lower strength than humans so they are not very good at fighting with hand weapons. Gnomes have fair infravision, so they can detect warm-blooded creatures at a distance. Gnomes are intrinsically protected against paralysis.", -"Dwarves are the headstrong miners and fighters of legend. Dwarves tend to be stronger and tougher but slower and less intelligent than humans. Because they are so headstrong and are somewhat wise, they resist spells which are cast on them. They are very good at searching, perception, fighting, and bows. Dwarves have a miserable stealth. They can never be blinded.", +"Dwarves are the headstrong miners and fighters of legend. Dwarves tend to be stronger and tougher but slower and less intelligent than humans. Because they are so headstrong and are somewhat wise, they resist spells which are cast on them. They are very good at searching, perception, fighting, and bows. Dwarves have miserable stealth. They can never be blinded.", "Half-orcs make excellent warriors, but are terrible at magic. They are as bad as dwarves at stealth, and horrible at searching, disarming, and perception. Half-orcs are quite ugly, and tend to pay more for goods in town. Because of their preference to living underground to on the surface, half-orcs resist darkness attacks.", -- 2.21.1 (Apple Git-122.3) From c41102d1005946f7b7400e52076f4805d8e461d2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 13:30:52 -0800 Subject: [PATCH 002/335] Reworded Engglish description of half-trolls for the part about warriors having slow digestion at higher levels. --- lib/help/raceclas.txt | 3 +-- src/birth.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index 44f2bbc7..f2c2839a 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -102,8 +102,7 @@ by the racial/class power command ("U"/"O"). ugly that a Half-Orc grimaces in their presence. They also happen to be fun to run... Half-trolls always have their strength sustained. At higher levels, Half-Trolls regenerate wounds - automatically, and, if he or she is a warrior, require food less - often. + automatically, and, if a warrior, require food less often. ***** diff --git a/src/birth.c b/src/birth.c index f7addd5a..4ae71558 100644 --- a/src/birth.c +++ b/src/birth.c @@ -172,7 +172,7 @@ static concptr race_jouhou[MAX_RACES] = "Half-orcs make excellent warriors, but are terrible at magic. They are as bad as dwarves at stealth, and horrible at searching, disarming, and perception. Half-orcs are quite ugly, and tend to pay more for goods in town. Because of their preference to living underground to on the surface, half-orcs resist darkness attacks.", -"Half-Trolls are incredibly strong and have more hit points than most other races. They are also very stupid and slow. They are bad at searching, disarming, perception, and stealth. They are so ugly that a Half-Orc grimaces in their presence. They also happen to be fun to run... Half-trolls always have their strength sustained. At higher levels, Half-Trolls regenerate wounds automatically and, if he or she is a warrior, require food less often.", +"Half-Trolls are incredibly strong and have more hit points than most other races. They are also very stupid and slow. They are bad at searching, disarming, perception, and stealth. They are so ugly that a Half-Orc grimaces in their presence. They also happen to be fun to run... Half-trolls always have their strength sustained. At higher levels, Half-Trolls regenerate wounds automatically and, if a warrior, require food less often.", "The Amberites are a reputedly immortal race, who are endowed with numerous advantages in addition to their longevity. They are very tough and their constitution cannot be reduced. Their ability to heal wounds far surpasses that of any other race. Having seen virtually everything, very little is new to them, and they gain levels much slower than the other races.", -- 2.21.1 (Apple Git-122.3) From 88db9e7e47b6c04cb9a5e0615173fe351e3dd9ef Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 13:50:46 -0800 Subject: [PATCH 003/335] Added comma in English description of half-giants to completely set off an auxilliary clause. --- lib/help/raceclas.txt | 2 +- src/birth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index f2c2839a..46cf0b06 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -157,7 +157,7 @@ by the racial/class power command ("U"/"O"). Half-Giants' limited intelligence makes it difficult for them to become full spellcasters, but, with their great strength, they make excellent warriors. Their thick skin makes them resistant - to shards, and like Half-Ogres and Half-Trolls, they have their + to shards, and, like Half-Ogres and Half-Trolls, they have their strength sustained. diff --git a/src/birth.c b/src/birth.c index 4ae71558..a18a5503 100644 --- a/src/birth.c +++ b/src/birth.c @@ -182,7 +182,7 @@ static concptr race_jouhou[MAX_RACES] = "Half-Ogres are like Half-Orcs, only more so. They are big, bad, and stupid. For warriors, they have all the necessary attributes, and they can even become wizards: after all, they are related to Ogre Magi, from whom they have learned the skill of setting trapped runes once their level is high enough. Like Half-Orcs, they resist darkness, and like Half-Trolls, they have their strength sustained.", -"Half-Giants' limited intelligence makes it difficult for them to become full spellcasters, but, with their great strength, they make excellent warriors. Their thick skin makes them resistant to shards, and like Half-Ogres and Half-Trolls, they have their strength sustained.", +"Half-Giants' limited intelligence makes it difficult for them to become full spellcasters, but, with their great strength, they make excellent warriors. Their thick skin makes them resistant to shards, and, like Half-Ogres and Half-Trolls, they have their strength sustained.", "Half-mortal descendants of the mighty titans, these immensely powerful creatures put almost any other race to shame. They may lack the fascinating special powers of certain other races, but their enhanced attributes more than make up for that. They learn to estimate the strengths of their foes, and their love for law and order makes them resistant to the effects of Chaos.", -- 2.21.1 (Apple Git-122.3) From d1c1b67f009abbe46c34196c3abf56a399f0fc90 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 14:14:46 -0800 Subject: [PATCH 004/335] In the description of the ranger class, dropped the article in front of stealth to be more idiomatic and changed "a good saving throw" to "good saving throws" for better flow with the other listed characteristics. --- lib/help/raceclas.txt | 4 ++-- src/birth.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index 46cf0b06..4159d4d1 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -562,8 +562,8 @@ command("U"/"O"). developed a special affinity for the natural world around him. He or she is a good fighter and also good with missile weapons - such as bows. A ranger has a good stealth, good perception, good - searching, a good saving throw and is good with magical devices. + such as bows. A ranger has good stealth, good perception, good + searching, good saving throws and is good with magical devices. Intelligence determines a Ranger's spell casting ability. All rangers are trained in Nature magic, and all Nature spells are diff --git a/src/birth.c b/src/birth.c index a18a5503..67f35974 100644 --- a/src/birth.c +++ b/src/birth.c @@ -311,7 +311,7 @@ static concptr class_jouhou[MAX_CLASS] = "A Rogue is a character that prefers to live by his or her cunning, but is capable of fighting out of a tight spot. Rogues are good at locating hidden traps and doors and are the masters of disarming traps and picking locks. A rogue is very stealthy, allowing him or her to sneak around many creatures without having to fight or to get in a telling first blow. A rogue may also backstab a fleeing monster. Intelligence determines a Rogue's spell casting ability.", -"A Ranger is a combination of a warrior and a mage who has developed a special affinity for the natural world. He or she is a good fighter and also good with missile weapons such as bows. A ranger has a good stealth, good perception, good searching, a good saving throw and is good with magical devices. Intelligence determines a Ranger's spell casting ability.", +"A Ranger is a combination of a warrior and a mage who has developed a special affinity for the natural world. He or she is a good fighter and also good with missile weapons such as bows. A ranger has good stealth, good perception, good searching, good saving throws and is good with magical devices. Intelligence determines a Ranger's spell casting ability.", "A Paladin is a combination of a warrior and a priest. Paladins are very good fighters, but not very good at missile weapons. A paladin lacks much in the way of abilities. He or she is poor at stealth, perception, searching, and magical devices but has a decent saving throw due to his or her divine alliance. Wisdom determines a Paladin's success at praying to his or her deity.", -- 2.21.1 (Apple Git-122.3) From c89518c97b6f4b8a0999e632b6cf65de921ddb57 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 18:24:01 -0800 Subject: [PATCH 005/335] Some English class descriptions used both gender pronouns and some just used the masculine forms. Modified the ones that used only the masculine forms to use both with some rewording to avoid extra "him or her" or "he or she" expressions. --- lib/help/raceclas.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index 4159d4d1..4b7d7d42 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -559,10 +559,9 @@ command("U"/"O"). --- Ranger --- A Ranger is a combination of a warrior and a mage who has - - developed a special affinity for the natural world around him. - He or she is a good fighter and also good with missile weapons - such as bows. A ranger has good stealth, good perception, good + developed a special affinity for the natural world. He or she + is a good fighter and also good with missile weapons such as + bows. A ranger has good stealth, good perception, good searching, good saving throws and is good with magical devices. Intelligence determines a Ranger's spell casting ability. @@ -584,7 +583,7 @@ command("U"/"O"). paladin lacks much in the way of abilities. He or she is poor at stealth, perception, searching, and magical devices but has a decent saving throw due to his divine alliance. Wisdom determines - a Paladin's success at praying to his deity. + a Paladin's success at praying to his or her deity. Paladins can select a realm from Crusade and Death. Like priests, they cannot select which prayers to learn, but are rewarded with @@ -623,11 +622,11 @@ command("U"/"O"). of Chaos. Every Chaos Warrior has a Patron Demon and, when gaining a level, may receive a reward from his or her Patron. He or she might be healed or polymorphed, given an awesome weapon, - or have his or stats increased. On the other hand, the Patron + or have his or her stats increased. On the other hand, the Patron might surround the Chaos Warrior with monsters, drain his or her - stats, wreck or her equipment, or simply ignore the Chaos Warrior. - The Demon Lords of Chaos are chaotic and unpredictable indeed. - The exact type of reward depends on both the Patron Demon + stats, wreck his or her equipment, or simply ignore the Chaos + Warrior. The Demon Lords of Chaos are chaotic and unpredictable + indeed. The exact type of reward depends on both the Patron Demon (different Demons give different rewards) and chance. Chaos Warriors can select a realm from Chaos and Daemon. They are @@ -682,7 +681,7 @@ command("U"/"O"). High-mages are mages who specialize in one particular field of magic and learn it very well - much better than the ordinary mage. A high mage's prime statistic is intelligence as this determines - his spell casting ability. + his or her spell casting ability. For the price of giving up a second realm of magic, High-mages gain substantial benefits in the mana costs, minimum levels, and @@ -838,7 +837,7 @@ command("U"/"O"). techniques. Samurai are not good at most other skills, and many magical devices may be too difficult for them to use. Wisdom determines a Samurai's ability to use the special combat - techniques available to him. + techniques available to him or her. Samurai use the art of the blade called Kendo (or Bugei). Books of Kendo are similar to spellbooks, but Samurai don't need to -- 2.21.1 (Apple Git-122.3) From 3e06ead6368dd41314fe0801980d4d0ce67cf0cf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 19:57:04 -0800 Subject: [PATCH 006/335] Removed some commas where only two expressions were joined by a conjunction. --- lib/help/raceclas.txt | 8 ++++---- src/birth.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index 4b7d7d42..e6a35a4f 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -53,9 +53,9 @@ by the racial/class power command ("U"/"O"). good saving throws. They also are very good at searching, disarming, perception, and stealth; so they make excellent rogues, but prefer to be called burglars. They are much weaker than - humans, and no good at melee fighting. Halflings have fair + humans and no good at melee fighting. Halflings have fair infravision, so they can detect warm creatures at a distance. - They have a strong hold on their life force, and are thus + They have a strong hold on their life force and are thus intrinsically resistant to life draining. @@ -88,7 +88,7 @@ by the racial/class power command ("U"/"O"). Half-orcs make excellent warriors, but are terrible at magic. They are as bad as dwarves at stealth, and horrible at searching, - disarming, and perception. Half-orcs are quite ugly, and tend to + disarming, and perception. Half-orcs are quite ugly and tend to pay more for goods in town. Because of their preference to living underground to on the surface, half-orcs resist darkness attacks. @@ -260,7 +260,7 @@ by the racial/class power command ("U"/"O"). A demon-creature from the nether-world, naturally resistant to fire attacks, and capable of learning fire bolt and fire ball - attacks. They are little loved by other races, but can perform + attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible. diff --git a/src/birth.c b/src/birth.c index 67f35974..736ef99a 100644 --- a/src/birth.c +++ b/src/birth.c @@ -164,13 +164,13 @@ static concptr race_jouhou[MAX_RACES] = "Elves are better magicians then humans, but not as good at fighting. They tend to be smarter and faster than either humans or half-elves and also have better wisdom. Elves are better at searching, disarming, perception, stealth, bows, and magic, but they are not as good at hand weapons. They resist light effects intrinsically.", -"Hobbits, or Halflings, are very good at bows, throwing, and have good saving throws. They also are very good at searching, disarming, perception, and stealth; so they make excellent rogues, but prefer to be called burglars. They are much weaker than humans, and no good at melee fighting. Halflings have fair infravision, so they can detect warm creatures at a distance. They have a strong hold on their life force, and are thus intrinsically resistant to life draining.", +"Hobbits, or Halflings, are very good at bows, throwing, and have good saving throws. They also are very good at searching, disarming, perception, and stealth; so they make excellent rogues, but prefer to be called burglars. They are much weaker than humans and no good at melee fighting. Halflings have fair infravision, so they can detect warm creatures at a distance. They have a strong hold on their life force and are thus intrinsically resistant to life draining.", -"Gnomes are smaller than dwarves but larger than Halflings. They, like the hobbits, live in the earth in burrow-like homes. Gnomes make excellent mages, and have very good saving throws. They are good at searching, disarming, perception, and stealth. They have lower strength than humans so they are not very good at fighting with hand weapons. Gnomes have fair infravision, so they can detect warm-blooded creatures at a distance. Gnomes are intrinsically protected against paralysis.", +"Gnomes are smaller than dwarves but larger than Halflings. They, like the hobbits, live in the earth in burrow-like homes. Gnomes make excellent mages and have very good saving throws. They are good at searching, disarming, perception, and stealth. They have lower strength than humans so they are not very good at fighting with hand weapons. Gnomes have fair infravision, so they can detect warm-blooded creatures at a distance. Gnomes are intrinsically protected against paralysis.", "Dwarves are the headstrong miners and fighters of legend. Dwarves tend to be stronger and tougher but slower and less intelligent than humans. Because they are so headstrong and are somewhat wise, they resist spells which are cast on them. They are very good at searching, perception, fighting, and bows. Dwarves have miserable stealth. They can never be blinded.", -"Half-orcs make excellent warriors, but are terrible at magic. They are as bad as dwarves at stealth, and horrible at searching, disarming, and perception. Half-orcs are quite ugly, and tend to pay more for goods in town. Because of their preference to living underground to on the surface, half-orcs resist darkness attacks.", +"Half-orcs make excellent warriors, but are terrible at magic. They are as bad as dwarves at stealth, and horrible at searching, disarming, and perception. Half-orcs are quite ugly and tend to pay more for goods in town. Because of their preference to living underground to on the surface, half-orcs resist darkness attacks.", "Half-Trolls are incredibly strong and have more hit points than most other races. They are also very stupid and slow. They are bad at searching, disarming, perception, and stealth. They are so ugly that a Half-Orc grimaces in their presence. They also happen to be fun to run... Half-trolls always have their strength sustained. At higher levels, Half-Trolls regenerate wounds automatically and, if a warrior, require food less often.", @@ -202,7 +202,7 @@ static concptr race_jouhou[MAX_RACES] = "A secretive and mysterious ancient race. Their civilization may well be older than any other on our planet, and their intelligence and wisdom are naturally sustained, and are so great that they enable Mind Flayers to become more powerful spellcasters than any other race, even if their physical attributes are a good deal less admirable. As they advance levels, they gain the powers of See Invisible and Telepathy.", -"A demon-creature from the nether-world, naturally resistant to fire attacks, and capable of learning fire bolt and fire ball attacks. They are little loved by other races, but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", +"A demon-creature from the nether-world, naturally resistant to fire attacks, and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", "A Golem is an artificial creature, built from a lifeless raw material like clay, and awakened to life. They are nearly mindless, making them useless for professions which rely on magic, but as warriors they are very tough. They are resistant to poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their experience. Golems gain very little nutrition from ordinary food, but can absorb mana from staves and wands as their power source. Golems also gain a natural armor class bonus from their tough body.", -- 2.21.1 (Apple Git-122.3) From ab1712fa1c4f461540f2b370331c88f9e09068e9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 20:13:15 -0800 Subject: [PATCH 007/335] Removed extra whitespace at the end of some English descriptions for races, classes and realms. --- src/birth.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/birth.c b/src/birth.c index 736ef99a..0092f1d8 100644 --- a/src/birth.c +++ b/src/birth.c @@ -178,7 +178,7 @@ static concptr race_jouhou[MAX_RACES] = "High-elves are a race of immortal beings dating from the beginning of time. They are masters of all skills, and are strong and intelligent, although their wisdom is sometimes suspect. High-elves begin their lives able to see the unseen, and resist light effects just like regular elves. However, there are few things that they have not seen already, and experience is very hard for them to gain.", -"Barbarians are hardy men of the north. They are fierce in combat, and their wrath is feared throughout the world. Combat is their life: they feel no fear, and they learn to enter battle frenzy at will even sooner than half-trolls. Barbarians are, however, suspicious of magic, which makes magic devices fairly hard for them to use. ", +"Barbarians are hardy men of the north. They are fierce in combat, and their wrath is feared throughout the world. Combat is their life: they feel no fear, and they learn to enter battle frenzy at will even sooner than half-trolls. Barbarians are, however, suspicious of magic, which makes magic devices fairly hard for them to use.", "Half-Ogres are like Half-Orcs, only more so. They are big, bad, and stupid. For warriors, they have all the necessary attributes, and they can even become wizards: after all, they are related to Ogre Magi, from whom they have learned the skill of setting trapped runes once their level is high enough. Like Half-Orcs, they resist darkness, and like Half-Trolls, they have their strength sustained.", @@ -190,7 +190,7 @@ static concptr race_jouhou[MAX_RACES] = "Yeeks are among the most pathetic creatures. Fortunately, their horrible screams can scare away less confident foes, and their skin becomes more and more resistant to acid, as they gain experience. But having said that, even a mediocre monster can wipe the proverbial floor with an unwary Yeek.", -"Klackons are bizarre semi-intelligent ant-like insectoid creatures. They make great fighters, but their mental abilities are severely limited. Obedient and well-ordered, they can never be confused. They are also very nimble, and become faster as they advance levels. They are also very acidic, inherently resisting acid, and capable of spitting acid at higher levels. ", +"Klackons are bizarre semi-intelligent ant-like insectoid creatures. They make great fighters, but their mental abilities are severely limited. Obedient and well-ordered, they can never be confused. They are also very nimble, and become faster as they advance levels. They are also very acidic, inherently resisting acid, and capable of spitting acid at higher levels.", "Kobolds are a weak goblin race. They love poisoned weapons, and can learn to throw poisoned darts (of which they carry an unlimited supply). They are also inherently resistant to poison, although they are not one of the more powerful races.", @@ -224,7 +224,7 @@ static concptr race_jouhou[MAX_RACES] = "Balrogs are a higher class of demons. They are strong, intelligent and tough. They do not believe in gods, and are not suitable for priest at all. Balrog are resistant to fire and nether, and have a firm hold on their experience. They also eventually learn to see invisible things. They are good at almost all skills except stealth. They gain very little nutrition from the food of mortals, and need human corpses as sacrifices to regain their vitality.", -"Dunedain are a race of hardy men from the West. This elder race surpasses human abilities in every field, especially constitution. However, being men of the world, very little is new to them, and levels are very hard for them to gain. Their constitution cannot be reduced. ", +"Dunedain are a race of hardy men from the West. This elder race surpasses human abilities in every field, especially constitution. However, being men of the world, very little is new to them, and levels are very hard for them to gain. Their constitution cannot be reduced.", "Shadow Fairies are one of several fairy races. They have wings, and can fly over traps that may open up beneath them. Shadow Fairies must beware of sunlight, as they are vulnerable to bright light. They are physically weak, but have advantages in using magic and are amazingly stealthy. Shadow Fairies have a wonderful advantage in that they never aggravate monsters (If their equipment normally aggravates monsters, they only suffer a penalty to stealth, but if they aggravate by their personality itself, the advantage will be lost).", @@ -399,7 +399,7 @@ static concptr seikaku_jouhou[MAX_SEIKAKU] = "\"Shrewd\" reduces your physical stats, and raises your intelligence and magical skills. It makes your stats suitable for a mage. Also it directly influences your hit-points and spell fail rate.", -"\"Pious\" deepens your faith in your God. It makes your physical ability average, and your stats suitable for priest. ", +"\"Pious\" deepens your faith in your God. It makes your physical ability average, and your stats suitable for priest.", "\"Nimble\" improves most skills except for melee combat.", @@ -466,7 +466,7 @@ static concptr realm_jouhou[VALID_REALM] = "Trump magic has, indeed, an admirable selection of teleportation spells. Since the Trump gateways can also be used to summon other creatures, Trump magic has an equally impressive selection of summoning spells. However, not all monsters appreciate being drawn to another place by Trump user.", -"Arcane magic is a general purpose realm of magic. It attempts to encompass all 'useful' spells from all realms. This is the downside of Arcane magic: while Arcane does have all the necessary 'tool' spells for a dungeon delver, it has no ultra-powerful high level spells. As a consequence, all Arcane spellbooks can be bought in town. It should also be noted that the 'specialized' realms usually offer the same spell at a lower level and cost. ", +"Arcane magic is a general purpose realm of magic. It attempts to encompass all 'useful' spells from all realms. This is the downside of Arcane magic: while Arcane does have all the necessary 'tool' spells for a dungeon delver, it has no ultra-powerful high level spells. As a consequence, all Arcane spellbooks can be bought in town. It should also be noted that the 'specialized' realms usually offer the same spell at a lower level and cost.", "Craft magic can strengthen the caster or his or her equipment. These spells can greatly improve the caster's fighting ability. Using them against opponents directly is not possible.", -- 2.21.1 (Apple Git-122.3) From d7d8107b1fa6573a7a2761fdaeb827f8569d13b5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 20:35:45 -0800 Subject: [PATCH 008/335] In English description of imps, added noun and removed a comma where two phrases were joined by a conjunction. --- lib/help/raceclas.txt | 4 ++-- src/birth.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index e6a35a4f..f2465bb4 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -258,8 +258,8 @@ by the racial/class power command ("U"/"O"). ***** --- Imp --- - A demon-creature from the nether-world, naturally resistant to - fire attacks, and capable of learning fire bolt and fire ball + A demon-creature from the nether-world, imps are naturally resistant + to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible. diff --git a/src/birth.c b/src/birth.c index 0092f1d8..c8dca00b 100644 --- a/src/birth.c +++ b/src/birth.c @@ -202,7 +202,7 @@ static concptr race_jouhou[MAX_RACES] = "A secretive and mysterious ancient race. Their civilization may well be older than any other on our planet, and their intelligence and wisdom are naturally sustained, and are so great that they enable Mind Flayers to become more powerful spellcasters than any other race, even if their physical attributes are a good deal less admirable. As they advance levels, they gain the powers of See Invisible and Telepathy.", -"A demon-creature from the nether-world, naturally resistant to fire attacks, and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", +"A demon-creature from the nether-world, imps are naturally resistant to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", "A Golem is an artificial creature, built from a lifeless raw material like clay, and awakened to life. They are nearly mindless, making them useless for professions which rely on magic, but as warriors they are very tough. They are resistant to poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their experience. Golems gain very little nutrition from ordinary food, but can absorb mana from staves and wands as their power source. Golems also gain a natural armor class bonus from their tough body.", -- 2.21.1 (Apple Git-122.3) From 6897ff1762819be0149f09bac4d2173db96ed6b9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 12 Dec 2019 20:45:05 -0800 Subject: [PATCH 009/335] Removed comma before conjunction where only two phrases are joined in the English description of beastmasters. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index c8dca00b..4eb96dc3 100644 --- a/src/birth.c +++ b/src/birth.c @@ -329,7 +329,7 @@ static concptr class_jouhou[MAX_CLASS] = "Imitators have enough fighting skills to survive, but rely on their ability to imitate monster spells. When monsters in line of sight use spells, they are added to a temporary spell list which the imitator can choose among. Spells should be imitated quickly, because timing and situation are everything. An imitator can only repeat a spell once each time he or she observes it. Dexterity determines general imitation ability, but a stat related to the specific action is often also taken into account.", -"Beastmasters are in tune with the minds of the creatures of the world of Hengband. They are very good at riding and have enough fighting ability. The monsters that a beastmaster summons or dominates become the beastmaster's hands and feet. Beastmasters can cast trump magic, and are very good at summoning spells, but they can not summon non-living creatures. Charisma determines a Beastmaster's spell casting ability.", +"Beastmasters are in tune with the minds of the creatures of the world of Hengband. They are very good at riding and have enough fighting ability. The monsters that a beastmaster summons or dominates become the beastmaster's hands and feet. Beastmasters can cast trump magic and are very good at summoning spells, but they can not summon non-living creatures. Charisma determines a Beastmaster's spell casting ability.", "Sorcerers are the all-around best magicians, being able to cast any spell from most magic realms without having to learn it. On the downside, they are the worst fighters in the dungeon, being unable to use any weapon but a Wizardstaff.", -- 2.21.1 (Apple Git-122.3) From cd8e12f5077b6aa08035267068168978cd165b7b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 13 Dec 2019 06:47:27 -0800 Subject: [PATCH 010/335] Added articles in English description of nature magic to be more idiomatic. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index 4eb96dc3..c11b2635 100644 --- a/src/birth.c +++ b/src/birth.c @@ -458,7 +458,7 @@ static concptr realm_jouhou[VALID_REALM] = "Sorcery is a `meta` realm, including enchantment and general spells. It provides superb protection spells, spells to enhance your odds in combat and, most importantly, a vast selection of spells for gathering information. However, Sorcery has one weakness: it has no spells to deal direct damage to your enemies.", -"Nature magic makes you a master of elements; it provides protection, detection, curing and attack spells. Nature also has a spell of Herbal Healing, which is the only powerful healing spell outside the realm of Life magic.", +"Nature magic makes you a master of the elements; it provides protection, detection, curing and attack spells. Nature also has a spell of Herbal Healing, which is the only powerful healing spell outside the realm of Life magic.", "There are few types of magic more unpredictable and difficult to control than Chaos magic. Chaos is the very element of unmaking, and the Chaos spells are the most terrible weapons of destruction imaginable. The caster can also call on the primal forces of Chaos to induce mutations in his/her opponents and even him/herself.", -- 2.21.1 (Apple Git-122.3) From 2e4e64b0597d1af4402f43c39786c956ff125f78 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 13 Dec 2019 07:28:30 -0800 Subject: [PATCH 011/335] For clarity, reworded description of changing the second realm of magic mid-game. --- lib/help/magic.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/help/magic.txt b/lib/help/magic.txt index 95b720b6..281245ac 100644 --- a/lib/help/magic.txt +++ b/lib/help/magic.txt @@ -21,13 +21,14 @@ intelligence, wisdom, or charisma. For spellcasting, you must always carry spellbooks which include spells which you want to cast. You can choose either one or two realms, depending on class. -In Hengband, you cannot be as proficient in secondary realm as in -first realm. But you can change secondary realm to another realm of -magic even in the middle of the game. For that, you must choose a -spellbook of new realm in the study command ('G'). But beware! After -changing realm, you will forget all spells of old realm, moreover the -forgotten spells still count towards the total number of spells you -can learn, limiting the number of new spells you'll be able to study. +In Hengband, you cannot be as proficient in the second realm as in +the first realm. But you can change the second realm to another realm +of magic even in the middle of the game. For that, you must choose a +spellbook of the new realm in the study command ('G'). But beware! +After changing realms, you will forget all spells of the old realm, +moreover the forgotten spells still count towards the total number of +spells you can learn, limiting the number of new spells you'll be +able to study. Note that certain realms may be prohibited for some classes. In the table below, '1' indicates that the realm may only be the first -- 2.21.1 (Apple Git-122.3) From b1376b6a111cae54d7da1d583dc5c2ee051998d1 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 13 Dec 2019 07:38:16 -0800 Subject: [PATCH 012/335] Reworded the English description of music magic to be clearer. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index c11b2635..38c1fe2b 100644 --- a/src/birth.c +++ b/src/birth.c @@ -474,7 +474,7 @@ static concptr realm_jouhou[VALID_REALM] = "Crusade is a magic of 'Justice'. It includes damage spells, which are greatly effective against foul and evil monsters, but have poor effects against good monsters.", -"Music magic works through the caster singing songs. There are two types of songs; one which shows effects instantly and another which shows effects continuously until SP runs out. The latter type has a limit: only one song can be sung at the same time.", +"Music magic works through the caster singing songs. There are two types of songs; one which shows effects instantly and another which shows effects continuously until SP runs out. The latter type has a limit: only one song can be sung at a time.", "The books of Kendo describe various combat techniques. When learning new techniques, you are required to carry the books, but once you memorizes them, you don't have to carry them. When using a technique, wielding a weapon is required.", -- 2.21.1 (Apple Git-122.3) From 69cfaf1b4ab53163da119ac73a0a566157345984 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 14 Dec 2019 19:29:42 -0800 Subject: [PATCH 013/335] English message has swapped order for string and integer parameters but was given them in the same order as the Japanese message. Fixed. --- src/bldg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bldg.c b/src/bldg.c index 5aff39a2..c3762fcd 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -2269,7 +2269,11 @@ static void castle_quest(player_type *player_ptr) q_ptr->cur_num = 0; concptr name = (r_name + r_ptr->name); - msg_format(_("クエスト: %sを %d体倒す", "Your quest: kill %d %s"), name, q_ptr->max_num); +#ifdef JP + msg_format("クエスト: %sを %d体倒す", name, q_ptr->max_num); +#else + msg_format("Your quest: kill %d %s", q_ptr->max_num, name); +#endif get_questinfo(player_ptr, q_index, TRUE); } -- 2.21.1 (Apple Git-122.3) From 203c04528a6004825ceab919f74e55ee4362c5c4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 14 Dec 2019 19:54:35 -0800 Subject: [PATCH 014/335] Replaced "current_world_ptr->game_turn" with "turn" in English messages were "turn" seemed like the intended word. --- src/mutation.c | 8 ++++---- src/object1.c | 4 ++-- src/player-effects.c | 4 ++-- src/selfinfo.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mutation.c b/src/mutation.c index 1843718e..b629ea86 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -445,7 +445,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) case 120: case 121: case 122: muta_class = &(creature_ptr->muta3); muta_which = MUT3_HYPER_STR; - muta_desc = _( "超人的に強くなった!", "You current_world_ptr->game_turn into a superhuman he-man!"); + muta_desc = _( "超人的に強くなった!", "You turn into a superhuman he-man!"); break; case 123: case 124: case 125: @@ -481,7 +481,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) case 136: case 137: muta_class = &(creature_ptr->muta3); muta_which = MUT3_ALBINO; - muta_desc = _( "アルビノになった!弱くなった気がする...", "You current_world_ptr->game_turn into an albino! You feel frail..."); + muta_desc = _( "アルビノになった!弱くなった気がする...", "You turn into an albino! You feel frail..."); break; case 138: case 139: case 140: @@ -541,7 +541,7 @@ bool gain_mutation(player_type *creature_ptr, MUTATION_IDX choose_mut) case 159: case 160: muta_class = &(creature_ptr->muta3); muta_which = MUT3_SHORT_LEG; - muta_desc = _( "足が短い突起になってしまった!", "Your legs current_world_ptr->game_turn into short stubs!"); + muta_desc = _( "足が短い突起になってしまった!", "Your legs turn into short stubs!"); break; case 161: case 162: @@ -1616,7 +1616,7 @@ void dump_mutations(player_type *creature_ptr, FILE *OutFile) } if (creature_ptr->muta1 & MUT1_MIDAS_TCH) { - fprintf(OutFile, _(" あなたは通常アイテムを金に変えることができる。\n", " You can current_world_ptr->game_turn ordinary items to gold.\n")); + fprintf(OutFile, _(" あなたは通常アイテムを金に変えることができる。\n", " You can turn ordinary items to gold.\n")); } if (creature_ptr->muta1 & MUT1_GROW_MOLD) diff --git a/src/object1.c b/src/object1.c index d08810ca..63d39ac9 100644 --- a/src/object1.c +++ b/src/object1.c @@ -443,7 +443,7 @@ static concptr item_activation_aux(object_type *o_ptr) dice = act_ptr->timeout.dice; if (constant == 0 && dice == 0) { /* We can activate it every turn */ - strcpy(timeout, _("いつでも", "every current_world_ptr->game_turn")); + strcpy(timeout, _("いつでも", "every turn")); } else if (constant < 0) { /* Activations that have special timeout */ switch (act_ptr->index) { @@ -573,7 +573,7 @@ bool screen_object(player_type *player_ptr, object_type *o_ptr, BIT_FLAGS mode) /* Figurines, a hack */ if (o_ptr->name1 == ART_STONEMASK) { - info[i++] = _("それを装備した者は吸血鬼になる。", "It makes you current_world_ptr->game_turn into a vampire permanently."); + info[i++] = _("それを装備した者は吸血鬼になる。", "It makes you turn into a vampire permanently."); } if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_POISON_NEEDLE)) diff --git a/src/player-effects.c b/src/player-effects.c index f4d6623b..af5e42c6 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -1218,7 +1218,7 @@ bool set_wraith_form(player_type *creature_ptr, TIME_EFFECT v, bool do_dec) } else if (!creature_ptr->wraith_form) { - msg_print(_("物質界を離れて幽鬼のような存在になった!", "You leave the physical world and current_world_ptr->game_turn into a wraith-being!")); + msg_print(_("物質界を離れて幽鬼のような存在になった!", "You leave the physical world and turn into a wraith-being!")); notice = TRUE; chg_virtue(creature_ptr, V_UNLIFE, 3); chg_virtue(creature_ptr, V_HONOUR, -2); @@ -3255,7 +3255,7 @@ void change_race(player_type *creature_ptr, CHARACTER_IDX new_race, concptr effe #ifdef JP msg_format("あなたは%s%sに変化した!", effect_msg, title); #else - msg_format("You current_world_ptr->game_turn into %s %s%s!", (!effect_msg[0] && is_a_vowel(title[0]) ? "an" : "a"), effect_msg, title); + msg_format("You turn into %s %s%s!", (!effect_msg[0] && is_a_vowel(title[0]) ? "an" : "a"), effect_msg, title); #endif chg_virtue(creature_ptr, V_CHANCE, 2); diff --git a/src/selfinfo.c b/src/selfinfo.c index d98b57f0..39ab95b1 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -307,7 +307,7 @@ void self_knowledge(player_type *creature_ptr) break; case RACE_GOLEM: if (plev > 19) - info[i++] = _("あなたは d20+30 ターンの間肌を石に変化させられる。(15 MP)", "You can current_world_ptr->game_turn your skin to stone, dur d20+30 (cost 15)."); + info[i++] = _("あなたは d20+30 ターンの間肌を石に変化させられる。(15 MP)", "You can turn your skin to stone, dur d20+30 (cost 15)."); break; case RACE_ZOMBIE: case RACE_SKELETON: @@ -506,7 +506,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_CAVALRY: if (plev > 9) { - info[i++] = _("あなたはモンスターに乗って無理矢理ペットにすることができる。", "You can ride on a hostile monster forcibly to current_world_ptr->game_turn it into pet."); + info[i++] = _("あなたはモンスターに乗って無理矢理ペットにすることができる。", "You can ride on a hostile monster forcibly to turn it into pet."); } break; case CLASS_BERSERKER: @@ -604,7 +604,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->muta1 & MUT1_MIDAS_TCH) { - info[i++] = _("あなたは通常アイテムを金に変えることができる。", "You can current_world_ptr->game_turn ordinary items to gold."); + info[i++] = _("あなたは通常アイテムを金に変えることができる。", "You can turn ordinary items to gold."); } if (creature_ptr->muta1 & MUT1_GROW_MOLD) { -- 2.21.1 (Apple Git-122.3) From c0bdcdf9377686cb4ee3c48590c801a276044337 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 14 Dec 2019 20:02:07 -0800 Subject: [PATCH 015/335] Changed an English message related to "Call the Void" to be more idiomatic. --- src/spells3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spells3.c b/src/spells3.c index 0091d1c9..c504d8be 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -1071,7 +1071,7 @@ void call_the_void(player_type *caster_ptr) if (one_in_(666)) { - if (!vanish_dungeon(caster_ptr)) msg_print(_("ダンジョンは一瞬静まり返った。", "The dungeon silences a moment.")); + if (!vanish_dungeon(caster_ptr)) msg_print(_("ダンジョンは一瞬静まり返った。", "The dungeon beomes quiet for a moment.")); take_hit(caster_ptr, DAMAGE_NOESCAPE, 100 + randint1(150), _("自殺的な虚無招来", "a suicidal Call the Void"), -1); return; } -- 2.21.1 (Apple Git-122.3) From bf4d56040216b29102731140ffd5f767c05e9587 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 14 Dec 2019 21:16:54 -0800 Subject: [PATCH 016/335] Except in files.c, replaced "posture" or "form" with "stance" in the English messages about monk or samurai fighting techniques since "stance" may be clearer. --- src/player-effects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/player-effects.c b/src/player-effects.c index af5e42c6..fb5b9b2a 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -130,13 +130,13 @@ void set_action(player_type *creature_ptr, ACTION_IDX typ) } case ACTION_KAMAE: { - msg_print(_("構えをといた。", "You stop assuming the posture.")); + msg_print(_("構えをといた。", "You stop assuming the special stance.")); creature_ptr->special_defense &= ~(KAMAE_MASK); break; } case ACTION_KATA: { - msg_print(_("型を崩した。", "You stop assuming the posture.")); + msg_print(_("型を崩した。", "You stop assuming the special stance.")); creature_ptr->special_defense &= ~(KATA_MASK); creature_ptr->update |= (PU_MONSTERS); creature_ptr->redraw |= (PR_STATUS); -- 2.21.1 (Apple Git-122.3) From 308112cec47fac61c8a09a676b6dc289b5748f02 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 14 Dec 2019 21:43:54 -0800 Subject: [PATCH 017/335] In English messages, replaced "spelling" with "casting" when referring to the ongoing process of using a spell. --- src/player-effects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/player-effects.c b/src/player-effects.c index fb5b9b2a..de8bafcf 100644 --- a/src/player-effects.c +++ b/src/player-effects.c @@ -338,7 +338,7 @@ void dispel_player(player_type *creature_ptr) if (music_singing_any(creature_ptr) || hex_spelling_any(creature_ptr)) { - concptr str = (music_singing_any(creature_ptr)) ? _("歌", "singing") : _("呪文", "spelling"); + concptr str = (music_singing_any(creature_ptr)) ? _("歌", "singing") : _("呪文", "casting"); INTERUPTING_SONG_EFFECT(creature_ptr) = SINGING_SONG_EFFECT(creature_ptr); SINGING_SONG_EFFECT(creature_ptr) = MUSIC_NONE; msg_format(_("%sが途切れた。", "Your %s is interrupted."), str); -- 2.21.1 (Apple Git-122.3) From 414436e75d9d885472503c464343ab0a65ae54f5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 01:24:41 -0800 Subject: [PATCH 018/335] Corrected spelling mistake and subject/verb agreement in message about the distribution of stat values. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index 38c1fe2b..16ab5bcd 100644 --- a/src/birth.c +++ b/src/birth.c @@ -3274,7 +3274,7 @@ static bool get_chara_limits(player_type *creature_ptr) /* Prompt for the minimum stats */ put_str(_("2/4/6/8で項目選択、+/-で値の増減、Enterで次へ", "2/4/6/8 for Select, +/- for Change value, Enter for Goto next"), 11, 10); - put_str(_("注意:身長と体重の最大値/最小値ぎりぎりの値は非常に出現確率が低くなります。", "Caution: Values near minimum or maximum is extremery rare."), 23, 2); + put_str(_("注意:身長と体重の最大値/最小値ぎりぎりの値は非常に出現確率が低くなります。", "Caution: Values near minimum or maximum are extremely rare."), 23, 2); if (creature_ptr->psex == SEX_MALE) { -- 2.21.1 (Apple Git-122.3) From 686e1c289a9c9cd24322f868600e39290e76e5ca Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 01:54:04 -0800 Subject: [PATCH 019/335] Replaced "p_ptr->inventory_list" or "client_ptr->inventory_list" in English messages to the user with "inventory". --- src/autopick.c | 2 +- src/store.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 5b43b7ca..eb8c01b5 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -494,7 +494,7 @@ static GAME_TEXT MN_SEARCH[] = "Search"; static GAME_TEXT MN_SEARCH_STR[] = "Search by string"; static GAME_TEXT MN_SEARCH_FORW[] = "Search forward"; static GAME_TEXT MN_SEARCH_BACK[] = "Search backward"; -static GAME_TEXT MN_SEARCH_OBJ[] = "Search by inventory list object"; +static GAME_TEXT MN_SEARCH_OBJ[] = "Search by inventory object"; static GAME_TEXT MN_SEARCH_DESTROYED[] = "Search by destroyed object"; static GAME_TEXT MN_INSERT[] = "Insert..."; diff --git a/src/store.c b/src/store.c index 7d370ffb..3531ce48 100644 --- a/src/store.c +++ b/src/store.c @@ -4576,7 +4576,7 @@ static void store_process_command(player_type *client_ptr) /* 日本語版追加 */ /* 1 ページ戻るコマンド: 我が家のページ数が多いので重宝するはず By BUG */ if (st_ptr->stock_num <= store_bottom) { - msg_print(_("これで全部です。", "Entire client_ptr->inventory_list is shown.")); + msg_print(_("これで全部です。", "Entire inventory is shown.")); } else { store_top -= store_bottom; @@ -4593,7 +4593,7 @@ static void store_process_command(player_type *client_ptr) { if (st_ptr->stock_num <= store_bottom) { - msg_print(_("これで全部です。", "Entire client_ptr->inventory_list is shown.")); + msg_print(_("これで全部です。", "Entire inventory is shown.")); } else { -- 2.21.1 (Apple Git-122.3) From 8894e8ecdce85b8507e397fb9438c0b3cb8ed514 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 02:00:54 -0800 Subject: [PATCH 020/335] In the English version, the displayed player level in the main window wasn't alighed with the stats below it. --- src/view-mainwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c index 6466b767..0a96e23d 100644 --- a/src/view-mainwindow.c +++ b/src/view-mainwindow.c @@ -777,7 +777,7 @@ static void print_title(player_type *creature_ptr) static void print_level(player_type *creature_ptr) { char tmp[32]; - sprintf(tmp, "%5d", creature_ptr->lev); + sprintf(tmp, _("%5d", "%6d"), creature_ptr->lev); if (creature_ptr->lev >= creature_ptr->max_plv) { put_str(_("レベル ", "LEVEL "), ROW_LEVEL, 0); -- 2.21.1 (Apple Git-122.3) From 7d52d97f4c9dcc8575fe79bed9feda0215b2f07b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 10:34:50 -0800 Subject: [PATCH 021/335] Changed second half of riding message in English to be a recond action rather than a participle. --- src/monster-process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monster-process.c b/src/monster-process.c index ed3e3131..e3328352 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -1352,7 +1352,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx) if (is_riding_mon && riding_pinch < 2) { msg_format(_("%sは傷の痛さの余りあなたの束縛から逃れようとしている。", - "%^s seems to be in so much pain and trying to escape from your restriction."), m_name); + "%^s seems to be in so much pain and tries to escape from your restriction."), m_name); riding_pinch++; disturb(target_ptr, TRUE, TRUE); } -- 2.21.1 (Apple Git-122.3) From 754b88e05db2f2b005220e9f02ea95243cc3bbff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 10:58:15 -0800 Subject: [PATCH 022/335] For English message, replaced "did Seppuku" with "committed seppuku" since the literal English translation would be "committed ritual suicide". --- src/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/files.c b/src/files.c index 87ffdf34..ae0a50cd 100644 --- a/src/files.c +++ b/src/files.c @@ -3460,7 +3460,7 @@ void display_player(player_type *creature_ptr, int mode) #ifdef JP sprintf(statmsg, "…あなたは勝利の後%sした。", streq(creature_ptr->died_from, "Seppuku") ? "切腹" : "引退"); #else - sprintf(statmsg, "...You %s after winning.", streq(creature_ptr->died_from, "Seppuku") ? "did Seppuku" : "retired from the adventure"); + sprintf(statmsg, "...You %s after winning.", streq(creature_ptr->died_from, "Seppuku") ? "committed seppuku" : "retired from the adventure"); #endif } else if (!floor_ptr->dun_level) -- 2.21.1 (Apple Git-122.3) From 509b5fea6a9ff534afffcae1a3b1e06532677ea8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 11:05:11 -0800 Subject: [PATCH 023/335] Corrected English spelling mistake for "alignment" in character dumps and display of character virtues. --- src/cmd/cmd-dump.c | 2 +- src/files.c | 2 +- src/selfinfo.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index e89d9e06..77c9e115 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6159,7 +6159,7 @@ static void do_cmd_knowledge_virtues(player_type *creature_ptr) return; } - fprintf(fff, _("現在の属性 : %s\n\n", "Your alighnment : %s\n\n"), your_alignment(creature_ptr)); + fprintf(fff, _("現在の属性 : %s\n\n", "Your alignment : %s\n\n"), your_alignment(creature_ptr)); dump_virtues(creature_ptr, fff); my_fclose(fff); diff --git a/src/files.c b/src/files.c index ae0a50cd..f7139ab8 100644 --- a/src/files.c +++ b/src/files.c @@ -4259,7 +4259,7 @@ static void dump_aux_virtues(player_type *creature_ptr, FILE *fff) else fprintf(fff, "%s ???\n", stat_names[v_nr]); } - fprintf(fff, _("\n属性 : %s\n", "\nYour alighnment : %s\n"), your_alignment(creature_ptr)); + fprintf(fff, _("\n属性 : %s\n", "\nYour alignment : %s\n"), your_alignment(creature_ptr)); fprintf(fff, "\n"); dump_virtues(creature_ptr, fff); } diff --git a/src/selfinfo.c b/src/selfinfo.c index 39ab95b1..5dbcf04b 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -111,7 +111,7 @@ void self_knowledge(player_type *creature_ptr) } info[i++] = ""; - sprintf(Dummy, _("現在の属性 : %s(%ld)", "Your alighnment : %s(%ld)"), your_alignment(creature_ptr), (long int)creature_ptr->align); + sprintf(Dummy, _("現在の属性 : %s(%ld)", "Your alignment : %s(%ld)"), your_alignment(creature_ptr), (long int)creature_ptr->align); strcpy(buf[1], Dummy); info[i++] = buf[1]; for (v_nr = 0; v_nr < 8; v_nr++) -- 2.21.1 (Apple Git-122.3) From 8bf818bbc056b8ec5ca4b2638464837a0f5907da Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 11:30:10 -0800 Subject: [PATCH 024/335] Replaced "temporal" (i.e. time-dependent) with the more specific word, "temporary" (i.e. not permanent, fleeting, or transitory) in English comments and messages to reflect normal English usage. Also replaced the adverb form, "temporally", with "temporarily". --- src/floor-save.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/floor-save.c b/src/floor-save.c index 30ebc538..70fef0ba 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -862,7 +862,7 @@ void leave_floor(player_type *creature_ptr) /* New floor is not yet prepared */ new_floor_id = 0; - /* Temporary get a floor_id (for Arena) */ + /* Temporarily get a floor_id (for Arena) */ if (!creature_ptr->floor_id && (creature_ptr->change_floor_mode & CFM_SAVE_FLOORS) && !(creature_ptr->change_floor_mode & CFM_NO_RETURN)) -- 2.21.1 (Apple Git-122.3) From 921eaf746f99939a3a04567c093df972decc761a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 12:38:13 -0800 Subject: [PATCH 025/335] Slightly reworded the English messages about deleting old temporary files for clarity and grammar. --- src/floor-save.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/floor-save.c b/src/floor-save.c index 70fef0ba..a86c412f 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -97,9 +97,9 @@ void init_saved_floors(player_type *creature_ptr, bool force) { msg_print(_("エラー:古いテンポラリ・ファイルが残っています。", "Error: There are old temporary files.")); msg_print(_("変愚蛮怒を二重に起動していないか確認してください。", "Make sure you are not running two game processes simultaneously.")); - msg_print(_("過去に変愚蛮怒がクラッシュした場合は一時ファイルを", "If the temporary files are garbages of old crashed process, ")); - msg_print(_("強制的に削除して実行を続けられます。", "you can delete it safely.")); - if (!get_check(_("強制的に削除してもよろしいですか?", "Do you delete old temporary files? "))) + msg_print(_("過去に変愚蛮怒がクラッシュした場合は一時ファイルを", "If the temporary files are garbage from an old crashed process, ")); + msg_print(_("強制的に削除して実行を続けられます。", "you can delete them safely.")); + if (!get_check(_("強制的に削除してもよろしいですか?", "Do you delete the old temporary files? "))) quit(_("実行中止", "Aborted.")); force = TRUE; } -- 2.21.1 (Apple Git-122.3) From 353b172a1f526a23a89390653c060ae7a866dd0a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 12:41:16 -0800 Subject: [PATCH 026/335] In English messages for things that return when thrown, interface "come" before "back" in two places where it was missing. --- src/cmd/cmd-basic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index 949bae5d..ed101e20 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -2749,7 +2749,7 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID { if (item >= 0) { - msg_format(_("%sを受け損ねた!", "%s comes backs, but you can't catch!"), o2_name); + msg_format(_("%sを受け損ねた!", "%s comes back, but you can't catch!"), o2_name); } else { -- 2.21.1 (Apple Git-122.3) From 197ba785557551279d810d7fcc859791d81c68a7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:02:18 -0800 Subject: [PATCH 027/335] Since "something" is singular, changed "prevent" to "prevents" for subject/verb agreement. --- src/combat/melee1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combat/melee1.c b/src/combat/melee1.c index 9984ac1a..f530ced3 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -2213,7 +2213,7 @@ bool py_attack(player_type *attacker_ptr, POSITION y, POSITION x, COMBAT_OPTION_ if (d_info[attacker_ptr->dungeon_idx].flags1 & DF1_NO_MELEE) { - msg_print(_("なぜか攻撃することができない。", "Something prevent you from attacking.")); + msg_print(_("なぜか攻撃することができない。", "Something prevents you from attacking.")); return FALSE; } -- 2.21.1 (Apple Git-122.3) From 3910eb4584ab9ac122b5718acb020ff6794f9825 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:12:17 -0800 Subject: [PATCH 028/335] Reworded English message about pets affecting concentration to hopefully be more idiomatic. --- src/spells2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spells2.c b/src/spells2.c index 347b31ce..82ddbc9f 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -4446,7 +4446,7 @@ bool clear_mind(player_type *creature_ptr) { if (total_friends) { - msg_print(_("今はペットを操ることに集中していないと。", "You need concentration on the pets now.")); + msg_print(_("今はペットを操ることに集中していないと。", "Your pets demand all of your attention.")); return FALSE; } -- 2.21.1 (Apple Git-122.3) From c529e624a1ef7630b8fa28ec8fa14239875cbe92 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:19:30 -0800 Subject: [PATCH 029/335] Corrected English spelling mistake for "conversion". --- src/spells2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spells2.c b/src/spells2.c index 82ddbc9f..e10fddf5 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -4261,7 +4261,7 @@ bool double_attack(player_type *creature_ptr) bool comvert_hp_to_mp(player_type *creature_ptr) { - int gain_sp = take_hit(creature_ptr, DAMAGE_USELIFE, creature_ptr->lev, _("HPからMPへの無謀な変換", "thoughtless convertion from HP to SP"), -1) / 5; + int gain_sp = take_hit(creature_ptr, DAMAGE_USELIFE, creature_ptr->lev, _("HPからMPへの無謀な変換", "thoughtless conversion from HP to SP"), -1) / 5; if (!gain_sp) { msg_print(_("変換に失敗した。", "You failed to convert.")); -- 2.21.1 (Apple Git-122.3) From a833d4a3b32ac13d3ac73c9f697b9be404bb84b1 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:32:18 -0800 Subject: [PATCH 030/335] For the English message regarding KATA_IAI, matched verb tenses. --- src/combat/melee1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combat/melee1.c b/src/combat/melee1.c index f530ced3..263e76fc 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -2400,7 +2400,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) if (target_ptr->special_defense & KATA_IAI) { - msg_format(_("相手が襲いかかる前に素早く武器を振るった。", "You took sen, draw and cut in one motion before %s moved."), m_name); + msg_format(_("相手が襲いかかる前に素早く武器を振るった。", "You took sen, drew and cut in one motion before %s moved."), m_name); if (py_attack(target_ptr, m_ptr->fy, m_ptr->fx, HISSATSU_IAI)) return TRUE; } -- 2.21.1 (Apple Git-122.3) From 77ccebb2d3efb2a7087cb9c81f15fd61fe4e7815 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:36:36 -0800 Subject: [PATCH 031/335] Converted English counterattack message to a full sentence. --- src/combat/melee1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combat/melee1.c b/src/combat/melee1.c index 263e76fc..6a122f34 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -4069,7 +4069,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) monster_desc(target_ptr, m_target_name, m_ptr, 0); target_ptr->csp -= 7; - msg_format(_("%^sに反撃した!", "Your counterattacked to %s!"), m_target_name); + msg_format(_("%^sに反撃した!", "You counterattacked to %s!"), m_target_name); py_attack(target_ptr, m_ptr->fy, m_ptr->fx, HISSATSU_COUNTER); fear = FALSE; target_ptr->redraw |= (PR_MANA); -- 2.21.1 (Apple Git-122.3) From f192bd1f0bc8ba1652003f8a25afa14159c15bc2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:50:24 -0800 Subject: [PATCH 032/335] Changed English message for constitution loss due to disease to hopefully be more idiomatic. --- src/combat/melee1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/combat/melee1.c b/src/combat/melee1.c index 6a122f34..8866e190 100644 --- a/src/combat/melee1.c +++ b/src/combat/melee1.c @@ -3461,7 +3461,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx) bool perm = one_in_(10); if (dec_stat(target_ptr, A_CON, randint1(10), perm)) { - msg_print(_("病があなたを蝕んでいる気がする。", "You feel strange sickness.")); + msg_print(_("病があなたを蝕んでいる気がする。", "You feel sickly.")); obvious = TRUE; } } -- 2.21.1 (Apple Git-122.3) From eaa47f33f645fed197e92c3bf280d1d992bcf393 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 14:55:38 -0800 Subject: [PATCH 033/335] English message is missing string argument. Added it. --- src/spells1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spells1.c b/src/spells1.c index 635b3989..ef346a88 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1943,7 +1943,7 @@ static bool project_m(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI } if (MON_MONFEAR(m_ptr)) { - if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name); + if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name, m_poss); (void)set_monster_monfear(caster_ptr, g_ptr->m_idx, 0); } -- 2.21.1 (Apple Git-122.3) From 526519ae9068c5764806ecd32aa1a5e6aa9ecb84 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 19:00:46 -0800 Subject: [PATCH 034/335] Replaced "damages" with "damage" in English messages for hex spells since the latter works as well or better. In one instance, also changed the preposition immediately after "damages" to be more idiomatic. --- src/realm-hex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/realm-hex.c b/src/realm-hex.c index 70f2e4cb..f6c43f75 100644 --- a/src/realm-hex.c +++ b/src/realm-hex.c @@ -546,7 +546,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) } if (current_world_ptr->wizard) { - msg_format(_("%d点のダメージを返した。", "You return %d damages."), power); + msg_format(_("%d点のダメージを返した。", "You return %d damage."), power); } /* Reset */ @@ -609,7 +609,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 12: if (name) return _("魔剣化", "Swords to runeswords"); if (desc) return _("武器の攻撃力を上げる。切れ味を得、呪いに応じて与えるダメージが上昇し、善良なモンスターに対するダメージが2倍になる。", - "Gives vorpal ability to your weapon. Increases damages by your weapon acccording to curse of your weapon."); + "Gives vorpal ability to your weapon. Increases damage from your weapon acccording to curse of your weapon."); if (cast) { #ifdef JP @@ -837,7 +837,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 22: if (name) return _("苦痛を魔力に", "Pain to mana"); - if (desc) return _("視界内のモンスターに精神ダメージ与え、魔力を吸い取る。", "Deals psychic damages to all monsters in sight and drains some mana."); + if (desc) return _("視界内のモンスターに精神ダメージ与え、魔力を吸い取る。", "Deals psychic damage to all monsters in sight and drains some mana."); power = plev * 3 / 2; if (info) return info_damage(1, power, 0); if (cast || cont) @@ -1104,7 +1104,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) if (current_world_ptr->wizard) { - msg_format(_("%d点のダメージを返した。", "You return %d damages."), power); + msg_format(_("%d点のダメージを返した。", "You return %d damage."), power); } } else -- 2.21.1 (Apple Git-122.3) From 33ffbff8f185c01a4e109546a6e552590f691756 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 20:10:19 -0800 Subject: [PATCH 035/335] To match what's done in other spell descriptions, removed comma before "and" in list of effects in a spell description. --- src/realm-crusade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-crusade.c b/src/realm-crusade.c index 1cc9d741..db71e1c7 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -258,7 +258,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 15: if (name) return _("聖なる御言葉", "Holy Word"); if (desc) return _("視界内の邪悪な存在に大きなダメージを与え、体力を回復し、毒、恐怖、朦朧状態、負傷から全快する。", - "Damages all evil monsters in sight, heals HP somewhat, and completely cures fear, poisons, cuts, and being stunned."); + "Damages all evil monsters in sight, heals HP somewhat, and completely cures fear, poisons, cuts and being stunned."); { int dam_sides = plev * 6; -- 2.21.1 (Apple Git-122.3) From 8a2b0d59193727b0941b2fc0b68efa17e42679d8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 15 Dec 2019 21:14:13 -0800 Subject: [PATCH 036/335] "information" is it's own plural so dropped the "s". --- src/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.c b/src/util.c index 5d695799..373e46ce 100644 --- a/src/util.c +++ b/src/util.c @@ -3091,7 +3091,7 @@ menu_naiyou menu_info[10][10] = {"Items(other)", 4, FALSE}, {"Equip", 5, FALSE}, {"Door/Box", 6, FALSE}, - {"Informations", 7, FALSE}, + {"Information", 7, FALSE}, {"Options", 8, FALSE}, {"Other commands", 9, FALSE}, {"", 0, FALSE}, -- 2.21.1 (Apple Git-122.3) From 9b6d936291c9957bf628d730a2a1b8070eb97954 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 16 Dec 2019 18:22:14 -0800 Subject: [PATCH 037/335] Changed "effecting" to "affecting" in Engilsh message since the latter is appropriate for this case. --- src/mind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mind.c b/src/mind.c index 5fcff8f5..9da9bd4a 100644 --- a/src/mind.c +++ b/src/mind.c @@ -464,7 +464,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] = "Envelops you with a temporary aura that damages any monster which hits you in melee.", "Damages an adjacent monster and blows it away.", "Fires a large energy ball.", - "Dispels all magics which are effecting a monster.", + "Dispels all magics which are affecting a monster.", "Summons ghosts.", "Generates a huge ball of flame centered on you.", "Fires a long, powerful energy beam.", -- 2.21.1 (Apple Git-122.3) From 5040cf7463895c7b8f7efb1b6416b699749c7961 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 16 Dec 2019 21:01:19 -0800 Subject: [PATCH 038/335] Reworded the English description of the mindcrafter's detection ability to be similar to the other detection descriptions that were modified. Dropped the "more and more" since that didn't seem to add anything. --- src/mind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mind.c b/src/mind.c index 9da9bd4a..3f85a531 100644 --- a/src/mind.c +++ b/src/mind.c @@ -432,7 +432,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] = }, #else { - "Detects visible monsters in your vicinity and more and more. Detects traps and doors at level 5, invisible monsters at level 15, items at level 30. And magic mapping at level 20. Lights and know the whole level at level 45. Gives telepathy at level 25.", + "Detects visible monsters in your vicinity. Detects traps and doors at level 5, invisible monsters at level 15, and items at level 30. Gives telepathy at level 25. Magically maps the surroundings at level 20. Lights and reveals the whole level at level 45.", "Fires a beam or ball which inflicts PSI damage.", "Teleports you a short distance.", "Teleports you a long distance.", -- 2.21.1 (Apple Git-122.3) From bbfd320935661fc634dc57451f1791db29f36b4c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 16 Dec 2019 21:03:36 -0800 Subject: [PATCH 039/335] Added a "the" in the English description of the berserker detection spell in order to be more idiomatic. --- src/mind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mind.c b/src/mind.c index 3f85a531..b6e84d6d 100644 --- a/src/mind.c +++ b/src/mind.c @@ -478,7 +478,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] = "", }, { - "Detects all monsters except mindless in your vicinity.", + "Detects all monsters except the mindless in your vicinity.", "Attacks a monster with your weapons normally, then dodges to one side.", "Sets off a trap, then destroys that trap.", "Shakes dungeon structure, and results in random swapping of floors and walls.", -- 2.21.1 (Apple Git-122.3) From 00463e9cb44c64fdc935573569f982ca04b644ce Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 14:12:47 -0800 Subject: [PATCH 040/335] For English spell descriptions, most only use one space after a period. Change the handful of instances where two spaces were used. --- src/realm-death.c | 4 ++-- src/realm-life.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/realm-death.c b/src/realm-death.c index 9a2e5583..c7127d35 100644 --- a/src/realm-death.c +++ b/src/realm-death.c @@ -353,7 +353,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 15: if (name) return _("抹殺", "Genocide"); if (desc) return _("指定した文字のモンスターを現在の階から消し去る。抵抗されると無効。", - "Eliminates an entire class of monster, exhausting you. Powerful or unique monsters may resist."); + "Eliminates an entire class of monster, exhausting you. Powerful or unique monsters may resist."); { int power = plev + 50; @@ -584,7 +584,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 29: if (name) return _("周辺抹殺", "Mass Genocide"); if (desc) return _("自分の周囲にいるモンスターを現在の階から消し去る。抵抗されると無効。", - "Eliminates all nearby monsters, exhausting you. Powerful or unique monsters may be able to resist."); + "Eliminates all nearby monsters, exhausting you. Powerful or unique monsters may be able to resist."); { int power = plev + 50; diff --git a/src/realm-life.c b/src/realm-life.c index 7c3c070d..a0cf73bc 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -398,7 +398,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 26: if (name) return _("アンデッド消滅", "Annihilate Undead"); if (desc) return _("自分の周囲にいるアンデッドを現在の階から消し去る。抵抗されると無効。", - "Eliminates all nearby undead monsters, exhausting you. Powerful or unique monsters may be able to resist."); + "Eliminates all nearby undead monsters, exhausting you. Powerful or unique monsters may be able to resist."); { int power = plev + 50; -- 2.21.1 (Apple Git-122.3) From 84e9f9f792b93584b3dea6e0d40e166141cc6256 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 16:15:41 -0800 Subject: [PATCH 041/335] Removed comma from English descriptions of recall spells or abilities: only two phrases are joined by the conjunction and they are not independent. --- src/mind.c | 2 +- src/realm-arcane.c | 2 +- src/realm-life.c | 2 +- src/realm-sorcery.c | 2 +- src/realm-trump.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mind.c b/src/mind.c index b6e84d6d..672c1aae 100644 --- a/src/mind.c +++ b/src/mind.c @@ -518,7 +518,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] = "Attempts to slow, stun, confuse, scare, freeze all monsters in sight. Gets more power on a mirror.", "Recreates current dungeon level. Can only be used on a mirror.", "Teleports you to a given location.", - "Recalls player from dungeon to town, or from town to the deepest level of dungeon.", + "Recalls player from dungeon to town or from town to the deepest level of dungeon.", "Completely protects you from any attacks at one in two chance.", "Generates a magical triangle which damages all monsters in the area. The vertices of the triangle are you and two mirrors in sight.", "Generates a barrier which completely protects you from almost all damage. Takes a few your turns when the barrier breaks or duration time is exceeded.", diff --git a/src/realm-arcane.c b/src/realm-arcane.c index cbbdf915..4ad6a3f3 100644 --- a/src/realm-arcane.c +++ b/src/realm-arcane.c @@ -520,7 +520,7 @@ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode case 30: if (name) return _("帰還の呪文", "Word of Recall"); if (desc) return _("地上にいるときはダンジョンの最深階へ、ダンジョンにいるときは地上へと移動する。", - "Recalls player from dungeon to town, or from town to the deepest level of dungeon."); + "Recalls player from dungeon to town or from town to the deepest level of dungeon."); { int base = 15; diff --git a/src/realm-life.c b/src/realm-life.c index a0cf73bc..a4209eb0 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -318,7 +318,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 21: if (name) return _("帰還の詔", "Word of Recall"); - if (desc) return _("地上にいるときはダンジョンの最深階へ、ダンジョンにいるときは地上へと移動する。", "Recalls player from dungeon to town, or from town to the deepest level of dungeon."); + if (desc) return _("地上にいるときはダンジョンの最深階へ、ダンジョンにいるときは地上へと移動する。", "Recalls player from dungeon to town or from town to the deepest level of dungeon."); { int base = 15; diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c index c4e784a4..4ae7684c 100644 --- a/src/realm-sorcery.c +++ b/src/realm-sorcery.c @@ -386,7 +386,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 22: if (name) return _("帰還の呪文", "Word of Recall"); if (desc) return _("地上にいるときはダンジョンの最深階へ、ダンジョンにいるときは地上へと移動する。", - "Recalls player from dungeon to town, or from town to the deepest level of dungeon."); + "Recalls player from dungeon to town or from town to the deepest level of dungeon."); { int base = 15; diff --git a/src/realm-trump.c b/src/realm-trump.c index 942acd30..38c58279 100644 --- a/src/realm-trump.c +++ b/src/realm-trump.c @@ -298,7 +298,7 @@ concptr do_trump_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 14: if (name) return _("帰還の呪文", "Word of Recall"); if (desc) return _("地上にいるときはダンジョンの最深階へ、ダンジョンにいるときは地上へと移動する。", - "Recalls player from dungeon to town, or from town to the deepest level of dungeon."); + "Recalls player from dungeon to town or from town to the deepest level of dungeon."); { int base = 15; -- 2.21.1 (Apple Git-122.3) From b9bb738e234520cfedd17eaf70807b5d65c0e3b0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 16:19:44 -0800 Subject: [PATCH 042/335] Reworded English description for glyph of warding spells to make the conditional part an introductory phrase and to drop the comma before the conjunction. --- src/realm-life.c | 2 +- src/realm-song.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/realm-life.c b/src/realm-life.c index a4209eb0..b96d686b 100644 --- a/src/realm-life.c +++ b/src/realm-life.c @@ -235,7 +235,7 @@ concptr do_life_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 15: if (name) return _("結界の紋章", "Glyph of Warding"); if (desc) return _("自分のいる床の上に、モンスターが通り抜けたり召喚されたりすることができなくなるルーンを描く。", - "Sets a glyph on the floor beneath you. Monsters cannot attack you if you are on a glyph, but can try to break glyph."); + "Sets a glyph on the floor beneath you. If you are on a glyph, monsters cannot attack you but can try to break the glyph."); { if (cast) diff --git a/src/realm-song.c b/src/realm-song.c index 50bfd8cd..4f39a16d 100644 --- a/src/realm-song.c +++ b/src/realm-song.c @@ -767,7 +767,7 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 26: if (name) return _("守りの歌", "Endurance"); if (desc) return _("自分のいる床の上に、モンスターが通り抜けたり召喚されたりすることができなくなるルーンを描く。", - "Sets a glyph on the floor beneath you. Monsters cannot attack you if you are on a glyph, but can try to break glyph."); + "Sets a glyph on the floor beneath you. If you are on a glyph, monsters cannot attack you but can try to break the glyph."); { /* Stop singing before start another */ -- 2.21.1 (Apple Git-122.3) From 64b2e3b0e22f5b28380edfcdd150fa23a3a471c6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 16:24:02 -0800 Subject: [PATCH 043/335] Reworded English description of clairvoyance: previous version was missing possesive in second sentence and had unnecessary "and". --- src/realm-arcane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-arcane.c b/src/realm-arcane.c index 4ad6a3f3..f7ad583b 100644 --- a/src/realm-arcane.c +++ b/src/realm-arcane.c @@ -538,7 +538,7 @@ concptr do_arcane_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode case 31: if (name) return _("千里眼", "Clairvoyance"); if (desc) return _("その階全体を永久に照らし、ダンジョン内すべてのアイテムを感知する。さらに、一定時間テレパシー能力を得る。", - "Maps and lights whole dungeon level. Knows all objects location. And gives telepathy for a while."); + "Maps and lights whole dungeon level. Reveals locations of all objects. Gives telepathy for a while."); { int base = 25; -- 2.21.1 (Apple Git-122.3) From 3b61eea5fb8f4de4342de4e2001ae3b6b222c92e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 12:36:52 -0800 Subject: [PATCH 044/335] Changed English description for "Elemental Branding" to use a more specific verb. --- src/realm-nature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-nature.c b/src/realm-nature.c index 24602358..19c8f87b 100644 --- a/src/realm-nature.c +++ b/src/realm-nature.c @@ -539,7 +539,7 @@ concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode case 30: if (name) return _("精霊の刃", "Elemental Branding"); - if (desc) return _("武器に炎か冷気の属性をつける。", "Makes current weapon fire or frost branded."); + if (desc) return _("武器に炎か冷気の属性をつける。", "Brands current weapon with fire or frost."); { if (cast) -- 2.21.1 (Apple Git-122.3) From fbe81a4210e9b22c36502b5d0ace999829067f17 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 16:43:59 -0800 Subject: [PATCH 045/335] Changed second sentence of the English description for "Vampire's Fang" to a complete clause. --- src/realm-hissatsu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index 4a6a486a..2f9e5baa 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -717,7 +717,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo case 24: if (name) return _("吸血鬼の牙", "Vampire's Fang"); if (desc) return _("攻撃した相手の体力を吸いとり、自分の体力を回復させる。生命を持たないモンスターには通じない。", - "Attacks with vampiric strikes which absorb HP from a monster and heal you. Has no effect to unliving monsters."); + "Attacks with vampiric strikes which absorb HP from a monster and heal you. Has no effect on unliving monsters."); if (cast) { -- 2.21.1 (Apple Git-122.3) From e8d7ba1997b59064702e643a7fad4bcf45680235 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 17:19:20 -0800 Subject: [PATCH 046/335] Replaced "effect" (used as a verb) with "affect" in two English spell descriptions where "affect" is the right word to use. --- src/realm-crusade.c | 2 +- src/realm-hissatsu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/realm-crusade.c b/src/realm-crusade.c index db71e1c7..61edc29d 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -154,7 +154,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 9: if (name) return _("聖なる光球", "Holy Orb"); if (desc) return _("聖なる力をもつ宝珠を放つ。邪悪なモンスターに対して大きなダメージを与えるが、善良なモンスターには効果がない。", - "Fires a ball with holy power. Hurts evil monsters greatly, but doesn't effect good monsters."); + "Fires a ball with holy power. Hurts evil monsters greatly, but doesn't affect good monsters."); { DICE_NUMBER dice = 3; diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index 2f9e5baa..f33b21df 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -849,7 +849,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo case 29: if (name) return _("虎伏絶刀勢", "Kofuku-Zettousei"); - if (desc) return _("強力な攻撃を行い、近くの場所にも効果が及ぶ。", "Performs a powerful attack which even effects nearby monsters."); + if (desc) return _("強力な攻撃を行い、近くの場所にも効果が及ぶ。", "Performs a powerful attack which even affects nearby monsters."); if (cast) { -- 2.21.1 (Apple Git-122.3) From 9c12d1913cb58d18593c772c52e2eb6f4d51551c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 17:37:15 -0800 Subject: [PATCH 047/335] Reworded English descriptions of heroism-like spells to make it clear the HP boost isn't a timed effect. --- src/realm-craft.c | 2 +- src/realm-crusade.c | 2 +- src/realm-daemon.c | 2 +- src/realm-song.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/realm-craft.c b/src/realm-craft.c index 58e47e2e..3d6129a2 100644 --- a/src/realm-craft.c +++ b/src/realm-craft.c @@ -110,7 +110,7 @@ concptr do_craft_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 5: if (name) return _("士気高揚", "Heroism"); - if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear, and gives a bonus to hit and 10 more HP for a while."); + if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear. Gives a bonus to hit for a while. Heals you for 10 HP."); { int base = 25; diff --git a/src/realm-crusade.c b/src/realm-crusade.c index 61edc29d..e55ecd55 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -420,7 +420,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 24: if (name) return _("士気高揚", "Heroism"); - if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear, and gives a bonus to hit and 10 more HP for a while."); + if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear. Gives a bonus to hit for a while. Heals you for 10 HP."); { int base = 25; diff --git a/src/realm-daemon.c b/src/realm-daemon.c index 3dd9085b..575c70e3 100644 --- a/src/realm-daemon.c +++ b/src/realm-daemon.c @@ -465,7 +465,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode case 24: if (name) return _("士気高揚", "Raise the Morale"); - if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear, and gives bonus to hit and 10 more HP for a while."); + if (desc) return _("一定時間、ヒーロー気分になる。", "Removes fear. Gives a bonus to hit for a while. Heals you for 10 HP."); { int base = 25; diff --git a/src/realm-song.c b/src/realm-song.c index 4f39a16d..d7f83cbb 100644 --- a/src/realm-song.c +++ b/src/realm-song.c @@ -231,7 +231,7 @@ concptr do_music_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode) case 7: if (name) return _("戦いの歌", "Heroic Ballad"); - if (desc) return _("ヒーロー気分になる。", "Removes fear, and gives bonus to hit and 10 more HP for a while."); + if (desc) return _("ヒーロー気分になる。", "Removes fear. Gives a bonus to hit for a while. Heals you for 10 HP."); /* Stop singing before start another */ if (cast || fail) stop_singing(caster_ptr); -- 2.21.1 (Apple Git-122.3) From d017d3c36c40c3a1bc2fc62d71f111f797bdbced Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 12:25:42 -0800 Subject: [PATCH 048/335] In English description, changed last verb to past tense since the player was damaged at the point that the monster takes damage. --- src/realm-crusade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-crusade.c b/src/realm-crusade.c index e55ecd55..7930aad7 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -481,7 +481,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 28: if (name) return _("目には目を", "An Eye for an Eye"); if (desc) return _("一定時間、自分がダメージを受けたときに攻撃を行ったモンスターに対して同等のダメージを与える。", - "Gives special aura for a while. When you are attacked by a monster, the monster is injured with same amount of damage as you take."); + "Gives special aura for a while. When you are attacked by a monster, the monster is injured with same amount of damage as you took."); { int base = 10; -- 2.21.1 (Apple Git-122.3) From 4e91bf6f3b14bfbf3114d40717691588502bd667 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 12:28:32 -0800 Subject: [PATCH 049/335] Changed one "which" to "that" in the English description of "Holy Aura" so the result is hopefully easier to read. --- src/realm-crusade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-crusade.c b/src/realm-crusade.c index 7930aad7..5942397f 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -311,7 +311,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 18: if (name) return _("聖なるオーラ", "Holy Aura"); if (desc) return _("一定時間、邪悪なモンスターを傷つける聖なるオーラを得る。", - "Gives aura of holy power which injures evil monsters which attacked you for a while."); + "Gives aura of holy power that injures evil monsters which attacked you for a while."); { int base = 20; -- 2.21.1 (Apple Git-122.3) From 7ac5521d7b94d4b5672e54bfbfae13581bcdbb01 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 17:42:33 -0800 Subject: [PATCH 050/335] In English description for "Holy Orb" corrected subject verb agreement in second sentence and remove comma before conjunction since there's only two things joined. --- src/realm-crusade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/realm-crusade.c b/src/realm-crusade.c index 5942397f..1b8aeb79 100644 --- a/src/realm-crusade.c +++ b/src/realm-crusade.c @@ -154,7 +154,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod case 9: if (name) return _("聖なる光球", "Holy Orb"); if (desc) return _("聖なる力をもつ宝珠を放つ。邪悪なモンスターに対して大きなダメージを与えるが、善良なモンスターには効果がない。", - "Fires a ball with holy power. Hurts evil monsters greatly, but doesn't affect good monsters."); + "Fires a ball with holy power. Hurts evil monsters greatly but doesn't affect good monsters."); { DICE_NUMBER dice = 3; -- 2.21.1 (Apple Git-122.3) From 915571ee9cdf5c84c427f75b48a16f5472669cc4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 20 Oct 2019 10:12:16 -0700 Subject: [PATCH 051/335] Changed *Slay* Evil multiplier to match what's in melee1.c. --- lib/help/attack.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/help/attack.txt b/lib/help/attack.txt index 990ab27b..57ea9c75 100644 --- a/lib/help/attack.txt +++ b/lib/help/attack.txt @@ -323,7 +323,7 @@ Weapon of *Slay* Animal Weapon of *Slay* Evil This weapon is especially effective against evil creatures and - will inflict damage with two times the normal dice against such + will inflict damage with 3.5 times the normal dice against such creatures, and allows wielder to sense the presence of evil creatures. It will increase your wisdom and will also be a blessed blade. -- 2.21.1 (Apple Git-122.3) From 603ec4bccd3450a7b8054935b69044f2361d7fda Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 20 Oct 2019 09:33:56 -0700 Subject: [PATCH 052/335] Corrected typos in English autopick header. --- src/autopick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autopick.c b/src/autopick.c index eb8c01b5..2c8c368a 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -2156,7 +2156,7 @@ bool autopick_autoregister(player_type *player_ptr, object_type *o_ptr) fprintf(pref_fff, "%s\n", autoregister_header); fprintf(pref_fff, "%s\n", _("# *警告!!* 以降の行は自動登録されたものです。", - "# *Warning!* The lines below will be deleated later.")); + "# *Warning!* The lines below will be deleted later.")); fprintf(pref_fff, "%s\n", _("# 後で自動的に削除されますので、必要な行は上の方へ移動しておいてください。", "# Keep it by cut & paste if you need these lines for future characters.")); player_ptr->autopick_autoregister = TRUE; -- 2.21.1 (Apple Git-122.3) From e9455af1031c628fbf67c88c47f5216e86a1903e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 20 Oct 2019 10:13:00 -0700 Subject: [PATCH 053/335] Changed the multipliers listed for slays and brands to match what's in melee1.c. --- lib/help/tang.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/help/tang.txt b/lib/help/tang.txt index 98f5e6e8..72c60680 100644 --- a/lib/help/tang.txt +++ b/lib/help/tang.txt @@ -465,7 +465,7 @@ rundown on slays: (x5 for *Slay*) damage dice against the relevant monster type The brands ("of Melting", "of Burning", "of Freezing", "of Shocking", -and "of Poisoning") all do x2 damage dice to those monsters not +and "of Poisoning") all do x2.5 damage dice to those monsters not resistant to the relevant element. There is also a "(Vampiric)" brand which will suck life from your foes and heal you at the same time and a "(Chaotic)" brand which can cause some unexpected results when using -- 2.21.1 (Apple Git-122.3) From 1c29785531e86e31ea0befba541ad72cbdd803f1 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:03:41 -0800 Subject: [PATCH 054/335] Corrected spelling mistake in message about a ninja ability. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 5dbcf04b..1189011f 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -522,7 +522,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_NINJA: if (plev > 19) { - info[i++] = _("あなたは素早く移動することができる。", "You can walk extremery fast."); + info[i++] = _("あなたは素早く移動することができる。", "You can walk extremely fast."); } break; } -- 2.21.1 (Apple Git-122.3) From b848d74427a3efa30e86cd191a338491e0427ff5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:06:09 -0800 Subject: [PATCH 055/335] Corrected subject/verb agreement in English message for paladin's special ability. --- src/selfinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 1189011f..15edade3 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -418,14 +418,14 @@ void self_knowledge(player_type *creature_ptr) { if (plev > 29) { - info[i++] = _("あなたは聖なる槍を放つことができる。(30 MP)", "You can fires a holy spear (cost 30)."); + info[i++] = _("あなたは聖なる槍を放つことができる。(30 MP)", "You can fire a holy spear (cost 30)."); } } else { if (plev > 29) { - info[i++] = _("あなたは生命力を減少させる槍を放つことができる。(30 MP)", "You can fires a spear which drains vitality (cost 30)."); + info[i++] = _("あなたは生命力を減少させる槍を放つことができる。(30 MP)", "You can fire a spear which drains vitality (cost 30)."); } } break; -- 2.21.1 (Apple Git-122.3) From 4663883eb151f38007076c94f1681fea4b2cd346 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:09:49 -0800 Subject: [PATCH 056/335] Added "can" to English message for half-troll special ability to match what is done for other special abilities. Added an indefinite article to the English message fro the barbarian and half-troll special abilities so they are more idiomatic. --- src/selfinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 15edade3..c0eab34c 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -221,7 +221,7 @@ void self_knowledge(player_type *creature_ptr) break; case RACE_HALF_TROLL: if (plev > 9) - info[i++] = _("あなたは狂暴化することができる。(12 MP) ", "You enter berserk fury (cost 12)."); + info[i++] = _("あなたは狂暴化することができる。(12 MP) ", "You can enter a berserk fury (cost 12)."); break; case RACE_AMBERITE: if (plev > 29) @@ -233,7 +233,7 @@ void self_knowledge(player_type *creature_ptr) break; case RACE_BARBARIAN: if (plev > 7) - info[i++] = _("あなたは狂暴化することができる。(10 MP) ", "You can enter berserk fury (cost 10)."); + info[i++] = _("あなたは狂暴化することができる。(10 MP) ", "You can enter a berserk fury (cost 10)."); break; case RACE_HALF_OGRE: -- 2.21.1 (Apple Git-122.3) From 51dc0d1165d7ed213eac789799138fb2b151f10b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:12:10 -0800 Subject: [PATCH 057/335] Corrected spelling mistake ("prove" instead of "probe") for English messages about a ranger's special ability. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index c0eab34c..0ea97e81 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -410,7 +410,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_RANGER: if (plev > 14) { - info[i++] = _("あなたは怪物を調査することができる。(20 MP)", "You can prove monsters (cost 20)."); + info[i++] = _("あなたは怪物を調査することができる。(20 MP)", "You can probe monsters (cost 20)."); } break; case CLASS_PALADIN: -- 2.21.1 (Apple Git-122.3) From d144a1f7056019aea5a1bfe38e9eaf35995b870c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:14:43 -0800 Subject: [PATCH 058/335] Corrected subject/verb agreement in English message about priests' special ability. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 0ea97e81..e8120e7f 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -397,7 +397,7 @@ void self_knowledge(player_type *creature_ptr) { if (plev > 41) { - info[i++] = _("あなたは周りのすべてのモンスターを攻撃することができる。(40 MP)", "You can damages all monsters in sight (cost 40)."); + info[i++] = _("あなたは周りのすべてのモンスターを攻撃することができる。(40 MP)", "You can damage all monsters in sight (cost 40)."); } } break; -- 2.21.1 (Apple Git-122.3) From 84489736f6eb649b6929b6a7325bea2aaddfb0db Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:19:32 -0800 Subject: [PATCH 059/335] Replaced "at a time", "in a time", or "in one time" with "simultaneously" or "at the same time" since those are clearer English. --- src/selfinfo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index e8120e7f..db7b1799 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -372,7 +372,7 @@ void self_knowledge(player_type *creature_ptr) if (plev > 39) { info[i++] = _("あなたはランダムな方向に対して数回攻撃することができる。(75 MP)", - "You can attack some random directions at a time (cost 75)."); + "You can attack some random directions simultaneously (cost 75)."); } break; case CLASS_HIGH_MAGE: @@ -404,7 +404,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_ROGUE: if (plev > 7) { - info[i++] = _("あなたは攻撃して即座に逃げることができる。(12 MP)", "You can hit a monster and teleport at a time (cost 12)."); + info[i++] = _("あなたは攻撃して即座に逃げることができる。(12 MP)", "You can hit a monster and teleport away simultaneously (cost 12)."); } break; case CLASS_RANGER: @@ -450,7 +450,7 @@ void self_knowledge(player_type *creature_ptr) } if (plev > 29) { - info[i++] = _("あなたは通常の2倍の攻撃を行うことができる。(30 MP)", "You can perform double attacks in a time (cost 30)."); + info[i++] = _("あなたは通常の2倍の攻撃を行うことができる。(30 MP)", "You can perform two attacks at the same time (cost 30)."); } break; case CLASS_MINDCRAFTER: @@ -488,7 +488,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_RED_MAGE: if (plev > 47) { - info[i++] = _("あなたは1ターンに2回魔法を唱えることができる。(20 MP)", "You can cast two spells in one time (cost 20)."); + info[i++] = _("あなたは1ターンに2回魔法を唱えることができる。(20 MP)", "You can cast two spells simultaneously (cost 20)."); } break; case CLASS_SAMURAI: -- 2.21.1 (Apple Git-122.3) From 99bb475ca67ef2e1a81fe63f66009175d82aa04a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:21:33 -0800 Subject: [PATCH 060/335] Shifted the position of an adverb and added an indefinite article to have a clearer English message for the cavalry special ability. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index db7b1799..20df3b23 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -506,7 +506,7 @@ void self_knowledge(player_type *creature_ptr) case CLASS_CAVALRY: if (plev > 9) { - info[i++] = _("あなたはモンスターに乗って無理矢理ペットにすることができる。", "You can ride on a hostile monster forcibly to turn it into pet."); + info[i++] = _("あなたはモンスターに乗って無理矢理ペットにすることができる。", "You can ride on a hostile monster to forcibly turn it into a pet."); } break; case CLASS_BERSERKER: -- 2.21.1 (Apple Git-122.3) From 7256f72d5188f0b7df73f13a4418020404ed9c92 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:23:59 -0800 Subject: [PATCH 061/335] Shifted phrase in English message to make it clearer that it applies to the subject of the sentence and not the object. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 20df3b23..f2efccde 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -560,7 +560,7 @@ void self_knowledge(player_type *creature_ptr) if (creature_ptr->muta1 & MUT1_VAMPIRISM) { info[i++] = _("あなたは吸血鬼のように敵から生命力を吸収することができる。(ダメージ レベルX2)", - "You can drain life from a foe like a vampire (dam lvl * 2)."); + "Like a vampire, you can drain life from a foe (dam lvl * 2)."); } if (creature_ptr->muta1 & MUT1_SMELL_MET) { -- 2.21.1 (Apple Git-122.3) From 45f39ea34a19a54303cbf395a58b921297f81b70 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:27:00 -0800 Subject: [PATCH 062/335] For clarity, replaced "are" and a gerund phrase with an active verb in two English descriptions for mutations. --- src/selfinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index f2efccde..9b52cc2c 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -672,7 +672,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->muta2 & MUT2_RTELEPORT) { - info[i++] = _("あなたはランダムにテレポートする。", "You are teleporting randomly."); + info[i++] = _("あなたはランダムにテレポートする。", "You may randomly teleport."); } if (creature_ptr->muta2 & MUT2_ALCOHOL) { @@ -688,7 +688,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->muta2 & MUT2_PROD_MANA) { - info[i++] = _("あなたは制御不能な魔法のエネルギーを発している。", "You are producing magical energy uncontrollably."); + info[i++] = _("あなたは制御不能な魔法のエネルギーを発している。", "You produce magical energy uncontrollably."); } if (creature_ptr->muta2 & MUT2_ATT_DEMON) { -- 2.21.1 (Apple Git-122.3) From ec46072d96bf23ce761ead6d4cc1c49f85070a70 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 19:29:55 -0800 Subject: [PATCH 063/335] For English message, added an article for "albino" since it is a noun. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 9b52cc2c..91e18d41 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -820,7 +820,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->muta3 & MUT3_ALBINO) { - info[i++] = _("あなたはアルビノだ。(耐久-4)", "You are albino (-4 CON)."); + info[i++] = _("あなたはアルビノだ。(耐久-4)", "You are an albino (-4 CON)."); } if (creature_ptr->muta3 & MUT3_FLESH_ROT) { -- 2.21.1 (Apple Git-122.3) From cc61d8ecac63cccfd297996626454d99a67aa772 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 22:03:46 -0800 Subject: [PATCH 064/335] Change "a" to "an" in front of something starting with a vowel. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index 91e18d41..e6668d6d 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -1192,7 +1192,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->tim_sh_touki) { - info[i++] = _("あなたは闘気のオーラに包まれている。", "You are surrounded with a energy aura."); + info[i++] = _("あなたは闘気のオーラに包まれている。", "You are surrounded with an energy aura."); } if (creature_ptr->anti_magic) { -- 2.21.1 (Apple Git-122.3) From 632d7c68b59fb5a2d0d93631b0e5ca8e8084727c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 22:07:01 -0800 Subject: [PATCH 065/335] Reworded English message for curse that cuases spells to fail more often. --- src/selfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index e6668d6d..ad21269a 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -1006,7 +1006,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->cursed & TRC_LOW_MAGIC) { - info[i++] = _("あなたは魔法を失敗しやすい。", "You are subject to fail spellcasting."); + info[i++] = _("あなたは魔法を失敗しやすい。", "Your spells fail more frequently."); } if (creature_ptr->cursed & TRC_FAST_DIGEST) { -- 2.21.1 (Apple Git-122.3) From bcc800549d3fe9549b134c290adc20596a2634c4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 22:09:28 -0800 Subject: [PATCH 066/335] Reworded English messages for having one of the draining curses since the previous ones gave little indication about what was affected. --- src/selfinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/selfinfo.c b/src/selfinfo.c index ad21269a..1ceeef05 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -962,7 +962,7 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->cursed & TRC_DRAIN_EXP) { - info[i++] = _("あなたは経験値を吸われている。", "You are drained."); + info[i++] = _("あなたは経験値を吸われている。", "You occasionally lose experience for no reason."); } if (creature_ptr->cursed & TRC_SLOW_REGEN) { @@ -1014,11 +1014,11 @@ void self_knowledge(player_type *creature_ptr) } if (creature_ptr->cursed & TRC_DRAIN_HP) { - info[i++] = _("あなたは体力を吸われている。", "You are drained."); + info[i++] = _("あなたは体力を吸われている。", "You occasionally lose hit points for no reason."); } if (creature_ptr->cursed & TRC_DRAIN_MANA) { - info[i++] = _("あなたは魔力を吸われている。", "You brain is drained."); + info[i++] = _("あなたは魔力を吸われている。", "You occasionally lose spell points for no reason."); } if (is_blessed(creature_ptr)) { -- 2.21.1 (Apple Git-122.3) From fba92e49b6577d3ed4032e2f3f2dca7453cab7a6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 22:45:48 -0800 Subject: [PATCH 067/335] Corrected spelling mistake in English message about an action being prevented by stunning. --- src/cmd/cmd-basic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index ed101e20..dc3c76c7 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -137,7 +137,7 @@ bool cmd_limit_stun(player_type *creature_ptr) { if (creature_ptr->stun) { - msg_print(_("頭が朦朧としていて集中できない!", "You are too stuned!")); + msg_print(_("頭が朦朧としていて集中できない!", "You are too stunned!")); return TRUE; } return FALSE; -- 2.21.1 (Apple Git-122.3) From 9dfe329ab5d85f74c64e1ef048e36489fec58f37 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:02:38 -0800 Subject: [PATCH 068/335] Removed unneeded capitalization in English message. --- src/cmd/cmd-activate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-activate.c b/src/cmd/cmd-activate.c index 4bf735f0..35a9d4f5 100644 --- a/src/cmd/cmd-activate.c +++ b/src/cmd/cmd-activate.c @@ -1142,7 +1142,7 @@ bool activate_artifact(player_type *user_ptr, object_type *o_ptr) { if (o_ptr->name1 == ART_HYOUSIGI) { - msg_print(_("拍子木を打った。", "You beat Your wooden clappers.")); + msg_print(_("拍子木を打った。", "You beat your wooden clappers.")); } else { -- 2.21.1 (Apple Git-122.3) From 11fb30bb5080e287456712ee4fe2a81649a02fdd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:10:06 -0800 Subject: [PATCH 069/335] Corrected English spelling mistake in diary entry message. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 77c9e115..33c84f4d 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -881,7 +881,7 @@ static void do_cmd_last_get(player_type *creaute_ptr) GAME_TURN turn_tmp = current_world_ptr->game_turn; current_world_ptr->game_turn = record_turn; - sprintf(buf, _("%sを手に入れた。", "descover %s."), record_o_name); + sprintf(buf, _("%sを手に入れた。", "discover %s."), record_o_name); exe_write_diary(creaute_ptr, DIARY_DESCRIPTION, 0, buf); current_world_ptr->game_turn = turn_tmp; } -- 2.21.1 (Apple Git-122.3) From 06b521139d455ae6b1ba6485255e873c5a0488c2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:17:56 -0800 Subject: [PATCH 070/335] Changed "Ambertite" to "Amberite" in English monster group listing. --- src/cmd/cmd-dump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 33c84f4d..2b5cb952 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -2920,7 +2920,7 @@ static concptr monster_group_text[] = "ユニーク", /* "Uniques" */ "乗馬可能なモンスター", /* "Riding" */ "賞金首", /* "Wanted */ - "アンバーの王族", /* "Ambertite" */ + "アンバーの王族", /* "Amberite" */ "アリ", "コウモリ", "ムカデ", @@ -2981,7 +2981,7 @@ static concptr monster_group_text[] = "Uniques", "Ridable monsters", "Wanted monsters", - "Ambertite", + "Amberite", "Ant", "Bat", "Centipede", -- 2.21.1 (Apple Git-122.3) From 2e8945ebed66d30d75ff9d10200d075ca3c44e3d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:28:03 -0800 Subject: [PATCH 071/335] Added possesive for "today" in the English display of the daily wanted monster. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 2b5cb952..f2ec1461 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6115,7 +6115,7 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr) return; } - fprintf(fff, _("今日のターゲット : %s\n", "Today target : %s\n"), + fprintf(fff, _("今日のターゲット : %s\n", "Today's target : %s\n"), (creature_ptr->today_mon ? r_name + r_info[creature_ptr->today_mon].name : _("不明", "unknown"))); fprintf(fff, "\n"); fprintf(fff, _("賞金首リスト\n", "List of wanted monsters\n")); -- 2.21.1 (Apple Git-122.3) From 757a86603dd870657ac43d8a7d77091475114fa1 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:29:13 -0800 Subject: [PATCH 072/335] Changed English message for an empty wanted monster list to be more idiomatic. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index f2ec1461..79344a73 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6133,7 +6133,7 @@ static void do_cmd_knowledge_bounty(player_type *creature_ptr) if (!listed) { - fprintf(fff, "\n%s\n", _("賞金首はもう残っていません。", "There is no more wanted monster.")); + fprintf(fff, "\n%s\n", _("賞金首はもう残っていません。", "There are no more wanted monster.")); } my_fclose(fff); -- 2.21.1 (Apple Git-122.3) From faa46dd78822bfc2111713728b726aeca275626d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 17 Dec 2019 23:35:16 -0800 Subject: [PATCH 073/335] Changed English description for "find the exit" quests to be more idiomatic and dropped unneeded capitalization. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 79344a73..94c4f916 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6337,7 +6337,7 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff sprintf(note, _("\n - %sを見つけ出す。", "\n - Find out %s."), name); break; case QUEST_TYPE_FIND_EXIT: - sprintf(note, _(" - 出口に到達する。", " - Reach to Exit.")); + sprintf(note, _(" - 出口に到達する。", " - Reach exit.")); break; case QUEST_TYPE_KILL_NUMBER: -- 2.21.1 (Apple Git-122.3) From 9c242da3b44168990f20d9b0a73a2a4dd572c785 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 00:37:06 -0800 Subject: [PATCH 074/335] Corrected English spelling: "targetting" to "targeting". --- lib/help/jversion.txt | 2 +- lib/help/option.txt | 2 +- src/cmd/cmd-gameoption.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/help/jversion.txt b/lib/help/jversion.txt index 81cbb2c9..0892775f 100644 --- a/lib/help/jversion.txt +++ b/lib/help/jversion.txt @@ -1743,7 +1743,7 @@ Official Angband Home Page で確認することができます。 an underlying keyset refueling torches better monster memory - nicer targetting mode + nicer targeting mode object stacking the recall window the choice window diff --git a/lib/help/option.txt b/lib/help/option.txt index f731f7ff..3d05cd6b 100644 --- a/lib/help/option.txt +++ b/lib/help/option.txt @@ -93,7 +93,7 @@ Prompt before exiting a quest level [confirm_quest] you go up the stairs from such quest levels. ***** -Allow targetting pets [target_pet] +Allow targeting pets [target_pet] Normally, the program doesn't automatically choose pets as target in the targeting mode of attack spells. If this option is set, the program always chooses every monster in sight as target. diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 4d308693..8cbd669c 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -27,7 +27,7 @@ bool always_repeat; /* Repeat obvious commands */ bool confirm_destroy; /* Prompt for destruction of known worthless items */ bool confirm_wear; /* Confirm to wear/wield known cursed items */ bool confirm_quest; /* Prompt before exiting a quest level */ -bool target_pet; /* Allow targetting pets */ +bool target_pet; /* Allow targeting pets */ bool easy_open; /* Automatically open doors */ bool easy_disarm; /* Automatically disarm traps */ bool easy_floor; /* Display floor stacks in a list */ @@ -263,7 +263,7 @@ const option_type option_info[] = "confirm_quest", _("クエストを諦めて階段で逃げる前に確認する", "Prompt before exiting a quest level") }, { &target_pet, FALSE, OPT_PAGE_INPUT, 2, 5, - "target_pet", _("ペットをターゲットにする", "Allow targetting pets") }, + "target_pet", _("ペットをターゲットにする", "Allow targeting pets") }, { &easy_open, TRUE, OPT_PAGE_INPUT, 5, 7, "easy_open", _("自動的にドアを開ける", "Automatically open doors") }, -- 2.21.1 (Apple Git-122.3) From f354033f496d8233a4bd2eff1f5d433accb854fb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 00:46:55 -0800 Subject: [PATCH 075/335] Changed English description of ignore_unview option to be closer to what Google Translate gives for the Japanese description: that is clearer than what was the English description. --- src/cmd/cmd-gameoption.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 8cbd669c..4c2cb984 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -372,7 +372,7 @@ const option_type option_info[] = "exp_need", _("次のレベルに必要な経験値を表示する", "Show the experience needed for next level") }, { &ignore_unview, FALSE, OPT_PAGE_TEXT, 2, 13, - "ignore_unview", _("視界外のモンスターの行動を表示しない", "Ignore whenever any monster does") }, + "ignore_unview", _("視界外のモンスターの行動を表示しない", "Ignore out-of-sight monster behavior") }, { &show_ammo_detail, TRUE, OPT_PAGE_TEXT, 2, 14, "show_ammo_detail", _("矢弾のダメージの説明を表示する", "Show description of ammo damage") }, -- 2.21.1 (Apple Git-122.3) From 7c8f6964fd8fc07641ff2f95fb014721f3fbad37 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 00:55:32 -0800 Subject: [PATCH 076/335] To be more idiomatic, replace "while continuous command" with "while in repeated command" in English descriptions. --- src/cmd/cmd-gameoption.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 4c2cb984..9bed498c 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -47,7 +47,7 @@ bool view_perma_grids; /* Map remembers all perma-lit grids */ bool view_torch_grids; /* Map remembers all torch-lit grids */ bool view_unsafe_grids; /* Map marked by detect traps */ bool view_reduce_view; /* Reduce view-radius in town */ -bool fresh_before; /* Flush output while continuous command */ +bool fresh_before; /* Flush output while in repeated command */ bool fresh_after; /* Flush output after monster's move */ bool fresh_message; /* Flush output after every message */ bool hilite_player; /* Hilite the player with the cursor */ @@ -95,7 +95,7 @@ bool allow_debug_opts; /* Allow use of debug/cheat options */ bool find_ignore_stairs; /* Run past stairs */ bool find_ignore_doors; /* Run through open doors */ bool find_cut; /* Run past known corners */ -bool check_abort; /* Check for user abort while continuous command */ +bool check_abort; /* Check for user abort while in repeated command */ bool flush_failure; /* Flush input on various failures */ bool flush_disturb; /* Flush input whenever disturbed */ bool disturb_move; /* Disturb whenever any monster moves */ @@ -316,7 +316,7 @@ const option_type option_info[] = "view_reduce_view", _("街では視野を狭くする", "Reduce view-radius in town") }, { &fresh_before, TRUE, OPT_PAGE_MAPSCREEN, 1, 23, - "fresh_before", _("連続コマンド中に画面を再描画し続ける", "Flush output while continuous command") }, + "fresh_before", _("連続コマンド中に画面を再描画し続ける", "Flush output while in repeated command") }, { &fresh_after, FALSE, OPT_PAGE_MAPSCREEN, 1, 24, "fresh_after", _("コマンド後に画面を常に再描画し続ける", "Flush output after monster's move") }, @@ -433,7 +433,7 @@ const option_type option_info[] = "find_cut", _("曲り角を斜めに最短距離で通過する", "Run past known corners") }, { &check_abort, TRUE, OPT_PAGE_DISTURBANCE, 1, 18, - "check_abort", _("連続コマンドはキー入力で中断する", "Check for user abort while continuous command") }, + "check_abort", _("連続コマンドはキー入力で中断する", "Check for user abort while in repeated command") }, { &flush_failure, TRUE, OPT_PAGE_DISTURBANCE, 1, 20, "flush_failure", _("様々なミス発生時に入力をクリアする", "Flush input on various failures") }, -- 2.21.1 (Apple Git-122.3) From fa6dc3b3011a1ac298049010aadf02661268799d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 01:06:46 -0800 Subject: [PATCH 077/335] Replaced "current_world_ptr->game_turn" with turn in English description for cheat_turn option. Made other minor changes to the description to be more idiomatic. --- src/cmd/cmd-gameoption.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index 9bed498c..709e3372 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -640,7 +640,7 @@ const option_type cheat_info[CHEAT_MAX] = }, { &cheat_turn, FALSE, 255, 0x81, 0x00, - "cheat_turn", _("ゲームメッセージにターン表示を行う", "Put current_world_ptr->game_turn to game message.") + "cheat_turn", _("ゲームメッセージにターン表示を行う", "Put turn in game messages.") }, { &cheat_sight, FALSE, 255, 0x82, 0x00, -- 2.21.1 (Apple Git-122.3) From e392ba7dbe166b8725bce3b7b4856f3c01c6181e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 01:29:30 -0800 Subject: [PATCH 078/335] Corrected English message, for magic-eater tapping a rod-derived ability, for subject/verb agreement. --- src/cmd/cmd-magiceat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c index d7f8a513..1e09ae43 100644 --- a/src/cmd/cmd-magiceat.c +++ b/src/cmd/cmd-magiceat.c @@ -450,7 +450,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(player_type *creature_ptr, bool o { if (creature_ptr->magic_num1[ext+i] > k_info[lookup_kind(tval, i)].pval * (creature_ptr->magic_num2[ext+i] - 1) * EATER_ROD_CHARGE) { - msg_print(_("その魔法はまだ充填している最中だ。", "The magic are still charging.")); + msg_print(_("その魔法はまだ充填している最中だ。", "The magic is still charging.")); msg_print(NULL); if (use_menu) ask = TRUE; continue; -- 2.21.1 (Apple Git-122.3) From 2c68af1370fd5b64a8c10f66d3e1237dd46155c6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 06:48:32 -0800 Subject: [PATCH 079/335] Reworded English message for too many simultaneous hex spells to use "cast" rather than "spell" as the verb. --- src/cmd/cmd-spell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index 1ce6e3f1..ada2203e 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -1075,7 +1075,7 @@ void do_cmd_cast(player_type *caster_ptr) if (hex_spell_fully(caster_ptr)) { bool flag = FALSE; - msg_print(_("これ以上新しい呪文を詠唱することはできない。", "Can not spell new spells more.")); + msg_print(_("これ以上新しい呪文を詠唱することはできない。", "Can not cast more spells.")); flush(); if (caster_ptr->lev >= 35) flag = stop_hex_spell(caster_ptr); if (!flag) return; -- 2.21.1 (Apple Git-122.3) From a1e9dcd39821bf112d23c2e9eb07e849ccbb97bc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 18 Dec 2019 07:22:39 -0800 Subject: [PATCH 080/335] Corrected spelling and, to be more idiomatic, made a noun plural in the English NIKKI_ARENA message. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 94c4f916..08894388 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -622,7 +622,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) if (num == MAX_ARENA_MONS) { fprintf(fff, _(" 闘技場のすべての敵に勝利し、チャンピオンとなった。\n", - " won all fight to become a Chanpion.\n")); + " won all fights to become a Champion.\n")); do_level = FALSE; } break; -- 2.21.1 (Apple Git-122.3) From d987db0c75f7fb6b6a11bd1ea2dcd1704afc5232 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:09:00 -0800 Subject: [PATCH 081/335] To be more idiomatic, dropped article in front of "plate mail". --- lib/file/death.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/death.txt b/lib/file/death.txt index 09b7c531..87b6cf62 100644 --- a/lib/file/death.txt +++ b/lib/file/death.txt @@ -229,7 +229,7 @@ I don't care. I have a Ring of Regeneration. I have this dungeon at home, I know where everything is! This HAS to be an illusion. I attempt to disbelieve it. I thought you could be trusted. -Never try to sneak in a plate mail. +Never try to sneak in plate mail. I'll never surrender. I'll use the Cheat Death option... I'm invincible! -- 2.21.1 (Apple Git-122.3) From 0c17f78e35c36206d10637f04ad115667188f6a4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:24:23 -0800 Subject: [PATCH 082/335] Added missing space and corrected some spelling mistakes in Lion Heart's lines. --- lib/file/monfrien.txt | 6 +++--- lib/file/monspeak.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/file/monfrien.txt b/lib/file/monfrien.txt index de0324ee..36b1ca48 100644 --- a/lib/file/monfrien.txt +++ b/lib/file/monfrien.txt @@ -31,7 +31,7 @@ mumbles something about mushrooms. N:19:Lion Heart says, 'We must stand up with firm resolve to strive for the eradication of terrorism, together with other nations of the world' -says, 'Japan supports the U.S. position that it will not bow to terrorism. Ithink it is only natural for President Bush to hunt down the culprits and take firm steps against this serious crime.' +says, 'Japan supports the U.S. position that it will not bow to terrorism. I think it is only natural for President Bush to hunt down the culprits and take firm steps against this serious crime.' says, 'The terrorist acts are extremely heinous and outrageous and cannot be forgiven.' says, 'It is a challenge not only to the U.S. but also to democracy, and I am outraged.' says, 'Japan-U.S. alliance is becoming bigger and bigger.' @@ -41,8 +41,8 @@ says, 'The safe society is crumbling and this is a significant incident.' ### says, 'I am not a entertainer but a politician.' sings, 'As K*izumi as the day is long...' says, 'I don't think there's any going back to what politics was in this country even three weeks ago.' -says, 'What will the prime minister do if the anti-reform forces within the Liveral Democratic Party regain power?' -says, 'People are driving the LDP members, and the LDP members are driveing the party. That is a total reversal of the past.' +says, 'What will the prime minister do if the anti-reform forces within the Liberal Democratic Party regain power?' +says, 'People are driving the LDP members, and the LDP members are driving the party. That is a total reversal of the past.' says, 'No pain, no gain.' says, 'Here's a present for you. A compact disc of X-JAPAN!' sings, 'Forever...' diff --git a/lib/file/monspeak.txt b/lib/file/monspeak.txt index ddd1dc02..146eba6c 100644 --- a/lib/file/monspeak.txt +++ b/lib/file/monspeak.txt @@ -52,8 +52,8 @@ says, 'The safe society is crumbling and this is a significant incident.' ### says, 'I am not a entertainer but a politician.' sings, 'As K*izumi as the day is long...' says, 'I don't think there's any going back to what politics was in this country even three weeks ago.' -says, 'What will the prime minister do if the anti-reform forces within the Liveral Democratic Party regain power?' -says, 'People are driving the LDP members, and the LDP members are driveing the party. That is a total reversal of the past.' +says, 'What will the prime minister do if the anti-reform forces within the Liberal Democratic Party regain power?' +says, 'People are driving the LDP members, and the LDP members are driving the party. That is a total reversal of the past.' says, 'No pain, no gain.' says, 'Here's a present for you. A compact disc of X-JAPAN!' sings, 'Forever...' -- 2.21.1 (Apple Git-122.3) From b50f2c795bd88857975cba85e4c761065f468f37 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:33:14 -0800 Subject: [PATCH 083/335] Made correction for subject/verb agreement. --- lib/file/monspeak.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/monspeak.txt b/lib/file/monspeak.txt index 146eba6c..f8bd9e74 100644 --- a/lib/file/monspeak.txt +++ b/lib/file/monspeak.txt @@ -479,7 +479,7 @@ says, 'You'll become a good mounting' #N:805:Omarax the Eye Tyrant N:807:Gerard, Strongman of Amber -rush toward you wordlessly. +rushes toward you wordlessly. #N:809:Atlach-Nacha, the Spider God -- 2.21.1 (Apple Git-122.3) From 01fdd21f20ec7ba6d967cc39a5f0119cbb404b7a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:36:21 -0800 Subject: [PATCH 084/335] To be more idiomatic, made a noun plural. --- lib/file/monspeak.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/monspeak.txt b/lib/file/monspeak.txt index f8bd9e74..8376e877 100644 --- a/lib/file/monspeak.txt +++ b/lib/file/monspeak.txt @@ -324,7 +324,7 @@ says, 'You aren't a caitiff that throws a cloak?!' #N:596:Mother Hydra N:598:Mandor, Master of the Logrus -enjoys espresso coffee between battle. +enjoys espresso coffee between battles. says, 'My slaves fight with you.' says, 'Excuse me, I have no time to continue a small fight.' says, 'It is a great pleasure to fight with such a worthy opponent as you.' -- 2.21.1 (Apple Git-122.3) From a871c659cb43f69641db27aee47efd6823a5b4d4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:45:28 -0800 Subject: [PATCH 085/335] Removed unneeded space. --- lib/file/monspeak.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/monspeak.txt b/lib/file/monspeak.txt index 8376e877..0126c496 100644 --- a/lib/file/monspeak.txt +++ b/lib/file/monspeak.txt @@ -601,7 +601,7 @@ says, 'Maybe I won't kill you... NOT!' yawns at your pathetic efforts to kill it. says, 'Another day, another bastard to slaughter...' says, 'I can't be bothered... minions, slaughter this fool!' -says, 'Such a doomed, pathetic gesture as yours verges on the heroic!' +says, 'Such a doomed, pathetic gesture as yours verges on the heroic!' says, 'Mere mortals such as you should not meddle the affair of the Powers!' N:873:Combat-Echizen -- 2.21.1 (Apple Git-122.3) From ae48b9b2c8203864929f69b150991f106058479b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:47:27 -0800 Subject: [PATCH 086/335] Corrected typo. --- lib/file/monspeak.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/monspeak.txt b/lib/file/monspeak.txt index 0126c496..f369ac56 100644 --- a/lib/file/monspeak.txt +++ b/lib/file/monspeak.txt @@ -748,7 +748,7 @@ says, 'Thou shalt repent of thy cunning.' says, 'Verily, thou shalt be one dead cretin.' says, 'Surrender or die!' says, 'Savor thy breath, it be thine last.' -says, 'Prepare do die, miscreant!' +says, 'Prepare to die, miscreant!' says, 'You're history, dude!' says, 'Feeling lucky, punk?' says, 'You're toast!' -- 2.21.1 (Apple Git-122.3) From 62036cf02f1a1fc582704185f0319a69c94621df Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 18:55:33 -0800 Subject: [PATCH 087/335] Changed "Bushi-do" to "bushido"; that matches changes made to realm-hissatsu.c. --- lib/file/seppuku.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/seppuku.txt b/lib/file/seppuku.txt index 14ec57d3..ab0dc163 100644 --- a/lib/file/seppuku.txt +++ b/lib/file/seppuku.txt @@ -1,2 +1,2 @@ N:*:Default -Meaning of Bushi-do is found in the death. +Meaning of bushido is found in the death. -- 2.21.1 (Apple Git-122.3) From 41de98a01a96bfe9cb7c7a2be0e163717772b228 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 19 Dec 2019 20:58:01 -0800 Subject: [PATCH 088/335] "Of the Damned" is more idiomatic. --- lib/file/w_low.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/w_low.txt b/lib/file/w_low.txt index 1f63f4ae..eb0309b2 100644 --- a/lib/file/w_low.txt +++ b/lib/file/w_low.txt @@ -30,7 +30,7 @@ N: 3:BIAS_FIRE 'Fire Ant' 'Hot Blood' 'Fervent Soul' -of the Damn +of the Damned N: 4:BIAS_COLD 'Freezing' -- 2.21.1 (Apple Git-122.3) From 4b1f70d76ab7d2467511ae8190b20b150e935e69 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 10:02:47 -0800 Subject: [PATCH 089/335] Had "of" plus two nouns, one misspelled. Google Translate gives "dark storm" for the Japanese version. Try "of Stormy Darkness" for the English. --- lib/file/w_med.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/file/w_med.txt b/lib/file/w_med.txt index 4379104b..e6800bf8 100644 --- a/lib/file/w_med.txt +++ b/lib/file/w_med.txt @@ -98,7 +98,7 @@ N:14:BIAS_NECROMANTIC 'Dark Banisher' 'Bloody Mary' of Helthing -of Darkness Strom +of Stormy Darkness of Genocide of Thuringwethil -- 2.21.1 (Apple Git-122.3) From b1049e4e116e8fea96bfe2822d3eb87ca34316d8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 11:03:51 -0800 Subject: [PATCH 090/335] Made the English labels for the standard shops consistent between f_info.txt and the help files. Generally preferred the versions of the labels from f_info.txt but did change one: "Weapon Smiths" is now "Weaponsmith's Shop". --- lib/edit/f_info.txt | 2 +- lib/help/bldg.txt | 8 ++++---- lib/help/dungeon.txt | 2 +- lib/help/tang.txt | 6 +++--- lib/help/town.txt | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt index 2cabc678..c9c40dcf 100644 --- a/lib/edit/f_info.txt +++ b/lib/edit/f_info.txt @@ -912,7 +912,7 @@ F:PERMANENT | GLOW N:76:WEAPON_SMITHS J:武器専門店 -E:Weapon Smiths +E:Weaponsmith's Shop G:3:w W:10 F:SUBTYPE_2 | LOS | PROJECT | MOVE | NOTICE | REMEMBER | STORE | DOOR | diff --git a/lib/help/bldg.txt b/lib/help/bldg.txt index 6a42b7e3..ed09a069 100644 --- a/lib/help/bldg.txt +++ b/lib/help/bldg.txt @@ -4,11 +4,11 @@ The town is composed of both stores and buildings. Classical stores: Magic Shop: buy your wands, staffs, rings and amulets here. -Alchemist: for all sorts of bubbling potions and scrolls. -Weaponsmith: they deal in anything sharp and to the point. -Armorer: to offer protection from the ravages of the dungeon. +Alchemy Shop: for all sorts of bubbling potions and scrolls. +Weaponsmith's Shop: they deal in anything sharp and to the point. +Armoury: to offer protection from the ravages of the dungeon. General Store: food, torches, ammo, some necessities. -Temple Trade: those items permitted to the pious in life. +Temple: those items permitted to the pious in life. Black Market: the prices are usurious, but may have powerful items! Home: to store some of your precious treasures. diff --git a/lib/help/dungeon.txt b/lib/help/dungeon.txt index 66dfbb52..9e9ef69d 100644 --- a/lib/help/dungeon.txt +++ b/lib/help/dungeon.txt @@ -39,7 +39,7 @@ to something you are more comfortable with. [[[[g|.| Patch of grass [[[[b|*| Section of the Pattern [[[[G|:| Flower [[[[U|1| General Store [[[[g|:| Brake [[[[s|2| Armoury - [[[[B|.| Swamp [[[[w|3| Weapon Smiths + [[[[B|.| Swamp [[[[w|3| Weaponsmith's Shop [[[[B|~| Shallow Water [[[[g|4| Temple [[[[b|~| Deep Water [[[[b|5| Alchemy Shop [[[[U|~| Shallow Lava [[[[r|6| Magic Shop diff --git a/lib/help/tang.txt b/lib/help/tang.txt index 72c60680..ced6f00e 100644 --- a/lib/help/tang.txt +++ b/lib/help/tang.txt @@ -49,15 +49,15 @@ an absolutely ridiculous price. Any good item can show up in this store show up in other stores. -Be sure to visit shops #1 and #2, the General Store and Armory, +Be sure to visit shops #1 and #2, the General Store and Armoury, respectively. At the General Store, buy a cloak and a Brass Lantern, -and a flask of oil or two. Sell your torches. At the Armory, buy some +and a flask of oil or two. Sell your torches. At the Armoury, buy some of the light armor. Suggested: Hard Leather Boots, a Leather Cap, Leather Gloves. If a Small Leather Shield is on sale and you can afford it, buy it. This should have cleaned out your money. However, if it hasn't, it is -strongly recommended that you go to the Alchemist's shop (#5) and +strongly recommended that you go to the Alchemy Shop (#5) and purchase a scroll of Phase Door. If you get surrounded by monsters, read it, and you'll be teleported a short distance away. diff --git a/lib/help/town.txt b/lib/help/town.txt index daf2f8c5..c88e2796 100644 --- a/lib/help/town.txt +++ b/lib/help/town.txt @@ -260,8 +260,8 @@ The General Store ("1") lamps, oil, shovels, picks, and spikes. All of these items and some others can be sold back to the General store for money. -The Armory ("2") - The Armory is where the town's armor is fashioned. All sorts of +The Armoury ("2") + The Armoury is where the town's armor is fashioned. All sorts of protective gear may be bought and sold here. The Weaponsmith's Shop ("3") @@ -274,11 +274,11 @@ The Temple ("4") bless scrolls, word of recall scrolls, some approved priestly weapons, as well as books of Life magic for priests and paladins. -The Alchemy shop ("5") +The Alchemy Shop ("5") The Alchemy Shop deals in all types of potions and scrolls. -The Magic User's Shop ("6") - The Magic User's Shop deals in all sorts of rings, wands, amulets, +The Magic Shop ("6") + The Magic Shop deals in all sorts of rings, wands, amulets, and staves, as well as some magic books. The Black Market ("7") -- 2.21.1 (Apple Git-122.3) From 5931985369c621da6d99524df9a06e7664172191 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 11:12:51 -0800 Subject: [PATCH 091/335] To be more idiomatic, switch position of adverb in English description. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 15dd4304..c2da8680 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -320,7 +320,7 @@ E:& Strip~ of Venison G:,:u I:80:33:1500 W:0:0:2:2 -D:$A strip of jerked beef that seems never to spoil. +D:$A strip of jerked beef that never seems to spoil. D:良く乾燥させた肉。決して腐る事が無さそうだ。 N:24:スライムモルド -- 2.21.1 (Apple Git-122.3) From 05ab4cc85127a9754f0a89a354ecf37ebb64662c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:37:58 -0800 Subject: [PATCH 092/335] Added an English description for the lance. --- lib/edit/k_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index c2da8680..30712a03 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -805,6 +805,8 @@ W:10:0:300:230 A:10/1 P:0:2d8:0:0:0 F:SHOW_MODS | RIDING +D:$A spear with a long conical tip. It is well-suited for the rider of +D:$ a charging horse. D:大きく長い円錐形の穂先を持った槍だ。 D:馬上で構えて突撃する為に作られている。 -- 2.21.1 (Apple Git-122.3) From d0fe0b2c3ac650181638276aa967375c4ca0c520 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:40:26 -0800 Subject: [PATCH 093/335] Added an English description for the heavy crossbow to replace the commented out one. --- lib/edit/k_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 30712a03..afb40403 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -923,9 +923,8 @@ I:19:24:0 W:30:0:200:500 A:30/2:40/2 F:SHOW_MODS -# Not all heavy crossbow is the arbalest with a crank! -#D:$The arbalest is so powerful it has to be reinforced with metal and -#D:$requires a crank to be cocked. +D:$A heavy mechanical bow. It is slower to fire than its lighter +D:$ cousin but each bolt fired is deadlier. D:鋼鉄製の弦をあらかじめ引いておき、機械式の引き金を引くだけで矢を発射 D:する事ができる。ショート・ボウやロング・ボウに比べて扱いが簡単な武器だ。 D:ヘヴィ・クロスボウはライト・クロスボウに比べて威力は強いが、 -- 2.21.1 (Apple Git-122.3) From 2326773b8cf1c0217127c071e85d9a0eac87c8b5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:42:56 -0800 Subject: [PATCH 094/335] For clarity, reworded the English description of potions of experience. --- lib/edit/k_info.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index afb40403..a5b98bf7 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -2626,7 +2626,8 @@ I:75:59:0 W:65:0:4:25000 A:65/1 P:0:1d1:0:0:0 -D:$You gain experience half of your experience (max: 100000) when you quaff it. +D:$You gain experience equal to the lesser of 100000 or half of your current +D:$ experience when you quaff it. D:それは飲むと現在の経験値の半分(100000を超えない)の経験を得る。 N:245:眠り:ぼやけた色の -- 2.21.1 (Apple Git-122.3) From 529550de454b3a0b5ba5ab4f4fb863fe05e88329 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:45:21 -0800 Subject: [PATCH 095/335] Since "hallucinate" isn't normally used as a transitive verb, reworded the English description for potions of booze. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index a5b98bf7..d6229de1 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -2658,8 +2658,8 @@ I:75:9:50 W:0:0:4:0 A:0/1 P:0:1d1:0:0:0 -D:$It confuses and hallucinates you when you quaff it. If you are a monk, -D:$you may be a drunken master. +D:$It confuses you and causes you to hallucinate when you quaff it. If you are +D:$ a monk, you may be a drunken master. D:それは飲むと混乱し、幻覚に侵される。修行僧が飲むと酔拳を使えるらしい。 N:248:毒:薄い緑色の -- 2.21.1 (Apple Git-122.3) From 15d166b032c29e85b7fe62dafc5d95215afe4ebb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 12:50:48 -0800 Subject: [PATCH 096/335] Corrected subject/verb agreement in English description for potions of resistance. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index d6229de1..ed97b37a 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -2881,7 +2881,7 @@ A:20/1:45/1:80/1:100/1 P:0:1d1:0:0:0 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD D:$You get temporary resistances to elements and poison when you quaff it. -D:$These resistances is cumulative with equipment. +D:$These resistances are cumulative with equipment. D:それは飲むと一時的に酸・電撃・火炎・冷気・毒の耐性を得る。 D:装備による耐性に累積する。 -- 2.21.1 (Apple Git-122.3) From 2ecbc4d982401ca33eeb59d7d226607875ef59ff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 12:55:13 -0800 Subject: [PATCH 097/335] To be more idiomatic, reworded English description for wands of trap/door destruction. --- lib/edit/k_info.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index ed97b37a..66834bb1 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3019,7 +3019,8 @@ I:65:5:15 W:10:0:10:100 A:10/1 P:0:1d1:0:0:0 -D:$It fires a beam destroys all traps and doors on the line when you use it. +D:$It fires a beam that destroys all traps and doors along a line when you +D:$ use it. D:それは使うとトラップやドアを破壊するビームを放つ。 N:282:マジック・ミサイル:チタンの -- 2.21.1 (Apple Git-122.3) From 22d456ef91a575533ce262cd7648ac6e95298ec5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 12:56:47 -0800 Subject: [PATCH 098/335] To be more idiomatic, reworded English description for wands of teleport other. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 66834bb1..ab5b2193 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3061,7 +3061,7 @@ I:65:3:12 W:20:0:10:350 A:20/1 P:0:1d1:0:0:0 -D:$It fires a beam teleports all monsters on the line when you use it. +D:$It fires a beam that teleports all monsters along a line when you use it. D:それは使うとモンスターをテレポートさせるビームを放つ。 N:286:トラップ解除:銅メッキの -- 2.21.1 (Apple Git-122.3) From 310b4bafd5415a88c4eedf315fdaecc3d1b68bbc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 12:57:36 -0800 Subject: [PATCH 099/335] To be more idiomatic, reworded English description for wands of trap destruction. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index ab5b2193..70170776 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3071,7 +3071,7 @@ I:65:4:10 W:20:0:10:700 A:20/1 P:0:1d1:0:0:0 -D:$It fires a beam destroys all traps on the line when you use it. +D:$It fires a beam that destroys all traps along a line when you use it. D:それは使うとトラップを破壊するビームを放つ。 N:287:サンダー・ボール:金メッキの -- 2.21.1 (Apple Git-122.3) From dd18288e92f23f56fd798f25f523b3efda408819 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:02:49 -0800 Subject: [PATCH 100/335] For clarity, reworded English description for staves of starlight. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 70170776..6a7aefca 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3313,7 +3313,7 @@ I:55:7:12 W:20:0:50:800 A:20/1 P:0:1d2:0:0:0 -D:$It fires a line of light directed randomly for 5d3 times when you use it. +D:$It fires 5d3 random lines of light when you use it. D:それは使うとランダムな方向への光線を5d3回放つ。 N:309:スピード・モンスター:ユーカリの -- 2.21.1 (Apple Git-122.3) From aec58117e74e80b19e094555b5475c251ab17149 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:27:39 -0800 Subject: [PATCH 101/335] To be more idiomatic, inserted a "the" in the English descriptions for scrolls and staves of darkness. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 6a7aefca..43a70fb9 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -2263,7 +2263,7 @@ G:?:w I:70:0:0 W:1:0:5:0 A:1/1 -D:$It darkens nearby area or current room and blinds you when you read it. +D:$It darkens the nearby area or current room and blinds you when you read it. D:それは読むと自分の周囲もしくは部屋全体が暗闇に包まれ、盲目になる。 N:209:対邪悪結界:頭森 地跳 真骨 @@ -3456,7 +3456,7 @@ I:55:0:10 W:5:0:50:0 A:5/1:50/1 P:0:1d2:0:0:0 -D:$It darkens nearby area or current room and blinds you when you use it. +D:$It darkens the nearby area or current room and blinds you when you use it. D:それは使うと自分の周囲もしくは部屋全体が暗闇に包まれ、盲目になる。 N:323:抹殺:チークの -- 2.21.1 (Apple Git-122.3) From 3e425eda4acac092ad728ceca769f06bc89c78be Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:29:17 -0800 Subject: [PATCH 102/335] To be more idiomatic, made "creature" plural in the English description for staves of holiness. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 43a70fb9..ccaa0628 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3510,7 +3510,7 @@ W:70:0:50:4500 A:70/2 P:0:1d2:0:0:0 D:$It does 150 damage to all evil monsters in sight, gives temporary -D:$protection from lesser evil creature, cures poison, stuuned, cuts, removes +D:$protection from lesser evil creatures, cures poison, stuuned, cuts, removes D:$fear and heals you 50 when you use it. D:それは使うと視界内の邪悪なモンスターに150のダメージを与え、 D:一時的に弱い邪悪な者の攻撃を回避しやすくなる結界を張り、 -- 2.21.1 (Apple Git-122.3) From 3d29d925a5dd9c0a4577fef2218ef95dfaf6fd2c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:31:15 -0800 Subject: [PATCH 103/335] Removed the comma in the English descriptions for scrolls and rods of recall since only two things are joined by the conjunction and they aren't independent. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index ccaa0628..828fc0e5 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -2370,7 +2370,7 @@ G:?:w I:70:11:0 W:5:0:5:150 A:5/1 -D:$It recalls you to the town, or back into the dungeon you have entered when +D:$It recalls you to the town or back into the dungeon you have entered when D:$you read it. D:それは読むと地上にいる時は行ったことのあるダンジョンの最深階へ、 D:ダンジョンにいる時は地上へと移動する。 @@ -3772,7 +3772,7 @@ I:66:3:60 W:30:0:15:4000 A:15/16:30/4 P:0:1d1:0:0:0 -D:$It recalls you to the town, or back into the dungeon you have entered when +D:$It recalls you to the town or back into the dungeon you have entered when D:$you zap it. D:それは振ると地上にいる時は行ったことのあるダンジョンの最深階へ、 D:ダンジョンにいる時は地上へと移動する。 -- 2.21.1 (Apple Git-122.3) From 03007f466e95ce8b1efedc17e0317d7fc2fab6bc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:33:18 -0800 Subject: [PATCH 104/335] To be more idiomatic, reworded the English description for rods of teleport other. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 828fc0e5..a3daceb6 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3875,7 +3875,7 @@ I:66:13:25 W:45:0:15:1400 A:23/8:45/2 P:0:1d1:0:0:0 -D:$It fires a beam teleports all monsters on the line when you zap it. +D:$It fires a beam that teleports all monsters along a line when you zap it. D:それは振るとモンスターをテレポートさせるビームを放つ。 N:365:トラップ解除:ジルコンの -- 2.21.1 (Apple Git-122.3) From 9f7604f28b87e2bc90bde67caf652f4fd979f563 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:34:15 -0800 Subject: [PATCH 105/335] To be more idiomatic, reworded the English description for rods of disarming. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index a3daceb6..92ec753e 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -3885,7 +3885,7 @@ I:66:14:22 W:35:0:15:2100 A:18/4:35/1 P:0:1d1:0:0:0 -D:$It fires a beam destroys all traps on the line when you zap it. +D:$It fires a beam that destroys all traps along a line when you zap it. D:それは振るとトラップを破壊するビームを放つ。 N:366:サンダー・ボール:亜鉛の -- 2.21.1 (Apple Git-122.3) From 4b5d00c5e01437e85dfea8e80ef747795d07bae9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:45:30 -0800 Subject: [PATCH 106/335] To be more idiomatic, reworded the English description for scrolls of spell. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 92ec753e..e076e758 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -5803,8 +5803,8 @@ G:?:w I:70:43:0 W:10:0:5:1000 A:10/8 -D:$It increases the number you can study spells when you read. If you are the -D:$class can't study or don't need to study, it effects none. +D:$It increases the number of spells you can study when read. If you are a +D:$ class that can't study or don't need to study, it has no effect. D:それは読むと呪文を1つ学習できるようになる。 D:学習できない、または学習する必要のない職業では何も起きない。 -- 2.21.1 (Apple Git-122.3) From 92e4cd98ea3b83d94532e4aedaf52aaea2b8f202 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:48:45 -0800 Subject: [PATCH 107/335] To be more idiomatic, reworded the English description for staves of animate dead. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index e076e758..324966ed 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -5876,8 +5876,8 @@ I:55:30:8 W:35:0:50:800 A:35/1 P:0:1d2:0:0:0 -D:$It raises corpses and skeletons nearby you from dead and makes them your -D:$pet when you use it. +D:$It raises nearby corpses and skeletons from the dead and makes them your +D:$ pets when you use it. D:それは使うと自分の周囲の死体や骨を生き返らせてペットにする。 N:609:石 -- 2.21.1 (Apple Git-122.3) From 0afa32064b651784656dca8a9d925d5bdcf3e4cd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:51:17 -0800 Subject: [PATCH 108/335] To be more idiomatic, made "meteor" plural in the English description for wands of striking. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index 324966ed..ff1dae80 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -6044,7 +6044,7 @@ W:65:0:10:4000 A:65/3 P:0:1d1:0:0:0 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD -D:$It fires a bolt of meteor (damage: (15+level/3)d13) when you use it. +D:$It fires a bolt of meteors (damage: (15+level/3)d13) when you use it. D:それは使うとダメージ(15+レベル/3)d13の隕石の矢を放つ。 N:629:魔力の嵐:トネリコの -- 2.21.1 (Apple Git-122.3) From f188a62bc822caf7bbdd45290ef2ec0a31c47dc9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:53:18 -0800 Subject: [PATCH 109/335] To be more idiomatic, inserted "that" in English descripotion for scrolls of summon kin. --- lib/edit/k_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index ff1dae80..a35627a0 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -6242,7 +6242,7 @@ G:?:w I:70:54:0 W:30:0:5:1000 A:30/2 -D:$It summons a monster corresponds to your race as your pet when you read it. +D:$It summons a monster that corresponds to your race as your pet when you read it. D:それは読むと自分の種族に対応したモンスター1体をペットとして召喚する。 N:651:魔法の笛 -- 2.21.1 (Apple Git-122.3) From b9b7e484f8e165670256f6a07939d3a0d7456d3b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 13:54:57 -0800 Subject: [PATCH 110/335] Corrected spelling in English descriptions for scrolls of amusement and *amusement*. --- lib/edit/k_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt index a35627a0..317c1264 100644 --- a/lib/edit/k_info.txt +++ b/lib/edit/k_info.txt @@ -6381,7 +6381,7 @@ G:?:w I:70:55:0 W:20:0:5:100 A:20/6 -D:$It creates one amuzing item when you read it. +D:$It creates one amusing item when you read it. D:それは読むと誰の得なのかわからないものを1個作り出す。 N:668:*誰得*:挽怒 那 務故 @@ -6390,7 +6390,7 @@ G:?:w I:70:56:0 W:20:0:5:500 A:60/8 -D:$It creates some amuzing item when you read it. +D:$It creates some amusing item when you read it. D:それは読むと誰の得なのかわからないものを複数作り出す。 N:669:オーブ -- 2.21.1 (Apple Git-122.3) From e2a958a26b314653f3ecfa3a27831d9b554e1126 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:10:07 -0800 Subject: [PATCH 111/335] In the English description for crypt creeps, made the nouns singular and reworded it to be a complete sentence. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index a3a5e251..5808cdd1 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -2036,7 +2036,7 @@ F:EVIL | UNDEAD | IM_POIS | RES_NETH | F:NO_CONF | NO_SLEEP | HURT_LITE S:1_IN_10 S:CAUSE_1 | S_UNDEAD -D:$Frightening skeletal figures in black robes. +D:$Is a frightening skeletal figure in a black robe. D:黒装束に身を包んだ恐ろしげな骸骨の姿だ。 D:(ロバート・ブロック「窖に潜むもの」) -- 2.21.1 (Apple Git-122.3) From 8c89cf85e45499fef69e4c3f8ac1dd048ff9eebb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:12:47 -0800 Subject: [PATCH 112/335] Changed the English description for rotting corpses to be a complete sentence describing one creature. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 5808cdd1..edbfab73 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -2051,7 +2051,7 @@ B:CLAW:POISON:1d4 F:OPEN_DOOR | BASH_DOOR | FRIENDS | F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS F:IM_COLD | RES_NETH | COLD_BLOOD | EMPTY_MIND -D:$Corpses awakened from their sleep by dark sorceries. +D:$It is a corpse awakened from its sleep by dark sorceries. D:暗黒魔術により眠りを覚まされた死体だ。 #J0# -- 2.21.1 (Apple Git-122.3) From 131fa87839b2e5420063729fd84752e688d20548 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:16:11 -0800 Subject: [PATCH 113/335] Dropped comma in English description for gremlins since the conjunction only joins two things that aren't independent. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index edbfab73..db4a195b 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -2501,7 +2501,7 @@ B:CLAW:EAT_FOOD:1d2 B:BITE:EAT_FOOD:1d4 F:MULTIPLY | IM_POIS | RES_DARK | HURT_LITE | EVIL | DEMON | OPEN_DOOR | F:TAKE_ITEM | CAN_SWIM -D:$Don't splash water on them, and don't feed them after midnight! +D:$Don't splash water on them and don't feed them after midnight! D:水を掛けたり、真夜中を過ぎてから餌をやってはいけない! #J0# -- 2.21.1 (Apple Git-122.3) From acc559b678d7442555cdfcfac08ad7c3bea34a1e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:22:55 -0800 Subject: [PATCH 114/335] Reworded last part of the English description for white wolves to be an independent phrae. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index db4a195b..6fd591b1 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -3500,7 +3500,7 @@ F:FRIENDS | F:BASH_DOOR | WILD_WASTE | F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE D:$A large and muscled wolf from the northern wastes. Its breath is cold and -D:$icy and its fur coated in frost. +D:$icy, and its fur is coated in frost. D:北の荒れ地からやって来た、大きくて屈強な狼だ。その息は氷のようで、毛皮は D:冷気に覆われている。 -- 2.21.1 (Apple Git-122.3) From 5922a519cd63e5b971fd3010cc841b9606c85503 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:27:11 -0800 Subject: [PATCH 115/335] Corrected spelling in English description for nixies. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 6fd591b1..b65a0d94 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -4115,7 +4115,7 @@ W:14:1:0:60:0:0 B:HIT:HURT:6d3 B:HIT:HURT:6d3 F:AQUATIC | WILD_ALL | RES_WATE -D:$A race of fair yet belligrent sea elves. +D:$A race of fair yet belligerent sea elves. D:洗練された、しかも好戦的な海のエルフの種族だ。 #JZ# -- 2.21.1 (Apple Git-122.3) From 53406fd36c9ec77833a61554a72c68114ca998e6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:29:43 -0800 Subject: [PATCH 116/335] To be more idiomatic, replaced "just to look" with "just looking" in English descriptions. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index b65a0d94..0bf4243c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -4291,7 +4291,7 @@ B:BITE:HURT:1d2 F:RAND_50 | CAN_FLY | F:WEIRD_MIND | MULTIPLY | F:ANIMAL -D:$It makes you itch just to look at it. +D:$It makes you itch just looking at it. D:それを見るだけで体がむずがゆくなってくる。 #J0# @@ -9574,7 +9574,7 @@ F:ANIMAL | RES_INER | NO_CONF | NO_SLEEP S:1_IN_5 | S:BR_INER D:$Bizarrely, this hound seems to be hardly moving at all, yet it approaches -D:$you with deadly menace. It makes you tired just to look at it. +D:$you with deadly menace. It makes you tired just looking at it. D:奇怪なことだが、この犬は全然動いていないように見えるにも関わらず、何故か D:恐ろしい勢いで近づいてくるのだ。それを見ているだけで疲労してくる。 -- 2.21.1 (Apple Git-122.3) From bbe396c40466014e62786f588216eda292d04565 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:31:42 -0800 Subject: [PATCH 117/335] To be more idiomatic, changed preposition in English description for half-orcs. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 0bf4243c..f8b1d27e 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -4380,7 +4380,7 @@ F:MALE | WILD_ALL | F:FRIENDS | DROP_60 | F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | ORC | RES_DARK -D:$He is a hideous deformed cross-breed with man and orc, combining man's +D:$He is a hideous deformed cross-breed of man and orc, combining man's D:$strength and cunning with orcish evil. D:彼は人間とオークの混血でひどく醜い容貌をしている。人間の力強さとオークの邪悪 D:なずる賢さを受け継いでいる。 -- 2.21.1 (Apple Git-122.3) From bbd4cbc554c24cca7118abbcac1f37085befbe86 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:32:47 -0800 Subject: [PATCH 118/335] To be more idiomatic, changed preposition in English description for plaguebearers of Nurgle. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f8b1d27e..a3235b77 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -4450,7 +4450,7 @@ S:SCARE | S_ANT | CAUSE_2 | SLOW D:$An unfortunate individual, who was killed by the incurable D:$disease known as Nurgle's Rot, and was transformed into a D:$rotting demon zombie. It has but one eye, and a single -D:$pale horn in its forehead. +D:$pale horn on its forehead. D:<ナーグル>の腐れ病という名で知られる不治の病によって死んだ不運な人間で、 D:腐乱した悪魔のゾンビになってしまっている。目は一つだけで、一本の D:青白い角が額に生えている。 -- 2.21.1 (Apple Git-122.3) From 25419b72983579dcf1e6cc3cdce2880a6e19d4a7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:34:38 -0800 Subject: [PATCH 119/335] In English description of flying skulls, replaced "skullpack" with "skull". --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index a3235b77..5346f38c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -4541,7 +4541,7 @@ B:BITE:POISON:1d3 B:BITE:LOSE_STR:1d4 F:UNDEAD | EVIL | IM_POIS | IM_COLD | WEIRD_MIND | NO_FEAR | CAN_FLY | F:RES_NETH | NO_CONF | NO_SLEEP | DROP_60 | BASH_DOOR | FRIENDS | COLD_BLOOD -D:$A skullpack animated by necromantic spells. +D:$A skull animated by necromantic spells. D:死霊術の呪文により動いている髑髏だ。 #JZ# -- 2.21.1 (Apple Git-122.3) From e04d680c11c727608bd128b98d9d6baf1a11f8b7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:40:50 -0800 Subject: [PATCH 120/335] In the English description for wyverns, replaced "dragonian" with "dragon-like". --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 5346f38c..8cebd7f8 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -5580,7 +5580,7 @@ F:ONLY_GOLD | DROP_60 | DROP_90 | IM_POIS | CAN_FLY | F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DRAGON | F:WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE | F:ANIMAL | EVIL | RIDING | EAT_POISONOUS -D:$A fast-moving and deadly dragonian animal. Beware its poisonous sting! +D:$A fast-moving and deadly dragon-like animal. Beware its poisonous sting! D:それは素早く動く危険なドラゴンのような生き物だ。 D:その毒爪には気をつけろ! -- 2.21.1 (Apple Git-122.3) From d97e935ab9ded0f3843604a7d9a0c917cb111ccb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 14:42:55 -0800 Subject: [PATCH 121/335] Changed "lacerate" to "pierce" since the object is "armor". --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 8cebd7f8..caee852d 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -5675,7 +5675,7 @@ B:BITE:HURT:1d10 B:BITE:HURT:1d10 F:BASH_DOOR | WILD_WOOD | WILD_GRASS | F:ANIMAL | DROP_SKELETON | DROP_CORPSE | EAT_SPEED -D:$A fierce and dangerous cat, its huge tusks and sharp claws would lacerate +D:$A fierce and dangerous cat, its huge tusks and sharp claws would pierce D:$even the strongest armour. D:獰猛で危険なネコであり、その巨大な牙と鋭い爪は最強の鎧でさえも切り D:裂いてしまう。 -- 2.21.1 (Apple Git-122.3) From 8b08e163a02e2b67382aa8ba1a6c2205de989d3e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 15:03:36 -0800 Subject: [PATCH 122/335] Changed English description for bloodletters of Khorne to describe a single creature. --- lib/edit/r_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index caee852d..4b79af9f 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -9193,9 +9193,8 @@ B:HIT:EXP_20:13d1 F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE | F:ONLY_ITEM | NO_FEAR | NONLIVING | F:EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_CHAO | DEMON -D:$Slender, red-skinned demons twisting in nightmarish shapes. -D:$They are armed with hellblades, which will suck the life from -D:$your body. +D:$It is a slender, red-skinned demon twisted into a nightmarish shape. +D:$ It is armed with a hellblade, which will suck the life from your body. D:流血の神<コーン>の配下の下級悪魔。 D:悪夢のような姿に捻じ曲がった、細身で赤い肌をした悪魔だ。 D:ヘルブレードを装備していて、その刃はあなたの生命力を -- 2.21.1 (Apple Git-122.3) From b0c23038ec8ad75d71f701a7f7db6c55030fb07b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 16:28:35 -0800 Subject: [PATCH 123/335] Added an English description for the Sheer Heart Attack, largely cribbed from the result of Google Translate's result for the Japanese description and the content on Jojo's Bizarre Wiki, https://jojo.fandom.com , for Yoshikage Kira and Killer Queen. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4b79af9f..4bcef128 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -9340,6 +9340,10 @@ B:EXPLODE:SHATTER:100d2 F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | REFLECTING | F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE +D:$It is the left hand of Killer Queen, the visual manifestation of the life +D:$ energy of Yoshikage Kira. It will follow the heat of the adventurer's +D:$ body forever. "Sheer Heart Attack in Killer Queen will definitely kill +D:$ the prey at which he's aimed ...." D:吉良吉影のスタンド『キラークイーン』の左手だ。冒険者の体温を頼りに D:どこまでも追いかける。「『キラークイーン』の『シアーハートアタック』 D:は狙った獲物は絶対に仕留める……」 -- 2.21.1 (Apple Git-122.3) From 7ce3f14e306041f778e8d43802f1ce3b690f78e4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 16:35:27 -0800 Subject: [PATCH 124/335] Dropped article in front of "plate mail" in English description for revenants. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4bcef128..6a2b33e0 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -9838,7 +9838,7 @@ S:1_IN_4| S:BO_FIRE V:150 D:$Back from the grave, to wreak vengeance upon the living. A gaunt, tall, -D:$skeletal figure wearing a ruined plate mail. +D:$skeletal figure wearing ruined plate mail. D:生ける者たちへ復讐するために墓から甦った亡霊だ。 D:気味の悪い、背の高い骸骨の姿で D:壊れたプレートメイルを身につけている。 -- 2.21.1 (Apple Git-122.3) From 23322e9ba80bf11ce23f45747d5ba64729b4e5a9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 17:00:10 -0800 Subject: [PATCH 125/335] Change the English description of maulotaurs to correct a spelling mistake and to be more idiomatic. --- lib/edit/r_info.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 6a2b33e0..9a2f9b84 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -13744,8 +13744,7 @@ F:BASH_DOOR | STUPID | DROP_CORPSE F:EVIL | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP S:1_IN_5 | S:BO_PLAS | BA_FIRE -D:$It is a belligrent minotaur with some destructive magical arsenal, armed -D:$with a hammer. +D:$It is a belligerent minotaur with some magic powers and armed with a hammer. D:破壊的な魔法の火器を持ち、ハンマーを装備した好戦的なミノタウロスだ。 #J0# -- 2.21.1 (Apple Git-122.3) From bd5992174cc2f0727ee08e68047c1224c11e6bfe Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 17:18:49 -0800 Subject: [PATCH 126/335] Inserted "like" in English description of lords of change to be more idiomatic. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 9a2f9b84..70c3e2ad 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -14323,7 +14323,7 @@ S:MIND_BLAST | BA_CHAO | SCARE | BRAIN_SMASH | DRAIN_MANA | S:S_HOUND | S_DEMON | S_DRAGON | TPORT | HASTE | CONF | S:TELE_AWAY | FORGET D:$The most powerful of Tzeentch's servitors. This demon looks like -D:$a huge bird-creature, with the head of a predatory bird and +D:$a huge bird-like creature, with the head of a predatory bird and D:$fantastically multi-coloured wings. D:混沌の魔神<ティーンチ>の最も強力な手下だ。この悪魔は巨大な鳥のようで、 D:頭部は肉食の猛禽類、羽根は幻想的な虹色に彩られている。 -- 2.21.1 (Apple Git-122.3) From 99ea345f460479e75e1b96c23b155e89bf2c554a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 17:34:56 -0800 Subject: [PATCH 127/335] Corrected typo in English description for Y'golonac. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 70c3e2ad..0c5d22f0 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -16165,7 +16165,7 @@ V:60 D:$"He saw why the shadow on the frosted pane yesterday had been D:$headless and he screamed... but before he could scream out his D:$protest his breath was cut off, as the hands descended on his -D:$face and the wed ret mouths opened in their palms." +D:$face and the wed red mouths opened in their palms." D:煉瓦の壁の向こう側にある広大な廃虚の地下に住む、邪悪な神。 D:頭の無い太った人間のような姿をしている。 D:両手に濡れた赤い口が付いており、全身が白熱して光り輝いている。 -- 2.21.1 (Apple Git-122.3) From 422581de4950cab7c42f93fb4811ca8c39938c59 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 17:38:03 -0800 Subject: [PATCH 128/335] Corrected spelling mistake in the English description for cyberdemons. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 0c5d22f0..e77514ae 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -16348,7 +16348,7 @@ F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING S:1_IN_4 | S:ROCKET V:166 -D:$Reverbrant metal steps announce the arrival of this huge creature, +D:$Reverberant metal steps announce the arrival of this huge creature, D:$half demon half machine. It has an unsurpassable firepower. D:響き渡る金属的な足音がこの巨大な、半悪魔半機械の怪物の D:到来を告げる。その火力には何者もかなわない。 -- 2.21.1 (Apple Git-122.3) From de6145e5070fd3b7ceccce4b3e34bfa446c9793f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 17:55:28 -0800 Subject: [PATCH 129/335] Added an English description for metal babbles using Google Translate's result for the Japanese description as a starting point. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e77514ae..16f83c99 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18030,6 +18030,7 @@ F:RES_ALL | POWERFUL | F:NO_CONF | NO_SLEEP | NO_STUN | EMPTY_MIND | RES_TELE | S:1_IN_1 | S:BLINK | BO_MANA | BA_CHAO | BA_FIRE | TPORT | PSY_SPEAR +D:$Is a bit of magical slime wrapped in hard metal. D:硬い金属に包まれたスライムだ。 N:872:『八岐大蛇』 -- 2.21.1 (Apple Git-122.3) From a47f20cf70b3cf1d7639b0852c6d74d5bfa0abaf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 18:04:24 -0800 Subject: [PATCH 130/335] Added an English description for the Yamata-no-Orochi. Used Google Translate's result for the Japanese description as the basis with some help with Wikipedia's entry for "Yamata no Orochi". --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 16f83c99..543b769f 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18052,6 +18052,8 @@ S:1_IN_2 | S:BR_FIRE | BR_NEXU | BR_CHAO | BR_POIS | BR_DISE | BR_PLAS | BR_NUKE | BR_DARK A:128:1:25 V:150 +D:$Is a legendary snake, with eight necks and eight tails, living in Izumo. +D:$ If denied sacrificial victims, it causes floods and annihilates people. D:出雲の国に棲む伝説の蛇で、八つの首と八つの尾を持つ。 D:いけにえを拒むと洪水を起こして人々を全滅させる。 -- 2.21.1 (Apple Git-122.3) From 98e7b230d1d6350ab8c5aab4cadea686b03173b0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 18:11:35 -0800 Subject: [PATCH 131/335] Reworded the English description for Combat-Echizen to be a bit more idiomatic. In some places, made it more closely follow Google Translate's result for the Jpanese description. --- lib/edit/r_info.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 543b769f..c1eea304 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18078,12 +18078,11 @@ S:1_IN_2 | S:ROCKET | HEAL | BLINK | INVULNER A:16:1:50 V:900 -D:$His favorite food is roasting rice noodle. -D:$He is the lone wolf filled with the adventurous spirit. +D:$His favorite food is grilled rice noodle. +D:$He is a lone wolf filled with the adventurous spirit. D:$His righteousness and courage are more than the average. D:$He sometimes become emotional. -D:$He would like to choose a haphazard life rather than an intentional life. -D:$He is poor at treating women. +D:$He prefers a haphazard life to an intentional one and is a known misogynist. D:好きな食べ物は焼きビーフン。抑えてはいるが、冒険心旺盛な D:一匹狼。正義感、勇気とも平均以上だがカッとしやすい所もある。 D:計画的人生より行き当たりばったりの人生を選んでしまうタイプで、 -- 2.21.1 (Apple Git-122.3) From 3cfc7b3e3de321209152e303998a33e8851dbcab Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 23:17:56 -0800 Subject: [PATCH 132/335] Added an English description for Dio Brando. It is mostly the result from Google Translate for the Japanese description with some cribbing Jojo's Bizarre Wiki, https://jojo.fandom.com . --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index c1eea304..d05be346 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18179,6 +18179,10 @@ F:NO_CONF | NO_SLEEP | RES_TIME | RES_TELE | REFLECTING | S:1_IN_4 | S:SCARE | S_KIN | WORLD | TELE_TO A:146:1:20 +D:$Dio, who became an immortal vampire with the help of a stone mask, +D:$ looks only at the adventurer. Watch out for The World, Dio's stand +D:$ or visual manifestation of his life energy: "I don't know what his +D:$ stand is, but it is certain that it can only be used at close range." D:石仮面の力で不死の吸血鬼となったディオは冒険者を餌としか見ていない。 D:『ザ・ワールド』に気をつけろ!「奴のスタンドの正体は分からないが、 D:至近距離でしか使えないことは確かだッ」 -- 2.21.1 (Apple Git-122.3) From 0e965d3b3a73e7959ddfea79a32442c7a5171c9f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 23:28:34 -0800 Subject: [PATCH 133/335] Added an English description for ohmu, largely based on Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index d05be346..2ff6502b 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18198,6 +18198,8 @@ F:KILL_WALL | CAN_SWIM | DROP_CORPSE | MOVE_BODY | F:FORCE_MAXHP | ONLY_GOLD | DROP_2D2 | DROP_3D2 | S:1_IN_3 S:SPECIAL +D:$A mass of worms, mad with rage, rushes towards you strewing miasma in +D:$ its wake. D:怒りに狂った王蟲の群は瘴気をまき散らしながら突進してくる。 N:880:時を統べる者『リチャード・ウォン』 -- 2.21.1 (Apple Git-122.3) From bac86561f5b1315fe63e761296f95d4334d68fa2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 20 Dec 2019 23:54:28 -0800 Subject: [PATCH 134/335] Added an English description for Richard Wong. It is largely the result for the Japanese description from Google Translate, but I dropped the second half: it wasn't clear to me and I couldn't fit it with the brief description of the character in Wikipedia's entry for the video game, Psychic Force. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 2ff6502b..7d202902 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18221,6 +18221,9 @@ S:TPORT | SCARE | S_KIN | BLINK | HEAL | S:TELE_TO | CONF | BO_MANA | BRAIN_SMASH | S:BA_WATE | TELE_AWAY | S:DISPEL | WORLD | PSY_SPEAR +D:$He has psychic powers that allow him to freely manipulate time and space. +D:$ He keeps calm and is always smiling, but beneath that mask is a +D:$ cold-blooded soul. D:時間と空間を自在に操る超能力者。 D:冷静沈着で、常に余裕の笑みを浮かべている。 D:だが、その仮面の下には冷血な魂が宿り、自分自身の欲望の為なら手段を選ばない。 -- 2.21.1 (Apple Git-122.3) From d73cc62818e7b5e1b7898f60dc743df1266a147a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 00:18:37 -0800 Subject: [PATCH 135/335] Added an English description for Superman Locke; it takes the conversation quoted in the Japanese description and changes it into an interaction between the adventurer and Locke. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 7d202902..f815ec39 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18246,6 +18246,9 @@ F:NO_SLEEP | RES_TELE | RES_NETH | RES_TIME | POWERFUL | CAN_FLY | S:1_IN_3 | S:TPORT | BLIND | HOLD | BLINK | HEAL | HASTE | S:TELE_TO | CONF | BO_MANA | BRAIN_SMASH | PSY_SPEAR +D:$Seeing the look in your eyes, he asks, "Do you know me?" You're very +D:$ tempted to answer, "Of course! You're Superman Locke! Immortal, +D:$ the strongest ESPer ever!" D:「そうだ!超人ロック!」「僕を知っているのか?」 D:「もちろん!不老不死にして、史上最強のエスパー!」 D:(聖悠紀、超人ロック「赤いサーペント」) -- 2.21.1 (Apple Git-122.3) From 181a16a2211708fb37b5b569f7253ff556d310e8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 06:23:10 -0800 Subject: [PATCH 136/335] Added an English description for Emperor Layzark. It is largely based on Google Translate's result for the Japanese description but drops the quote from the source material. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f815ec39..24771006 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18273,6 +18273,8 @@ S:TPORT | BLIND | BLINK | HEAL | HASTE | S:CONF | BO_MANA | BRAIN_SMASH | PSY_SPEAR | S:BA_NETH | BA_DARK | BA_CHAO | S:S_MONSTERS | S_DEMON | S_KIN +D:$She tried to destroy Earth solely just she wanted to fight Locke, the +D:$ Superman, as a superhuman. D:彼女はただ超人として超人との戦いを望むが故に、皇帝に扮し地球を D:滅ぼそうとした。「とにかくある朝起きてみるとディナールは皇帝 D:レイザークの神聖なる領地となっていたのだ」 -- 2.21.1 (Apple Git-122.3) From 7506ffde61e7adf9a73ddb546d404274464fcd1c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:06:32 -0800 Subject: [PATCH 137/335] Added an English description for the Zombified Serpent of Chaos. It is a paraphrase of Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 24771006..affdd0e8 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18302,6 +18302,8 @@ S:1_IN_3 | S:S_MONSTERS | BR_CHAO | BA_CHAO | ROCKET | S_CYBER | S_KIN | S:BR_NETH | BR_MANA | S_HI_UNDEAD | S_HI_DRAGON | S_UNIQUE | S:BR_NUKE | BR_DISI | HAND_DOOM | DISPEL +D:$Has returned from the bottom of Hell to take revenge on those who +D:$ destroyed it. D:自分を滅ぼした者に復讐するため、地獄の底から復活した! N:884:有毒ガス -- 2.21.1 (Apple Git-122.3) From fcba40060106c0d211b85c05758eb8517a1b9e47 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:10:58 -0800 Subject: [PATCH 138/335] To be more idiomatic, inserted an indefinite article in the English description for Gorlim. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index affdd0e8..52e0d05d 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18449,8 +18449,8 @@ F:SMART | OPEN_DOOR | BASH_DOOR | HAS_LITE_2 | F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | S:1_IN_2 | S:CAUSE_3 | BO_WATE | BO_MANA -D:$This body of once-mighty warrior was so dominated by Sauron's power that he -D:$became little more than a mindless undead of evil. +D:$This body of a once-mighty warrior was so dominated by Sauron's power that +D:$ he became little more than a mindless undead of evil. D:かつて屈強さを誇ったこの戦士の肉体はサウロンの力に完全に支配され、 D:今ではほとんど意思を持たない邪悪なアンデッドに成り下がってしまった。 -- 2.21.1 (Apple Git-122.3) From 2fd150a751057ad389a78c3381914aa13c112b8e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 21 Dec 2019 10:12:15 -0800 Subject: [PATCH 139/335] Removed comma in the English description for troll kings. The conjunction joins only two things, and they are not independent. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 52e0d05d..36a02349 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18500,7 +18500,7 @@ F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | REGENERATE S:1_IN_8 | S:BLINK D:$This troll is a king, which means it's still stupid, but has even more power. -D:$It never comes alone, and can call out to other trolls. +D:$It never comes alone and can call out to other trolls. D:このトロルはトロルの中の王だ。彼は依然としてトロルであり、頭は良くないが、 D:その力はさらに強力だ。彼は一人でいる事はなく常に手下を連れている。 -- 2.21.1 (Apple Git-122.3) From e843ff93fd57af380ea711c118b1b5430b90f5a8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 10:56:11 -0800 Subject: [PATCH 140/335] Corrected regression, for both the Japanese and English versions, introduced by the change to make the "recovers courage" part of spell_RF6_HEAL() more compact. --- src/mspells4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mspells4.c b/src/mspells4.c index 6c3c5b4f..5f4cb8ab 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -1961,7 +1961,7 @@ void spell_RF6_HEAL(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_id (void)set_monster_monfear(target_ptr, m_idx, 0); if (see_monster(floor_ptr, m_idx)) - msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name); + msg_format(_("%^sは勇気を取り戻した。", format("%%^s recovers %s courage.", m_poss)), m_name); } -- 2.21.1 (Apple Git-122.3) From 813035c884e545601cdcdaf800f80a301d53b54f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 11:03:54 -0800 Subject: [PATCH 141/335] Added an English description for the Demogorgon. It is a paraphrase of Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 36a02349..e193e9ce 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18943,6 +18943,8 @@ S:1_IN_3 | S:BLIND | CONF | SCARE | S:BA_DARK | BO_NETH | BR_NETH | BR_DARK | BR_NUKE | BR_POIS | HAND_DOOM | S:S_DEMON | S_KIN | DISPEL +D:$Said to be the commander of a hellish army, this terrifying demon can cause +D:$ ruin merely by saying his own name. D:その名を口にするだけで破滅をもたらすほどの恐るべきデーモンであり、 D:地獄の軍勢の指揮官であると言われている。 -- 2.21.1 (Apple Git-122.3) From 61b54e4173748a6c8dc5508b5a53de2395146003 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 11:10:01 -0800 Subject: [PATCH 142/335] Added an English description for the internet exploders. It is a rough paraphrase of Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e193e9ce..ac5eb461 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18962,6 +18962,8 @@ F:RES_CHAO | RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV | RES_TELE | F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP | CAN_FLY | S:1_IN_3 | S:HOLD | BLIND | CONF | SCARE | SLOW +D:$This is Bull Gates's most devastating weapon, propagating fear and ruin +D:$ throughout the world. D:ブル・ゲイツの究極兵器であり、全世界に破滅をもたらす恐怖の存在だ。 N:922:ピカチャウ -- 2.21.1 (Apple Git-122.3) From f52effdf68381b22f20f1c9abc7de3ebb31996bd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 11:14:53 -0800 Subject: [PATCH 143/335] Added an English description for electric rats. Did not know what to make of Google Translate's result for the Japanese description so went for something glib. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index ac5eb461..555eabbb 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18978,6 +18978,7 @@ F:DROP_CORPSE | ONLY_GOLD | DROP_1D2 | IM_ELEC | ANIMAL | AURA_ELEC | F:SELF_LITE_1 | S:1_IN_5 | S:BR_ELEC | BO_ELEC +D:$It's shockingly pretty, for a rat. D:かわいらしい外見をしているが、油断すると思わぬ衝撃を受けるだろう。 N:923:雪女 -- 2.21.1 (Apple Git-122.3) From 1438d489fcfcca27635a24b99e6c0353d30a07cb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 12:18:26 -0800 Subject: [PATCH 144/335] Added an English description for the monkeys of Nikko. Deviated from Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 555eabbb..6560c7a3 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19018,6 +19018,8 @@ W:18:3:0:50:0:0 B:HIT:HURT:2d7 B:HIT:HURT:2d7 F:DROP_60 | ANIMAL | DROP_SKELETON | DROP_CORPSE | FRIENDS | ONLY_GOLD +D:$It is one of the wise monkeys of the Nikko Tosho-gu shrine and very likely +D:$ has friends nearby. D:常に集団で現れる。つまり、日光猿の軍団なわけで…… N:926:ツチノコ -- 2.21.1 (Apple Git-122.3) From 767edd2293117fba1b186fa57deb6bb39c8551d7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 22 Dec 2019 13:13:00 -0800 Subject: [PATCH 145/335] Added an English description for a tsuchinoko. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 6560c7a3..1b6cda14 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19032,6 +19032,8 @@ B:CLAW:HURT:2d5 B:BITE:HURT:3d4 B:CRUSH:SUPERHURT:5d8 F:ANIMAL | DROP_SKELETON | DROP_CORPSE +D:$It is snake-like but much wider in the middle than the ends. You've heard +D:$ rumors of someone paying 1,000,000 gold for one captured alive. D:それを捕えた者には $1,000,000 の賞金が出るといわれている。 # Description in English by Nick Keulmann -- 2.21.1 (Apple Git-122.3) From 9153d670e29ac5a48174cba2648d7bb635f810c1 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 08:39:30 -0800 Subject: [PATCH 146/335] Change "an" to "a" in the English description for Narse the Black Dragon: the article precedes something that starts with a consonant. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 1b6cda14..c82091e2 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19840,7 +19840,7 @@ F:NO_FEAR | NO_STUN | RIDING | SELF_DARK_2 | S:1_IN_3 | S:BRAIN_SMASH | BR_DARK | BR_NETH | BA_NETH D:$One of the ancient dragons of Lodoss, it causes destruction with -D:$an dark and nether breath. +D:$a dark and nether breath. D:ロードスの古代竜の一匹で、暗黒と地獄のブレスで破壊を引き起こす。 N:971:金鱗の竜王『マイセン』 -- 2.21.1 (Apple Git-122.3) From 584957323e1006bd9b2b40c9940a01042075fcd9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 08:44:53 -0800 Subject: [PATCH 147/335] Corrected a spelling mistake in the English descriptions for Suke-san and Kaku-san, the warders of Mitsukuni. Also ended both with periods and shifted the space for the linebreak to appear on the second line to avoid git's nagging. --- lib/edit/r_info.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index c82091e2..abcf24cf 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20368,8 +20368,8 @@ B:HIT:SUPERHURT:4d8 B:HIT:SUPERHURT:4d8 F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 | HUMAN | F:OPEN_DOOR | BASH_DOOR | NO_FEAR | UNIQUE2 -D:$He is always traveling togather with -D:$Mitsukuni of the Yellow Gate, Grand Duke of Mito +D:$He is always traveling together with +D:$ Mitsukuni of the Yellow Gate, Grand Duke of Mito. D:ご老公を助けて旅から旅へ。とんだ爺に仕えたもんだ。 N:1002:『格さん』 @@ -20381,8 +20381,8 @@ B:HIT:SUPERHURT:4d8 B:HIT:SUPERHURT:4d8 F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 | HUMAN | F:OPEN_DOOR | BASH_DOOR | NO_FEAR | UNIQUE2 -D:$He is always traveling togather with -D:$Mitsukuni of the Yellow Gate, Grand Duke of Mito +D:$He is always traveling together with +D:$ Mitsukuni of the Yellow Gate, Grand Duke of Mito. D:ご老公を助けて旅から旅へ。とんだ爺に仕えたもんだ。 N:1003:ゴースト『Q』 -- 2.21.1 (Apple Git-122.3) From be9bed44450db6d48c66f05a51bce64a6178cab6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 08:49:28 -0800 Subject: [PATCH 148/335] To be more idiomatic, reworded the English description for spider bombs. --- lib/edit/r_info.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index abcf24cf..b37db658 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20637,8 +20637,7 @@ B:EXPLODE:HURT:30d2 F:EMPTY_MIND | COLD_BLOOD | F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE -D:$It is a small bomb of a form like a spider. -D:$It walks toward you! +D:$It is a small bomb in a spider-like package. It walks toward you! D:蜘蛛のような形の小さな爆弾で、あなたに向って歩き、爆発する。 # -- 2.21.1 (Apple Git-122.3) From cbf9fe3ea1f5fdd02073060bd0842ddf634d66b9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 08:56:08 -0800 Subject: [PATCH 149/335] Changed the English description of grand master thieves to make the first part a fully independent clause. Adjusted the punctuation in the rest to match what are separate clauses and what are not. --- lib/edit/r_info.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index b37db658..366240b8 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20775,8 +20775,9 @@ F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | F:EVIL | S:1_IN_2 | S:BLINK | TPORT | TELE_TO | CONF | TRAPS -D:$A class of its own: you are already too late to protect your possessions -D:$and he seems to have studied magic too, and is a master of setting traps. +D:$He is a thief almost without equal; you are already too late to protect +D:$ your possessions. He seems to have studied magic too and is a master +D:$ of setting traps. D:その技、だれにも真似はできない。今さら財産を守っても手遅れだ。 D:彼は魔法を学び、罠を仕掛けることを覚えているのだ。 -- 2.21.1 (Apple Git-122.3) From 5fde7f4d1ef92e05198b1d0ae043bc4c0bd7a2eb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:07:02 -0800 Subject: [PATCH 150/335] Reworded the English description for Charon to make the first part a complete sentence and, hopefully, clearer. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 366240b8..e1ab94be 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20800,8 +20800,8 @@ S:1_IN_3 | S:BLIND | HOLD | SCARE | CAUSE_3 | DARKNESS | S:BO_ICEE | BO_NETH | BA_COLD | BA_NETH | BA_WATE | S:S_UNDEAD -D:$The ferryman across the river Styx to the land of the dead. -D:$He wishes to receive payment for your entry. +D:$He is the ferryman for the boat to cross the river Styx to the land of +D:$ the dead. He wishes to receive payment for your entry. D:三途の川の死者の国への渡し守だ。 D:あなたを乗せて渡し賃をもらおうと考えている。 -- 2.21.1 (Apple Git-122.3) From 9c524d535c4e4cc1dc8fff10e96f47542bcb97c7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:11:26 -0800 Subject: [PATCH 151/335] Changed the English description for Red Helm to make the first part a complete sentence and to be more idiomatic. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e1ab94be..e4a7ce49 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20842,8 +20842,8 @@ B:BITE:HURT:3d10 F:MALE | ESCORT F:BASH_DOOR | FORCE_MAXHP | UNIQUE | DROP_CORPSE F:ANIMAL | EVIL | WILD_WOOD | WILD_MOUNTAIN | NO_SLEEP | NO_FEAR -D:$A king of mad bear. He had built his stronghold at Hutago mountain, -D:$and is reigning over there. +D:$He is king of the mad bears. He has built his stronghold at Hutago +D:$ mountain and reigns from there. D:二子峠に己の牙城を築き上げ君臨する凶熊どもの王だ。 N:1028:凶熊 -- 2.21.1 (Apple Git-122.3) From 7878d2b9dd0b05bb3d5c0eeb6b3a5a1c2ae5f77b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:13:17 -0800 Subject: [PATCH 152/335] Changed the English descrption for mad bears to describe a single specimen. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e4a7ce49..095c931c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20856,7 +20856,7 @@ B:CLAW:HURT:2d5 B:BITE:HURT:3d6 F:WEIRD_MIND | BASH_DOOR | FRIENDS | DROP_SKELETON | DROP_CORPSE F:ANIMAL | EVIL | WILD_WOOD | WILD_MOUNTAIN -D:$These bears are followers of Red Helm. +D:$This bear is a follower of Red Helm. D:『赤カブト』の配下の熊だ。 N:1029:ベビーサタン -- 2.21.1 (Apple Git-122.3) From 1c39603f2f9c3ae07220b2198a8b668dce7ac155 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:15:03 -0800 Subject: [PATCH 153/335] To be more idiomatic, dropped the article before "armor" in the English description for living armor. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 095c931c..091cefd2 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20983,7 +20983,7 @@ B:CRUSH:HURT:4d8 F:NEVER_MOVE | NONLIVING | NO_FEAR | F:STUPID | COLD_BLOOD | CHAR_MULTI | NO_CONF | NO_SLEEP | F:EVIL | IM_COLD | IM_FIRE | FORCE_MAXHP | IM_ELEC | IM_POIS -D:$It resembles a normal armor until some poor fool ventures too close! +D:$It resembles normal armor until some poor fool ventures too close! D:哀れで愚かな冒険者が近づいて来るまでは普通の鎧に似ている。 N:1036:トラップマスター -- 2.21.1 (Apple Git-122.3) From 43d193ea94eb63c3f58d7f502a6c1a848d1bd365 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:17:16 -0800 Subject: [PATCH 154/335] Changed the last part of the English description for rangers so that it's part of the prepositional phrase rather than independent. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 091cefd2..6dcc9617 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21054,7 +21054,7 @@ F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR S:1_IN_4 | S:SHOOT | MISSILE | S_MONSTER | BO_ELEC | BLINK D:$A warrior who is at one with nature. A master of both bow and sword, with -D:$minor spellcasting skills, and animals come to do his bidding. +D:$minor spellcasting skills and animals that come to do his bidding. D:自然と共に戦う戦士だ。弓にも剣にも達者で、多少の魔法も使うことができ、 D:動物達を飼い、従えている。 -- 2.21.1 (Apple Git-122.3) From 1108854355f79baf6bea607ee69bfdef570063c9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:20:25 -0800 Subject: [PATCH 155/335] Took out unneccesary capitalization in the English description for Ulfang the Black. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 6dcc9617..aebec4fc 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21174,7 +21174,7 @@ F:FORCE_MAXHP | HAS_LITE_1 | DROP_SKELETON | DROP_CORPSE | F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | F:EVIL -D:$A short and swarthy Easterling dressed in Black. +D:$A short and swarthy Easterling dressed in black. D:背が低くて浅黒い肌をした東夷で、黒い服に身を包んでいる。 N:1047:黄衣の修行僧 -- 2.21.1 (Apple Git-122.3) From 68fc936957827fcd8ba3b55209f2ef197da29616 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:22:40 -0800 Subject: [PATCH 156/335] In the English description for dimensional shamblers, dropped the article in fron of "skin" to be more idiomatic. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index aebec4fc..1777e841 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21285,7 +21285,7 @@ F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | F:IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE | S:1_IN_3 | S:HEAL | HASTE | BLIND | CONF | SCARE | TPORT | BLINK -D:$A shabby humanoid with a wrinkled skin. It seems to shift +D:$A shabby humanoid with wrinkled skin. It seems to shift D:$in and out of existance as you watch. D:しわくちゃの肌を持つみすぼらしい姿の人間型モンスターだ。 D:実存と非実存の間を行ったり来たりしている。 -- 2.21.1 (Apple Git-122.3) From bb4a024118dd33dde2e72d2ef29d3d8c9622be77 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:25:21 -0800 Subject: [PATCH 157/335] For clarity, added a comma and indefinite article to the English description for mori trolls. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 1777e841..1e80b06c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21422,7 +21422,7 @@ F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY #F:ONLY_ITEM | DROP_90 | DROP_GOOD | FRIENDLY | F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 | F:NO_CONF | NO_SLEEP -D:$Brazen faced this creature is more impudent than normal troll. +D:$Brazen faced, this creature is more impudent than a normal troll. D:面の皮は普通のトロルよりも厚い。 N:1061:『恐竜バーニーちゃん』 -- 2.21.1 (Apple Git-122.3) From 6555a8b824d11af4d953737fbdd221fc638a0501 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:30:34 -0800 Subject: [PATCH 158/335] Changed "louses" to "lice" in English label and description for Lousy. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 1e80b06c..4e78f2b9 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21464,7 +21464,7 @@ D:グルーの頭を笑う者は、そのうち笑えないことに気づくだ D:ていうかグルーを笑って生きのびた者はいない。 N:1063:巨大白シラミの王『lousy』 -E:Lousy, the King of Louses +E:Lousy, the King of Lice G:I:W I:130:11d11:8:10:10 W:9:3:0:100:0:0 @@ -21480,7 +21480,7 @@ F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | S:1_IN_6 S:S_KIN D:$This huge louse is the ruin of the sad man -D:$who had become a louse just because he loves louses. +D:$who had become a louse just because he loves lice. D:この巨大なシラミはシラミを愛するあまりシラミになってしまった D:哀れな人間のなれの果てだ。 -- 2.21.1 (Apple Git-122.3) From f54eeea8dbb3776d89741ca295613b3405d37405 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:35:14 -0800 Subject: [PATCH 159/335] To be more idiomatic, made a noun plural and added a definite article in the English description for Dionysus, the Munchkin of Chaos. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4e78f2b9..3991772a 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21582,7 +21582,7 @@ F:INVISIBLE | PASS_WALL | F:UNDEAD | EVIL S:1_IN_2 | S:SHOOT | TELE_AWAY | TPORT | HASTE | BLINK | HEAL -D:$He is one of the greatest trickster. Even greatest warrior cannot +D:$He is one of the greatest tricksters. Even the greatest warrior cannot D:$ defeat him, and his storm of holy might arrows from the dark have D:$ defeated numerous victims. D:彼はこの世界で最も偉大ないかさま師だ。いかなる剣の達人も彼に深い傷を -- 2.21.1 (Apple Git-122.3) From 0707efee00e21ef8f1a76b9452cd96c1b19f14c0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:44:44 -0800 Subject: [PATCH 160/335] To hopefully be more idiomatic, changed the English description for the Cockatrice. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 3991772a..79fce7d4 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21890,8 +21890,8 @@ F:DROP_CORPSE | ONLY_GOLD | DROP_2D2 | DROP_4D2 | F:NO_SLEEP | RES_INER | IM_POIS | S:1_IN_5 | S:SHRIEK -D:$It will make animals into stone-like objects. Be aware, -D:$you become to stone if you touch it with your empty hand! +D:$It can turn an animal into a stone statue. Beware, you will turn to +D:$ stone if you touch it with your bare hand! D:こいつは獲物を石像のようにしちまうんだ。 D:気をつけろ!素手で触ると石になっちまうぞ。 -- 2.21.1 (Apple Git-122.3) From 180f8a3e344f18dcc60af675da0335af47ad3190 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:49:52 -0800 Subject: [PATCH 161/335] Changed phrase in the English description for Muzgash to be more idiomatic and get rid of a spelling mistake. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 79fce7d4..02b4ca35 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22098,7 +22098,7 @@ F:EVIL | ORC | RES_DARK S:1_IN_3 | S:SHOOT D:$A captain of a regiment of weaker orcs, -D:$Muzgash schemes promotion by flattety to his superiors. +D:$Muzgash schemes promotion by flattering his superiors. D:$"I've told you twice that Gorbag's swine got to the gate first, and none D:$of ours got out. Lagduf and Muzgash ran through, but they were shot." D:ムズガッシュは弱いオークの部隊を指揮する隊長で、上役にへつらい出世を企んでいる。 -- 2.21.1 (Apple Git-122.3) From 01a2f4da91ccd6ca3ed48c4e1b947ea044f4e75a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 23 Dec 2019 09:58:22 -0800 Subject: [PATCH 162/335] Reworded the English description for rat ogres. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 02b4ca35..9986aa08 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22219,8 +22219,8 @@ B:HIT:SUPERHURT:5d4 B:BITE:POISON:9d3 F:EVIL | DROP_1D2 | DROP_SKELETON | DROP_CORPSE | FORCE_SLEEP F:OPEN_DOOR | MALE | WILD_WASTE | WILD_SWAMP | NO_FEAR -D:$It's a biped walking monster, seems subspecies of Skaven, -D:$but it's larger and more terrible than them. +D:$Walking on two legs, this creature looks like a Skaven, of sorts, but it's +D:$ larger and more terrible than a Skaven. D:それはスケイヴンの亜種と思われるが、より大きくおぞましい二足歩行の怪物だ。 N:1103:拡散の尖兵 -- 2.21.1 (Apple Git-122.3) From 9879f9ca7f1c58b704768c7f9797d96d6f9714c2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 05:46:28 -0800 Subject: [PATCH 163/335] Added an English description for Druaga. For the number of arms and skin color, I followed the result from Google Translate for the Japanese description, but the "Tower of Druaga" wiki, https://towerofdruaga.fandom.com/wiki/Druaga , says Druaga has eight arms and green skin. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 9986aa08..4bc69f7a 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19246,6 +19246,9 @@ F:OPEN_DOOR | RES_NETH | RES_PLAS | F:EVIL | IM_FIRE | NO_CONF | NO_SLEEP S:1_IN_3 | S:S_DEMON | BA_CHAO | BO_PLAS | BR_FIRE | BR_PLAS +D:$This horrible creature has four legs, nine arms, and bluish skin. It wears +D:$ a high golden crown with horns on either side. Large fangs protude from +D:$ its mouth. According to legend, it guards an artifact that Ishtar wants. D:脚が4本。腕は9本。 D:両脇から角が出ている丈高めの黄金の冠をかぶる。体色は青。牙を持つ。 D:女神イシターを封印したと伝えられる。 -- 2.21.1 (Apple Git-122.3) From 7ed02cdb70959f6c0f88d662c19439c829696c36 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 05:53:09 -0800 Subject: [PATCH 164/335] Reworded the English description for Hoarmurath of Dir for clarity. The result tries to paraphrase Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4bc69f7a..c3562a30 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19330,8 +19330,8 @@ S:1_IN_3 | S:BLIND | HOLD | SCARE | CAUSE_3 | CAUSE_4 | MIND_BLAST | S:BO_COLD | BA_COLD | BA_NETH | S:S_UNDEAD | S_HI_UNDEAD -D:$A Ringwraith powerful in fell sorcery, he yearns for the life he has lost -D:$for a life of everlasting torment. +D:$Is a Ringwraith powerful in fell sorcery. He suffers eternally yearning +D:$ for his lost soul. D:堕落した魔法使いである強力な指輪の幽鬼だ。彼は魂を失って永劫の苦しみの中に D:いるため、新たな魂を心から渇望している。 -- 2.21.1 (Apple Git-122.3) From 1a8f9fa6f79c06a80058dc5bf95d4ffc1c0d7472 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:09:39 -0800 Subject: [PATCH 165/335] Added an English description for buzzy beetles. I wasn't sure what to make of Google Translate's result. Is "stunned by the magic powerlessness" meant to be an oblique reference to the contents of the creature flags? So I went with a physical description that drops the second part about the cribeau (that seems to be a Mario reference but didn't find out what it is). --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index c3562a30..a01f4dff 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19543,6 +19543,7 @@ F:ONLY_GOLD | DROP_90 | F:EMPTY_MIND | BASH_DOOR | REFLECTING | F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | IM_ACID | F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING +D:$It walks on four legs and has a shiny shell like that of a beetle. D:このモンスターに対してはあまりの魔法の無力さに呆然とするであろう。 D:噂では中にクリボーが入っているとか…… -- 2.21.1 (Apple Git-122.3) From f8f90466348e6a621bd1228beba15188f31693bf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:16:02 -0800 Subject: [PATCH 166/335] Added an English description for the kamikaze hounds. It's based on Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index a01f4dff..f0f704d6 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19557,6 +19557,7 @@ F:FORCE_SLEEP | F:FRIENDS | F:OPEN_DOOR | BASH_DOOR | F:ANIMAL | NO_CONF | NO_SLEEP +D:$This dog is about to explode. D:今にも爆発しそうな犬だ。 N:953:折れたデスソード -- 2.21.1 (Apple Git-122.3) From d15c57e1c10ac9556a41e0b5e5327af8707963b5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:18:50 -0800 Subject: [PATCH 167/335] Added an English description for broken death swords. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f0f704d6..f217cdec 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19572,6 +19572,7 @@ B:HIT:POISON:1d1 F:NONLIVING | NO_FEAR | F:STUPID | COLD_BLOOD | NO_CONF | NO_SLEEP | F:EVIL | IM_COLD | IM_FIRE | IM_ELEC | IM_POIS +D:$This broken sword moves about, searching for prey. D:獲物の血を求めて動き回る折れた剣だ。 N:954:オークの弩弓隊 -- 2.21.1 (Apple Git-122.3) From dfc47ca26e80ab7a8693303c55d44b8d1e356640 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:23:38 -0800 Subject: [PATCH 168/335] Reworded the English description of horses for clarity. --- lib/edit/r_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f217cdec..ae9e3dfb 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19607,7 +19607,6 @@ F:ANIMAL | DROP_SKELETON | DROP_CORPSE | RIDING D:$This pitiful horse has not been well fed, it walks unsteadily. D:満足に飼葉も与えられていないがりがりでふらふらの哀れな馬だ。 -# Description in English by Nick Keulmann N:956:馬 E:Horse G:q:o @@ -19617,8 +19616,8 @@ B:BITE:HURT:1d8 B:KICK:HURT:2d4 F:WILD_WASTE | BASH_DOOR | F:ANIMAL | DROP_SKELETON | DROP_CORPSE | RIDING -D:$As for the horse with the animal of four feet which can run fast, -D:$it was utilized for a long time as the vehicle of the human. +D:$This four-legged beast is capable of running quickly. Others like it +D:$ have been used by humans as vehicles since ancient times. D:馬は速く駆けることのできる四本足の獣で、 D:古くから人間の乗り物として利用されてきた。 -- 2.21.1 (Apple Git-122.3) From b38998a772f44085ea4bb11f8b7ba6679ef855f3 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:34:40 -0800 Subject: [PATCH 169/335] Added an English description for Botei-Building. It's largely cribbed from https://villains.fandom.com/wiki/Botei though the last sentence borrows from Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index ae9e3dfb..7a2324dd 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19721,6 +19721,10 @@ F:REGENERATE | EAT_GIVE_STR | EAT_GIVE_CON | EAT_LOSE_INT | EAT_LOSE_CHR | S:1_IN_6 | S:BR_SHAR | TELE_TO V:150 +D:$This muscle-bound man with a horned helmet has won the Great Galaxy +D:$ Bodybuiling championship ten times in a row. He is eager to prevent +D:$ anyone from challenging his title. He's also know for his signature +D:$ move, the Bo Emperor Building Cutter. D:銀河ボディビルコンテスト十連続グランドチャンピオン。 D:必殺技はボ帝ビルカッター。 -- 2.21.1 (Apple Git-122.3) From 53a95b5a96d29a812fc6041d426238ee4a5ef9c0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 06:38:58 -0800 Subject: [PATCH 170/335] Added an English description for "Statue of Chest mimic mimic" that paraphrases Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 7a2324dd..ceda1192 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19753,6 +19753,9 @@ F:NO_CONF | NO_SLEEP | NO_FEAR S:1_IN_5 | S:BLIND | CONF | SCARE | CAUSE_2 | BA_POIS | S:S_MONSTER +D:$This strange creature, transformed into an image of a strange creature +D:$ that is transformed into an abandoned box, waits for a stupid adventurer +D:$ to get close to its poisonous claws. D:放置された箱に化けている奇妙な生物の像に化けている奇妙な生物で、 D:愚かな冒険者がその毒のある爪の射程に入るのを待ち構えている。 -- 2.21.1 (Apple Git-122.3) From 6718698e8e4fd4d008e1f963078dbe5c1b5b3096 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 08:34:43 -0800 Subject: [PATCH 171/335] Added an English description for Luigi. It is Google Translate's result for the Japanese description with the parenthetical phrase omitted (that phrase, "principal claim", didn't mean anything to me). --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index ceda1192..ff446d57 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19774,6 +19774,7 @@ F:OPEN_DOOR | GOOD | CAN_SWIM | CAN_FLY | F:NO_CONF | NO_SLEEP | FRIENDLY | TAKE_ITEM | S:1_IN_4 | S:BA_FIRE | HASTE | HOLD | CONF | BLIND +D:$Absolutely not a Mario analog! D:断じてマリオの類似品ではない!(本人主張) N:967:ガキ大将『ジャイアン』 -- 2.21.1 (Apple Git-122.3) From e6ccdbdc987780da557701d434e6a20e10d97924 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 08:43:48 -0800 Subject: [PATCH 172/335] Added an English description for Jaian. It is his catchphrase, as given at https://doraemon.fandom.com/wiki/Takeshi_Gouda ; that is also close to Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index ff446d57..3a2b808d 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19793,6 +19793,7 @@ F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM | MOVE_BODY | RES_SOUN S:1_IN_5 | S:BR_SOUN | V:150 +D:$What's yours is mine, and what's mine is mine. D:お前のものは俺のもの。俺のものは俺のもの。 N:968:氷竜『ブラムド』 -- 2.21.1 (Apple Git-122.3) From a450bc6e999bcecbb4fe43eb5cf41d89d1a37b70 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 08:47:00 -0800 Subject: [PATCH 173/335] Corrected English usage in the description for Shooting Star the Red Dragon. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 3a2b808d..10dd9c4a 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19895,7 +19895,7 @@ F:NO_FEAR | NO_STUN | RIDING | S:1_IN_3 | S:BRAIN_SMASH | BR_FIRE | BA_FIRE D:$One of the ancient dragons of Lodoss, it causes destruction -D:$with it's breath of fire. +D:$with its breath of fire. D:ロードスの古代竜の一匹で、その火炎のブレスで全てを焼き尽くす。 N:973:暗黒の島マーモの皇帝『ベルド』 -- 2.21.1 (Apple Git-122.3) From 7f04441f5328bb2bf9e337b8e9f40b33d4dfe5e5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:07:47 -0800 Subject: [PATCH 174/335] Added an English description for Shuten-douji. It is an interpolation of Google Translate's result for the Japanese description and Wikipedia's entry for Shuten-doji. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 10dd9c4a..3eaee561 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20032,6 +20032,8 @@ F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_CORPSE | F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | AURA_ELEC | F:EVIL | GIANT | IM_POIS | IM_FIRE | IM_ELEC A:194:1:33 +D:$Living on Mt. Oe, in the province of Tanba, this large ogre seized young +D:$ women and treasure from nearby Kyoto. D:丹波の国の大江山をねぐらとし、京の都を襲っては財宝と娘を D:奪う凶悪な鬼どもの首領だ。 -- 2.21.1 (Apple Git-122.3) From 6b6a448feb52d86d915c5c50368c24dc9201b041 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:16:43 -0800 Subject: [PATCH 175/335] Added an English description for Durahan. It is a paraphrase of Google Translate's result for the Japanese description with the assumption that the starting point is the dullahan from Irish mythology. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 3eaee561..88bad7c7 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20080,6 +20080,7 @@ F:COLD_BLOOD | OPEN_DOOR | CAN_FLY | F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_NETH | NO_CONF | NO_SLEEP | S:1_IN_5 S:BLIND | HOLD | SCARE | CAUSE_4 | BO_NETH | S_UNDEAD +D:$Carrying its head in its hand, this ominous monster comes to announce death. D:この不吉なモンスターは自分の首を脇に抱え、死を告げにやってくる。 N:983:ヒバゴン -- 2.21.1 (Apple Git-122.3) From d3b3197eb9843ec783a6380a7950f4189a79aff2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:27:39 -0800 Subject: [PATCH 176/335] Added an English description for the hibagons, based on Google Translate's result for the Japanese description and Wikipedia's entry for the hibagon. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 88bad7c7..95527556 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20093,6 +20093,9 @@ B:CLAW:HURT:1d7 B:BITE:HURT:2d7 F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN | DROP_CORPSE | F:ANIMAL +D:$Resembling a monkey but, at five feet tall, much larger than monkey, this +D:$ animal must be one of the mysterious beasts that live around Mt. Hiba in +D:$ Hiroshima Prefecture. D:広島県の比婆山一帯に現れる「サルに似ているが、サルよりも大きな」謎の動物。 N:984:鵺 -- 2.21.1 (Apple Git-122.3) From bc27c22b91cd4a7be7c812289d37bc0c336ab618 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:39:44 -0800 Subject: [PATCH 177/335] Added an English description for Nue. It's an interpolation of Google Translate's result for the Japanese description and the English Wikipedia entry for Nue. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 95527556..0349b919 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20108,6 +20108,10 @@ B:CLAW:HURT:1d10 B:BITE:POISON:1d10 F:FORCE_SLEEP | DROP_CORPSE | ANIMAL | F:BASH_DOOR | WILD_MOUNTAIN | +D:$This strange hybrid has the head of a monkey, the body of a racoon dog, +D:$ the legs of a tiger and a tail that is the front half of a snake. It +D:$ makes an eerie, sorrowful cry, like that of a scaly thrush, and is +D:$ wreathed with clouds of black smoke. D:頭がサル、胴はタヌキ、尾はヘビ、手足はトラで、鳴き声はトラツグミに D:似ていたという奇妙な生物だ。非常に変わった D:外見をしていて、近寄りがたい雰囲気がある。 -- 2.21.1 (Apple Git-122.3) From 960343cd6d16a7c74b2e775fbb1449f91a5ee684 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:42:57 -0800 Subject: [PATCH 178/335] Added an English description for unicorns. It is Google Translate's result for the Japanese description cast as a complete sentence. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 0349b919..f23dc23d 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20128,6 +20128,7 @@ B:BITE:LOSE_ALL:3d8 F:REFLECTING | DROP_1D2 | DROP_2D2 | RES_DISE | ANIMAL | F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | F:NO_CONF | NO_SLEEP | RES_TELE | CAN_SWIM | RIDING +D:It is a white horse with a horn on its forehead. D:額に一本の角を持った白馬で、乙女にのみ心を許すと言われる。 N:986:猫又 -- 2.21.1 (Apple Git-122.3) From 0f9f91bb25f5f69d9bd0858f39ea0a514ff73bbf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 09:57:52 -0800 Subject: [PATCH 179/335] Added an English description for nekomata. It's largely cribbed from the description of nekomata of domestic cat origin in Wikipedia's entry for nekomata and does not try to match Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f23dc23d..72680b8a 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20142,6 +20142,8 @@ F:MALE | EVIL | FORCE_SLEEP | DROP_1D2 | ANIMAL | F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE S:1_IN_3 | S:SCARE | CAUSE_2 | S_MONSTER +D:$This cat has a second tail. There are fables about old cats becoming +D:$ such creatures and bedeviling people. D:猫が年老いると次第に高い知能と分かれた尻尾を持ち、猫又になるという。 N:987:九尾の狐 -- 2.21.1 (Apple Git-122.3) From 11f597b0759b278c9520f0247cae449bd0c5d583 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 10:04:41 -0800 Subject: [PATCH 180/335] Added an English description for the nine-tailed foxes. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 72680b8a..e7ca5e1c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20161,6 +20161,7 @@ F:NO_CONF | NO_SLEEP | RES_TELE | RIDING | S:1_IN_2 S:S_MONSTERS | CAUSE_3 | CAUSE_4 | CONF | BRAIN_SMASH | DRAIN_MANA | SCARE | S:HASTE | HOLD | +D:It is a fox with nine tails, and you can sense its strong magical power. D:尾が九つに分かれた狐で、強い妖力を秘めている。 N:988:鳳凰 -- 2.21.1 (Apple Git-122.3) From 2f47edd8f96d4e279dbd5d4afd289cae4ccd43cd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 18:05:32 -0800 Subject: [PATCH 181/335] Added an English description for Yukionna. It uses the quote from Lafcadio Hearn's story with a short introduction to give it context. --- lib/edit/r_info.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e7ca5e1c..79fae4ed 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -18992,6 +18992,13 @@ B:TOUCH:COLD:3d5 F:FEMALE | IM_COLD | DROP_1D2 | NONLIVING | AURA_COLD | S:1_IN_5 S:BR_COLD | BO_COLD | BA_COLD +D:$This female figure stirs the memory of a tale of two woodcutters sheltering +D:$ from a winter storm in a small hut: "He was awakened by a showering of +D:$ snow in his face. The door of the hut had been forced open; and, by the +D:$ snow-light he saw a woman in the room, - a woman all in white. She was +D:$ bending above Mosaku, and blowing her breath upon him; - and her breath +D:$ was like a bright white smoke." (from Lafcadio Hearn's "Yuki-onna" in his +D:$ collection of stories, "Kwaidan: Stories and Studies of Strange Things") D:顔に雪がさかんに降りかかるので、巳之吉は目をさました。 D:小屋の戸はむりにこじ開けられて、小屋の中に一人の女―すっかり白い装いをした D:女がいるのが、雪明かりで見えた。女は茂作のうえに身をかがめて、 -- 2.21.1 (Apple Git-122.3) From bea889679ca71dc926eba06a233b0d73cfa2a792 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 24 Dec 2019 21:17:51 -0800 Subject: [PATCH 182/335] Added an English description for fenghuang. It very roughly follows the first part of Google Translate's result for the Japanese description but for the body parts listed in that result uses the source animal from the English Wikipedia entry for fenghuang (where the source is given as the ancient Chinese book, Erya). I dropped the five legs (the Wikipedia entry does mentions versions with three and others with five tails) and dragon pattern mentioned in Google Translate's result as well as the "front is Hong, back is Lin" (though that seems close to another part of the Wikipedia entry where another old Chinese book assigns words to parts of the fenghuang). --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 79fae4ed..5b404bc8 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20190,6 +20190,10 @@ S:1_IN_3 | S:SCARE | BRAIN_SMASH | DRAIN_MANA | S:BR_FIRE | BR_LITE | BR_SOUN | HEAL | S_ANGEL V:133 +D:$It is a ruler among the birds and a symbol of virtue and grace. It has +D:$ the beak of a rooster, the face of a swallow, the forehead of a fowl, +D:$ the neck of a snake, the back of a tortoise, the hindquarters of a stag, +D:$ and tail of a fish. D:伝説の聖なる鳥だ。前は鴻、後は麟、顎は燕、嘴は鶏、頸は蛇、尾は魚、額は鸛、 D:顋は鴛、背は亀甲、羽は五采を備え、龍の紋様を持つと言う。 -- 2.21.1 (Apple Git-122.3) From d838141cab4a9e559a88c6279257048200eda67e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 09:24:52 -0800 Subject: [PATCH 183/335] Added an English description for kirin. It's not particularly close to what Google Translate gives for the Japanese description and relies more on the English Wikipedia entry for qilin, especially the description of the Japanese variant. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 5b404bc8..a225add3 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20215,6 +20215,8 @@ F:NO_STUN | NO_CONF | NO_SLEEP | RIDING S:1_IN_6 | S:BLIND | SHRIEK | DISPEL | INVULNER | S_ANGEL V:133 +D:$It is deer-like but with the scales of a dragon and the tail of an ox. All +D:$ accounts attest to its holiness and power. D:龍の鱗に牛の尾、馬の蹄を持ち、角の生えた四本足の聖なる獣で、 D:王者が仁のある政治を行った時に姿を現わすと言われている。 -- 2.21.1 (Apple Git-122.3) From 40b0d12c3d167582ed736277c6e4df7b351c44cd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 09:31:38 -0800 Subject: [PATCH 184/335] Added an English description for Pegasus. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index a225add3..bf6b5ba3 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20230,6 +20230,7 @@ B:BITE:HURT:3d8 B:KICK:HURT:4d10 B:KICK:HURT:4d10 F:DROP_2D2 | ANIMAL | NO_SLEEP | CAN_FLY | RIDING +D:$It is a large white horse with wings. D:翼の生えた天駆ける白馬だ。 N:991:オーディンの乗馬『スレイプニル』 -- 2.21.1 (Apple Git-122.3) From 2b89764e9147b377529794fdf5f676b39e4c8d89 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 09:32:19 -0800 Subject: [PATCH 185/335] To be more idiomatic, dropped "the" from the English label for Sleipnir. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index bf6b5ba3..17619ef8 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20234,7 +20234,7 @@ D:$It is a large white horse with wings. D:翼の生えた天駆ける白馬だ。 N:991:オーディンの乗馬『スレイプニル』 -E:Sleipnir, the Odin's Steed +E:Sleipnir, Odin's Steed G:q:o I:130:40d100:20:140:50 W:51:3:0:17000:0:0 -- 2.21.1 (Apple Git-122.3) From b1ad3f84a4b3470adf4966c582d70ee64a839ae6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 11:15:20 -0800 Subject: [PATCH 186/335] Added an English description for Sleipnir. It is a paraphrased version of Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 17619ef8..35e869d9 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20245,6 +20245,8 @@ B:BITE:HURT:10d10 F:FORCE_MAXHP | UNIQUE | ANIMAL | CAN_FLY | F:REGENERATE | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | F:IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | RIDING +D:$This great eight-legged horse is Odin's mount. It is said to be the child +D:$ of Loki, the giant. D:オーディンの乗馬たるスレイプニルは、8本の足を持つ名馬である。 D:巨人ロキの子供であると言われている。 -- 2.21.1 (Apple Git-122.3) From e460b06ed425bcf5a3bd431b67860c3e93f1822b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 11:41:31 -0800 Subject: [PATCH 187/335] Added an English description for Huan. It largely covers the same ground as Google Translate's result for the Japanese description but adds a note about Huan's size and drops the clause about the special mission. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 35e869d9..b962d5af 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20263,6 +20263,10 @@ F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | WILD_WOOD | F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | GOOD | FRIENDLY | F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | RIDING | F:ANIMAL | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP +D:$As large as a small horse, Huan, the hound of Valinor, has the ability to +D:$ understand and speak the languages of elves and men. However, he never +D:$ speaks in front of Feanor's sons as he's only allowed to speak three times +D:$ before he dies. D:ヴァリノールの猟犬たるフアンは特別な力を持ち、人語を理解し、そして D:話すことができる。しかし、フェアノールの子息達の前で話すことは無い。 D:なぜならば彼は死ぬまでに3度しか話をすることを許されておらず、 -- 2.21.1 (Apple Git-122.3) From 9a92326bd477ab9bd8774d6eade3a4a0968d0048 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 11:47:33 -0800 Subject: [PATCH 188/335] To be more idiomatic, made "hair" plural in the English description for the Ghost 'Q'. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index b962d5af..c2c1535b 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20449,7 +20449,7 @@ F:ONLY_ITEM | DROP_90 | DROP_GOOD | F:INVISIBLE | COLD_BLOOD | PASS_WALL | RES_NETH F:UNDEAD | NO_SLEEP V:25 -D:$He has only three hair. He is careless, but kind, and always a bit hungry. +D:$He has only three hairs. He is careless, but kind, and always a bit hungry. D:毛が三本しかないんだよ。ずっこけなんだ優しい奴さ。 D:いつもおなかを空かせているんだよ。 -- 2.21.1 (Apple Git-122.3) From 76b1b503280406a56189d887a2d082f86c8656b2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 12:12:19 -0800 Subject: [PATCH 189/335] Added an English description for Pip and changed "braver" to "adventurer" in the English label for Pip. Since I don't have ready access to the source material (J.H. Brennan's "The Castle of Darkness"), I didn't include the comparable quotes that appear in the Japanese description. --- lib/edit/r_info.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index c2c1535b..04be259a 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20454,7 +20454,7 @@ D:毛が三本しかないんだよ。ずっこけなんだ優しい奴さ。 D:いつもおなかを空かせているんだよ。 N:1004:異世界からの勇者『ピップ』 -E:Pip, the Braver from Another World +E:Pip, the Adventurer from Another World G:p:u I:110:20d48:20:80:15 W:35:3:0:1800:0:0 @@ -20469,6 +20469,9 @@ F:NO_CONF | NO_SLEEP | FRIENDLY | TAKE_ITEM | S:1_IN_5 | S:BA_FIRE | HOLD | BO_FIRE | HEAL A:179:1:50 +D:$Merlin the magician summoned this young warrior to complete a variety of +D:$ tasks. Pip carries a dubious sword, created by Merlin and modeled on King +D:$ Arthur's Excalibur. D:かの大魔術師マーリンが異世界から召喚した(と言い張っている)戦士だ。 D:「若者はエクスカリバーを短くしたような怪しげな剣を持ち、 D:稲妻だとか火の玉だとか、わけのわからぬことを呟いている。」 -- 2.21.1 (Apple Git-122.3) From b4f36692ab185a000e0b5b5ebbb6338eb8586863 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 12:21:43 -0800 Subject: [PATCH 190/335] Added an English description for Ansalom. Basically it's close to what Google TTranslate gives for the last part of the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 04be259a..fc215ec6 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20494,6 +20494,8 @@ F:IM_ACID | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | EVIL S:1_IN_2 | CAUSE_3 | BA_FIRE | HOLD | BLIND | CONF | SCARE S:TRAPS | BO_PLAS | BO_NETH S:BA_DARK | S_HOUND +D:$This black-haired sorceror does all he can to wither crops, steal pigs, +D:$ dry up waterways, and kidnap a queen. D:「そこには、魔法の杖を持った黒髪、黒髭、黒い目をして、 D:黒いローブをまとったいかにも極悪非道といった感じの男が描かれた絵が、 D:無造作に貼り付けてある」 -- 2.21.1 (Apple Git-122.3) From 431f6cec1226c0e29f057109c541ae0d1abfdc0d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 12:55:08 -0800 Subject: [PATCH 191/335] Added an English description for Raou. It is an interpolation between the result of Google Translate for the Japanese description and the content in the English Wikipedia entry for Raoh, the character from Fist of the North Star. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index fc215ec6..8a2be3ac 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20724,6 +20724,10 @@ F:DROP_2D2 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | CAN_SWIM | F:GOOD | IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE | S:1_IN_3 | S:CAUSE_3 | TELE_TO +D:$Raou is the eldest of four honorary brothers, another being Kenshirou, +D:$ who were trained by the master of Hokuto Shinken, a martial art. +D:$ Headstrong, Raou tries to forge a new order through conquest in a +D:$ turbulent dark era. D:ラオウは北斗神拳伝承者ケンシロウの義兄であり北斗神拳の使い手である。 D:激動の闇の時代に、己の信念で新たな時代を築こうとした。 -- 2.21.1 (Apple Git-122.3) From 1c6cf1ea9e011f05947bc16d38507ffa5cd82bb7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 12:57:25 -0800 Subject: [PATCH 192/335] Added an English description for Kenshirou. It is a paraphrase of the result from Google Translate for the Japanese description. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 8a2be3ac..7ba8596b 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -19276,6 +19276,8 @@ F:DROP_2D2 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | CAN_SWIM | F:GOOD | IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE | S:1_IN_3 | S:CAUSE_4 | TELE_TO +D:$He is the rightful master of the martial art, Hokuto Shinken. At a time +D:$ when power seems to be everything, he lives in love and fights for love. D:一子相伝とされる北斗神拳の伝承者だ。力が全てを支配すると思われた D:時代にあって愛に生き、愛のために戦っている。 -- 2.21.1 (Apple Git-122.3) From 4ef461229d3b8cf4a7c7c26f690da26715efef72 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 13:01:24 -0800 Subject: [PATCH 193/335] Added an English description for Kokuo. It is essentially what Google Translate gives for the Japanese description. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 7ba8596b..e12c8ed2 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20747,6 +20747,7 @@ B:BITE:HURT:6d6 F:FORCE_MAXHP | UNIQUE | ANIMAL | F:REGENERATE | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | F:IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | RIDING +D:$This rough horse, with its large black body, is just right for Raou. D:黒く大きな体をしたこの荒ぶる馬は、まさにラオウの乗馬にふさわしい。 # -- 2.21.1 (Apple Git-122.3) From 24043082be9a7396cae3849efb00e029d666327d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 13:07:50 -0800 Subject: [PATCH 194/335] To be a bit more idiomatic, added some articles and changed a pronoun in the English description for Nappa. --- lib/edit/r_info.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index e12c8ed2..4c52fb35 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20802,10 +20802,9 @@ F:EVIL | REGENERATE | F:OPEN_DOOR | BASH_DOOR | RES_WALL S:1_IN_8 | S:TELE_TO | BO_MANA -D:$He looks like brawny human being apparently. -D:$However, unlike man, it has the tail of a monkey. -D:$This tail proves he is a Saiyan. -D:$A Saiyan's fighting power is far superior to human's and will bring many destruction. +D:$He looks like a brawny human. However, unlike a man, he has the tail of a +D:$ monkey. This tail proves he is a Saiyan. A Saiyan's fighting power is +D:$ far superior to a human's and will cause much destruction. D:逞しい人間のようだが、猿の尻尾が付いている。これこそがサイヤ人の証だ。 D:その戦闘力は人間を凌駕し、多くの破壊を呼び起こすだろう。 -- 2.21.1 (Apple Git-122.3) From 5d712a7152120b0046e5d66401d20114565cff97 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 13:18:42 -0800 Subject: [PATCH 195/335] Replaced "southerings" in the English labels and descriptions for the uniques from the "Romance of the Three Kingdoms" with the more idiomatic "the southerners". --- lib/edit/r_info.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4c52fb35..7f067194 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20933,7 +20933,7 @@ D:$A demon small in stature whose face you can't help but love. D:憎めない顔をした小柄な悪魔だ。 N:1030:南蛮王『孟獲』 -E:Meng Huo, the King of Southerings +E:Meng Huo, the King of the Southerners G:p:o I:110:38d10:20:50:20 W:18:2:0:250:0:0 @@ -21732,7 +21732,7 @@ F:UNIQUE | MALE | EVIL | HAS_LITE_2 | HUMAN | F:FORCE_MAXHP | CAN_SPEAK | WILD_ALL | DROP_SKELETON | DROP_CORPSE | F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | F:OPEN_DOOR | BASH_DOOR -D:$He is a junior brother of king of southerings Meng Huo. +D:$He is a junior brother of the king of the southerners, Meng Huo. D:南蛮王孟獲の弟だ。武勇には多少の自信がある。 N:1074:火の神『祝融』 @@ -21754,7 +21754,7 @@ D:南蛮王孟獲の妻だ。彼女は火の神の化身と言われている。 D:その武勇を侮るな。 N:1075:南蛮人『帯来洞主』 -E:Dailai Dongzhu, the Captain of Southerings +E:Dailai Dongzhu, the Captain of the Southerners G:p:u I:110:22d10:20:35:20 W:10:2:0:100:0:0 @@ -21772,7 +21772,7 @@ D:$He comes to help his sister and her husband Meng Huo. D:南蛮王孟獲の援軍として現れた南蛮の将だ。孟獲の義理の弟にあたる。 N:1076:禿竜洞主『朶思大王』 -E:King Duosi, the Chief of Southerings +E:King Duosi, the Chief of the Southerners G:p:v I:110:25d10:20:45:20 W:11:2:0:150:0:0 @@ -21789,7 +21789,7 @@ D:$the enemy. D:南蛮随一の知恵者と言われる有力領主だ。彼の知略は蜀軍を苦しめた。 N:1077:南蛮の酋長『木鹿大王』 -E:King Mulu, the Chief of Southerings +E:King Mulu, the Chief of the Southerners G:p:g I:110:35d10:20:45:20 W:16:2:0:250:0:0 @@ -21807,7 +21807,7 @@ D:南蛮を支配する酋長の一人だ。彼の動物軍団には孟獲も絶 D:ただしカラクリは嫌いだ。 N:1078:烏戈国王『兀突骨』 -E:Wutugu, the Chief of Southerings +E:Wutugu, the Chief of the Southerners G:P:u I:110:35d10:20:60:20 W:17:2:0:250:0:0 -- 2.21.1 (Apple Git-122.3) From ad276c1a62c24a6c490bbbb6c55f22723d91127a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 13:20:53 -0800 Subject: [PATCH 196/335] To be more idiomatic, inserted an article in the English description for King Mulu. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 7f067194..be515e61 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21802,7 +21802,7 @@ F:FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | OPEN_DOOR | BASH_DOOR S:1_IN_6 | S:S_ANT | S_SPIDER -D:$He is one of chiefs of Nanman. He is also good beast master. +D:$He is one of chiefs of Nanman. He is also a good beast master. D:南蛮を支配する酋長の一人だ。彼の動物軍団には孟獲も絶大な信頼を寄せる。 D:ただしカラクリは嫌いだ。 -- 2.21.1 (Apple Git-122.3) From d227b1ad7eb2a03483c9e7c05481c911b90b420e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 13:25:32 -0800 Subject: [PATCH 197/335] Changed the English description for Lady Zhurong to be more idiomatic and to correct a spelling mistake. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index be515e61..63d3d7bb 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21748,8 +21748,8 @@ F:FORCE_MAXHP | CAN_SPEAK | WILD_ALL | DROP_SKELETON | DROP_CORPSE | F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | OPEN_DOOR | BASH_DOOR | S:1_IN_9 S:SHRIEK -D:$She is the wife of king Meng Huo. She is called as the avater of -D:$flame spirit. +D:$She is the wife of king Meng Huo. She is said to be an avatar of a +D:$ flame spirit. D:南蛮王孟獲の妻だ。彼女は火の神の化身と言われている。 D:その武勇を侮るな。 -- 2.21.1 (Apple Git-122.3) From f9a1ea24fa6b43f938621dbcbf8cb197df603011 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:15:42 -0800 Subject: [PATCH 198/335] Changed the English description of Wahha-man: interpolated between what was there and the brief online synopses for the Wahhaman manga. --- lib/edit/r_info.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 63d3d7bb..640ef9d9 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -20967,8 +20967,9 @@ F:NO_CONF | NO_SLEEP | CAN_FLY | F:COLD_BLOOD | BASH_DOOR | POWERFUL | RAND_25 | F:GOOD | DROP_CORPSE | SELF_LITE_2 V:150 -D:$He was the braver of Atlantis. His body was converted by a Shinto priest, -D:$in order to fight against "Papa". His body is now made by Orihalcon. +D:$He is a robotic soldier from the lost city of Atlantis. Rediscovered in +D:$ Tokyo, a Shinto priest converted his body into orihalcon to fight against +D:$ "Papa". D:もとはアトランティスの勇者。 D:『パパ』に立ち向かうために神官の手によってオリハルコンの体に改造された。 -- 2.21.1 (Apple Git-122.3) From fd8e0e7a22c34fe799fae8e09ac6c4bdae95cde0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:19:52 -0800 Subject: [PATCH 199/335] Added an English description for trap masters. It is essentially the same as Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 640ef9d9..6e32ad30 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21056,6 +21056,7 @@ F:MALE | HUMAN | DROP_SKELETON | DROP_CORPSE | F:DROP_1D2 | EAT_GIVE_DEX | EAT_LOSE_WIS | OPEN_DOOR | BASH_DOOR | EVIL | S:1_IN_2 | S:TRAPS | BLINK +D:$Be careful! When you see him, you're likely already surrounded with traps. D:気をつけろ!姿を見たときはすでに罠に囲まれているぞ。 N:1037:聖堂騎士 -- 2.21.1 (Apple Git-122.3) From c32081411d04fb76d73c8d51087f8f53195fafcf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:23:07 -0800 Subject: [PATCH 200/335] For clarity, changed the English description of the narwhal. It basically follows the result from Google Translate for the Japanese description. --- lib/edit/r_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 6e32ad30..a7a736f0 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21157,9 +21157,8 @@ F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | F:IM_COLD | RES_WATE | F:IM_POIS | NO_CONF | NO_SLEEP | NO_STUN | F:RIDING -D:$This is the whale of the tradition which gets across to the Inuit -D:$who lives in the world of winter. It is said that the mystical horn -D:$of this whale cures all illnesses. +D:$This is the legendary whale of the Inuit living in the winter world. It +D:$ is said that the horn of this whale can cure any disease. D:冬の世界に住むイヌイット族に伝わる伝説の鯨で, D:その神秘の角はあらゆる病に効くとされる。 -- 2.21.1 (Apple Git-122.3) From 2364259b44ff3fc4dc4c2ad671e4de38ee15cc21 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:30:23 -0800 Subject: [PATCH 201/335] Reworded the English description of Petshop since it seems to be more of a guard than a luggage hauler and to make the second sentence a bit more idiomatic. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index a7a736f0..afcee425 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21182,8 +21182,8 @@ F:OPEN_DOOR | BASH_DOOR | SMART | F:ANIMAL | IM_ACID | IM_FIRE | IM_COLD | IM_POIS | NO_CONF | NO_SLEEP S:1_IN_3 | S:BO_COLD | BA_COLD | BO_ICEE | BR_COLD -D:$This bird is the porter of the mansion in which Dio Brando hides and lives. -D:$For it, a dog may be a favorite food. +D:$This bird guards the mansion in which Dio Brando hides and lives. Dogs +D:$ may be its favorite food. D:ディオが隠れ棲む館の門番であるこの鳥は犬が D:大好物なのかもしれない。 -- 2.21.1 (Apple Git-122.3) From 418cf0aa8d02f53a6b1e4028bd27ba3a08f51742 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:41:33 -0800 Subject: [PATCH 202/335] Changed English label to use "disintegration" rather than "disintegrate" since the other vortices use "some noun" followed by "vortex" in their labels. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index afcee425..07e89a01 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21208,7 +21208,7 @@ D:彼にとっては冒険者など獲物にすぎない。 #J0# N:1045:分解ボルテックス -E:Disintegrate vortex +E:Disintegration vortex G:v:s I:140:32d20:100:80:0 W:65:6:0:5000:0:0 -- 2.21.1 (Apple Git-122.3) From 1c6c5dce2f5066b3fa34c9003dcb33eb5dd6925c Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 15:59:11 -0800 Subject: [PATCH 203/335] Added an English description for disintegration vortices. It's inspired by Google Translate's result for the Japanese description but doesn't attempt to get close to the wording in that result. --- lib/edit/r_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 07e89a01..01999b40 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21218,6 +21218,8 @@ F:EMPTY_MIND | BASH_DOOR | POWERFUL | KILL_WALL | KILL_ITEM | F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN | NONLIVING S:1_IN_6 | S:BR_DISI +D:$You see streams of dust spiraling inward from rapidly crumbling stone on +D:$ the walls or floor. D:周囲のものが渦巻き状に分解されていくのが見える。 N:1046:黒色王『ウルファング』 -- 2.21.1 (Apple Git-122.3) From 0042536133184811efb9f048cf4fc2c02d90db5d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 19:01:07 -0800 Subject: [PATCH 204/335] Added an English description for great wyrms of space-time. Tried to emulate the spirit, but not the words, of Google Translate's result for the Japanese descrption. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 01999b40..f37eb7bb 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21564,6 +21564,9 @@ S:TPORT | BLINK | TELE_AWAY | TELE_LEVEL | HASTE | S:SLOW | HOLD | S:BR_TIME | BR_NEXU | BR_GRAV | BR_INER | S:S_DRAGON +D:$The figure is distorted, like but not like the way swirling water or air +D:$ above a hot surface can twist a shape, but it appears to be a huge dragon, +D:$ somehow. D:このような存在にはかつて出会ったことがない。 D:その周囲の空間も時も歪んで見えるためよく分からないが、 D:なんとなく巨大なドラゴンがいるように見える。 -- 2.21.1 (Apple Git-122.3) From 456c97d1fb3a1d260628f0f64664c36e02d7bc8d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 25 Dec 2019 20:55:16 -0800 Subject: [PATCH 205/335] Reworded the English description of the Ferghana horeses. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index f37eb7bb..093524dd 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22326,8 +22326,8 @@ B:KICK:HURT:8d4 F:WILD_ALL | BASH_DOOR | RAND_25 | CAN_SWIM F:NO_FEAR | POWERFUL | FRIENDS F:ANIMAL | DROP_SKELETON | DROP_CORPSE | RIDING -D:$This horse is produced in ancient Fergana. -D:$It was able to run 1000 Li a day and shed bloogy sweat. +D:$It is one of the famed horses from Central Asia. They are said to sweat +D:$ blood and to be able to run 300 miles in a day. D:大宛で産出する名馬だ。血の汗を流し、千里を走ることができた。 N:1106:光の堕天使『エミリオ・ミハイロフ』 -- 2.21.1 (Apple Git-122.3) From c32c1e8ef7cd9c2ea52741bc691b7e268d96466d Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 26 Dec 2019 05:07:06 -0800 Subject: [PATCH 206/335] Reworded the English description for half-demon orcs. --- lib/edit/r_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 093524dd..b698f707 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22607,8 +22607,8 @@ F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | EAT_POISONOUS | F:EVIL | ORC | IM_POIS | RES_DARK | IM_FIRE | RES_CHAO | DEMON | WILD_VOLCANO | AURA_FIRE S:1_IN_8 S:SHOOT | BO_FIRE | -D:$This orc is succeeding demon blood. He wears brack flame. -D:$This unclean combination is bred in unclean tribe +D:$Cloaked in black flame, this orc must be the descendant of a demon. Such +D:$ creatures are often seen among the foulest orcs. D:このオークの体にはデーモンの血が流れており、そこから来る暗黒の炎をまとっている。 D:この不浄な結合は、暗き風習を持つ生き物の中でしばしば育まれる。 -- 2.21.1 (Apple Git-122.3) From d715c4e5262472f46a8e670c8eb73726d4c9bba9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 26 Dec 2019 05:13:33 -0800 Subject: [PATCH 207/335] For effect, changed the wording of Suneo's English description. It is now closer to what Google Translate gives for the Jpanese description. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index b698f707..1965e683 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22589,7 +22589,7 @@ F:EVIL | IM_POIS | EAT_POISONOUS F:ESCORT | ESCORTS | RES_SOUN | CAN_FLY F:NO_CONF D:$"Hey Nobita, I regret to say, but the capacity of this dungeon is 3." -D:$However, obviously there are many money mongers around him! +D:$However, there are clearly more than three money mongers around him! D:「悪いなのび太、このダンジョンは3人用なんだ」 D:しかし、彼に群がる金の亡者は明らかに3人よりも多い! -- 2.21.1 (Apple Git-122.3) From 419e51858ee0fe1dbb43be7af0a035ccc57440ff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 26 Dec 2019 05:22:34 -0800 Subject: [PATCH 208/335] Added a physical description to the English description for tanuki and edited what was there to be more idiomatic. --- lib/edit/r_info.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 1965e683..ce29de3c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21622,8 +21622,9 @@ B:HIT:HURT:1d5 B:CRUSH:HURT:1d6 F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | RAND_25 F:ANIMAL | TANUKI -D:$Tanuki (raccoon dog) is thought to bewitch people in Japanese. -D:$Tanuki can disguise as human beings by putting a magic leaf on his/her head. +D:$It is a dog-like carnivorous mammal with markings like a raccoon. In +D:$ Japanese tales, a tanuki (raccoon dog) can bewitch people or disguise +D:$ itself as a human being by placing a magic leaf on its head. D:日本の伝説では、たぬきは人を化かすと伝えられている。 D:魔法の木の葉を頭に載せて人に化けるのだ。 -- 2.21.1 (Apple Git-122.3) From 6625df9fcfc5f7b0ef1ee327e455c88d6ab7af5e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Thu, 26 Dec 2019 23:48:02 -0800 Subject: [PATCH 209/335] Added English descriptions for chameleons and the chameleon lord. --- lib/edit/r_info.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index ce29de3c..1a90345b 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21128,6 +21128,7 @@ F:CHAMELEON | WILD_WOOD | DROP_1D2 | DROP_CORPSE | DROP_SKELETON | ANIMAL | F:CAN_FLY | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | S:1_IN_1 S:SPECIAL +D:$This lizard can change its appearance to blend in with its surroundings. D:周囲の環境に合わせてその姿を変えると言われる生物だ。 N:1041:カメレオンの王 @@ -21140,8 +21141,8 @@ F:CHAMELEON | DROP_3D2 | DROP_CORPSE | DROP_SKELETON | ANIMAL | F:CAN_FLY | IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS S:1_IN_1 S:SPECIAL -D:カメレオンは周囲の環境に合わせてその姿を変えると言われるが、 -D:それは王とて例外ではない。 +D:$This king of the chameleons, like its lesser kin, can change its appearance +D:$ to blend in with its surroundings. N:1042:幻の鯨『イッカク』 E:Narwhal -- 2.21.1 (Apple Git-122.3) From 21a38a0ccb77a1dcb154a8de7035cf0592936b62 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 00:28:57 -0800 Subject: [PATCH 210/335] Changed the English label for the aliens from "Chargeman Ken" to be "Juralian" rather than "Alien Jural". That matches how they're called in the English Wikipedia page for "Chargeman Ken". Added an English description for those aliens. It doesn't attempt to follow what Google Translate gives for the Japanese description. Instead it gives a physical description (cribbed from the English Wikipedi a page) and mentions that these creatures are part of an alien invasion. --- lib/edit/r_info.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 1a90345b..d45b4e79 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21916,7 +21916,7 @@ D:「チャージマン!殺してやる!」「それは僕が言う言葉だ D:(『チャージマン研!』アニメ第36話・『戦慄!悪魔の病院』) N:1082:ジュラル星人 -E:Alien Jural +E:Juralian G:h:v I:105:3d6:10:10:10 W:5:8:0:20:0:0 @@ -21927,6 +21927,10 @@ F:DROP_90 | OPEN_DOOR | BASH_DOOR | FRIENDS | DROP_CORPSE | F:WILD_WOOD | HAS_LITE_1 | S:1_IN_6 S:SHOOT +D:$This maroon-colored, vaguely humanoid, creature with one eye, tentacle-like +D:$ limbs, slim waist and broad chest is a member of an advanced +D:$ civilization from another world. They have invaded this world to steal its +D:$ resources. D:彼等の文明は地球より500年進んでいるそうだ。 D:「これから毎日家を焼こうぜ」 D:(『チャージマン研!』アニメ第25話・『雄一少年を救え!』) -- 2.21.1 (Apple Git-122.3) From b7ffac15ce4a49c65017f86d214214690d228708 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 00:33:49 -0800 Subject: [PATCH 211/335] Added an English description for Chargeman Ken. --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index d45b4e79..4e5f31aa 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -21910,6 +21910,9 @@ F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_WOOD | F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE S:1_IN_4 S:SHOOT | BLINK +D:$He is an elementary school student who, with his weapons such as the +D:$ Alpha Gun, Visual Belt, and Sky Rod, indiscriminately slaughters +D:$ Juralians on a daily basis. D:アルファガン、ビジュームベルト、スカイロッドなどの破壊兵器を所持し、 D:毎日のようにジュラル星人を大量虐殺している小学生だ。 D:「チャージマン!殺してやる!」「それは僕が言う言葉だ!」 -- 2.21.1 (Apple Git-122.3) From abbcdbc5e1b703d02565b7837f338d04c64a86f8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 08:40:36 -0800 Subject: [PATCH 212/335] Added a brief description for the Witch-King of Jural. It is essentially the second sentence from Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4e5f31aa..4d063e3c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22072,6 +22072,7 @@ F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | F:OPEN_DOOR | BASH_DOOR S:1_IN_2 S:SHOOT | SHRIEK +D:$He leads the force of Juralians invading this world. D:環境の悪化したジュラル星に変わる新天地を求め、 D:地球侵略を企てるジュラル星人の統率者だ。 D:「諸君、今から命令をすりゅ!地球の子供達をかたっぱしからとらえて君! 」 -- 2.21.1 (Apple Git-122.3) From e6da6109389e65498ce011aa1e89584aedbcb7ff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 08:42:11 -0800 Subject: [PATCH 213/335] Added an English description for Dr. Volga. It is essentially (and for the quote from the source, exactly) Google Translate's result for the Japanese description. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4d063e3c..79fc9f8d 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22087,6 +22087,10 @@ B:EXPLODE:SHATTER:15d8 F:GOOD | DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_90 | FORCE_MAXHP | F:UNIQUE | EMPTY_MIND | WILD_TOWN | CAN_SPEAK | F:OPEN_DOOR | BASH_DOOR | NONLIVING | RES_TELE +D:$He was a West German scientist, but the Jurians turned him into a bomb +D:$ delivery system: "Dr. Volga, you have been killed. With a bomb in your +D:$ head, you are now a human robot!" ("Chargeman Ken!" episode 35, +D:$ "Dynamite in the Brain!") D:ジュラル星人の魔の手により爆弾を頭に仕込まれた西ドイツの科学者だ。 D:「ボルガ博士、あなたは殺されたんです。 D:その頭の中に爆弾を仕掛けられて、今のあなたは人間ロボットなんだ!」 -- 2.21.1 (Apple Git-122.3) From 053c62b45ae3c57dbe97a0a7b788d6a2eb5ae033 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 08:43:42 -0800 Subject: [PATCH 214/335] Added an English description for the black knights of Gwyn. It covers the same ground as Google Translate's result for the Japanese description but borrows heavily from the description of the black knights in https://darksouls.fandom.com/wiki/Gwyn,_Lord_of_Cinder . --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 79fc9f8d..277308c0 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22109,6 +22109,10 @@ F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_CHAO | MALE | HUMAN | F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | NO_FEAR | NO_CONF F:OPEN_DOOR | BASH_DOOR | F:IM_FIRE | IM_POIS | HAS_LITE_1 | +D:$Formerly one of Lord Gwyn's Silver Knights, he fought the demons from the +D:$ Bed of Chaos and accompanied the lord to the Kiln of the First Flame. Now +D:$ burned beyond recognition and clad in charred armor, he wanders the world +D:$ for eternity. D:太陽の光の王グウィンの火継ぎの輝きに焼かれ、灰となった神代の騎士だ。 D:以来、彼らは世界を彷徨い歩く存在となった。 -- 2.21.1 (Apple Git-122.3) From 0ef51823c09a8dad98f7dad82c5f60e5a64e1e92 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 08:47:09 -0800 Subject: [PATCH 215/335] Corrected spelling in English label for the fat officials of Allant. --- lib/edit/r_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 277308c0..5354289c 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22117,7 +22117,7 @@ D:太陽の光の王グウィンの火継ぎの輝きに焼かれ、灰となっ D:以来、彼らは世界を彷徨い歩く存在となった。 N:1092:オーラントの公使 -E:Fat offcial of Allant +E:Fat official of Allant G:p:D I:108:80d12:10:110:20 W:34:4:0:2000:0:0 -- 2.21.1 (Apple Git-122.3) From 0df2b2198fda62de25d1683034b85aadeddd352a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 08:56:30 -0800 Subject: [PATCH 216/335] Added an English description for the fat officials of Allant. I largely followed Google Translate's result for the Japanese description, but that does not seem to match with anything described in https://demonssouls.fandom.com/wiki/Old_King_Allant or the other material in that wiki for the Boletarian Palace. --- lib/edit/r_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 5354289c..4d788656 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22127,6 +22127,10 @@ F:IM_POIS | OPEN_DOOR | BASH_DOOR | MALE | FORCE_MAXHP F:NO_CONF | NO_SLEEP | EVIL | DEMON | HUMAN S:1_IN_2 | S:BO_FIRE | BA_FIRE +D:$After the land of Boletaria, King Allant's kingdom, is engulfed in a +D:$ colorless fog, this creature is one of King Allant's officials who take +D:$ charge. Shaking his fat and ugly body, he rolls out a fireball with an +D:$ eerie laugh and attacks with a crescent ax. D:ボーレタリアが色のない霧に包まれた後、 D:オーラント王の手先として彼の地を統率する異形の者だ。 D:その醜く太った体を揺らしながら、不気味な笑いと共に火の玉を繰り出し、 -- 2.21.1 (Apple Git-122.3) From 6049a7bd8a4b904c5965f601d82d40bdf8009aaf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 11:31:04 -0800 Subject: [PATCH 217/335] Added an English description for the vanguards of diffusion. It mixes much of what's in Google Translate's result for the Japanese description with the more detailed physical description from https://demonssouls.fandom.com/wiki/Vanguard . --- lib/edit/r_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 4d788656..b7532664 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22322,6 +22322,9 @@ F:FORCE_SLEEP | FORCE_MAXHP | F:ONLY_ITEM | DROP_4D2 | F:OPEN_DOOR | BASH_DOOR | POWERFUL | NONLIVING | F:EVIL | DEMON | NO_CONF | NO_SLEEP +D:$This giant demon carrying an axe has three yellow eyes and grey skin +D:$ covered with spikes. It is one of the first demons to emerge from the +D:$ colorless fog engulfing Boletaria. D:ボーレタリアの色のない霧から最初に現れたデーモンの尖兵だ。 D:刺々しい灰色の巨体が斧を握りしめている。 -- 2.21.1 (Apple Git-122.3) From 56f909cef114d0b1ceedf0dca710caad6a6f32e5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 11:47:11 -0800 Subject: [PATCH 218/335] Took a different tack by emphasizing some physical characteristic in the English descriptions for the weaker tier of the elemental kobolds. --- lib/edit/r_info.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index b7532664..7b21c4b2 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22455,7 +22455,7 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS F:IM_FIRE | WILD_VOLCANO -D:$It seems only a red kobold, but it learned the use of fire. +D:$It's a red kobold. Wait, are its hands on fire? D:それは単なる赤いコボルドに見えるが、火の使い方を覚えている。 N:1112:アイス・コボルド @@ -22468,7 +22468,7 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS F:IM_COLD | WILD_SWAMP -D:$It seems only a white kobold, but it learned the use of ice. +D:$It's a white kobold. Wait, is that frost on its hands? D:それは単なる白いコボルドに見えるが、冷気の浴びせ方を覚えている。 N:1113:サンダー・コボルド @@ -22481,7 +22481,7 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS F:IM_ELEC | WILD_MOUNTAIN -D:$It seems only a blue kobold, but it learned the use of electricity. +D:$Its a blue kobold, but why do its hands glow with St. Elmo's fire? D:それは単なる青いコボルドに見えるが、電撃の浴びせ方を覚えている。 N:1114:アシッド・コボルド @@ -22494,7 +22494,7 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS F:IM_ACID | WILD_WOOD -D:$It seems only a black kobold, but it learned the use of acid. +D:$It's a black kobold, but its hands drip with some sort of caustic substance. D:それは単なる黒いコボルドに見えるが、酸の浴びせ方を覚えている。 N:1115:ポイズン・コボルド @@ -22506,7 +22506,8 @@ B:HIT:POISON:4d6 F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS -D:$It seems only a green kobold, but it learned the use of poison. +D:$It's a green kobold, but there's something strange about the oily +D:$ secretions on its hands. D:それは単なる緑色のコボルドに見えるが、毒のくらわし方を覚えている。 N:1116:フレイム・コボルド -- 2.21.1 (Apple Git-122.3) From 49c537aade948c9095071b219d49643e1dc8f324 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 13:02:47 -0800 Subject: [PATCH 219/335] Except for the apotoxin kobold, modified the English descriptions for the second tier of elemental kobolds to emphasize something about the physical appearance and not adhere strictly to the content of the Japanese description. That approach doesn't work well for the apotoxin kobold since there's no particular rationale to link the effects of its poison to the appearance of the creature. --- lib/edit/r_info.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 7b21c4b2..5ff6bacf 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22523,9 +22523,8 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS | CAN_SWIM F:IM_FIRE | FRIENDS -D:$It is a kobold which emits the fire breath enough to burns down a big tree. -D:$They are sometimes shunned by other kobolds on the ground that -D:$he is a somothering guy. +D:$This red kobold has flames on its hands and wisps of smoke issuing +D:$ from its mouth. D:大木を焼き尽くすほどの強力な炎を吐き出すことができるようになったコボルドだ。 D:コボルド仲間の間でも暑苦しいと煙たがれることがある。 @@ -22542,8 +22541,8 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS | CAN_SWIM F:IM_COLD | FRIENDS -D:$It can freeze a room eternally by its strong breath. -D:$Around him, you may be able to see the diamond dust. +D:$This white kobold has frost covering its hands, and small ice crystals swirl +D:$ in the air around it. D:部屋の全てを永遠に凍りつかせるほどの強力な冷気を吐き出すことができる。 D:それの周りではダイアモンドダストを見ることができるという。 @@ -22561,8 +22560,7 @@ F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS | CAN_SWIM F:IM_ELEC | FRIENDS F:SELF_LITE_1 -D:$Have you seen the very experiment by Edison? -D:$This kobold can kill an elephant easily by its breath! +D:$Electric sparks fly from the hands and mouth of this blue kobold. D:君は見たことがあるだろうか、あのエジソンの忌まわしい実験を! D:このコボルドはあれと同じことができる! @@ -22579,8 +22577,7 @@ F:DROP_90 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE F:EVIL | IM_POIS | EAT_POISONOUS | CAN_SWIM F:IM_ACID | FRIENDS -D:$O my god! -D:$This kobold can resolve a candle via its breath! +D:$This black kobold has caustic liquid dripping from its hands and mouth. D:ああ、何ということだ! D:このコボルドが吐き出す酸はロウソクをも溶かしてしまう! -- 2.21.1 (Apple Git-122.3) From f2125f7aff40bd30f3d82ddce66d903fb3ed6189 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 19:36:38 -0800 Subject: [PATCH 220/335] Added an English description for the gunners of Corwin. Tried to cover the same content as Google Translate's result for the Japanese descripotion but the wording is different. --- lib/edit/r_info.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 5ff6bacf..26b3ce43 100644 --- a/lib/edit/r_info.txt +++ b/lib/edit/r_info.txt @@ -22162,6 +22162,13 @@ F:IM_FIRE | IM_POIS | NO_SLEEP | NO_CONF F:MALE | DROP_CORPSE | DROP_SKELETON S:1_IN_3 | S:SHOOT +D:$Firearms were not used in Amber since gunpowder does not work there: +D:$ chemistry is not always the same in Amber and the parallel worlds that +D:$ are shadows of it. Prince Corwin, by accident, had found a substance in +D:$ Avalon that could work as powder and primer in Amber and its closest +D:$ shadows. With that in mind, he devised a plan to take Amber using a small +D:$ force armed with automatic rifles. This gunner, from a parallel world +D:$ where Corwin is worshipped as a god, is one of that force. D:アンバーの王子コーウィンは、並行世界の化学的作用が必ずしも D:共通でない事を知っている。そこで彼はあらゆる影から数多くの鉱物を取り寄せ、 D:各世界で作用する火薬を生産し、現代地球の銃器で利用できる手法を確立した。 -- 2.21.1 (Apple Git-122.3) From bd4f2f4b03960cc27819e75259bd882c7f6fe78a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 09:54:55 -0800 Subject: [PATCH 221/335] To be more idiomatic, changed preposition in English offer for tsuchinoko. --- src/bldg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bldg.c b/src/bldg.c index c3762fcd..93c1db23 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -1792,7 +1792,7 @@ static void today_target(player_type *player_ptr) static void tsuchinoko(void) { clear_bldg(4, 18); - c_put_str(TERM_YELLOW, _("一獲千金の大チャンス!!!", "Big chance to quick money!!!"), 5, 10); + c_put_str(TERM_YELLOW, _("一獲千金の大チャンス!!!", "Big chance for quick money!!!"), 5, 10); c_put_str(TERM_YELLOW, _("ターゲット:幻の珍獣「ツチノコ」", "target: the rarest animal 'Tsuchinoko'"), 6, 10); c_put_str(TERM_WHITE, _("生け捕り ---- $1,000,000", "catch alive ---- $1,000,000"), 8, 10); c_put_str(TERM_WHITE, _("死体 ---- $200,000", "corpse ---- $200,000"), 9, 10); -- 2.21.1 (Apple Git-122.3) From d4fddd7c89920e9009f86aa2a337d721981a3935 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 27 Dec 2019 23:04:10 -0800 Subject: [PATCH 222/335] Replaced "carencet" with "caracanet" which is "a necklace or ornamental collar". It's also the word used in Angband 4.2.0 for Nauglamir. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 3cd4c61c..2ed45ce8 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -212,7 +212,7 @@ I:40:12:3 W:70:70:3:75000 F:STR | CON | INFRA | HIDE_TYPE | F:SEE_INVIS | FREE_ACT | REGEN | LITE | INSTA_ART -D:$The Nauglamir; a carencet of gold set with a multitude of shining gems of +D:$The Nauglamir; a carcanet of gold set with a multitude of shining gems of D:$Valinor, accenting a radiant Silmaril. The sturdy spirits of Dwarvish D:$craftsmen who labored long in mountain smithies lie within it still, and D:$as gossamer it rests upon the bearer. -- 2.21.1 (Apple Git-122.3) From 6ea2562d8fb2c8268959ab9c59d3ffac80900b3f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 08:04:51 -0800 Subject: [PATCH 223/335] To be more idiomatic, reworded the English decription of Lohengrin's armor. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2ed45ce8..09bc30dd 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -547,8 +547,8 @@ F:HOLD_EXP | RES_NETHER | RES_DARK | RES_FEAR | F:ACTIVATE U:CHOIR_SINGS D:$The shining armor of Lohengrin the son of Parsifal. -D:$ If you wears it, the holy grail gives to you the devine protection -D:$ from all evils. (W.R.Wagner, 'Parsifal') +D:$ The Holy Grail gives divine protection from all evils to the wearer. +D:$ (W.R.Wagner, 'Parsifal') D:聖杯守護の騎士パルジファルの息子、ローエングリンの輝く鎧だ。 D:身に付ける者はあらゆる邪悪なものを退け聖杯の加護を得る。 D:(ワーグナー、「パルジファル」) -- 2.21.1 (Apple Git-122.3) From 45b954faaa6687b3b6dbf86e43750c060c0382cc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 08:17:25 -0800 Subject: [PATCH 224/335] Dropped "which has a power" from the English description of the leather armor of Shiva's avatar. That's to make it more idiomatic; it also brings it closer to Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 09bc30dd..1b367c39 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -627,7 +627,7 @@ P:12:1d2:3:4:20 F:BLOWS | RES_SHARDS | HOLD_EXP | SLOW_DIGEST | F:SUST_STR | SUST_DEX | SUST_CON | SUST_INT | SUST_WIS | SUST_CHR | F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD -D:$The leather armor which has a power of Shiva the god of destruction. +D:$The leather armor of Shiva, the god of destruction. D:ヒンズー教の最高神は創造の神ブラフマン、維持の神ヴィシュヌ、 D:そして破壊神シヴァだ。これはその中でも最も強力なシヴァの力が宿った D:鎧だ。 -- 2.21.1 (Apple Git-122.3) From 8d03d06a6e0edf140e9aac7f68f4b9886aa13f85 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 08:23:08 -0800 Subject: [PATCH 225/335] Changed the last part of the English description for Celegorm's shield to match hat in Angband 4.2.0 since it flows a bit better. Set off the descriptive phrase with commas in the first part for the same reason. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 1b367c39..2b10a058 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -692,9 +692,9 @@ I:34:4:0 W:30:3:60:30000 P:6:1d2:0:0:20 F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | RES_LITE | RES_DARK | XTRA_H_RES -D:$This shield emblazoned with a multitude of creatures not seen for ages -D:$once protected Celegorm, lord of Himlad; around it lies a mystic balance -D:$that contains the conflicts of the elements. +D:$This shield, emblazoned with a multitude of creatures not seen for ages, +D:$ once protected Celegorm, lord of Himlad; around it, a mystic balance lies +D:$ containing the conflicts of the elements. D:いまでは見られなくなった数々の伝説の生き物の D:装飾が施されたこの盾は、かつてヒムラドの王ケレゴルムを D:守っていた。地水火風のエレメントのせめぎ合いを内包し、 -- 2.21.1 (Apple Git-122.3) From fb8d0c43632a1f28e766052b293f4a9e5812a8c5 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 08:25:37 -0800 Subject: [PATCH 226/335] Set off a descriptive phrase with a comma in the English description of the helm of Indra. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2b10a058..cb3166c2 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -734,7 +734,7 @@ I:32:2:5 W:30:50:15:100000 P:2:0d0:0:0:18 F:INT | WIS | CHR | SUST_INT | SUST_WIS | SUST_CHR | RES_BLIND | IM_ELEC -D:$This is the helm of Indra the god of thunderstorms. +D:$This is the helm of Indra, the god of thunderstorms. D:雷神インドラの兜だ。 # The Massive Iron Crown of Morgoth -- 2.21.1 (Apple Git-122.3) From 55b85d10f4325455d34473ee1933443b5d518606 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 08:46:53 -0800 Subject: [PATCH 227/335] Changed the English description for the terror mask since the long string of adjectives ahead of the noun seemed awkward. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index cb3166c2..fda6a7ba 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -881,8 +881,8 @@ F:SEE_INVIS | NO_MAGIC | ACTIVATE | F:RES_DISEN | RES_FEAR | FREE_ACT | RES_ACID | RES_COLD | RES_POIS | F:TELEPORT U:TERROR -D:$This is terrible, scary, fearful, dreadful, bloodcurding, hair-rising -D:$ frightening mask. +D:$You run out of adjectives to describe the dread this mask inspires: +D:$ terrifying, scary, creepy, bloodcurdling, hair-rising, frightening, .... D:なんとも恐ろしい、不気味で、おどろおどろしく、髪が逆立ち、血も凍り、 D:ぞっとして鳥肌が立つような仮面だ。 D:仮面の奥の瞳に睨まれれば、怖くて逃げ出さずにはいられない。 -- 2.21.1 (Apple Git-122.3) From c74032ef421f8e3b9695206bded05d27f8901fea Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:01:07 -0800 Subject: [PATCH 228/335] Corrected spelling mistake in the English description for Paurhach. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index fda6a7ba..eadd7c05 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1097,7 +1097,7 @@ W:10:20:25:15000 P:2:1d1:0:0:15 F:STR | RES_FIRE | MAGIC_MASTERY | ACTIVATE U:BO_FIRE_1 -D:$A firey set of gauntlets that can even shoot fire from the user's +D:$A fiery set of gauntlets that can even shoot fire from the user's D:$hands. D:シンダール語で「跳ねる炎の拳」の名を持つこの篭手は炎に D:包まれており、身に付ける者は火の球を撃ち出すことも出来る。 -- 2.21.1 (Apple Git-122.3) From 690bb6abd0466833e3601a1e39de1375e3035b19 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:01:51 -0800 Subject: [PATCH 229/335] Added an English description for the gauntlets of Corwin. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index eadd7c05..146dce4f 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1112,6 +1112,8 @@ I:31:2:4 W:10:40:25:43000 P:2:1d1:0:0:15 F:SUST_CON | CON | REGEN | RES_COLD | FREE_ACT +D:$These gauntlets belonged to Prince Corwin of Amber and are imbued with +D:$ his extraordinary toughness. D:並外れた強靭さを持つアンバーの王子コーウィンのガントレットだ。 # The Set of Gauntlets 'Pauraegen' -- 2.21.1 (Apple Git-122.3) From 8b7340dcbf3c29999b7ea5a0eb250c35c52fcb7f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:07:22 -0800 Subject: [PATCH 230/335] Added an English description for Flora's boots. It's largely Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 146dce4f..3ad7edaa 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1217,6 +1217,9 @@ P:2:1d1:0:0:15 U:CURE_POISON F:DEX | HIDE_TYPE | CHR | SUST_CHR | ACTIVATE | FREE_ACT | F:RES_NETHER | RES_CHAOS | SUST_CON +D:$Flora is away from Amber's palace most of the time and enjoys finding +D:$ new boyfriends in the parallel worlds that are shadows of Amber. Her +D:$ boots are enchanted with magic to make the wearer more attractive. D:フローラはほとんどの時間アンバーの宮殿を離れていて、 D:影の世界で新しいボーイフレンドを見つけては楽しんでいる。 D:彼女のブーツには身に付けた者を魅力的に見せる魔法がかかっている。 -- 2.21.1 (Apple Git-122.3) From 4cf26fef93e8fae47defe44601759f943acdd838 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:09:03 -0800 Subject: [PATCH 231/335] Corrected subject/verb agreement in the English description for the boots of Shiva's avatar and changed an article to be more idiomatic. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 3ad7edaa..f2fdd927 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1257,7 +1257,7 @@ I:30:2:4 W:30:20:20:100000 P:4:1d1:5:5:16 F:SPEED | DEX | SUST_DEX | RES_NEXUS | FREE_ACT | LEVITATION -D:$The boots has an agility of Shiva the god of destruction. +D:$The boots have the agility of Shiva, the god of destruction. D:破壊神シヴァの力を持った革の靴だ。 -- 2.21.1 (Apple Git-122.3) From 5dd7145b72424bf743248cc18c3387384677fbe0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:11:09 -0800 Subject: [PATCH 232/335] For clarity, added a possesive and comma in the English description of Caine's dagger. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index f2fdd927..c7838421 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1295,7 +1295,7 @@ P:0:2d4:10:15:5 F:DEX | HIDE_TYPE | STEALTH | SEARCH | SLAY_HUMAN | F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | BRAND_POIS | F:FREE_ACT | RES_DARK | SUST_DEX | SEE_INVIS | SHOW_MODS | THROW -D:$The dagger of Caine the leader of Amber fleets. +D:$The dagger of Caine, the leader of Amber's fleets. D:アンバーの艦隊を指揮するケインのダガーだ。 # The Dagger 'Narthanc' -- 2.21.1 (Apple Git-122.3) From 8c7c751a10ec2a4540d87384dadfd2d8225fc3fa Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:19:04 -0800 Subject: [PATCH 233/335] Corrected a typo in the English description of Nothung and reworded the second sentence in the description. Used Wagner's spelling of the dragon's name for consistency with a_info.txt. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index c7838421..a8539bb0 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1460,9 +1460,9 @@ P:0:2d5:12:16:0 F:SEARCH | BRAND_ELEC | SLAY_ORC | KILL_DRAGON | RES_FEAR | F:RES_ELEC | LITE | RES_FIRE | RES_POIS | F:SLOW_DIGEST | SHOW_MODS | RIDING -D:$The sword of Sigurd which is alos called Balmung or Gram. -D:$ He slashed the anvil of Mime's blacksmith and used to -D:$ kill the dragon Fafnir. +D:$The sword of Sigurd which is also called Balmung or Gram. +D:$ With it, Sigurd cut the anvil at Mime's forge in half and slew Fafner, +D:$ the dragon. D:「ノートゥングさ、その名は。ヴォータンがとねりこの幹 D:に突き立てた剣だ。それを引き抜くことのでき D:た者だけが、わがものとしうるわけだ。」 -- 2.21.1 (Apple Git-122.3) From d8a0092d6a2d0597067a89bb2530efb48a41807f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:28:17 -0800 Subject: [PATCH 234/335] Corrected typo in the English description for Ringil. --- lib/edit/a_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index a8539bb0..e2a602d0 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1569,8 +1569,7 @@ P:0:4d6:-40:-60:-50 F:SPEED | IM_FIRE | RES_FIRE | BRAND_FIRE | RES_DISEN | RES_FEAR | F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS | TY_CURSE | LITE F:RANDOM_CURSE2 -D:$The flame sword with which Surtr set fire all over the world -D:$ at Ragnarok. +D:$The flame sword with which Surtr set the world on fire at Ragnarok. D:北欧神話において炎の巨人スルトが世界に火を放った燃える剣だ。 # The Cutlass 'Gondricam' @@ -1641,7 +1640,7 @@ F:ESP_ORC | ESP_TROLL | ESP_GIANT U:BA_COLD_2 D:$The weapon of Fingolfin, High King of the Noldor; it shines like a column D:$of ice lit by light unquenchable. Morgoth came but unwillingly to meet it -D:$of old; his lame foot will remind him of its might should be meet it again. +D:$of old; his lame foot will remind him of its might should he meet it again. D:ノルドールの上級王フィンゴルフィンの武器。氷の柱の如く輝いている。 D:かつてモルゴスは期せずしてこの剣に対峙し深い傷を D:刻み込まれた。彼はこの剣の力を再び思い知ることになるだろう。 -- 2.21.1 (Apple Git-122.3) From 190a9f69ead8d8fd6115f109fe1d7cd5a387f5cc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:32:38 -0800 Subject: [PATCH 235/335] Kept the second sentence as a question in the English description for the chainsword but substituted a phrase from Google Translate's result for the Japanese description since that's more apt than what was there. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index e2a602d0..07db9b07 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1708,7 +1708,7 @@ F:DEX | CHR | STEALTH | HIDE_TYPE | SPEED | AGGRAVATE | VORPAL | F:SLAY_HUMAN | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS | F:ESP_ORC | ESP_TROLL | ESP_HUMAN D:$Take care! This sword will make you a murderer if you wield it. -D:$ Do you hear cries of this sword that want more blood thirstily? +D:$ Do you hear the bloodthirsty screams of this sword? D:持った者を殺戮マシーンに変える呪われた剣だ。あなたにはこの剣の D:血に飢えた叫びが聞こえるだろう。 -- 2.21.1 (Apple Git-122.3) From c4c23bf58859ca29b2e9ff3a809ee61dbef9d315 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:38:58 -0800 Subject: [PATCH 236/335] For clarity, simplified the English description of Til-i-arc by cutting out a clause. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 07db9b07..913756f0 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1901,8 +1901,8 @@ P:0:2d5:10:12:10 F:INT | HIDE_TYPE | F:BRAND_COLD | BRAND_FIRE | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | F:RES_FIRE | RES_COLD | SUST_INT | SLOW_DIGEST | SHOW_MODS | LITE -D:$Within this long thrusting spear lie the spirits of frost giants and fire -D:$demons, who war forever, trapped by magely spells. +D:$Within this long thrusting spear, the spirits of frost giants and fire +D:$ demons war forever, trapped by magely spells. D:この両手持ちの長槍の中には D:氷の巨人と炎の悪魔の二つの魂が魔法により D:封印されていて永遠に争っている。 -- 2.21.1 (Apple Git-122.3) From 615b7741e2872b8af04eb163c3d0d924b3be8579 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:42:02 -0800 Subject: [PATCH 237/335] Changed the second sentence in the English description for 'Runespear' to avoid a spelling mistake. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 913756f0..aa90d4fa 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1920,8 +1920,8 @@ F:SLAY_TROLL | SLAY_ORC | SLAY_GIANT | F:FREE_ACT | RES_FIRE | RES_ELEC | RES_LITE | F:SLOW_DIGEST | ACTIVATE | BLESSED | SHOW_MODS | LITE | RIDING U:BA_ELEC_2 -D:$The spear which Odin created from a branch of the world tree. -D:$It is craved magical runes. +D:$The spear which Odin created from a branch of the world tree. Magical +D:$ runes have been carved into the shaft. D:主神オーディンが世界樹の枝から作り上げた槍で、魔力を込めた D:ルーン文字が刻まれている。(北欧神話) -- 2.21.1 (Apple Git-122.3) From 5338042c2425e54bbfc3d1e5d686e34faf114223 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 09:48:52 -0800 Subject: [PATCH 238/335] Changed to use "hammer" rather than "mace" in the English description for 'Turmil'. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index aa90d4fa..c3c78142 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2421,9 +2421,9 @@ F:WIS | INFRA | HIDE_TYPE | BLESSED | F:BRAND_COLD | SLAY_ORC | RES_COLD | RES_LITE | LITE | REGEN | F:ACTIVATE | SHOW_MODS | XTRA_H_RES U:DRAIN_2 -D:$Wielded by the High Priest of Meneltarma, this great mace gleams coldly as -D:$though moonlit, and it can strike as mighty a blow spiritually as -D:$physically. +D:$Wielded by the High Priest of Meneltarma, this great hammer gleams coldly +D:$ as though moonlit, and it can strike as mighty a blow spiritually as +D:$ physically. D:メネルタルマの高僧が使っていた大鎚で、月の光のように冷たく輝いている。 D:その打撃は敵の肉体だけでなく精神をも打ち砕くことができる。 -- 2.21.1 (Apple Git-122.3) From 50ddaff642dee5dd41c5b997b49be0c550ae60a0 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 18:44:15 -0800 Subject: [PATCH 239/335] Added an English description for 'Slayer' based on Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index c3c78142..1439284a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2437,6 +2437,8 @@ W:30:60:260:200000 P:0:4d5:15:15:0 F:BLOWS | VAMPIRIC | HOLD_EXP | SLAY_UNDEAD | SLAY_EVIL | SLAY_HUMAN | F:REGEN | RES_FEAR | RES_BLIND | SLOW_DIGEST | SHOW_MODS +D:$This bloodthirsty blade, which has lopped countless heads, heals the body +D:$ and safeguards the soul of the wielder. D:数え切れないほどの首を落としてきたこの血に飢えた刃は D:敵の血と魂を吸って手にする者の体を癒す。 -- 2.21.1 (Apple Git-122.3) From 906e230740aaae8028de7b0882b89c07215985a9 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 18:46:08 -0800 Subject: [PATCH 240/335] Changed the English description of Grayswandir to correct a typo, drop the plural "s" on "moonlight", and set off a descriptive phrase with commas. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 1439284a..d3fb2ace 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1409,7 +1409,7 @@ F:RES_CHAOS | RES_NETHER | HOLD_EXP | RES_FEAR | F:RES_COLD | BRAND_COLD | F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD | F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED | RIDING -D:$The silver sable forged by moonlights, which Corwin the prince of +D:$The is the silver saber, forged by moonlight, which Corwin the prince of D:$ Amber wielded. It shows contrasts between silver and black like D:$ its owner does. D:アンバーの王子コーウィンが使っていた、月の光により -- 2.21.1 (Apple Git-122.3) From 951f7eae56e8bc3ff992afd12e123374825f953f Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 18:52:48 -0800 Subject: [PATCH 241/335] Changed the English physical description of the Jewel of Judgement to be closer to how it is described at page 448 of the Great Book of Amber (Volumes 1-10 of the Amber Series), Avon Eos First Printing 1999. Did keep the mention of gold for the chain from Google Translate's result for the Japanese Description (the description in the book simply says a heavy chain). Also added an article in front of "creation" to be more idiomatic. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index d3fb2ace..ee60bf5b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -135,8 +135,8 @@ P:0:1d1:0:0:0 F:ACTIVATE | SEE_INVIS | HOLD_EXP | RES_CONF | RES_CHAOS | LITE_3 | F:INSTA_ART | SPEED | WIS | INT U:JUDGE -D:$This crimson jewelry which is chained with a gold chain is -D:$ deeply related to creation of this universe. +D:$This ruby pendant in a simple setting with a heavy gold chain is deeply +D:$ related to the creation of this universe. D:$ (R.Zelazny, 'The Chronicles of Amber', vol.3-10) D:金の鎖に取り付けられた、この宇宙の創世に深い関わりを持つ真紅の宝石。 D:(R.ゼラズニイ、真世界アンバーシリーズ 3~10巻) -- 2.21.1 (Apple Git-122.3) From fedf42bf5f2710a02915d97d51d81f10f0ecb433 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 19:08:37 -0800 Subject: [PATCH 242/335] Since the description of Amber's crown in "Nine Princes of Amber" is "It was wrought of silver and had seven high points each topped by a gem stone. It was studded with emeralds, and there were two huge rubies at either temple.", changed the base object to be the jewel encrusted crown and the English physical description to be closer to what's given in the book. --- lib/edit/a_info.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ee60bf5b..5bf3b32b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -887,12 +887,12 @@ D:なんとも恐ろしい、不気味で、おどろおどろしく、髪が逆 D:ぞっとして鳥肌が立つような仮面だ。 D:仮面の奥の瞳に睨まれれば、怖くて逃げ出さずにはいられない。 -# The Golden Crown of Gondor -> Amber +# The Golden Crown of Gondor -> Jewel Encrusted Crown of Amber #JZ# N:42:真世界アンバーの E:of Amber -I:33:11:3 +I:33:12:3 W:40:40:30:125000 P:0:1d1:0:0:15 F:STR | WIS | CON | HIDE_TYPE | SPEED | @@ -900,8 +900,9 @@ F:RES_COLD | RES_FIRE | RES_LITE | RES_BLIND | RES_ELEC | RES_CONF | F:RES_CHAOS | LITE | SEE_INVIS | REGEN | ACTIVATE F:XTRA_POWER | XTRA_H_RES U:CURE_700 -D:$The gold grown which is decorated with much jewerly is the symbol -D:$ of the throne of Amber. Princes of Amber scrambled for it violently. +D:$Wrought of silver with seven high points each topped by a gem, this crown +D:$ is the symbol of the throne of Amber. The Princes of Amber scrambled for +D:$ it violently. D:アンバーの王位の象徴である、多数の宝石で飾られた金の王冠だ。 D:これをめぐって骨肉の争いが王子たちの間で繰り広げられた。 -- 2.21.1 (Apple Git-122.3) From b1d9ab400c340162728041fce428174f61d3bb88 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 21:05:51 -0800 Subject: [PATCH 243/335] Changed the English description for the kusanagi-no-tsurugi: added a gloss for the meaning of tsurugi, made the first sentence complete, dropped the "conquesting Japan" part since it isn't in Google Translate's result for the Japanese description and doesn't well represent the description of Yamato in the English Wikipedia entry, and reordered the final sentence. --- lib/edit/a_info.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 5bf3b32b..eee0d99f 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2484,7 +2484,7 @@ W:50:25:110:100000 P:0:0d0:10:14:0 F:SPEED | RES_FIRE | XTRA_MIGHT | ACTIVATE | SHOW_MODS | XTRA_RES_OR_POWER U:BRAND_FIRE_BOLTS -D:$Magic power of this crossbow of Brand the prince of Amber will enable +D:$The magic power of this crossbow of Brand, the prince of Amber, will enable D:$ you to move faster. D:トランプの魔力を自分の物にし、新たな宇宙を創造しようとした D:アンバーの王子ブランドが使っていたクロスボウだ。 @@ -2513,10 +2513,10 @@ F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | ACTIVATE | F:SLAY_EVIL | SLAY_ANIMAL | SLAY_DEMON | SLAY_DRAGON | F:SEE_INVIS | REGEN | BLESSED | LITE | SHOW_MODS U:ESCAPE -D:$One of the three imperial spiritual artifacts of Japan. -D:$Susanoo found this tsurugi at Izumo, then Yamato Takeru -D:$got and used for conquesting Japan. -D:$It guards its owner from many dangers by its spiritual power. +D:$It is one of the three imperial spiritual artifacts of Japan. +D:$ Susanoo found this tsurugi, a straight double-edged sword, at Izumo. +D:$ Many years later, Yamato Takeru received it as a gift. +D:$ The tsurugi's spiritual power guards its owner from many dangers. D:三種の神器の一つ。出雲の国で素戔嗚尊(すさのおのみこと)により D:見出され、後に日本武尊(やまとたけるのみこと)の剣となる。 D:使う者を様々な危機から守る霊力が備わっている。 -- 2.21.1 (Apple Git-122.3) From 6b3627c081a273a1dddd48a8c01be5ac10f54ed6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 22:01:36 -0800 Subject: [PATCH 244/335] Added an English description for Goln Nova. It interpolates between Google Translate's result for the Japanese description and the content at https://kanzaka.fandom.com/wiki/Gorun_Nova . Since the demons from the Slayers novels aren't the equivalent of the demons in Hengband and the weapon does not have SLAY_DEMON or KILL_DEMON, dropped the mention of demons in the second sentence and instead generically mention evil creatures. --- lib/edit/a_info.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index eee0d99f..a6c27b94 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2668,6 +2668,10 @@ W:20:25:150:40000 P:0:2d5:10:10:0 F:STR | DEX | HIDE_TYPE | FORCE_WEAPON | KILL_EVIL F:SHOW_MODS | RIDING +D:$This legendary weapon is said to have killed Zanaffer, the beast that +D:$ destroyed the magic city of Sairaag. As the wielder's will augments the +D:$ powers of this blade of light, all evil creatures have reason to fear its +D:$ power. D:かつて魔導都市サイラーグを破壊つくした魔獣、ザナッファー。 D:それを滅ぼしたといわれるのが、この伝説の武器である。 D:持つ者の、意思の力を刃と成して、魔族すらも両断する。 -- 2.21.1 (Apple Git-122.3) From 0a3ae0420bf26a04e97e7d6b1d6232e5e0ba55c8 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 22:09:08 -0800 Subject: [PATCH 245/335] In the English description for Winblows, corrected a spelling mistake, added an article, and changed an adjective to match Google Translate's result. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index a6c27b94..30e2cd2a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2700,8 +2700,8 @@ P:0:8d6:0:30:0 F:STEALTH | INT | WIS | AGGRAVATE | CURSED | HEAVY_CURSE | F:SHOW_MODS | CHAOTIC | IMPACT | SPEED F:RANDOM_CURSE0 -D:$This is disruptive heave thing made by Micro$oft. -D:$It will bring many troubles to its user. +D:$This is a destructive heavy thing made by Micro$oft. +D:$ It will bring many troubles to its user. D:マイクロンフトによって作られたもので、重くて破壊力がある。 D:使用する者に災いをもたらす。 -- 2.21.1 (Apple Git-122.3) From cec9f86205297a9f1cbd27c2fdc25c88a4ca7ad2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 22:12:44 -0800 Subject: [PATCH 246/335] In the English description for Silver Chariot, set off the name of the stand with a comma and added spaces about the line break. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 30e2cd2a..818f68c9 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2712,8 +2712,8 @@ W:30:15:75:100000 P:0:2d6:17:12:0 F:DEX | BLOWS | SLAY_EVIL | SLAY_UNDEAD | SLAY_ORC | SLAY_DEMON | F:FREE_ACT | SEE_INVIS | SHOW_MODS | RES_DARK | RES_DISEN | SPEED -D:$The silver light sabre of Polnareff's stand Silver Chariot. -D:$It can pierce enemies rapidly. +D:$The silver light sabre of Polnareff's stand, Silver Chariot. +D:$ It can pierce enemies rapidly. D:ポルナレフのスタンド「シルバーチャリオッツ」が手にしていた D:軽量のサーベルだ。一瞬にして敵に無数の風穴をあけることがで D:きるはずだッ! -- 2.21.1 (Apple Git-122.3) From 490235fa8ff9ad9db52f42c5329c3a21ab3aac98 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 22:14:27 -0800 Subject: [PATCH 247/335] Changed the last sentence in the English description for the Platinum Yendorian express card and added spaces about the line break. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 818f68c9..2ef5d2aa 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2729,8 +2729,8 @@ F:LEVITATION | SLOW_DIGEST | REGEN | SEARCH | LITE | WARNING | F:INSTA_ART | QUESTITEM | FULL_NAME U:RECHARGE_XTRA D:$Yaaaaaaaaay! Platinum card of Yendorian Express!!! -D:$Wait a minute, you can not pay any more with this card. -D:$You must think other way of using it. +D:$ Wait a minute, you can not pay any more with this card. +D:$ You must think of another way of using it. D:金色に光り輝くイェンダー印のプラチナカードだ。 D:まるで億万長者になった気分がする。限度額まで使い込もう。 -- 2.21.1 (Apple Git-122.3) From 3d0fa5a9a27709509039a692255a51cfccfe9064 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 28 Dec 2019 22:16:28 -0800 Subject: [PATCH 248/335] Changed the description of Grayswandir to use "sabre" rather than "saber" for consistency with k_info.txt and other instances of sabres in a_info.txt. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2ef5d2aa..33b55212 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1410,7 +1410,7 @@ F:RES_CHAOS | RES_NETHER | HOLD_EXP | RES_FEAR | F:RES_COLD | BRAND_COLD | F:SLAY_DEMON | SLAY_EVIL | SLAY_DRAGON | SLAY_UNDEAD | F:SLOW_DIGEST | SHOW_MODS | HIDE_TYPE | BLESSED | RIDING -D:$The is the silver saber, forged by moonlight, which Corwin the prince of +D:$The is the silver sabre, forged by moonlight, which Corwin the prince of D:$ Amber wielded. It shows contrasts between silver and black like D:$ its owner does. D:アンバーの王子コーウィンが使っていた、月の光により -- 2.21.1 (Apple Git-122.3) From 5bbaa1bed611362dcdba34e7dd3a57c1aa990135 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 08:47:42 -0800 Subject: [PATCH 249/335] Changed the English description for Muramasa, to incorporate the quote (as translated by Google Translate) from the Japanese description, correct some spelling mistakes, and, hopefully, make the description more idiomatic. --- lib/edit/a_info.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 33b55212..70d492db 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2766,9 +2766,10 @@ F:HIDE_TYPE | BLOWS | VORPAL | VAMPIRIC | SLAY_HUMAN | F:SHOW_MODS | SPEED | ACTIVATE | RES_DISEN | NO_TELE | F:DRAIN_EXP | AGGRAVATE | RES_DARK | RES_NETHER | TY_CURSE | U:MURAMASA -D:$Muramasa the legendaly bracksmith forged this sword 'Muramasa'. -D:$ It always wants more blood thirstily, although it already -D:$ drained blood from many person. +D:$"If you encounter a demon, you will cut the demon. If you encounter a god +D:$ you will cut the god." Muramasa, the legendary swordsmith, forged this +D:$ sword. It always wants more blood, even though it has already drained the +D:$ blood of many. D:「魔物に遭うては魔物を斬り、神に遭うては神を斬る。」 D:伝説の刀匠村正が全身全霊を込めて鍛えたこの妖刀は D:数え切れない人間の血を啜ってきた。その刃は -- 2.21.1 (Apple Git-122.3) From 8fc421896417b18ce0ba92619e4480b4c433a850 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 09:14:37 -0800 Subject: [PATCH 250/335] Added an English description for the nunchaku of Xiaolong. It largely follows Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 70d492db..0771e2d5 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2784,6 +2784,9 @@ F:STEALTH | SUST_STR | SUST_DEX | SUST_CON | F:SPEED | RES_FIRE | BRAND_FIRE | F:SLAY_ANIMAL | SLAY_DRAGON | RES_FEAR | FREE_ACT | F:REGEN | SHOW_MODS | HIDE_TYPE +D:$This a powerful nunchaku with the spiritual power of a legendary fighter. +D:$ In skilled hands, it can deliver blows as fast as someone fighting +D:$ barehanded. D:伝説の格闘家の霊力が宿った強力なヌンチャクだ。 D:拳法を操る者が手にすれば自らの体の一部のように D:操ることができ、素手の時と同じくらい素早い攻撃が -- 2.21.1 (Apple Git-122.3) From 8bc2b6fed9b450f38af254c9f53fbdc287402f34 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 09:17:41 -0800 Subject: [PATCH 251/335] Added an English description for 'Stone Mask'. It is essentially the same as Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 0771e2d5..037ab999 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2802,6 +2802,7 @@ F:RES_CONF | RES_NETHER | RES_COLD | RES_POIS | RES_DARK | RES_FEAR | F:SEE_INVIS | ACTIVATE | DRAIN_EXP | F:SH_COLD | HOLD_EXP | LEVITATION | REGEN U:TERROR +D:$It is the stone mask of Dio Brando that turns the wearer into a vampire. D:装備した者を吸血鬼に変えてしまうというディオの石仮面だ。 N:147:飛行 -- 2.21.1 (Apple Git-122.3) From 7120802137ab85be13c6e0b6d820a638c0abddcb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 09:20:56 -0800 Subject: [PATCH 252/335] Added an English description for the Levitation Stone of Laputa. It is essentially the same as Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 037ab999..d46cb990 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2812,6 +2812,7 @@ W:60:60:10:60000 P:0:1d1:0:0:0 F:INT | CHR | SPEED | ACTIVATE | LEVITATION | HOLD_EXP | INSTA_ART | LITE_3 | U:BA_MANA +D:$This glowing blue gem allows the wielder to levitate. D:浮遊の力を与えてくれる青く仄光る宝石だ。 N:148:『与一の弓』 -- 2.21.1 (Apple Git-122.3) From f9986df7dee87a33ee7b25439f4873637ce5dd60 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 09:35:14 -0800 Subject: [PATCH 253/335] Added an English description for the longbow of Yoichi. It draws from the Wikipedia pages for Nasu no Yoichi and Tale of the Heike. I didn't try to incorporate the quote that's in the Japanese description. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index d46cb990..ce7414d3 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2821,6 +2821,7 @@ I:19:13:4 W:35:30:40:30000 P:0:0d0:40:13:0 F:DEX | HIDE_TYPE | SEE_INVIS | XTRA_MIGHT | SHOW_MODS +D:$It is the bow of Nasu no Yoichi, known for making impossible shots. D:「与一鏑を取つて番ひ、能つ引いてひやうと放つ。小兵といふ条、 D:十二束三伏、弓はつよし、鏑は浦響くほどに長鳴して、過たず扇の D:要ぎは一寸ばかり置いて、ひいふつとぞ射切つたる。」(平家物語)。 -- 2.21.1 (Apple Git-122.3) From c8aeb25d74c77c9a410dac913bcc63e575a862ff Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 10:01:04 -0800 Subject: [PATCH 254/335] Added an English description for Zantetsuken. It makes a broader claim ("cutting anything" rather than "cuts through steel") than Google Translate's result for the Japanese description based on the TUNNEL flag and the description of the weapon from Final Fantasy at https://finalfantasy.fandom.com/wiki/Zantetsuken_(weapon) . --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ce7414d3..2d43ab6b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2843,6 +2843,7 @@ I:23:20:2 W:30:25:120:80000 P:0:10d4:17:21:0 F:STR | DEX | VORPAL | TUNNEL | SHOW_MODS +D:$It's a sharp Japanese sword said to be capable of cutting anything. D:鋼をも切り裂く、切れ味抜群の日本刀だ。 N:151:八咫 -- 2.21.1 (Apple Git-122.3) From 8aa74536da323df53a31d5f449bedefdaa60f4dc Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 10:18:54 -0800 Subject: [PATCH 255/335] Added an English description for the naginata of Benkei. It tries to cover the same ground as Google Translate's result for the Japanese description but adds some details described in the English wikipedia entry for Benkei. --- lib/edit/a_info.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2d43ab6b..5a386e48 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2862,6 +2862,11 @@ W:40:20:400:98765 P:0:3d6:5:23:5 F:STR | CON | SLAY_EVIL | SLAY_UNDEAD | SLAY_ORC | SLAY_TROLL | RES_FEAR | F:FREE_ACT | REGEN | SHOW_MODS +D:$Musashibo Benkei, sometimes said to be a demon, used his power to obtain +D:$ this naginata. With it, he won 999 swords from samurai in duels +D:$ around Kyoto. Trying to win an additional sword, Benkei fought Minamoto +D:$ no Yoshitsune on Gojo Bridge and lost. Benkei later became Yoshitsune's +D:$ retainer. D:後に義経に仕えた怪僧・武蔵坊弁慶は、この大薙刀を得物に武力を振るい、 D:五条大橋の上で999本の刀を狩った。 -- 2.21.1 (Apple Git-122.3) From 593d4d5063886d7b1390f410aab6c3d24c5e0eaf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 12:46:01 -0800 Subject: [PATCH 256/335] Added an English description for the fishing pole of Taikobo. It's essentially Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 5a386e48..0f25f8e9 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2937,6 +2937,8 @@ W:10:150:30:10000 P:0:1d1:0:0:0 F:ACTIVATE | INSTA_ART U:FISHING +D:$Taikobo's daily routine was to fish with this fishing rod. Eventually, +D:$ Taikobo was himself caught by Zhou Wen Wang. D:太公望はこの釣り竿を用いて釣りを楽しむのが日課であったが、 D:結局は彼自身が周の文王に釣られてしまったのであった。 -- 2.21.1 (Apple Git-122.3) From f5cecb2e83fb45a20acdefb0602ef27118237896 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 13:05:49 -0800 Subject: [PATCH 257/335] Added an English description for Tonbo giri. It tries to cover the same ground as Google Translate's result for the Japanese description, but also draws from the English Wikipedia entry for Tonbokiri. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 0f25f8e9..7d0fbcdf 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2961,9 +2961,9 @@ P:0:4d9:6:23:10 F:STR | DEX | HIDE_TYPE | SEARCH | FREE_ACT | SLAY_HUMAN | F:SLAY_TROLL | SLAY_GIANT | SLAY_ANIMAL | SLAY_ORC | RES_FIRE | RES_COLD | F:RES_ELEC | RES_ACID | RES_FEAR | SHOW_MODS | RIDING -D:$Because of very superb sharpness such as dragon flies are -D:$cut which perches on the tip of this spear, it is called -D:$'Tonbo giri' which means 'dragon fry cutter'. +D:$Said to belong to Honda Tadakatsu, a leading general for Tokugawa Ieyasu, +D:$ this spear got its name, 'Tonbo giri' or dragonfly cutter, because a +D:$ dragonfly that tried to perch on the tip was cut in two. D:徳川四天王の1人本多忠勝の愛用の槍だ。 D:その切れ味は穂先に止まった蜻蛉が切れて落ちるほどである。 -- 2.21.1 (Apple Git-122.3) From 7620eeb7734856dcabd9120c1908e4acca8aee93 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 13:29:55 -0800 Subject: [PATCH 258/335] Added an English description for GaeBolg. That largely sticks to Google Translate's result for the Japanese description but also draws from English Wikipedia entry for Gae Bulg. --- lib/edit/a_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 7d0fbcdf..2ed47a1a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -2989,6 +2989,9 @@ F:BRAND_ELEC | SLAY_EVIL | SLAY_GIANT | F:RES_ELEC | RES_LITE | RES_DARK | F:LITE | SEE_INVIS | RES_BLIND | SHOW_MODS | RIDING U:BA_STAR +D:$This is spear of the Celtic hero, Cuchulainn. Carved from the bone of +D:$ a sea dragon, it protects the sight of the wielder and can flash to dazzle +D:$ an opponent. D:ケルトの英雄クーフーリンの、海竜の骨から削られた長槍だ。 D:つねに目映く発せられるその閃光は敵の目をくらまし、 D:逆に所有者の視力を守る。 -- 2.21.1 (Apple Git-122.3) From 29e015221ece26c5ebc44d66fa0b294f1e909046 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 15:05:23 -0800 Subject: [PATCH 259/335] Added an English description for Exalipur: it's essentially Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2ed47a1a..ebdeb8e0 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3159,6 +3159,7 @@ W:50:30:130:0 P:0:5d5:-50:-50:-5 F:WIS | CHR | F:TY_CURSE | AGGRAVATE | DRAIN_EXP | SHOW_MODS | THROW +D:$"What's this! Isn't it the strongest sword!?" (Final Fantasy V) D:「なんだこれは!最強の剣じゃないのか!?」 D:(FINAL FANTASY V) -- 2.21.1 (Apple Git-122.3) From 4ee1ba8c7a834bbc89e00fb49c03d975ffdae8cf Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 15:10:43 -0800 Subject: [PATCH 260/335] Added an English description for Excalibur Jr. It tries to cover the same ground as Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ebdeb8e0..2375c373 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3182,6 +3182,9 @@ F:BLOWS F:SLAY_UNDEAD | SLAY_DRAGON | SLAY_ANIMAL | F:RES_FIRE | RES_FEAR | BLESSED | F:SLOW_DIGEST | SHOW_MODS +D:$It is similar to the fabled Excalibur but is slightly smaller. It also +D:$ also happens to talk, calling itself "E.J." and admitting to a severe case +D:$ of arachnophobia. D:かの宝剣エクスカリバーに似た作りの、少し小型の剣だ。 D:自分のことを「E.J.」と呼び、ごくたまに話もする。 D:蜘蛛と対峙すると、恐れのあまりプリンのようにぷるぷると震える。 -- 2.21.1 (Apple Git-122.3) From 1cd4485f4331d7b6e88ad218d8a02d9070d00b60 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 18:43:35 -0800 Subject: [PATCH 261/335] Added an English description for the whip of Bolshoi. It tries to emulate the content, though not the exact wording, of Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 2375c373..4fd607fa 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3333,6 +3333,8 @@ P:0:2d6:6:9:0 F:DEX | CHR | HIDE_TYPE | RIDING | F:KILL_ANIMAL | ESP_ANIMAL | BRAND_FIRE | ACTIVATE U:CHARM_ANIMAL +D:$This is the whip of a venerable beastmaster from a country circus. The +D:$ crack of this whip can shake any beast. D:某国サーカス団で使用された由緒正しい猛獣使いの証だ。 D:このムチの音はどんな猛獣でも震え上がらせることができる。 -- 2.21.1 (Apple Git-122.3) From 91a3dd9b296a803ed25bb8a281091e7c1a4f8f64 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 18:52:30 -0800 Subject: [PATCH 262/335] Edited the English description of Frakir to correct the spelling of "Merlin", give his relationship to Corwin, and to hopefully be more idiomatic. --- lib/edit/a_info.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 4fd607fa..7dfb1827 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -252,10 +252,10 @@ W:50:40:2:75000 F:STR | INT | WIS | DEX | CON | CHR | STEALTH | HIDE_TYPE | F:RES_POIS | ACTIVATE | SEE_INVIS | SEARCH | WARNING | INSTA_ART U:HYPODYNAMIA_1 -D:$This bracelet has its own will, which was created by Marlin -D:$ the prince of chaos. It is invisible but it sometimes -D:$ ripples to warn owner's dangers. It can morph to strangle -D:$ enemy's neck, if owner commands to it. +D:$This bracelet has its own will. It was created by Merlin, a prince of Chaos +D:$ and son of Corwin. The bracelet is invisible, but it sometimes ripples or +D:$ constricts to warn its owner of danger. When commanded by its owner, it +D:$ can morph to strangle an enemy's neck. D:$ (R.Zelazny, 'The Chronicles of Amber', vol.6-10) D:混沌の王子マーリンがログルスから生み出した意思を持った腕輪だ。 D:普段は目に見えないが脈動して危険を知らせてくれる。装備するものが -- 2.21.1 (Apple Git-122.3) From a78b42e9a6e880545b44b96f41725c326ff7d492 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 19:04:37 -0800 Subject: [PATCH 263/335] Edited the description of the short sword of Merlin to hopefully be more idiomatic and include his relationship to Corwin. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 7dfb1827..77cefb2b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -1790,9 +1790,9 @@ W:20:8:80:35000 P:0:1d7:3:7:0 F:BLOWS | F:SLAY_ANIMAL | SLOW_DIGEST | REGEN | SHOW_MODS | SEE_INVIS | RES_DISEN -D:$Merlin the prince of chaos hates carrying a heavy sword, so he invokes -D:$ a power of chaos to take his sword from another dimension when he -D:$ needs. This sword is also one of such things. +D:$Merlin, a prince of chaos and Corwin's son, hates carrying a heavy sword. +D:$ When he needs one, he invokes a power of chaos to summon a blade from some +D:$ nearby parallel world. This sword is one of those he summoned. D:$ (R.Zelazny, 'The Chronicles of Amber', vol.6-10) D:地球暮らしの長いマーリンは現代っ子らしく重く長い剣を持ち歩くのが嫌いで、 D:必要な時カオスの力で剣を異世界から取り寄せる。この剣もそうした物の -- 2.21.1 (Apple Git-122.3) From 028232cf56fa46cece9cd84a04555c418f743839 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 20:45:03 -0800 Subject: [PATCH 264/335] Added an English description for the club of Samson. --- lib/edit/a_info.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 77cefb2b..6992c06a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3169,6 +3169,9 @@ I:21:1:3 W:10:20:50:40000 P:0:2d4:8:10:0 F:STR | CON | RES_FEAR | SEE_INVIS | SLAY_EVIL | SLAY_UNDEAD +D:$This is the donkey's jawbone that Samson used to defeat a Philistine Army. +D:$ Lightweight but effective, this club's sacred power is especially deadly +D:$ against evil foes. D:怪力サムソンがペルシア人兵士の包囲を撃ち破ったときに使っていた D:棍棒。骨でできているために軽く、その聖なる力は邪悪なモンスター D:を打ち払う。 -- 2.21.1 (Apple Git-122.3) From f6a717dcd018986a7089451d3ceedd060d8aaf58 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 20:53:54 -0800 Subject: [PATCH 265/335] Corrected typo in the English description of Narsil. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 6992c06a..ab2e2e53 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3373,7 +3373,7 @@ W:20:4:130:20000 P:0:2d2:6:10:0 F:STR | BLOWS | HIDE_TYPE | F:SLAY_ORC | SLAY_TROLL | RES_FIRE -D:$A blade of Elendil that was broken by his fall as the battled Sauron upon +D:$A blade of Elendil that was broken by his fall as he battled Sauron upon D:$ the steps of Barad-Dur. D:「金はすべて光るとは限らぬ、 D:放浪する者すべてが、まよう者ではない。 -- 2.21.1 (Apple Git-122.3) From 55f95900355f0eafdcd8dfea2a72b94fa06ac541 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 21:52:17 -0800 Subject: [PATCH 266/335] Corrected typo in label for artifact rusty chain mail. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ab2e2e53..e4e8ab22 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3490,7 +3490,7 @@ D:是れ淤能碁呂島なり。」(古事記)。 # モーロックの高僧の錆びた鎖かたびら N:203:モーロックの高僧の -E:of The High Preist of Morlok +E:of The High Priest of Morlok I:37:1:-2 W:90:8:200:100000 P:14:1d4:-5:0:-40 -- 2.21.1 (Apple Git-122.3) From fa674bd1698a5fc2cb30b07885b8b00d5a61a621 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 22:10:01 -0800 Subject: [PATCH 267/335] From Google Translate's result for the Japanese description, it sounds like this the rusty chainmail of the High Priest of Morlok is a NetHack reference. Based on that, changed "Morlok" to "Moloch" in the label and added an English description that tries to match the intent of Google Translate's result but doesn't match the words. --- lib/edit/a_info.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index e4e8ab22..d7d0a3c5 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3490,7 +3490,7 @@ D:是れ淤能碁呂島なり。」(古事記)。 # モーロックの高僧の錆びた鎖かたびら N:203:モーロックの高僧の -E:of The High Priest of Morlok +E:of The High Priest of Moloch I:37:1:-2 W:90:8:200:100000 P:14:1d4:-5:0:-40 @@ -3498,6 +3498,9 @@ F:INT | WIS | CHR | HIDE_TYPE | RES_LITE | RES_DARK | F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD | F:RES_POIS | RES_CONF | RES_CHAOS | RES_NETHER | F:RES_NEXUS | AGGRAVATE | CURSED | HEAVY_CURSE | TY_CURSE +D:$This badly rusted chain mail was once worn by a high priest who guarded a +D:$ powerful magic amulet. That priest's despair and the amulet's magic have +D:$ left their mark in the mail. D:この赤々と錆びた今にも崩れ去りそうな鎖かたびらには、 D:かつて愚かにも守護する魔除けを奪われ朽ち果てた、 D:太古の高僧の怨念がこもっている。 -- 2.21.1 (Apple Git-122.3) From e2876c925dab913f2cb14f8ea54d3ba68c74e9ab Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 22:20:20 -0800 Subject: [PATCH 268/335] Added an English description for the Sumo wrestler's loincloth. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index d7d0a3c5..dd16e48a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3514,6 +3514,8 @@ P:4:0d0:0:0:0 F:STR | CON | SUST_STR | SUST_CON | F:RES_FEAR | FREE_ACT | ACTIVATE U:SHIKOFUMI +D:$It is the traditional garb for a Sumo wrestler. Just touching it makes you +D:$ feel stronger. D:遥か東の国のスモー戦士が身につける正装だ。 D:その豪華な宝飾は力強さを感じさせる。 -- 2.21.1 (Apple Git-122.3) From 986a0f0a6659e288c49509d2a31992f6fe906cbe Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 29 Dec 2019 22:26:19 -0800 Subject: [PATCH 269/335] Added an English description for fur cloak of Mook, drawing on Google Translate's result for the Japanese description and the English Wikipedia entry for Gachapin. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index dd16e48a..45f8773b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3526,6 +3526,7 @@ W:20:20:30:50000 P:3:0d0:0:0:20 F:RES_COLD | RES_ACID | RES_CHAOS | LEVITATION | ACTIVATE U:RESIST_COLD +D:$This is the fur cloak of Mook, a red Yeti and Gachapin's friend. D:ガチャピンと対をなす赤い獣の毛皮のクロークだ。 # 金属製ラメラー・アーマー『バテレン鎧』 -- 2.21.1 (Apple Git-122.3) From e9c4762fe4a6393ee4e3238865783602e59e34f4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 08:19:05 -0800 Subject: [PATCH 270/335] Added an English description for the Amulet of the Pitch Dark Night. It is essentially Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 45f8773b..354fe719 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3675,6 +3675,8 @@ F:STEALTH | SEARCH | HIDE_TYPE | SEE_INVIS | F:RES_DARK | ACTIVATE | LITE_M1 | F:INSTA_ART U:BA_DARK +D:$It is a necklace decorated with jet-black jewels. Wear it and feel yourself +D:$ in the dark. D:漆黒の宝玉がつけられた頸飾りだ。 D:身に付けると自分が暗闇の中にいるのを感じる。 -- 2.21.1 (Apple Git-122.3) From 80ee006bc3ae59629e059e6400f35b91bbe68661 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 08:31:28 -0800 Subject: [PATCH 271/335] To be more idiomatic, dropped "the" from the English label for the "Collar Harness of the Hell". --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 354fe719..3022cbdc 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3708,7 +3708,7 @@ U:DISP_CURSE_XTRA D:これを身につけたプレイヤーは呪いをはね返すことができる。 N:218:地獄の -E:of the Hell +E:of Hell I:40:26:-2 W:50:40:30:66666 P:0:0d0:15:15:-5 -- 2.21.1 (Apple Git-122.3) From f98cd4595cdf4c6ca46781fc02f012f611ec31bd Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 08:43:03 -0800 Subject: [PATCH 272/335] Added an English description for the Collar Harness of Hell. It tries to cover the same ground as Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 3022cbdc..266147fc 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3717,6 +3717,8 @@ F:RES_DARK | RES_NETHER | F:SEE_INVIS | AGGRAVATE | ESP_UNDEAD | ACTIVATE | F:INSTA_ART U:BA_DARK +D:$It is one of the restraining collars used for the prisoners in Hell. The +D:$ spite of many prisoners is palpable when near the collar. D:地獄の囚人を拘束する首輪だ。多くの囚人の怨念が込められている。 N:219:帯魔力ペンダント -- 2.21.1 (Apple Git-122.3) From 338111774c92ca9adbd6dd2b77e614f97b194dea Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 08:46:33 -0800 Subject: [PATCH 273/335] Changed the English description for the short bow of Robin Hood to be more idiomatic and more closely follow Google Translate's result for the Japanese descripotion. --- lib/edit/a_info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 266147fc..1ed74605 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3748,7 +3748,7 @@ W:20:15:30:50000 P:0:2d1:15:17:0 F:DEX | CHR | STEALTH | F:XTRA_MIGHT | HIDE_TYPE | SHOW_MODS | XTRA_H_RES -D:$This is of Robin Hood who live in the deep forest. +D:$It is the bow of Robin Hood, the bandit in Sherwood Forest. D:シャーウッドの森に住む義賊ロビン・フッドの弓だ。 # from Slash'EM -- 2.21.1 (Apple Git-122.3) From 7774a077100d6ab4e564e48d4bb71248c3cae3eb Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 09:17:02 -0800 Subject: [PATCH 274/335] Changed the English description for the Light Crossbow of 'Hellfire' to add an adjective from Google Translate's result, change the verb from "gives" to "can cause" since the branding is an activation and not a permanent effect, and describe the branding effect in a different way. --- lib/edit/a_info.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 1ed74605..af6f603b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3760,7 +3760,8 @@ P:0:2d1:15:17:0 F:STR | INFRA | RES_FIRE | SH_FIRE | F:ACTIVATE | HIDE_TYPE | SHOW_MODS U:BRAND_FIRE_BOLTS -D:$This crossbow gives flame energy to bolts which it fires. +D:$This fiery-colored crossbow can cause the bolts it fires to burst into +D:$ flame upon impact. D:この燃えるような色のクロスボウは、発射するボルトに炎の力を D:与えることができる。 -- 2.21.1 (Apple Git-122.3) From 5ca6a06836150de2b7e1d8ba44054b753eaf35b2 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 09:26:36 -0800 Subject: [PATCH 275/335] To hopefully be more idiomatic, reworded the English description for the Light Crossbow of Wilhelm Tell. --- lib/edit/a_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index af6f603b..6eda1f31 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3771,9 +3771,8 @@ I:19:23:4 W:35:30:110:50000 P:0:0d0:40:13:0 F:DEX | HIDE_TYPE | SEE_INVIS | XTRA_MIGHT | SHOW_MODS -D:$With this crossbow, Swiss hero Tell shot an apple exactly -D:$though it was on his son's head, and then he defeated evil -D:$magistrate Gessler. +D:$With this crossbow, the Swiss hero, Tell, shot an apple from his son's +D:$ head and then defeated the Gessler, the tyrannical magistrate. D:スイスの英雄ウィリアム・テルの使ったクロスボウだ。 D:彼は我が子の頭の上のリンゴを正確に撃ち抜き、民衆を苦しめる D:悪代官ゲスラーを打ち破った。 -- 2.21.1 (Apple Git-122.3) From 98431be1f68913c3f62ae5563dd1283943edbb92 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 09:29:08 -0800 Subject: [PATCH 276/335] Reworded the English description for the Bolt of Wilhelm Tell. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 6eda1f31..dbf69279 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3783,8 +3783,8 @@ I:18:1:0 W:35:35:2:5000 P:0:6d5:20:16:0 F:KILL_HUMAN -D:$It is said that this bolt sticked onto the heart of Gessler -D:$when Wilhelm Tell shot it. +D:$It is said that Wilhelm Tell slew Gessler, the Austrian magistrate, with +D:$ this bolt. D:かつてウィリアム・テルが撃ち放った1本のクロスボウの矢だ。 D:悪代官ゲスラーの命を正確に奪ったという。 -- 2.21.1 (Apple Git-122.3) From 066fd933b0308460614b754272924ddc84164e3a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 09:44:24 -0800 Subject: [PATCH 277/335] Changed to use the English rendering of the Greek, rather than Roman, form of Asclepius's name and slightly reworded the description. --- lib/edit/a_info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index dbf69279..6ad0769b 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3790,7 +3790,7 @@ D:悪代官ゲスラーの命を正確に奪ったという。 #JX# N:225:アスクレピオスの -E:of Aesculapius +E:of Asclepius I:21:14:3 W:40:45:160:300000 P:0:2d11:15:15:5 @@ -3800,8 +3800,8 @@ F:VAMPIRIC | SLAY_ANIMAL | SLAY_DRAGON | SLAY_HUMAN | F:SLAY_ORC | SLAY_TROLL | SLAY_GIANT | F:RES_POIS | RES_CONF | RES_CHAOS | U:REST_ALL -D:$This is the staff of Aesculapius, who is a greek god of -D:$the medicine. +D:$This is the staff of Asclepius, a hero and god of medicine in Greek +D:$ mythology. D:これは、医学の神アスクレピオスの奇跡の六尺棒だ。 D:どんな怪我もたちまち癒してしまう。 -- 2.21.1 (Apple Git-122.3) From e3e49cb2112b9db6a841eabd44119ad4613cb909 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 10:11:57 -0800 Subject: [PATCH 278/335] Inserted an indefinite article in the English label for the Broken Dagger of Magician to be more idiomatic. Changed the English description since the older version was awkward. --- lib/edit/a_info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 6ad0769b..0b42a1cf 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3864,11 +3864,11 @@ D:大きな太刀を手にして多くの敵兵の命を奪いさった。その D:えに敵陣に突っ込みすぎたという。 N:230:手品師の -E:of Magician +E:of a Magician I:23:1:0 W:1:1:5:3000 P:0:1d1:0:0:0 -D:$This dagger can not injure someone almostly. +D:$This dull dagger has a very faint magic aura about it. D:このダガーは人を傷つけることはないだろう。 N:231:暗殺者荊軻の -- 2.21.1 (Apple Git-122.3) From 30aaa29cd3b7407ea41ebedf124fad0431239136 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 11:09:48 -0800 Subject: [PATCH 279/335] Added an English description for the Mace 'Demonbane'; it's Google Translate's result for the Japanese description. --- lib/edit/a_info.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 0b42a1cf..02c76522 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3968,6 +3968,7 @@ I:21:5:0 W:45:18:250:2500 P:0:4d6:15:15:0 F:RIDING | WARNING | SLAY_EVIL | KILL_DEMON | ESP_DEMON +D:$What, this useless sword again? Oh! Wait a minute .... D:なんだ、またこの役立たずの剣か。おや?ちょっと待てよ…… # The Light Crossbow 'Wiizapper' (x3) -- 2.21.1 (Apple Git-122.3) From e3d93acc9fa18061cbff3d5c944cc8191bfb2e4b Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 11:17:27 -0800 Subject: [PATCH 280/335] Changed the English description for 'Wiizapper' to be a bit more idiomatic. --- lib/edit/a_info.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index 02c76522..ad15e17a 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -3980,9 +3980,8 @@ P:0:1d1:13:13:0 F:INFRA | DEX | XTRA_SHOTS | LITE | F:SEE_INVIS | WARNING | F:HIDE_TYPE | SHOW_MODS -D:$The white light crossbow that the fighter Link, wearing green clothes, -D:$bought for training of shooting.'Enjoy shootings at the living room.' -D:$(Nintendo) +D:$Link, a warrior dressed in green, allegedly bought this white light crossbow +D:$ for training. "Enjoy shooting in the living room" (Nintendo) D:緑の服の戦士リンクがボウガンのトレーニングのために購入した D:と言われる軽くて白いクロスボウだ。「リビングで射撃を楽しむ」 D:(Nintendo) -- 2.21.1 (Apple Git-122.3) From 388fdf190db5d44c90df6147a2a63ee5577b8ab7 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 11:36:24 -0800 Subject: [PATCH 281/335] =?UTF-8?q?Added=20an=20English=20label=20for=20th?= =?UTF-8?q?e=20Heavy=20Crossbow=20of=20=E7=AE=A1=E5=AD=90=E3=81=AE.=20Rewo?= =?UTF-8?q?rded=20the=20English=20description=20to=20make=20it=20clearer?= =?UTF-8?q?=20(drawing=20upon=20the=20English=20Wikipedia=20entry=20for=20?= =?UTF-8?q?Guan=20Zhong=20in=20the=20process).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/edit/a_info.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ad15e17a..b0d3b3f2 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -4001,15 +4001,16 @@ D:この不気味に黒光るクロスボウはずっしりと重い。その一 # The Heavy Crossbow of Guanzi (x4) N:241:管子の +E:of Guan Zhong I:19:24:3 W:40:20:200:99999 P:0:4d1:10:15:0 F:INT | WIS | SUST_INT | SUST_WIS | MAGIC_MASTERY | XTRA_SHOTS | F:RES_CONF | RES_NEXUS | FREE_ACT | F:HIDE_TYPE | SHOW_MODS -D:$This is Guan Zhong's heavy crossbow for assassinating. -D:$He took prime minister's post of Qi, although he failed to -D:$take the life of the prince of Qi. +D:$This is Guan Zhong's heavy crossbow. Tutor to a prince of Qi, he +D:$ attempted to use it to kill another prince of Qi but failed. Spared by +D:$ his target, he became the chancellor of Qi. D:斉の管仲が暗殺用に用いた重い弩だ。公子小白を射抜くことはできなかった D:が、後に斉の宰相の座を見事に射止めた。 -- 2.21.1 (Apple Git-122.3) From cdeeb63580771741cf1ed8b50f05aab35981fed6 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 11:55:21 -0800 Subject: [PATCH 282/335] Changed the English description of Vampire Killer to flow better and use the spelling for the family name that's used in English Wikipedia entry for the Castlevania characters. --- lib/edit/a_info.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index b0d3b3f2..ad74d928 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -4059,10 +4059,9 @@ D:この聖なる鞭は、錬金術師の知恵と乙女の代償によって生 D:退魔の血族ベルモンド家代々の手で振るわれてきた。 D:その力は邪悪な夜の一族に対する呪詛そのものであり、 D:汚れた魂を過たず撃ち滅ぼすだろう。 -D:$This holy whip was generated with wise of a alchemist and a maiden's -D:$sacrifice, wielded by Belmond family, the vampire hunters. -D:$That power is indeed curse of evil household of night -D:$and vanish the poisonous souls. +D:$This holy whip was generated by an alchemist's wisdom and a maiden's +D:$ sacrifice. It has been wielded by generations of the Belmont family, the +D:$ vampire hunters, and is the great bane of any with an unclean soul. N:245:運命のオーブ E:The Orb of Fate -- 2.21.1 (Apple Git-122.3) From 9d0fcf694ca1933a1a1272254a1e5628572052db Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Mon, 30 Dec 2019 13:10:52 -0800 Subject: [PATCH 283/335] Added an English description for the Orb of Fate. The quoted text is from https://nethackwiki.com/wiki/Valkyrie_quest where I uniformly used Tyr as the deity (since Google Translate's result for the Japanese description has "Tulle") and replaced "daughter" with "child" in the last sentence. --- lib/edit/a_info.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt index ad74d928..1ee57fe7 100644 --- a/lib/edit/a_info.txt +++ b/lib/edit/a_info.txt @@ -4070,6 +4070,11 @@ W:70:70:15:45000 P:0:1d1:0:0:20 F:WIS | CON | WARNING | ACTIVATE | FULL_NAME | LITE_3 | U:TELEPORT_LEVEL +D:"You may take the Orb of Fate with you. I have removed from it the power +D: to foretell the future, for that power no mortal should have. Its other +D: abilities, however, you have at your disposal. You must now begin in Tyr's +D: name to search for the Amulet of Yendor. May your steps be guided by Tyr, +D: my child." (Norn, Nethack) D:「運命のオーブを持っていきなさい。わたしは運命のオーブから D:人間の手に触れてはならぬ未来を告げる力を取り除きました。 D:しかしながら運命のオーブの他の力は,あなたの思い通りに -- 2.21.1 (Apple Git-122.3) From 446fbdc6f97ddabb63a690fb14f9c93baecfe65e Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 31 Dec 2019 20:21:28 -0800 Subject: [PATCH 284/335] Corrected subject/verb agreement in the English message about the Kendo books. --- src/birth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/birth.c b/src/birth.c index 16ab5bcd..92e6f693 100644 --- a/src/birth.c +++ b/src/birth.c @@ -476,7 +476,7 @@ static concptr realm_jouhou[VALID_REALM] = "Music magic works through the caster singing songs. There are two types of songs; one which shows effects instantly and another which shows effects continuously until SP runs out. The latter type has a limit: only one song can be sung at a time.", -"The books of Kendo describe various combat techniques. When learning new techniques, you are required to carry the books, but once you memorizes them, you don't have to carry them. When using a technique, wielding a weapon is required.", +"The books of Kendo describe various combat techniques. When learning new techniques, you are required to carry the books, but once you memorize them, you don't have to carry them. When using a technique, wielding a weapon is required.", "Hex is an unsavory realm, like the death and demon realms. Many spells can act continuously by stringing together curses like a song. Spells may obstruct monsters' actions, deal damage to monsters in sight, or return damage to monsters who have damaged the caster." #endif -- 2.21.1 (Apple Git-122.3) From 818184f8e2bf1019753cbac715665cdbeaec0592 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 1 Jan 2020 13:37:33 -0800 Subject: [PATCH 285/335] In the introductory phrase for the English description of imps, made the noun plural to match the noun in the main clause. --- lib/help/raceclas.txt | 2 +- src/birth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index f2465bb4..b1b44025 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -258,7 +258,7 @@ by the racial/class power command ("U"/"O"). ***** --- Imp --- - A demon-creature from the nether-world, imps are naturally resistant + Demon-creatures from the nether-world, imps are naturally resistant to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they diff --git a/src/birth.c b/src/birth.c index 92e6f693..f4e35908 100644 --- a/src/birth.c +++ b/src/birth.c @@ -202,7 +202,7 @@ static concptr race_jouhou[MAX_RACES] = "A secretive and mysterious ancient race. Their civilization may well be older than any other on our planet, and their intelligence and wisdom are naturally sustained, and are so great that they enable Mind Flayers to become more powerful spellcasters than any other race, even if their physical attributes are a good deal less admirable. As they advance levels, they gain the powers of See Invisible and Telepathy.", -"A demon-creature from the nether-world, imps are naturally resistant to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", +"Demon-creatures from the nether-world, imps are naturally resistant to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", "A Golem is an artificial creature, built from a lifeless raw material like clay, and awakened to life. They are nearly mindless, making them useless for professions which rely on magic, but as warriors they are very tough. They are resistant to poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their experience. Golems gain very little nutrition from ordinary food, but can absorb mana from staves and wands as their power source. Golems also gain a natural armor class bonus from their tough body.", -- 2.21.1 (Apple Git-122.3) From 966e17a238483d397143bc6f329e5f9a11356a35 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 4 Jan 2020 11:40:29 -0800 Subject: [PATCH 286/335] Redid the English descriptions for the charge and harainuke abilities since the previous change didn't accurately convey how the movement after the attack works. --- src/mind.c | 2 +- src/realm-hissatsu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mind.c b/src/mind.c index 672c1aae..9526260d 100644 --- a/src/mind.c +++ b/src/mind.c @@ -479,7 +479,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] = }, { "Detects all monsters except the mindless in your vicinity.", - "Attacks a monster with your weapons normally, then dodges to one side.", + "In one action, attacks a monster with your weapons normally and then moves to the space beyond the monster if that space is not blocked.", "Sets off a trap, then destroys that trap.", "Shakes dungeon structure, and results in random swapping of floors and walls.", "Attacks all adjacent monsters.", diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c index f33b21df..4880f1b2 100644 --- a/src/realm-hissatsu.c +++ b/src/realm-hissatsu.c @@ -184,7 +184,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo case 7: if (name) return _("払い抜け", "Harainuke"); if (desc) return _("攻撃した後、反対側に抜ける。", - "Attacks a monster with your weapons normally, then dodges to one side."); + "In one action, attacks a monster with your weapons normally and then moves to the space beyond the monster if that space is not blocked."); if (cast) { -- 2.21.1 (Apple Git-122.3) From 7d1500fb234b8f1fd8deab1929091505df7126be Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 5 Jan 2020 07:56:43 -0800 Subject: [PATCH 287/335] To be more idiomatic, dropped "out" in the English summary for QUEST_TYPE_FIND_ARTIFACT quests. --- src/cmd/cmd-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 08894388..77a44d48 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -6334,7 +6334,7 @@ static void do_cmd_knowledge_quests_current(player_type *creature_ptr, FILE *fff q_ptr->ident = IDENT_STORE; object_desc(creature_ptr, name, q_ptr, OD_NAME_ONLY); } - sprintf(note, _("\n - %sを見つけ出す。", "\n - Find out %s."), name); + sprintf(note, _("\n - %sを見つけ出す。", "\n - Find %s."), name); break; case QUEST_TYPE_FIND_EXIT: sprintf(note, _(" - 出口に到達する。", " - Reach exit.")); -- 2.21.1 (Apple Git-122.3) From 75c3421284e116636a39443b4c7ce533bb09cb84 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Tue, 7 Jan 2020 22:03:23 -0800 Subject: [PATCH 288/335] Went back to using "staffs{ as the plural of staff rather than "staves" since saw some sources indicating that both are acceptable and some treating "staves" as archaic. Using "staves" as the plural also would require some modification of object_desc() and the k_info.txt entries for "Quarterstaff", "Jo Staff", and "Bo Staff". --- lib/help/attack.txt | 2 +- lib/help/commdesc.txt | 6 +++--- lib/help/defend.txt | 4 ++-- lib/help/faq.txt | 2 +- lib/help/objects.txt | 20 ++++++++++---------- lib/help/raceclas.txt | 14 +++++++------- lib/help/tang.txt | 4 ++-- lib/help/town.txt | 2 +- lib/help/version.txt | 2 +- src/autopick.c | 2 +- src/birth.c | 8 ++++---- src/bldg.c | 8 ++++---- src/cmd/cmd-dump.c | 2 +- src/object-flavor.c | 2 +- src/spells2.c | 2 +- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/help/attack.txt b/lib/help/attack.txt index 57ea9c75..1a812dec 100644 --- a/lib/help/attack.txt +++ b/lib/help/attack.txt @@ -26,7 +26,7 @@ devices. You can attack creatures from a distance by firing a missile from a bow or other missile launcher, by throwing an object or by using magical -items such as wands, rods and staves. If you have chosen to play a +items such as wands, rods and staffs. If you have chosen to play a spell casting class, you may be able to learn some spells which allow you to attack a creature from a distance. You can use distance attacks even when your target is next to you. diff --git a/lib/help/commdesc.txt b/lib/help/commdesc.txt index 66b1a47b..eb6e89eb 100644 --- a/lib/help/commdesc.txt +++ b/lib/help/commdesc.txt @@ -24,7 +24,7 @@ Inventory list (i) equipment. Often, many identical objects can be "stacked" into a "pile" which will count as a single item. This is always true of things like potions, scrolls, and food, but you may have to set - options to allow wands, staves, and other such objects to stack. + options to allow wands, staffs, and other such objects to stack. Each object has a weight, and if you carry more objects than your strength permits, you will begin to slow down. @@ -390,13 +390,13 @@ Aim a wand (a) or Zap a wand (z) Use a staff (u) or Zap a staff (Z) This command will use a staff. A staff is normally very similar to a scroll, in that they normally either have an area effect or - affect a specific object. Staves are magical devices, and there + affect a specific object. Staffs are magical devices, and there is a chance you will not be able to figure out how to use them. Zap a rod (z) or Activate a rod (a) Rods are extremely powerful magical items, which cannot be burnt or shattered, and which can have either staff-like or wand-like - effects, but unlike staves and wands, they don't have charges. + effects, but unlike staffs and wands, they don't have charges. Instead, they draw on the ambient magical energy to recharge themselves, and therefore can only be activated once every few turns. The recharging time varies depending on the type of rod. diff --git a/lib/help/defend.txt b/lib/help/defend.txt index aa31a096..31ae51ee 100644 --- a/lib/help/defend.txt +++ b/lib/help/defend.txt @@ -528,9 +528,9 @@ need to take steps to recover from the damage as soon as possible. --- Healing Items --- -Healing is available in multiple forms including: Potions and Staves +Healing is available in multiple forms including: Potions and Staffs of Cure Light Wounds, Potions of Cure Serious Wounds, Potions of Cure -Critical Wounds, Potions, Staves and Rods of Healing, Potions of +Critical Wounds, Potions, Staffs and Rods of Healing, Potions of *Healing* and Potions of Life, from weakest to strongest. Both the Life and Nature realms contain spells to heal the player. diff --git a/lib/help/faq.txt b/lib/help/faq.txt index 937fcf86..b3e2cf1d 100644 --- a/lib/help/faq.txt +++ b/lib/help/faq.txt @@ -11,7 +11,7 @@ A. Scroll of Satisfy Hunger and Berserker's ability of Satisfy Hunger are obsoleted. And races which previously relied on Satisfy Hunger have new sources of nutrition now; Android can quaff oil. Balrogs can sacrifice human corpse using the 'E'at command. Golems, - Skeletons, Zombies, and Spectres can absorb mana from staves and + Skeletons, Zombies, and Spectres can absorb mana from staffs and wands using the 'E'at command. Ents can gain enough nutrition from potions. diff --git a/lib/help/objects.txt b/lib/help/objects.txt index 433f2616..b8b2fd59 100644 --- a/lib/help/objects.txt +++ b/lib/help/objects.txt @@ -9,7 +9,7 @@ pick up items automatically or to be prompted before picking up objects. Many objects found within the dungeon have special commands for their -use. Wands must be 'a'imed, staves must be 'u'sed, scrolls must be +use. Wands must be 'a'imed, staffs must be 'u'sed, scrolls must be 'r'ead, and potions must be 'q'uaffed. You may, in general, not only use items in your pack, but also items on the ground, if you are standing on top of them. @@ -202,7 +202,7 @@ the dying curse of an Amberite. ***** === Object Flavors === -Some objects (scrolls, potions, wands, rods and staves) are 'flavored +Some objects (scrolls, potions, wands, rods and staffs) are 'flavored items'. This means that with each game they are given a random flavor. For example, the first time you find a Potion of Heroism it might be described as a 'Dark Blue Potion'. Once you have identified it, the @@ -303,7 +303,7 @@ pseudo-id ability to ascertain the quality of some items. For the most part you will need to identify them before you can ascertain how much use they will be to you. There are several methods of identifying items available to you. These include Scrolls of Identify and *Identify*, -Staves and Rods of Perception, spells and prayers and services from +Staffs and Rods of Perception, spells and prayers and services from town buildings among others. There is an important difference between 'identify'ing an object and @@ -469,7 +469,7 @@ special meaning to inscriptions containing any text of the form "@#" or "@x#" or "!x" or "!*" (see command.txt#ObjectSelection [i]) . The game provides some "fake" inscriptions to help you keep track of -your possessions. Wands and staves which are known to be empty will be +your possessions. Wands and staffs which are known to be empty will be inscribed with "empty". Objects which have been tried at least once but haven't been identified yet will be inscribed with "tried". Cursed objects are inscribed with "cursed". Broken objects may be inscribed @@ -783,15 +783,15 @@ Wands ('-') and most wands will require a target. Staffs ('_') - Staves are a flavored item and are made of various types of wood. + Staffs are a flavored item and are made of various types of wood. Like wands, they contain a limited number of charges and must be - recharged when empty. In general, staves have an area affect or - act on the player. Unlike wands, few staves may be used directly - for offense. Staves must be 'u'sed and do not require a target. + recharged when empty. In general, staffs have an area affect or + act on the player. Unlike wands, few staffs may be used directly + for offense. Staffs must be 'u'sed and do not require a target. Rods ('-') - Rods are similar to both wands and staves in that many magical - effects available from wands and staves are also available from + Rods are similar to both wands and staffs in that many magical + effects available from wands and staffs are also available from rods. The main difference is that a rod carries a single charge but over time will recharge itself. Typically, the better the rod, the longer it will take to recharge itself. This means you have an diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt index b1b44025..a753c15a 100644 --- a/lib/help/raceclas.txt +++ b/lib/help/raceclas.txt @@ -275,7 +275,7 @@ by the racial/class power command ("U"/"O"). poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their life force. Golems gain very little nutrition - from ordinary food, but can absorb mana from staves and wands as + from ordinary food, but can absorb mana from staffs and wands as their power source. Golems also gain a natural armor class bonus from their tough body. @@ -293,7 +293,7 @@ by the racial/class power command ("U"/"O"). effects of these will affect the skeleton even without entering the skeleton's (non-existent) belly, the potion or food itself will fall through the skeleton's jaws, giving no nutritional - benefit. They can absorb mana from staves and wands as their + benefit. They can absorb mana from staffs and wands as their energy source. @@ -307,7 +307,7 @@ by the racial/class power command ("U"/"O"). see invisible. While still vulnerable to cuts (unlike skeletons), Zombies are resistant to Nether. Like Golems, they gain very little nutrition from the food of mortals, but can absorb mana - from staves and wands as their energy source. + from staffs and wands as their energy source. ***** @@ -337,7 +337,7 @@ by the racial/class power command ("U"/"O"). cold. They also resist nether. At higher levels they develop telepathic abilities. Spectres make superb spellcasters, but their physical form is very weak. They gain very little nutrition - from the food of mortals, but can absorb mana from staves and + from the food of mortals, but can absorb mana from staffs and wands as their energy source. @@ -505,7 +505,7 @@ command("U"/"O"). second realm can be changed in the middle of the game. You can change second realm by studying ("G") from a spellbook of new realm. They have a class power - 'Eat Magic' - which absorbs mana - from wands, staves or rods. + from wands, staffs or rods. ***** @@ -687,7 +687,7 @@ command("U"/"O"). gain substantial benefits in the mana costs, minimum levels, and failure rates of the spells in their speciality realm. They have a class power - 'Eat Magic' - which absorbs mana from wands, - staves, or rods. + staffs, or rods. And then, only High-Mages are able to cast Hex spells. @@ -758,7 +758,7 @@ command("U"/"O"). Sorcerers can cast any spell from any spellbooks of all nine magic realms with 'Master' proficiency level without having to learn it. They have a class power - 'Eat Magic' - which absorbs mana from - wands, staves or rods. + wands, staffs or rods. ***** diff --git a/lib/help/tang.txt b/lib/help/tang.txt index ced6f00e..3e524cf6 100644 --- a/lib/help/tang.txt +++ b/lib/help/tang.txt @@ -170,7 +170,7 @@ damage, and magical bonuses to stats. It also tells you if the item is cursed. It tells you what a wand/rod/staff/potion/scroll/mushroom/etc. does, and this is very important. There are nasty potions deep in the dungeon that you *do not* want to drink! Sometimes, the descriptions of -the items are a little obscure; things like Staves of Holiness and +the items are a little obscure; things like Staffs of Holiness and Power, Mushrooms of Unhealth, and others. You may have to experiment a bit to determine their powers. @@ -275,7 +275,7 @@ you watch, helpless. Confusion and Blindness resistance are vital. If you have these, you can rely on scrolls of Teleportation to get you out of any situation. -Before this, you need Staves of Teleportation which can be activated +Before this, you need Staffs of Teleportation which can be activated when blinded or confused, although with a decent failure rate. Scrolls are fail-safe. diff --git a/lib/help/town.txt b/lib/help/town.txt index c88e2796..3c8eba4a 100644 --- a/lib/help/town.txt +++ b/lib/help/town.txt @@ -279,7 +279,7 @@ The Alchemy Shop ("5") The Magic Shop ("6") The Magic Shop deals in all sorts of rings, wands, amulets, - and staves, as well as some magic books. + and staffs, as well as some magic books. The Black Market ("7") The Black Market will sell and buy anything at extortionate diff --git a/lib/help/version.txt b/lib/help/version.txt index 1e336287..75e2d38f 100644 --- a/lib/help/version.txt +++ b/lib/help/version.txt @@ -206,7 +206,7 @@ Implemented 'Saved Floors': - Removed scrolls of satisfy hunger and that class power of Berserkers. Androids can quaff flasks of oil. Barlogs can sacrifice corpses with symbol 't','p', or 'h' using the Eat command. - Golems, Zombies, Skeletons, and Spectors can Eat charges of wands and staves. + Golems, Zombies, Skeletons, and Spectors can Eat charges of wands and staffs. Ents can get nutritions from water in any potions. - Added lists of known monsters/objects from Eyangband. - Shift + direction keys will move cursor quickly in the look command. diff --git a/src/autopick.c b/src/autopick.c index 2c8c368a..ae99a837 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -2612,7 +2612,7 @@ static void describe_autopick(char *buff, autopick_type *entry) else if (IS_FLG(FLG_MISSILES)) body_str = "shots, arrows or crossbow bolts"; else if (IS_FLG(FLG_DEVICES)) - body_str = "scrolls, wands, staves or rods"; + body_str = "scrolls, wands, staffs or rods"; else if (IS_FLG(FLG_LIGHTS)) body_str = "light sources"; else if (IS_FLG(FLG_JUNKS)) diff --git a/src/birth.c b/src/birth.c index f4e35908..4199419d 100644 --- a/src/birth.c +++ b/src/birth.c @@ -204,15 +204,15 @@ static concptr race_jouhou[MAX_RACES] = "Demon-creatures from the nether-world, imps are naturally resistant to fire attacks and capable of learning fire bolt and fire ball attacks. They are little loved by other races but can perform fairly well in most professions. As they advance levels, they gain the powers of See Invisible.", -"A Golem is an artificial creature, built from a lifeless raw material like clay, and awakened to life. They are nearly mindless, making them useless for professions which rely on magic, but as warriors they are very tough. They are resistant to poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their experience. Golems gain very little nutrition from ordinary food, but can absorb mana from staves and wands as their power source. Golems also gain a natural armor class bonus from their tough body.", +"A Golem is an artificial creature, built from a lifeless raw material like clay, and awakened to life. They are nearly mindless, making them useless for professions which rely on magic, but as warriors they are very tough. They are resistant to poison, they can see invisible things, and move freely. At higher levels, they also become resistant to attacks which threaten to drain away their experience. Golems gain very little nutrition from ordinary food, but can absorb mana from staffs and wands as their power source. Golems also gain a natural armor class bonus from their tough body.", -"There are two types of skeletons: the ordinary, warrior-like skeletons, and the spell-using skeletons, which are also called liches. As undead beings, skeletons need to worry very little about poison or attacks that can drain life. They do not really use eyes for perceiving things, and are thus not fooled by invisibility. Their bones are resistant to sharp shrapnel, and they will quickly become resistant to cold. Although the magical effects of these will affect the skeleton even without entering the skeleton's (non-existent) belly, the potion or food itself will fall through the skeleton's jaws, giving no nutritional benefit. They can absorb mana from staves and wands as their energy source.", +"There are two types of skeletons: the ordinary, warrior-like skeletons, and the spell-using skeletons, which are also called liches. As undead beings, skeletons need to worry very little about poison or attacks that can drain life. They do not really use eyes for perceiving things, and are thus not fooled by invisibility. Their bones are resistant to sharp shrapnel, and they will quickly become resistant to cold. Although the magical effects of these will affect the skeleton even without entering the skeleton's (non-existent) belly, the potion or food itself will fall through the skeleton's jaws, giving no nutritional benefit. They can absorb mana from staffs and wands as their energy source.", -"Much like Skeletons, Zombies too are undead horrors: they are resistant to exp-draining attacks, and can learn to restore their experience. Like skeletons, they become resistant to cold-based attacks (actually earlier than skeletons), resist poison and can see invisible. While still vulnerable to cuts (unlike skeletons), Zombies are resistant to Nether. Like Golems, they gain very little nutrition from the food of mortals, but can absorb mana from staves and wands as their energy source.", +"Much like Skeletons, Zombies too are undead horrors: they are resistant to exp-draining attacks, and can learn to restore their experience. Like skeletons, they become resistant to cold-based attacks (actually earlier than skeletons), resist poison and can see invisible. While still vulnerable to cuts (unlike skeletons), Zombies are resistant to Nether. Like Golems, they gain very little nutrition from the food of mortals, but can absorb mana from staffs and wands as their energy source.", "One of the mightier undead creatures, the Vampire is an awe-inspiring sight. Yet this dread creature has a serious weakness: the bright rays of sun are its bane, and it will need to flee the surface to the deep recesses of earth until the sun finally sets. Darkness, on the other hand, only makes the Vampire stronger. As undead, the Vampire has a firm hold on its experience, and resists nether attacks. The Vampire also resists cold and poison based attacks. It is, however, susceptible to its perpetual hunger for fresh blood, which can only be satiated by sucking the blood from a nearby monster.", -"Another powerful undead creature: the Spectre is a ghastly apparition, surrounded by an unearthly green glow. They exist only partially on our plane of existence: half-corporeal, they can pass through walls, although the density of the wall will hurt them in the process of doing this. As undead, they have a firm hold on their experience, see invisible, and resist poison and cold. They also resist nether. At higher levels they develop telepathic abilities. Spectres make superb spellcasters, but their physical form is very weak. They gain very little nutrition from the food of mortals, but can absorb mana from staves and wands as their energy source.", +"Another powerful undead creature: the Spectre is a ghastly apparition, surrounded by an unearthly green glow. They exist only partially on our plane of existence: half-corporeal, they can pass through walls, although the density of the wall will hurt them in the process of doing this. As undead, they have a firm hold on their experience, see invisible, and resist poison and cold. They also resist nether. At higher levels they develop telepathic abilities. Spectres make superb spellcasters, but their physical form is very weak. They gain very little nutrition from the food of mortals, but can absorb mana from staffs and wands as their energy source.", "One of several fairy races, Sprites are very small. They have tiny wings and can fly over traps that may open up beneath them. They enjoy sunlight intensely, and need worry little about light based attacks. Although physically among the weakest races, Sprites are very talented in magic, and can become highly skilled wizards. Sprites have the special power of spraying Sleeping Dust, and at higher levels they learn to fly faster.", diff --git a/src/bldg.c b/src/bldg.c index 93c1db23..b66095b9 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -3183,13 +3183,13 @@ static bool enchant_item(player_type *player_ptr, PRICE cost, HIT_PROB to_hit, H /*! - * @brief 魔道具の使用回数を回復させる施設のメインルーチン / Recharge rods, wands and staves + * @brief 魔道具の使用回数を回復させる施設のメインルーチン / Recharge rods, wands and staffs * @details * The player can select the number of charges to add\n * (up to a limit), and the recharge never fails.\n *\n * The cost for rods depends on the level of the rod. The prices\n - * for recharging wands and staves are dependent on the cost of\n + * for recharging wands and staffs are dependent on the cost of\n * the base-item.\n * @param player_ptr プレーヤーへの参照ポインタ * @return なし @@ -3353,13 +3353,13 @@ static void building_recharge(player_type *player_ptr) /*! - * @brief 魔道具の使用回数を回復させる施設の一括処理向けサブルーチン / Recharge rods, wands and staves + * @brief 魔道具の使用回数を回復させる施設の一括処理向けサブルーチン / Recharge rods, wands and staffs * @details * The player can select the number of charges to add\n * (up to a limit), and the recharge never fails.\n *\n * The cost for rods depends on the level of the rod. The prices\n - * for recharging wands and staves are dependent on the cost of\n + * for recharging wands and staffs are dependent on the cost of\n * the base-item.\n * @param player_ptr プレーヤーへの参照ポインタ * @return なし diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 77a44d48..54ba8d5a 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -3262,7 +3262,7 @@ static concptr object_group_text[] = "Whistle", "Lanterns", "Wands", - "Staves", + "Staffs", "Rods", "Cards", "Capture Balls", diff --git a/src/object-flavor.c b/src/object-flavor.c index 5e1ba2b0..b39471eb 100644 --- a/src/object-flavor.c +++ b/src/object-flavor.c @@ -359,7 +359,7 @@ void flavor_init(void) /* Shuffle Amulets */ shuffle_flavors(TV_AMULET); - /* Shuffle Staves */ + /* Shuffle Staffs */ shuffle_flavors(TV_STAFF); /* Shuffle Wands */ diff --git a/src/spells2.c b/src/spells2.c index e10fddf5..0a225320 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -292,7 +292,7 @@ bool detect_objects_normal(player_type *caster_ptr, POSITION range) * @details *
  * This will light up all spaces with "magic" items, including artifacts,
- * ego-items, potions, scrolls, books, rods, wands, staves, amulets, rings,
+ * ego-items, potions, scrolls, books, rods, wands, staffs, amulets, rings,
  * and "enchanted" items of the "good" variety.
  *
  * It can probably be argued that this function is now too powerful.
-- 
2.21.1 (Apple Git-122.3)


From cba2ed6d4b4bfddbde89eb2963eb8c5dfde7f590 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Thu, 16 Jan 2020 21:17:35 -0800
Subject: [PATCH 289/335] For clarity, swapped word in the English description
 for Layzark, the Emperor.

---
 lib/edit/r_info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 26b3ce43..2f1f4d73 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -18273,7 +18273,7 @@ S:TPORT | BLIND | BLINK | HEAL | HASTE |
 S:CONF | BO_MANA | BRAIN_SMASH | PSY_SPEAR |
 S:BA_NETH | BA_DARK | BA_CHAO |
 S:S_MONSTERS | S_DEMON | S_KIN
-D:$She tried to destroy Earth solely just she wanted to fight Locke, the
+D:$She tried to destroy Earth solely because she wanted to fight Locke, the
 D:$ Superman, as a superhuman.
 D:彼女はただ超人として超人との戦いを望むが故に、皇帝に扮し地球を
 D:滅ぼそうとした。「とにかくある朝起きてみるとディナールは皇帝
-- 
2.21.1 (Apple Git-122.3)


From 74b501da790957e8a8a2b2cb5df3766e42f0816a Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 17 Jan 2020 00:54:06 -0800
Subject: [PATCH 290/335] Added an English description of the long sword
 'Gurenki'. From
 http://www-personal.umich.edu/~weyrbrat/fanfic/anime/novels/tsurugi.html ,
 I'm guessing it is a reference to the light novel, Hayou no Tsurugi, so the
 description uses the color mentioned in Google Translate's result for the
 Japanese description and an allusion to it's demon-killing prowess (mentioned
 in that website summarizing Hayou no Tsurugi and implied by the KILL_DEMON |
 ESP_DEMON flags).

---
 lib/edit/a_info.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 1ee57fe7..95cc8fca 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -2950,6 +2950,8 @@ W:60:150:130:100000
 P:0:4d5:-10:25:0
 F:VORPAL | VAMPIRIC | SLAY_EVIL | KILL_DEMON | ESP_DEMON |
 F:AGGRAVATE | LITE | CON 
+D:$As you handle this reddish gold blade, you have the strong urge to find
+D:$ and kill some demons.
 D:彼女は史上最強の破妖刀だ。
 D:朱金に輝く刀身で魔性の心臓をつらぬき、その命を食べつくす。
 
-- 
2.21.1 (Apple Git-122.3)


From 45d013fd5c1967ebe6c97e9a216160758f7fb1a0 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 17 Jan 2020 11:09:02 -0800
Subject: [PATCH 291/335] =?UTF-8?q?Added=20an=20English=20description=20fo?=
 =?UTF-8?q?r=20Hyousi-gi=20using=20Google=20Translate's=20result=20for=20t?=
 =?UTF-8?q?he=20Japanese=20description=20and=20the=20"Other=20uses"=20sect?=
 =?UTF-8?q?iob=20of=20https://en.wikipedia.org/wiki/Hy=C5=8Dshigi=20as=20s?=
 =?UTF-8?q?ources.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/edit/a_info.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 95cc8fca..b87b1415 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3067,6 +3067,9 @@ W:25:5:15:808
 P:0:1d2:-3:-7:6
 F:SEARCH | ACTIVATE | SHOW_MODS | HIDE_TYPE
 U:AGGRAVATE
+D:$It is two wooden prisms joined by a thin rope.  Though a poor weapon,
+D:$ firefighters use such devices as percussion instruments to warn others of
+D:$ danger.
 D:角柱二本の互いの端が、細い縄で結ばれている。
 D:武器としては見るからに貧相だが、 防火をその任とする衛士たちが使った、
 D:由緒正しい武器だといわれている。
-- 
2.21.1 (Apple Git-122.3)


From 87e82ca1a0e69bde144555e775ec285b72ed4ca7 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 17 Jan 2020 11:25:20 -0800
Subject: [PATCH 292/335] Added an English description for Matoi using Google
 Translate's result for the Jpanese description,
 https://en.wikipedia.org/wiki/Matoi , and
 http://www.nihonhikeshihozonkai.org/english/index.html as sources.

---
 lib/edit/a_info.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index b87b1415..273656fe 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3081,6 +3081,11 @@ W:40:5:100:808
 P:0:1d7:-5:10:3
 F:STR | CHR | RES_FIRE | ACTIVATE | 
 U:HERO
+D:$It is a short staff with an attached flag.  The opposite end of the staff
+D:$ from the flag has a disk with the mark of a firefighting squad.  Staffs
+D:$ like this were used to rally firefighters to sites of fires in Edo period
+D:$ Japan.  The bearers, matoimachi, of such staffs were noted for their
+D:$ courage.
 D:消火作業にあたって、士気を鼓舞すべく振りたてられた杖だ。
 D:杖の先に隊のマーク入りの円盤があり、その下側から
 D:長い帯状の飾りが幾本ものびている。
-- 
2.21.1 (Apple Git-122.3)


From a889226768b5d11f81d1b8f2e8e9ffca1e47046e Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 17 Jan 2020 22:26:06 -0800
Subject: [PATCH 293/335] Added an English description for the 'Iron ball'.
 Based on https://nethackwiki.com/wiki/Punishment , this appears to be a
 Nethack reference. The English description is not particularly close to
 Google Translate's result for the Japanese description.

---
 lib/edit/a_info.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 273656fe..08db20a6 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3120,6 +3120,9 @@ W:45:40:666:66666
 P:0:25d4:-30:0:20
 F:SPEED | STEALTH | WIS | IMPACT | SHOW_MODS | HIDE_TYPE |
 F:CURSED | HEAVY_CURSE
+D:$It is a very heavy iron ball, likely too cumbersome to be effective as
+D:$ a weapon, with an attached chain and metal ring, ready to be fastened to
+D:$ an ankle or wrist.
 D:不信心者の足にくくりつけられ、その動きを阻害する。
 D:重いが武器としても使えない事はない。
 
-- 
2.21.1 (Apple Git-122.3)


From 332debe42dba6162ed0e5dcae191b11b22b390c8 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 17 Jan 2020 23:12:12 -0800
Subject: [PATCH 294/335] Added an English description, which is just Google
 Translate's result for the Japanese description, for the Yumi of
 irresponsibility.

---
 lib/edit/a_info.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 08db20a6..746fa61a 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3239,6 +3239,7 @@ F:SPEED | INT | WIS | SUST_INT | SUST_WIS | XTRA_SHOTS | XTRA_MIGHT |
 F:DEC_MANA |
 F:RES_DARK | RES_LITE | RES_DISEN | RES_BLIND | IM_COLD | SLOW_DIGEST |
 F:HIDE_TYPE | SHOW_MODS | QUESTITEM | INSTA_ART
+D:$It's a very ridiculous bow.
 D:すごくいいかげんな作りの弓だ。
 
 N:183:やる気のない
-- 
2.21.1 (Apple Git-122.3)


From 9ec1024995523f4e58bd39d6fef4ddcf34aa0c17 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 09:06:25 -0800
Subject: [PATCH 295/335] Added an English description for the falchion of Guan
 Yu. It is essentially the same as Google Translate's result for the Japanese
 description, but use the transliteration of the Chinese name for the general
 from the Three Kingdoms period in Chinese history,
 https://en.wikipedia.org/wiki/Guan_Yu .

---
 lib/edit/a_info.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 746fa61a..bdd22fa0 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3412,6 +3412,8 @@ W:60:60:320:200000
 P:0:4d5:20:20:5
 F:STR | DEX | CON | SLAY_EVIL | SLAY_HUMAN |
 F:VORPAL | SHOW_MODS
+D:$Guan Yu, who has a long, lush beard, knocked many great men to the ground
+D:$ with this blue dragon sword.
 D:豊かな髯を蓄えた義人・関羽はこの青龍刀で多くの豪傑を地に
 D:叩き伏せて来た。
 
-- 
2.21.1 (Apple Git-122.3)


From b92cfe3f5515e5d1b104c33599b9e65022b8eb3f Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 09:25:44 -0800
Subject: [PATCH 296/335] =?UTF-8?q?Added=20an=20English=20description=20fo?=
 =?UTF-8?q?r=20the=20testsubo=20of=20Shuten-douji.=20It=20is=20essentially?=
 =?UTF-8?q?=20Google=20Translate's=20result=20for=20the=20Japanese=20descr?=
 =?UTF-8?q?iption=20with=20some=20modifications=20based=20on=20the=20conte?=
 =?UTF-8?q?nt=20from=20https://en.wikipedia.org/wiki/Shuten-d=C5=8Dji=20an?=
 =?UTF-8?q?d=20https://en.wikipedia.org/wiki/Kanab=C5=8D=20.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/edit/a_info.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index bdd22fa0..07e4a6a6 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3423,6 +3423,8 @@ I:21:16:6
 W:40:40:350:100000
 P:0:4d7:0:20:10
 F:STR | RES_FEAR
+D:$It is the heavy gold war club of Shuten-douji, sake lover and leader of the
+D:$ ogres on Mt. Oe.
 D:大江山の鬼の首領たる酒呑童子の重い金棒だ。
 
 N:195:『ゴールデンハンマー』
-- 
2.21.1 (Apple Git-122.3)


From d8110055bebd5933783346e489c7bf1caa49d02e Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 09:53:26 -0800
Subject: [PATCH 297/335] Added an English description for the small metal
 shield of Perseus. It is a slightly rearranged version of Google Translate's
 result for the Japanese description.

---
 lib/edit/a_info.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 07e4a6a6..ba2ddb4b 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3448,6 +3448,8 @@ W:30:10:65:45000
 P:5:1d2:0:0:15
 F:STR | RES_ACID | RES_COLD | RES_FEAR |
 F:REFLECT | SUST_STR | 
+D:$Perseus evaded the snake-haired Medusa's petrifying gaze with this
+D:$ reflective shield in hand.
 D:蛇の髪を持つメドゥーサの石化の睨みも、この反射の盾の前には
 D:効果がなかった。
 
-- 
2.21.1 (Apple Git-122.3)


From 173baa9dd344fb2e889a2a1c6c4dc0f9db4a4281 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 10:17:25 -0800
Subject: [PATCH 298/335] Added an English description for the rhino hide
 armour 'Dasai'. It adds some to Google Translate's result for the Japanese
 description to hint at the penalty to charisma and the AGGRAVATE flag.

---
 lib/edit/a_info.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index ba2ddb4b..f90f1147 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3476,6 +3476,7 @@ I:36:8:-10
 W:20:3:110:0
 P:8:1d1:-1:0:64
 F:AGGRAVATE | SUST_CHR | CHR
+D:$It's a rugged cuirass with a noticeable and offensive odor.
 D:なんとゴツゴツとした鎧だこと。
 
 N:201:『青龍の霊鱗』
-- 
2.21.1 (Apple Git-122.3)


From e076fa621bcdf92b9736c25f546276c700aa6362 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 11:06:55 -0800
Subject: [PATCH 299/335] Added an English description for the blue dragon
 scale mail 'Elemental of Ching-Rong'. It's an attempt to capture what I think
 is the intent of the Japanese description (as filtered through Google
 Translate) and is informed by the content at
 https://en.wikipedia.org/wiki/Azure_Dragon ,
 https://en.wikipedia.org/wiki/White_Tiger_(mythology) ,
 https://en.wikipedia.org/wiki/Black_Tortoise , and
 https://en.wikipedia.org/wiki/Vermilion_Bird .

---
 lib/edit/a_info.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index f90f1147..62ecebf7 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3488,6 +3488,9 @@ F:RES_ACID | RES_FIRE | RES_COLD | RES_ELEC |
 F:RES_DARK | RES_CONF | RES_POIS |
 F:FREE_ACT | SEE_INVIS | ACTIVATE
 U:RESIST_ALL
+D:$This blue dragon scale armor has been blessed by the azure dragon that
+D:$ guards the east and the three other guardians, Byakko, Genbu, and Suzaku.
+D:$ Even a god would be envious of the protection this armor provides.
 D:玄武、白虎、朱雀とともに四獣と呼ばれる青龍の鱗鎧を
 D:身に纏えば、神の如き守護の力が得られる。
 
-- 
2.21.1 (Apple Git-122.3)


From 743a011c48fc2714b9bbab388fa75a8330cf5de5 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 11:25:25 -0800
Subject: [PATCH 300/335] Added an English description for the awl-pike
 'Ama-no-NumaHoko'. It is a recapitulation of
 https://en.wikipedia.org/wiki/Amenonuhoko which seems to be the same story
 given in the Japanese description.

---
 lib/edit/a_info.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 62ecebf7..7a53e95b 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3504,6 +3504,9 @@ F:SLAY_EVIL | SLAY_DEMON | SLAY_UNDEAD |
 F:RES_ACID | RES_COLD | RES_BLIND | RES_CHAOS |
 F:LITE | ACTIVATE | BLESSED | SEE_INVIS | SHOW_MODS
 U:BA_WATER
+D:$From the bridge between heaven and earth, Izanagi and Izanami churned the
+D:$ sea with this jeweled weapon.  The first land sprung up from where drops
+D:$ of salty water fell from the weapon's tip.
 D:「是に天つ神、諸の命以ちて、伊邪那岐命、伊邪那美命、
 D:二柱の神に、『是の多陀用弊流国を修め理り固め成せ。』
 D:と詔りて、天の沼矛を賜ひて、言依さし賜ひき。故、二柱
-- 
2.21.1 (Apple Git-122.3)


From 92724a2b138ba27885105e360a55b39924708643 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 12:42:39 -0800
Subject: [PATCH 301/335] Added an English description for the metal lamellar
 armour of the Padre. It tries to cover the same ground as Google Translate's
 result for the Japanese description.

---
 lib/edit/a_info.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 7a53e95b..7f431b0e 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3566,6 +3566,7 @@ W:45:5:340:80000
 P:23:1d6:5:5:17
 F:CHR | REFLECT |
 F:RES_FIRE | RES_CHAOS | LITE
+D:$It is the suit of shining western-style armor that Nobunaga Oda loved.
 D:織田信長の愛用した光り輝く西洋の鎧だ。
 
 # グレート・ソード『真魔剛竜剣』 (from ダイの大冒険)
-- 
2.21.1 (Apple Git-122.3)


From d1ff925b9b72ad8d5c6c21358e8d35b17da67106 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 22:52:40 -0800
Subject: [PATCH 302/335] Added an English description for the metal shod boots
 'Tetsu-geta of Flame'. The description largely follows Google Translate's
 result for the description.

---
 lib/edit/a_info.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 7f431b0e..cf2b77be 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3620,6 +3620,10 @@ W:20:15:150:40000
 P:6:1d1:-5:10:20
 F:INT | WIS | CHR | STEALTH | SPEED | RES_FIRE |
 F:SUST_STR | SUST_CON | SH_FIRE | REGEN | RES_FEAR
+D:$Since ancient times, some martial artists have trained with weighted sandals
+D:$ to build leg strength.  This is a pair of those, warm to the touch and
+D:$ with soles fashioned out of iron.  Wear them enough, you'll feel light as
+D:$ a feather when you take them off.
 D:古来より伝わる、男を磨くための靴だ。
 D:ふだん身に付けていれば、外したときに自分のからだが羽根のように
 D:軽く感じられるだろう。
-- 
2.21.1 (Apple Git-122.3)


From 4e2b70b00cc2b022b50a171ced9d5d4784dfeb8c Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 19 Jan 2020 23:26:15 -0800
Subject: [PATCH 303/335] Changed "of The Bonze Octopus" to "of The Bronze
 Octopus" (Google Translate gives tin in its result, but I'll stick with
 bronze) and added an English description which interpolates from Google
 Translate's result for the Japanese description (ignoring the quoted
 material) and the mention of the legend in
 http://kansai-odyssey.com/kishiwada-castle-danjiri-museum/ .

---
 lib/edit/a_info.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index cf2b77be..93feaf08 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3668,13 +3668,17 @@ D:この正視するもかなわぬ眩い炎のムチをひとたび手に取れ
 D:バルログの長ゴズモグは戦において負け知らずであった。
 
 N:213:天性寺聖地蔵尊の六環
-E:of The Bonze Octopus
+E:of The Bronze Octopus
 I:21:7:2
 W:35:40:70:125000
 P:0:1d7:8:8:8
 F:STR | WIS | BLOWS | TUNNEL | ACTIVATE | RES_ACID | RES_ELEC
 F:REGEN | FREE_ACT | BRAND_ELEC | BLESSED | XTRA_H_RES
 U:SUMMON_OCTOPUS
+D:$It is a walking stick bound with six rings of bronze.  According to legend,
+D:$ an incarnation of Jizo Daibosatsu carried this staff when he defended
+D:$ Kishiwada castle with the assistance of a horde of octopuses he had called
+D:$ from the sea.
 D:その昔、蛸を引き連れて岸和田の地を守るために戦かったという
 D:蛸法師こと地蔵大菩薩の化身が使っていた六環の錫杖だ。
 D:「…その時。一人の法師がどこからともなく現れて、何万という敵に飛びかかり、
-- 
2.21.1 (Apple Git-122.3)


From 73857976589eaee386d0e4b7c0b6b72ac9a06cd0 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Sun, 26 Jan 2020 14:32:34 -0800
Subject: [PATCH 304/335] Added an English description for the sexy swimsuit of
 Milim the Valkyrie. The description tries to follow Google Translate's result
 for the Japanese description. It also draws from information from Wikipedia's
 entry for Queen's Blade Rebellion,
 https://en.wikipedia.org/wiki/Queen%27s_Blade_Rebellion .

---
 lib/edit/a_info.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 93feaf08..41370552 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -4129,6 +4129,9 @@ F:SUST_CHR | SUST_CON |
 F:RES_SOUND | RES_DISEN | REFLECT | FREE_ACT | ACTIVATE
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | AGGRAVATE
 U:STRAIN_HASTE
+D:$A result of Steel Staff Ymir's research project, this swimsuit, powered by
+D:$ a hyper vibration crystal, provides much more protection than you might
+D:$ expect.
 D:ドワーフの姫、鋼鉄参謀ユーミルの研究の成果だ。
 D:超振動クリスタルが高い防御力をもたらしているらしい。
 
-- 
2.21.1 (Apple Git-122.3)


From 58fb6af535508657f120628d427cdf467c5d83e6 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Mon, 27 Jan 2020 20:51:32 -0800
Subject: [PATCH 305/335] Adopted the more compact form used in the master
 branch for displaying the message about adding an essence to and object.

---
 src/cmd/cmd-smith.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 73980bf1..df94fb0e 100644
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -1313,12 +1313,8 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode)
 	}
 
 	take_turn(creature_ptr, 100);
-
-#ifdef JP
-	msg_format("%sに%sの能力を付加しました。", o_name, es_ptr->add_name);
-#else
-	msg_format("You have added ability of %s to %s.", es_ptr->add_name, o_name);
-#endif
+	_(msg_format("%sに%sの能力を付加しました。", o_name, es_ptr->add_name),
+	  msg_format("You have added ability of %s to %s.", es_ptr->add_name, o_name));
 	creature_ptr->update |= (PU_COMBINE | PU_REORDER);
 	creature_ptr->window |= (PW_INVEN);
 }
-- 
2.21.1 (Apple Git-122.3)


From 751665728f796a474d24a165a817b2965c1acfc8 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 20 Dec 2019 10:11:54 -0800
Subject: [PATCH 306/335] For English descriptions of Heaven and Hell, took out
 "the" to be more idiomatic.

---
 lib/edit/d_info.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index 5aa9142b..05c872fc 100644
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -155,7 +155,7 @@ M:IM_FIRE | CAN_FLY | WILD_VOLCANO
 
 N:9:地獄
 E:Hell
-D:$the stairway to the Hell
+D:$the stairway to Hell
 D:地獄への階段
 P:62:94
 W:666:696:50:1:14:160:90:77:0x0188:0x0280
@@ -167,7 +167,7 @@ M:IM_FIRE | EVIL
 
 N:10:天界
 E:Heaven
-D:$the way to the heaven
+D:$the way to Heaven
 D:天界へと通じる道
 P:2:94
 W:555:585:50:1:18:160:85:35:0x0040:0x0104
-- 
2.21.1 (Apple Git-122.3)


From 810bc19a02b1f652238a328175d7a057442048f0 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 20 Dec 2019 10:21:16 -0800
Subject: [PATCH 307/335] Changed English name from "of Dwarven" to "of the
 Dwarves" since "dwarven" is an adjective and want to combine a noun with
 "of".

---
 lib/edit/e_info.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index addd7051..dbc6efad 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -117,7 +117,7 @@ F:RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD | XTRA_H_RES
 
 N:10:ドワーフの
-E:of Dwarven
+E:of the Dwarves
 X:31:10
 W:0:10:0:1500
 C:0:0:15:3
@@ -222,7 +222,7 @@ C:0:0:15:0
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 
 N:239:ドワーフの
-E:of Dwarven
+E:of the Dwarves
 X:25:20
 W:0:15:0:2000
 C:0:0:8:2
-- 
2.21.1 (Apple Git-122.3)


From 14ba500b2720e3a0fac5a85a77aafc96d7fe3046 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Thu, 19 Dec 2019 17:58:07 -0800
Subject: [PATCH 308/335] Corrected spelling.

---
 lib/file/a_med.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/file/a_med.txt b/lib/file/a_med.txt
index 554b1796..a21d6ab6 100644
--- a/lib/file/a_med.txt
+++ b/lib/file/a_med.txt
@@ -74,7 +74,7 @@ of the Ruler of Wallachia
 N:15:BIAS_LAW
 N:13:BIAS_PRIESTLY
 N: 8:BIAS_WIS
-'Enlightenment from Heven'
+'Enlightenment from Heaven'
 'Holy Chant'
 'Holy Prayer'
 'Righteousness'
-- 
2.21.1 (Apple Git-122.3)


From 576951c0a99c7ff0bf0464b756f2ff769a9e1346 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Fri, 20 Dec 2019 10:22:48 -0800
Subject: [PATCH 309/335] Corrected typo.

---
 lib/file/w_low.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/file/w_low.txt b/lib/file/w_low.txt
index eb0309b2..596790df 100644
--- a/lib/file/w_low.txt
+++ b/lib/file/w_low.txt
@@ -81,7 +81,7 @@ N:14:BIAS_NECROMANTIC
 'Dungeon Shade'
 'Elfrist'
 of Misery
-of Boodoo
+of Voodoo
 
 N:15:BIAS_LAW
 N:13:BIAS_PRIESTLY
-- 
2.21.1 (Apple Git-122.3)


From d58a5e8e669b2361a806d89fd4ad66dfebd9fcd9 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:17:53 -0800
Subject: [PATCH 310/335] Removed commas before conjunctions in two places
 since the conjunction joined parts that weren't fully independent clauses.

---
 lib/help/raceclas.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt
index a753c15a..6529bc75 100644
--- a/lib/help/raceclas.txt
+++ b/lib/help/raceclas.txt
@@ -102,7 +102,7 @@ by the racial/class power command ("U"/"O").
     ugly that a Half-Orc grimaces in their presence.  They also happen
     to be fun to run...  Half-trolls always have their strength
     sustained.  At higher levels, Half-Trolls regenerate wounds
-    automatically, and, if a warrior, require food less often.
+    automatically and, if a warrior, require food less often.
 
 
 ***** 
@@ -735,7 +735,7 @@ command("U"/"O").
     world of Hengband.  They are very good at riding, and have enough
     fighting ability.  The monsters that a beastmaster summons or
     dominates become the beastmaster's hands and feet.  Beastmasters
-    can cast trump magic, and are very good at summoning spells, but
+    can cast trump magic and are very good at summoning spells, but
     they can not summon non-living creatures.  Charisma determines a
     Beastmaster's spell casting ability.
 
-- 
2.21.1 (Apple Git-122.3)


From 52ac222df76e2e181f9eed17e7cc828bf5a38929 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:19:09 -0800
Subject: [PATCH 311/335] Inserted extra space after a period to match the rest
 of the file.

---
 lib/help/raceclas.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/help/raceclas.txt b/lib/help/raceclas.txt
index 6529bc75..fb6c0e17 100644
--- a/lib/help/raceclas.txt
+++ b/lib/help/raceclas.txt
@@ -603,7 +603,7 @@ command("U"/"O").
     between the warrior and mage classes.  Unlike rangers, who
     specialize in Nature magic and survival skills, true Warrior-
     Mages attempt to reach the best of both worlds.  As warriors
-    they are much superior to the usual Mage class. Intelligence
+    they are much superior to the usual Mage class.  Intelligence
     determines a Warrior-Mage's spell casting ability.
 
     Warrior-mages begin the game with Arcane magic, and they can
-- 
2.21.1 (Apple Git-122.3)


From 988a710fb2ebe47412543c79d28d83950feb5098 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:24:28 -0800
Subject: [PATCH 312/335] Replaced current_world_ptr->game_turn with turn in
 English messages from alchemy().

---
 src/spells3.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/spells3.c b/src/spells3.c
index c504d8be..d5fc9657 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1315,7 +1315,7 @@ bool alchemy(player_type *caster_ptr)
 	if (command_arg > 0) force = TRUE;
 
 	concptr q = _("どのアイテムを金に変えますか?", "Turn which item to gold? ");
-	concptr s = _("金に変えられる物がありません。", "You have nothing to current_world_ptr->game_turn to gold.");
+	concptr s = _("金に変えられる物がありません。", "You have nothing to turn to gold.");
 	OBJECT_IDX item;
 	object_type *o_ptr;
 	o_ptr = choose_object(caster_ptr, &item, q, s, (USE_INVEN | USE_FLOOR), 0);
@@ -1339,21 +1339,21 @@ bool alchemy(player_type *caster_ptr)
 		if (confirm_destroy || (object_value(o_ptr) > 0))
 		{
 			char out_val[MAX_NLEN + 40];
-			sprintf(out_val, _("本当に%sを金に変えますか?", "Really current_world_ptr->game_turn %s to gold? "), o_name);
+			sprintf(out_val, _("本当に%sを金に変えますか?", "Really turn %s to gold? "), o_name);
 			if (!get_check(out_val)) return FALSE;
 		}
 	}
 
 	if (!can_player_destroy_object(o_ptr))
 	{
-		msg_format(_("%sを金に変えることに失敗した。", "You fail to current_world_ptr->game_turn %s to gold!"), o_name);
+		msg_format(_("%sを金に変えることに失敗した。", "You fail to turn %s to gold!"), o_name);
 		return FALSE;
 	}
 
 	PRICE price = object_value_real(o_ptr);
 	if (price <= 0)
 	{
-		msg_format(_("%sをニセの金に変えた。", "You current_world_ptr->game_turn %s to fool's gold."), o_name);
+		msg_format(_("%sをニセの金に変えた。", "You turn %s to fool's gold."), o_name);
 		vary_item(caster_ptr, item, -amt);
 		return TRUE;
 	}
@@ -1363,7 +1363,7 @@ bool alchemy(player_type *caster_ptr)
 	if (amt > 1) price *= amt;
 
 	if (price > 30000) price = 30000;
-	msg_format(_("%sを$%d の金に変えた。", "You current_world_ptr->game_turn %s to %ld coins worth of gold."), o_name, price);
+	msg_format(_("%sを$%d の金に変えた。", "You turn %s to %ld coins worth of gold."), o_name, price);
 
 	caster_ptr->au += price;
 	caster_ptr->redraw |= PR_GOLD;
-- 
2.21.1 (Apple Git-122.3)


From da5a7015656a680f701623ee28be267d6b443bb9 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:26:23 -0800
Subject: [PATCH 313/335] Corrected typo in English message.

---
 src/spells3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/spells3.c b/src/spells3.c
index d5fc9657..e63f2754 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1071,7 +1071,7 @@ void call_the_void(player_type *caster_ptr)
 
 	if (one_in_(666))
 	{
-		if (!vanish_dungeon(caster_ptr)) msg_print(_("ダンジョンは一瞬静まり返った。", "The dungeon beomes quiet for a moment."));
+		if (!vanish_dungeon(caster_ptr)) msg_print(_("ダンジョンは一瞬静まり返った。", "The dungeon becomes quiet for a moment."));
 		take_hit(caster_ptr, DAMAGE_NOESCAPE, 100 + randint1(150), _("自殺的な虚無招来", "a suicidal Call the Void"), -1);
 		return;
 	}
-- 
2.21.1 (Apple Git-122.3)


From 1c5c0d56af697ecd862b142061f0d22457ca8dea Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:27:50 -0800
Subject: [PATCH 314/335] Removed preposition for a more idiomatic English
 message.

---
 src/combat/melee1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index 8866e190..a04bc45f 100644
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -4069,7 +4069,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
 		monster_desc(target_ptr, m_target_name, m_ptr, 0);
 
 		target_ptr->csp -= 7;
-		msg_format(_("%^sに反撃した!", "You counterattacked to %s!"), m_target_name);
+		msg_format(_("%^sに反撃した!", "You counterattacked %s!"), m_target_name);
 		py_attack(target_ptr, m_ptr->fy, m_ptr->fx, HISSATSU_COUNTER);
 		fear = FALSE;
 		target_ptr->redraw |= (PR_MANA);
-- 
2.21.1 (Apple Git-122.3)


From f074d06c44aaae98a4d314e6ef3e875736442de3 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:29:45 -0800
Subject: [PATCH 315/335] Corrected spelling mistake in English ability
 description.

---
 src/mind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mind.c b/src/mind.c
index 9526260d..f418617d 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -528,7 +528,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
 	"Darkens nearby area and inside of a room.",
 	"Detects visible monsters in your vicinity. Detects traps, doors and stairs at level 5. Detects items at level 15. Lights and reveals the whole level at level 45.",
 	"Teleports you a short distance.",
-	"Teleports you as you recieve an attack. Might be able to teleport just before receiving damage at higher levels.",
+	"Teleports you as you receive an attack. Might be able to teleport just before receiving damage at higher levels.",
 	"Teleports you a long distance.",
 	"Attacks an adjacent monster and teleports you away immediately after the attack.",
 	"Attempts to freeze a monster.",
-- 
2.21.1 (Apple Git-122.3)


From 1e91d5fb2f08173a74945c5f00b2b4dbd3f52835 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:31:44 -0800
Subject: [PATCH 316/335] Inserted preposition for a more idiomatic English
 ability description.

---
 src/mind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mind.c b/src/mind.c
index f418617d..f99beb96 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -521,7 +521,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
 	"Recalls player from dungeon to town or from town to the deepest level of dungeon.",
 	"Completely protects you from any attacks at one in two chance.",
 	"Generates a magical triangle which damages all monsters in the area. The vertices of the triangle are you and two mirrors in sight.",
-	"Generates a barrier which completely protects you from almost all damage. Takes a few your turns when the barrier breaks or duration time is exceeded.",
+	"Generates a barrier which completely protects you from almost all damage. Takes a few of your turns when the barrier breaks or duration time is exceeded.",
 },
 
 {
-- 
2.21.1 (Apple Git-122.3)


From 9b5f9042ae178f47b49bac43caaba40732679bc0 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:34:20 -0800
Subject: [PATCH 317/335] Added a preposition for a more idiomatic English
 spell description.

---
 src/realm-sorcery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-sorcery.c b/src/realm-sorcery.c
index 4ae7684c..5a547bf5 100644
--- a/src/realm-sorcery.c
+++ b/src/realm-sorcery.c
@@ -541,7 +541,7 @@ concptr do_sorcery_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 	case 31:
 		if (name) return _("無傷の球", "Globe of Invulnerability");
 		if (desc) return _("一定時間、ダメージを受けなくなるバリアを張る。切れた瞬間に少しターンを消費するので注意。",
-			"Generates a barrier which completely protects you from almost all damage. Takes a few your turns when the barrier breaks or duration time is exceeded.");
+			"Generates a barrier which completely protects you from almost all damage. Takes a few of your turns when the barrier breaks or duration time is exceeded.");
 
 		{
 			int base = 4;
-- 
2.21.1 (Apple Git-122.3)


From 977a21c31b89fde3b6e1e0279ef78347883f3d17 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:35:25 -0800
Subject: [PATCH 318/335] Corrected typo in English spell description.

---
 src/realm-hex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-hex.c b/src/realm-hex.c
index f6c43f75..45a06079 100644
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -851,7 +851,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 		if (desc) return _("打撃や魔法で受けたダメージを、攻撃元のモンスターにも与える。", "Returns same damage which you got to the monster which damaged you.");
 		if (cast)
 		{
-			msg_print(_("復讐したい欲望にかられた。", "You feel verry vengeful."));
+			msg_print(_("復讐したい欲望にかられた。", "You feel very vengeful."));
 		}
 		break;
 
-- 
2.21.1 (Apple Git-122.3)


From bd25ecef04c68b9bd6cc0579a27423bbb49dfc17 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:36:36 -0800
Subject: [PATCH 319/335] Removed extra space after period to match other
 English spell descriptions.

---
 src/realm-death.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-death.c b/src/realm-death.c
index c7127d35..78577d91 100644
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -622,7 +622,7 @@ concptr do_death_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 	case 31:
 		if (name) return _("幽体化", "Wraithform");
 		if (desc) return _("一定時間、壁を通り抜けることができ受けるダメージが軽減される幽体の状態に変身する。",
-			"Causes you to be ghost-like for a while.  That reduces the damage you take and allows you to pass through walls.");
+			"Causes you to be ghost-like for a while. That reduces the damage you take and allows you to pass through walls.");
 
 		{
 			int base = plev / 2;
-- 
2.21.1 (Apple Git-122.3)


From 3c664bec5073c6b2f2344863619ea2d6ba75fa68 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:38:28 -0800
Subject: [PATCH 320/335] Added space after a comma in the English description
 for "Summon Greater Demon".

---
 src/realm-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index 575c70e3..fc5ffcc8 100644
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -526,7 +526,7 @@ concptr do_daemon_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode
 	case 28:
 		if (name) return _("グレーターデーモン召喚", "Summon Greater Demon");
 		if (desc) return _("上級デーモンを召喚する。召喚するには人間('p','h','t'で表されるモンスター)の死体を捧げなければならない。",
-			"Summons greater demon. Requires the sacrifice of a human corpse ('p','h' or 't').");
+			"Summons greater demon. Requires the sacrifice of a human corpse ('p', 'h' or 't').");
 
 		{
 			if (cast)
-- 
2.21.1 (Apple Git-122.3)


From 50936bdfcc78cdcd4c72452e85a7f67d0832e3fb Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:39:52 -0800
Subject: [PATCH 321/335] Included missing format specifier for object name in
 English message.

---
 src/player-damage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/player-damage.c b/src/player-damage.c
index c24c5cfb..3f7bf8f1 100644
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -149,7 +149,7 @@ static bool acid_minus_ac(player_type *creature_ptr)
 	/* No damage left to be done */
 	if (o_ptr->ac + o_ptr->to_a <= 0)
 	{
-		msg_format(_("%sは既にボロボロだ!", "is already fully corroded!"), o_name);
+		msg_format(_("%sは既にボロボロだ!", "Your %s is already fully corroded!"), o_name);
 		return FALSE;
 	}
 
-- 
2.21.1 (Apple Git-122.3)


From 5a6fda3022f3344cbf896b9886d47b4c04179890 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:43:25 -0800
Subject: [PATCH 322/335] Corrected subject/verb agreement in English spell
 description.  Merged two sentences there as well since the second started
 with a conjunction.

---
 src/realm-hissatsu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 4880f1b2..e8a71781 100644
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -902,7 +902,7 @@ concptr do_hissatsu_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mo
 	case 30:
 		if (name) return _("慶雲鬼忍剣", "Keiun-Kininken");
 		if (desc) return _("自分もダメージをくらうが、相手に非常に大きなダメージを与える。アンデッドには特に効果がある。",
-			"Attacks a monster with extremely powerful damage. But you also takes some damage. Hurts an undead monster greatly.");
+			"Attacks a monster with extremely powerful damage, but you also take some damage. Hurts an undead monster greatly.");
 
 		if (cast)
 		{
-- 
2.21.1 (Apple Git-122.3)


From ce0d43ab9c7be9e2f3448fed1b6d26a8965e43d7 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:46:25 -0800
Subject: [PATCH 323/335] Removed extra space after period to match other
 English spell descriptions.

---
 src/realm-crusade.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index 1b8aeb79..f080ab15 100644
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -541,7 +541,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 	case 31:
 		if (name) return _("聖戦", "Crusade");
 		if (desc) return _("視界内の善良なモンスターをペットにしようとし、ならなかった場合及び善良でないモンスターを恐怖させる。さらに多数の加速された騎士を召喚し、ヒーロー、祝福、加速、対邪悪結界を得る。",
-			"Attempts to charm all good monsters in sight and scares all non-charmed monsters.  Summons a great number of knights. Gives heroism, bless, speed and protection from evil to the caster.");
+			"Attempts to charm all good monsters in sight and scares all non-charmed monsters. Summons a great number of knights. Gives heroism, bless, speed and protection from evil to the caster.");
 
 		{
 			if (cast)
-- 
2.21.1 (Apple Git-122.3)


From 86836a09744834548eb4f44ed90a8a90305c1f51 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:49:15 -0800
Subject: [PATCH 324/335] Changed another instance of "spelling" to "spell
 casting" in an English message.

---
 src/racial.c        | 2 +-
 src/realm-crusade.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/racial.c b/src/racial.c
index 617d9434..460f973b 100644
--- a/src/racial.c
+++ b/src/racial.c
@@ -876,7 +876,7 @@ void do_cmd_racial_power(player_type *creature_ptr)
 	case CLASS_HIGH_MAGE:
 		if (creature_ptr->realm1 == REALM_HEX)
 		{
-			strcpy(power_desc[num].name, _("詠唱をやめる", "Stop spelling"));
+			strcpy(power_desc[num].name, _("詠唱をやめる", "Stop spell casting"));
 			power_desc[num].level = 1;
 			power_desc[num].cost = 0;
 			power_desc[num].stat = A_INT;
diff --git a/src/realm-crusade.c b/src/realm-crusade.c
index f080ab15..a887794e 100644
--- a/src/realm-crusade.c
+++ b/src/realm-crusade.c
@@ -258,7 +258,7 @@ concptr do_crusade_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mod
 	case 15:
 		if (name) return _("聖なる御言葉", "Holy Word");
 		if (desc) return _("視界内の邪悪な存在に大きなダメージを与え、体力を回復し、毒、恐怖、朦朧状態、負傷から全快する。",
-			"Damages all evil monsters in sight, heals HP somewhat, and completely cures fear, poisons, cuts and being stunned.");
+			"Damages all evil monsters in sight, heals HP somewhat and completely cures fear, poisons, cuts and being stunned.");
 
 		{
 			int dam_sides = plev * 6;
-- 
2.21.1 (Apple Git-122.3)


From 0efb5fda4c48bb350edb5781841432d750541912 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:50:43 -0800
Subject: [PATCH 325/335] Switched to an indefinite pronoun in an English
 message about the onset of an aura to match how other auras are described.

---
 src/player-effects.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/player-effects.c b/src/player-effects.c
index de8bafcf..8816205e 100644
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -1668,7 +1668,7 @@ bool set_tim_sh_touki(player_type *creature_ptr, TIME_EFFECT v, bool do_dec)
 		}
 		else if (!creature_ptr->tim_sh_touki)
 		{
-			msg_print(_("体が闘気のオーラで覆われた。", "You are enveloped by the aura of the Force!"));
+			msg_print(_("体が闘気のオーラで覆われた。", "You are enveloped by an aura of the Force!"));
 			notice = TRUE;
 		}
 	}
-- 
2.21.1 (Apple Git-122.3)


From 574c8f853019ac21790d86838a5780da37d9fdb3 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:52:12 -0800
Subject: [PATCH 326/335] Corrected spelling and moved adverb to be closer to
 the verb in English diary entry about winning.

---
 src/monster1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monster1.c b/src/monster1.c
index cbb8d1e0..7be15e85 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2941,7 +2941,7 @@ void monster_death(player_type *player_ptr, MONSTER_IDX m_idx, bool drop_item)
 	current_world_ptr->total_winner = TRUE;
 	player_ptr->redraw |= (PR_TITLE);
 	play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
-	exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった!", "become *WINNER* of Hengband finely!"));
+	exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった!", "finally become *WINNER* of Hengband!"));
 	admire_from_patron(player_ptr);
 	msg_print(_("*** おめでとう ***", "*** CONGRATULATIONS ***"));
 	msg_print(_("あなたはゲームをコンプリートしました。", "You have won the game!"));
-- 
2.21.1 (Apple Git-122.3)


From b8feb767f1d11414b169618ac8793f018ff6cb3d Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:54:32 -0800
Subject: [PATCH 327/335] Made fourth sentence a complete one in the English
 description of the mirror master detection ability.

---
 src/mind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mind.c b/src/mind.c
index f99beb96..e8e7888d 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -501,7 +501,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
 	"",
 },
 {
-	"Detects visible monsters in your vicinity. Detects invisible monsters at level 15. Gives telepathy at level 25. Magic mapping at level 35. All of the effects need 4 more levels unless on a mirror.",
+	"Detects visible monsters in your vicinity. Detects invisible monsters at level 15. Gives telepathy at level 25. Magically maps the surroundings at level 35. All of the effects need 4 more levels unless on a mirror.",
 	"Makes a mirror under you.",
 	"Fires bolt of light. At level ten or higher, the bolt will be a beam of light if you are on a mirror.",
 	"Teleports you a short distance.",
-- 
2.21.1 (Apple Git-122.3)


From daa9f4bd7c3161822626f83413d38438109692b2 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 17:59:18 -0800
Subject: [PATCH 328/335] Changed English description of hex realm to say that
 some rather than many spells can be cast continuously.

---
 lib/help/magic.txt | 2 +-
 src/birth.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/help/magic.txt b/lib/help/magic.txt
index 281245ac..0a06fae6 100644
--- a/lib/help/magic.txt
+++ b/lib/help/magic.txt
@@ -234,7 +234,7 @@ See raceclas.txt#TheClasses [a] for more details.
 --- Hex ---
 
      Hex is an abomination of magic, closer to swordsmanship than
-     spell casting.  Many of the spells can be cast continuously,
+     spell casting.  Some of the spells can be cast continuously,
      like songs, for more powerful effects.  Hex spells are good
      at obstructing opponents and returning damage to those who
      have damaged the caster.  The fail rate of Hex spells goes
diff --git a/src/birth.c b/src/birth.c
index 4199419d..dc287f3b 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -478,7 +478,7 @@ static concptr realm_jouhou[VALID_REALM] =
 
 "The books of Kendo describe various combat techniques.  When learning new techniques, you are required to carry the books, but once you memorize them, you don't have to carry them.  When using a technique, wielding a weapon is required.",
 
-"Hex is an unsavory realm, like the death and demon realms.  Many spells can act continuously by stringing together curses like a song.  Spells may obstruct monsters' actions, deal damage to monsters in sight, or return damage to monsters who have damaged the caster."
+"Hex is an unsavory realm, like the death and demon realms.  Some of the spells can act continuously by stringing together curses like a song.  Spells may obstruct monsters' actions, deal damage to monsters in sight, or return damage to monsters who have damaged the caster."
 #endif
 };
 
-- 
2.21.1 (Apple Git-122.3)


From cb41550f1d229f03f3485e84036e8999f907bd0a Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 18:01:03 -0800
Subject: [PATCH 329/335] Added space after a period in English persontality
 description to match what's done elsewhere in those descriptions.

---
 src/birth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/birth.c b/src/birth.c
index dc287f3b..a8570063 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -418,7 +418,7 @@ static concptr seikaku_jouhou[MAX_SEIKAKU] =
 
 "\"Munchkin\" is a personality for beginners.  It raises all your stats and skills.  With this personality, you can win the game easily, but gain little honor in doing so.",
 
-"\"ChargeMan\" is a crazy killer. You are strong and tough but have poor intelligence.  Since you're already insane, confusion and hallucinations do not affect you.",
+"\"ChargeMan\" is a crazy killer.  You are strong and tough but have poor intelligence.  Since you're already insane, confusion and hallucinations do not affect you.",
 
 #endif
 };
-- 
2.21.1 (Apple Git-122.3)


From ff5eb3995809437357d545aa7efd06f814254de6 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 18:02:50 -0800
Subject: [PATCH 330/335] Changed plural subject to a singular one to match
 what's used in prepositional phrase later in the English class description.

---
 src/birth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/birth.c b/src/birth.c
index a8570063..b7772868 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -345,7 +345,7 @@ static concptr class_jouhou[MAX_CLASS] =
 
 "A ForceTrainer is a master of the spiritual Force.  They prefer fighting with neither weapons nor armor.  They are not as good fighters as are Monks, but they can use both magic and the spiritual Force.  Wielding weapons or wearing heavy armor disturbs use of the Force.  Wisdom is a ForceTrainer's primary stat.",
 
-"A Blue-Mage is a spell caster that must live by his or her wits, as a Blue-Mage cannot hope to simply hack his or her way through the dungeon like a warrior.  A major difference between the Mage and the Blue-Mage is the method of learning spells: Blue-Mages may learn spells from monsters by activating his or her Learning ability.  A Blue-Mage's prime statistic is Intelligence as this determines his or her spell casting ability.",
+"A Blue-Mage is a spell caster that must live by his or her wits, as a Blue-Mage cannot hope to simply hack his or her way through the dungeon like a warrior.  A major difference between the Mage and the Blue-Mage is the method of learning spells: a Blue-Mage may learn spells from monsters by activating his or her Learning ability.  A Blue-Mage's prime statistic is Intelligence as this determines his or her spell casting ability.",
 
 "Cavalry ride on horses into battle.  Although they cannot cast spells, they are proud of their overwhelming offensive strength on horseback.  They are good at shooting.  At high levels, they learn to forcibly saddle and tame wild monsters.  Since they take pride in the body and the soul, they don't use magical devices well.",
 
-- 
2.21.1 (Apple Git-122.3)


From a47bf29f7ce7660935111f3070a8c3f4a7be725e Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 18:08:09 -0800
Subject: [PATCH 331/335] Inserted format specifier for English possesive
 rather than use a fixed "his" in messages about a monster healing itself.

---
 src/mspells4.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mspells4.c b/src/mspells4.c
index 5f4cb8ab..bed412a9 100644
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -1925,9 +1925,9 @@ void spell_RF6_HEAL(player_type *target_ptr, MONSTER_IDX m_idx, MONSTER_IDX t_id
 
 	monspell_message_base(target_ptr, m_idx, t_idx,
 		_("%^sが何かをつぶやいた。", "%^s mumbles."),
-		_("%^sは自分の傷に念を集中した。", format("%%^s concentrates on his wounds.", m_poss)),
-		_("%^sが自分の傷に集中した。", format("%%^s concentrates on his wounds.", m_poss)),
-		_("%^sは自分の傷に念を集中した。", format("%%^s concentrates on his wounds.", m_poss)),
+		_("%^sは自分の傷に念を集中した。", format("%%^s concentrates on %s wounds.", m_poss)),
+		_("%^sが自分の傷に集中した。", format("%%^s concentrates on %s wounds.", m_poss)),
+		_("%^sは自分の傷に念を集中した。", format("%%^s concentrates on %s wounds.", m_poss)),
 		target_ptr->blind > 0, TARGET_TYPE);
 
 	m_ptr->hp += (rlev * 6);
-- 
2.21.1 (Apple Git-122.3)


From d842971e80e1e88e47ff238d36fab9b62d04a54f Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 18:26:48 -0800
Subject: [PATCH 332/335] Corrected typo in English ability description.

---
 src/mind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mind.c b/src/mind.c
index e8e7888d..7f14f2e7 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -457,7 +457,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
 {
 	"Fires a very small energy ball.",
 	"Lights up nearby area and the inside of a room permanently.",
-	"Gives levitaion a while.",
+	"Gives levitation a while.",
 	"Fires a short energy beam.",
 	"Gives magic resistance for a while.",
 	"Increases your spirit energy temporarily. More spirit energy will boost the effect or duration of your force abilities. Too much spirit energy can result in an explosion.",
-- 
2.21.1 (Apple Git-122.3)


From 48dc26a2de6e812a84d351ad642c3e2e612b9f12 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 19:16:42 -0800
Subject: [PATCH 333/335] Inserted definite article for more idiomatic English
 ability description.

---
 src/mind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mind.c b/src/mind.c
index 7f14f2e7..defdab11 100644
--- a/src/mind.c
+++ b/src/mind.c
@@ -445,7 +445,7 @@ static concptr const mind_tips[5][MAX_MIND_POWERS] =
 	"Pulls a distant item close to you.",
 	"Fires a ball which damages. When not resisted, you gain SP. You will be occupied for 0 to 1.5 turns after casting as your mind recovers.",
 	"Fires a beam of pure energy which penetrates invulnerability barriers.",
-	"Stops time. Consumes all of your SP. The more SP consumed, the longer the duration of spell.",
+	"Stops time. Consumes all of your SP. The more SP consumed, the longer the duration of the spell.",
 	"",
 	"",
 	"",
-- 
2.21.1 (Apple Git-122.3)


From 309f2b26743b52b769692ef5d049691807a9b20a Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Wed, 5 Feb 2020 19:25:55 -0800
Subject: [PATCH 334/335] The multiplier for slay (without *) evil is two
 according to src/combat/melee1.c.

---
 lib/help/attack.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/help/attack.txt b/lib/help/attack.txt
index 1a812dec..13db4e95 100644
--- a/lib/help/attack.txt
+++ b/lib/help/attack.txt
@@ -274,7 +274,7 @@ Weapon of Slay Animal
 
 Weapon of Slay Evil
     This weapon is especially effective against evil creatures and
-    will inflict damage with 3.5 times the normal dice against such
+    will inflict damage with two times the normal dice against such
     creatures.
 
 Weapon of Slay Human
-- 
2.21.1 (Apple Git-122.3)


From 3138422f1f244dc1b19292bb897fd4e8d3e733d6 Mon Sep 17 00:00:00 2001
From: Eric Branlund 
Date: Thu, 6 Feb 2020 00:24:26 -0800
Subject: [PATCH 335/335] Aligned English level display with items below it in
 the main window.

---
 src/view-mainwindow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 0a96e23d..6466b767 100644
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -777,7 +777,7 @@ static void print_title(player_type *creature_ptr)
 static void print_level(player_type *creature_ptr)
 {
 	char tmp[32];
-	sprintf(tmp, _("%5d", "%6d"), creature_ptr->lev);
+	sprintf(tmp, "%5d", creature_ptr->lev);
 	if (creature_ptr->lev >= creature_ptr->max_plv)
 	{
 		put_str(_("レベル ", "LEVEL "), ROW_LEVEL, 0);
-- 
2.21.1 (Apple Git-122.3)