summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Otto <ottochar@gmail.com>2009-11-08 22:40:49 -0500
committerCharles Otto <ottochar@gmail.com>2009-11-08 22:40:49 -0500
commit9701b3016d5d0d1fb67185e7abd675a0de0c129a (patch)
tree784d87393b77498a551a18836128c0bf0f14be6a
parent0a3c856d3d36b49a8430fe9468d2f11ae234f9c8 (diff)
downloadcrawl-ref-9701b3016d5d0d1fb67185e7abd675a0de0c129a.tar.gz
crawl-ref-9701b3016d5d0d1fb67185e7abd675a0de0c129a.zip
Rename Feawn
In most places Feawn is now referred to as "Fedhas," its long name (used in the religion screen) is "Fedhas Madash"
-rw-r--r--crawl-ref/docs/changelog.txt2
-rw-r--r--crawl-ref/source/abl-show.cc50
-rw-r--r--crawl-ref/source/acr.cc6
-rw-r--r--crawl-ref/source/artefact.cc2
-rw-r--r--crawl-ref/source/attitude-change.cc20
-rw-r--r--crawl-ref/source/attitude-change.h6
-rw-r--r--crawl-ref/source/beam.cc28
-rw-r--r--crawl-ref/source/dat/altar.des32
-rw-r--r--crawl-ref/source/dat/descript/ability.txt2
-rw-r--r--crawl-ref/source/dat/descript/features.txt2
-rw-r--r--crawl-ref/source/dat/descript/gods.txt8
-rw-r--r--crawl-ref/source/dat/shrine.des4
-rw-r--r--crawl-ref/source/describe.cc6
-rw-r--r--crawl-ref/source/directn.cc4
-rw-r--r--crawl-ref/source/enum.h20
-rw-r--r--crawl-ref/source/feature.cc2
-rw-r--r--crawl-ref/source/godabil.cc14
-rw-r--r--crawl-ref/source/godabil.h2
-rw-r--r--crawl-ref/source/goditem.cc2
-rw-r--r--crawl-ref/source/godwrath.cc16
-rw-r--r--crawl-ref/source/l_dgngrd.cc2
-rw-r--r--crawl-ref/source/message.cc2
-rw-r--r--crawl-ref/source/mon-behv.cc2
-rw-r--r--crawl-ref/source/monstuff.cc8
-rw-r--r--crawl-ref/source/player.cc2
-rw-r--r--crawl-ref/source/religion.cc60
-rw-r--r--crawl-ref/source/religion.h6
-rw-r--r--crawl-ref/source/rltiles/dc-dngn.txt2
-rw-r--r--crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_fedhas.png (renamed from crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_feawn.png)bin961 -> 961 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-unrand.txt26
-rw-r--r--crawl-ref/source/tilepick.cc4
-rw-r--r--crawl-ref/source/travel.cc8
-rw-r--r--crawl-ref/source/view.cc2
-rw-r--r--crawl-ref/source/viewmap.cc2
34 files changed, 177 insertions, 177 deletions
diff --git a/crawl-ref/docs/changelog.txt b/crawl-ref/docs/changelog.txt
index 36bfb22519..1a38567902 100644
--- a/crawl-ref/docs/changelog.txt
+++ b/crawl-ref/docs/changelog.txt
@@ -1,6 +1,6 @@
Stone Soup 0.6
--------------
-* Two new gods: Jiyva, god of slime, and Feawn, god of plants.
+* Two new gods: Jiyva, god of slime, and Fedhas, god of plants.
* Shorten Lair to eight levels.
* New portal vaults: Bailey and Trove.
* Added scroll of silence.
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index b968d3d6c7..c0a03f1761 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -146,9 +146,9 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] =
// Jiyva
{ ABIL_JIYVA_CALL_JELLY, ABIL_NON_ABILITY, ABIL_NON_ABILITY,
ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION },
- // Feawn
- { ABIL_FEAWN_SUNLIGHT, ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_RAIN,
- ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION },
+ // Fedhas
+ { ABIL_FEDHAS_SUNLIGHT, ABIL_FEDHAS_PLANT_RING, ABIL_FEDHAS_RAIN,
+ ABIL_FEDHAS_SPAWN_SPORES, ABIL_FEDHAS_EVOLUTION },
// Cheibriados
{ ABIL_NON_ABILITY, ABIL_CHEIBRIADOS_TIME_BEND, ABIL_NON_ABILITY,
ABIL_CHEIBRIADOS_SLOUCH, ABIL_CHEIBRIADOS_TIME_STEP },
@@ -327,13 +327,13 @@ static const ability_def Ability_List[] =
{ ABIL_JIYVA_CURE_BAD_MUTATION, "Cure Bad Mutation",
8, 0, 200, 15, ABFLAG_NONE },
- // Feawn
- { ABIL_FEAWN_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE },
- { ABIL_FEAWN_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE},
- { ABIL_FEAWN_PLANT_RING, "Growth", 2, 0, 0, 1, ABFLAG_FRUIT},
- { ABIL_FEAWN_RAIN, "Rain", 4, 0, 100, 2, ABFLAG_NONE},
- { ABIL_FEAWN_SPAWN_SPORES, "Reproduction", 4, 0, 50, 2, ABFLAG_NONE},
- { ABIL_FEAWN_EVOLUTION, "Evolution", 4, 0, 0, 2, ABFLAG_FRUIT},
+ // Fedhas
+ { ABIL_FEDHAS_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE },
+ { ABIL_FEDHAS_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE},
+ { ABIL_FEDHAS_PLANT_RING, "Growth", 2, 0, 0, 1, ABFLAG_FRUIT},
+ { ABIL_FEDHAS_RAIN, "Rain", 4, 0, 100, 2, ABFLAG_NONE},
+ { ABIL_FEDHAS_SPAWN_SPORES, "Reproduction", 4, 0, 50, 2, ABFLAG_NONE},
+ { ABIL_FEDHAS_EVOLUTION, "Evolution", 4, 0, 0, 2, ABFLAG_FRUIT},
// Cheibriados
{ ABIL_CHEIBRIADOS_PONDEROUSIFY, "Make Ponderous", 2, 0, 0, 0, ABFLAG_NONE },
@@ -683,14 +683,14 @@ static talent _get_talent(ability_type ability, bool check_confused)
case ABIL_ELYVILON_LESSER_HEALING_OTHERS:
case ABIL_LUGONU_ABYSS_EXIT:
case ABIL_JIYVA_CALL_JELLY:
- case ABIL_FEAWN_SUNLIGHT:
+ case ABIL_FEDHAS_SUNLIGHT:
invoc = true;
failure = 30 - (you.piety / 20) - (6 * you.skills[SK_INVOCATIONS]);
break;
// destroying stuff doesn't train anything
case ABIL_ELYVILON_DESTROY_WEAPONS:
- case ABIL_FEAWN_FUNGAL_BLOOM:
+ case ABIL_FEDHAS_FUNGAL_BLOOM:
invoc = true;
failure = 0;
break;
@@ -734,7 +734,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
case ABIL_ELYVILON_GREATER_HEALING_OTHERS:
case ABIL_LUGONU_BEND_SPACE:
case ABIL_JIYVA_SLIMIFY:
- case ABIL_FEAWN_PLANT_RING:
+ case ABIL_FEDHAS_PLANT_RING:
invoc = true;
failure = 40 - (you.piety / 20) - (5 * you.skills[SK_INVOCATIONS]);
break;
@@ -756,8 +756,8 @@ static talent _get_talent(ability_type ability, bool check_confused)
break;
case ABIL_MAKHLEB_MAJOR_DESTRUCTION:
- case ABIL_FEAWN_SPAWN_SPORES:
- case ABIL_FEAWN_RAIN:
+ case ABIL_FEDHAS_SPAWN_SPORES:
+ case ABIL_FEDHAS_RAIN:
case ABIL_YRED_DRAIN_LIFE:
case ABIL_CHEIBRIADOS_SLOUCH:
invoc = true;
@@ -769,7 +769,7 @@ static talent _get_talent(ability_type ability, bool check_confused)
case ABIL_OKAWARU_HASTE:
case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
case ABIL_LUGONU_CORRUPT:
- case ABIL_FEAWN_EVOLUTION:
+ case ABIL_FEDHAS_EVOLUTION:
invoc = true;
failure = 70 - (you.piety / 25) - (you.skills[SK_INVOCATIONS] * 4);
break;
@@ -1927,14 +1927,14 @@ static bool _do_ability(const ability_def& abil)
exercise(SK_INVOCATIONS, 1);
break;
- case ABIL_FEAWN_FUNGAL_BLOOM:
+ case ABIL_FEDHAS_FUNGAL_BLOOM:
{
int count = fungal_bloom();
if (count)
{
simple_god_message(" appreciates your contribution to the "
- "ecosystem.", GOD_FEAWN);
+ "ecosystem.", GOD_FEDHAS);
}
// We are following the blood god sacrifice piety gain model, given as:
@@ -1953,33 +1953,33 @@ static bool _do_ability(const ability_def& abil)
break;
}
- case ABIL_FEAWN_SUNLIGHT:
+ case ABIL_FEDHAS_SUNLIGHT:
if (!sunlight())
return (false);
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
- case ABIL_FEAWN_PLANT_RING:
+ case ABIL_FEDHAS_PLANT_RING:
if (!plant_ring_from_fruit())
return (false);
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
- case ABIL_FEAWN_RAIN:
+ case ABIL_FEDHAS_RAIN:
rain(you.pos());
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
- case ABIL_FEAWN_SPAWN_SPORES:
+ case ABIL_FEDHAS_SPAWN_SPORES:
corpse_spores();
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
- case ABIL_FEAWN_EVOLUTION:
+ case ABIL_FEDHAS_EVOLUTION:
if (!evolve_flora())
return (false);
@@ -2363,8 +2363,8 @@ std::vector<talent> your_talents(bool check_confused)
_add_talent(talents, ABIL_ELYVILON_DESTROY_WEAPONS, check_confused);
else if (you.religion == GOD_TROG)
_add_talent(talents, ABIL_TROG_BURN_SPELLBOOKS, check_confused);
- else if (you.religion == GOD_FEAWN)
- _add_talent(talents, ABIL_FEAWN_FUNGAL_BLOOM, check_confused);
+ else if (you.religion == GOD_FEDHAS)
+ _add_talent(talents, ABIL_FEDHAS_FUNGAL_BLOOM, check_confused);
else if (you.religion == GOD_CHEIBRIADOS)
_add_talent(talents, ABIL_CHEIBRIADOS_PONDEROUSIFY, check_confused);
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 3ff8fe146c..230212b25d 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -414,7 +414,7 @@ static void _god_greeting_message(bool game_start)
case GOD_JIYVA:
god_speaks(you.religion, "Slime for the Slime God!");
break;
- case GOD_FEAWN:
+ case GOD_FEDHAS:
simple_god_message(" says: Spread life and death.");
break;
case GOD_CHEIBRIADOS:
@@ -3875,7 +3875,7 @@ static void _move_player(coord_def move)
const dungeon_feature_type targ_grid = grd(targ);
monsters* targ_monst = monster_at(targ);
- if (feawn_passthrough(targ_monst))
+ if (fedhas_passthrough(targ_monst))
{
// Moving on a plant takes 1.5 x normal move delay. We
// will print a message about it but only when moving
@@ -3884,7 +3884,7 @@ static void _move_player(coord_def move)
you.time_taken = div_rand_round(you.time_taken * 3, 2);
monsters * current = monster_at(you.pos());
- if(!current || !feawn_passthrough(current))
+ if(!current || !fedhas_passthrough(current))
{
// Probably need better messages. -cao
if(mons_genus(targ_monst->type) == MONS_FUNGUS)
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 1e15b149ca..41ac02868c 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -194,7 +194,7 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
return (false);
break;
- case GOD_FEAWN:
+ case GOD_FEDHAS:
// Anti-necromancy god: nothing involving necromancy or
// necromantic spell use.
if (brand == SPWPN_DRAINING || brand == SPWPN_PAIN
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc
index 840c86eb89..957a4f7713 100644
--- a/crawl-ref/source/attitude-change.cc
+++ b/crawl-ref/source/attitude-change.cc
@@ -125,15 +125,15 @@ void slime_convert(monsters* monster)
}
}
-void feawn_neutralise(monsters* monster)
+void fedhas_neutralise(monsters* monster)
{
- if (you.religion == GOD_FEAWN
+ if (you.religion == GOD_FEDHAS
&& monster->attitude == ATT_HOSTILE
- && feawn_neutralises(monster)
+ && fedhas_neutralises(monster)
&& !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT)
&& !player_under_penance())
{
- feawn_neutralise_plant(monster);
+ fedhas_neutralise_plant(monster);
monster->flags |= MF_ATT_CHANGE_ATTEMPT;
stop_running();
@@ -621,7 +621,7 @@ bool yred_slaves_abandon_you()
return (false);
}
-static bool _feawn_plants_on_level_hostile()
+static bool _fedhas_plants_on_level_hostile()
{
for (int i = 0; i < MAX_MONSTERS; ++i)
{
@@ -637,7 +637,7 @@ static bool _feawn_plants_on_level_hostile()
#endif
// You can potentially turn an oklob or whatever neutral
- // again by going back to Feawn.
+ // again by going back to Fedhas.
if (testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT))
monster->flags &= ~MF_ATT_CHANGE_ATTEMPT;
@@ -651,9 +651,9 @@ static bool _feawn_plants_on_level_hostile()
return (true);
}
-bool feawn_plants_hostile()
+bool fedhas_plants_hostile()
{
- if (apply_to_all_dungeons(_feawn_plants_on_level_hostile))
+ if (apply_to_all_dungeons(_fedhas_plants_on_level_hostile))
{
mpr("The plants of the dungeon turn on you!", MSGCH_GOD);
return (true);
@@ -901,10 +901,10 @@ void beogh_convert_orc(monsters *orc, bool emergency,
behaviour_event(orc, ME_ALERT, MHITNOT);
}
-void feawn_neutralise_plant(monsters *plant)
+void fedhas_neutralise_plant(monsters *plant)
{
if (!plant
- || !feawn_neutralises(plant)
+ || !fedhas_neutralises(plant)
|| plant->attitude != ATT_HOSTILE
|| testbits(plant->flags, MF_ATT_CHANGE_ATTEMPT))
{
diff --git a/crawl-ref/source/attitude-change.h b/crawl-ref/source/attitude-change.h
index 784edd8131..c54b686b02 100644
--- a/crawl-ref/source/attitude-change.h
+++ b/crawl-ref/source/attitude-change.h
@@ -2,8 +2,8 @@
#define ATTITUDE_CHANGE_H
void good_god_follower_attitude_change(monsters *monster);
-void feawn_neutralise(monsters* monster);
-bool feawn_plants_hostile();
+void fedhas_neutralise(monsters* monster);
+bool fedhas_plants_hostile();
void beogh_follower_convert(monsters *monster, bool orc_hit = false);
void slime_convert(monsters *monster);
bool holy_beings_attitude_change();
@@ -21,6 +21,6 @@ void good_god_holy_fail_attitude_change(monsters *holy);
void beogh_convert_orc(monsters *orc, bool emergency,
bool converted_by_follower = false);
void jiyva_convert_slime(monsters* slime);
-void feawn_neutralise_plant(monsters *plant);
+void fedhas_neutralise_plant(monsters *plant);
#endif
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 13826a0e80..cd8d484634 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4276,11 +4276,11 @@ void bolt::tracer_enchantment_affect_monster(monsters* mon)
bool bolt::determine_damage(monsters* mon, int& preac, int& postac, int& final,
std::vector<std::string>& messages)
{
- // Feawn worshippers can fire through monsters of the same
- // alignment. This means Feawn-worshipping players can fire through
- // allied plants, and also means that Feawn-worshipping oklob plants
+ // Fedhas worshippers can fire through monsters of the same
+ // alignment. This means Fedhas-worshipping players can fire through
+ // allied plants, and also means that Fedhas-worshipping oklob plants
// can fire through plants with the same attitude.
- bool originator_worships_feawn = false;
+ bool originator_worships_fedhas = false;
// Checking beam_source to decide whether the player or a monster
// fired the beam (so we can check their religion). This is
@@ -4291,21 +4291,21 @@ bool bolt::determine_damage(monsters* mon, int& preac, int& postac, int& final,
// or not this is an explosion, and also the range of beam_source
// before attempting to reference env.mons with it. -cao
if (!is_explosion && beam_source == NON_MONSTER)
- originator_worships_feawn = (you.religion == GOD_FEAWN);
+ originator_worships_fedhas = (you.religion == GOD_FEDHAS);
else if (!is_explosion && beam_source >= 0 && beam_source < MAX_MONSTERS)
- originator_worships_feawn = (env.mons[beam_source].god == GOD_FEAWN);
+ originator_worships_fedhas = (env.mons[beam_source].god == GOD_FEDHAS);
if (!is_enchantment()
&& attitude == mon->attitude
- && originator_worships_feawn
- && feawn_protects(mon))
+ && originator_worships_fedhas
+ && fedhas_protects(mon))
{
if (!is_tracer)
{
// FIXME: Could use a better message, something about
// dodging that doesn't sound excessively weird would be
// nice.
- mprf(MSGCH_GOD, "Feawn protects %s plant from harm.",
+ mprf(MSGCH_GOD, "Fedhas protects %s plant from harm.",
attitude == ATT_FRIENDLY ? "your" : "a");
}
return (false);
@@ -4817,13 +4817,13 @@ void bolt::affect_monster(monsters* mon)
enable_attack_conducts(conducts);
// We'll say giant spore explosions don't trigger the ally attack conduct
- // for Feawn worshipers. Mostly because you can accidentally blow up a
+ // for Fedhas worshipers. Mostly because you can accidentally blow up a
// group of 8 plants and get placed under penance until the end of time
// otherwise. I'd prefer to do this elsewhere but the beam information
// goes out of scope.
//
// Also exempting miscast explosions from this conduct -cao
- if (you.religion == GOD_FEAWN
+ if (you.religion == GOD_FEDHAS
&& (flavour == BEAM_SPORE
|| beam_source == NON_MONSTER
&& aux_source.find("your miscasting") != std::string::npos))
@@ -4899,14 +4899,14 @@ void bolt::affect_monster(monsters* mon)
else
{
// Prevent spore explosions killing plants from being registered
- // as a Feawn misconduct. Deaths can trigger the ally dying or
+ // as a Fedhas misconduct. Deaths can trigger the ally dying or
// plant dying conducts, but spore explosions shouldn't count
// for either of those.
//
// FIXME: Should be a better way of doing this. For now, we are
// just falsifying the death report... -cao
- if (you.religion == GOD_FEAWN && flavour == BEAM_SPORE
- && feawn_protects(mon))
+ if (you.religion == GOD_FEDHAS && flavour == BEAM_SPORE
+ && fedhas_protects(mon))
{
if (mon->attitude == ATT_FRIENDLY)
mon->attitude = ATT_HOSTILE;
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index 8e43c7b963..633caf24da 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -273,15 +273,15 @@ ENDMAP
# III Special altars
######################################
-# XXX - The WEIGHTs and PLACE of these Feawn vaults are temporary.
+# XXX - The WEIGHTs and PLACE of these Fedhas vaults are temporary.
# Remove once the Ecumenical Temple is updated to cater for
# more than 12 gods.
-NAME: feawn_altar_1
-TAGS: uniq_altar_feawn
+NAME: fedhas_altar_1
+TAGS: uniq_altar_fedhas
DEPTH: D:2-7
WEIGHT: 75
-KFEAT: C = altar_feawn
+KFEAT: C = altar_fedhas
MONS: plant
MAP
.....
@@ -291,11 +291,11 @@ MAP
.....
ENDMAP
-NAME: feawn_altar_2
-TAGS: uniq_altar_feawn
+NAME: fedhas_altar_2
+TAGS: uniq_altar_fedhas
DEPTH: D:2-7
WEIGHT: 75
-KFEAT: C = altar_feawn
+KFEAT: C = altar_fedhas
NSUBST: w = 2:W / *:w
SUBST: . = ..wW
SUBST: w = wwwP
@@ -307,11 +307,11 @@ MAP
.....
ENDMAP
-NAME: feawn_altar_3
-TAGS: uniq_altar_feawn
+NAME: fedhas_altar_3
+TAGS: uniq_altar_fedhas
DEPTH: D:2-7
WEIGHT: 75
-KFEAT: C = altar_feawn
+KFEAT: C = altar_fedhas
NSUBST: b = 1:. / *:1
MONS: plant w:5 / fungus / nothing w:3
MAP
@@ -322,11 +322,11 @@ MAP
.111.
ENDMAP
-NAME: feawn_altar_4
-TAGS: uniq_altar_feawn
+NAME: fedhas_altar_4
+TAGS: uniq_altar_fedhas
DEPTH: D:2-7
WEIGHT: 75
-KFEAT: C = altar_feawn
+KFEAT: C = altar_fedhas
FTILE: . = floor_lair
FTILE: t = floor_lair
MAP
@@ -343,10 +343,10 @@ xxxxxxxtttttttx
xxxxxxxxxxxxxxx
ENDMAP
-NAME: feawn_altar_5
-TAGS: uniq_altar_feawn
+NAME: fedhas_altar_5
+TAGS: uniq_altar_fedhas
PLACE: D:8
-KFEAT: C = altar_feawn
+KFEAT: C = altar_fedhas
MONS: centaur, bush
MAP
......
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 63dbf33cce..4efea916be 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -358,7 +358,7 @@ Recall Orcish Followers
Recall your orcish followers from anywhere on the level to your immediate surroundings.
%%%%
-# Feawn
+# Fedhas
Decomposition
Cause corpses in your field of vision to rapidly decay. Corpses with a monster (or you) on top of them will not be affected.
diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt
index 2007e7c9f3..e6e55c528d 100644
--- a/crawl-ref/source/dat/descript/features.txt
+++ b/crawl-ref/source/dat/descript/features.txt
@@ -341,5 +341,5 @@ This waist-deep, misty water makes movement and combat cumbersome for landlubber
%%%%
Trees
-While the dungeon is filled with dim magic light, in most places it is not bright enough to sustain any larger plants. It is uneven, though, and there are spots where, with the grace of Feawn, trees as big as those on the surface can grow underground.
+While the dungeon is filled with dim magic light, in most places it is not bright enough to sustain any larger plants. It is uneven, though, and there are spots where, with the grace of Fedhas, trees as big as those on the surface can grow underground.
%%%%
diff --git a/crawl-ref/source/dat/descript/gods.txt b/crawl-ref/source/dat/descript/gods.txt
index a236f4ee83..93c80756e1 100644
--- a/crawl-ref/source/dat/descript/gods.txt
+++ b/crawl-ref/source/dat/descript/gods.txt
@@ -74,9 +74,9 @@ Jiyva
Jiyva is the chaotic ancient deity of the slimes.
%%%%
-Feawn
+Fedhas
-Feawn is the god of plant and fungal life.
+Fedhas Madash is the god of plant and fungal life.
%%%%
Cheibriados
@@ -136,9 +136,9 @@ Beogh powers
Beogh encourages followers to make use of orcish gear found in the dungeon. Followers can smite their foes, and will even gain orcish followers of their own, who may be blessed by Beogh in battle and can be recalled within a level as needed. Eventually, they'll gain the power to walk on water. Beogh will sometimes directly intervene to save a follower's life.
%%%%
-Feawn powers
+Fedhas powers
-Feawn encourages followers to promote the growth of plant life.
+Fedhas encourages followers to promote the growth of plant life.
%%%%
Cheibriados powers
diff --git a/crawl-ref/source/dat/shrine.des b/crawl-ref/source/dat/shrine.des
index 7916087f0e..e208564fe6 100644
--- a/crawl-ref/source/dat/shrine.des
+++ b/crawl-ref/source/dat/shrine.des
@@ -350,11 +350,11 @@ xxxxxxxxx...xxxxxxxxx
xxxxxxxxxxxxxxxxxxxxx
ENDMAP
-NAME: shrine_feawn
+NAME: shrine_fedhas
TAGS: shrine no_item_gen no_monster_gen
ORIENT: encompass
KFEAT: > = exit_portal_vault
-KFEAT: X = altar_feawn
+KFEAT: X = altar_fedhas
MONS: plant, fungus, oklob plant
SUBST: . = .F
COLOUR: F = green
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index b6ebe5c0d5..7114f173ee 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3289,7 +3289,7 @@ const char *divine_title[NUM_GODS][8] =
{"Scum", "Jelly", "Squelcher", "Dissolver",
"Putrid Slime", "Consuming %s", "Archjelly", "Royal Jelly"},
- // Feawn -- nature theme. Titles could use some work, but the
+ // Fedhas Madash -- nature theme. Titles could use some work, but the
// progression is generally from nature lover to walking disaster.
// -cao
{"Walking Fertiliser", "Green %s", "Photosynthesist", "Planter",
@@ -3656,13 +3656,13 @@ void describe_god( god_type which_god, bool give_title )
ABIL_JIYVA_JELLY_SHIELD);
}
}
- else if (which_god == GOD_FEAWN)
+ else if (which_god == GOD_FEDHAS)
{
have_any = true;
std::string buf = "You can speed up decomposition.";
_print_final_god_abil_desc(which_god, buf,
- ABIL_FEAWN_FUNGAL_BLOOM);
+ ABIL_FEDHAS_FUNGAL_BLOOM);
_print_final_god_abil_desc(which_god,
"You can walk through plants.",
ABIL_NON_ABILITY);
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 47cdd1542e..b332862a97 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2775,8 +2775,8 @@ static std::string _base_feature_desc(dungeon_feature_type grid,
return ("roughly hewn altar of Beogh");
case DNGN_ALTAR_JIYVA:
return ("viscous altar of Jiyva");
- case DNGN_ALTAR_FEAWN:
- return ("blossoming altar of Feawn");
+ case DNGN_ALTAR_FEDHAS:
+ return ("blossoming altar of Fedhas");
case DNGN_ALTAR_CHEIBRIADOS:
return ("snail-covered altar of Cheibriados");
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 4cfbd9030b..e6b41bec7d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -101,12 +101,12 @@ enum ability_type
ABIL_JIYVA_JELLY_SHIELD, // 240
ABIL_JIYVA_SLIMIFY,
ABIL_JIYVA_CURE_BAD_MUTATION,
- ABIL_FEAWN_FUNGAL_BLOOM,
- ABIL_FEAWN_SUNLIGHT,
- ABIL_FEAWN_RAIN, // 245
- ABIL_FEAWN_PLANT_RING,
- ABIL_FEAWN_SPAWN_SPORES,
- ABIL_FEAWN_EVOLUTION,
+ ABIL_FEDHAS_FUNGAL_BLOOM,
+ ABIL_FEDHAS_SUNLIGHT,
+ ABIL_FEDHAS_RAIN, // 245
+ ABIL_FEDHAS_PLANT_RING,
+ ABIL_FEDHAS_SPAWN_SPORES,
+ ABIL_FEDHAS_EVOLUTION,
ABIL_CHEIBRIADOS_PONDEROUSIFY,
ABIL_CHEIBRIADOS_TIME_STEP, // 250
ABIL_CHEIBRIADOS_TIME_BEND,
@@ -780,8 +780,8 @@ enum conduct_type
DID_DESTROY_ORCISH_IDOL, // Beogh
DID_CREATE_LIFE, // unused
DID_KILL_SLIME, // Jiyva
- DID_KILL_PLANT, // Feawn
- DID_ALLY_KILLED_PLANT, // Feawn
+ DID_KILL_PLANT, // Fedhas
+ DID_ALLY_KILLED_PLANT, // Fedhas
DID_HASTY, // Cheibriados
NUM_CONDUCTS
@@ -1113,7 +1113,7 @@ enum dungeon_feature_type
DNGN_ALTAR_LUGONU,
DNGN_ALTAR_BEOGH,
DNGN_ALTAR_JIYVA,
- DNGN_ALTAR_FEAWN,
+ DNGN_ALTAR_FEDHAS,
DNGN_ALTAR_CHEIBRIADOS,
DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_CHEIBRIADOS,
@@ -1337,7 +1337,7 @@ enum god_type
GOD_LUGONU,
GOD_BEOGH,
GOD_JIYVA, // 15
- GOD_FEAWN,
+ GOD_FEDHAS,
GOD_CHEIBRIADOS,
NUM_GODS, // always after last god
diff --git a/crawl-ref/source/feature.cc b/crawl-ref/source/feature.cc
index af04ac2d4b..c817438b14 100644
--- a/crawl-ref/source/feature.cc
+++ b/crawl-ref/source/feature.cc
@@ -579,7 +579,7 @@ void _init_feat(feature_def &f, dungeon_feature_type feat)
f.minimap = MF_FEATURE;
break;
- case DNGN_ALTAR_FEAWN:
+ case DNGN_ALTAR_FEDHAS:
f.colour = GREEN;
f.dchar = DCHAR_ALTAR;
f.flags |= FFT_NOTABLE;
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index b203cc95a0..fa6c766e0e 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -312,11 +312,11 @@ void yred_make_enslaved_soul(monsters *mon, bool force_hostile,
}
}
-// Feawn allows worshipers to walk on top of stationary plants and
+// Fedhas allows worshipers to walk on top of stationary plants and
// fungi.
-bool feawn_passthrough(const monsters * target)
+bool fedhas_passthrough(const monsters * target)
{
- return (target && you.religion == GOD_FEAWN
+ return (target && you.religion == GOD_FEDHAS
&& mons_is_plant(target)
&& mons_is_stationary(target)
&& (target->type != MONS_OKLOB_PLANT
@@ -464,7 +464,7 @@ static int _create_plant(coord_def & target)
0,
target,
MHITNOT,
- MG_FORCE_PLACE, GOD_FEAWN));
+ MG_FORCE_PLACE, GOD_FEDHAS));
if (plant != -1)
@@ -567,7 +567,7 @@ bool sunlight()
target,
MHITNOT,
MG_FORCE_PLACE,
- GOD_FEAWN));
+ GOD_FEDHAS));
if (plant != -1 && observe_cell(target))
plant_count++;
@@ -882,7 +882,7 @@ int rain(const coord_def &target)
0,
*rad,
MHITNOT,
- MG_FORCE_PLACE, GOD_FEAWN));
+ MG_FORCE_PLACE, GOD_FEDHAS));
if (plant != -1)
spawned_count++;
@@ -1112,7 +1112,7 @@ bool evolve_flora()
};
current_plant->upgrade_type(current_target.new_type, true, true);
- current_plant->god = GOD_FEAWN;
+ current_plant->god = GOD_FEDHAS;
current_plant->attitude = ATT_FRIENDLY;
current_plant->flags |= MF_CREATED_FRIENDLY;
current_plant->flags |= MF_ATT_CHANGE_ATTEMPT;
diff --git a/crawl-ref/source/godabil.h b/crawl-ref/source/godabil.h
index a87c62e998..02fbd817bb 100644
--- a/crawl-ref/source/godabil.h
+++ b/crawl-ref/source/godabil.h
@@ -18,7 +18,7 @@ bool jiyva_remove_bad_mutation();
bool beogh_water_walk();
void yred_make_enslaved_soul(monsters *mon, bool force_hostile = false,
bool quiet = false, bool unrestricted = false);
-bool feawn_passthrough(const monsters * target);
+bool fedhas_passthrough(const monsters * target);
int fungal_bloom();
bool sunlight();
bool prioritise_adjacent(const coord_def &target,
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index ab9268ec0f..418a8dfae5 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -433,7 +433,7 @@ conduct_type god_hates_item_handling(const item_def &item)
}
break;
- case GOD_FEAWN:
+ case GOD_FEDHAS:
if (item_type_known(item)
&& (is_potentially_evil_item(item) || is_evil_item(item)))
{
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index 4daa9a3fb2..585b1a059d 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -985,13 +985,13 @@ static bool _jiyva_retribution()
return (true);
}
-static bool _feawn_retribution()
+static bool _fedhas_retribution()
{
- const god_type god = GOD_FEAWN;
+ const god_type god = GOD_FEDHAS;
// We have 3 forms of retribution, but players under penance will be
// spared the 'you are now surrounded by oklob plants, please die' one.
- const int retribution_options = you.religion == GOD_FEAWN ? 2 : 3;
+ const int retribution_options = you.religion == GOD_FEDHAS ? 2 : 3;
switch (random2(retribution_options))
{
@@ -1000,13 +1000,13 @@ static bool _feawn_retribution()
// fall through to the elemental miscast effects.
if (corpse_spores(BEH_HOSTILE))
{
- simple_god_message(" produces spores.", GOD_FEAWN);
+ simple_god_message(" produces spores.", GOD_FEDHAS);
break;
}
case 1:
{
// Elemental miscast effects.
- simple_god_message(" invokes the elements against you.", GOD_FEAWN);
+ simple_god_message(" invokes the elements against you.", GOD_FEDHAS);
spschool_flag_type stype = SPTYP_NONE;
switch (random2(4))
@@ -1025,7 +1025,7 @@ static bool _feawn_retribution()
break;
};
MiscastEffect(&you, -god, stype, 5 + you.experience_level,
- random2avg(88, 3), "the enmity of Feawn");
+ random2avg(88, 3), "the enmity of Fedhas Madash");
break;
}
case 2:
@@ -1042,7 +1042,7 @@ static bool _feawn_retribution()
coord_def(),
MHITNOT,
MG_FORCE_PLACE,
- GOD_FEAWN);
+ GOD_FEDHAS);
// If we have a lot of space to work with (the circle with
// radius 6 is substantially unoccupied), we can do something
@@ -1133,7 +1133,7 @@ bool divine_retribution(god_type god, bool no_bonus)
case GOD_SIF_MUNA: do_more = _sif_muna_retribution(); break;
case GOD_ELYVILON: do_more = _elyvilon_retribution(); break;
case GOD_JIYVA: do_more = _jiyva_retribution(); break;
- case GOD_FEAWN: do_more = _feawn_retribution(); break;
+ case GOD_FEDHAS: do_more = _fedhas_retribution(); break;
case GOD_CHEIBRIADOS: do_more = _cheibriados_retribution(); break;
default:
diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc
index 022c1882ec..4f2b62dbfe 100644
--- a/crawl-ref/source/l_dgngrd.cc
+++ b/crawl-ref/source/l_dgngrd.cc
@@ -57,7 +57,7 @@ const char *dngn_feature_names[] =
"altar_yredelemnul", "altar_xom", "altar_vehumet",
"altar_okawaru", "altar_makhleb", "altar_sif_muna", "altar_trog",
"altar_nemelex_xobeh", "altar_elyvilon", "altar_lugonu",
-"altar_beogh", "altar_jiyva", "altar_feawn", "altar_cheibriados", "", "", "",
+"altar_beogh", "altar_jiyva", "altar_fedhas", "altar_cheibriados", "", "", "",
"fountain_blue", "fountain_sparkling", "fountain_blood",
"dry_fountain_blue", "dry_fountain_sparkling", "dry_fountain_blood",
"permadry_fountain", "abandoned_shop"
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index fc1c802f17..aa52c81d6c 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -213,7 +213,7 @@ static char god_message_altar_colour( god_type god )
case GOD_KIKUBAAQUDGHA:
return (DARKGREY);
- case GOD_FEAWN:
+ case GOD_FEDHAS:
return (coinflip() ? BROWN : GREEN);
case GOD_XOM:
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index f792b48fcd..8566f6a5a9 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -1717,7 +1717,7 @@ void behaviour_event(monsters *mon, mon_event_type event, int src,
{
// Monster types that you can't gain experience from cannot
// fight back, so don't bother having them do so. If you
- // worship Feawn, create a ring of friendly plants, and try
+ // worship Fedhas, create a ring of friendly plants, and try
// to break out of the ring by killing a plant, you'll get
// a warning prompt and penance only once. Without the
// hostility check, the plant will remain friendly until it
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 5b31c7f406..e97e10a416 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1209,7 +1209,7 @@ void pikel_band_neutralise ()
for (int i = 0; i < MAX_MONSTERS; ++i)
{
monsters *monster = &menv[i];
- if (monster->alive() && monster->type == MONS_HUMAN
+ if (monster->alive() && monster->type == MONS_HUMAN
&& testbits(monster->flags, MF_BAND_MEMBER))
{
if (monster->observable() && !message_made)
@@ -1307,7 +1307,7 @@ static int _tentacle_too_far(monsters *head, monsters *tentacle)
// The Shoals produce no disjoint bodies of water.
// If this ever changes, we'd need to check if the head and tentacle
// are still in the same pool.
- // XXX: Actually, using Feawn's Sunlight power you can separate pools...
+ // XXX: Actually, using Fedhas's Sunlight power you can separate pools...
return grid_distance(head->pos(), tentacle->pos()) > LOS_RADIUS;
}
@@ -1642,7 +1642,7 @@ int monster_die(monsters *monster, killer_type killer,
true, monster);
}
- if (feawn_protects(monster))
+ if (fedhas_protects(monster))
{
did_god_conduct(DID_KILL_PLANT, monster->hit_dice,
true, monster);
@@ -1760,7 +1760,7 @@ int monster_die(monsters *monster, killer_type killer,
true, monster);
}
- if (pet_kill && feawn_protects(monster))
+ if (pet_kill && fedhas_protects(monster))
{
did_god_conduct(DID_ALLY_KILLED_PLANT, 1 + (monster->hit_dice / 2),
true, monster);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 6f87186f9c..fe7b7bca31 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -124,7 +124,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
ASSERT(swapping && monster_at(p)
|| !swapping && (!monster_at(p)
|| monster_at(p)->submerged()
- || feawn_passthrough(monster_at(p))));
+ || fedhas_passthrough(monster_at(p))));
// Don't prompt if force is true.
if (!force)
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index a1fdbe1434..6a5b6d3999 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -295,7 +295,7 @@ const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
"turn your foes to slime",
"call upon Jiyva to remove your harmful mutations"
},
- // Feawn
+ // Fedhas
{ "call sunshine",
"cause a ring of plants to grow",
"control the weather",
@@ -402,7 +402,7 @@ const char* god_lose_power_messages[NUM_GODS][MAX_GOD_ABILITIES] =
"turn your foes to slime",
"call upon Jiyva to remove your harmful mutations"
},
- // Feawn
+ // Fedhas
{ "call sunshine",
"cause a ring of plants to grow",
"control the weather",
@@ -523,7 +523,7 @@ std::string get_god_likes(god_type which_god, bool verbose)
likes.push_back("you train your various spell casting skills");
break;
- case GOD_FEAWN:
+ case GOD_FEDHAS:
snprintf(info, INFO_SIZE, "you promote decomposition of nearby corpses%s",
verbose ? " via the <w>a</w> command" : "");
likes.push_back(info);
@@ -802,7 +802,7 @@ std::string get_god_dislikes(god_type which_god, bool /*verbose*/)
dislikes.push_back("you attack your fellow slimes");
break;
- case GOD_FEAWN:
+ case GOD_FEDHAS:
dislikes.push_back("you or your allies destroy plants");
dislikes.push_back("allied flora die");
dislikes.push_back("you use necromancy");
@@ -1454,7 +1454,7 @@ bool is_follower(const monsters* mon)
return (is_orcish_follower(mon));
else if (you.religion == GOD_JIYVA)
return (is_fellow_slime(mon));
- else if (you.religion == GOD_FEAWN)
+ else if (you.religion == GOD_FEDHAS)
return (is_neutral_plant(mon));
else if (you.religion == GOD_ZIN)
return (is_good_lawful_follower(mon));
@@ -2521,7 +2521,7 @@ std::string god_name(god_type which_god, bool long_name)
return (long_name ? god_name_jiyva(true) + " the Shapeless"
: god_name_jiyva(false));
}
- case GOD_FEAWN: return (long_name ? "Feawn the Arboreal" : "Feawn");
+ case GOD_FEDHAS: return (long_name ? "Fedhas Madash" : "Fedhas");
case GOD_CHEIBRIADOS: return (long_name ? "Cheibriados the Contemplative" : "Cheibriados");
case GOD_XOM:
if (!long_name)
@@ -2675,7 +2675,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
break;
case DID_NECROMANCY:
- if (you.religion == GOD_FEAWN)
+ if (you.religion == GOD_FEDHAS)
{
if (known)
{
@@ -2773,7 +2773,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
case DID_KILL_PLANT:
case DID_ALLY_KILLED_PLANT:
// Piety loss but no penance for killing a plant.
- if (you.religion == GOD_FEAWN)
+ if (you.religion == GOD_FEDHAS)
{
retval = true;
piety_change = -level;
@@ -2856,10 +2856,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
break;
// fall through
- case GOD_FEAWN:
+ case GOD_FEDHAS:
// double-check god because of fall-throughs from other gods
// Toadstools are an exception for this conduct
- if (you.religion == GOD_FEAWN && (!feawn_protects(victim)
+ if (you.religion == GOD_FEDHAS && (!fedhas_protects(victim)
|| victim->mons_species() == MONS_TOADSTOOL))
break;
// fall through
@@ -3962,24 +3962,24 @@ void lose_piety(int pgn)
}
}
-// Feawn worshipers are on the hook for most plants and fungi
+// Fedhas worshipers are on the hook for most plants and fungi
//
-// If feawn worshipers kill a protected monster they lose piety,
+// If fedhas worshipers kill a protected monster they lose piety,
// if they attack a friendly one they get penance,
// if a friendly one dies they lose piety.
-bool feawn_protects_species(int mc)
+bool fedhas_protects_species(int mc)
{
return (mons_class_is_plant(mc)
&& mc != MONS_GIANT_SPORE);
}
-bool feawn_protects(const monsters * target)
+bool fedhas_protects(const monsters * target)
{
- return target && feawn_protects_species(target->mons_species());
+ return target && fedhas_protects_species(target->mons_species());
}
-// Feawn neutralises most plants and fungi
-bool feawn_neutralises(const monsters * target)
+// Fedhas neutralises most plants and fungi
+bool fedhas_neutralises(const monsters * target)
{
return (target && mons_is_plant(target));
}
@@ -4178,8 +4178,8 @@ void excommunication(god_type new_god)
_inc_penance(old_god, 30);
break;
- case GOD_FEAWN:
- feawn_plants_hostile();
+ case GOD_FEDHAS:
+ fedhas_plants_hostile();
_inc_penance(old_god, 30);
divine_retribution(old_god);
break;
@@ -4492,8 +4492,8 @@ bool god_hates_attacking_friend(god_type god, int species)
return (mons_genus(species) == MONS_ORC);
case GOD_JIYVA:
return (mons_class_is_slime(species));
- case GOD_FEAWN:
- return feawn_protects_species(species);
+ case GOD_FEDHAS:
+ return fedhas_protects_species(species);
default:
return (false);
}
@@ -4881,8 +4881,8 @@ bool player_can_join_god(god_type which_god)
if (which_god == GOD_BEOGH && you.species != SP_HILL_ORC)
return (false);
- // Feawn hates undead, but will accept demonspawn.
- if (which_god == GOD_FEAWN && you.holiness() == MH_UNDEAD)
+ // Fedhas hates undead, but will accept demonspawn.
+ if (which_god == GOD_FEDHAS && you.holiness() == MH_UNDEAD)
return (false);
return (true);
@@ -4993,9 +4993,9 @@ void god_pitch(god_type which_god)
mpr("You can now call upon Trog to burn spellbooks in your "
"surroundings.", MSGCH_GOD);
}
- else if (you.religion == GOD_FEAWN)
+ else if (you.religion == GOD_FEDHAS)
{
- mpr("You can call upon Feawn to speed up the decay of corpses.",
+ mpr("You can call upon Fedhas to speed up the decay of corpses.",
MSGCH_GOD);
mpr("The plants of the dungeon cease their hostilities.", MSGCH_GOD);
}
@@ -5119,8 +5119,8 @@ bool god_hates_killing(god_type god, const monsters* mon)
break;
}
- if (god == GOD_FEAWN)
- retval = (feawn_protects(mon));
+ if (god == GOD_FEDHAS)
+ retval = (fedhas_protects(mon));
return (retval);
}
@@ -5331,8 +5331,8 @@ void handle_god_time()
lose_piety(1);
break;
- case GOD_FEAWN:
- // Feawn's piety is stable over time but we need a case here to
+ case GOD_FEDHAS:
+ // Fedhas's piety is stable over time but we need a case here to
// avoid the error message below.
break;
@@ -5362,7 +5362,7 @@ int god_colour(god_type god) // mv - added
case GOD_SHINING_ONE:
case GOD_ELYVILON:
case GOD_OKAWARU:
- case GOD_FEAWN:
+ case GOD_FEDHAS:
return (CYAN);
case GOD_YREDELEMNUL:
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 09aad4a6f2..82b1a5f731 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -102,9 +102,9 @@ harm_protection_type god_protects_from_harm(god_type god, bool actual = true);
bool jiyva_is_dead();
bool remove_all_jiyva_altars();
-bool feawn_protects(const monsters * target);
-bool feawn_protects_species(int mc);
-bool feawn_neutralises(const monsters * target);
+bool fedhas_protects(const monsters * target);
+bool fedhas_protects_species(int mc);
+bool fedhas_neutralises(const monsters * target);
bool ely_destroy_weapons();
bool tso_unchivalric_attack_safe_monster(const monsters *mon);
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 7ce45ea637..bd555197b7 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -481,7 +481,7 @@ dngn_altar_lugonu DNGN_ALTAR_LUGONU
dngn_altar_beogh DNGN_ALTAR_BEOGH
dngn_altar_jiyva DNGN_ALTAR_JIYVA
%rim 1
-dngn_altar_feawn DNGN_ALTAR_FEAWN
+dngn_altar_fedhas DNGN_ALTAR_FEDHAS
%rim 0
dngn_altar DNGN_ALTAR_CHEIBRIADOS
diff --git a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_feawn.png b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_fedhas.png
index 9278407d2e..9278407d2e 100644
--- a/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_feawn.png
+++ b/crawl-ref/source/rltiles/dc-dngn/altars/dngn_altar_fedhas.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-unrand.txt b/crawl-ref/source/rltiles/dc-unrand.txt
index 6bb710e9f7..69d9cc4c54 100644
--- a/crawl-ref/source/rltiles/dc-unrand.txt
+++ b/crawl-ref/source/rltiles/dc-unrand.txt
@@ -2,6 +2,13 @@
# util/art-data.pl. Do not directly edit this file, but rather change
# art-data.txt.
+%sdir item/amulet/artefact
+urand_air UNRAND_AIR
+urand_cekugob UNRAND_CEKUGOB
+urand_four_winds UNRAND_FOUR_WINDS
+urand_bloodlust UNRAND_BLOODLUST
+urand_brooch_of_shielding UNRAND_SHIELDING
+
%sdir item/armour/artefact
urand_ignorance UNRAND_IGNORANCE
urand_augmentation UNRAND_AUGMENTATION
@@ -27,6 +34,12 @@ urand_fencer UNRAND_FENCERS_GLOVES
urand_starlight UNRAND_STARLIGHT
urand_ratskin_cloak UNRAND_RATSKIN_CLOAK
+%sdir item/ring/artefact
+urand_shadows UNRAND_SHADOWS
+urand_shaolin UNRAND_SHAOLIN
+urand_robustness UNRAND_ROBUSTNESS
+urand_mage UNRAND_MAGE
+
%sdir item/weapon/artefact
spwpn_singing_sword UNRAND_SINGING_SWORD
spwpn_wrath_of_trog UNRAND_TROG
@@ -74,16 +87,3 @@ urand_serpent_scourge UNRAND_SERPENT_SCOURGE
urand_knife_of_accuracy UNRAND_ACCURACY
%rim 0
-%sdir item/amulet/artefact
-urand_air UNRAND_AIR
-urand_cekugob UNRAND_CEKUGOB
-urand_four_winds UNRAND_FOUR_WINDS
-urand_bloodlust UNRAND_BLOODLUST
-urand_brooch_of_shielding UNRAND_SHIELDING
-
-%sdir item/ring/artefact
-urand_shadows UNRAND_SHADOWS
-urand_shaolin UNRAND_SHAOLIN
-urand_robustness UNRAND_ROBUSTNESS
-urand_mage UNRAND_MAGE
-
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 5c26dcebc8..e0b76d4b87 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2540,8 +2540,8 @@ int tileidx_feature(dungeon_feature_type feat, int gx, int gy)
return TILE_DNGN_ALTAR_BEOGH;
case DNGN_ALTAR_JIYVA:
return TILE_DNGN_ALTAR_JIYVA;
- case DNGN_ALTAR_FEAWN:
- return TILE_DNGN_ALTAR_FEAWN;
+ case DNGN_ALTAR_FEDHAS:
+ return TILE_DNGN_ALTAR_FEDHAS;
case DNGN_ALTAR_CHEIBRIADOS:
return TILE_DNGN_ALTAR_CHEIBRIADOS;
case DNGN_FOUNTAIN_BLUE:
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 32d2241173..a3f69c1507 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -309,7 +309,7 @@ static bool _is_monster_blocked(const coord_def& c)
return (mons
&& mons->visible_to(&you)
&& mons_is_stationary(mons)
- && !feawn_passthrough(mons)
+ && !fedhas_passthrough(mons)
&& mons_was_seen(mons)
&& !mons_is_unknown_mimic(mons));
}
@@ -390,9 +390,9 @@ static bool _is_safe_move(const coord_def& c)
if (const monsters *mon = monster_at(c))
{
// Stop before wasting energy on plants and fungi,
- // unless a worshipping Feawn.
+ // unless a worshipping Fedhas.
if (you.can_see(mon) && mons_class_flag(mon->type, M_NO_EXP_GAIN)
- && !feawn_passthrough(mon))
+ && !fedhas_passthrough(mon))
return (false);
// If this is any *other* monster, it'll be visible and
@@ -3819,7 +3819,7 @@ bool runrest::run_grids_changed() const
return (true);
monsters * mon = monster_at(you.pos() + pos);
- if (mon && !feawn_passthrough(mon))
+ if (mon && !fedhas_passthrough(mon))
return (true);
for (int i = 0; i < 3; i++)
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index b0b78f0ec3..99a7b0cb17 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -425,7 +425,7 @@ void monster_grid(bool do_updates)
good_god_follower_attitude_change(monster);
beogh_follower_convert(monster);
slime_convert(monster);
- feawn_neutralise(monster);
+ fedhas_neutralise(monster);
}
}
}
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index bf33c711f4..98603fc959 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -82,7 +82,7 @@ bool is_feature(int feature, const coord_def& where)
case DNGN_ALTAR_LUGONU:
case DNGN_ALTAR_BEOGH:
case DNGN_ALTAR_JIYVA:
- case DNGN_ALTAR_FEAWN:
+ case DNGN_ALTAR_FEDHAS:
case DNGN_ALTAR_CHEIBRIADOS:
return (true);
default: