[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)

* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag * really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
parent b6c4bd6e01
commit 7126b61205
56 changed files with 348 additions and 311 deletions
@@ -38,8 +38,7 @@
 		if(11 to 15)
 			new /obj/item/reagent_containers/glass/beaker/bluespace(src)
 		if(16 to 20)
-			for(var/i in 1 to 10)
-				new /obj/item/ore/diamond(src)
+			new /obj/item/stack/ore/diamond(src, 10)
 		if(21 to 25)
 			for(var/i in 1 to 5)
 				new /obj/item/poster/random_contraband(src)
@@ -86,8 +85,7 @@
 				var/newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
 				new newitem(src)
 		if(69 to 70)
-			for(var/i in 1 to 5)
-				new /obj/item/ore/bluespace_crystal(src)
+			new /obj/item/stack/ore/bluespace_crystal(src, 5)
 		if(71 to 72)
 			new /obj/item/pickaxe/drill(src)
 		if(73 to 74)
@@ -196,7 +194,7 @@
 			if(attempts == 1)
 				to_chat(user, "<span class='warning'>* Anti-Tamper Bomb will activate on next failed access attempt.</span>")
 			else
-				to_chat(user, "<span class='notice'>* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.</span>")
+				to_chat(user, "<span class='notice'>* Anti-Tamper Bomb will activate after [attempts] failed access attempts.</span>")
 			if(lastattempt != null)
 				var/list/guess = list()
 				var/list/answer = list()
@@ -83,10 +83,10 @@
 	return ..()

 /obj/machinery/mineral/processing_unit/HasProximity(atom/movable/AM)
-	if(istype(AM, /obj/item/ore) && AM.loc == get_step(src, input_dir))
+	if(istype(AM, /obj/item/stack/ore) && AM.loc == get_step(src, input_dir))
 		process_ore(AM)

-/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/ore/O)
+/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/stack/ore/O)
 	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(O)
 	if(!materials.has_space(material_amount))
@@ -48,12 +48,12 @@
 	point_upgrade = point_upgrade_temp
 	sheet_per_ore = sheet_per_ore_temp

-/obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/ore/O)
+/obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/stack/ore/O)

 	ore_buffer -= O

 	if(O && O.refined_type)
-		points += O.points * point_upgrade
+		points += O.points * point_upgrade * O.amount

 	GET_COMPONENT(materials, /datum/component/material_container)
 	var/material_amount = materials.get_item_material_amount(O)
@@ -61,7 +61,7 @@
 	if(!material_amount)
 		qdel(O) //no materials, incinerate it

-	else if(!materials.has_space(material_amount * sheet_per_ore)) //if there is no space, eject it
+	else if(!materials.has_space(material_amount * sheet_per_ore * O.amount)) //if there is no space, eject it
 		unload_mineral(O)

 	else
@@ -133,7 +133,7 @@
 	if(OB)
 		input = OB

-	for(var/obj/item/ore/O in input)
+	for(var/obj/item/stack/ore/O in input)
 		if(QDELETED(O))
 			continue
 		ore_buffer |= O
@@ -16,7 +16,7 @@
 	if(T)
 		var/limit
 		for(var/obj/structure/ore_box/B in T)
-			for (var/obj/item/ore/O in B)
+			for (var/obj/item/stack/ore/O in B)
 				B.contents -= O
 				unload_mineral(O)
 				limit++
@@ -36,9 +36,9 @@
 	projectiletype = /obj/item/projectile/kinetic
 	projectilesound = 'sound/weapons/gunshot4.ogg'
 	speak_emote = list("states")
-	wanted_objects = list(/obj/item/ore/diamond, /obj/item/ore/gold, /obj/item/ore/silver,
-						  /obj/item/ore/plasma,  /obj/item/ore/uranium,    /obj/item/ore/iron,
-						  /obj/item/ore/bananium, /obj/item/ore/titanium)
+	wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
+						  /obj/item/stack/ore/plasma,  /obj/item/stack/ore/uranium,    /obj/item/stack/ore/iron,
+						  /obj/item/stack/ore/bananium, /obj/item/stack/ore/titanium)
 	healable = 0
 	var/mode = MINEDRONE_COLLECT
 	var/light_on = 0
@@ -85,7 +85,7 @@
 /mob/living/simple_animal/hostile/mining_drone/death()
 	..()
 	visible_message("<span class='danger'>[src] is destroyed!</span>")
