0007944: Remove caps. - Dungeon Crawl Stone Soup Tracker

From 48916b637ce04ea3d7cc91903160f17f20eae41c Mon Sep 17 00:00:00 2001 From: wheals <shm.mark@gmail.com> Date: Tue, 31 Dec 2013 12:50:14 -0500 Subject: [PATCH] Remove caps; rename wizards hats "hats." In the spirit of the glove/gauntlet and helmet types distinction removal, there doesn't seem to be much reason to have both caps and wizard hats. Hats are more common among unrands and wizards starting with hats is more "thematic" than some gladiators starting with caps. on the other hand, those gladiators starting with wizard hats would be pretty weird, so wizard hats are just hats now. Caps not removed: - Caps existing in old saves - Summon cap - Level cap This changes the percentages of hat brands from 2/3 MR and 1/3 int to 1/3 MR, 1/3 int, and 1/3 spirit shield. --- crawl-ref/source/acquire.cc | 2 +- crawl-ref/source/art-data.txt | 12 ++++----- crawl-ref/source/artefact.cc | 2 +- crawl-ref/source/dat/des/portals/icecave.des | 2 +- crawl-ref/source/dat/des/portals/sewer.des | 4 +-- crawl-ref/source/dat/des/portals/trove.des | 6 ++--- crawl-ref/source/dat/des/portals/volcano.des | 2 +- crawl-ref/source/dat/des/sprint/arena_sprint.des | 2 +- crawl-ref/source/dat/des/sprint/linesprint.des | 8 +++--- crawl-ref/source/dat/des/sprint/pitsprint.des | 8 +++--- .../source/dat/des/variable/mini_monsters.des | 6 ++--- crawl-ref/source/dat/descript/cs/items.txt | 2 +- crawl-ref/source/dat/descript/da/items.txt | 2 +- crawl-ref/source/dat/descript/de/items.txt | 2 +- crawl-ref/source/dat/descript/fr/items.txt | 2 +- crawl-ref/source/dat/descript/items.txt | 4 +-- crawl-ref/source/dat/descript/ja/items.txt | 2 +- crawl-ref/source/dat/descript/ko/items.txt | 2 +- crawl-ref/source/dat/descript/lv/items.txt | 2 +- crawl-ref/source/dat/descript/pl/items.txt | 2 +- crawl-ref/source/dat/descript/pt/items.txt | 2 +- crawl-ref/source/dat/descript/ru/items.txt | 2 +- crawl-ref/source/dat/descript/zh/items.txt | 2 +- crawl-ref/source/itemprop-enum.h | 4 ++- crawl-ref/source/itemprop.cc | 6 +++-- crawl-ref/source/makeitem.cc | 29 +++++++-------------- crawl-ref/source/mon-gear.cc | 4 +-- crawl-ref/source/monster.cc | 3 +-- crawl-ref/source/ng-setup.cc | 4 +-- crawl-ref/source/rltiles/dc-item.txt | 4 +-- .../source/rltiles/item/armour/headgear/hat1.png | Bin 0 -> 431 bytes .../source/rltiles/item/armour/headgear/hat2.png | Bin 0 -> 455 bytes .../rltiles/item/armour/headgear/wizard_hat1.png | Bin 431 -> 0 bytes .../rltiles/item/armour/headgear/wizard_hat2.png | Bin 455 -> 0 bytes crawl-ref/source/shopping.cc | 4 ++- crawl-ref/source/tilepick-p.cc | 8 +++--- crawl-ref/source/tilepick.cc | 6 +++-- 37 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 crawl-ref/source/rltiles/item/armour/headgear/hat1.png create mode 100644 crawl-ref/source/rltiles/item/armour/headgear/hat2.png delete mode 100644 crawl-ref/source/rltiles/item/armour/headgear/wizard_hat1.png delete mode 100644 crawl-ref/source/rltiles/item/armour/headgear/wizard_hat2.png diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc index 86b59f8..cb18c30 100644 --- a/crawl-ref/source/acquire.cc +++ b/crawl-ref/source/acquire.cc @@ -158,7 +158,7 @@ static armour_type _pick_wearable_armour(const armour_type arm) // Check for Horns 3 & Antennae 3 - Don't give a cap if those mutation // levels have been reached. if (you.mutation[MUT_HORNS] <= 2 || you.mutation[MUT_ANTENNAE] <= 2) - result = coinflip() ? ARM_CAP : ARM_WIZARD_HAT; + result = ARM_HAT; else result = NUM_ARMOURS; } diff --git a/crawl-ref/source/art-data.txt b/crawl-ref/source/art-data.txt index 7818e61..98f7e29 100644 --- a/crawl-ref/source/art-data.txt +++ b/crawl-ref/source/art-data.txt @@ -684,7 +684,7 @@ TILE_EQ: shield_bullseye EV: -5 NAME: crown of Dyrovepreva -OBJ: OBJ_ARMOUR/ARM_CAP +OBJ: OBJ_ARMOUR/ARM_HAT PLUS: +3 COLOUR: ETC_JEWEL TILE: urand_dyrovepreva @@ -694,7 +694,7 @@ METAB: 1 BOOL: elec, seeinv NAME: hat of the Bear Spirit -OBJ: OBJ_ARMOUR/ARM_CAP +OBJ: OBJ_ARMOUR/ARM_HAT PLUS: +2 COLOUR: DARKGREY TILE: urand_bear @@ -805,7 +805,7 @@ BOOL: nospell, notelep, cursed ENUM: DRAGONMASK NAME: mask of the Dragon -OBJ: OBJ_ARMOUR/ARM_CAP +OBJ: OBJ_ARMOUR/ARM_HAT COLOUR: ETC_SHIMMER_BLUE TILE: urand_dragonmask TILE_EQ: art_dragonhelm @@ -833,7 +833,7 @@ TILE_EQ: dragonarm_gold MAGIC: 50 NAME: hat of the Alchemist -OBJ: OBJ_ARMOUR/ARM_WIZARD_HAT +OBJ: OBJ_ARMOUR/ARM_HAT PLUS: +2 COLOUR: LIGHTMAGENTA TILE: urand_alchemist @@ -962,7 +962,7 @@ TILE_EQ: robe_clouds BOOL: elec, fly NAME: hat of Pondering -OBJ: OBJ_ARMOUR/ARM_WIZARD_HAT +OBJ: OBJ_ARMOUR/ARM_HAT PLUS: +3 COLOUR: LIGHTRED TILE: urand_pondering @@ -1109,7 +1109,7 @@ BRAND: SPWPN_VORPAL ENUM: HIGH_COUNCIL NAME: hat of the High Council INSCRIP: Wiz- -OBJ: OBJ_ARMOUR/ARM_WIZARD_HAT +OBJ: OBJ_ARMOUR/ARM_HAT COLOUR: LIGHTGREEN TILE: urand_high_council TILE_EQ: wizard_lightgreen diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 60ddc51..04f3cf9 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -977,7 +977,7 @@ static void _get_randart_properties(const item_def &item, } if (!done_powers && one_chance_in(10) && aclass == OBJ_ARMOUR - && (atype == ARM_CAP || atype == ARM_SHIELD)) + && (atype == ARM_HAT || atype == ARM_SHIELD)) { proprt[ARTP_BRAND] = SPARM_SPIRIT_SHIELD; power_level++; diff --git a/crawl-ref/source/dat/des/portals/icecave.des b/crawl-ref/source/dat/des/portals/icecave.des index 786e25a..2c070b6 100644 --- a/crawl-ref/source/dat/des/portals/icecave.des +++ b/crawl-ref/source/dat/des/portals/icecave.des @@ -201,7 +201,7 @@ end -- : ice_cave_caverns_undead_demon_loot(_G) function ice_cave_caverns_undead_demon_loot(e) ice_cave_item_attributes(e) - e.item("cloak " .. coldres .. " good_item w:8 / wizard hat good_item / \ + e.item("cloak " .. coldres .. " good_item w:8 / hat good_item / \ pair of gloves good_item / pair of boots good_item / nothing") e.item("book of ice / book of unlife / staff of cold / staff of death / \ randbook disc:ice disc2:necromancy numspells:6 w:2 / nothing w:30") diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des index 28c7b32..e9420de 100644 --- a/crawl-ref/source/dat/des/portals/sewer.des +++ b/crawl-ref/source/dat/des/portals/sewer.des @@ -768,7 +768,7 @@ ITEM: potion of flight w:50 / potion of invisibility / \ potion of might w:3 / potion of agility w:4 / \ potion of brilliance w:3 / nothing # possibly rather generous loot, if you get to the center -ITEM: scroll of vulnerability / scroll of identify / wizard hat / \ +ITEM: scroll of vulnerability / scroll of identify / hat / \ potion of magic / potion of brilliance / potion of resistance ITEM: scroll of identify / scroll of recharging / potion of invisibility / \ pair of gloves w:5 / pair of boots w:5 / potion of agility / nothing @@ -779,7 +779,7 @@ KITEM: ' = scroll of random uselessness w:30 / \ scroll of identify / scroll of teleportation / \ potion of confusion w:50 / potion of paralysis w:50 / \ potion of mutation / potion of flight / \ - wizard hat / buckler / pair of gloves w:5 / pair of boots w:5 + hat / buckler / pair of gloves w:5 / pair of boots w:5 MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xwwwwwwwwwwwWWW-WW-W--WWWWW-WWW--W--WW-WW-WW-W-WWwwwwwwwwwwwx diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des index e7ddf3a..07325c7 100644 --- a/crawl-ref/source/dat/des/portals/trove.des +++ b/crawl-ref/source/dat/des/portals/trove.des @@ -875,10 +875,10 @@ ITEM: ring of evasion unrand:ring_of_shaolin / any randart jewellery w:60 /\ amulet of warding unrand:brooch_of_shielding /\ amulet of rage unrand:necklace_of_bloodlust /\ helmet unrand:crown_of_dyrovepreva / randart helmet / randart cap /\ - cap unrand:mask_of_the_dragon / randart wizard hat /\ + cap unrand:mask_of_the_dragon / randart hat /\ cap unrand:hat_of_the_bear_spirit /\ - wizard hat unrand:hat_of_the_alchemist / randart pair of gloves /\ - wizard hat unrand:hat_of_pondering / randart pair of boots /\ + hat unrand:hat_of_the_alchemist / randart pair of gloves /\ + hat unrand:hat_of_pondering / randart pair of boots /\ pair of gloves unrand:gauntlets_of_war /\ pair of gloves unrand:fencers_gloves /\ naga barding unrand:lightning_scales /\ diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des index b0569cb..5ac474b 100644 --- a/crawl-ref/source/dat/des/portals/volcano.des +++ b/crawl-ref/source/dat/des/portals/volcano.des @@ -192,7 +192,7 @@ function setup_loot (e) e.item(make_fiery_armour(e, {"robe w:30", "animal skin w:30", "leather armour w:30", "ring mail w:30", "scale mail w:20", "chain mail w:40", "plate armour w:10", "pair of gloves w:5", - "helmet w:6", "pair of boots w:3", "cap w:2", "wizard hat w:2", + "helmet w:6", "pair of boots w:3", "cap w:2", "hat w:2", "shield w:1", "buckler w:3"}) .. " / fire dragon armour w:5") e.item([[potion of berserk rage w:20 / potion of poison w:2 / potion of might w:5 / potion of brilliance w:5 / diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des index 0a0899d..0508d64 100644 --- a/crawl-ref/source/dat/des/sprint/arena_sprint.des +++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des @@ -1065,7 +1065,7 @@ KFEAT: K = antique armour shop count:17 use_all type:Advanced suffix:Armour gre pair of gloves randart | pair of gloves randart | pair of boots randart |\ pair of boots randart | helmet randart | cap randart | buckler randart |\ shield randart | cloak randart | cloak randart | robe randart | animal skin randart |\ - large shield randart | robe randart | buckler randart | wizard hat randart |\ + large shield randart | robe randart | buckler randart | hat randart |\ leather armour randart KFEAT: L = armour shop count:17 greed:12 type:Basic suffix:Armour use_all ; \ mundane not_cursed storm dragon armour | mundane not_cursed fire dragon armour |\ diff --git a/crawl-ref/source/dat/des/sprint/linesprint.des b/crawl-ref/source/dat/des/sprint/linesprint.des index b2bff37..9fd6a54 100644 --- a/crawl-ref/source/dat/des/sprint/linesprint.des +++ b/crawl-ref/source/dat/des/sprint/linesprint.des @@ -622,8 +622,8 @@ KITEM: d = plate armour plus:5 not_cursed ident:all /\ helmet plus:0 good_item not_cursed ident:all /\ cloak plus:1 not_cursed ident:all /\ cloak plus:0 good_item not_cursed ident:all /\ - wizard hat plus:1 not_cursed ident:all /\ - wizard hat plus:0 good_item not_cursed ident:all /\ + hat plus:1 not_cursed ident:all /\ + hat plus:0 good_item not_cursed ident:all /\ large shield plus:3 not_cursed ident:all /\ large shield plus:0 good_item not_cursed ident:all /\ naga barding plus:2 not_cursed ident:all w:5 /\ @@ -863,8 +863,8 @@ KITEM: d = plate armour plus:6 not_cursed ident:all /\ helmet plus:0 good_item not_cursed ident:all /\ cloak plus:2 not_cursed ident:all /\ cloak plus:0 good_item not_cursed ident:all /\ - wizard hat plus:2 not_cursed ident:all /\ - wizard hat plus:0 good_item not_cursed ident:all /\ + hat plus:2 not_cursed ident:all /\ + hat plus:0 good_item not_cursed ident:all /\ large shield plus:5 not_cursed ident:all /\ large shield plus:3 good_item not_cursed ident:all /\ naga barding plus:4 not_cursed ident:all w:5 /\ diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des index 3fd6d39..a9e3f6d 100644 --- a/crawl-ref/source/dat/des/sprint/pitsprint.des +++ b/crawl-ref/source/dat/des/sprint/pitsprint.des @@ -281,8 +281,8 @@ function general_item_setup(e) helmet plus:2 good_item not_cursed ident:all /\ cloak plus:4 not_cursed ident:all /\ cloak plus:2 good_item not_cursed ident:all /\ - wizard hat plus:4 not_cursed ident:all /\ - wizard hat plus:2 good_item not_cursed ident:all /\ + hat plus:4 not_cursed ident:all /\ + hat plus:2 good_item not_cursed ident:all /\ large shield plus:5 not_cursed ident:all /\ large shield plus:3 good_item not_cursed ident:all /\ naga barding plus:6 not_cursed ident:all w:5 /\ @@ -339,8 +339,8 @@ function general_item_setup(e) helmet plus:0 good_item not_cursed ident:all /\ cloak plus:2 not_cursed ident:all /\ cloak plus:0 good_item not_cursed ident:all /\ - wizard hat plus:2 not_cursed ident:all /\ - wizard hat plus:0 good_item not_cursed ident:all /\ + hat plus:2 not_cursed ident:all /\ + hat plus:0 good_item not_cursed ident:all /\ large shield plus:3 not_cursed ident:all /\ large shield plus:0 good_item not_cursed ident:all /\ naga barding plus:2 not_cursed ident:all w:5 /\ diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des index 8bb6561..4ec478d 100644 --- a/crawl-ref/source/dat/des/variable/mini_monsters.des +++ b/crawl-ref/source/dat/des/variable/mini_monsters.des @@ -1828,8 +1828,8 @@ KMONS: 0 = orc ; robe race:orcish . wand of confusion | wand of slowing w:35 | wand of magic darts w:35 | wand of flame | wand of frost . \ potion of invisibility | potion of speed | nothing w:980 KMONS: 89 = deep elf mage -KITEM: 8d = robe / robe race:orcish, wizard hat w:40 / wizard hat good_item, \ - wizard hat w:20 / wizard hat good_item +KITEM: 8d = robe / robe race:orcish, hat w:40 / hat good_item, \ + hat w:20 / hat good_item KITEM: 9e = book of minor magic SUBST: - = + KMASK: de89 = no_item_gen @@ -2101,7 +2101,7 @@ MONS: wizard spells:venom_bolt;iskenderun's_mystic_blast;invisibility;\ # Cloud. MONS: tengu reaver spells:venom_bolt;.;iskenderun's_battlesphere;\ poisonous_cloud;iskenderun's_battlesphere;blink -ITEM: book of Power, robe good_item, wizard hat good_item, robe, wizard hat +ITEM: book of Power, robe good_item, hat good_item, robe, hat KFEAT: _ = altar_vehumet SHUFFLE: ef, gh, ij MAP diff --git a/crawl-ref/source/dat/descript/cs/items.txt b/crawl-ref/source/dat/descript/cs/items.txt index 1680f8d..1451f26 100644 --- a/crawl-ref/source/dat/descript/cs/items.txt +++ b/crawl-ref/source/dat/descript/cs/items.txt @@ -487,7 +487,7 @@ war axe Jednoruční vojenská sekera s dlouhou rukojetí a čepelí s jednou hlavicí. %%%% -wizard hat +hat Kuželovitý látkový klobouk. %%%% diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt index aac584c..3b86b50 100644 --- a/crawl-ref/source/dat/descript/da/items.txt +++ b/crawl-ref/source/dat/descript/da/items.txt @@ -1788,7 +1788,7 @@ Et langt, flettet stykke læder. Dette enkle våben blev oprindeligt brugt i uoverensstemmelser med kvæg, men bruges nu i uoverensstemmelser mellem alle mulige former for væsener. %%%% -wizard hat +hat En konisk stofhat. %%%% diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt index 6294b91..a1e6486 100644 --- a/crawl-ref/source/dat/descript/de/items.txt +++ b/crawl-ref/source/dat/descript/de/items.txt @@ -1705,7 +1705,7 @@ Ein langer gepflochtener-Streifen aus Leder. Ursprünglich entwickelt für den Gebrauch in Unstimmigkeiten mit dem Vieh wird diese einfache Waffe jetzt weit verwendet, um Unterschiede zwischen allen Sorten von Wesen zu setzen. %%%% -wizard hat +hat Ein kegelförmiger Stoffhut. %%%% diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt index 85bd4f1..639a6a7 100644 --- a/crawl-ref/source/dat/descript/fr/items.txt +++ b/crawl-ref/source/dat/descript/fr/items.txt @@ -1747,7 +1747,7 @@ whip Un fouet. %%%% -wizard hat +hat Un chapeau pointu. %%%% diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index 7946d14..1dcf43d 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -1796,9 +1796,9 @@ A long plaited strip of leather. Originally developed for use in disagreements with cattle, this simple weapon is now widely used to settle differences between all sorts of creatures. %%%% -wizard hat +hat -A conical cloth hat. +A cloth or leather hat. %%%% young poisoner's handbook diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt index 51d8592..d42ee26 100644 --- a/crawl-ref/source/dat/descript/ja/items.txt +++ b/crawl-ref/source/dat/descript/ja/items.txt @@ -1451,7 +1451,7 @@ war axe 長い柄と片刃の頭部を持つ軍隊用の片手斧だ。 %%%% -wizard hat +hat 円錐形をした布の帽子だ。 %%%% diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt index d5a93df..11838d9 100644 --- a/crawl-ref/source/dat/descript/ko/items.txt +++ b/crawl-ref/source/dat/descript/ko/items.txt @@ -1734,7 +1734,7 @@ whip 기다란 가죽을 여러 겹 꼬아서 만든 채찍이다. 원래는 가축을 조련할 때 쓰기 위해 만들었지만, 이 단순한 무기는 모든 존재들을 가축으로 보는 것 같다. %%%% -wizard hat +hat 천 재질의 모자다. 원뿔 모양을 하고 있다. %%%% diff --git a/crawl-ref/source/dat/descript/lv/items.txt b/crawl-ref/source/dat/descript/lv/items.txt index 7731ae1..9de54ce 100644 --- a/crawl-ref/source/dat/descript/lv/items.txt +++ b/crawl-ref/source/dat/descript/lv/items.txt @@ -121,7 +121,7 @@ strawberry Mazs, taču gards sarkans auglis. %%%% -wizard hat +hat Koniskas formas ādas cepure. %%%% diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt index 5c7a396..e3f3e7b 100644 --- a/crawl-ref/source/dat/descript/pl/items.txt +++ b/crawl-ref/source/dat/descript/pl/items.txt @@ -1609,7 +1609,7 @@ whip Bat z byczej skóry. %%%% -wizard hat +hat Szpiczasta czapka. %%%% diff --git a/crawl-ref/source/dat/descript/pt/items.txt b/crawl-ref/source/dat/descript/pt/items.txt index 2f401fd..c9bbc40 100644 --- a/crawl-ref/source/dat/descript/pt/items.txt +++ b/crawl-ref/source/dat/descript/pt/items.txt @@ -557,7 +557,7 @@ whip Um chicote. %%%% -wizard hat +hat Um chapéu de tecido cônico. %%%% diff --git a/crawl-ref/source/dat/descript/ru/items.txt b/crawl-ref/source/dat/descript/ru/items.txt index 72fcbf0..c2a17dc 100644 --- a/crawl-ref/source/dat/descript/ru/items.txt +++ b/crawl-ref/source/dat/descript/ru/items.txt @@ -1218,7 +1218,7 @@ war axe Одноручный боевой топор с длинной рукоятью и одинарным лезвием. %%%% -wizard hat +hat Шляпа конической формы, сделанная из ткани. %%%% diff --git a/crawl-ref/source/dat/descript/zh/items.txt b/crawl-ref/source/dat/descript/zh/items.txt index e73f7e2..8505e90 100644 --- a/crawl-ref/source/dat/descript/zh/items.txt +++ b/crawl-ref/source/dat/descript/zh/items.txt @@ -1418,7 +1418,7 @@ whip 一条由许多层皮革褶叠起来制成的皮鞭。这种简易武器最初是作为牧羊工具制作的，但用来教训其他种类的生物时一样好用。 %%%% -wizard hat +hat 一顶圆锥形布帽。 %%%% diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h index 0a29cc9..5af378c 100644 --- a/crawl-ref/source/itemprop-enum.h +++ b/crawl-ref/source/itemprop-enum.h @@ -12,8 +12,10 @@ enum armour_type ARM_CLOAK, +#if TAG_MAJOR_VERSION == 34 ARM_CAP, - ARM_WIZARD_HAT, +#endif + ARM_HAT, ARM_HELMET, ARM_GLOVES, diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 5ab1670..1e93973 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -122,10 +122,12 @@ static const armour_def Armour_prop[NUM_ARMOURS] = { ARM_HELMET, "helmet", 1, 0, 80, EQ_HELMET, SIZE_SMALL, SIZE_MEDIUM }, +#if TAG_MAJOR_VERSION == 34 { ARM_CAP, "cap", 0, 0, 40, EQ_HELMET, SIZE_LITTLE, SIZE_LARGE }, +#endif - { ARM_WIZARD_HAT, "wizard hat", 0, 0, 40, + { ARM_HAT, "hat", 0, 0, 40, EQ_HELMET, SIZE_LITTLE, SIZE_LARGE }, // Note that barding size is compared against torso so it currently @@ -889,7 +891,7 @@ void set_equip_race(item_def &item, iflags_t flags) break; case OBJ_ARMOUR: if (get_armour_slot(item) == EQ_HELMET && !is_hard_helmet(item) - && item.sub_type != ARM_WIZARD_HAT) + && item.sub_type != ARM_HAT) { return; } diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 52a4ade..aaeaa28 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -209,7 +209,7 @@ static int _armour_colour(const item_def &item) item_colour = RED; break; case ARM_CAP: - case ARM_WIZARD_HAT: + case ARM_HAT: case ARM_HELMET: item_colour = MAGENTA; break; @@ -2135,12 +2135,7 @@ static item_status_flag_type _determine_armour_race(const item_def& item, rc = ISFLAG_DWARVEN; break; - case ARM_CAP: - if (one_chance_in(6)) - rc = ISFLAG_ELVEN; - break; - - case ARM_WIZARD_HAT: + case ARM_HAT: if (one_chance_in(6)) rc = ISFLAG_ORCISH; if (one_chance_in(6)) @@ -2211,20 +2206,14 @@ static special_armour_type _determine_armour_ego(const item_def& item, -1); break; - case ARM_WIZARD_HAT: + case ARM_HAT: if (coinflip()) { - rc = (one_chance_in(3) ? SPARM_MAGIC_RESISTANCE - : SPARM_INTELLIGENCE); + rc = random_choose(SPARM_MAGIC_RESISTANCE, SPARM_INTELLIGENCE, + SPARM_SPIRIT_SHIELD, -1); } break; - case ARM_CAP: - if (one_chance_in(10)) - { - rc = SPARM_SPIRIT_SHIELD; - break; - } case ARM_HELMET: rc = coinflip() ? SPARM_SEE_INVISIBLE : SPARM_INTELLIGENCE; break; @@ -2358,7 +2347,7 @@ bool is_armour_brand_ok(int type, int brand, bool strict) return true; // in portal vaults, these can happen on every slot case SPARM_MAGIC_RESISTANCE: - if (type == ARM_WIZARD_HAT) + if (type == ARM_HAT) return true; // deliberate fall-through case SPARM_POISON_RESISTANCE: @@ -2370,7 +2359,7 @@ bool is_armour_brand_ok(int type, int brand, bool strict) || !strict; case SPARM_SPIRIT_SHIELD: - return type == ARM_CAP || slot == EQ_SHIELD || !strict; + return type == ARM_HAT || slot == EQ_SHIELD || !strict; case NUM_SPECIAL_ARMOURS: case NUM_REAL_SPECIAL_ARMOURS: die("invalid armour brand"); @@ -2455,7 +2444,7 @@ static void _generate_armour_item(item_def& item, bool allow_uniques, if (item_level == ISPEC_BAD) do_curse_item(item); } - else if ((forced_ego || item.sub_type == ARM_WIZARD_HAT + else if ((forced_ego || item.sub_type == ARM_HAT || x_chance_in_y(51 + item_level, 250)) && !item.is_mundane() || force_good) { @@ -3582,7 +3571,7 @@ static armour_type _get_random_armour_type(int item_level) if (armtype == ARM_HELMET && one_chance_in(3)) { - const armour_type hats[] = { ARM_CAP, ARM_WIZARD_HAT, ARM_HELMET }; + const armour_type hats[] = { ARM_HAT, ARM_HELMET }; armtype = RANDOM_ELEMENT(hats); } diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index 0c56933..28488c3 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -2213,7 +2213,7 @@ static void _give_armour(monster* mon, int level, bool spectral_orcs) case MONS_OCTOPODE: item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_ARMOUR; - item.sub_type = coinflip() ? ARM_WIZARD_HAT : ARM_CAP; + item.sub_type = ARM_HAT; break; case MONS_ANGEL: @@ -2297,7 +2297,7 @@ static void _give_armour(monster* mon, int level, bool spectral_orcs) { item_race = MAKE_ITEM_NO_RACE; item.base_type = OBJ_ARMOUR; - item.sub_type = ARM_WIZARD_HAT; + item.sub_type = ARM_HAT; // Not as good as it sounds. Still just +0 a lot of the time. level = MAKE_GOOD_ITEM; diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 2a2d684..00593bb 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -1885,8 +1885,7 @@ bool monster::pickup_armour(item_def &item, int near, bool force) } break; // And another hack or two... - case ARM_WIZARD_HAT: - case ARM_CAP: + case ARM_HAT: if (type == MONS_GASTRONOK || type == MONS_OCTOPODE) eq = EQ_BODY_ARMOUR; break; diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc index dc7372a..b1d9816 100644 --- a/crawl-ref/source/ng-setup.cc +++ b/crawl-ref/source/ng-setup.cc @@ -548,7 +548,7 @@ static void _give_items_skills(const newgame_def& ng) newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR, ARM_ANIMAL_SKIN); - newgame_make_item(2, EQ_HELMET, OBJ_ARMOUR, ARM_HELMET, ARM_CAP); + newgame_make_item(2, EQ_HELMET, OBJ_ARMOUR, ARM_HELMET, ARM_HAT); newgame_make_item(3, EQ_NONE, OBJ_MISSILES, MI_THROWING_NET, -1, 3); autopickup_starting_ammo(MI_THROWING_NET); @@ -741,7 +741,7 @@ static void _give_items_skills(const newgame_def& ng) case JOB_WIZARD: newgame_make_item(0, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_ROBE); - newgame_make_item(1, EQ_HELMET, OBJ_ARMOUR, ARM_WIZARD_HAT); + newgame_make_item(1, EQ_HELMET, OBJ_ARMOUR, ARM_HAT); newgame_make_item(2, EQ_NONE, OBJ_BOOKS, BOOK_MINOR_MAGIC); diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt index c0cbbb2..4a4c975 100644 --- a/crawl-ref/source/rltiles/dc-item.txt +++ b/crawl-ref/source/rltiles/dc-item.txt @@ -575,8 +575,8 @@ lshield_louise LSHIELD_LOUISE elven_leather_helm THELM_CAP cap_jester THELM_CAP_JESTER -wizard_hat1 THELM_WIZARD_HAT -wizard_hat2 +hat1 THELM_HAT +hat2 helmet1_visored THELM_HELM THELM_FIRST helmet2_etched diff --git a/crawl-ref/source/rltiles/item/armour/headgear/hat1.png b/crawl-ref/source/rltiles/item/armour/headgear/hat1.png new file mode 100644 index 0000000000000000000000000000000000000000..2a3334f357fd8197d9b071ca00e5ce126ef3adb8 GIT binary patch literal 431 zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004MNkl<ZScUDD z&2hpo5QU#J6ro#G0wuT%A1T2l<jBz_aC8|iffCG3T_^{#%JWLHY{wij_?ux6V!ZF| zj|9NM!NI#zy)t;$4c-_F=f=r?+txvMcLQBFcv*|Myl%IzNN+a-A}pfDSlsUe0A$5? zF~GtCXAK}L{wD)DVE`fXk~jdIwu&2LVaz9-djxSYz-=h8$$;S8Bbspje7#<Z75-Q& z%GnDtaN5igRvQqc^uV*{=W`v*@Oz0>Es*RrEGp}z)mUADQeYm$B@~CG??<l#^MuRv z^M1+%U%y2IEXqQud!5Z`xHa;8)7Xh-)B+Lb0DQs7CBxZq@8@uCl=wj-s(>yzXCV8j zN^rHbxfD%f0icR1@bg8;DtD{ttmmr0W}mTs?~v3CcmNm%KRN5UfF)9<BuM~O?i7R` z%^A_A^hwY&)V8&LENdV#0swtKhBf~X%|Y2tgrmh8BO7_?-@k+Z%Qv6D>z>zXOo;#h Z002ovPDHLkV1fVu002ovPDHLkV1lu{zHk5l literal 0 HcmV?d00001 diff --git a/crawl-ref/source/rltiles/item/armour/headgear/hat2.png b/crawl-ref/source/rltiles/item/armour/headgear/hat2.png new file mode 100644 index 0000000000000000000000000000000000000000..2a37b4d47b12d28ec3a3c3786bbdfb87453312bd GIT binary patch literal 455 zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004kNkl<ZScUDD z(UF575Qe|pTmf_tN=OH1DV9J9lwb)d#S$!mbU+8*16f@`6LrkP&H2wT*^z<o-(_I} zr%s*v@49?+_qOh_211;EukHi)cmr+S53#^y__p93XF$LLwFcUd<`&?`7<hvHk0m}L zjR5tycZ;0;1~M=}BWJBMe*p*h-VL_~e>G*+z-;3kY9N<}NxUL^fUnK4JbT@68opAy zD&VgsGZm)Yzd_q7Q2CVoBg;@jC0<#D?ML8lWd#JN?|yWvwtIgKgX;%?w_q&TDtU2D z>H&d=2<;ObTJT}qM?Jsq4QQw?sUyLSP2c2K6hj&kivisqwwW-?BM`VO6gYs3BR~W7 z&~wG!QT87g%RQi<QZZr;)LjYFlDQ^J!Wxy3LrjzgY%^UjbG=;Cfotb0P<PX_mt=IT zns}}UQh9n0`E{Gy@SWz~1xXSvOSfR`gI7j!Q@UDt0|Qj|eAS|X(g?`eC0)%rV`H`x xa1m@WvQMA=`*-Tk>K7bU;GF7UJ<0$8002ovPDHLkV1fVu002ovPDHLkV1j=C#a93T literal 0 HcmV?d00001 diff --git a/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat1.png b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat1.png deleted file mode 100644 index 2a3334f357fd8197d9b071ca00e5ce126ef3adb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004MNkl<ZScUDD z&2hpo5QU#J6ro#G0wuT%A1T2l<jBz_aC8|iffCG3T_^{#%JWLHY{wij_?ux6V!ZF| zj|9NM!NI#zy)t;$4c-_F=f=r?+txvMcLQBFcv*|Myl%IzNN+a-A}pfDSlsUe0A$5? zF~GtCXAK}L{wD)DVE`fXk~jdIwu&2LVaz9-djxSYz-=h8$$;S8Bbspje7#<Z75-Q& z%GnDtaN5igRvQqc^uV*{=W`v*@Oz0>Es*RrEGp}z)mUADQeYm$B@~CG??<l#^MuRv z^M1+%U%y2IEXqQud!5Z`xHa;8)7Xh-)B+Lb0DQs7CBxZq@8@uCl=wj-s(>yzXCV8j zN^rHbxfD%f0icR1@bg8;DtD{ttmmr0W}mTs?~v3CcmNm%KRN5UfF)9<BuM~O?i7R` z%^A_A^hwY&)V8&LENdV#0swtKhBf~X%|Y2tgrmh8BO7_?-@k+Z%Qv6D>z>zXOo;#h Z002ovPDHLkV1fVu002ovPDHLkV1lu{zHk5l diff --git a/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat2.png b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat2.png deleted file mode 100644 index 2a37b4d47b12d28ec3a3c3786bbdfb87453312bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004kNkl<ZScUDD z(UF575Qe|pTmf_tN=OH1DV9J9lwb)d#S$!mbU+8*16f@`6LrkP&H2wT*^z<o-(_I} zr%s*v@49?+_qOh_211;EukHi)cmr+S53#^y__p93XF$LLwFcUd<`&?`7<hvHk0m}L zjR5tycZ;0;1~M=}BWJBMe*p*h-VL_~e>G*+z-;3kY9N<}NxUL^fUnK4JbT@68opAy zD&VgsGZm)Yzd_q7Q2CVoBg;@jC0<#D?ML8lWd#JN?|yWvwtIgKgX;%?w_q&TDtU2D z>H&d=2<;ObTJT}qM?Jsq4QQw?sUyLSP2c2K6hj&kivisqwwW-?BM`VO6gYs3BR~W7 z&~wG!QT87g%RQi<QZZr;)LjYFlDQ^J!Wxy3LrjzgY%^UjbG=;Cfotb0P<PX_mt=IT zns}}UQh9n0`E{Gy@SWz~1xXSvOSfR`gI7j!Q@UDt0|Qj|eAS|X(g?`eC0)%rV`H`x xa1m@WvQMA=`*-Tk>K7bU;GF7UJ<0$8002ovPDHLkV1fVu002ovPDHLkV1j=C#a93T diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index a7ca15d..c7be0d4 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -1626,8 +1626,10 @@ unsigned int item_value(item_def item, bool ident) break; case ARM_HELMET: +#if TAG_MAJOR_VERSION == 34 case ARM_CAP: - case ARM_WIZARD_HAT: +#endif + case ARM_HAT: case ARM_BUCKLER: valued += 25; break; diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index e0e9749..07b8fb9 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -388,13 +388,15 @@ tileidx_t tilep_equ_helm(const item_def &item) switch (item.sub_type) { +#if TAG_MAJOR_VERSION == 34 case ARM_CAP: return _modrng(item.rnd, TILEP_HELM_CAP_FIRST_NORM, TILEP_HELM_CAP_LAST_NORM); - case ARM_WIZARD_HAT: - return _modrng(item.rnd, TILEP_HELM_WHAT_FIRST_NORM, - TILEP_HELM_WHAT_LAST_NORM); +#endif + case ARM_HAT: + return _modrng(item.rnd, TILEP_HELM_HAT_FIRST_NORM, + TILEP_HELM_HAT_LAST_NORM); case ARM_HELMET: return _modrng(item.rnd, TILEP_HELM_FIRST_NORM, diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 6f609d1..8491ce3 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -3466,11 +3466,13 @@ static tileidx_t _tileidx_armour_base(const item_def &item) case ARM_CLOAK: return TILE_ARM_CLOAK; - case ARM_WIZARD_HAT: - return TILE_THELM_WIZARD_HAT; + case ARM_HAT: + return TILE_THELM_HAT; +#if TAG_MAJOR_VERSION == 34 case ARM_CAP: return TILE_THELM_CAP; +#endif case ARM_HELMET: return _modrng(item.rnd, TILE_THELM_FIRST, TILE_THELM_LAST); -- 1.8.1.4

