Dungeon Crawl Stone Soup Tracker - DCSS
The scroll's effect is an interesting one, but they were too rare to get much use. This patch increases their appearance to curse weapon levels, somewhat reducing the weight of remove curse scroll generation.
purge_magic_scroll2.patch [^] (20,481 bytes) 2014-02-15 07:48 [Show Content] [Hide Content]From b4f7c90ba04056383a152e6e60f204a384ed89f0 Mon Sep 17 00:00:00 2001
From: Nikhil Addleman <wizardosiris@gmail.com>
Date: Thu, 13 Feb 2014 14:20:05 -0700
Subject: [PATCH 1/2] Rename scroll of vulnerability to scroll of purge magic
This emphasizes the scroll's utility at removing magical effects.
Signed-off-by: Nikhil Addleman <wizardosiris@gmail.com>
---
crawl-ref/source/dat/des/portals/bailey.des | 2 +-
crawl-ref/source/dat/des/portals/sewer.des | 2 +-
crawl-ref/source/dat/des/portals/trove.des | 4 ++--
crawl-ref/source/dat/des/sprint/arena_sprint.des | 2 +-
crawl-ref/source/dat/des/sprint/pitsprint.des | 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 | 2 +-
crawl-ref/source/dat/descript/ja/items.txt | 2 +-
crawl-ref/source/dat/descript/ko/items.txt | 2 +-
crawl-ref/source/dat/descript/pl/items.txt | 2 +-
crawl-ref/source/dat/descript/quotes.txt | 2 +-
crawl-ref/source/dat/descript/ru/items.txt | 2 +-
crawl-ref/source/dat/descript/zh/items.txt | 2 +-
crawl-ref/source/dat/dlua/dungeon.lua | 2 +-
crawl-ref/source/item_use.cc | 6 +++---
crawl-ref/source/itemname.cc | 2 +-
crawl-ref/source/itemprop-enum.h | 2 +-
crawl-ref/source/makeitem.cc | 2 +-
crawl-ref/source/rltiles/dc-item.txt | 2 +-
crawl-ref/source/rltiles/item/scroll/i-purge_magic.png | Bin 0 -> 178 bytes
crawl-ref/source/rltiles/item/scroll/i-vulnerability.png | Bin 178 -> 0 bytes
crawl-ref/source/shopping.cc | 2 +-
24 files changed, 25 insertions(+), 25 deletions(-)
create mode 100644 crawl-ref/source/rltiles/item/scroll/i-purge_magic.png
delete mode 100644 crawl-ref/source/rltiles/item/scroll/i-vulnerability.png
diff --git a/crawl-ref/source/dat/des/portals/bailey.des b/crawl-ref/source/dat/des/portals/bailey.des
index fc60c38..0d022bb 100644
--- a/crawl-ref/source/dat/des/portals/bailey.des
+++ b/crawl-ref/source/dat/des/portals/bailey.des
@@ -840,7 +840,7 @@ SUBST: D : d, E = 1.., F : 3, G : .
NSUBST: d = 3:d / *:$
ITEM: scroll of enchant armour q:2 / scroll of enchant weapon III q:2 /\
scroll of acquirement w:5 / scroll of silence q:3 /\
- scroll of fog q:3 / scroll of vulnerability q:3 /\
+ scroll of fog q:3 / scroll of purge magic q:3 /\
scroll of recharging q:3 / scroll of immolation q:3 /\
any good_item book w:30 /\
book of annihilations w:1 / grand grimoire w:1 / necronomicon w:1
diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des
index 2a313bc..28b8e49 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 / hat / \
+ITEM: scroll of purge magic / 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
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index 02501c2..eb5f28b 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -180,14 +180,14 @@ end
-- "any scroll good_item" still gets you 'scroll of noise', 'scroll of curse weapon', etc
-- so let's limit it to the enchant/recharge scrolls, tloc scrolls, identify scrolls,
--- mapping scrolls with a low chance of silence, vulnerability or acquirement (lowest)
+-- mapping scrolls with a low chance of silence, purge magic or acquirement (lowest)
function trove.good_scroll (e)
e.item([[scroll of enchant weapon i / scroll of enchant weapon ii /
scroll of enchant weapon iii w:5 / scroll of brand weapon w:3 /
scroll of enchant armour / scroll of identify w:20 /
scroll of magic mapping w:5 / scroll of blinking / scroll of silence w:2 /
scroll of recharging / scroll of acquirement w:1 / scroll of teleportation w:20 /
- scroll of vulnerability w:2 / scroll of holy word w:8 / scroll of fog w:8]])
+ scroll of purge magic w:2 / scroll of holy word w:8 / scroll of fog w:8]])
end
function trove.place_fog(e, type, strength)
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index 7bdbd1d..53d74a9 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1044,7 +1044,7 @@ KFEAT: EP = scroll shop greed:10 use_all count:17 ; \
scroll of blinking q:3 | scroll of blinking q:4 | scroll of blinking q:5 |\
scroll of fog q:3 | scroll of fog q:4 | scroll of fog q:5 |\
scroll of recharging q:3 | scroll of recharging q:3 | scroll of recharging q:3 |\
- scroll of silence q:3 | scroll of brand weapon | scroll of vulnerability q:3 |\
+ scroll of silence q:3 | scroll of brand weapon | scroll of purge magic q:3 |\
scroll of amnesia q:5 | scroll of remove curse q:15 | scroll of enchant weapon iii q:6 |\
scroll of enchant armour q:4 | scroll of enchant armour q:4
KFEAT: FS = distillery shop use_all count:17 greed:10 ; \
diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
index d104bad..ab7f080 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -675,7 +675,7 @@ KITEM: a = bread ration q:7, \
KITEM: b = scroll of summoning ident:all q:1, \
scroll of amnesia q:5 ident:all, \
scroll of remove curse q:3 ident:all, \
- scroll of vulnerability q:2 ident:all
+ scroll of purge magic q:2 ident:all
KITEM: c = staff of energy ident:all, \
stone q:10
KITEM: d = potion of invisibility ident:all q:2, \
diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt
index bad552f..3d7d157 100644
--- a/crawl-ref/source/dat/descript/da/items.txt
+++ b/crawl-ref/source/dat/descript/da/items.txt
@@ -1478,7 +1478,7 @@ Denne skriftrulle påkalder sig mørkets kræfter for at påføre væsener i næ
store smerter – inklusive dig! Dette halverer alle levende væseners livskraft,
men er aldrig decideret dødbringende.
%%%%
-scroll of vulnerability
+scroll of purge magic
Denne skriftrulle fjerner alle magiske fortryllelser fra læseren og fra væsener
i nærheden. Magisk modstandskraft hos læseren og andre væsener i nærheden vil
diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt
index f3ad62f..5a5ebd1 100644
--- a/crawl-ref/source/dat/descript/de/items.txt
+++ b/crawl-ref/source/dat/descript/de/items.txt
@@ -1415,7 +1415,7 @@ Diese Schriftrolle fordert die Mächte der Dunkelheit auf, großen Schmerz jedem
nahe gelegenen Wesen — einschließlich Ihrer zuzufügen! Das Hälften der
Elastizität aller lebenden Wesen, obwohl nie direkt tödlich ist.
%%%%
-scroll of vulnerability
+scroll of purge magic
Diese Schriftrolle annulliert das ganze magische Entzücken vom Leser und von
Wesen in der Umgebung. Außerdem werden die magischen Widerstände des Lesers und
diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt
index dd7ad70..c2ca906 100644
--- a/crawl-ref/source/dat/descript/fr/items.txt
+++ b/crawl-ref/source/dat/descript/fr/items.txt
@@ -1433,7 +1433,7 @@ douleur sur toute les créatures à proximité – y compris vous ! Ceci traver
moitié de la résistance de toutes les créatures vivantes, bien que ce ne soit
jamais directement fatale.
%%%%
-scroll of vulnerability
+scroll of purge magic
Ce parchemin annule tous les enchantements magiques du lecteur et des êtres
dans le voisinage. En outre, les résistances magiques du lecteur et des êtres
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 43d584b..11fd50c 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1471,7 +1471,7 @@ This scroll calls on the powers of darkness to inflict great pain on any nearby
creature — including you! This halves the resilience of all living creatures,
although is never directly fatal.
%%%%
-scroll of vulnerability
+scroll of purge magic
This scroll cancels all magical enchantments from the reader and from beings in
the vicinity. Also, the magical resistances of the reader and nearby beings are
diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt
index bd55578..a9320fa 100644
--- a/crawl-ref/source/dat/descript/ja/items.txt
+++ b/crawl-ref/source/dat/descript/ja/items.txt
@@ -1218,7 +1218,7 @@ scroll of torment
この巻物は周囲の者に非常に大きな苦痛を与える暗黒の力を呼び出す—自分も含めるぞ！
これは全ての生物の体力を半分にしてしまうが、決して命に関わることはない。
%%%%
-scroll of vulnerability
+scroll of purge magic
この巻物は読み手とその周辺の存在にかかっている全ての魔法の効果を取り消す。また、
少しの間、読み手や近くの存在の魔法抵抗力を半分にする。
diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt
index 450f58d..d5f227e 100644
--- a/crawl-ref/source/dat/descript/ko/items.txt
+++ b/crawl-ref/source/dat/descript/ko/items.txt
@@ -1446,7 +1446,7 @@ scroll of torment
고통을 가한다. 모든 생명체의 체력을 절반으로 깎지만, 이 고통으로 생명체가
죽지는 않는다.
%%%%
-scroll of vulnerability
+scroll of purge magic
이 두루마리는 사용자와 그 부근의 존재들에게 걸린 모든 마법적 효과를 제거하며,
짧은 시간 동안 마법 저항력을 반으로 줄인다. 뒤의 효과는 마법 저항력이 완전히
diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt
index 4011068..63db206 100644
--- a/crawl-ref/source/dat/descript/pl/items.txt
+++ b/crawl-ref/source/dat/descript/pl/items.txt
@@ -1274,7 +1274,7 @@ Ten zwój używa mocy sił ciemności aby zesłać straszliwe cierpienie na wszy
żywe istoty w pobliżu — łącznie z tobą! Powoduje to znaczną utratę zdrowia,
jednakże nigdy samo z siebie nie powoduje śmierci.
%%%%
-scroll of vulnerability
+scroll of purge magic
Ten zwój przerywa działanie wszelkich czarów rzuconych na czytającego i na
istoty w pobliżu. Także, odporność na uroki, zarówno czytającego i tych w
diff --git a/crawl-ref/source/dat/descript/quotes.txt b/crawl-ref/source/dat/descript/quotes.txt
index eecb1ea..409f4ea 100644
--- a/crawl-ref/source/dat/descript/quotes.txt
+++ b/crawl-ref/source/dat/descript/quotes.txt
@@ -2538,7 +2538,7 @@ scroll of torment
<scroll>
%%%%
-scroll of vulnerability
+scroll of purge magic
<scroll>
%%%%
diff --git a/crawl-ref/source/dat/descript/ru/items.txt b/crawl-ref/source/dat/descript/ru/items.txt
index 930ac8b..dc46dc5 100644
--- a/crawl-ref/source/dat/descript/ru/items.txt
+++ b/crawl-ref/source/dat/descript/ru/items.txt
@@ -999,7 +999,7 @@ scroll of torment
здоровье всех живых существ, однако никогда не приведёт непосредственно к
смерти.
%%%%
-scroll of vulnerability
+scroll of purge magic
Этот свиток снимает все чары, наложенные на того, кто прочёл его, а также тех,
кто находится поблизости. Кроме того, он ненадолго наполовину снижает
diff --git a/crawl-ref/source/dat/descript/zh/items.txt b/crawl-ref/source/dat/descript/zh/items.txt
index f69385b..5a9100a 100644
--- a/crawl-ref/source/dat/descript/zh/items.txt
+++ b/crawl-ref/source/dat/descript/zh/items.txt
@@ -1131,7 +1131,7 @@ scroll of torment
这个卷轴将黑暗力量导入这个世界中，让附近的所有生物（包括你自己！）
承受极大的痛苦。它能将所有活着的生物体力削减一半，但不会直接杀死任何生物。
%%%%
-scroll of vulnerability
+scroll of purge magic
这个卷轴能消除使用者和其附近所有存在身上的一切魔法效果。另外，
使用者和其附近生物的魔法抗性在短时间内减半（完全免疫魔法的生物不受影响）。
diff --git a/crawl-ref/source/dat/dlua/dungeon.lua b/crawl-ref/source/dat/dlua/dungeon.lua
index 56ad35c..e3ae8fd 100644
--- a/crawl-ref/source/dat/dlua/dungeon.lua
+++ b/crawl-ref/source/dat/dlua/dungeon.lua
@@ -674,7 +674,7 @@ dgn.good_scrolls = [[
w:1 scroll of acquirement no_pickup q:3 /
w:10 scroll of brand weapon no_pickup /
w:10 scroll of torment no_pickup /
- w:10 scroll of vulnerability no_pickup
+ w:10 scroll of purge magic no_pickup
]]
-- Returns true if point1 is inside radius(X, point2).
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index e3fa8c2..aaf2285 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2790,7 +2790,7 @@ retry:
return false;
}
-static void _vulnerability_scroll()
+static void _purge_magic_scroll()
{
// First cast antimagic on yourself.
antimagic();
@@ -3254,8 +3254,8 @@ void read_scroll(int slot)
cast_silence(30);
break;
- case SCR_VULNERABILITY:
- _vulnerability_scroll();
+ case SCR_PURGE_MAGIC:
+ _purge_magic_scroll();
break;
case SCR_AMNESIA:
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 0082e34..560c564 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -712,7 +712,7 @@ static const char* scroll_type_name(int scrolltype)
case SCR_RECHARGING: return "recharging";
case SCR_ENCHANT_WEAPON_III: return "enchant weapon III";
case SCR_HOLY_WORD: return "holy word";
- case SCR_VULNERABILITY: return "vulnerability";
+ case SCR_PURGE_MAGIC: return "purge magic";
case SCR_SILENCE: return "silence";
case SCR_AMNESIA: return "amnesia";
default: return "bugginess";
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 5af378c..78c296d 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -326,7 +326,7 @@ enum scroll_type
SCR_RECHARGING,
SCR_ENCHANT_WEAPON_III,
SCR_HOLY_WORD,
- SCR_VULNERABILITY,
+ SCR_PURGE_MAGIC,
SCR_SILENCE,
SCR_AMNESIA,
SCR_CURSE_JEWELLERY,
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 81af766..72c0c72 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2774,7 +2774,7 @@ static void _generate_scroll_item(item_def& item, int force_type,
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_ENCHANT_WEAPON_III),
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_SUMMONING),
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_SILENCE),
- 140, (depth_mod < 4 ? NUM_SCROLLS : SCR_VULNERABILITY),
+ 140, (depth_mod < 4 ? NUM_SCROLLS : SCR_PURGE_MAGIC),
// High-level scrolls.
140, (depth_mod < 7 ? NUM_SCROLLS : SCR_BRAND_WEAPON),
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 88cab34..9f37a31 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -771,7 +771,7 @@ i-recharging SCR_RECHARGING
i-enchant-weapon3 SCR_ENCHANT_WEAPON_III
%back scroll-red
i-holy_word SCR_HOLY_WORD
-i-vulnerability SCR_VULNERABILITY
+i-purge_magic SCR_PURGE_MAGIC
%back scroll-red
i-silence SCR_SILENCE
%back scroll-yellow
diff --git a/crawl-ref/source/rltiles/item/scroll/i-purge_magic.png b/crawl-ref/source/rltiles/item/scroll/i-purge_magic.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a2d320e6f8ae65bad129b1d52ec2dfbc31aee2c
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy`~f~8u0R?H3WRoSh`+Z-nyZj!
z^B*9eu_VYZn8D%MjWi%9(9^{+q~g}wiH=+hiag9)U;e+pN8-ezrs7+xlk+8|x*iw(
zJpQLhpz68K8HPh)4oyaT998c<*yE*P5ueQ1`{c?*HiIY6WqRfua8p-bJlFWWy<MXj
UW4wI3kR8ZsPgg&ebxsLQ07@`Cv;Y7A
literal 0
HcmV?d00001
diff --git a/crawl-ref/source/rltiles/item/scroll/i-vulnerability.png b/crawl-ref/source/rltiles/item/scroll/i-vulnerability.png
deleted file mode 100644
index 3a2d320e6f8ae65bad129b1d52ec2dfbc31aee2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy`~f~8u0R?H3WRoSh`+Z-nyZj!
z^B*9eu_VYZn8D%MjWi%9(9^{+q~g}wiH=+hiag9)U;e+pN8-ezrs7+xlk+8|x*iw(
zJpQLhpz68K8HPh)4oyaT998c<*yE*P5ueQ1`{c?*HiIY6WqRfua8p-bJlFWWy<MXj
UW4wI3kR8ZsPgg&ebxsLQ07@`Cv;Y7A
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 450e03a..e0d3b03 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1968,7 +1968,7 @@ unsigned int item_value(item_def item, bool ident)
case SCR_TORMENT:
case SCR_HOLY_WORD:
case SCR_SILENCE:
- case SCR_VULNERABILITY:
+ case SCR_PURGE_MAGIC:
valued += 75;
break;
--
1.8.4.5
From dc145adf1fba9746af8616e0fa602d6668390532 Mon Sep 17 00:00:00 2001
From: Nikhil Addleman <wizardosiris@gmail.com>
Date: Thu, 13 Feb 2014 15:40:57 -0700
Subject: [PATCH 2/2] Increase the weight of purge magic scroll generation
(decrease remove curse)
The scrolls are rare enough that their utility is largely underexplored.
This patch increases their generation weight from that of other medium level scrolls to curse weapon levels.
Signed-off-by: Nikhil Addleman <wizardosiris@gmail.com>
---
crawl-ref/source/makeitem.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 72c0c72..e84f762 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2741,13 +2741,13 @@ static void _generate_scroll_item(item_def& item, int force_type,
int tries = 500;
do
{
- // total weight: 8634 if depth_mod < 4,
+ // total weight: 8504 if depth_mod < 4,
// 9334 if 4 <= depth_mod < 7,
// 9754 if depth_mod >= 7,
// and -1133 in sprint
item.sub_type = random_choose_weighted(
1800, SCR_IDENTIFY,
- 1250, SCR_REMOVE_CURSE,
+ 1120, SCR_REMOVE_CURSE,
// [Cha] don't generate teleportation scrolls if in sprint
802, (crawl_state.game_is_sprint() ? NUM_SCROLLS : SCR_TELEPORTATION),
331, SCR_FEAR,
@@ -2774,7 +2774,7 @@ static void _generate_scroll_item(item_def& item, int force_type,
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_ENCHANT_WEAPON_III),
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_SUMMONING),
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_SILENCE),
- 140, (depth_mod < 4 ? NUM_SCROLLS : SCR_PURGE_MAGIC),
+ 270, (depth_mod < 4 ? NUM_SCROLLS : SCR_PURGE_MAGIC),
// High-level scrolls.
140, (depth_mod < 7 ? NUM_SCROLLS : SCR_BRAND_WEAPON),
--
1.8.4.5