-	new /obj/effect/decal/cleanable/robot_debris(src.loc)
+	new /obj/effect/decal/cleanable/robot_debris(loc)
 	DropOre(0)
 	qdel(src)
 	return
@@ -124,20 +124,14 @@
 	to_chat(src, "<span class='info'>You are set to attack mode. You can now attack from range.</span>")

 /mob/living/simple_animal/hostile/mining_drone/AttackingTarget()
-	if(istype(target, /obj/item/ore) && mode ==  MINEDRONE_COLLECT)
+	if(istype(target, /obj/item/stack/ore) && mode ==  MINEDRONE_COLLECT)
 		CollectOre()
 		return
 	return ..()

 /mob/living/simple_animal/hostile/mining_drone/proc/CollectOre()
-	var/obj/item/ore/O
-	for(O in src.loc)
+	for(var/obj/item/stack/ore/O in range(1, src))
 		O.forceMove(src)
-	for(var/dir in GLOB.alldirs)
-		var/turf/T = get_step(src,dir)
-		for(O in T)
-			O.forceMove(src)
-	return

 /mob/living/simple_animal/hostile/mining_drone/proc/DropOre(message = 1)
 	if(!contents.len)
@@ -146,7 +140,7 @@
 		return
 	if(message)
 		to_chat(src, "<span class='notice'>You dump your stored ore.</span>")
-	for(var/obj/item/ore/O in contents)
+	for(var/obj/item/stack/ore/O in contents)
 		contents -= O
 		O.forceMove(drop_location())
 	return
@@ -3,16 +3,43 @@
 #define GIBTONITE_QUALITY_MEDIUM 2
 #define GIBTONITE_QUALITY_LOW 1

+#define ORESTACK_OVERLAYS_MAX 10
+
 /**********************Mineral ores**************************/

-/obj/item/ore
+/obj/item/stack/ore
 	name = "rock"
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore"
+	full_w_class = WEIGHT_CLASS_BULKY
+	singular_name = "ore chunk"
 	var/points = 0 //How many points this ore gets you from the ore redemption machine
 	var/refined_type = null //What this ore defaults to being refined into
+	novariants = FALSE // Ore stacks handle their icon updates themselves to keep the illusion that there's more going
+	var/list/stack_overlays

-/obj/item/ore/attackby(obj/item/I, mob/user, params)
+/obj/item/stack/ore/add(amount)
+	var/amount_added = 0
+	while (amount_added < amount && LAZYLEN(stack_overlays) < ORESTACK_OVERLAYS_MAX)
+		var/mutable_appearance/newore = mutable_appearance(icon, icon_state)
+		newore.pixel_x = rand(-8,8)
+		newore.pixel_y = rand(-8,8)
+		LAZYADD(stack_overlays, newore)
+		amount_added++
+	return ..()
+
+/obj/item/stack/ore/use(amount)
+	var/newamount = src.amount - amount
+	if (newamount <= ORESTACK_OVERLAYS_MAX)
+		if (LAZYLEN(stack_overlays))
+			stack_overlays.len = newamount-1
+	return ..()
+
+/obj/item/stack/ore/update_icon()
+	. = ..()
+	add_overlay(stack_overlays)
+
+/obj/item/stack/ore/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weldingtool))
 		var/obj/item/weldingtool/W = I
 		if(W.remove_fuel(15) && refined_type)
@@ -22,91 +49,40 @@
 			to_chat(user, "<span class='info'>Not enough fuel to smelt [src].</span>")
 	..()

