First pass on porting Baymining. Compiles, not playable, do not merge alone.

code/modules/mining/machine_stacking.dm

@@ -10,17 +10,16 @@
 	var/machinedir = SOUTHEAST
 
 /obj/machinery/mineral/stacking_unit_console/New()
+
 	..()
+
 	spawn(7)
 		src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
 		if (machine)
-			machine.CONSOLE = src
+			machine.console = src
 		else
 			del(src)
 
-/obj/machinery/mineral/stacking_unit_console/process()
-	updateDialog()
-
 /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
 	add_fingerprint(user)
 	interact(user)
@@ -30,168 +29,38 @@
 
 	var/dat
 
-	dat += text("<b>Stacking unit console</b><br><br>")
+	dat += text("<h1>Stacking unit console</h1><hr><table>")
 
-	if(machine.ore_iron)
-		dat += text("Iron: [machine.ore_iron] <A href='?src=\ref[src];release=iron'>Release</A><br>")
-	if(machine.ore_plasteel)
-		dat += text("Plasteel: [machine.ore_plasteel] <A href='?src=\ref[src];release=plasteel'>Release</A><br>")
-	if(machine.ore_glass)
-		dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
-	if(machine.ore_rglass)
-		dat += text("Reinforced Glass: [machine.ore_rglass] <A href='?src=\ref[src];release=rglass'>Release</A><br>")
-	if(machine.ore_plasma)
-		dat += text("Plasma: [machine.ore_plasma] <A href='?src=\ref[src];release=plasma'>Release</A><br>")
-	if(machine.ore_plasmaglass)
-		dat += text("Plasma Glass: [machine.ore_plasmaglass] <A href='?src=\ref[src];release=plasmaglass'>Release</A><br>")
-	if(machine.ore_plasmarglass)
-		dat += text("Reinforced Plasma Glass: [machine.ore_plasmarglass] <A href='?src=\ref[src];release=plasmarglass'>Release</A><br>")
-	if(machine.ore_gold)
-		dat += text("Gold: [machine.ore_gold] <A href='?src=\ref[src];release=gold'>Release</A><br>")
-	if(machine.ore_silver)
-		dat += text("Silver: [machine.ore_silver] <A href='?src=\ref[src];release=silver'>Release</A><br>")
-	if(machine.ore_uranium)
-		dat += text("Uranium: [machine.ore_uranium] <A href='?src=\ref[src];release=uranium'>Release</A><br>")
-	if(machine.ore_diamond)
-		dat += text("Diamond: [machine.ore_diamond] <A href='?src=\ref[src];release=diamond'>Release</A><br>")
-	if(machine.ore_wood)
-		dat += text("Wood: [machine.ore_wood] <A href='?src=\ref[src];release=wood'>Release</A><br>")
-	if(machine.ore_cardboard)
-		dat += text("Cardboard: [machine.ore_cardboard] <A href='?src=\ref[src];release=cardboard'>Release</A><br>")
-	if(machine.ore_cloth)
-		dat += text("Cloth: [machine.ore_cloth] <A href='?src=\ref[src];release=cloth'>Release</A><br>")
-	if(machine.ore_leather)
-		dat += text("Leather: [machine.ore_leather] <A href='?src=\ref[src];release=leather'>Release</A><br>")
-	if(machine.ore_clown)
-		dat += text("Bananium: [machine.ore_clown] <A href='?src=\ref[src];release=clown'>Release</A><br>")
-	if(machine.ore_adamantine)
-		dat += text ("Adamantine: [machine.ore_adamantine] <A href='?src=\ref[src];release=adamantine'>Release</A><br>")
-	if(machine.ore_mythril)
-		dat += text ("Mythril: [machine.ore_mythril] <A href='?src=\ref[src];release=adamantine'>Release</A><br>")
-
-	dat += text("<br>Stacking: [machine.stack_amt]<br><br>")
+	for(var/stacktype in machine.stack_storage)
+		if(machine.stack_storage[stacktype] > 0)
+			dat += "<tr><td width = 150><b>[capitalize(stacktype)]:</b></td><td width = 30>[machine.stack_storage[stacktype]]</td><td width = 50><A href='?src=\ref[src];release_stack=[stacktype]'>\[release\]</a></td></tr>"
+	dat += "</table><hr>"
+	dat += text("<br>Stacking: [machine.stack_amt] <A href='?src=\ref[src];change_stack=1'>\[change\]</a><br><br>")
 
 	user << browse("[dat]", "window=console_stacking_machine")
 	onclose(user, "console_stacking_machine")
 
