射撃のときに*スレイ*が適用されていなったので修正。英語版でエッセンスを付加する

ときのスレイのリストの順番をきれいに直した。

diff --git a/src/cmd2.c b/src/cmd2.c
index 48a4d27..74d5ae9 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3274,6 +3274,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 17) mult = 17;
                        }
 
+                       /* Kill Animal */
+                       if ((have_flag(flgs, TR_KILL_ANIMAL)) &&
+                           (r_ptr->flags3 & RF3_ANIMAL))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_ANIMAL;
+                               }
+
+                               if (mult < 27) mult = 27;
+                       }
+
                        /* Slay Evil */
                        if ((have_flag(flgs, TR_SLAY_EVIL)) &&
                            (r_ptr->flags3 & RF3_EVIL))
@@ -3286,6 +3298,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 15) mult = 15;
                        }
 
+                       /* Kill Evil */
+                       if ((have_flag(flgs, TR_KILL_EVIL)) &&
+                           (r_ptr->flags3 & RF3_EVIL))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_EVIL;
+                               }
+
+                               if (mult < 25) mult = 25;
+                       }
+
                        /* Slay Human */
                        if ((have_flag(flgs, TR_SLAY_HUMAN)) &&
                            (r_ptr->flags2 & RF2_HUMAN))
@@ -3298,6 +3322,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 17) mult = 17;
                        }
 
+                       /* Kill Human */
+                       if ((have_flag(flgs, TR_KILL_HUMAN)) &&
+                           (r_ptr->flags2 & RF2_HUMAN))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags2 |= RF2_HUMAN;
+                               }
+
+                               if (mult < 27) mult = 27;
+                       }
+
                        /* Slay Undead */
                        if ((have_flag(flgs, TR_SLAY_UNDEAD)) &&
                            (r_ptr->flags3 & RF3_UNDEAD))
@@ -3310,6 +3346,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 20) mult = 20;
                        }
 
+                       /* Kill Undead */
+                       if ((have_flag(flgs, TR_KILL_UNDEAD)) &&
+                           (r_ptr->flags3 & RF3_UNDEAD))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_UNDEAD;
+                               }
+
+                               if (mult < 30) mult = 30;
+                       }
+
                        /* Slay Demon */
                        if ((have_flag(flgs, TR_SLAY_DEMON)) &&
                            (r_ptr->flags3 & RF3_DEMON))
@@ -3322,6 +3370,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 20) mult = 20;
                        }
 
+                       /* Kill Demon */
+                       if ((have_flag(flgs, TR_KILL_DEMON)) &&
+                           (r_ptr->flags3 & RF3_DEMON))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_DEMON;
+                               }
+
+                               if (mult < 30) mult = 30;
+                       }
+
                        /* Slay Orc */
                        if ((have_flag(flgs, TR_SLAY_ORC)) &&
                            (r_ptr->flags3 & RF3_ORC))
@@ -3334,6 +3394,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 20) mult = 20;
                        }
 
+                       /* Kill Orc */
+                       if ((have_flag(flgs, TR_KILL_ORC)) &&
+                           (r_ptr->flags3 & RF3_ORC))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_ORC;
+                               }
+
+                               if (mult < 30) mult = 30;
+                       }
+
                        /* Slay Troll */
                        if ((have_flag(flgs, TR_SLAY_TROLL)) &&
                            (r_ptr->flags3 & RF3_TROLL))
@@ -3346,6 +3418,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 20) mult = 20;
                        }
 
+                       /* Kill Troll */
+                       if ((have_flag(flgs, TR_KILL_TROLL)) &&
+                           (r_ptr->flags3 & RF3_TROLL))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_TROLL;
+                               }
+
+                               if (mult < 30) mult = 30;
+                       }
+
                        /* Slay Giant */
                        if ((have_flag(flgs, TR_SLAY_GIANT)) &&
                            (r_ptr->flags3 & RF3_GIANT))
@@ -3358,6 +3442,18 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
                                if (mult < 20) mult = 20;
                        }
 
+                       /* Kill Giant */
+                       if ((have_flag(flgs, TR_KILL_GIANT)) &&
+                           (r_ptr->flags3 & RF3_GIANT))
+                       {
+                               if (m_ptr->ml)
+                               {
+                                       r_ptr->r_flags3 |= RF3_GIANT;
+                               }
+
+                               if (mult < 30) mult = 30;
+                       }
+
                        /* Slay Dragon  */
                        if ((have_flag(flgs, TR_SLAY_DRAGON)) &&
                            (r_ptr->flags3 & RF3_DRAGON))

