summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-11-14 18:57:08 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-11-14 18:57:08 +0100
commit8f183a4cca166d1b15b7e0d7103e8b264e0f7b15 (patch)
tree24ea4ce1c605037b708ed71f118122761807ebbc
parent983afd1a349b820b4e2ff47a03e665ad0d6693d6 (diff)
downloadcrawl-ref-8f183a4cca166d1b15b7e0d7103e8b264e0f7b15.tar.gz
crawl-ref-8f183a4cca166d1b15b7e0d7103e8b264e0f7b15.zip
Revert removal of the speed brand, pending discussion.
Such grand changes should not be made out of the blue. There was not a single mention of it before, save a line in a long brainstorm FR. It has a large impact (badly hurting short blade users, making axes far more a non-brainer over long blades/polearms, and so on). We may decide this is the way to go, but a discussion needs to be done first. And, re-reverting it is a single command so no work is lost...
-rw-r--r--crawl-ref/source/makeitem.cc29
1 files changed, 24 insertions, 5 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 90963d600e..99843c71bd 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1263,6 +1263,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
if (one_chance_in(8))
rc = SPWPN_DRAINING;
+ if (one_chance_in(8))
+ rc = SPWPN_SPEED;
+
if (one_chance_in(6))
rc = SPWPN_VENOM;
break;
@@ -1275,6 +1278,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
case WPN_SCIMITAR:
if (one_chance_in(25))
rc = SPWPN_PAIN;
+
+ if (one_chance_in(7))
+ rc = SPWPN_SPEED;
// **** intentional fall through here ****
case WPN_GREAT_SWORD:
case WPN_DOUBLE_SWORD:
@@ -1357,6 +1363,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
rc = SPWPN_REACHING;
if (one_chance_in(5))
+ rc = SPWPN_SPEED;
+
+ if (one_chance_in(5))
rc = SPWPN_ELECTROCUTION;
break;
@@ -1373,6 +1382,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
if (one_chance_in(4))
rc = SPWPN_PROTECTION;
+
+ if (one_chance_in(5))
+ rc = SPWPN_SPEED;
// **** intentional fall through here ****
case WPN_SPEAR:
if (one_chance_in(25))
@@ -1415,14 +1427,16 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
rc = SPWPN_FLAME;
else if (tmp < 500)
rc = SPWPN_FROST;
- else if (tmp < 660)
+ else if (tmp < 650)
rc = SPWPN_PENETRATION;
- else if (tmp < 820)
+ else if (tmp < 800)
rc = SPWPN_REAPING;
- else if (tmp < 940)
+ else if (tmp < 920)
rc = SPWPN_PROTECTION;
- else
+ else if (tmp < 980)
rc = SPWPN_VORPAL;
+ else
+ rc = SPWPN_SPEED;
if (item.sub_type == WPN_HAND_CROSSBOW || item.sub_type == WPN_CROSSBOW)
if (one_chance_in(5))
rc = SPWPN_ELECTROCUTION;
@@ -1438,6 +1452,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
if (_got_distortion_roll(item_level))
rc = SPWPN_DISTORTION;
+ if (one_chance_in(5))
+ rc = SPWPN_SPEED;
+
if (one_chance_in(10))
rc = SPWPN_VORPAL;
@@ -1446,7 +1463,9 @@ static brand_type _determine_weapon_brand(const item_def& item, int item_level)
break;
case WPN_LAJATANG:
- if (one_chance_in(12))
+ if (one_chance_in(8))
+ rc = SPWPN_SPEED;
+ else if (one_chance_in(12))
rc = SPWPN_PAIN;
else if (_got_distortion_roll(item_level))
rc = SPWPN_DISTORTION;