From 353b5d567f907b6a9edef11071fa5a2ab08392dc Mon Sep 17 00:00:00 2001 From: wheals <shm.mark@gmail.com> Date: Wed, 1 Jan 2014 12:21:55 -0500 Subject: [PATCH 2/2] Actually stop caps from generating I forgot to update map descs. --- crawl-ref/source/dat/des/branches/abyss.des | 2 +- crawl-ref/source/dat/des/branches/forest.des | 2 +- crawl-ref/source/dat/des/builder/food.des | 2 +- crawl-ref/source/dat/des/portals/icecave.des | 6 +++--- crawl-ref/source/dat/des/portals/trove.des | 14 +++++++------- crawl-ref/source/dat/des/portals/volcano.des | 2 +- crawl-ref/source/dat/des/sprint/arena_sprint.des | 2 +- crawl-ref/source/dat/des/variable/encompass.des | 2 +- crawl-ref/source/dat/des/variable/mini_monsters.des | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des index c2270ae..504183b 100644 --- a/crawl-ref/source/dat/des/branches/abyss.des +++ b/crawl-ref/source/dat/des/branches/abyss.des @@ -1333,7 +1333,7 @@ KITEM: 24d = scroll of curse weapon w:5 q:1 / \ KITEM: 13e = rod of striking w:2 / wand of slowing / wand of magic darts / \ wand of flame w:5 / wand of frost w:5 / lamp of fire w:2 / \ plain deck w:2 / whip not_cursed w:2 / \ - cap not_cursed mundane race:none w:5 + hat not_cursed mundane race:none w:5 KITEM: f = abyssal rune of zot mimic, abyssal rune of zot mimic KITEM: g = abyssal rune of zot mimic, abyssal rune of zot SHUFFLE: 14 / 23 diff --git a/crawl-ref/source/dat/des/branches/forest.des b/crawl-ref/source/dat/des/branches/forest.des index cef67fb..7330c3a 100644 --- a/crawl-ref/source/dat/des/branches/forest.des +++ b/crawl-ref/source/dat/des/branches/forest.des @@ -1204,7 +1204,7 @@ KMONS: R = plant KMONS: Q = bush KMONS: K = giant firefly KITEM: f = dagger / short sword / cutlass / flail / whip / blowgun / bow -KITEM: g = robe / cloak / cap / buckler / steam dragon armour w:1 +KITEM: g = robe / cloak / hat / buckler / steam dragon armour w:1 KMONS: L = spriggan ; robe . dagger KITEM: h = bread ration q:2 COLOUR: C = white diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des index 9d24c2d..565d484 100644 --- a/crawl-ref/source/dat/des/builder/food.des +++ b/crawl-ref/source/dat/des/builder/food.des @@ -390,7 +390,7 @@ ENDMAP # 20.8k/23.8k/12.0k # Welcome to Pandemonium Pizzeria; is this for carry-out or delivery? -# (Ideally the cashier would have a silly cap, but they can't wear caps.) +# (Ideally the cashier would have a silly hat, but they can't wear hats.) NAME: grunt_pizzeria DEPTH: D:8-14 : food_weight(_G, 8) diff --git a/crawl-ref/source/dat/des/portals/icecave.des b/crawl-ref/source/dat/des/portals/icecave.des index 2c070b6..cc2c395 100644 --- a/crawl-ref/source/dat/des/portals/icecave.des +++ b/crawl-ref/source/dat/des/portals/icecave.des @@ -513,7 +513,7 @@ ITEM: great mace good_item / battleaxe good_item / glaive good_item / \ : " / battleaxe " .. goodfreezeweap .. " / glaive " .. goodfreezeweap .. : " / halberd " .. goodfreezeweap .. " / great sword " .. goodfreezeweap .. : " / nothing w:80") -: item("cap " .. coldres .. " / cloak " .. coldres .. +: item("hat " .. coldres .. " / cloak " .. coldres .. : " / shield " .. coldres .. " / large shield " .. coldres .. : " / animal skin " .. coldres .. " / nothing w:60") ITEM: potion of resistance w:5 / potion of beneficial mutation / \ @@ -658,7 +658,7 @@ ITEM: nothing KITEM: de = book of ice / book of frost / randbook disc:ice numspells:6 w:2 : end -: item("cap " .. coldres .. " / pair of gloves " .. coldres .. +: item("hat " .. coldres .. " / pair of gloves " .. coldres .. : " / cloak " .. coldres .. " / naga barding " .. coldres .. " w:5 " .. : " / centaur barding " .. coldres .. " / buckler " .. coldres .. " w:5 " .. : " / helmet " .. coldres) @@ -760,7 +760,7 @@ SUBST: ` = . : " / claymore " .. goodfreezeweap .. " / demon trident " .. goodfreezeweap .. : " / giant spiked club " .. goodfreezeweap) ITEM: demon whip good_item / demon blade good_item / demon trident good_item -: item("cap " .. coldres .. " / pair of gloves " .. coldres .. +: item("hat " .. coldres .. " / pair of gloves " .. coldres .. : " / cloak " .. coldres .. " / buckler " .. coldres .. : " / pair of boots " .. coldres) : item("crystal plate armour " .. coldres .. diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des index 07325c7..d027412 100644 --- a/crawl-ref/source/dat/des/portals/trove.des +++ b/crawl-ref/source/dat/des/portals/trove.des @@ -874,11 +874,11 @@ ITEM: ring of evasion unrand:ring_of_shaolin / any randart jewellery w:60 /\ amulet of warding unrand:amulet_of_cekugob /\ amulet of warding unrand:brooch_of_shielding /\ amulet of rage unrand:necklace_of_bloodlust /\ - helmet unrand:crown_of_dyrovepreva / randart helmet / randart cap /\ - cap unrand:mask_of_the_dragon / randart hat /\ - cap unrand:hat_of_the_bear_spirit /\ - hat unrand:hat_of_the_alchemist / randart pair of gloves /\ - hat unrand:hat_of_pondering / randart pair of boots /\ + hat unrand:crown_of_dyrovepreva / randart helmet / randart hat /\ + hat unrand:mask_of_the_dragon / randart hat /\ + hat unrand:hat_of_the_bear_spirit /\ + hat unrand:hat_of_the_alchemist / randart pair of gloves /\ + hat unrand:hat_of_pondering / randart pair of boots /\ pair of gloves unrand:gauntlets_of_war /\ pair of gloves unrand:fencers_gloves /\ naga barding unrand:lightning_scales /\ @@ -888,8 +888,8 @@ ITEM: dagger unrand:vampires_tooth / dagger unrand:dagger_of_chilly_death /\ dagger unrand:morg / great sword unrand:sword_of_the_doom_knight /\ great sword unrand:sword_of_power / demon blade unrand:bloodbane /\ scimitar unrand:scimitar_of_flaming_death / broad axe unrand:arga /\ - broad axe unrand:obsidian_axe / claymore unrand:plutonium_sword /\ - demon blade unrand:leech / bastard sword unrand:sword_of_zonguldrok /\ + broad axe unrand:obsidian_axe / claymore unrand:plutonium_sword /\ + demon blade unrand:leech / bastard sword unrand:sword_of_zonguldrok /\ staff of poison unrand:staff_of_olgreb / scythe unrand:finisher /\ quarterstaff unrand:elemental_staff / mace unrand:devastator /\ staff of energy unrand:staff_of_wucad_mu /\ diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des index 5ac474b..17e43ed 100644 --- a/crawl-ref/source/dat/des/portals/volcano.des +++ b/crawl-ref/source/dat/des/portals/volcano.des @@ -192,7 +192,7 @@ function setup_loot (e) e.item(make_fiery_armour(e, {"robe w:30", "animal skin w:30", "leather armour w:30", "ring mail w:30", "scale mail w:20", "chain mail w:40", "plate armour w:10", "pair of gloves w:5", - "helmet w:6", "pair of boots w:3", "cap w:2", "hat w:2", + "helmet w:6", "pair of boots w:3", "hat w:4", "shield w:1", "buckler w:3"}) .. " / fire dragon armour w:5") e.item([[potion of berserk rage w:20 / potion of poison w:2 / potion of might w:5 / potion of brilliance w:5 / diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des index 0508d64..9f5551c 100644 --- a/crawl-ref/source/dat/des/sprint/arena_sprint.des +++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des @@ -1063,7 +1063,7 @@ KFEAT: I = antiques shop type:Jewellery count:17 greed:9 ; \ any jewellery randart KFEAT: K = antique armour shop count:17 use_all type:Advanced suffix:Armour greed:35 ; \ pair of gloves randart | pair of gloves randart | pair of boots randart |\ - pair of boots randart | helmet randart | cap randart | buckler randart |\ + pair of boots randart | helmet randart | hat randart | buckler randart |\ shield randart | cloak randart | cloak randart | robe randart | animal skin randart |\ large shield randart | robe randart | buckler randart | hat randart |\ leather armour randart diff --git a/crawl-ref/source/dat/des/variable/encompass.des b/crawl-ref/source/dat/des/variable/encompass.des index 6e3a081..b6f4b13 100644 --- a/crawl-ref/source/dat/des/variable/encompass.des +++ b/crawl-ref/source/dat/des/variable/encompass.des @@ -385,7 +385,7 @@ KMONS: Q = bush KMONS: e = bat skeleton KMONS: K = giant firefly KITEM: f = dagger / short sword / cutlass / flail / whip / blowgun / bow -KITEM: g = robe / cloak / cap / buckler / steam dragon armour w:1 +KITEM: g = robe / cloak / hat / buckler / steam dragon armour w:1 KMONS: L = spriggan ; robe . dagger KITEM: h = bread ration q:2 KMONS: M = yak diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des index 4ec478d..fec20fc 100644 --- a/crawl-ref/source/dat/des/variable/mini_monsters.des +++ b/crawl-ref/source/dat/des/variable/mini_monsters.des @@ -5084,7 +5084,7 @@ DEPTH: Depths WEIGHT: 3 MONS: patrolling crystal golem name:crystal_guardian n_rpl n_des spells:bolt_of_fire;bolt_of_cold MONS: orange crystal statue -ITEM: cap unrand:crown_of_dyrovepreva no_pickup +ITEM: hat unrand:crown_of_dyrovepreva no_pickup KPROP: 12d' = no_rtele_into SUBST: ' = . MAP -- 1.8.1.4