diff --git a/src/object2.c b/src/object2.c
index bc02585..170e7e6 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6657,15 +6657,6 @@ static essence_type essence_info[] =
         {TR_BLOWS, "extra attack", 1, TR_BLOWS, 20},
         {TR_CHAOTIC, "chaos brand", 1, TR_CHAOTIC, 15},
         {TR_VAMPIRIC, "vampiric brand", 1, TR_VAMPIRIC, 60},
-        {TR_SLAY_ANIMAL, "slay animal", 5, TR_SLAY_ANIMAL, 20},
-        {TR_SLAY_EVIL, "slay evil", 5, TR_SLAY_EVIL, 100},
-        {TR_SLAY_UNDEAD, "slay undead", 5, TR_SLAY_UNDEAD, 20},
-        {TR_SLAY_DEMON, "slay demon", 5, TR_SLAY_DEMON, 20},
-        {TR_SLAY_ORC, "slay orc", 5, TR_SLAY_ORC, 15},
-        {TR_SLAY_TROLL, "slay troll", 5, TR_SLAY_TROLL, 15},
-        {TR_SLAY_GIANT, "slay giant", 5, TR_SLAY_GIANT, 20},
-        {TR_SLAY_DRAGON, "slay dragon", 5, TR_SLAY_DRAGON, 20},
-        {TR_KILL_DRAGON, "kill dragon", 5, TR_SLAY_DRAGON, 60},
         {TR_IMPACT, "quake activation", 7, TR_IMPACT, 15},
         {TR_BRAND_POIS, "poison brand", 1, TR_BRAND_POIS, 20},
         {TR_BRAND_ACID, "acid brand", 1, TR_BRAND_ACID, 20},
@@ -6703,7 +6694,6 @@ static essence_type essence_info[] =
         {TR_RES_DISEN, "resistance to disenchantment", 2, TR_RES_DISEN, 20},
         {TR_SH_FIRE, "", 0, -2, 0},
         {TR_SH_ELEC, "", 0, -2, 0},
-        {TR_SLAY_HUMAN, "slay human", 5, TR_SLAY_HUMAN, 20},
         {TR_SH_COLD, "", 0, -2, 0},
         {TR_NO_MAGIC, "anti magic", 3, TR_NO_MAGIC, 15},
         {TR_WARNING, "warning", 3, TR_WARNING, 20},
@@ -6714,14 +6704,26 @@ static essence_type essence_info[] =
         {TR_SLOW_DIGEST, "slow digestion", 3, TR_SLOW_DIGEST, 15},
         {TR_REGEN, "regeneration", 3, TR_REGEN, 20},
         {TR_TELEPORT, "teleport", 3, TR_TELEPORT, 25},
+
+        {TR_SLAY_EVIL, "slay evil", 5, TR_SLAY_EVIL, 100},
+        {TR_SLAY_ANIMAL, "slay animal", 5, TR_SLAY_ANIMAL, 20},
         {TR_KILL_ANIMAL, "kill animal", 5, TR_SLAY_ANIMAL, 60},
         {TR_KILL_EVIL, "kill evil", 0, TR_SLAY_EVIL, 60},
+        {TR_SLAY_UNDEAD, "slay undead", 5, TR_SLAY_UNDEAD, 20},
         {TR_KILL_UNDEAD, "kill undead", 5, TR_SLAY_UNDEAD, 60},
+        {TR_SLAY_DEMON, "slay demon", 5, TR_SLAY_DEMON, 20},
         {TR_KILL_DEMON, "kill demon", 5, TR_SLAY_DEMON, 60},
+        {TR_SLAY_ORC, "slay orc", 5, TR_SLAY_ORC, 15},
         {TR_KILL_ORC, "kill orc", 5, TR_SLAY_ORC, 60},
+        {TR_SLAY_TROLL, "slay troll", 5, TR_SLAY_TROLL, 15},
         {TR_KILL_TROLL, "kill troll", 5, TR_SLAY_TROLL, 60},
+        {TR_SLAY_GIANT, "slay giant", 5, TR_SLAY_GIANT, 20},
         {TR_KILL_GIANT, "kill giant", 5, TR_SLAY_GIANT, 60},       
+        {TR_SLAY_DRAGON, "slay dragon", 5, TR_SLAY_DRAGON, 20},
+        {TR_KILL_DRAGON, "kill dragon", 5, TR_SLAY_DRAGON, 60},
+        {TR_SLAY_HUMAN, "slay human", 5, TR_SLAY_HUMAN, 20},
         {TR_KILL_HUMAN, "kill human", 5, TR_SLAY_HUMAN, 60},
+
         {TR_ESP_ANIMAL, "sense animal", 6, TR_SLAY_ANIMAL, 40},
         {TR_ESP_UNDEAD, "sense undead", 6, TR_SLAY_UNDEAD, 40}, 
         {TR_ESP_DEMON, "sense demon", 6, TR_SLAY_DEMON, 40},