+
 /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list)
 	if(..())
 		return
-	usr.set_machine(src)
-	src.add_fingerprint(usr)
-	if(href_list["release"])
-		switch(href_list["release"])
-			if ("plasma")
-				if (machine.ore_plasma > 0)
-					var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
-					G.amount = machine.ore_plasma
-					G.loc = machine.output.loc
-					machine.ore_plasma = 0
-			if ("plasmaglass")
-				if (machine.ore_plasmaglass > 0)
-					var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
-					G.amount = machine.ore_plasmaglass
-					G.loc = machine.output.loc
-					machine.ore_plasmaglass = 0
-			if ("plasmarglass")
-				if (machine.ore_plasmarglass > 0)
-					var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
-					G.amount = machine.ore_plasmarglass
-					G.loc = machine.output.loc
-					machine.ore_plasmarglass = 0
-			if ("uranium")
-				if (machine.ore_uranium > 0)
-					var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium
-					G.amount = machine.ore_uranium
-					G.loc = machine.output.loc
-					machine.ore_uranium = 0
-			if ("glass")
-				if (machine.ore_glass > 0)
-					var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass
-					G.amount = machine.ore_glass
-					G.loc = machine.output.loc
-					machine.ore_glass = 0
-			if ("rglass")
-				if (machine.ore_rglass > 0)
-					var/obj/item/stack/sheet/rglass/G = new /obj/item/stack/sheet/rglass
-					G.amount = machine.ore_rglass
-					G.loc = machine.output.loc
-					machine.ore_rglass = 0
-			if ("gold")
-				if (machine.ore_gold > 0)
-					var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold
-					G.amount = machine.ore_gold
-					G.loc = machine.output.loc
-					machine.ore_gold = 0
-			if ("silver")
-				if (machine.ore_silver > 0)
-					var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver
-					G.amount = machine.ore_silver
-					G.loc = machine.output.loc
-					machine.ore_silver = 0
-			if ("diamond")
-				if (machine.ore_diamond > 0)
-					var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond
-					G.amount = machine.ore_diamond
-					G.loc = machine.output.loc
-					machine.ore_diamond = 0
-			if ("iron")
-				if (machine.ore_iron > 0)
-					var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal
-					G.amount = machine.ore_iron
-					G.loc = machine.output.loc
-					machine.ore_iron = 0
-			if ("plasteel")
-				if (machine.ore_plasteel > 0)
-					var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
-					G.amount = machine.ore_plasteel
-					G.loc = machine.output.loc
-					machine.ore_plasteel = 0
-			if ("wood")
-				if (machine.ore_wood > 0)
-					var/obj/item/stack/sheet/wood/G = new /obj/item/stack/sheet/wood
-					G.amount = machine.ore_wood
-					G.loc = machine.output.loc
-					machine.ore_wood = 0
-			if ("cardboard")
-				if (machine.ore_cardboard > 0)
-					var/obj/item/stack/sheet/cardboard/G = new /obj/item/stack/sheet/cardboard
-					G.amount = machine.ore_cardboard
-					G.loc = machine.output.loc
-					machine.ore_cardboard = 0
-			if ("cloth")
-				if (machine.ore_cloth > 0)
-					var/obj/item/stack/sheet/cloth/G = new /obj/item/stack/sheet/cloth
-					G.amount = machine.ore_cloth
-					G.loc = machine.output.loc
-					machine.ore_cloth = 0
-			if ("leather")
-				if (machine.ore_leather > 0)
-					var/obj/item/stack/sheet/leather/G = new /obj/item/stack/sheet/leather
-					G.amount = machine.ore_diamond
-					G.loc = machine.output.loc
-					machine.ore_leather = 0
-			if ("clown")
-				if (machine.ore_clown > 0)
-					var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown
-					G.amount = machine.ore_clown
-					G.loc = machine.output.loc
-					machine.ore_clown = 0
-			if ("adamantine")
-				if (machine.ore_adamantine > 0)
-					var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine
-					G.amount = machine.ore_adamantine
-					G.loc = machine.output.loc
-					machine.ore_adamantine = 0
-			if ("mythril")
-				if (machine.ore_mythril > 0)
-					var/obj/item/stack/sheet/mineral/mythril/G = new /obj/item/stack/sheet/mineral/mythril
-					G.amount = machine.ore_mythril
-					G.loc = machine.output.loc
-					machine.ore_mythril = 0
-	src.updateUsrDialog()
-	return
 
