Turning a few components into elements. (#12325)

* Turning a few components into elements. * eh
2020-05-24 22:06:27 +02:00
parent 02f467654e
commit ce1f1bdf5e
20 changed files with 116 additions and 100 deletions
@@ -9,6 +9,7 @@
 	var/originalName
 	var/list/affixes
 	var/list/appliedComponents
+	var/list/appliedElements

 	var/static/list/affixListing

@@ -22,6 +23,7 @@

 	src.affixes = affixes
 	appliedComponents = list()
+	appliedElements = list()
 	randomAffixes()

 /datum/component/fantasy/Destroy()
@@ -118,6 +120,8 @@
 		affix.remove(src)
 	for(var/i in appliedComponents)
 		qdel(i)
+	for(var/i in appliedElements)
+		master._RemoveElement(i)

 	master.force = max(0, master.force - quality)
 	master.throwforce = max(0, master.throwforce - quality)
@@ -45,7 +45,8 @@

 /datum/fantasy_affix/tactical/apply(datum/component/fantasy/comp, newName)
 	var/obj/item/master = comp.parent
-	comp.appliedComponents += master.AddComponent(/datum/component/tactical)
+	master.AddElement(/datum/element/tactical)
+	comp.appliedElements += list(/datum/element/tactical)
 	return "tactical [newName]"

 /datum/fantasy_affix/pyromantic