Plus2: Update unrand weapons

Leech receives a buff to +8 and increased penalties (-2 instead of -1).

[Committer's note: Tweaked some more.]

1 files changed, 61 insertions, 63 deletions

diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt
index b94bb6a775..ffa5de3ab5 100644
--- a/crawl-ref/source/art-data.txt
+++ b/crawl-ref/source/art-data.txt
@@ -115,9 +115,7 @@
 # OBJ: The enumerations of the base type and sub type of the artefact,
 # separated by a dash.  E.g., OBJ_WEAPONS/WPN_SWORD
 
-# PLUS: The pluses of the artefact.  For an object with two pluses,
-# this is specified with "plus/plus2".  For an object with just one plus,
-# this is specified with "plus".
+# PLUS: The pluses of the artefact.
 
 #####
 
@@ -157,14 +155,14 @@
 ENUM:   DUMMY1
 NAME:   DUMMY UNRANDART 1
 OBJ:    OBJ_UNASSIGNED/250
-PLUS:   250/250
+PLUS:   250
 COLOUR: BLACK
 
 ####################### First come the old fixed arts.
 
 NAME:    Singing Sword
 OBJ:     OBJ_WEAPONS/WPN_BASTARD_SWORD
-PLUS:    +7/+7
+PLUS:    +7
 COLOUR:  ETC_GOLD
 TILE:    spwpn_singing_sword
 TILE_EQ: singing_sword
@@ -173,7 +171,7 @@ BOOL:    special
 
 NAME:    Wrath of Trog
 OBJ:     OBJ_WEAPONS/WPN_BATTLEAXE
-PLUS:    +3/+11
+PLUS:    +8
 COLOUR:  ETC_BLOOD
 TILE:    spwpn_wrath_of_trog
 TILE_EQ: axe_trog
@@ -183,7 +181,7 @@ BRAND:   SPWPN_ANTIMAGIC
 
 NAME:    Mace of Variability
 OBJ:     OBJ_WEAPONS/WPN_GREAT_MACE
-PLUS:    0/0   # Set on generation
+PLUS:    +0   # Set on generation
 COLOUR:  ETC_RANDOM
 TILE:    spwpn_mace_of_variability
 TILE_EQ: mace_of_variability
@@ -193,7 +191,7 @@ BRAND:   SPWPN_CHAOS
 
 NAME:    Glaive of Prune
 OBJ:     OBJ_WEAPONS/WPN_GLAIVE
-PLUS:    +4/+12
+PLUS:    +9
 COLOUR:  LIGHTMAGENTA
 TILE:    spwpn_glaive_of_prune
 TILE_EQ: glaive_of_prune
@@ -203,7 +201,7 @@ BRAND:   SPWPN_VORPAL
 
 NAME:    Sword of Power
 OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
-PLUS:    0/0 # Set on wield
+PLUS:    +0 # Set on wield
 COLOUR:  RED
 TILE:    spwpn_sword_of_power
 TILE_EQ: sword_of_power
@@ -212,7 +210,7 @@ BOOL:    special, no_upgrade
 
 NAME:    Staff of Olgreb
 OBJ:     OBJ_WEAPONS/WPN_STAFF
-PLUS:    0/0 # Set on wield
+PLUS:    +0 # Set on wield
 COLOUR:  ETC_POISON
 TILE:    spwpn_staff_of_olgreb
 TILE_EQ: olgreb
@@ -221,7 +219,7 @@ BOOL:    poison, no_upgrade
 
 NAME:    Staff of Wucad Mu
 OBJ:     OBJ_WEAPONS/WPN_STAFF
-PLUS:    +9/+9
+PLUS:    +9
 COLOUR:  ETC_MAGIC
 TILE:    spwpn_wucad_mu
 TILE_EQ: wucad_mu
@@ -231,7 +229,7 @@ BOOL:    special
 NAME:    Vampire's Tooth
 OBJ:     OBJ_WEAPONS/WPN_DAGGER
 # it's a dagger made from a tooth -> no TYPE
-PLUS:    +3/+4
+PLUS:    +4
 COLOUR:  ETC_BONE
 TILE:    spwpn_vampires_tooth
 TILE_EQ: vampires_tooth
@@ -241,7 +239,7 @@ BOOL:    special
 
 NAME:    Scythe of Curses
 OBJ:     OBJ_WEAPONS/WPN_SCYTHE
-PLUS:    +13/+13
+PLUS:    +13
 COLOUR:  ETC_DEATH
 TILE:    spwpn_scythe_of_curses
 TILE_EQ: finisher
@@ -252,7 +250,7 @@ BOOL:    evil
 
 NAME:    Sceptre of Torment
 OBJ:     OBJ_WEAPONS/WPN_MACE
-PLUS:    +7/+6
+PLUS:    +7
 COLOUR:  ETC_GOLD
 TILE:    spwpn_sceptre_of_torment
 TILE_EQ: mace_ruby
@@ -261,7 +259,7 @@ BOOL:    special, evil
 
 NAME:    Sword of Zonguldrok
 OBJ:     OBJ_WEAPONS/WPN_BASTARD_SWORD
-PLUS:    +9/+9
+PLUS:    +9
 COLOUR:  ETC_BONE
 TILE:    spwpn_sword_of_zonguldrok
 TILE_EQ: zonguldrok
@@ -276,7 +274,7 @@ TYPE:    flamberge
 OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
 BASE_DAM: +1
 BASE_ACC: +1
-PLUS:    +6/+6
+PLUS:    +6
 COLOUR:  ETC_FIRE
 TILE:    spwpn_sword_of_cerebov
 TILE_EQ: sword_twist
@@ -287,7 +285,7 @@ BOOL:    tilerim, unholy, nogen
 NAME:    Staff of Dispater
 APPEAR:  golden staff
 OBJ:     OBJ_WEAPONS/WPN_STAFF
-PLUS:    +4/+4
+PLUS:    +4
 COLOUR:  ETC_GOLD
 TILE:    spwpn_staff_of_dispater
 TILE_EQ: dispater
@@ -297,7 +295,7 @@ BOOL:    special, unholy, nogen
 NAME:    Sceptre of Asmodeus
 APPEAR:  ruby sceptre
 OBJ:     OBJ_WEAPONS/WPN_STAFF
-PLUS:    +7/+7
+PLUS:    +7
 COLOUR:  ETC_BLOOD
 TILE:    spwpn_sceptre_of_asmodeus
 TILE_EQ: asmodeus
@@ -317,7 +315,7 @@ BOOL:    nogen, unided, no_upgrade
 
 NAME:    demon blade "Bloodbane"
 OBJ:     OBJ_WEAPONS/WPN_DEMON_BLADE
-PLUS:    +7/+8
+PLUS:    +8
 COLOUR:  ETC_DARK
 TILE:    urand_bloodbane
 TILE_EQ: bloodbane
@@ -328,7 +326,7 @@ STEALTH: -1
 
 NAME:    scimitar of Flaming Death
 OBJ:     OBJ_WEAPONS/WPN_SCIMITAR
-PLUS:    +7/+5
+PLUS:    +6
 COLOUR:  ETC_FIRE
 TILE:    urand_flaming_death
 TILE_EQ: flaming_death
@@ -340,7 +338,7 @@ MAGIC:   1
 
 NAME:    mace of Brilliance
 OBJ:     OBJ_WEAPONS/WPN_MACE
-PLUS:    +5/+5
+PLUS:    +5
 COLOUR:  ETC_HOLY
 TILE:    urand_brilliance
 TILE_EQ: mace_of_brilliance
@@ -352,20 +350,20 @@ BOOL:    life, seeinv
 
 NAME:    demon blade "Leech"
 OBJ:     OBJ_WEAPONS/WPN_DEMON_BLADE
-PLUS:    +13/+1
+PLUS:    +8
 COLOUR:  ETC_DARK
 TILE:    urand_leech
 TILE_EQ: leech
 BRAND:   SPWPN_VAMPIRICISM
-EV:      -1
-STR:     -1
-INT:     -1
-DEX:     -1
+EV:      -2
+STR:     -2
+INT:     -2
+DEX:     -2
 BOOL:    life
 
 NAME:    dagger of Chilly Death
 OBJ:     OBJ_WEAPONS/WPN_DAGGER
-PLUS:    +8/+10
+PLUS:    +9
 COLOUR:  ETC_ICE
 TILE:    urand_chilly_death
 TILE_EQ: chilly_death
@@ -377,7 +375,7 @@ BOOL:    poison
 
 NAME:     dagger "Morg"
 OBJ:      OBJ_WEAPONS/WPN_DAGGER
-PLUS:     -1/+4
+PLUS:     +3
 COLOUR:   LIGHTRED
 TILE:     urand_morg
 TILE_EQ:  morg
@@ -387,7 +385,7 @@ MAGIC:    1
 
 NAME:    scythe "Finisher"
 OBJ:     OBJ_WEAPONS/WPN_SCYTHE
-PLUS:    +3/+5
+PLUS:    +5
 COLOUR:  ETC_DARK
 TILE:    urand_finisher
 TILE_EQ: finisher
@@ -396,7 +394,7 @@ STR:     3
 
 NAME:    sling "Punk"
 OBJ:     OBJ_WEAPONS/WPN_SLING
-PLUS:    +9/+12
+PLUS:    +11
 COLOUR:  ETC_ICE
 TILE:    urand_punk
 TILE_EQ: punk
@@ -406,7 +404,7 @@ COLD:    1
 ENUM:     KRISHNA
 NAME:     bow of Krishna "Sharnga"
 OBJ:      OBJ_WEAPONS/WPN_LONGBOW
-PLUS:     +8/+8
+PLUS:     +8
 COLOUR:   ETC_GOLD
 TILE:     urand_krishna
 TILE_EQ:  krishna
@@ -416,7 +414,7 @@ BOOL:     seeinv
 
 NAME:    giant club "Skullcrusher"
 OBJ:     OBJ_WEAPONS/WPN_GIANT_CLUB
-PLUS:    +0/+5
+PLUS:    +3
 COLOUR:  BROWN
 TILE:    urand_skullcrusher
 TILE_EQ: giant_club_slant
@@ -425,7 +423,7 @@ STR:     5
 
 NAME:     glaive of the Guard
 OBJ:      OBJ_WEAPONS/WPN_GLAIVE
-PLUS:     +5/+8
+PLUS:     +7
 COLOUR:   ETC_ELECTRICITY
 TILE:     urand_guard
 TILE_EQ:  glaive_of_the_guard
@@ -435,7 +433,7 @@ BOOL:     seeinv, berserk
 
 NAME:     sword of Jihad
 OBJ:      OBJ_WEAPONS/WPN_EUDEMON_BLADE
-PLUS:     +12/+10
+PLUS:     +10
 COLOUR:   ETC_HOLY
 TILE:     urand_jihad
 TILE_EQ:  jihad
@@ -448,7 +446,7 @@ BOOL:     life
 NAME:    crossbow "Hellfire"
 INSCRIP: hellfire,
 OBJ:     OBJ_WEAPONS/WPN_CROSSBOW
-PLUS:    +6/+6
+PLUS:    +6
 COLOUR:  ETC_FIRE
 TILE:    urand_hellfire
 TILE_EQ: crossbow_fire
@@ -459,7 +457,7 @@ BOOL:    unholy
 
 NAME:    sword of the Doom Knight
 OBJ:     OBJ_WEAPONS/WPN_GREAT_SWORD
-PLUS:    +13/+13
+PLUS:    +13
 COLOUR:  BLUE
 TILE:    urand_doom_knight
 TILE_EQ: doom_knight
@@ -469,7 +467,7 @@ BOOL:    nospell
 
 NAME:    morningstar "Eos"
 OBJ:     OBJ_WEAPONS/WPN_MORNINGSTAR
-PLUS:    +11/+11
+PLUS:    +11
 COLOUR:  ETC_JEWEL
 TILE:    urand_eos
 TILE_EQ: eos
@@ -482,7 +480,7 @@ BOOL:    elec, seeinv, notelep
 # called botono.
 NAME:     spear of the Botono
 OBJ:      OBJ_WEAPONS/WPN_SPEAR
-PLUS:     +2/+10
+PLUS:     +6
 COLOUR:   ETC_UNHOLY
 TILE:     urand_botono
 TILE_EQ:  botono
@@ -492,7 +490,7 @@ BOOL:     poison, life
 
 NAME:     trident of the Octopus King
 OBJ:      OBJ_WEAPONS/WPN_TRIDENT
-PLUS:     +10/+4
+PLUS:     +7
 COLOUR:   ETC_WATER
 TILE:     urand_octopus_king
 TILE_EQ:  trident_octopus_king
@@ -502,7 +500,7 @@ MAGIC:    1
 
 NAME:    mithril axe "Arga"
 OBJ:     OBJ_WEAPONS/WPN_BROAD_AXE
-PLUS:    +10/+6
+PLUS:    +8
 COLOUR:  WHITE
 TILE:    urand_arga
 TILE_EQ: arga
@@ -512,7 +510,7 @@ MAGIC:   1
 
 NAME:     Elemental Staff
 OBJ:      OBJ_WEAPONS/WPN_STAFF
-PLUS:     +3/+3
+PLUS:     +3
 COLOUR:   DARKGREY
 TILE:     urand_elemental
 TILE_EQ:  elemental_staff
@@ -524,7 +522,7 @@ BOOL:     elec
 
 NAME:     crossbow "Sniper"
 OBJ:      OBJ_WEAPONS/WPN_CROSSBOW
-PLUS:     +15/+15
+PLUS:     +15
 COLOUR:   ETC_DARK
 TILE:     urand_sniper
 TILE_EQ:  sniper
@@ -534,7 +532,7 @@ BOOL:     seeinv
 
 NAME:    longbow "Piercer"
 OBJ:     OBJ_WEAPONS/WPN_LONGBOW
-PLUS:    +2/+10
+PLUS:    +7
 COLOUR:  CYAN
 TILE:    urand_piercer
 TILE_EQ: great_bow
@@ -544,7 +542,7 @@ EV:      -2
 ENUM:    BLOWGUN_ASSASSIN
 NAME:    blowgun of the Assassin
 OBJ:     OBJ_WEAPONS/WPN_BLOWGUN
-PLUS:    +6/+0
+PLUS:    +6
 COLOUR:  ETC_DEATH
 TILE:    urand_blowgun
 TILE_EQ: blowgun
@@ -555,7 +553,7 @@ NAME:    lance "Wyrmbane"
 OBJ:     OBJ_WEAPONS/WPN_SPEAR
 TYPE:    lance
 BASE_DAM: +2
-PLUS:    +9/+6
+PLUS:    +8
 COLOUR:  LIGHTGREEN
 TILE:    urand_wyrmbane
 TILE_EQ: wyrmbane
@@ -567,7 +565,7 @@ BOOL:    poison, berserk, no_upgrade
 NAME:     Spriggan's Knife
 OBJ:      OBJ_WEAPONS/WPN_DAGGER
 TYPE:     knife
-PLUS:     +4/+10
+PLUS:     +7
 COLOUR:   LIGHTCYAN
 TILE:     urand_spriggans_knife
 TILE_EQ:  spriggans_knife
@@ -579,7 +577,7 @@ STEALTH:  1
 
 NAME:    plutonium sword
 OBJ:     OBJ_WEAPONS/WPN_CLAYMORE
-PLUS:    +12/+16
+PLUS:    +14
 COLOUR:  ETC_MUTAGENIC
 TILE:    urand_plutonium
 TILE_EQ: plutonium_sword
@@ -589,7 +587,7 @@ STEALTH: -1
 NAME:     great mace "Undeadhunter"
 INSCRIP:  disrupt,
 OBJ:      OBJ_WEAPONS/WPN_GREAT_MACE
-PLUS:     +7/+7
+PLUS:     +7
 COLOUR:   LIGHTGREY
 TILE:     urand_undeadhunter
 TILE_EQ:  undeadhunter
@@ -597,7 +595,7 @@ BOOL:     life
 
 NAME:    whip "Snakebite"
 OBJ:     OBJ_WEAPONS/WPN_WHIP
-PLUS:    +5/+10
+PLUS:    +8
 COLOUR:  DARKGREY
 TILE:    urand_snakebite
 TILE_EQ: snakebite
@@ -608,7 +606,7 @@ BOOL:    poison, tilerim
 NAME:     knife of Accuracy
 OBJ:      OBJ_WEAPONS/WPN_DAGGER
 TYPE:     knife
-PLUS:     +27/-1
+PLUS:     +27
 COLOUR:   LIGHTCYAN
 TILE:     urand_knife_of_accuracy
 TILE_EQ:  knife_of_accuracy
@@ -619,7 +617,7 @@ BOOL:     tilerim, nogen
 ENUM:     CRYSTAL_SPEAR
 NAME:     Lehudib's crystal spear
 OBJ:      OBJ_WEAPONS/WPN_SPEAR
-PLUS:     +6/+6
+PLUS:     +6
 COLOUR:   GREEN
 TILE:     urand_crystal_spear
 TILE_EQ:  crystal_spear
@@ -628,7 +626,7 @@ BOOL:     nogen
 
 NAME:     captain's cutlass
 OBJ:      OBJ_WEAPONS/WPN_CUTLASS
-PLUS:     +5/+10
+PLUS:     +8
 COLOUR:   DARKGREY
 TILE:     urand_cutlass
 TILE_EQ:  capt_cutlass
@@ -636,7 +634,7 @@ BRAND:    SPWPN_SPEED
 
 NAME:     storm bow
 OBJ:      OBJ_WEAPONS/WPN_LONGBOW
-PLUS:     +8/+8
+PLUS:     +8
 COLOUR:   BLUE
 TILE:     urand_storm_bow
 TILE_EQ:  storm_bow
@@ -970,7 +968,7 @@ MAGIC:    1
 ENUM:     DEMON_AXE
 NAME:     obsidian axe
 OBJ:      OBJ_WEAPONS/WPN_BROAD_AXE
-PLUS:     +12/+15
+PLUS:     +14
 COLOUR:   ETC_UNHOLY
 TILE:     spwpn_demon_axe
 TILE_EQ:  demon_axe
@@ -1010,7 +1008,7 @@ TYPE:     katana
 TILE:     urand_katana
 TILE_EQ:  katana_slant
 COLOUR:   LIGHTRED
-PLUS:     +8/+8
+PLUS:     +8
 BASE_ACC: +2
 BASE_DAM: +4
 BASE_DELAY: -2
@@ -1022,7 +1020,7 @@ OBJ:      OBJ_WEAPONS/WPN_CLUB
 TYPE:     shillelagh
 TILE:     urand_shillelagh
 TILE_EQ:  shillelagh
-PLUS:     +4/+8
+PLUS:     +6
 BASE_DAM: +3
 BOOL:     special
 # hrm, nothing fitting, shouldn't be elemental but should be marked
@@ -1096,7 +1094,7 @@ TYPE:     maul
 COLOUR:   LIGHTRED
 TILE:     urand_dark_maul
 TILE_EQ:  dark_maul
-PLUS:     +6/+6
+PLUS:     +6
 BASE_ACC: +2
 BASE_DAM: +27
 BASE_DELAY: +13
@@ -1116,7 +1114,7 @@ STEALTH: -1
 NAME:     arc blade
 INSCRIP:  discharge,
 OBJ:      OBJ_WEAPONS/WPN_CUTLASS
-PLUS:     +3/+5
+PLUS:     +4
 COLOUR:   ETC_ELECTRICITY
 TILE:     urand_arc_blade
 TILE_EQ:  arc_blade
@@ -1126,7 +1124,7 @@ ENUM:     SPELLBINDER
 NAME:     demon whip "Spellbinder"
 OBJ:      OBJ_WEAPONS/WPN_DEMON_WHIP
 BRAND:    SPWPN_ANTIMAGIC
-PLUS:     +3/+6
+PLUS:     +5
 COLOUR:   ETC_ENCHANT
 TILE:     urand_spellbinder
 TILE_EQ:  spellbinder
@@ -1138,7 +1136,7 @@ OBJ:     OBJ_WEAPONS/WPN_LAJATANG
 COLOUR:  ETC_SILVER
 TILE:    urand_order
 TILE_EQ: order
-PLUS:    7/7
+PLUS:    +7
 
 ENUM:     FIRESTARTER
 NAME:     great mace "Firestarter"
@@ -1146,7 +1144,7 @@ OBJ:      OBJ_WEAPONS/WPN_GREAT_MACE
 COLOUR:   RED
 TILE:     urand_firestarter
 TILE_EQ:  firestarter
-PLUS:     +7/+7
+PLUS:     +7
 BRAND:    SPWPN_FLAMING
 FIRE:     2
 
@@ -1164,7 +1162,7 @@ ENUM:    MAJIN
 NAME:    Majin-Bo
 INSCRIP: Archmagi,
 OBJ:     OBJ_WEAPONS/WPN_QUARTERSTAFF
-PLUS:    +6/+6
+PLUS:    +6
 COLOUR:  ETC_UNHOLY
 TILE:    spwpn_majin
 TILE_EQ: majin
@@ -1221,5 +1219,5 @@ BOOL:    nogen, rnd_tele
 ENUM:   DUMMY2
 NAME:   DUMMY UNRANDART 2
 OBJ:    OBJ_UNASSIGNED/250
-PLUS:   250/250
+PLUS:   250
 COLOUR: BLACK