From ed98954da913275d81d80683a0de6aa931970271 Mon Sep 17 00:00:00 2001 From: wheals <shm.mark@gmail.com> Date: Tue, 7 Jan 2014 20:03:19 -0500 Subject: [PATCH 4/4] Reweight hat brands. 3/8 MR, 1/4 SInv, 1/4 Int+3, 1/8 spirit shield. Also fix a few other things related to cap removal. --- crawl-ref/source/dat/des/sprint/arena_sprint.des | 3 +-- crawl-ref/source/makeitem.cc | 13 ++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des index 9f5551c..0c0083f 100644 --- a/crawl-ref/source/dat/des/sprint/arena_sprint.des +++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des @@ -1065,8 +1065,7 @@ KFEAT: K = antique armour shop count:17 use_all type:Advanced suffix:Armour gre pair of gloves randart | pair of gloves randart | pair of boots randart |\ pair of boots randart | helmet randart | hat randart | buckler randart |\ shield randart | cloak randart | cloak randart | robe randart | animal skin randart |\ - large shield randart | robe randart | buckler randart | hat randart |\ - leather armour randart + large shield randart | robe randart | buckler randart | leather armour randart KFEAT: L = armour shop count:17 greed:12 type:Basic suffix:Armour use_all ; \ mundane not_cursed storm dragon armour | mundane not_cursed fire dragon armour |\ mundane not_cursed ice dragon armour | mundane not_cursed gold dragon armour |\ diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index ff3de28..dcbf611 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2211,8 +2211,11 @@ static special_armour_type _determine_armour_ego(const item_def& item, case ARM_HAT: if (coinflip()) { - rc = random_choose(SPARM_MAGIC_RESISTANCE, SPARM_INTELLIGENCE, - SPARM_SPIRIT_SHIELD, -1); + rc = random_choose_weighted(3, SPARM_MAGIC_RESISTANCE, + 2, SPARM_INTELLIGENCE, + 2, SPARM_SEE_INVISIBLE + 1, SPARM_SPIRIT_SHIELD, + 0); } break; @@ -2361,7 +2364,11 @@ bool is_armour_brand_ok(int type, int brand, bool strict) || !strict; case SPARM_SPIRIT_SHIELD: - return type == ARM_HAT || slot == EQ_SHIELD || !strict; + return type == ARM_HAT || +#if TAG_MAJOR_VERSION == 34 + type == ARM_CAP || +#endif + slot == EQ_SHIELD || !strict; case NUM_SPECIAL_ARMOURS: case NUM_REAL_SPECIAL_ARMOURS: die("invalid armour brand"); -- 1.8.1.4

Issue History
Date Modified	Username	Field	Change
2013-12-31 19:07	wheals	New Issue
2013-12-31 19:07	wheals	File Added: 0001-Remove-caps-rename-wizards-hats-hats.patch
2014-01-01 18:10	wheals	Note Added: 0024900
2014-01-01 18:22	wheals	File Added: 0002-Actually-stop-caps-from-generating.patch
2014-01-02 00:33	wheals	File Added: 0003-Set-another-cap-reference-to-be-removed-on-save-bump.patch
2014-01-02 00:33	wheals	Note Edited: 0024900
2014-01-03 13:03	Kate	Issue Monitored: Kate
2014-01-08 02:06	wheals	File Added: 0004-Reweight-hat-brands.patch
2014-01-12 14:23	Kate	Note Added: 0024976
2014-01-12 14:23	Kate	Status	new => resolved
2014-01-12 14:23	Kate	Fixed in Branch	=> 0.14 development branch
2014-01-12 14:23	Kate	Resolution	open => done
2014-01-12 14:23	Kate	Assigned To	=> Kate
2014-01-12 14:24	Kate	Issue End Monitor: Kate
2014-01-28 00:42	wheals	Status	resolved => closed

Notes
(0024900) wheals (administrator) 2014-01-01 18:10 edited on: 2014-01-02 00:33	Oops, forgot to check whether any vaults place caps. I'll upload a patch fixing any of those ASAP. EDIT: also missed another reference to caps.

(0024976) Kate (developer) 2014-01-12 14:23	Pushed, thanks for the patch.

Relationships