Skip to content

Commit 4473184

Browse files
authored
Merge pull request #297 from codeGlaze/68-fix-blank-spells-and-duplicates
Fixes #68 blank spells and duplicates
2 parents e63cdea + 627e17c commit 4473184

File tree

1 file changed

+42
-38
lines changed

1 file changed

+42
-38
lines changed

src/cljc/orcpub/dnd/e5/spell_lists.cljc

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
:detect-magic :disguise-self :faerie-fire :feather-fall
1212
:healing-word :heroism :identify :illusory-script
1313
:longstrider :silent-image :sleep :speak-with-animals :hideous-laughter :thunderwave
14-
:unseen-servant
15-
],
14+
:unseen-servant],
1615
2
1716
[:animal-messenger :blindness-deafness :calm-emotions
1817
:detect-thoughts :enhance-ability :enthrall :heat-metal
@@ -44,7 +43,8 @@
4443
8
4544
[:dominate-monster :feeblemind :glibness :mind-blank
4645
:power-word-stun],
47-
9 [:foresight :power-word-kill :true-polymorph]},
46+
9
47+
[:foresight :power-word-kill :true-polymorph]},
4848
:cleric
4949
{0
5050
[:guidance :light :mending :resistance :sacred-flame :spare-the-dying :thaumaturgy],
@@ -79,16 +79,19 @@
7979
7
8080
[:conjure-celestial :divine-word :etherealness :fire-storm
8181
:plane-shift :regenerate :resurrection :symbol],
82-
8 [:antimagic-field :control-weather :earthquake :holy-aura],
83-
9 [:astral-projection :gate :mass-heal :true-resurrection]},
82+
8
83+
[:antimagic-field :control-weather :earthquake :holy-aura],
84+
9
85+
[:astral-projection :gate :mass-heal :true-resurrection]},
8486
:druid
85-
{0 [:druidcraft :guidance :mending :poison-spray :produce-flame :resistance :shillelagh ],
87+
{0
88+
[:druidcraft :guidance :mending :poison-spray :produce-flame :resistance :shillelagh ],
8689
1
8790
[:animal-friendship :charm-person :create-or-destroy-water :cure-wounds :detect-magic
8891
:detect-poison-and-disease :entangle :faerie-fire :fog-cloud :goodberry
8992
:healing-word :jump :longstrider :purify-food-and-drink
90-
:speak-with-animals :thunderwave
91-
],
93+
:speak-with-animals :thunderwave]
94+
,
9295
2
9396
[:animal-messenger :barkskin :darkvision :enhance-ability
9497
:find-traps :flame-blade :flaming-sphere :gust-of-wind :heat-metal
@@ -119,7 +122,8 @@
119122
8
120123
[:animal-shapes :antipathy-sympathy :control-weather :earthquake
121124
:feeblemind :sunburst :tsunami],
122-
9 [:foresight :shapechange :storm-of-vengeance :true-resurrection]},
125+
9
126+
[:foresight :shapechange :storm-of-vengeance :true-resurrection]},
123127
:paladin
124128
{1
125129
[:bless :command :cure-wounds :detect-evil-and-good :detect-magic
@@ -132,8 +136,10 @@
132136
3
133137
[:create-food-and-water :daylight
134138
:dispel-magic :magic-circle :remove-curse :revivify]
135-
4 [:banishment :death-ward :locate-creature]
136-
5 [:dispel-evil-and-good :geas :raise-dead]}
139+
4
140+
[:banishment :death-ward :locate-creature]
141+
5
142+
[:dispel-evil-and-good :geas :raise-dead]}
137143
:ranger
138144
{1
139145
[:alarm :animal-friendship :cure-wounds :detect-magic :detect-poison-and-disease
@@ -151,7 +157,8 @@
151157
4
152158
[:conjure-woodland-beings :freedom-of-movement :locate-creature
153159
:stoneskin],
154-
5 [:commune-with-nature :tree-stride]},
160+
5
161+
[:commune-with-nature :tree-stride]},
155162
:sorcerer
156163
{0
157164
[:acid-splash :chill-touch :dancing-lights :fire-bolt
@@ -161,8 +168,7 @@
161168
[:burning-hands :charm-person :color-spray :comprehend-languages
162169
:detect-magic :disguise-self :expeditious-retreat :false-life
163170
:feather-fall :fog-cloud :jump :mage-armor :magic-missile :shield
164-
:silent-image :sleep :thunderwave
165-
],
171+
:silent-image :sleep :thunderwave],
166172
2
167173
[:alter-self :blindness-deafness :blur :darkness :darkvision
168174
:detect-thoughts :enhance-ability :enlarge-reduce :gust-of-wind
@@ -181,20 +187,19 @@
181187
5
182188
[:animate-objects :cloudkill :cone-of-cold :creation
183189
:dominate-person :hold-monster :insect-plague :seeming :telekinesis
184-
:teleportation-circle :wall-of-stone
185-
],
190+
:teleportation-circle :wall-of-stone],
186191
6
187192
[:chain-lightning :circle-of-death :disintegrate :eyebite
188193
:globe-of-invulnerability :mass-suggestion :move-earth :sunbeam
189-
:true-seeing
190-
],
194+
:true-seeing],
191195
7
192196
[:delayed-blast-fireball :etherealness :finger-of-death :fire-storm
193197
:plane-shift :prismatic-spray :reverse-gravity :teleport],
194198
8
195199
[:dominate-monster :earthquake :incendiary-cloud :power-word-stun
196200
:sunburst],
197-
9 [:gate :meteor-swarm :power-word-kill :time-stop :wish]},
201+
9
202+
[:gate :meteor-swarm :power-word-kill :time-stop :wish]},
198203
:warlock
199204
{0
200205
[:chill-touch :eldritch-blast :mage-hand :minor-illusion :prestidigitation
@@ -205,37 +210,37 @@
205210
2
206211
[:darkness :enthrall :hold-person :invisibility :mirror-image
207212
:misty-step :ray-of-enfeeblement :shatter :spider-climb
208-
:suggestion
209-
],
213+
:suggestion],
210214
3
211215
[:counterspell :dispel-magic :fear :fly :gaseous-form :hypnotic-pattern
212216
:magic-circle :major-image :remove-curse :tongues :vampiric-touch],
213-
4 [:banishment :blight :dimension-door :hallucinatory-terrain ],
214-
5 [:contact-other-plane :dream :hold-monster :scrying],
217+
4
218+
[:banishment :blight :dimension-door :hallucinatory-terrain ],
219+
5
220+
[:contact-other-plane :dream :hold-monster :scrying],
215221
6
216222
[:circle-of-death :conjure-fey :create-undead :eyebite
217-
:flesh-to-stone :mass-suggestion :true-seeing
218-
],
219-
7 [:etherealness :finger-of-death :forcecage :plane-shift],
223+
:flesh-to-stone :mass-suggestion :true-seeing],
224+
7
225+
[:etherealness :finger-of-death :forcecage :plane-shift],
220226
8
221227
[:demiplane :dominate-monster :feeblemind :glibness
222228
:power-word-stun],
223-
9 [:astral-projection :foresight :imprisonment :power-word-kill :true-polymorph]},
229+
9
230+
[:astral-projection :foresight :imprisonment :power-word-kill :true-polymorph]},
224231
:wizard
225232
{0
226233
[:acid-splash :chill-touch :dancing-lights :fire-bolt :light :mage-hand
227234
:mending :message :minor-illusion :poison-spray :prestidigitation :ray-of-frost
228-
:shocking-grasp :true-strike
229-
:booming-blade :green-flame-blade :sword-burst],
235+
:shocking-grasp :true-strike],
230236
1
231237
[:alarm :burning-hands :charm-person :color-spray
232238
:comprehend-languages :detect-magic :disguise-self
233239
:expeditious-retreat :false-life :feather-fall :find-familiar
234240
:fog-cloud :grease :identify :illusory-script
235241
:jump :longstrider :mage-armor :magic-missile
236242
:protection-from-evil-and-good :shield :silent-image :sleep
237-
:hideous-laughter :floating-disk :thunderwave :unseen-servant
238-
],
243+
:hideous-laughter :floating-disk :thunderwave :unseen-servant],
239244
2
240245
[:alter-self :arcane-lock
241246
:blindness-deafness :blur :continual-flame :darkness :darkvision
@@ -266,12 +271,11 @@
266271
:passwall :planar-binding :telepathic-bond :scrying :seeming :telekinesis
267272
:teleportation-circle :wall-of-force :wall-of-stone],
268273
6
269-
[#_:arcane-gate :chain-lightning :circle-of-death :contingency :create-undead
274+
[:chain-lightning :circle-of-death :contingency :create-undead
270275
:disintegrate :instant-summons :eyebite :flesh-to-stone
271276
:globe-of-invulnerability :guards-and-wards
272277
:magic-jar :mass-suggestion :move-earth :freezing-sphere :irresistible-dance
273-
:programmed-illusion :sunbeam :true-seeing :wall-of-ice
274-
],
278+
:programmed-illusion :sunbeam :true-seeing :wall-of-ice],
275279
7
276280
[:delayed-blast-fireball :etherealness
277281
:finger-of-death :forcecage :mirage-arcane :magnificent-mansion
@@ -295,7 +299,7 @@
295299
(def spell-lists
296300
phb-spell-lists
297301
#_(merge-with
298-
merge-class-lists
299-
phb-spell-lists
300-
ee-spell-lists
301-
ua-starter-spells-lists))
302+
merge-class-lists
303+
phb-spell-lists
304+
ee-spell-lists
305+
ua-starter-spells-lists))

0 commit comments

Comments
 (0)