Charm dispersal 🔕: Remove the Charms school, skill, and Skalds

With the remaining charms spells moved out of the school, there isn't anything for the skill to be useful for. In designing the forthcoming charm-effect-items it became clear that for the most part they will not scale with skill; for those that do, we already have a magic-item-interaction skill: Evocations. In addition to removing the skill, the school is removed (it was still used for monster spells to tag them as buffs, but all true buffs are also flagged with selfench) from spschool type and miscasts. (Some of the miscast flavour lines are preserved in Hexes miscasts.) This also means removing the Book of Battle (now mostly empty) and Charm randbooks. Removing Charms as a school of magic leaves the Skald start without its core identity: using Charms magic to enhance melee. From a fundamental design perspective, there are already several backgrounds that much better embody the use-magic-to-melee better: Warper (positioning), Transmuter (forms), Enchanter (debuffs), Hedge Wizard (magic grab bag). Without a separate magic school for their identity, Skalds don't have much in the way of a background concept. It is possible that the resulting charm items might make for an interesting adventurer starting kit of some kind, but that is probably better done by adding them to a chance in a wanderer start.
crawl · Jul 15, 2020 · 0d1730e · 0d1730e
1 parent 2afbd45
commit 0d1730e
Show file tree

Hide file tree

Showing 104 changed files with 91 additions and 375 deletions.
diff --git a/crawl-ref/source/book-type.h b/crawl-ref/source/book-type.h
@@ -20,8 +20,6 @@ enum book_type
     BOOK_FEN,
 #if TAG_MAJOR_VERSION == 34
     BOOK_WAR_CHANTS = BOOK_FEN,
-#else
-    BOOK_BATTLE,
 #endif
     BOOK_CLOUDS,
     BOOK_NECROMANCY,

diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
@@ -1201,10 +1201,6 @@ Hexes player ghost
 
 @The_monster@ says @to_foe@, "When I snap my fingers, you will think you are a chicken."
 %%%%
-Charms player ghost
-
-@The_monster@ says, "If you think I look tough now, just wait!"
-%%%%
 Summonings player ghost
 
 @The_monster@ says, "It's dangerous to adventure alone."

diff --git a/crawl-ref/source/dat/database/randbook.txt b/crawl-ref/source/dat/database/randbook.txt
@@ -424,31 +424,6 @@ Blows and Bruises
 w:1
 Damage Dealing
 %%%%
-Charms
-
-Enhancements
-
-Talismans
-
-Good Luck
-
-Protection
-
-w:3
-Self-Knowledge
-
-w:3
-Self-Improvement
-
-Aid
-
-Augmentations
-
-w:1
-Benedictions
-
-Boosts
-%%%%
 Fire
 
 Fire

diff --git a/crawl-ref/source/dat/database/shout.txt b/crawl-ref/source/dat/database/shout.txt
@@ -257,10 +257,6 @@ Air Elementalist player ghost
 %%%%
 Earth Elementalist player ghost
 
-@player ghost@
-%%%%
-Skald player ghost
-
 @player ghost@
 %%%%
 Venom Mage player ghost

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
@@ -3134,7 +3134,6 @@ ITEM:    randbook owner:Kikubaaqudgha disc:necromancy spells:pain \
          numspells:1
 # You already got a direct damage spell by looting the other gods' altars.
 ITEM:    randbook owner:Sif_Muna disc:hexes numspells:1 slevels:1 / \
-         randbook owner:Sif_Muna disc:charms numspells:1 slevels:1 / \
          randbook owner:Sif_Muna disc:transmutation numspells:1 slevels:1 / \
          randbook owner:Sif_Muna disc:summoning numspells:1 slevels:1 / \
          randbook owner:Sif_Muna disc:translocation numspells:1 slevels:1

diff --git a/crawl-ref/source/dat/des/builder/alphashops.des b/crawl-ref/source/dat/des/builder/alphashops.des
@@ -64,8 +64,8 @@
        "manual of axes", "manual of armour", "wand of acid",
        "acid dragon scales" }
 
