0000002 Bumps up a bunch of Bearkin apts, mostly to make the armour apt less comical and improve bear wizards.
0001-Deform-Bearkin-s-body-as-originally-intended.patch [^] (716 bytes) 2015-01-18 21:27 [Show Content] [Hide Content]From b20a38f550e6fba24d3ea779a1f9f9821ed98f4c Mon Sep 17 00:00:00 2001
From: Kvaak <vihastutit@kvaak.in>
Date: Sun, 18 Jan 2015 21:09:22 +0200
Subject: [PATCH] Deform Bearkin's body as originally intended.
---
crawl-ref/source/ng-setup.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index f1dd23e..302a854 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -326,6 +326,7 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_HIND_CLAWS] = 1;
you.mutation[MUT_SHAGGY_FUR] = 1;
you.mutation[MUT_BEARSERK] = 1;
+ you.mutation[MUT_DEFORMED] = 1;
break;
default:
break;
--
2.1.0
0001-Bump-Bearkin-apts-up-slightly.patch [^] (2,792 bytes) 2015-01-18 21:28 [Show Content] [Hide Content]From b2294fabd96c0969603ff906365131cea2f6b447 Mon Sep 17 00:00:00 2001
From: Kvaak <vihastutit@kvaak.in>
Date: Sun, 18 Jan 2015 22:21:55 +0200
Subject: [PATCH] Bump Bearkin apts up slightly.
---
crawl-ref/source/aptitudes.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index 2b28a94..ffa42b9 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -1490,35 +1490,35 @@ static const species_skill_aptitude species_skill_aptitudes[] =
APT(SP_BEARKIN, SK_SHORT_BLADES, -3),
APT(SP_BEARKIN, SK_LONG_BLADES, -2),
APT(SP_BEARKIN, SK_AXES, -1),
- APT(SP_BEARKIN, SK_MACES_FLAILS, 0),
+ APT(SP_BEARKIN, SK_MACES_FLAILS, 1),
APT(SP_BEARKIN, SK_POLEARMS, -2),
APT(SP_BEARKIN, SK_STAVES, 0),
APT(SP_BEARKIN, SK_SLINGS, -3),
APT(SP_BEARKIN, SK_BOWS, -2),
APT(SP_BEARKIN, SK_CROSSBOWS, -2),
APT(SP_BEARKIN, SK_THROWING, -1),
- APT(SP_BEARKIN, SK_ARMOUR, -4),
+ APT(SP_BEARKIN, SK_ARMOUR, -3),
APT(SP_BEARKIN, SK_DODGING, -2),
APT(SP_BEARKIN, SK_STEALTH, -1),
#if TAG_MAJOR_VERSION == 34
APT(SP_BEARKIN, SK_STABBING, -99),
#endif
- APT(SP_BEARKIN, SK_SHIELDS, -3),
+ APT(SP_BEARKIN, SK_SHIELDS, -2),
#if TAG_MAJOR_VERSION == 34
APT(SP_BEARKIN, SK_TRAPS, -99),
#endif
APT(SP_BEARKIN, SK_UNARMED_COMBAT, 0),
APT(SP_BEARKIN, SK_SPELLCASTING, -1),
- APT(SP_BEARKIN, SK_CONJURATIONS, -2),
+ APT(SP_BEARKIN, SK_CONJURATIONS, -1),
APT(SP_BEARKIN, SK_HEXES, -2),
- APT(SP_BEARKIN, SK_CHARMS, -1),
+ APT(SP_BEARKIN, SK_CHARMS, 0),
APT(SP_BEARKIN, SK_SUMMONINGS, 0),
- APT(SP_BEARKIN, SK_NECROMANCY, -3),
- APT(SP_BEARKIN, SK_TRANSLOCATIONS, 2),
+ APT(SP_BEARKIN, SK_NECROMANCY, -2),
+ APT(SP_BEARKIN, SK_TRANSLOCATIONS, -2),
APT(SP_BEARKIN, SK_TRANSMUTATIONS, 0),
- APT(SP_BEARKIN, SK_FIRE_MAGIC, -3),
+ APT(SP_BEARKIN, SK_FIRE_MAGIC, -2),
APT(SP_BEARKIN, SK_ICE_MAGIC, 1),
- APT(SP_BEARKIN, SK_AIR_MAGIC, -2),
+ APT(SP_BEARKIN, SK_AIR_MAGIC, -1),
APT(SP_BEARKIN, SK_EARTH_MAGIC, 0),
APT(SP_BEARKIN, SK_POISON_MAGIC, 0),
APT(SP_BEARKIN, SK_INVOCATIONS, -1),
--
2.1.0
0001-Clean-up-lower-stat-gain-to-sane-levels.patch [^] (2,267 bytes) 2015-01-18 22:47 [Show Content] [Hide Content]From 0034af7a4a7f6bdf94b698bbe3eba1c2e5655531 Mon Sep 17 00:00:00 2001
From: Kvaak <vihastutit@kvaak.in>
Date: Sun, 18 Jan 2015 23:46:15 +0200
Subject: [PATCH] Clean up + lower stat gain to sane levels.
---
crawl-ref/source/ng-setup.cc | 2 +-
crawl-ref/source/player.cc | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 302a854..51a3ee1 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -76,7 +76,7 @@ static void _species_stat_init(species_type which_species)
case SP_TENGU: s = 8; i = 8; d = 9; break; // 25
case SP_FORMICID: s = 12; i = 7; d = 6; break; // 25
case SP_VINE_STALKER: s = 10; i = 8; d = 9; break; // 27
- case SP_BEARKIN: s = 11; i = 7; d = 6; break; // 24
+ case SP_BEARKIN: s = 11; i = 7; d = 6; break; // 24
case SP_KOBOLD: s = 6; i = 6; d = 11; break; // 23
case SP_HALFLING: s = 8; i = 7; d = 9; break; // 24
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8ca665c..763fa12 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3389,14 +3389,14 @@ void level_change(bool skip_attribute_increase)
break;
case SP_BEARKIN:
- if (!(you.experience_level % 5) && !skip_attribute_increase)
+ if (!(you.experience_level % 3) && !skip_attribute_increase)
{
modify_stat((coinflip() ? STAT_STR
: STAT_INT), 1, false,
"level gain");
}
- if (!(you.experience_level % 4) && !skip_attribute_increase)
- modify_stat(STAT_STR, 1, false, "bearkin transformation");
+ if (!(you.experience_level == 14) && !skip_attribute_increase)
+ modify_stat(STAT_STR, 2, false, "bearkin transformation");
if (you.experience_level == 6)
perma_mutate(MUT_SHAGGY_FUR, 1, "bearkin transformation");
@@ -3415,8 +3415,6 @@ void level_change(bool skip_attribute_increase)
else perma_mutate(MUT_FANGS, 1, "bearkin transformation");
}
- // TODO: turn large at XL14, remember to allow GSCs.
- // Give low hp berserk ability at XL1.
break;
--
2.1.0
0001-Make-Bearkin-bearsome-from-the-start.patch [^] (17,260 bytes) 2015-01-19 20:10 [Show Content] [Hide Content]From 3c82e52a315ec2104c68b7be22f7a855f664784b Mon Sep 17 00:00:00 2001
From: Kvaak <vihastutit@kvaak.in>
Date: Mon, 19 Jan 2015 21:08:34 +0200
Subject: [PATCH] Make Bearkin bearsome from the start.
Old implementation didn't really work out, bears started with too little
and ended up with too much. It's hard to spread out meaningful mutations
over 27 experience levels and the size change in particular was just too
drastic.
Instead they now get level 2 on all their hurty stuff from the start along
with level 3 fur and +3 HP. Apts were also bumped up to make them more
battlemage-esque instead of the weird "you have DID and one of your
personalities is a wild bear" concept.
In return they now get large races' armour slots and a -2 exp apt. Ogres
and trolls have never been good at more than a handful of things and
they're still better at those things than bears.
---
crawl-ref/source/ability.cc | 14 ---------
crawl-ref/source/aptitudes.h | 28 +++++++++---------
crawl-ref/source/dat/descript/species.txt | 4 +--
crawl-ref/source/duration-data.h | 2 --
crawl-ref/source/enum.h | 5 ----
crawl-ref/source/mutation-data.h | 10 -------
crawl-ref/source/ng-setup.cc | 8 +++---
crawl-ref/source/player-act.cc | 2 --
crawl-ref/source/player-reacts.cc | 14 +--------
crawl-ref/source/player.cc | 48 +++++++++----------------------
crawl-ref/source/religion.cc | 3 --
crawl-ref/source/species.cc | 8 ++++--
crawl-ref/source/status.cc | 8 ------
13 files changed, 39 insertions(+), 115 deletions(-)
diff --git a/crawl-ref/source/ability.cc b/crawl-ref/source/ability.cc
index 002934b..06aab62 100644
--- a/crawl-ref/source/ability.cc
+++ b/crawl-ref/source/ability.cc
@@ -241,8 +241,6 @@ static const ability_def Ability_List[] =
{ ABIL_DIG, "Dig", 0, 0, 0, 0, 0, ABFLAG_INSTANT},
{ ABIL_SHAFT_SELF, "Shaft Self", 0, 0, 250, 0, 0, ABFLAG_DELAY},
- { ABIL_BEARSERK, "Cornered Berserk", 0, 0, 0, 0, 0, ABFLAG_NONE},
-
// EVOKE abilities use Evocations and come from items.
// Teleportation and Blink can also come from mutations
// so we have to distinguish them (see above). The off items
@@ -1096,10 +1094,6 @@ talent get_talent(ability_type ability, bool check_confused)
failure = 0;
break;
- case ABIL_BEARSERK:
- failure = 0;
- break;
-
// end species abilities (some mutagenic)
// begin demonic powers {dlb}
@@ -2164,11 +2158,6 @@ static spret_type _do_ability(const ability_def& abil, bool fail)
return SPRET_ABORT;
break;
- case ABIL_BEARSERK:
- fail_check();
- you.go_berserk(true);
- break;
-
case ABIL_DELAYED_FIREBALL:
{
fail_check();
@@ -3584,9 +3573,6 @@ vector<talent> your_talents(bool check_confused, bool include_unusable)
}
}
- if (player_mutation_level(MUT_BEARSERK) && you.hp * 100 / you.hp_max <= 30)
- _add_talent(talents, ABIL_BEARSERK, check_confused);
-
// Spit Poison. Nagas can upgrade to Breathe Poison.
if (you.species == SP_NAGA)
{
diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index ffa42b9..3fb6c74 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -1487,19 +1487,19 @@ static const species_skill_aptitude species_skill_aptitudes[] =
// SP_BEARKIN
APT(SP_BEARKIN, SK_FIGHTING, 0),
- APT(SP_BEARKIN, SK_SHORT_BLADES, -3),
- APT(SP_BEARKIN, SK_LONG_BLADES, -2),
- APT(SP_BEARKIN, SK_AXES, -1),
+ APT(SP_BEARKIN, SK_SHORT_BLADES, -1),
+ APT(SP_BEARKIN, SK_LONG_BLADES, 1),
+ APT(SP_BEARKIN, SK_AXES, 1),
APT(SP_BEARKIN, SK_MACES_FLAILS, 1),
- APT(SP_BEARKIN, SK_POLEARMS, -2),
+ APT(SP_BEARKIN, SK_POLEARMS, 1),
APT(SP_BEARKIN, SK_STAVES, 0),
- APT(SP_BEARKIN, SK_SLINGS, -3),
+ APT(SP_BEARKIN, SK_SLINGS, -2),
APT(SP_BEARKIN, SK_BOWS, -2),
APT(SP_BEARKIN, SK_CROSSBOWS, -2),
APT(SP_BEARKIN, SK_THROWING, -1),
APT(SP_BEARKIN, SK_ARMOUR, -3),
APT(SP_BEARKIN, SK_DODGING, -2),
- APT(SP_BEARKIN, SK_STEALTH, -1),
+ APT(SP_BEARKIN, SK_STEALTH, 0),
#if TAG_MAJOR_VERSION == 34
APT(SP_BEARKIN, SK_STABBING, -99),
#endif
@@ -1508,21 +1508,21 @@ static const species_skill_aptitude species_skill_aptitudes[] =
APT(SP_BEARKIN, SK_TRAPS, -99),
#endif
APT(SP_BEARKIN, SK_UNARMED_COMBAT, 0),
- APT(SP_BEARKIN, SK_SPELLCASTING, -1),
- APT(SP_BEARKIN, SK_CONJURATIONS, -1),
- APT(SP_BEARKIN, SK_HEXES, -2),
+ APT(SP_BEARKIN, SK_SPELLCASTING, 0),
+ APT(SP_BEARKIN, SK_CONJURATIONS, 0),
+ APT(SP_BEARKIN, SK_HEXES, -1),
APT(SP_BEARKIN, SK_CHARMS, 0),
- APT(SP_BEARKIN, SK_SUMMONINGS, 0),
+ APT(SP_BEARKIN, SK_SUMMONINGS, 1),
APT(SP_BEARKIN, SK_NECROMANCY, -2),
- APT(SP_BEARKIN, SK_TRANSLOCATIONS, -2),
+ APT(SP_BEARKIN, SK_TRANSLOCATIONS, -1),
APT(SP_BEARKIN, SK_TRANSMUTATIONS, 0),
- APT(SP_BEARKIN, SK_FIRE_MAGIC, -2),
+ APT(SP_BEARKIN, SK_FIRE_MAGIC, -1),
APT(SP_BEARKIN, SK_ICE_MAGIC, 1),
APT(SP_BEARKIN, SK_AIR_MAGIC, -1),
- APT(SP_BEARKIN, SK_EARTH_MAGIC, 0),
+ APT(SP_BEARKIN, SK_EARTH_MAGIC, 1),
APT(SP_BEARKIN, SK_POISON_MAGIC, 0),
APT(SP_BEARKIN, SK_INVOCATIONS, -1),
- APT(SP_BEARKIN, SK_EVOCATIONS, -1),
+ APT(SP_BEARKIN, SK_EVOCATIONS, 0),
};
diff --git a/crawl-ref/source/dat/descript/species.txt b/crawl-ref/source/dat/descript/species.txt
index 3bd2b6b..d02c7a8 100644
--- a/crawl-ref/source/dat/descript/species.txt
+++ b/crawl-ref/source/dat/descript/species.txt
@@ -1,9 +1,7 @@
%%%%
Bearkin
-Humanoids cursed to turn into mindless animals, Bearkin slowly gain
-unparalleled strength and fortitude.
-
+Bearkin level slower than most due their innate might and intelligence.
%%%%
Centaur
diff --git a/crawl-ref/source/duration-data.h b/crawl-ref/source/duration-data.h
index 407ca5e..f727ad8 100644
--- a/crawl-ref/source/duration-data.h
+++ b/crawl-ref/source/duration-data.h
@@ -372,8 +372,6 @@ static const duration_def duration_data[] =
"You are cleaving through your foes.", D_DISPELLABLE },
{ DUR_AMBROSIA, GREEN, "Ambros", "", "ambrosia",
"You are regenerating under the effects of ambrosia.", D_DISPELLABLE },
- { DUR_CORNERED, YELLOW, "Cornrd", "", "cornered",
- "You feel cornered and can go berserk.", D_NO_FLAGS },
// The following are visible in wizmode only, or are handled
// specially in the status lights and/or the % or @ screens.
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 6d03d31..dc14b4d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -180,9 +180,6 @@ enum ability_type
// Formicids
ABIL_DIG,
ABIL_SHAFT_SELF,
- // Bearkin
- ABIL_BEARSERK,
- ABIL_MAX_INTRINSIC = ABIL_BEARSERK,
// Evoking items.
ABIL_EVOKE_BERSERK = 40,
@@ -1827,7 +1824,6 @@ enum duration_type
DUR_NO_SCROLLS,
DUR_NEGATIVE_VULN,
DUR_CLEAVE,
- DUR_CORNERED,
NUM_DURATIONS
};
@@ -3571,7 +3567,6 @@ enum mutation_type
MUT_ANTIMAGIC_BITE,
MUT_NO_DEVICE_HEAL,
MUT_HIND_CLAWS,
- MUT_BEARSERK,
#if TAG_MAJOR_VERSION == 34
MUT_COLD_VULNERABILITY,
MUT_HEAT_VULNERABILITY,
diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h
index 88ef38d..ea872df 100644
--- a/crawl-ref/source/mutation-data.h
+++ b/crawl-ref/source/mutation-data.h
@@ -903,16 +903,6 @@ static const mutation_def mut_data[] =
"hind claws",
},
-{ MUT_BEARSERK, 0, 1, MUTFLAG_GOOD, true,
- "cornered berserk",
-
- {"You can berserk when greatly wounded.", "", ""},
- {"You can now berserk when greatly wounded.", "", ""},
- {"You can no longer berserk when greatly wounded.","",""},
-
- "cornered berserk",
-},
-
// Naga only
{ MUT_BREATHE_POISON, 4, 1, MUTFLAG_GOOD, false,
"breathe poison",
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 51a3ee1..16d2719 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -76,7 +76,7 @@ static void _species_stat_init(species_type which_species)
case SP_TENGU: s = 8; i = 8; d = 9; break; // 25
case SP_FORMICID: s = 12; i = 7; d = 6; break; // 25
case SP_VINE_STALKER: s = 10; i = 8; d = 9; break; // 27
- case SP_BEARKIN: s = 11; i = 7; d = 6; break; // 24
+ case SP_BEARKIN: s = 12; i = 8; d = 6; break; // 26
case SP_KOBOLD: s = 6; i = 6; d = 11; break; // 23
case SP_HALFLING: s = 8; i = 7; d = 9; break; // 24
@@ -323,10 +323,10 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_ROT_IMMUNITY] = 1;
break;
case SP_BEARKIN:
- you.mutation[MUT_HIND_CLAWS] = 1;
- you.mutation[MUT_SHAGGY_FUR] = 1;
- you.mutation[MUT_BEARSERK] = 1;
+ you.mutation[MUT_HIND_CLAWS] = 2;
+ you.mutation[MUT_SHAGGY_FUR] = 3;
you.mutation[MUT_DEFORMED] = 1;
+ you.mutation[MUT_FANGS] = 2;
break;
default:
break;
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index ea0e177..b9d960c 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -191,8 +191,6 @@ bool player::is_habitable_feat(dungeon_feature_type actual_grid) const
size_type player::body_size(size_part_type psize, bool base) const
{
- if (species == SP_BEARKIN)
- return (experience_level < 14) ? SIZE_MEDIUM : SIZE_LARGE;
if (base)
return species_size(species, psize);
else
diff --git a/crawl-ref/source/player-reacts.cc b/crawl-ref/source/player-reacts.cc
index dcdd34c..023e071 100644
--- a/crawl-ref/source/player-reacts.cc
+++ b/crawl-ref/source/player-reacts.cc
@@ -389,17 +389,6 @@ static void _update_cowardice()
}
/**
- * Update whether a player with the MUT_BEARSERK is cornered or not
- */
-static void _update_cornered()
-{
- if (player_mutation_level(MUT_BEARSERK) && you.hp * 100 / you.hp_max <= 30)
- you.set_duration(DUR_CORNERED, 1);
- else
- you.set_duration(DUR_CORNERED, 0);
-}
-
-/**
* Player reactions after monster and cloud activities in the turn are finished.
*/
void player_reacts_to_monsters()
@@ -428,8 +417,7 @@ void player_reacts_to_monsters()
if (_decrement_a_duration(DUR_SLEEP, you.time_taken))
you.awake();
_maybe_melt_armour();
- _update_cowardice();
- _update_cornered();
+ _update_cowardice();;
}
static bool _check_recite()
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 763fa12..84a469d 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -724,7 +724,8 @@ bool you_can_wear(int eq, bool special_armour)
|| you.species == SP_OGRE
|| you.species == SP_SPRIGGAN
|| you.species == SP_FELID
- || you.species == SP_OCTOPODE)
+ || you.species == SP_OCTOPODE
+ || you.species == SP_BEARKIN)
{
return false;
}
@@ -747,7 +748,8 @@ bool you_can_wear(int eq, bool special_armour)
#endif
|| you.species == SP_OGRE
|| you.species == SP_FELID
- || you.species == SP_OCTOPODE)
+ || you.species == SP_OCTOPODE
+ || you.species == SP_BEARKIN)
{
return false;
}
@@ -771,7 +773,8 @@ bool you_can_wear(int eq, bool special_armour)
/// big & tiny races can only wear some shield types.
if (you.species == SP_TROLL
|| you.species == SP_SPRIGGAN
- || you.species == SP_OGRE)
+ || you.species == SP_OGRE
+ || you.species == SP_BEARKIN)
{
return special_armour;
}
@@ -806,7 +809,8 @@ bool you_can_wear(int eq, bool special_armour)
|| you.species == SP_SPRIGGAN
|| you.species == SP_OGRE
|| you.species == SP_OCTOPODE
- || player_genus(GENPC_DRACONIAN))
+ || player_genus(GENPC_DRACONIAN)
+ || you.species == SP_BEARKIN)
{
return false;
}
@@ -3395,28 +3399,6 @@ void level_change(bool skip_attribute_increase)
: STAT_INT), 1, false,
"level gain");
}
- if (!(you.experience_level == 14) && !skip_attribute_increase)
- modify_stat(STAT_STR, 2, false, "bearkin transformation");
-
- if (you.experience_level == 6)
- perma_mutate(MUT_SHAGGY_FUR, 1, "bearkin transformation");
-
- if (you.experience_level == 12)
- perma_mutate(MUT_SHAGGY_FUR, 1, "bearkin transformation");
-
- if (!(you.experience_level % 9))
- perma_mutate(MUT_ROBUST, 1, "bearkin transformation");
-
- if (!(you.experience_level % 4))
- { if (one_chance_in(3) && player_mutation_level(MUT_CLAWS) == 1)
- perma_mutate(MUT_CLAWS, 1, "bearkin transformation");
- else if (one_chance_in(2) && player_mutation_level(MUT_HIND_CLAWS) < 3)
- perma_mutate(MUT_HIND_CLAWS, 1, "bearkin transformation");
- else perma_mutate(MUT_FANGS, 1, "bearkin transformation");
- }
-
- break;
-
default:
break;
@@ -7966,18 +7948,15 @@ bool player::cannot_act() const
return asleep() || cannot_move();
}
-bool player::can_throw_large_rocks() const
-{
- if (species == SP_BEARKIN && experience_level >= 14)
- return true;
- return species_can_throw_large_rocks(species);
-}
-
bool player::can_smell() const
{
return species != SP_MUMMY;
}
+ bool player::can_throw_large_rocks() const
+{
+ return species_can_throw_large_rocks(species);
+}
/**
* Attempts to put the player to sleep.
*
@@ -7996,7 +7975,8 @@ void player::put_to_sleep(actor*, int power, bool hibernate)
canned_msg(MSG_YOU_UNAFFECTED);
return;
}
-
+
+
if (duration[DUR_SLEEP_IMMUNITY])
{
mpr("You can't fall asleep again this soon!");
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 9e7d6c3..5b72248 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3252,9 +3252,6 @@ bool player_can_join_god(god_type which_god)
if (is_good_god(which_god) && you.undead_or_demonic())
return false;
- if (which_god == GOD_ZIN && you.species == SP_BEARKIN)
- return false;
-
if (which_god == GOD_YREDELEMNUL && you.is_artificial())
return false;
diff --git a/crawl-ref/source/species.cc b/crawl-ref/source/species.cc
index ddb5bb5..1d92d75 100644
--- a/crawl-ref/source/species.cc
+++ b/crawl-ref/source/species.cc
@@ -272,7 +272,7 @@ int species_has_claws(species_type species, bool mut_level)
return 1;
if (species == SP_BEARKIN)
- return 1;
+ return 2;
return 0;
}
@@ -380,6 +380,7 @@ size_type species_size(species_type species, size_part_type psize)
{
case SP_OGRE:
case SP_TROLL:
+ case SP_BEARKIN:
return SIZE_LARGE;
case SP_NAGA:
case SP_CENTAUR:
@@ -401,7 +402,6 @@ monster_type player_species_to_mons_species(species_type species)
switch (species)
{
case SP_HUMAN:
- case SP_BEARKIN: // eventually fix this
return MONS_HUMAN;
case SP_HIGH_ELF:
case SP_DEEP_ELF:
@@ -426,6 +426,7 @@ monster_type player_species_to_mons_species(species_type species)
case SP_OGRE:
return MONS_OGRE;
case SP_TROLL:
+ case SP_BEARKIN: // eventually fix this
return MONS_TROLL;
case SP_RED_DRACONIAN:
return MONS_RED_DRACONIAN;
@@ -592,10 +593,10 @@ int species_exp_modifier(species_type species)
#if TAG_MAJOR_VERSION == 34
case SP_DJINNI:
case SP_LAVA_ORC:
- case SP_BEARKIN:
return -1;
#endif
case SP_DEMIGOD:
+ case SP_BEARKIN:
return -2;
default:
return 0;
@@ -650,6 +651,7 @@ int species_hp_modifier(species_type species)
return 2;
case SP_OGRE:
case SP_TROLL:
+ case SP_BEARKIN:
return 3;
}
}
diff --git a/crawl-ref/source/status.cc b/crawl-ref/source/status.cc
index 862e68f..3f5436b 100644
--- a/crawl-ref/source/status.cc
+++ b/crawl-ref/source/status.cc
@@ -628,14 +628,6 @@ bool fill_status_info(int status, status_info* inf)
break;
}
- case DUR_CORNERED:
- if (you.hp * 100 / you.hp_max <= 30 )
- {
- inf->light_colour = YELLOW;
- inf->light_text = "Cornrd";
- }
- break;
-
default:
if (!found)
{
--
2.1.0
0001-Make-bears-less-insane-at-XL1.patch [^] (2,480 bytes) 2015-01-19 22:02 [Show Content] [Hide Content]From 6561aad8dc682b5348425d62f286fcb40d8e2ebd Mon Sep 17 00:00:00 2001
From: Kvaak <vihastutit@kvaak.in>
Date: Mon, 19 Jan 2015 22:58:17 +0200
Subject: [PATCH] Make bears less insane at XL1.
Drop the aux muts completely and lower the claws to level 1. Now that
bears have decent apts and +3 HP they can afford to get the muts over time.
Now all three go up to level 3 with aux attacks being prioritized as claws
are of little use to non-UC bears.
---
crawl-ref/source/ng-setup.cc | 2 --
crawl-ref/source/player.cc | 16 ++++++++++++++++
crawl-ref/source/species.cc | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 16d2719..3fd116c 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -323,10 +323,8 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_ROT_IMMUNITY] = 1;
break;
case SP_BEARKIN:
- you.mutation[MUT_HIND_CLAWS] = 2;
you.mutation[MUT_SHAGGY_FUR] = 3;
you.mutation[MUT_DEFORMED] = 1;
- you.mutation[MUT_FANGS] = 2;
break;
default:
break;
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 84a469d..2201757 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3399,6 +3399,22 @@ void level_change(bool skip_attribute_increase)
: STAT_INT), 1, false,
"level gain");
}
+ if (!(you.experience_level % 3))
+ {
+ if (one_chance_in(2))
+ {
+ if (player_mutation_level(MUT_HIND_CLAWS) < 3)
+ perma_mutate(MUT_HIND_CLAWS, 1, "bearkin growth");
+ else if(player_mutation_level(MUT_FANGS) < 3)
+ perma_mutate(MUT_FANGS, 1, "bearkin growth");
+ else if(player_mutation_level(MUT_CLAWS) < 3)
+ perma_mutate(MUT_CLAWS, 1, "bearkin growth");
+ }
+ else if (player_mutation_level(MUT_FANGS) < 3)
+ perma_mutate(MUT_FANGS, 1, "bearkin growth");
+ else if (player_mutation_level(MUT_CLAWS) < 3)
+ perma_mutate(MUT_CLAWS, 1, "bearkin growth");
+ }
default:
break;
diff --git a/crawl-ref/source/species.cc b/crawl-ref/source/species.cc
index 1d92d75..7ab62b5 100644
--- a/crawl-ref/source/species.cc
+++ b/crawl-ref/source/species.cc
@@ -272,7 +272,7 @@ int species_has_claws(species_type species, bool mut_level)
return 1;
if (species == SP_BEARKIN)
- return 2;
+ return 1;
return 0;
}
--
2.1.0
