Attached Files |
remove_vorpalise.diff [^] (18,473 bytes) 2013-09-05 22:24 [Show Content] [Hide Content]diff --git a/crawl-ref/source/dat/des/portals/bailey.des b/crawl-ref/source/dat/des/portals/bailey.des
index b6538f6..93f99da 100644
--- a/crawl-ref/source/dat/des/portals/bailey.des
+++ b/crawl-ref/source/dat/des/portals/bailey.des
@@ -933,7 +933,7 @@ KITEM: ! = potion of curing / potion of heal wounds / potion of might w:5 /\
potion of invisibility w:3 / potion of experience w:1 /\
potion of beneficial mutation w:1 / potion of resistance w:1
KITEM: ? = scroll of enchant weapon I / scroll of enchant weapon II /\
- scroll of enchant weapon III w:5 / scroll of vorpalise weapon w:1 /\
+ scroll of enchant weapon III w:5 / scroll of brand weapon w:1 /\
scroll of enchant armour / scroll of acquirement w:1 /\
scroll of summoning w:2
SUBST: 2 = 2 3:1
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index a0a6482..14951ab 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -189,7 +189,7 @@ end
-- mapping scrolls with a low chance of silence, vulnerability 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 vorpalise weapon w:3 /
+ 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 /
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index 7d55378..7f9b09a 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1054,7 +1054,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 vorpalise weapon | scroll of vulnerability q:3 |\
+ scroll of silence q:3 | scroll of brand weapon | scroll of vulnerability 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 df22ff5..a2cebcb 100644
--- a/crawl-ref/source/dat/des/sprint/pitsprint.des
+++ b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -176,7 +176,7 @@ function general_item_setup(e)
scroll of acquirement w:1 ident:all /\
scroll of enchant weapon iii ident:all q:2 w:2 /\
scroll of enchant armour ident:all q:4 w:2 /\
- scroll of vorpalise weapon ident:all")
+ scroll of brand weapon ident:all")
e.kitem("| = superb_item ident:all w:66 / star_item ident:all w:33")
e.kitem("* = star_item ident:all w:66 / any ident:all w:33")
e.kitem("% = any ident:all")
diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
index 366e561..acfbd03 100644
--- a/crawl-ref/source/dat/des/sprint/zigsprint.des
+++ b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -94,7 +94,7 @@ function setup_room(e, id)
potion of speed q:2 ident:all w:2 / scroll of acquirement w:1 ident:all /\
scroll of enchant weapon iii ident:all q:2 w:2 /\
scroll of enchant armour ident:all q:4 w:2 /\
- scroll of vorpalise weapon ident:all")
+ scroll of brand weapon ident:all")
-- Place monsters
if id < 7 then
diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt
index 66d8e4e..1e692e6 100644
--- a/crawl-ref/source/dat/descript/da/items.txt
+++ b/crawl-ref/source/dat/descript/da/items.txt
@@ -1486,7 +1486,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 vorpalise weapon
+scroll of brand weapon
Denne skriftrulle fortryller et valgfrit våben, så det bliver langt mere
effektivt til at forvolde skade på dine fjender. Den kan gøre de midlertidige
diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt
index 68d3273..a998eee 100644
--- a/crawl-ref/source/dat/descript/fr/items.txt
+++ b/crawl-ref/source/dat/descript/fr/items.txt
@@ -1408,7 +1408,7 @@ douleur sur toute les créatures à proximité – y compris vous! Ceci traverse
moitié de la résistance de toutes les créatures vivantes, bien que ce ne soit
jamais directement fatale.
%%%%
-scroll of vorpalise weapon
+scroll of brand weapon
Ce parchemin enchante l'arme choisie de façon à la rendre beaucoup plus
efficaces pour infliger des dommages sur les ennemis de son porteur. Il peut
diff --git a/crawl-ref/source/dat/descript/fr/spells.txt b/crawl-ref/source/dat/descript/fr/spells.txt
index 4cd7aba..e48b04d 100644
--- a/crawl-ref/source/dat/descript/fr/spells.txt
+++ b/crawl-ref/source/dat/descript/fr/spells.txt
@@ -345,8 +345,7 @@ Excruciating Wounds spell
Ce sort imprègne temporairement l'arme portée par le sorcier avec l'essence
même de la douleur. Cela n'affectera pas les armes qui sont déjà sujète à des
enchantements spéciaux. Notez que contrairement à d'autres enchantements, la
-douleur ne peut pas être rendu permanente par un parchemin de vorpalisation
-d'arme.
+douleur ne peut pas être rendu permanente par un parchemin de marque l'arme.
%%%%
Fire Brand spell
@@ -1169,5 +1168,5 @@ Warp Weapon spell
Ce sort lie temporairement une zone de transfert localisée avec l'arme du
sorcier. Notez que contrairement aux autres enchantements, la distorsion ne
-peut pas être rendue permanente en lisant un parchemin de vorpalisation d'arme.
+peut pas être rendue permanente en lisant un parchemin de marque l'arme.
%%%%
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 759f48d..b6b31599 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -2370,7 +2370,7 @@ scroll of torment:quote
<scroll:quote>
%%%%
-scroll of vorpalise weapon
+scroll of brand weapon
This scroll enchants a chosen weapon so as to make it far more effective at
inflicting harm on its wielder's enemies. The scroll can make permanent the
@@ -2381,7 +2381,7 @@ Brands that are closely tied to one of the gods (Trog, Lugonu, Kikubaaqudgha,
the Shining One) cannot be affixed this way. Xom, on the other hand, wouldn't
let such an opportunity for fun go to waste.
%%%%
-scroll of vorpalise weapon:quote
+scroll of brand weapon:quote
<scroll:quote>
%%%%
diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt
index 2a89993..28d6fa4 100644
--- a/crawl-ref/source/dat/descript/pl/items.txt
+++ b/crawl-ref/source/dat/descript/pl/items.txt
@@ -1252,7 +1252,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 vorpalise weapon
+scroll of brand weapon
Ten zwój trwale nadaje broni którą trzymasz w ręce zdolność bardziej
efektywnego wyrządzania krzywdy bliźniemu. Nie zadziała to jeśli broń ta już ma
diff --git a/crawl-ref/source/dat/descript/ru/spells.txt b/crawl-ref/source/dat/descript/ru/spells.txt
index 19d845b..9a05f6b 100644
--- a/crawl-ref/source/dat/descript/ru/spells.txt
+++ b/crawl-ref/source/dat/descript/ru/spells.txt
@@ -269,7 +269,7 @@ Excruciating Wounds spell
Это заклинание временно наделяет оружие мага способностью служить воплощением
боли. Оно не действует на оружие, на которое уже наложены другие заклятья.
Обратите внимание, что в отличие от других аур, эффект этого заклинания не
-может стать постоянным после прочтения свитка of vorpalise weapon.
+может стать постоянным после прочтения свитка of brand weapon.
%%%%
Fire Brand spell
@@ -845,5 +845,5 @@ Warp Weapon spell
Это заклинание на время окружает ваше оружие аурой, искажающей пространство.
Обратите внимание, что в отличие от других аур, аура искажения не может стать
-постоянной после прочтения свитка of vorpalise weapon.
+постоянной после прочтения свитка of brand weapon.
%%%%
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index 0aeda3c..c137cf1 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -349,7 +349,7 @@ Excruciating Wounds spell
This spell temporarily infuses the weapon held by the caster with the essence
of pain itself. It will not affect weapons which are otherwise subject to
special enchantments. Note that unlike other brands, pain can not be made
-permanent by reading a scroll of vorpalise weapon.
+permanent by reading a scroll of brand weapon.
%%%%
Fire Brand spell
@@ -1166,5 +1166,5 @@ Warp Weapon spell
This spell temporarily binds a localized warp field to the invoker's weapon.
Note that unlike other brands, distortion can not be made permanent by reading
-a scroll of vorpalise weapon.
+a scroll of brand weapon.
%%%%
diff --git a/crawl-ref/source/dat/dlua/dungeon.lua b/crawl-ref/source/dat/dlua/dungeon.lua
index 3bdb157..56ad35c 100644
--- a/crawl-ref/source/dat/dlua/dungeon.lua
+++ b/crawl-ref/source/dat/dlua/dungeon.lua
@@ -672,7 +672,7 @@ dgn.good_scrolls = [[
w:10 scroll of acquirement no_pickup /
w:4 scroll of acquirement no_pickup q:2 /
w:1 scroll of acquirement no_pickup q:3 /
- w:10 scroll of vorpalise weapon no_pickup /
+ w:10 scroll of brand weapon no_pickup /
w:10 scroll of torment no_pickup /
w:10 scroll of vulnerability no_pickup
]]
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index f3c8e76..f5826d8 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2439,7 +2439,7 @@ static void _rebrand_weapon(item_def& wpn)
}
}
-static void _vorpalise_weapon(bool alreadyknown, item_def &wpn)
+static void _brand_weapon(bool alreadyknown, item_def &wpn)
{
you.wield_change = true;
@@ -2558,9 +2558,9 @@ static void _vorpalise_weapon(bool alreadyknown, item_def &wpn)
success = false;
// This is only naughty if you know you're doing it.
- // XXX: assumes this can only happen from Vorpalise Weapon scroll.
+ // XXX: assumes this can only happen from Brand Weapon scroll.
did_god_conduct(DID_NECROMANCY, 10,
- get_ident_type(OBJ_SCROLLS, SCR_VORPALISE_WEAPON)
+ get_ident_type(OBJ_SCROLLS, SCR_BRAND_WEAPON)
== ID_KNOWN_TYPE);
break;
@@ -2607,7 +2607,7 @@ static void _vorpalise_weapon(bool alreadyknown, item_def &wpn)
}
// Returns false if we're cancelling the scroll.
-static bool _handle_vorpalise_weapon(bool alreadyknown, string *pre_msg)
+static bool _handle_brand_weapon(bool alreadyknown, string *pre_msg)
{
int item_slot;
@@ -2651,7 +2651,7 @@ static bool _handle_vorpalise_weapon(bool alreadyknown, string *pre_msg)
if (pre_msg && alreadyknown)
mpr(pre_msg->c_str());
- _vorpalise_weapon(alreadyknown, wpn);
+ _brand_weapon(alreadyknown, wpn);
return true;
}
@@ -3023,7 +3023,7 @@ bool _is_cancellable_scroll(scroll_type scroll)
|| scroll == SCR_REMOVE_CURSE
|| scroll == SCR_CURSE_ARMOUR
|| scroll == SCR_CURSE_JEWELLERY
- || scroll == SCR_VORPALISE_WEAPON);
+ || scroll == SCR_BRAND_WEAPON);
}
void read_scroll(int slot)
@@ -3353,16 +3353,16 @@ void read_scroll(int slot)
_handle_enchant_weapon(1 + random2(2), 1 + random2(2), "bright yellow");
break;
- case SCR_VORPALISE_WEAPON:
+ case SCR_BRAND_WEAPON:
if (!alreadyknown)
{
mpr(pre_succ_msg.c_str());
- mpr("It is a scroll of vorpalise weapon.");
+ mpr("It is a scroll of brand weapon.");
// Pause to display the message before jumping to the weapon list.
if (Options.auto_list)
more();
}
- cancel_scroll = !_handle_vorpalise_weapon(alreadyknown, &pre_succ_msg);
+ cancel_scroll = !_handle_brand_weapon(alreadyknown, &pre_succ_msg);
break;
case SCR_IDENTIFY:
@@ -3485,7 +3485,7 @@ void read_scroll(int slot)
if (id_the_scroll
&& !alreadyknown
&& which_scroll != SCR_ACQUIREMENT
- && which_scroll != SCR_VORPALISE_WEAPON)
+ && which_scroll != SCR_BRAND_WEAPON)
{
mprf("It %s a %s.",
you.inv[item_slot].quantity < prev_quantity ? "was" : "is",
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 36382f5..ac5bd6e 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -697,7 +697,7 @@ static const char* scroll_type_name(int scrolltype)
case SCR_FOG: return "fog";
case SCR_ACQUIREMENT: return "acquirement";
case SCR_ENCHANT_WEAPON_II: return "enchant weapon II";
- case SCR_VORPALISE_WEAPON: return "vorpalise weapon";
+ case SCR_BRAND_WEAPON: return "brand weapon";
case SCR_RECHARGING: return "recharging";
case SCR_ENCHANT_WEAPON_III: return "enchant weapon III";
case SCR_HOLY_WORD: return "holy word";
@@ -3178,7 +3178,7 @@ bool is_useless_item(const item_def &item, bool temp)
case SCR_ENCHANT_WEAPON_II:
case SCR_ENCHANT_WEAPON_III:
case SCR_ENCHANT_ARMOUR:
- case SCR_VORPALISE_WEAPON:
+ case SCR_BRAND_WEAPON:
return (you.species == SP_FELID);
default:
return false;
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index 0efd1d7..a095b85 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -322,7 +322,7 @@ enum scroll_type
SCR_FOG,
SCR_ACQUIREMENT,
SCR_ENCHANT_WEAPON_II,
- SCR_VORPALISE_WEAPON,
+ SCR_BRAND_WEAPON,
SCR_RECHARGING,
SCR_ENCHANT_WEAPON_III,
SCR_HOLY_WORD,
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 1799745..b0c1627 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -2752,7 +2752,7 @@ static void _generate_scroll_item(item_def& item, int force_type,
140, (depth_mod < 4 ? NUM_SCROLLS : SCR_VULNERABILITY),
// High-level scrolls.
- 140, (depth_mod < 7 ? NUM_SCROLLS : SCR_VORPALISE_WEAPON),
+ 140, (depth_mod < 7 ? NUM_SCROLLS : SCR_BRAND_WEAPON),
140, (depth_mod < 7 ? NUM_SCROLLS : SCR_TORMENT),
140, (depth_mod < 7 ? NUM_SCROLLS : SCR_HOLY_WORD),
@@ -2765,7 +2765,7 @@ static void _generate_scroll_item(item_def& item, int force_type,
}
// determine quantity
- if (item.sub_type == SCR_VORPALISE_WEAPON
+ if (item.sub_type == SCR_BRAND_WEAPON
|| item.sub_type == SCR_ENCHANT_WEAPON_III
|| item.sub_type == SCR_ACQUIREMENT
|| item.sub_type == SCR_TORMENT
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index 95c49d4..a13df8e 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -834,7 +834,7 @@ static void _unequip_weapon_effect(item_def& item, bool showMsgs, bool meld)
break;
// NOTE: When more are added here, *must* duplicate unwielding
- // effect in vorpalise weapon scroll effect in read_scoll.
+ // effect in brand weapon scroll effect in read_scoll.
}
if (you.duration[DUR_WEAPON_BRAND])
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index fc5af43..4e7a364 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -750,7 +750,7 @@ i-fog SCR_FOG
i-acquirement SCR_ACQUIREMENT
%back scroll-green
i-enchant-weapon2 SCR_ENCHANT_WEAPON_II
-i-vorpalize-weapon SCR_VORPALISE_WEAPON
+i-brand-weapon SCR_BRAND_WEAPON
i-recharging SCR_RECHARGING
i-enchant-weapon3 SCR_ENCHANT_WEAPON_III
%back scroll-red
diff --git a/crawl-ref/source/rltiles/item/scroll/i-brand-weapon.png b/crawl-ref/source/rltiles/item/scroll/i-brand-weapon.png
new file mode 100644
index 0000000..2a62bbc
Binary files /dev/null and b/crawl-ref/source/rltiles/item/scroll/i-brand-weapon.png differ
diff --git a/crawl-ref/source/rltiles/item/scroll/i-vorpalize-weapon.png b/crawl-ref/source/rltiles/item/scroll/i-vorpalize-weapon.png
deleted file mode 100644
index 2a62bbc..0000000
Binary files a/crawl-ref/source/rltiles/item/scroll/i-vorpalize-weapon.png and /dev/null differ
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 928b2b1..81911a2 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1970,7 +1970,7 @@ unsigned int item_value(item_def item, bool ident)
break;
case SCR_ENCHANT_WEAPON_III:
- case SCR_VORPALISE_WEAPON:
+ case SCR_BRAND_WEAPON:
valued += 200;
break;
|