summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/docs/tables.txt9
-rw-r--r--crawl-ref/source/item_use.cc2
-rw-r--r--crawl-ref/source/itemprop.cc8
-rw-r--r--crawl-ref/source/items.cc5
-rw-r--r--crawl-ref/source/mutation.cc7
-rw-r--r--crawl-ref/source/newgame.cc3
-rw-r--r--crawl-ref/source/transfor.cc1
7 files changed, 16 insertions, 19 deletions
diff --git a/crawl-ref/docs/tables.txt b/crawl-ref/docs/tables.txt
index d598a1b659..b24bbe5813 100644
--- a/crawl-ref/docs/tables.txt
+++ b/crawl-ref/docs/tables.txt
@@ -26,7 +26,7 @@ T&D - Traps & Doors Pla - Polearms Trl - Translocations
Stv - Staves Trm - Transmigration
Inv - Invocations U C - Unarmed Combat Div - Divination
Evo - Evocations
- Ran - Ranged Combat Fir - Fire Magic
+ Thr - Throwing Fir - Fire Magic
Slg - Slings Ice - Ice Magic
Exp - Experience Bws - Bows Air - Air Magic
Crb - Crossbows Ear - Earth Magic
@@ -67,11 +67,12 @@ Demonspawn 110 110 110 110 110 110 80 110 140
Ghoul 110 110 80 100 110 120 110 130 120
Kenku 90 90 100 80 100 100 160 100 130
Merfolk 160 60 90 70 100 120 100 100 120
+Vampire 140 110 50 100 140 110 140 140 150
---------------------------------------------------------------------
Arm Ddg Sth Stb Shd T&D Inv Evo Exp
- Fgt SBl LBl Axs M&F Pla Stv U C Ran Slg Bws Crb Drt
+ Fgt SBl LBl Axs M&F Pla Stv U C Thr Slg Bws Crb Drt
---------------------------------------------------------------------
Human 100 100 100 100 100 100 100 100 100 100 100 100 100
High Elf 100 70 70 130 150 150 100 130 80 140 60 100 90
@@ -105,8 +106,9 @@ Demonspawn 100 110 110 110 110 110 110 110 110 110 110 110 110
Ghoul 80 110 110 110 110 110 110 80 130 130 130 130 130
Kenku 100 75 75 75 75 75 75 80 90 100 80 80 90
Merfolk 80 70 90 140 150 50 130 90 100 150 140 140 100
+Vampire 110 100 110 110 140 110 140 90 140 140 140 140 140
---------------------------------------------------------------------
- Fgt SBl LBl Axs M&F Pla Stv U C Ran Slg Bws Crb Drt
+ Fgt SBl LBl Axs M&F Pla Stv U C Thr Slg Bws Crb Drt
Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi
@@ -143,5 +145,6 @@ Demonspawn 100 100 110 100 90 110 110 110 100 110 110 110 100
Ghoul 120 130 130 120 100 120 120 120 150 90 150 90 100
Kenku 100 60 160 70 80 150 150 180 90 120 90 120 100
Merfolk 100 140 90 100 150 140 60 80 160 80 150 150 80
+Vampire 130 160 140 100 100 140 120 140 140 140 140 140 140
---------------------------------------------------------------------
Spc Coj Enc Sum Nec Trl Trm Div Fir Ice Air Ear Poi
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 69f8862bde..7e482656e4 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1999,7 +1999,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// CALCULATIONS FOR THROWN WEAPONS
if (projected == LRET_THROWN)
{
- returning = (get_weapon_brand(item) == SPWPN_RETURNING &&
+ returning = (get_weapon_brand(item) == SPWPN_RETURNING && !teleport &&
!one_chance_in(1 + skill_bump(SK_THROWING)));
baseHit = 0;
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index dfd8fde379..178f26c778 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1135,14 +1135,6 @@ bool check_armour_shape( const item_def &item, bool quiet )
return (false);
}
-
- if (you.mutation[MUT_HOOVES])
- {
- if (!quiet)
- mpr( "You can't wear boots with hooves!" );
-
- return (false);
- }
break;
}
break;
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index ddcb527f8e..d4807bbd0f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1332,10 +1332,11 @@ bool items_stack( const item_def &item1, const item_def &item2,
return false;
// Check the non-ID flags, but ignore dropped, thrown, cosmetic,
- // and note flags
+ // and note flags. Also, whether item was in inventory before.
#define NON_IDENT_FLAGS ~(ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | \
ISFLAG_DROPPED | ISFLAG_THROWN | \
- ISFLAG_NOTED_ID | ISFLAG_NOTED_GET)
+ ISFLAG_NOTED_ID | ISFLAG_NOTED_GET | \
+ ISFLAG_BEEN_IN_INV)
if ((item1.flags & NON_IDENT_FLAGS) !=
(item2.flags & NON_IDENT_FLAGS))
{
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index f35591372e..82cd64ec9d 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -538,6 +538,7 @@ const char *gain_mutation[][3] = {
// saprovorous: can never be gained or lost, only started with
{"", "", ""},
+
{"", "", ""},
{"", "", ""},
@@ -747,10 +748,7 @@ const char *lose_mutation[][3] = {
{"", "", ""},
{"", "", ""},
-
- // saprovorous: can never be gained or lost, only started with
{"", "", ""},
-
{"", "", ""},
// 65
@@ -758,7 +756,10 @@ const char *lose_mutation[][3] = {
{"Your movements feel completely certain again.",
"Your movements feel more certain.",
"Your movements feel more certain."},
+
+ // saprovorous: can never be gained or lost, only started with
{"", "", ""},
+
{"", "", ""},
{"", "", ""},
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index eaeaa5c576..4de80c5991 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -882,6 +882,7 @@ game_start:
{
if (is_valid_item(you.inv[i]))
{
+ // Why is this here? Elsewhere it's only ever used for runes
you.inv[i].flags |= ISFLAG_BEEN_IN_INV;
// identify all items in pack
@@ -2367,7 +2368,7 @@ static void give_random_potion( int slot )
you.inv[ slot ].plus2 = 0;
int temp_rand = 8;
- if (you.is_undead)
+ if (you.is_undead) // no Berserk for undeads
temp_rand--;
switch (random2(temp_rand))
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 54cf96f70d..913f395bbf 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -610,7 +610,6 @@ bool can_equip( equipment_type use_which, bool ignore_temporary )
switch (you.species)
{
case SP_NAGA:
- case SP_CENTAUR:
case SP_KENKU:
return (false);
default:
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-05 12:22:07 +0000