Skip to content

Commit 809498e

Browse files
Working on implementing anima.
Removes the 'veer' language stolen from Erickson. Working commit for additional spells.
1 parent ee2c03c commit 809498e

43 files changed

Lines changed: 818 additions & 304 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

maps/karzerfeste/karzerfeste.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "../../mods/content/fantasy/_fantasy.dme"
1010
#include "../../mods/content/undead/_undead.dme"
1111
#include "../../mods/content/biomods/_biomods.dme"
12+
#include "../../mods/content/wyrd/_wyrd.dme"
1213
#include "../../mods/pyrelight/_pyrelight.dme" // include after _fantasy.dme so overrides work
1314

1415
#include "areas/_area.dm"

maps/shaded_hills/shaded_hills.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "../../mods/species/drakes/_drakes.dme" // include before _fantasy.dme so overrides work
88
#include "../../mods/species/neoavians/_neoavians.dme" // include before _fantasy.dme so overrides work
99
#include "../../mods/content/item_sharpening/_item_sharpening.dme"
10-
#include "../../mods/content/anima/_anima.dme" // include before _fantasy.dme so skill overrides work
10+
#include "../../mods/content/wyrd/_wyrd.dme" // include before _fantasy.dme so skill overrides work
1111
#include "../../mods/content/fantasy/_fantasy.dme"
1212
#include "../../mods/content/undead/_undead.dme"
1313
#include "../../mods/content/biomods/_biomods.dme"

maps/shaded_hills/shaded_hills_skills.dm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
/obj/item/runestone
66
work_skill = /decl/skill/crafting/artifice
77

8-
/decl/material/solid/potentia
9-
arcana_skill = SKILL_SCIENCE
10-
11-
/decl/runestone_spell_archetype
12-
arcana_skill = SKILL_SCIENCE
13-
148
// Removal of space skills
159
/datum/map/shaded_hills/get_available_skill_types()
1610
. = ..()

mods/content/anima/_anima.dm

Lines changed: 0 additions & 15 deletions
This file was deleted.

mods/content/anima/_anima.dme

Lines changed: 0 additions & 14 deletions
This file was deleted.

mods/content/anima/spell_archetypes.dm

Lines changed: 0 additions & 29 deletions
This file was deleted.

mods/content/anima/spell_datum.dm

Lines changed: 0 additions & 14 deletions
This file was deleted.

mods/content/anima/spell_effect.dm

Lines changed: 0 additions & 100 deletions
This file was deleted.

mods/content/anima/spellcasting.dm

Lines changed: 0 additions & 6 deletions
This file was deleted.

mods/content/wyrd/_wyrd.dm

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/decl/modpack/wyrd
2+
name = "Pyrelight Magic Content"
3+
credits_topics = list("ANCIENT MAGIC", "ANCIENT ANIMA", "MAGICAL RITUALS", "MAGIC SPELLS")
4+
credits_nouns = list("MAGIC", "ANIMA", "WYRD")
5+
credits_adjectives = list("ANCIENT", "MAGICAL", "ARCANE", "DIVINE", "BEWITCHED", "ENCHANTED")
6+
credits_crew_outcomes = list("BEWITCHED", "ENCHANTED", "MAGICKED", "CURSED")
7+
dreams = list(
8+
"wyrd", "anima", "potentia", "magic", "an ancient curse", "an arcane ritual",
9+
"a magic spell", "a magician", "a wizard", "a witch",
10+
"a necromancer", "an ancient scroll", "a magic crystal"
11+
)
12+
13+
/*
14+
Notes to self on my own system structure:
15+
- A spell as a concept is /decl/wyrd_archetype
16+
- Archetype provides /decl/wyrd_effect for basic effect, metamagic effect, etc.
17+
- /decl/wyrd_effect is the specific mechanical interaction when the spell is cast.
18+
- /datum/wyrd_working is a temporary holder for a /decl/wyrd_effect and /decl/wyrd_archetype as well as cast strength and cast mode (AOE, single target, etc)
19+
*/

0 commit comments

Comments
 (0)