-/obj/item/ore/Crossed(atom/movable/AM)
-	set waitfor = FALSE
-	var/show_message = TRUE
-	for(var/obj/item/ore/O in loc)
-		if(O != src)
-			show_message = FALSE
-			break
-	var/obj/item/storage/bag/ore/OB
-	if(ishuman(AM))
-		var/mob/living/carbon/human/H = AM
-		OB = locate(/obj/item/storage/bag/ore) in H.get_storage_slots()
-		if(!OB)
-			OB = locate(/obj/item/storage/bag/ore) in H.held_items
-	else if(iscyborg(AM))
-		var/mob/living/silicon/robot/R = AM
-		OB = locate(/obj/item/storage/bag/ore) in R.held_items
-	if(OB)
-		var/obj/structure/ore_box/box
-		if(!OB.can_be_inserted(src, TRUE, AM))
-			if(!OB.spam_protection)
-				to_chat(AM, "<span class='warning'>Your [OB.name] is full and can't hold any more ore!</span>")
-				OB.spam_protection = TRUE
-				sleep(1)
-				OB.spam_protection = FALSE
-		else
-			OB.handle_item_insertion(src, TRUE, AM)
-		// Then, if the user is dragging an ore box, empty the satchel
-		// into the box.
-		var/mob/living/L = AM
-		if(istype(L.pulling, /obj/structure/ore_box))
-			box = L.pulling
-			for(var/obj/item/ore/O in OB)
-				OB.remove_from_storage(src, box)
-		if(show_message)
-			playsound(L, "rustle", 50, TRUE)
-			if(box)
-				L.visible_message("<span class='notice'>[L] offloads the ores into [box].</span>", \
-				"<span class='notice'>You offload the ores beneath you into your [box.name].</span>")
-			else
-				L.visible_message("<span class='notice'>[L] scoops up the ores beneath them.</span>", \
-				"<span class='notice'>You scoop up the ores beneath you with your [OB.name].</span>")
-	return ..()
-
-/obj/item/ore/uranium
+/obj/item/stack/ore/uranium
 	name = "uranium ore"
 	icon_state = "Uranium ore"
+	singular_name = "uranium ore chunk"
 	points = 30
 	materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/uranium

-/obj/item/ore/iron
+/obj/item/stack/ore/iron
 	name = "iron ore"
 	icon_state = "Iron ore"
+	singular_name = "iron ore chunk"
 	points = 1
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/metal

-/obj/item/ore/glass
+/obj/item/stack/ore/glass
 	name = "sand pile"
 	icon_state = "Glass ore"
+	singular_name = "sand pile"
 	points = 1
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/glass
 	w_class = WEIGHT_CLASS_TINY

-/obj/item/ore/glass/attack_self(mob/living/user)
-	to_chat(user, "<span class='notice'>You use the sand to make sandstone.</span>")
-	var/sandAmt = 1
-	for(var/obj/item/ore/glass/G in user.loc) // The sand on the floor
-		sandAmt += 1
-		qdel(G)
-	while(sandAmt > 0)
-		var/obj/item/stack/sheet/mineral/sandstone/SS = new /obj/item/stack/sheet/mineral/sandstone(user.loc)
-		if(sandAmt >= SS.max_amount)
-			SS.amount = SS.max_amount
-		else
-			SS.amount = sandAmt
-			for(var/obj/item/stack/sheet/mineral/sandstone/SA in user.loc)
-				if(SA != SS && SA.amount < SA.max_amount)
-					SA.attackby(SS, user) //we try to transfer all old unfinished stacks to the new stack we created.
-		sandAmt -= SS.max_amount
-	qdel(src)
-	return
+GLOBAL_LIST_INIT(sand_recipes, list(\
+		new /datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50)\
+		))

-/obj/item/ore/glass/throw_impact(atom/hit_atom)
+/obj/item/stack/ore/glass/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.sand_recipes
+	. = ..()
+
+/obj/item/stack/ore/glass/throw_impact(atom/hit_atom)
 	if(..() || !ishuman(hit_atom))
 		return
 	var/mob/living/carbon/human/C = hit_atom
@@ -125,18 +101,20 @@
 	to_chat(C, "<span class='userdanger'>\The [src] gets into your eyes! The pain, it burns!</span>")
 	qdel(src)

-/obj/item/ore/glass/basalt
+/obj/item/stack/ore/glass/basalt
 	name = "volcanic ash"
 	icon_state = "volcanic_sand"
+	singular_name = "volcanic ash pile"

-/obj/item/ore/plasma
+/obj/item/stack/ore/plasma
 	name = "plasma ore"
 	icon_state = "Plasma ore"
+	singular_name = "plasma ore chunk"
 	points = 15
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/plasma

-/obj/item/ore/plasma/attackby(obj/item/I, mob/user, params)
+/obj/item/stack/ore/plasma/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weldingtool))
 		var/obj/item/weldingtool/W = I
 		if(W.welding)
@@ -145,45 +123,51 @@
 		..()


-/obj/item/ore/silver
+/obj/item/stack/ore/silver
 	name = "silver ore"
 	icon_state = "Silver ore"
+	singular_name = "silver ore chunk"
 	points = 16
 	materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/silver