-      elseif s == "B" then i = { "bardiche", "barding", "battleaxe", "bolt",
-       "book of battle", "book of burglary", "box of beasts",
+      elseif s == "B" then i = { "bardiche", "battleaxe", "bolt",
+       "book of burglary", "box of beasts",
        "broad axe", "pair of boots", "potion of berserk rage",
        "potion of brilliance",
        "scroll of blinking", "scroll of brand weapon",
@@ -75,7 +75,7 @@
        "club", "book of changes", "book of conjurations",
        "chain mail", "cloak", "crystal plate armour", "potion of cancellation",
        "book of clouds", "staff of cold", "staff of conjuration",
-       "manual of crossbows", "manual of conjurations", "manual of charms",
+       "manual of crossbows", "manual of conjurations",
        "potion of curing", "wand of clouds" }
 
       elseif s == "D" then i = { "book of death", "book of debilitation",

diff --git a/crawl-ref/source/dat/des/portals/gauntlet.des b/crawl-ref/source/dat/des/portals/gauntlet.des
@@ -1062,7 +1062,6 @@ dgn.delayed_decay_extra(_G, "H", "merfolk skeleton",
     "trident good_item / demon trident / glaive good_item / bardiche" ..
     ", leather armour good_item w:100 / ring mail good_item w:100" ..
     "    / " .. light_scales .. " / " .. medium_scales ..
-    ", randbook disc:charms / book of battle" ..
     -- Give this a 1/4 in chance of placing since we guarantee 3 items above.
     ", buckler good_item / kite shield good_item / tower shield good_item" ..
     "    / " .. dgn.good_aux_armour .. " / any wand w:20 / any misc / gold" ..

diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
@@ -261,7 +261,7 @@ function trove.weapon_skills (e)
 end
 
 function trove.spell_skills (e)
-  local spell_skills = {"Spellcasting", "Conjurations", "Charms", "Hexes", "Summoning", "Necromancy", "Translocation", "Transmutation", "Fire Magic", "Ice Magic", "Air Magic", "Earth Magic", "Poison Magic"}
+  local spell_skills = {"Spellcasting", "Conjurations", "Hexes", "Summoning", "Necromancy", "Translocation", "Transmutation", "Fire Magic", "Ice Magic", "Air Magic", "Earth Magic", "Poison Magic"}
   local skill_total = 0
   local nonzero_skills = 0
   for _, skill in ipairs(spell_skills) do

diff --git a/crawl-ref/source/dat/des/serial/magic_research.des b/crawl-ref/source/dat/des/serial/magic_research.des
@@ -13,7 +13,7 @@
 # Note:
 # Schools covered: Fire, Ice, Air, Earth, Poison, Necromancy,
 # Transmutations, Translocations, Summonings, Hexes.
-# Schools not covered: Charms, Conjurations. Too little to work with right now.
+# Schools not covered: Conjurations. Too little to work with right now.
 # Other magic concepts might be interesting; additions are always welcome!
 
 default-depth: Depths, Vaults:1-4, Elf:1-2

diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -1518,7 +1518,7 @@ ITEM:    randbook numspells:2 title:Dhcmrlchtdj
 ITEM:    randbook numspells:2 title:Combed_Thunderclap disc:air
 ITEM:    randbook numspells:2 title:Plaster_Cramp disc:earth
 ITEM:    randbook numspells:2 title:Axaxaxas_mlö
-ITEM:    randbook numspells:3 title:Forking_Paths owner:Ts'ui_Pên disc:hexes disc2:charms
+ITEM:    randbook numspells:3 title:Forking_Paths owner:Ts'ui_Pên disc:hexes
 ITEM:    randbook numspells:2 title:Sand
 KFEAT:   ^ : shaft trap
 SHUFFLE: defg, efghij, bm, bm / ++
@@ -5057,7 +5057,6 @@ NSUBST: d = 1:e / *:d
 : end
 KITEM:  d = any potion / any scroll / nothing w:30
 KITEM:  e = randbook disc:necromancy slevels:2 owner:Jessica / \
-            randbook disc:charms slevels:2 owner:Jessica / \
             randbook disc:hexes slevels:2 owner:Jessica / \
             randbook disc:translocation slevels:2 owner:Jessica
 MONS:   jessica, quokka

diff --git a/crawl-ref/source/dat/descript/backgrounds.txt b/crawl-ref/source/dat/descript/backgrounds.txt
@@ -92,11 +92,6 @@ Necromancer
 Necromancers are wizards specializing in the practice of death magic. They
 start out with the Pain spell.
 %%%%
-Skald
-
-Skalds are melee fighters who can boost themselves in battle with spells from
-the Charms school.
-%%%%
 Summoner
 
 Summoners are able to cast Summon Small Mammal from the start, and begin with

diff --git a/crawl-ref/source/dat/descript/cs/items.txt b/crawl-ref/source/dat/descript/cs/items.txt
@@ -24,12 +24,6 @@ book of fixed theme
 
 Kniha kouzel.
 %%%%
-book of war chants
-
-Kniha kouzel určená bojovníkům. Verze v této knize jsou zhudebněné podle
-tradice bojujících skaldů. Funkčně jsou však identické s těmi, které jsou
-obyčejně vyslovovány.
-%%%%
 bow
 
 Zakřivený kus dřeva s tětivou, určený k střílení šípů. V boji způsobuje

diff --git a/crawl-ref/source/dat/descript/da/backgrounds.txt b/crawl-ref/source/dat/descript/da/backgrounds.txt
@@ -96,10 +96,6 @@ Necromancer
 Nekromantikere er troldmænd, som specialiserer sig i studiet af dødsmagi. De
 starter med besværgelsen Smerte.
 %%%%
-Skald
-
-Skjalde er nærkampskrigere, som kan styrke sig selv i kamp med Bogen om kamp.
-%%%%
 Summoner
 
 Hidkaldere starter med Bogen om kald og kan kaste Hidkald Små Pattedyr fra

diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt
@@ -67,11 +67,6 @@ sølle troldkarle risikerer en krank skæbne, hvis de læser dette værk.
 ADVARSEL: Hvis det mislykkes at lære en besværgelse fra denne bog, vil den
 angribe dig.
 %%%%
-book of battle
-
-Denne bog med besværgelser bruges af skjalde, som får magisk hjælp af dens
-kampsange.
-%%%%
 book of cantrips
 
 En bog som indeholder et lille udvalg af de mest grundlæggende besværgelser,

diff --git a/crawl-ref/source/dat/descript/de/backgrounds.txt b/crawl-ref/source/dat/descript/de/backgrounds.txt
@@ -92,11 +92,6 @@ Necromancer
 Nekromanten sind Zauberer, die sich auf Todesmagie spezialisieren. Sie beginnen
 mit dem Schmerzfluch.
 %%%%
-Skald
-
-Skalden sind Nahkämpfer, die sich im Kampf mit Zaubern aus dem Buch des
-Gefechts stärken können.
-%%%%
 Summoner
 
 Boten fangen mit dem Buch von Callings an und sind im Stande sich zu werfen

diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt
@@ -61,11 +61,6 @@ Erfinderischen die Kontrolle über Zerstörung mit der Leichtigkeit eines
 Augenzwinkerns. Schwache Zauberer werden allerdings ihrem Tod entgegensehen,
 wenn sie versuchen, dieses Werk zu lesen.
 %%%%
-book of battle
-
-Ein Buch mit Zaubersprüchen die von Skalden genutzt wurden, dessen Kampflieder
-gewährten ihnen magische Hilfe.
-%%%%
 book of cantrips
 
 Ein Buch, das eine kleine Auswahl sehr grundlegender Zaubersprüche enthält,
@@ -163,13 +158,6 @@ Entwicklung und den Befehl von untoten Dienern. Das schreckliche Buch strahlt
 eine bösartige Aura aus, und seine Pergament-Seiten zucken manchmal und
 schaudern selbstständig.
 %%%%
-book of war chants
-
-Ein Buch der Zaubersprüche nützlich für einen Krieger. Die Versionen haben hier
-eine musikalische Form enthalten, nach den Traditionen des Kampfes skald.
-Funktionell, obwohl sie genau wie Zauber funktionieren, sind die magischen
-Worte gesprochen.
-%%%%
 book of wizardry
 
 Ein Buch von verschiedenen Zaubern, die für jeden genug talentierten Hexern

diff --git a/crawl-ref/source/dat/descript/el/backgrounds.txt b/crawl-ref/source/dat/descript/el/backgrounds.txt
@@ -100,11 +100,6 @@ Necromancer
 Οι Νεκρομάντες είναι μάγοι ειδικευμένοι στην πρακτική της μαγείας του θανάτου.
 Ξεκινούν με το ξόρκι Πόνος.
 %%%%
-Skald
-
-Οι Πολεμιστές Βάρδοι μπορούν να βελτιώσουν τις ικανότητες τους στη μάχη με
-ξόρκια από το βιβλίο των Πολεμικών Ψαλμών.
-%%%%
 Summoner
 
 Οι Καλεστές ξεκινούν με το βιβλίο των Καλεσμάτων και το ξόρκι Κάλεσμα Μικρών

diff --git a/crawl-ref/source/dat/descript/es/backgrounds.txt b/crawl-ref/source/dat/descript/es/backgrounds.txt
@@ -94,11 +94,6 @@ Necromancer
 Los Nigromantes son magos especializados en la práctica de la magia de la
 muerte. Empiezan con el hechizo del Dolor.
 %%%%
-Skald
-
-Los Skald son luchadores cuerpo a cuerpo que pueden mejorar sus habilidades de
-combate con hechizos del Libro de Batallas.
-%%%%
 Summoner
 
 Los Convocadores comienzan con el Libro de las Llamadas y son capaces de

diff --git a/crawl-ref/source/dat/descript/fi/items.txt b/crawl-ref/source/dat/descript/fi/items.txt
@@ -145,12 +145,6 @@ Tämä epäpyhä kirja kertoo maagisista keinoista epäkuolleiden palvelijoiden
 luomiseen ja käskemiseen. Kauheassa kirjassa säteilee pahansuopa aura, ja sen
 pergamenttisivut joskus sätkivät ja värisevät itsestään.
 %%%%
-book of war chants
-
-Soturille hyödyllisiä loitsuja sisältävä kirja. Kirjan loitsuilla on
-musikaalinen muoto, seuraten skaldien perinteitä. Niillä on kuitenkin sama
-vaikutus kuin puhutuilla taioilla.
-%%%%
 book of wizardry
 
 Tämän kirjan loitsut sopivat kenelle tahansa pätevälle loitsijalle. Oppineet

diff --git a/crawl-ref/source/dat/descript/fr/backgrounds.txt b/crawl-ref/source/dat/descript/fr/backgrounds.txt
@@ -99,11 +99,6 @@ Necromancer
 Les Nécromanciens sont des sorciers spécialisés dans la magie des morts. Ils
 connaissent le sort Douleur.
 %%%%
-Skald
-
-Les Skalds sont des combattants qui se renforcent avec des sorts de leur livre
-des batailles.
-%%%%
 Summoner
 
 Les Invocateurs commencent avec le livre des Appels et sont capables de

diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt
@@ -96,11 +96,6 @@ sorciers, car il permet aux plus doués de répandre la destruction avec la
 facilité d'un claquement de doigt. Cependant, les médiocres courent à leur
 perte s'ils essaient de le lire.
 %%%%
-book of battle
-
-Un livre de sorts utilisés par les skalds, dont les chants de batailles leur
-accorde une aide magique.
-%%%%
 book of burglary
 
 Un livre contenant de nombreux sorts utiles pour voler, entrer par effraction,
@@ -265,12 +260,6 @@ commandement de serviteurs morts-vivants. Ce livre terrible irradie une aura
 malfaisante, et ses pages de parchemin tremblent et frémissent parfois toutes
 seules.
 %%%%
-book of war chants
-
-Un livre de sorts utile pour un guerrier. Les versions présentées ici ont une
-forme musicale, suivant les traditions des skalds guerriers. Fonctionnellement,
-cependant, ils sont identiques aux sorts dont les mots sont simplement parlés.
-%%%%
 book of wizardry
 
 Un livre contenant divers sorts utiles aux laceurs de sorts suffisamment

diff --git a/crawl-ref/source/dat/descript/fr/skills.txt b/crawl-ref/source/dat/descript/fr/skills.txt
@@ -185,18 +185,6 @@ sorte peut mettre hors d'état de nuire un ennemi. Cependant, il faut surpasser
 la résistance aux enchantements hostiles de la victime pour obtenir un effet.
 Être compétent en Enchantements aide à surpasser cette résistance.
 
-Être compétent dans une « école » de magie rend l'apprentissage et le lancement
-des sortilèges de cette école plus simples. De nombreux sortilèges
-appartiennent à une combinaison de différentes écoles, dans ce cas la réussite
-du lancement et la puissance dépendront du niveau de compétence dans ces
-écoles.
-%%%%
-Charms
-
-Charmes vous offre un certain nombre d'auras pour accroitre vos capacités.
-Entrainer la compétence Charmes augmentera en général la durée ou l'efficacité
-de ces auras.
-
 Être compétent dans une « école » de magie rend l'apprentissage et le lancement
 des sortilèges de cette école plus simples. De nombreux sortilèges
 appartiennent à une combinaison de différentes écoles, dans ce cas la réussite

diff --git a/crawl-ref/source/dat/descript/it/backgrounds.txt b/crawl-ref/source/dat/descript/it/backgrounds.txt
@@ -93,11 +93,6 @@ Necromancer
 I negromanti sono maghi specialisti nella magia della morte. Cominciano con
 l'incantesimo Dolore.
 %%%%
-Skald
-
-Gli Skald sono dei guerrieri che possono potenziarsi in battaglia con gli
-incantesimi dal libro della Battaglia.
-%%%%
 Summoner
 
 Gli attrattori cominciano con il Libro delle Chiamate e sono in grado

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
@@ -96,10 +96,6 @@ book of annihilations
 A tome of arcane fury, greatly sought after by sorcerers. It allows the gifted
 and resourceful to conjure destruction with ease.
 %%%%
-book of battle
-
-A book of battle songs, containing spells to assist in combat.
-%%%%
 book of burglary
 
 A book containing many diverse spells useful for theft, breaking and entering,

diff --git a/crawl-ref/source/dat/descript/ja/backgrounds.txt b/crawl-ref/source/dat/descript/ja/backgrounds.txt
@@ -84,10 +84,6 @@ Necromancer
 
 死人使いは死の魔法の修練に特化した魔術師である。彼らは苦痛の呪文を得て出発する。
 %%%%
-Skald
-
-スカルドは戦いの魔法書による呪文で戦闘時に自身を強化する戦士である。
-%%%%
 Summoner
 
 召喚術師は招集の魔法書を持って出発し、始めから小動物の召喚を詠唱できる。

diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt
@@ -63,10 +63,6 @@ book of annihilations
 これは才能や力のある魔導師達が容易に破壊を操ることを可能にするために追い求められる。
 一方、虚弱な魔術師がこの作品を読もうとすると死ぬ運命になるだろう。
 %%%%
-book of battle
-
-スカルドが使用する呪文書だ。その戦いの詩歌は彼らに魔法の助けを授ける
-%%%%
 book of cantrips
 
 この本には特定の魔法の領域の基礎を学ぼうとする初心者を対象とした、

diff --git a/crawl-ref/source/dat/descript/ko/backgrounds.txt b/crawl-ref/source/dat/descript/ko/backgrounds.txt
@@ -96,11 +96,6 @@ Necromancer
 강령술사는 죽음과 관련된 마법에 특화된 마법사다. ‘강령술의 마법서’ 와
 ‘고통’ 마법을 가지고 시작한다.
 %%%%
-Skald
-
-음유시인은  ‘전투의 서’ 에 적힌 주문들을 이용해서, 자신의 근접전 능력을
-향상시킨다.
-%%%%
 Summoner
 
 소환술사들은 작은 짐승들을 소환할 수 있는 ‘소집의 마법서’를 가지고 시작한다.

diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt
@@ -66,11 +66,6 @@ book of annihilations
 파괴의 지휘자가 될 수 있다. 하지만 미숙한 마법사가 겁도 없이 이 책을 읽으려
 들면, 파괴의 지휘는 커녕 자신이 파괴에게 지휘 당할 것이다.
 %%%%
-book of battle
-
-음유시인들이 사용하는 주문이 들어 있는 마법책이다. 음유시인들은 전장의 노래를
-불러 마법적인 도움을 얻는다.
-%%%%
 book of cantrips
 
 다양한 학파들의 아주 기초적인 마법이 담긴 책이다. 주로 한가지 학파를 정해

diff --git a/crawl-ref/source/dat/descript/pl/backgrounds.txt b/crawl-ref/source/dat/descript/pl/backgrounds.txt
@@ -57,11 +57,6 @@ Necromancer
 Nekromanci są czarodziejami specjalizującymi się w czarnej magii. Zaczynają
 znając czar „Ból”.
 %%%%
-Skald
-
-Skaldowie są wojownikami którzy dodają sobie sił magicznymi przyśpiewkami z
-księgi Pieśni Wojennych.
-%%%%
 Venom Mage
 
 Magowie Jadu zaczynają z Poradnikiem Małego Truciciela w zanadrzu. Jest to