Change Rarity of Armor ego.

[hengband/hengband.git] / src / object2.c

diff --git a/src/object2.c b/src/object2.c
index 73dee3b..c4a811c 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -991,7 +991,12 @@ s32b flag_cost(object_type *o_ptr, int plusses)
        if (have_flag(flgs, TR_HIDE_TYPE)) total += 0;
        if (have_flag(flgs, TR_SHOW_MODS)) total += 0;
        if (have_flag(flgs, TR_LEVITATION)) total += 1250;
-       if (have_flag(flgs, TR_LITE)) total += 1250;
+       if (have_flag(flgs, TR_LITE_1)) total += 1500;
+       if (have_flag(flgs, TR_LITE_2)) total += 2500;
+       if (have_flag(flgs, TR_LITE_3)) total += 4000;
+       if (have_flag(flgs, TR_LITE_M1)) total -= 1500;
+       if (have_flag(flgs, TR_LITE_M2)) total -= 2500;
+       if (have_flag(flgs, TR_LITE_M3)) total -= 4000;
        if (have_flag(flgs, TR_SEE_INVIS)) total += 2000;
        if (have_flag(flgs, TR_TELEPATHY)) total += 20000;
        if (have_flag(flgs, TR_ESP_ANIMAL)) total += 1000;
@@ -1020,6 +1025,16 @@ s32b flag_cost(object_type *o_ptr, int plusses)
        if (have_flag(flgs, TR_DRAIN_EXP)) total -= 12500;
        if (have_flag(flgs, TR_DRAIN_HP)) total -= 12500;
        if (have_flag(flgs, TR_DRAIN_MANA)) total -= 12500;
+       if (have_flag(flgs, TR_CALL_ANIMAL)) total -= 12500;
+       if (have_flag(flgs, TR_CALL_DEMON)) total -= 10000;
+       if (have_flag(flgs, TR_CALL_DRAGON)) total -= 10000;
+       if (have_flag(flgs, TR_CALL_UNDEAD)) total -= 10000;
+       if (have_flag(flgs, TR_COWARDICE)) total -= 5000;
+       if (have_flag(flgs, TR_LOW_MELEE)) total -= 5000;
+       if (have_flag(flgs, TR_LOW_AC)) total -= 5000;
+       if (have_flag(flgs, TR_LOW_MAGIC)) total -= 15000;
+       if (have_flag(flgs, TR_FAST_DIGEST)) total -= 10000;
+       if (have_flag(flgs, TR_SLOW_REGEN)) total -= 10000;
        if (have_flag(flgs, TR_TELEPORT))
        {
                if (object_is_cursed(o_ptr))
@@ -2412,6 +2427,7 @@ static void a_m_aux_1(object_type *o_ptr, int level, int power)
                                        if (one_in_(3)) add_flag(o_ptr->art_flags, TR_CHAOTIC);
                                        if (one_in_(4)) add_flag(o_ptr->art_flags, TR_BLOWS);
                                        if (one_in_(5)) add_flag(o_ptr->art_flags, TR_ADD_H_CURSE);
+                                       if (one_in_(5)) add_flag(o_ptr->art_flags, TR_CALL_DEMON);
                                        break;
                                }
 
@@ -2722,14 +2738,15 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power)
                                        if (one_in_(5)) add_flag(o_ptr->art_flags, TR_DRAIN_MANA);
                                        if (one_in_(5)) add_flag(o_ptr->art_flags, TR_DRAIN_EXP);
                                        if (one_in_(5)) add_flag(o_ptr->art_flags, TR_TY_CURSE);
+                                       if (one_in_(5)) add_flag(o_ptr->art_flags, TR_CALL_DEMON);
                                        break;
                                  case EGO_A_MORGUL:
                                        if (one_in_(3)) o_ptr->curse_flags |= (TRC_HEAVY_CURSE);
-                                       if (one_in_(6)) add_flag(o_ptr->art_flags, TR_TY_CURSE);
+                                       if (one_in_(9)) add_flag(o_ptr->art_flags, TR_TY_CURSE);
                                        if (one_in_(4)) add_flag(o_ptr->art_flags, TR_ADD_H_CURSE);
-                                       if (one_in_(4)) add_flag(o_ptr->art_flags, TR_AGGRAVATE);
-                                       if (one_in_(6)) add_flag(o_ptr->art_flags, TR_NO_MAGIC);
-                                       if (one_in_(6)) add_flag(o_ptr->art_flags, TR_NO_TELE);
+                                       if (one_in_(6)) add_flag(o_ptr->art_flags, TR_AGGRAVATE);
+                                       if (one_in_(9)) add_flag(o_ptr->art_flags, TR_NO_MAGIC);
+                                       if (one_in_(9)) add_flag(o_ptr->art_flags, TR_NO_TELE);
                                        break;
                                  default:
                                        break;
@@ -2952,7 +2969,6 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power)
                                        switch (o_ptr->name2)
                                        {
                                        case EGO_BRILLIANCE:
-                                       case EGO_LITE:
                                        case EGO_DARK:
                                        case EGO_INFRAVISION:
                                        case EGO_H_PROTECTION:
@@ -2964,6 +2980,27 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power)
                                                        else add_esp_weak(o_ptr, FALSE);
                                                }
                                                break;
