吟遊詩人の古い城の報酬をロビントンのハープに変更。ハープで射撃ができるバグを修正。/Reward of bird for The Old Castle changed...

diff --git a/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
index 4748bd9..f2082c9 100644 (file)
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -420,12 +420,17 @@ F:@:FLOOR:3:0:0:0:215
 F:a:BUILDING_0:3
 F:@:FLOOR:3:0:0:0:33
 
-# Quest 27 rewarding (Priest, Bard and ForceTrainer
+# Quest 27 rewarding (Priest and ForceTrainer
 # get The Palantir of Westernesse)
-?:[AND [EQU $QUEST27 3] [EQU $CLASS Priest Bard ForceTrainer] ]
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Priest ForceTrainer] ]
 F:a:BUILDING_0:3
 F:@:FLOOR:3:0:0:0:15
 
+# Quest 27 rewarding (Bard get Harp of Robinton, the masterharper)
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Bard ] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:251
+
 # Quest 27 rewarding (Mirror-Master gets The Jewel Encrusted Crown of Numenor)
 ?:[AND [EQU $QUEST27 3] [EQU $CLASS Mirror-Master] ]
 F:a:BUILDING_0:3

diff --git a/src/birth.c b/src/birth.c
index 626477b..e348d31 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -1753,7 +1753,7 @@ static cptr race_jouhou[MAX_RACES] =
 
 "One of the 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.",
 
- "This race is a blasphemous abomination produced by Chaos.  It is not an independent race but rather a humanoid creature, most often a human, twisted by the Chaos, or a nightmarish crossbreed of a human and a beast.  All Beastmen are accustomed to Chaos so much that they are untroubled by confusion and sound, although raw logrus can still have effects on them.  Beastmen revel in chaos, as it twists them more and more.  Beastmen are subject to mutations: when they have been created, they receive a random mutation.  After that, every time they advance a level they have a small chance of gaining yet another mutation.",
+"This race is a blasphemous abomination produced by Chaos.  It is not an independent race but rather a humanoid creature, most often a human, twisted by the Chaos, or a nightmarish crossbreed of a human and a beast.  All Beastmen are accustomed to Chaos so much that they are untroubled by confusion and sound, although raw logrus can still have effects on them.  Beastmen revel in chaos, as it twists them more and more.  Beastmen are subject to mutations: when they have been created, they receive a random mutation.  After that, every time they advance a level they have a small chance of gaining yet another mutation.",
 
 "The Ents are a powerful race dating from the beginning of the world, oldest of all animals or plants who inhabit Arda.  Spirits of the land, they were summoned to guard the forests of Middle-earth.  Being much like trees they are very clumsy but strong, and very susceptible to fire.  They gain very little nutrition from the food of mortals, but they can absorb water from potions as their nutrition.",
 

diff --git a/src/cmd2.c b/src/cmd2.c
index 982aa64..67af4b2 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3792,6 +3792,13 @@ void do_cmd_fire(void)
                return;
        }
 
+       if (j_ptr->sval == SV_HARP)
+       {
+               msg_print(_("この武器で射撃はできない。", "It's not for firing."));
+               flush();
+               return;
+       }
+
 
        if (p_ptr->special_defense & KATA_MUSOU)
        {

diff --git a/src/cmd4.c b/src/cmd4.c
index 50fed9a..7db4847 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5747,7 +5747,7 @@ static void do_cmd_knowledge_weapon_exp(void)
 
                                if ((k_ptr->tval == TV_SWORD - i) && (k_ptr->sval == num))
                                {
-                                       if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON)) continue;
+                                       if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON || k_ptr->sval == SV_HARP)) continue;
 
                                        weapon_exp = p_ptr->weapon_exp[4 - i][num];
                                        strip_name(tmp, j);

diff --git a/src/xtra1.c b/src/xtra1.c
index 2659c87..097aaba 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3092,6 +3092,7 @@ int bow_tval_ammo(object_type *o_ptr)
                        return TV_BOLT;
                }
                case SV_CRIMSON:
+               case SV_HARP:
                {
                        return TV_NO_AMMO;
                }