summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/effects.cc6
-rw-r--r--crawl-ref/source/enum.h4
-rw-r--r--crawl-ref/source/item_use.cc23
-rw-r--r--crawl-ref/source/itemprop.cc4
-rw-r--r--crawl-ref/source/makeitem.cc2
-rw-r--r--crawl-ref/source/newgame.cc16
-rw-r--r--crawl-ref/source/religion.cc2
-rw-r--r--crawl-ref/source/skills.cc2
-rw-r--r--crawl-ref/source/skills2.cc66
-rw-r--r--crawl-ref/source/tutorial.cc3
10 files changed, 63 insertions, 65 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 802653a456..f43c3843ed 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1381,7 +1381,7 @@ static int _acquirement_weapon_subtype()
int count = 0;
int skill = SK_FIGHTING;
- for (int i = SK_SHORT_BLADES; i <= SK_DARTS; i++)
+ for (int i = SK_SHORT_BLADES; i <= SK_CROSSBOWS; i++)
{
if (is_invalid_skill(i))
continue;
@@ -1452,7 +1452,7 @@ static missile_type _acquirement_missile_subtype()
int count = 0;
int skill = SK_THROWING;
- for (int i = SK_SLINGS; i <= SK_DARTS; i++)
+ for (int i = SK_SLINGS; i <= SK_THROWING; i++)
{
if (you.skills[i])
{
@@ -1478,7 +1478,7 @@ static missile_type _acquirement_missile_subtype()
: MI_DART);
break;
- case SK_DARTS:
+ case SK_THROWING:
// Assuming that blowgun in inventory means that they
// may want needles for it (but darts might also be
// wanted). Maybe expand this... see above comment.
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index eed1964627..7dfc0255a7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2625,8 +2625,8 @@ enum skill_type
SK_SLINGS,
SK_BOWS,
SK_CROSSBOWS,
- SK_DARTS,
- SK_THROWING,
+ // was darts, now unused
+ SK_THROWING = 11,
SK_ARMOUR,
SK_DODGING,
SK_STEALTH,
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index b5e4a27897..b755aa296e 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1691,7 +1691,7 @@ static int _item_to_skill_level(const item_def *item)
{
skill_type type = range_skill(*item);
- if (type == SK_DARTS || type == SK_SLINGS)
+ if (type == SK_SLINGS)
return (you.skills[type] + you.skills[SK_THROWING]);
return (2 * you.skills[type]);
@@ -2695,9 +2695,9 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// Blowguns take a _very_ steady hand; a lot of the bonus
// comes from dexterity. (Dex bonus here as well as below.)
- case SK_DARTS:
+ case SK_THROWING:
baseHit -= 2;
- exercise(SK_DARTS, (coinflip()? 2 : 1));
+ exercise(SK_THROWING, (coinflip()? 2 : 1));
exHitBonus += (effSkill * 3) / 2 + you.dex / 2;
// No extra damage for blowguns.
@@ -2748,7 +2748,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
}
// Slings and Darts train Throwing a bit.
- if (launcher_skill == SK_SLINGS || launcher_skill == SK_DARTS)
+ if (launcher_skill == SK_SLINGS)
{
if (coinflip())
exercise(SK_THROWING, 1);
@@ -2816,7 +2816,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
did_return = true;
break;
case WPN_BLOWGUN:
- if (returning && !one_chance_in(1 + skill_bump(SK_DARTS)))
+ if (returning && !one_chance_in(1 + skill_bump(SK_THROWING)))
did_return = true;
break;
default:
@@ -2922,13 +2922,12 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
break;
case MI_DART:
- exHitBonus = you.skills[SK_DARTS] * 2;
- exHitBonus += (you.skills[SK_THROWING] * 2) / 3;
- exDamBonus = you.skills[SK_DARTS] / 3;
- exDamBonus += you.skills[SK_THROWING] / 5;
+ // Darts also using throwing skills, now.
+ exHitBonus += skill_bump(SK_THROWING);
+ exDamBonus += you.skills[SK_THROWING] * 3 / 5;
// exercise skills
- exercise(SK_DARTS, 1 + random2avg(3, 2));
+ exercise(SK_THROWING, 1 + random2avg(3, 2));
break;
case MI_JAVELIN:
@@ -3026,8 +3025,8 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// Throwing needles is now seriously frowned upon; it's difficult
// to grip a fiddly little needle, and not penalising it cheapens
// blowguns.
- exHitBonus -= (30 - you.skills[SK_DARTS]) / 3;
- baseHit -= (30 - you.skills[SK_DARTS]) / 3;
+ exHitBonus -= (30 - you.skills[SK_THROWING]) / 3;
+ baseHit -= (30 - you.skills[SK_THROWING]) / 3;
dprf("Needle base hit = %d, exHitBonus = %d",
baseHit, exHitBonus);
}
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 8e673e24a9..58c5b12c25 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -337,7 +337,7 @@ static weapon_def Weapon_prop[NUM_WEAPONS] =
// - slings get a bonus from dex, not str (as tension is meaningless)
// - str weight is used for speed and applying dex to skill
{ WPN_BLOWGUN, "blowgun", 0, 2, 10, 20, 0,
- SK_DARTS, HANDS_HALF, SIZE_LITTLE, MI_NEEDLE, false,
+ SK_THROWING, HANDS_HALF, SIZE_LITTLE, MI_NEEDLE, false,
DAMV_NON_MELEE, 0 },
{ WPN_SLING, "sling", 0, 2, 11, 20, 1,
SK_SLINGS, HANDS_ONE, SIZE_LITTLE, MI_STONE, false,
@@ -1660,7 +1660,7 @@ skill_type range_skill( const item_def &item )
{
switch (item.sub_type)
{
- case MI_DART: return (SK_DARTS);
+ case MI_DART: return (SK_THROWING);
case MI_JAVELIN: return (SK_POLEARMS);
default: break;
}
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index eac23e371e..4d0a8eae20 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -82,7 +82,7 @@ static int _newwave_weapon_colour(const item_def &item)
case SK_CROSSBOWS:
item_colour = LIGHTBLUE;
break;
- case SK_DARTS:
+ case SK_THROWING:
item_colour = WHITE;
break;
case SK_SLINGS:
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index bf827f60c7..2abb8108d0 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1748,7 +1748,7 @@ static void _newgame_make_item(int slot, equipment_type eqslot,
static bool _give_wanderer_weapon(int & slot, int wpn_skill, int plus)
{
// Darts skill also gets you some needles.
- if (wpn_skill == SK_DARTS)
+ if (wpn_skill == SK_THROWING)
{
// Plus is set if we are getting a good item. In that case, we
// get curare here.
@@ -1801,7 +1801,7 @@ static bool _give_wanderer_weapon(int & slot, int wpn_skill, int plus)
you.inv[slot].sub_type = WPN_QUARTERSTAFF;
break;
- case SK_DARTS:
+ case SK_THROWING:
you.inv[slot].sub_type = WPN_BLOWGUN;
break;
@@ -2312,7 +2312,7 @@ void _wanderer_good_equipment(skill_type & skill, int & slot)
case SK_POLEARMS:
case SK_BOWS:
case SK_CROSSBOWS:
- case SK_DARTS:
+ case SK_THROWING:
case SK_STAVES:
case SK_SHORT_BLADES:
_give_wanderer_weapon(slot, skill, 3);
@@ -2493,7 +2493,7 @@ void _wanderer_decent_equipment(skill_type & skill,
case SK_POLEARMS:
case SK_BOWS:
case SK_CROSSBOWS:
- case SK_DARTS:
+ case SK_THROWING:
case SK_STAVES:
case SK_SHORT_BLADES:
_give_wanderer_weapon(slot, skill, 0);
@@ -2637,7 +2637,7 @@ static void _create_wanderer(void)
// Regardless of roles, players get a couple levels in these skills.
const skill_type util_skills[] =
- { SK_DARTS, SK_STABBING, SK_TRAPS_DOORS, SK_STEALTH,
+ { SK_THROWING, SK_STABBING, SK_TRAPS_DOORS, SK_STEALTH,
SK_SHIELDS, SK_EVOCATIONS, SK_INVOCATIONS };
int util_size = sizeof(util_skills) / sizeof(skill_type);
@@ -4259,7 +4259,7 @@ bool _give_items_skills()
you.skills[SK_DODGING] = 2;
you.skills[SK_SPELLCASTING] = 2;
you.skills[SK_TRANSLOCATIONS] = 3;
- you.skills[SK_DARTS] = 1;
+ you.skills[SK_THROWING] = 1;
weap_skill = 3;
break;
@@ -4395,7 +4395,7 @@ bool _give_items_skills()
you.inv[0].sub_type = WPN_CLUB;
weap_skill = 1;
- you.skills[SK_DARTS] = 1;
+ you.skills[SK_THROWING] = 1;
you.skills[SK_ENCHANTMENTS] = 4;
you.skills[SK_SPELLCASTING] = 1;
you.skills[SK_DODGING] = 2;
@@ -4566,7 +4566,7 @@ bool _give_items_skills()
you.skills[SK_DODGING] = 1;
you.skills[SK_STEALTH] = 3;
you.skills[SK_STABBING] = 2;
- you.skills[SK_DARTS] = 2;
+ you.skills[SK_THROWING] = 2;
break;
case JOB_HUNTER:
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 8a20c52062..814e36ceed 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -1177,7 +1177,7 @@ static bool _need_missile_gift()
&& random2( you.piety ) > 70
&& one_chance_in(8)
&& you.skills[ best_missile_skill ] >= 8
- && (launcher || best_missile_skill == SK_DARTS));
+ && (launcher || best_missile_skill == SK_THROWING));
}
static void _get_pure_deck_weights(int weights[])
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index 608ebca844..2d28a5201d 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -295,7 +295,7 @@ static int _exercise2(int exsk)
// practise. Increasing the "deg"ree of exercise would make
// missile weapons too easy earlier on, so, instead, we're
// giving them a special case here.
- if (exsk != SK_DARTS && exsk != SK_BOWS && exsk != SK_CROSSBOWS
+ if (exsk != SK_THROWING && exsk != SK_BOWS && exsk != SK_CROSSBOWS
|| skill_change > you.exp_available)
{
int fraction = (spending_limit * 10) / skill_change;
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 861bac1d0e..c736033772 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -153,7 +153,7 @@ const int spec_skills[NUM_SPECIES][40] =
100, // SK_SLINGS
100, // SK_BOWS
100, // SK_CROSSBOWS
- 100, // SK_DARTS
+ 100, // unused (was darts)
100, // SK_THROWING
100, // SK_ARMOUR
100, // SK_DODGING
@@ -195,7 +195,7 @@ const int spec_skills[NUM_SPECIES][40] =
140, // SK_SLINGS
60, // SK_BOWS
100, // SK_CROSSBOWS
- 90, // SK_DARTS
+ 90, // unused (was darts)
80, // SK_THROWING
110, // SK_ARMOUR
90, // SK_DODGING
@@ -237,7 +237,7 @@ const int spec_skills[NUM_SPECIES][40] =
140, // SK_SLINGS
80, // SK_BOWS
110, // SK_CROSSBOWS
- 80, // SK_DARTS
+ 80, // unused (was darts)
80, // SK_THROWING
140, // SK_ARMOUR
70, // SK_DODGING
@@ -279,7 +279,7 @@ const int spec_skills[NUM_SPECIES][40] =
100, // SK_SLINGS
100, // SK_BOWS
100, // SK_CROSSBOWS
- 100, // SK_DARTS
+ 100, // unused (was darts)
70, // SK_THROWING
140, // SK_ARMOUR
70, // SK_DODGING
@@ -321,7 +321,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
150, // SK_BOWS
90, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
60, // SK_ARMOUR
110, // SK_DODGING
@@ -363,7 +363,7 @@ const int spec_skills[NUM_SPECIES][40] =
50, // SK_SLINGS
70, // SK_BOWS
90, // SK_CROSSBOWS
- 50, // SK_DARTS
+ 50, // unused (was darts)
60, // SK_THROWING
150, // SK_ARMOUR
70, // SK_DODGING
@@ -405,7 +405,7 @@ const int spec_skills[NUM_SPECIES][40] =
130, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 130, // SK_DARTS
+ 130, // unused (was darts)
100, // SK_THROWING
90, // SK_ARMOUR
140, // SK_DODGING
@@ -447,7 +447,7 @@ const int spec_skills[NUM_SPECIES][40] =
70, // SK_SLINGS
90, // SK_BOWS
80, // SK_CROSSBOWS
- 50, // SK_DARTS
+ 50, // unused (was darts)
60, // SK_THROWING
140, // SK_ARMOUR
70, // SK_DODGING
@@ -489,7 +489,7 @@ const int spec_skills[NUM_SPECIES][40] =
140, // SK_SLINGS
140, // SK_BOWS
140, // SK_CROSSBOWS
- 140, // SK_DARTS
+ 140, // unused (was darts)
140, // SK_THROWING
140, // SK_ARMOUR
140, // SK_DODGING
@@ -531,7 +531,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
150, // SK_ARMOUR
150, // SK_DODGING
@@ -573,7 +573,7 @@ const int spec_skills[NUM_SPECIES][40] =
180, // SK_SLINGS
180, // SK_BOWS
180, // SK_CROSSBOWS
- 180, // SK_DARTS
+ 180, // unused (was darts)
80, // SK_THROWING
150, // SK_ARMOUR
120, // SK_DODGING
@@ -615,7 +615,7 @@ const int spec_skills[NUM_SPECIES][40] =
180, // SK_SLINGS
180, // SK_BOWS
180, // SK_CROSSBOWS
- 180, // SK_DARTS
+ 180, // unused (was darts)
130, // SK_THROWING
150, // SK_ARMOUR
130, // SK_DODGING
@@ -657,7 +657,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -699,7 +699,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -741,7 +741,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -783,7 +783,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -825,7 +825,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -867,7 +867,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -909,7 +909,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -951,7 +951,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -993,7 +993,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -1035,7 +1035,7 @@ const int spec_skills[NUM_SPECIES][40] =
120, // SK_SLINGS
120, // SK_BOWS
120, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
200, // SK_ARMOUR
120, // SK_DODGING
@@ -1077,7 +1077,7 @@ const int spec_skills[NUM_SPECIES][40] =
80, // SK_SLINGS
60, // SK_BOWS
90, // SK_CROSSBOWS
- 80, // SK_DARTS
+ 80, // unused (was darts)
60, // SK_THROWING
180, // SK_ARMOUR
170, // SK_DODGING
@@ -1119,7 +1119,7 @@ const int spec_skills[NUM_SPECIES][40] =
110, // SK_SLINGS
110, // SK_BOWS
110, // SK_CROSSBOWS
- 110, // SK_DARTS
+ 110, // unused (was darts)
110, // SK_THROWING
110, // SK_ARMOUR
110, // SK_DODGING
@@ -1161,7 +1161,7 @@ const int spec_skills[NUM_SPECIES][40] =
70, // SK_SLINGS
70, // SK_BOWS
100, // SK_CROSSBOWS
- 70, // SK_DARTS
+ 70, // unused (was darts)
90, // SK_THROWING
170, // SK_ARMOUR
50, // SK_DODGING
@@ -1203,7 +1203,7 @@ const int spec_skills[NUM_SPECIES][40] =
90, // SK_SLINGS
90, // SK_BOWS
90, // SK_CROSSBOWS
- 90, // SK_DARTS
+ 90, // unused (was darts)
90, // SK_THROWING
80, // SK_ARMOUR
80, // SK_DODGING
@@ -1245,7 +1245,7 @@ const int spec_skills[NUM_SPECIES][40] =
110, // SK_SLINGS
110, // SK_BOWS
110, // SK_CROSSBOWS
- 110, // SK_DARTS
+ 110, // unused (was darts)
110, // SK_THROWING
110, // SK_ARMOUR
110, // SK_DODGING
@@ -1287,7 +1287,7 @@ const int spec_skills[NUM_SPECIES][40] =
130, // SK_SLINGS
130, // SK_BOWS
130, // SK_CROSSBOWS
- 130, // SK_DARTS
+ 130, // unused (was darts)
130, // SK_THROWING
110, // SK_ARMOUR
110, // SK_DODGING
@@ -1329,7 +1329,7 @@ const int spec_skills[NUM_SPECIES][40] =
100, // SK_SLINGS
80, // SK_BOWS
80, // SK_CROSSBOWS
- 90, // SK_DARTS
+ 90, // unused (was darts)
90, // SK_THROWING
90, // SK_ARMOUR
90, // SK_DODGING
@@ -1371,7 +1371,7 @@ const int spec_skills[NUM_SPECIES][40] =
150, // SK_SLINGS
140, // SK_BOWS
140, // SK_CROSSBOWS
- 100, // SK_DARTS
+ 100, // unused (was darts)
100, // SK_THROWING
160, // SK_ARMOUR
60, // SK_DODGING
@@ -1413,7 +1413,7 @@ const int spec_skills[NUM_SPECIES][40] =
140, // SK_SLINGS
140, // SK_BOWS
140, // SK_CROSSBOWS
- 140, // SK_DARTS
+ 140, // unused (was darts)
140, // SK_THROWING
140, // SK_ARMOUR
90, // SK_DODGING
@@ -1455,7 +1455,7 @@ const int spec_skills[NUM_SPECIES][40] =
90, // SK_SLINGS
180, // SK_BOWS
90, // SK_CROSSBOWS
- 120, // SK_DARTS
+ 120, // unused (was darts)
120, // SK_THROWING
90, // SK_ARMOUR
90, // SK_DODGING
@@ -1535,7 +1535,7 @@ static const skill_type skill_display_order[] =
SK_BLANK_LINE,
- SK_BOWS, SK_CROSSBOWS, SK_THROWING, SK_SLINGS, SK_DARTS,
+ SK_BOWS, SK_CROSSBOWS, SK_THROWING, SK_SLINGS,
SK_BLANK_LINE,
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index e0e7d53b72..e0e3f68dc2 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -1197,7 +1197,6 @@ void tut_gained_new_skill(int skill)
case SK_SLINGS:
case SK_BOWS:
case SK_CROSSBOWS:
- case SK_DARTS:
learned_something_new(TUT_GAINED_RANGED_SKILL);
break;
@@ -3547,7 +3546,7 @@ void tutorial_describe_item(const item_def &item)
{
// Then only compare with other launcher skills.
curr_wpskill = range_skill(item);
- best_wpskill = best_skill(SK_SLINGS, SK_DARTS, 99);
+ best_wpskill = best_skill(SK_SLINGS, SK_THROWING, 99);
}
else
{
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-06-03 04:51:21 +0000