Move materials to their own file, start working on a generic storage datum.

2025-12-10 18:32:03 +00:00 · 2014-01-16 20:19:02 -08:00
parent 4de5d2b5c4
commit 5a44b71d34
3 changed files with 129 additions and 82 deletions
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -849,6 +849,7 @@
 #include "code\modules\mining\machine_processing.dm"
 #include "code\modules\mining\machine_stacking.dm"
 #include "code\modules\mining\machine_unloading.dm"
+#include "code\modules\mining\materials.dm"
 #include "code\modules\mining\mine_areas.dm"
 #include "code\modules\mining\mine_items.dm"
 #include "code\modules\mining\mine_turfs.dm"
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -144,88 +144,6 @@ a.notsmelting {
 	src.updateUsrDialog()
 	return

-/*************************** ORES *********************************/
-
-/datum/material
-	var/name=""
-	var/processed_name=""
-	var/id=""
-	var/stored=0
-	var/selected=0
-	var/cc_per_sheet=CC_PER_SHEET_MISC
-	var/oretype=null
-	var/sheettype=null
-	var/cointype=null
-
-/datum/material/New()
-	if(processed_name=="")
-		processed_name=name
-
-/datum/material/iron
-	name="Iron"
-	id="iron"
-	cc_per_sheet=CC_PER_SHEET_METAL
-	oretype=/obj/item/weapon/ore/iron
-	sheettype=/obj/item/stack/sheet/metal
-	cointype=/obj/item/weapon/coin/iron
-
-/datum/material/glass
-	name="Sand"
-	processed_name="Glass"
-	id="glass"
-	cc_per_sheet=CC_PER_SHEET_GLASS
-	oretype=/obj/item/weapon/ore/glass
-	sheettype=/obj/item/stack/sheet/glass
-
-/datum/material/diamond
-	name="Diamond"
-	id="diamond"
-	oretype=/obj/item/weapon/ore/diamond
-	sheettype=/obj/item/stack/sheet/mineral/diamond
-	cointype=/obj/item/weapon/coin/diamond
-
-/datum/material/plasma
-	name="Plasma"
-	id="plasma"
-	oretype=/obj/item/weapon/ore/plasma
-	sheettype=/obj/item/stack/sheet/mineral/plasma
-	cointype=/obj/item/weapon/coin/plasma
-
-/datum/material/gold
-	name="Gold"
-	id="gold"
-	oretype=/obj/item/weapon/ore/gold
-	sheettype=/obj/item/stack/sheet/mineral/gold
-	cointype=/obj/item/weapon/coin/gold
-
-/datum/material/silver
-	name="Silver"
-	id="silver"
-	oretype=/obj/item/weapon/ore/silver
-	sheettype=/obj/item/stack/sheet/mineral/silver
-	cointype=/obj/item/weapon/coin/silver
-
-/datum/material/uranium
-	name="Uranium"
-	id="uranium"
-	oretype=/obj/item/weapon/ore/uranium
-	sheettype=/obj/item/stack/sheet/mineral/uranium
-	cointype=/obj/item/weapon/coin/uranium
-
-/datum/material/clown
-	name="Bananium"
-	id="clown"
-	oretype=/obj/item/weapon/ore/clown
-	sheettype=/obj/item/stack/sheet/mineral/clown
-	cointype=/obj/item/weapon/coin/clown
-
-/datum/material/phazon
-	name="Phazon"
-	id="phazon"
-	oretype=/obj/item/weapon/ore/phazon
-	sheettype=/obj/item/stack/sheet/mineral/phazon
-	cointype=/obj/item/weapon/coin/phazon
-
 /**********************Mineral processing unit**************************/

 /obj/machinery/mineral/processing_unit
--- a/code/modules/mining/materials.dm
+++ b/code/modules/mining/materials.dm
@@ -0,0 +1,128 @@
+/**
+* Materials system
+*
+* Replaces all of the horrible variables that tracked each individual thing.
+*/
+
+/**
+* MATERIALS DATUM
+*
+* Tracks and manages material storage for an object.
+*/
+/datum/materials
+	var/list/datum/material/storage[0]
+
+/datum/materials/New()
+	for(var/matdata in typesof(/datum/material) - /datum/material)
+		var/datum/material/mat = new matdata
+		storage[mat.id]=mat
+
+/datum/materials/proc/addAmount(var/mat_id,var/amount)
+	if(!(mat_id in storage))
+		warning("addAmount(): Unknown material [mat_id]!")
+		return
+	var/datum/material/mat=storage[mat_id]
+	mat.stored += amount
+	storage[mat_id]=mat
+
+/datum/materials/proc/removeAmount(var/mat_id,var/amount)
+	if(!(mat_id in storage))
+		warning("removeAmount(): Unknown material [mat_id]!")
+		return
+	addAmount(mat_id,-amount)
+
+/datum/materials/proc/getAmount(var/mat_id,var/amount)
+	if(!(mat_id in storage))
+		warning("getAmount(): Unknown material [mat_id]!")
+		return 0
+
+	var/datum/material/mat=getMaterial(mat_id)
+	return mat.stored
+
+/datum/materials/proc/getMaterial(var/mat_id)
+	if(!(mat_id in storage))
+		warning("getMaterial(): Unknown material [mat_id]!")
+		return 0
+
+	return storage[mat_id]
+
+
+/datum/material
+	var/name=""
+	var/processed_name=""
+	var/id=""
+	var/stored=0
+	var/selected=0
+	var/cc_per_sheet=CC_PER_SHEET_MISC
+	var/oretype=null
+	var/sheettype=null
+	var/cointype=null
+
+/datum/material/New()
+	if(processed_name=="")
+		processed_name=name
+
+/datum/material/iron
+	name="Iron"
+	id="iron"
+	cc_per_sheet=CC_PER_SHEET_METAL
+	oretype=/obj/item/weapon/ore/iron
+	sheettype=/obj/item/stack/sheet/metal
+	cointype=/obj/item/weapon/coin/iron
+
+/datum/material/glass
+	name="Sand"
+	processed_name="Glass"
+	id="glass"
+	cc_per_sheet=CC_PER_SHEET_GLASS
+	oretype=/obj/item/weapon/ore/glass
+	sheettype=/obj/item/stack/sheet/glass
+
+/datum/material/diamond
+	name="Diamond"
+	id="diamond"
+	oretype=/obj/item/weapon/ore/diamond
+	sheettype=/obj/item/stack/sheet/mineral/diamond
+	cointype=/obj/item/weapon/coin/diamond
+
+/datum/material/plasma
+	name="Plasma"
+	id="plasma"
+	oretype=/obj/item/weapon/ore/plasma
+	sheettype=/obj/item/stack/sheet/mineral/plasma
+	cointype=/obj/item/weapon/coin/plasma
+
+/datum/material/gold
+	name="Gold"
+	id="gold"
+	oretype=/obj/item/weapon/ore/gold
+	sheettype=/obj/item/stack/sheet/mineral/gold
+	cointype=/obj/item/weapon/coin/gold
+
+/datum/material/silver
+	name="Silver"
+	id="silver"
+	oretype=/obj/item/weapon/ore/silver
+	sheettype=/obj/item/stack/sheet/mineral/silver
+	cointype=/obj/item/weapon/coin/silver
+
+/datum/material/uranium
+	name="Uranium"
+	id="uranium"
+	oretype=/obj/item/weapon/ore/uranium
+	sheettype=/obj/item/stack/sheet/mineral/uranium
+	cointype=/obj/item/weapon/coin/uranium
+
+/datum/material/clown
+	name="Bananium"
+	id="clown"
+	oretype=/obj/item/weapon/ore/clown
+	sheettype=/obj/item/stack/sheet/mineral/clown
+	cointype=/obj/item/weapon/coin/clown
+
+/datum/material/phazon
+	name="Phazon"
+	id="phazon"
+	oretype=/obj/item/weapon/ore/phazon
+	sheettype=/obj/item/stack/sheet/mineral/phazon
+	cointype=/obj/item/weapon/coin/phazon