diff options
| -rw-r--r-- | crawl-ref/source/describe.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 22 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 4 |
5 files changed, 26 insertions, 13 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 945a7a3e72..0c95a37d5a 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -4150,13 +4150,6 @@ void describe_god( god_type which_god, bool give_title ) EOL, god_name(which_god)); } - if (which_god == GOD_BEOGH && you.piety >= 30) - { - have_any = true; - cprintf( "%s supports the use of orcish gear." EOL, - god_name(which_god)); - } - // mv: No abilities (except divine protection) under penance if (!player_under_penance()) { diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 7eb3d2b6f9..6a4664513c 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -999,7 +999,7 @@ int melee_attack::player_apply_weapon_bonuses(int damage) if (get_equip_race(*weapon) == ISFLAG_ORCISH && you.species == SP_HILL_ORC) { - if (you.religion == GOD_BEOGH) + if (you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH]) damage++; if (coinflip()) @@ -2118,7 +2118,7 @@ int melee_attack::player_to_hit(bool random_factor) your_to_hit += (random_factor && coinflip() ? 2 : 1); } else if (get_equip_race(*weapon) == ISFLAG_ORCISH - && you.religion == GOD_BEOGH) + && you.religion == GOD_BEOGH && !you.penance[GOD_BEOGH]) { your_to_hit++; } diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index d3b2075eff..a407bb2f0a 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -1530,6 +1530,8 @@ int player_AC(void) racial_bonus *= 3; else if (you.piety >= 30) racial_bonus *= 2; + else + racial_bonus += 1; } } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index e71070b1f5..786ae5aca9 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -182,10 +182,11 @@ const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = "", "gate yourself to the Abyss" }, // Beogh - { "", + { "Beogh supports the use of orcish gear.", "smite your foes", "gain orcish followers", - "recall your orcish followers", "walk on water" } + "recall your orcish followers", + "walk on water" } }; const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = @@ -267,10 +268,11 @@ const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = "", "gate yourself to the Abyss" }, // Beogh - { "", + { "Beogh no longer supports the use of orcish gear.", "smite your foes", "gain orcish followers", - "recall your orcish followers", "walk on water" } + "recall your orcish followers", + "walk on water" } }; @@ -321,6 +323,12 @@ void dec_penance(god_type god, int val) simple_god_message(" seems mollified.", god); take_note(Note(NOTE_MOLLIFY_GOD, god)); you.penance[god] = 0; + + // bonuses now once more effective + if ( god == GOD_BEOGH && you.religion == GOD_BEOGH) + { + you.redraw_armour_class = 1; + } } else you.penance[god] -= val; @@ -334,6 +342,12 @@ void dec_penance(int val) void inc_penance(int god, int val) { + // orcish bonuses don't apply under penance + if ( god == GOD_BEOGH && you.penance[god] == 0) + { + you.redraw_armour_class = 1; + } + if (you.penance[god] + val > 200) you.penance[god] = 200; else diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index ef67f7ba45..e068bda7f8 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -956,6 +956,10 @@ bool recall(char type_recalled) { if (mons_species(monster->type) != MONS_ORC) continue; + + // does not include charmed orcs + if (monster->attitude != ATT_FRIENDLY) + continue; } if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3, false, empty)) |