+                                       case EGO_LITE:
+                                               if (one_in_(3)) add_flag(o_ptr->art_flags, TR_LITE_1);
+                                               if (one_in_(3)) add_flag(o_ptr->art_flags, TR_LITE_2);
+                                               break;
+                                       case EGO_H_DEMON:
+                                               if(one_in_(3)) o_ptr->curse_flags |= (TRC_HEAVY_CURSE);
+                                               one_in_(3) ? 
+                                                       add_flag(o_ptr->art_flags, TR_DRAIN_EXP) :
+                                                       one_in_(2) ?
+                                                               add_flag(o_ptr->art_flags, TR_DRAIN_HP) :
+                                                               add_flag(o_ptr->art_flags, TR_DRAIN_MANA);
+                                               
+                                               if (one_in_(3)) add_flag(o_ptr->art_flags, TR_AGGRAVATE);
+                                               if (one_in_(3)) add_flag(o_ptr->art_flags, TR_ADD_L_CURSE);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_ADD_H_CURSE);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_DRAIN_HP);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_DRAIN_MANA);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_DRAIN_EXP);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_TY_CURSE);
+                                               if (one_in_(5)) add_flag(o_ptr->art_flags, TR_CALL_DEMON);
+                                               break;
                                        default:/* not existing helm (Magi, Might, etc...)*/
                                                ok_flag = FALSE;
                                        }
@@ -3010,6 +3047,14 @@ static void a_m_aux_2(object_type *o_ptr, int level, int power)
                                        o_ptr->to_d -= 6;
                                        o_ptr->to_h -= 6;
                                        break;
+                                 case EGO_NAZGUL:
+                                       o_ptr->to_d -= 3;
+                                       o_ptr->to_h -= 3;
+                                       if (one_in_(3)) add_flag(o_ptr->art_flags, TR_COWARDICE);
+                                       if (one_in_(3)) add_flag(o_ptr->art_flags, TR_CALL_UNDEAD);
+                                       if (one_in_(3)) add_flag(o_ptr->art_flags, TR_SLOW_REGEN);
+                                       if (one_in_(3)) add_flag(o_ptr->art_flags, TR_DRAIN_EXP);
+                                       break;
                                }
 
                        }
@@ -3355,7 +3400,7 @@ static void a_m_aux_3(object_type *o_ptr, int level, int power)
                                                o_ptr->name2 = EGO_RING_REGEN;
                                                break;
                                        case 5: case 6:
-                                               if (have_flag(k_ptr->flags, TR_LITE)) break;
+                                               if (have_flag(k_ptr->flags, TR_LITE_1)) break;
                                                o_ptr->name2 = EGO_RING_LITE;
                                                break;
                                        case 7: case 8:
@@ -7164,7 +7209,7 @@ static essence_type essence_info[] =
        {TR_NO_MAGIC, "È¿ËâË¡", 3, TR_NO_MAGIC, 15},
        {TR_WARNING, "·Ù¹ð", 3, TR_WARNING, 20},
        {TR_LEVITATION, "ÉâÍ·", 3, TR_LEVITATION, 20},
-       {TR_LITE, "±Êµ×¸÷¸»", 3, TR_LITE, 15},
+       {TR_LITE_1, "±Êµ×¸÷¸»", 3, TR_LITE_1, 15},
        {TR_SEE_INVIS, "²Ä»ëÆ©ÌÀ", 3, TR_SEE_INVIS, 20},
        {TR_TELEPATHY, "¥Æ¥ì¥Ñ¥·¡¼", 6, TR_TELEPATHY, 15},
        {TR_SLOW_DIGEST, "Ãپò½", 3, TR_SLOW_DIGEST, 15},
@@ -7273,7 +7318,7 @@ static essence_type essence_info[] =
        {TR_NO_MAGIC, "anti magic", 3, TR_NO_MAGIC, 15},
        {TR_WARNING, "warning", 3, TR_WARNING, 20},
        {TR_LEVITATION, "levitation", 3, TR_LEVITATION, 20},
-       {TR_LITE, "permanent light", 3, TR_LITE, 15},
+       {TR_LITE_1, "permanent light", 3, TR_LITE_1, 15},
        {TR_SEE_INVIS, "see invisible", 3, TR_SEE_INVIS, 20},
        {TR_TELEPATHY, "telepathy", 6, TR_TELEPATHY, 15},
        {TR_SLOW_DIGEST, "slow digestion", 3, TR_SLOW_DIGEST, 15},
@@ -7649,8 +7694,18 @@ static void drain_essence(void)
        if (have_flag(old_flgs, TR_DRAIN_EXP)) dec--;
        if (have_flag(old_flgs, TR_DRAIN_HP)) dec--;
        if (have_flag(old_flgs, TR_DRAIN_MANA)) dec--;
+       if (have_flag(old_flgs, TR_CALL_ANIMAL)) dec--;
+       if (have_flag(old_flgs, TR_CALL_DEMON)) dec--;
+       if (have_flag(old_flgs, TR_CALL_DRAGON)) dec--;
+       if (have_flag(old_flgs, TR_CALL_UNDEAD)) dec--;
+       if (have_flag(old_flgs, TR_COWARDICE)) dec--;
+       if (have_flag(old_flgs, TR_LOW_MELEE)) dec--;
+       if (have_flag(old_flgs, TR_LOW_AC)) dec--;
+       if (have_flag(old_flgs, TR_LOW_MAGIC)) dec--;
+       if (have_flag(old_flgs, TR_FAST_DIGEST)) dec--;
+       if (have_flag(old_flgs, TR_SLOW_REGEN)) dec--;
        if (have_flag(old_flgs, TR_TY_CURSE)) dec--;
-
+       
        iy = o_ptr->iy;
        ix = o_ptr->ix;
        next_o_idx = o_ptr->next_o_idx;