+	if(href_list["change_stack"])
+		var/choice = input("What would you like to set the stack amount to?") as null|anything in list(1,5,10,20,50)
+		if(!choice) return
+		machine.stack_amt = choice
+
+	if(href_list["release_stack"])
+		if(machine.stack_storage[href_list["release_stack"]] > 0)
+			var/stacktype = machine.stack_paths[href_list["release_stack"]]
+			var/obj/item/stack/sheet/S = new stacktype (get_turf(machine.output))
+			S.amount = machine.stack_storage[href_list["release_stack"]]
+			machine.stack_storage[href_list["release_stack"]] = 0
+
+	src.add_fingerprint(usr)
+	src.updateUsrDialog()
+
+	return
 
 /**********************Mineral stacking unit**************************/
 
@@ -202,33 +71,29 @@
 	icon_state = "stacker"
 	density = 1
 	anchored = 1.0
-	var/obj/machinery/mineral/stacking_unit_console/CONSOLE
-	var/stk_types = list()
-	var/stk_amt   = list()
+	var/obj/machinery/mineral/stacking_unit_console/console
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null
-	var/ore_gold = 0;
-	var/ore_silver = 0;
-	var/ore_diamond = 0;
-	var/ore_plasma = 0;
-	var/ore_plasmaglass = 0;
-	var/ore_plasmarglass = 0;
-	var/ore_iron = 0;
-	var/ore_uranium = 0;
-	var/ore_clown = 0;
-	var/ore_glass = 0;
-	var/ore_rglass = 0;
-	var/ore_plasteel = 0;
-	var/ore_wood = 0
-	var/ore_cardboard = 0
-	var/ore_cloth = 0;
-	var/ore_leather = 0;
-	var/ore_adamantine = 0;
-	var/ore_mythril = 0;
-	var/stack_amt = 50; //ammount to stack before releassing
+	var/list/stack_storage[0]
+	var/list/stack_paths[0]
+	var/stack_amt = 50; // Amount to stack before releassing
 
 /obj/machinery/mineral/stacking_machine/New()
 	..()
+
+	for(var/stacktype in typesof(/obj/item/stack/sheet/mineral)-/obj/item/stack/sheet/mineral)
+		var/obj/item/stack/S = new stacktype(src)
+		stack_storage[S.name] = 0
+		stack_paths[S.name] = stacktype
+		del(S)
+
+	stack_storage["glass"] = 0
+	stack_paths["glass"] = /obj/item/stack/sheet/glass
+	stack_storage["metal"] = 0
+	stack_paths["metal"] = /obj/item/stack/sheet/metal
+	stack_storage["plasteel"] = 0
+	stack_paths["plasteel"] = /obj/item/stack/sheet/plasteel
+
 	spawn( 5 )
 		for (var/dir in cardinal)
 			src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
@@ -236,220 +101,31 @@
 		for (var/dir in cardinal)
 			src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
 			if(src.output) break
-		processing_objects.Add(src)
 		return
 	return
 
 /obj/machinery/mineral/stacking_machine/process()
 	if (src.output && src.input)
-		var/obj/item/stack/O
-		while (locate(/obj/item, input.loc))
-			O = locate(/obj/item/stack, input.loc)
-			if(isnull(O))
-				var/obj/item/I = locate(/obj/item, input.loc)
-				if (istype(I,/obj/item/weapon/ore/slag))
-					I.loc = null
+		var/turf/T = get_turf(input)
+		for(var/obj/item/O in T.contents)
+			if(!O) return
+			if(istype(O,/obj/item/stack))
+				if(!isnull(stack_storage[O.name]))
+					stack_storage[O.name]++
+					O.loc = null
 				else