-/obj/item/ore/gold
+/obj/item/stack/ore/gold
 	name = "gold ore"
 	icon_state = "Gold ore"
+	singular_name = "gold ore chunk"
 	points = 18
 	materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/gold

-/obj/item/ore/diamond
+/obj/item/stack/ore/diamond
 	name = "diamond ore"
 	icon_state = "Diamond ore"
+	singular_name = "diamond ore chunk"
 	points = 50
 	materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/diamond

-/obj/item/ore/bananium
+/obj/item/stack/ore/bananium
 	name = "bananium ore"
 	icon_state = "Bananium ore"
+	singular_name = "bananium ore chunk"
 	points = 60
 	materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/bananium

-/obj/item/ore/titanium
+/obj/item/stack/ore/titanium
 	name = "titanium ore"
 	icon_state = "Titanium ore"
+	singular_name = "titanium ore chunk"
 	points = 50
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
 	refined_type = /obj/item/stack/sheet/mineral/titanium

-/obj/item/ore/slag
+/obj/item/stack/ore/slag
 	name = "slag"
 	desc = "Completely useless."
 	icon_state = "slag"
+	singular_name = "slag chunk"

 /obj/item/twohanded/required/gibtonite
 	name = "gibtonite ore"
@@ -285,13 +269,20 @@
 				explosion(src,0,1,3,adminlog = notify_admins)
 		qdel(src)

-/obj/item/ore/Initialize()
+/obj/item/stack/ore/Initialize()
 	. = ..()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8

-/obj/item/ore/ex_act()
-	return
+/obj/item/stack/ore/ex_act(severity, target)
+	if (!severity || severity >= 2)
+		return
+	qdel(src)
+
+/obj/item/ore/stack/glass/ex_act(severity, target)
+	if (severity == EXPLODE_NONE)
+		return
+	qdel(src)

 /*****************************Coin********************************/

@@ -463,4 +454,7 @@
 			user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
 							 "<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
 							 "<span class='italics'>You hear the clattering of loose change.</span>")
-	return TRUE//did the coin flip? useful for suicide_act
+	return TRUE//did the coin flip? useful for suicide_act
+
+
+#undef ORESTACK_OVERLAYS_MAX
@@ -10,11 +10,11 @@
 	pressure_resistance = 5*ONE_ATMOSPHERE

 /obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
-	if (istype(W, /obj/item/ore))
+	if (istype(W, /obj/item/stack/ore))
 		user.transferItemToLoc(W, src)
 	else if (istype(W, /obj/item/storage))
 		var/obj/item/storage/S = W
-		for(var/obj/item/ore/O in S.contents)
+		for(var/obj/item/stack/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
 		to_chat(user, "<span class='notice'>You empty the ore in [S] into \the [src].</span>")
 	else if(istype(W, /obj/item/crowbar))
@@ -41,18 +41,18 @@

 /obj/structure/ore_box/proc/show_contents(mob/user)
 	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
-	var/list/oretypes = list()
-	for(var/obj/item/ore/O in contents)
-		oretypes |= O.type
-	for(var/i in oretypes)
-		var/obj/item/ore/T = locate(i) in contents
-		dat += "[capitalize(T.name)]: [count_by_type(contents, T.type)]<br>"
+	var/list/assembled = list()
+	for(var/obj/item/stack/ore/O in src)
+		assembled[O.type] += O.amount
+	for(var/type in assembled)
+		var/obj/item/stack/ore/O = type
+		dat += "[initial(O.name)] - [assembled[type]]<br>"
 	dat += text("<br><br><A href='?src=[REF(src)];removeall=1'>Empty box</A>")
 	user << browse(dat, "window=orebox")

 /obj/structure/ore_box/proc/dump_box_contents()
 	var/drop = drop_location()
-	for(var/obj/item/ore/O in src)
+	for(var/obj/item/stack/ore/O in src)
 		if(QDELETED(O))
 			continue
 		if(QDELETED(src))
@@ -69,7 +69,7 @@
 		return

 	usr.set_machine(src)
-	src.add_fingerprint(usr)
+	add_fingerprint(usr)
 	if(href_list["removeall"])
 		dump_box_contents()
 		to_chat(usr, "<span class='notice'>You open the release hatch on the box..</span>")
@@ -83,4 +83,4 @@
 	qdel(src)

 /obj/structure/ore_box/onTransitZ()
-	return
+	return