diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-05 18:09:50 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-05 18:09:50 +0000 |
commit | ccb8040b9032ede89892acff85c48d517ab16c14 (patch) | |
tree | 508407ae1ac57d958f92c6a83b649228c9f04f1b /crawl-ref/source | |
parent | 22d0bf1834360c8c1776f96049da60aad15c14b9 (diff) | |
download | crawl-ref-ccb8040b9032ede89892acff85c48d517ab16c14.tar.gz crawl-ref-ccb8040b9032ede89892acff85c48d517ab16c14.zip |
added Recall invocation for Beogh (data copied from Kiku)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1760 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/abl-show.cc | 9 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 1 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spells3.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/travel.cc | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 70f215b7e2..606a6ca084 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -140,7 +140,7 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = ABIL_LUGONU_ABYSS_ENTER }, // Beogh { ABIL_NON_ABILITY, ABIL_BEOGH_SMITING, - ABIL_NON_ABILITY, ABIL_NON_ABILITY, + ABIL_NON_ABILITY, ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, ABIL_NON_ABILITY } }; @@ -281,6 +281,7 @@ static const ability_def Ability_List[] = // Beogh { ABIL_BEOGH_SMITING, "Smiting", 3, 0, 50, 2, ABFLAG_NONE }, + { ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, "Recall Orcish Followers", 2, 0, 50, 0, ABFLAG_NONE }, // These six are unused "evil" god abilities: { ABIL_CHARM_SNAKE, "Charm Snake", 6, 0, 200, 5, ABFLAG_NONE }, @@ -604,6 +605,7 @@ static talent get_talent(ability_type ability, bool check_confused) case ABIL_ZIN_REPEL_UNDEAD: case ABIL_TSO_REPEL_UNDEAD: case ABIL_KIKU_RECALL_UNDEAD_SLAVES: + case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS: case ABIL_OKAWARU_MIGHT: case ABIL_ELYVILON_LESSER_HEALING: invoc = true; @@ -1584,6 +1586,11 @@ static bool do_ability(const ability_def& abil) exercise( SK_INVOCATIONS, (coinflip()? 3 : 2) ); break; + case ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS: + recall(2); + exercise(SK_INVOCATIONS, 1); + break; + //jmf: intended as invocations from evil god(s): case ABIL_CHARM_SNAKE: cast_snake_charm( you.experience_level * 2 diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 47d22008da..cd33d6c0e0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -117,6 +117,7 @@ enum ability_type ABIL_NEMELEX_PEEK, ABIL_NEMELEX_STACK_DECK, ABIL_BEOGH_SMITING, + ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, ABIL_CHARM_SNAKE, ABIL_TRAN_SERPENT_OF_HELL, diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 11212e6373..7f6d70caf3 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -185,7 +185,7 @@ const char* god_gain_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { "", "smite your foes", "gain orcish followers", - "", "walk on water" } + "recall your orcish followers", "walk on water" } }; const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = @@ -270,7 +270,7 @@ const char* god_lose_power_messages[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { "", "smite your foes", "gain orcish followers", - "", "walk on water" } + "recall your orcish followers", "walk on water" } }; diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 9037a55cdb..ef67f7ba45 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -900,6 +900,7 @@ bool project_noise(void) Type recalled: 0 = anything 1 = undead only (Kiku religion ability) + 2 = orcs only (Beogh religion ability) */ bool recall(char type_recalled) { @@ -951,6 +952,11 @@ bool recall(char type_recalled) } } } + else if (type_recalled == 2) // Beogh + { + if (mons_species(monster->type) != MONS_ORC) + continue; + } if (empty_surrounds(you.x_pos, you.y_pos, DNGN_FLOOR, 3, false, empty)) { diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index b841eda443..25ba95f66e 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -2105,7 +2105,7 @@ static void travel_depth_munge(int munge_method, static travel_target prompt_travel_depth(const level_id &id) { - travel_target target(level_pos(id), false); + travel_target target = travel_target(level_pos(id), false); // Handle one-level branches by not prompting. if (single_level_branch(target.p.id.branch)) |