-					I.loc = output.loc
-				continue
-			if (istype(O,/obj/item/stack/sheet/metal))
-				ore_iron+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/diamond))
-				ore_diamond+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/plasma))
-				ore_plasma+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/gold))
-				ore_gold+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/silver))
-				ore_silver+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/clown))
-				ore_clown+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/uranium))
-				ore_uranium+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/glass/plasmaglass))
-				ore_plasmaglass+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/glass/plasmarglass))
-				ore_plasmarglass+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/glass))
-				ore_glass+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/rglass))
-				ore_rglass+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/plasteel))
-				ore_plasteel+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/adamantine))
-				ore_adamantine+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/mineral/mythril))
-				ore_mythril+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/cardboard))
-				ore_cardboard+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/wood))
-				ore_wood+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/cloth))
-				ore_cloth+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			if (istype(O,/obj/item/stack/sheet/leather))
-				ore_leather+= O.amount
-				O.loc = null
-				//del(O)
-				continue
-			O.loc = src.output.loc
+					O.loc = output.loc
+			else
+				O.loc = output.loc
 
-	if (ore_gold >= stack_amt)
-		var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_gold -= stack_amt
-		return
-	if (ore_silver >= stack_amt)
-		var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_silver -= stack_amt
-		return
-	if (ore_diamond >= stack_amt)
-		var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_diamond -= stack_amt
-		return
-	if (ore_plasma >= stack_amt)
-		var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_plasma -= stack_amt
-		return
-	if (ore_iron >= stack_amt)
-		var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_iron -= stack_amt
-		return
-	if (ore_clown >= stack_amt)
-		var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_clown -= stack_amt
-		return
-	if (ore_uranium >= stack_amt)
-		var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_uranium -= stack_amt
-		return
-	if (ore_glass >= stack_amt)
-		var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_glass -= stack_amt
-		return
-	if (ore_rglass >= stack_amt)
-		var/obj/item/stack/sheet/rglass/G = new /obj/item/stack/sheet/rglass
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_rglass -= stack_amt
-		return
-	if (ore_plasmaglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmaglass/G = new /obj/item/stack/sheet/glass/plasmaglass
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_plasmaglass -= stack_amt
-		return
-	if (ore_plasmarglass >= stack_amt)
-		var/obj/item/stack/sheet/glass/plasmarglass/G = new /obj/item/stack/sheet/glass/plasmarglass
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_plasmarglass -= stack_amt
-		return
-	if (ore_plasteel >= stack_amt)
-		var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_plasteel -= stack_amt
-		return
-	if (ore_wood >= stack_amt)
-		var/obj/item/stack/sheet/wood/G = new /obj/item/stack/sheet/wood
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_wood -= stack_amt
-		return
-	if (ore_cardboard >= stack_amt)
-		var/obj/item/stack/sheet/cardboard/G = new /obj/item/stack/sheet/cardboard
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_cardboard -= stack_amt
-		return
-	if (ore_cloth >= stack_amt)
-		var/obj/item/stack/sheet/cloth/G = new /obj/item/stack/sheet/cloth
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_cloth -= stack_amt
-		return
-	if (ore_leather >= stack_amt)
-		var/obj/item/stack/sheet/leather/G = new /obj/item/stack/sheet/leather
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_leather -= stack_amt
-		return
-	if (ore_adamantine >= stack_amt)
-		var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_adamantine -= stack_amt
-		return
-	if (ore_mythril >= stack_amt)
-		var/obj/item/stack/sheet/mineral/mythril/G = new /obj/item/stack/sheet/mineral/mythril
-		G.amount = stack_amt
-		G.loc = output.loc
-		ore_mythril -= stack_amt
-		return
+	//Output amounts that are past stack_amt.
+	for(var/sheet in stack_storage)
+		if(stack_storage[sheet] >= stack_amt)
+			var/stacktype = stack_paths[sheet]
+			var/obj/item/stack/sheet/S = new stacktype (get_turf(output))
+			S.amount = stack_amt
+			stack_storage[sheet] -= stack_amt
+
+	console.updateUsrDialog()
 	return
+