From df2ce692ee2dc32c70a88e8098586fce189630f9 Mon Sep 17 00:00:00 2001 From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Date: Sun, 18 Feb 2024 08:10:57 +0530 Subject: [PATCH] General maintenance for all things boulder related. (#81358) ## About The Pull Request **1. Qol** - Adds screen tips & examines for screwdriver & crowbar acts on BRM, Refinery & Smelter - Adds examines to display number of boulders stored inside a refinery & maximum number of boulders it can hold. Right click screentip to remove boulders - Adds examines to display maximum number of boulders than can be teleported by a BRM & screentips for interacting with wires - More audio & visual feedback for refinery processing. If a boulder requires multiple steps you will get a balloon alert saying "crushing" for refineries & "smelting" for smelters along with a sound per process tick(which is every 2 seconds so no need for cooldown) giving you a better idea of what's happening in the pipeline - BRM now will display all lights when the "Automatic boulder retrieval" is on & turn off the lights when disabled along with examines giving you a visual indicator of its state **2. Code Improvements** - Splits types of boulders into its own file `boulder_types.dm` for easy maintainability - Moves beacon for refinery machines into its own file `boulder_processing/beacon.dm` for easy maintainability - Moves the cooldown for processing a boulder `processing_cooldown` into the refinery machine itself. Since 100's of boulders can be created per round this var can take up memory quickly so by moving them into the refinery machine it gives us some savings - Compressed & merged procs such as `create_mineral_contents()` , `flavour_boulder()` etc with the vent code. These procs were only used by the vent 1 time & by merging the code we removed if conditions to check if a parent vent was passed or not(since now that's always the case). Helped in removing boilder plate code **3. Fixes** - **Fixes vents always spawning "Small size boulders" & not medium, nor large boulders.** Once a vent generates a boulder it calls `flavour_boulder()` https://github.com/tgstation/tgstation/blob/084f56938c0169aeeee0b5f41453f31d072f3f67/code/game/objects/structures/lavaland/ore_vent.dm#L385 however this proc also accepts 2 more params `size` which would always default to `BOULDER_SIZE_SMALL` and `is_artifact` which is simply unused in the proc https://github.com/tgstation/tgstation/blob/fb83617ff94d6294b0d48c8c6c57488237508d11/code/modules/mining/boulder_processing/boulder.dm#L219 Therefore vents would always generate small boulders giving us no varity. Now the boulder size is set depending on the vent size & durability for each boulder is set to a random value between 2 & the boulder max size giving us the flavour we actually wanted - **Fixes "Expanded Gulag boulders" using "normal gulag material list" when setting its custom materials.** If you look at the `add_gulag_minerals()` proc it always picks from the `gulag_minerals` list & accepts no params https://github.com/tgstation/tgstation/blob/fb83617ff94d6294b0d48c8c6c57488237508d11/code/modules/mining/boulder_processing/boulder.dm#L235-L236 So when we try to pass params to this proc which in reality doesn't accept any we were wasting our time doing this https://github.com/tgstation/tgstation/blob/fb83617ff94d6294b0d48c8c6c57488237508d11/code/modules/mining/boulder_processing/boulder.dm#L274 And for our case `expanded_gulag_minerals` list was simply unused because our proc doesn't care about it and it went back to just using `gulag_minerals` list thus ignoring our list https://github.com/tgstation/tgstation/blob/fb83617ff94d6294b0d48c8c6c57488237508d11/code/modules/mining/boulder_processing/boulder.dm#L282 As i said in the "Code Improvement` section when i moved boulder types into it's own unique file this was fixed & now expanded gulag boulders actually has a chance to spawn with bluespace crystals inside them - **Fixes manual tapping of ore vents by hand not using a cooldown** `produce_boulder()` accepts a cooldown var for when you need to manually tap the vent by hand. https://github.com/tgstation/tgstation/blob/e8b5b52d54a60b651d72e610cfb35a237aef6efe/code/game/objects/structures/lavaland/ore_vent.dm#L374 This var was always set to FALSE because we never passed `TRUE` into it. Not once here https://github.com/tgstation/tgstation/blob/e8b5b52d54a60b651d72e610cfb35a237aef6efe/code/game/objects/structures/lavaland/ore_vent.dm#L124 Nor here https://github.com/tgstation/tgstation/blob/e8b5b52d54a60b651d72e610cfb35a237aef6efe/code/game/objects/structures/lavaland/ore_vent.dm#L131 Now we just pass `TRUE` so tapping these vents by hand have a cooldown - **Fixes BRM off icon state never being used** When the room ran out of power it would still look on. Now we use that state correctly - **Fixes Automatic Boulder Retrieval by the BRM not actually being automatic** You must have noticed that once you do "Right click" and wait for all the boulders it can teleport (determined by `boulder_processing_max`) to be teleported it stops permanently after that. Even if more boulders get generated it won't do anything, You have to again "Right click" & retoggle automatic boulder retrieval on again, thus forcing someone to stand there & monitor the BRM Now once you set Automatic Boulder Retrieval on you can leave & forget. It will teleport boulders as & when available thus enabling automation properly. - **Fixes boulders ejected from refineries via right click from getting teleported back into the machines loc** Fixes https://github.com/tgstation/tgstation/pull/78524#issuecomment-1911666995. The problem is refinery machines & the BRM keep track of all the boulders that entered into it via the `boulders_contained` list. Now we directly check `contents` for boulders so we don't have to maintain 2 seperate lists to keep track of boulders. It also now uses `processed_by` var of boulders to ensure refinerries don't retake in the same boulder it just processed. Not sure where exactly the problem got fixed but implementing these 2 measures fixed it regardless. - **Fixes boulders with 0 durability[a.k.a steps] from getting ejected out** Fixes https://github.com/tgstation/tgstation/pull/78524#issuecomment-1914551952. So inside `process()` we constantly decrease the durability of the boulder till it becomes 0. https://github.com/tgstation/tgstation/blob/0a496f180c627b9de26d3982d775cbf323fbc459/code/modules/mining/boulder_processing/_boulder_processing.dm#L159 When it reaches 0 it calls `breakdown_boulder()` https://github.com/tgstation/tgstation/blob/0a496f180c627b9de26d3982d775cbf323fbc459/code/modules/mining/boulder_processing/_boulder_processing.dm#L164-L165 This proc has a chance to reject the boulder if it could not process any materials https://github.com/tgstation/tgstation/blob/0a496f180c627b9de26d3982d775cbf323fbc459/code/modules/mining/boulder_processing/_boulder_processing.dm#L219-L222 **"Without resetting its durability"** over here https://github.com/tgstation/tgstation/blob/0a496f180c627b9de26d3982d775cbf323fbc459/code/modules/mining/boulder_processing/_boulder_processing.dm#L241 So it ends up rejecting a "0" or worse -1 durability boulder. Now we set the durability in `remove_boulder()` so regardless of what circumstances the boulder is ejected it always gets a positive durability - **Fixes BRM & Refinery from rapidly spitting out boulders in their loc which causes lag in the long terms** Fixes #81404. Basically even if there is 1 boulder sitting at a BRM's loc or an refineries loc. Operations are haulted i.e. the BRM will not teleport any more boulders & the refinery will keep their already processed boulders inside till their locs are cleared from boulders. This prevents large number of boulders from pilling up in long rounds - **[Priority : High] Fixes refineries incorrectly removing materials from processed boulders** Fixes #81109. This bug is quite serious because it can't literarily affect any random item with custom materials in game. This one line of code over here can break the entire material economy as we know it https://github.com/tgstation/tgstation/blob/0a496f180c627b9de26d3982d775cbf323fbc459/code/modules/mining/boulder_processing/_boulder_processing.dm#L217 **"DONT DO THIS"**. The `custom_materials` list is a **"read only"** list & if you ever want to change it call the `set_custom_materials()` proc with your new values but do not edit this list manually as it is done here. All lists related to materials are cached by the `SSmaterials` subsystem. List values are cached & shared across multiple objects so when you edit those values like here, you might end up effecting an item/multiple items in some random corner of the map that shares this list. This also causes boulders with empty list of materials to get spawned at random so yeah again plzz don't do this **4. Refactors** - Repathes `obj/machinery/boulder_processing/brm` -> just `obj/machinery/brm`. Even though semantically it looks nice that the brm is a subtype of `obj/machinery/boulder_processing` from a code & operation perspective they have 0 similarities. 1) The BRM does not accept boulders feed into it from a conveyer belt unlike a refinery but instead picks boulders from `SSore` subsystem & put it on the conveyer belt. This means procs for accepting boulders such `CanAllowThrough()`, `breakdown_boulder()`, `accept_boulder()` etc have no use in the BRM. Their just code clutter at this point 2) The BRM overrides `process()` & does not call its parent proc making that code wasted 3) It has no use for silo materials & mining points making those vars go to waste With so much wasted code its better to just let go off all of it & just make it a basic instance of `obj/machinery` making maintainence easy - BRM now teleports boulders in a batch (batch size determined by `boulders_processing_max` max value from upgraded parts is 7) with a boulder appearing every 1.5 seconds rather than spawning all at once. After a batch is processed it has a cooldown of 3 seconds before repeating the process if automatic boulder retrieval is on. This stops the conveyer belt from getting crowded with boulders and makes the refining process more efficient. With this BRM wires are removed because only it had only 1 wire responsible for toggling boulder retrieval but now since this process is automatic, we have true control over the timing of boulders spawned & don't want to leave it in the hands of players ## Changelog :cl: qol: adds examines & screentips for crowbar, screwdriver acts to BRM & refinery machines qol: adds examines about the number of boulders stored & processed to BRM & refinery machines qol: BRM now has its lights turn on/off depending on wether automatic boulder retrieval is on/off for visual clarity along with examines qol: refinery machines now display ballon alerts & plays sounds more frequently when processing boulders for better feedback fix: vents now spawn boulders of all sizes & not just small ones fix: expanded gulag boulders now have correct materials in them. fix: manual tapping of vents now has a cooldown applied as intended. fix: BRM has its light turned off when area power goes off fix: boulders ejected from refineries by hand no longer teleport all over the place occasionally. fix: refineries no longer eject boulders with 0 durability fix: Boulders & refineries no longer pile up on top of BRM's & refineries in long rounds. Their locs have to be clear of boulders before they spit out more boulders to prevent a large pile of boulders from causing lag fix: sheets ejected from lathes no longer get rejected when inserted back which could happen at random, no more boulders with empty materials code: splits boulder types into its own file along with other items code: merges & autodocs procs, vars related to boulders refactor: repaths BRM to a simpler subtype refactor: BRM now spawns boulders in batches(batch size can be increased with upgraded parts) with a boulder appearing every second. After a batch is processed a 3 second cooldown is applied to stop the conveyer belt from clogging up, With this BRM wires are removed as there is no need for timers to be attached to wires which intefers without our batch processing timings. /:cl: --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- _maps/map_files/Birdshot/birdshot.dmm | 2 +- .../map_files/IceBoxStation/IceBoxStation.dmm | 2 +- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/NorthStar/north_star.dmm | 2 +- _maps/map_files/tramstation/tramstation.dmm | 2 +- code/controllers/subsystem/ore_generation.dm | 15 +- code/datums/wires/brm.dm | 14 - .../machines/machine_circuitboards.dm | 5 +- .../objects/structures/lavaland/ore_vent.dm | 63 +- .../boulder_processing/_boulder_processing.dm | 559 +++++++++--------- .../mining/boulder_processing/beacon.dm | 28 + .../mining/boulder_processing/boulder.dm | 167 +----- .../boulder_processing/boulder_types.dm | 76 +++ code/modules/mining/boulder_processing/brm.dm | 394 ++++++++---- .../mining/boulder_processing/refinery.dm | 101 ++-- icons/obj/machines/mining_machines.dmi | Bin 13909 -> 6266 bytes tgstation.dme | 3 +- tools/UpdatePaths/Scripts/81358_brm.txt | 1 + 18 files changed, 775 insertions(+), 661 deletions(-) delete mode 100644 code/datums/wires/brm.dm create mode 100644 code/modules/mining/boulder_processing/beacon.dm create mode 100644 code/modules/mining/boulder_processing/boulder_types.dm create mode 100644 tools/UpdatePaths/Scripts/81358_brm.txt diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 6172121533a..b2fad9e88d2 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -22239,7 +22239,7 @@ /obj/machinery/conveyor{ id = "mining" }, -/obj/machinery/bouldertech/brm, +/obj/machinery/brm, /turf/open/floor/iron, /area/station/cargo/miningfoundry) "hZP" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 3b78dacec06..f1137f100e9 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -41240,7 +41240,7 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/machinery/bouldertech/brm, +/obj/machinery/brm, /turf/open/floor/iron, /area/mine/production) "mHu" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6b8edaaba10..443f7049dea 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -23833,7 +23833,7 @@ /obj/machinery/conveyor{ id = "mining" }, -/obj/machinery/bouldertech/brm, +/obj/machinery/brm, /turf/open/floor/iron, /area/station/cargo/miningoffice) "iIf" = ( diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 9a1372065a6..63a8be2d8cf 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -73293,7 +73293,7 @@ /area/station/security/detectives_office/private_investigators_office) "thH" = ( /obj/structure/cable, -/obj/machinery/bouldertech/brm, +/obj/machinery/brm, /obj/machinery/conveyor{ dir = 4; id = "mining" diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 57379c2353e..82c5377741f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -17448,7 +17448,7 @@ /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) "fdc" = ( -/obj/machinery/bouldertech/brm, +/obj/machinery/brm, /obj/machinery/conveyor{ dir = 8; id = "mining" diff --git a/code/controllers/subsystem/ore_generation.dm b/code/controllers/subsystem/ore_generation.dm index 162bc2e99d9..ca8aa09d611 100644 --- a/code/controllers/subsystem/ore_generation.dm +++ b/code/controllers/subsystem/ore_generation.dm @@ -6,11 +6,11 @@ SUBSYSTEM_DEF(ore_generation) runlevels = RUNLEVEL_GAME /// All ore vents that are currently producing boulders. - var/list/processed_vents = list() - /// All the boulders that have been produced by ore vents to be pulled by BRM machines. - var/list/available_boulders = list() + var/list/obj/structure/ore_vent/processed_vents = list() /// All the ore vents that are currently in the game, not just the ones that are producing boulders. - var/list/possible_vents = list() + var/list/obj/structure/ore_vent/possible_vents = list() + /// All the boulders that have been produced by ore vents to be pulled by BRM machines. + var/list/obj/item/boulder/available_boulders = list() /** * A list of all the minerals that are being mined by ore vents. We reset this list every time cave generation is done. * Generally Should be empty by the time initialize ends on lavaland. @@ -18,6 +18,7 @@ SUBSYSTEM_DEF(ore_generation) * If we call cave_generation more than once, we copy a list from the lists in lists/ores_spawned.dm */ var/list/ore_vent_minerals = list() + /// A tracker of how many of each ore vent size we have in the game. Useful for tracking purposes. var/list/ore_vent_sizes = list( LARGE_VENT_TYPE = 0, @@ -60,7 +61,7 @@ SUBSYSTEM_DEF(ore_generation) return SS_INIT_SUCCESS /datum/controller/subsystem/ore_generation/fire(resumed) - available_boulders = list() // reset upon new fire. + available_boulders.Cut() // reset upon new fire. for(var/obj/structure/ore_vent/current_vent as anything in processed_vents) var/local_vent_count = 0 @@ -71,6 +72,4 @@ SUBSYSTEM_DEF(ore_generation) if(local_vent_count >= MAX_BOULDERS_PER_VENT) continue //We don't want to be accountable for literally hundreds of unprocessed boulders for no reason. - var/obj/item/boulder/new_rock = current_vent.produce_boulder() - available_boulders += new_rock - + available_boulders += current_vent.produce_boulder() diff --git a/code/datums/wires/brm.dm b/code/datums/wires/brm.dm deleted file mode 100644 index c00d7875035..00000000000 --- a/code/datums/wires/brm.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/wires/brm - holder_type = /obj/machinery/bouldertech/brm - proper_name = "Boulder Retrieval Matrix" - -/datum/wires/brm/New(atom/holder) - add_duds(1) - return ..() - -/datum/wires/brm/on_pulse(wire) - var/obj/machinery/bouldertech/brm/brm_holder = holder - if(brm_holder.panel_open) - return - brm_holder.toggle_auto_on() - diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 8e5f2d1dfc5..382cf60ddc6 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -1559,7 +1559,7 @@ /obj/item/circuitboard/machine/brm name = "Boulder Retrieval Matrix" greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/bouldertech/brm + build_path = /obj/machinery/brm req_components = list( /datum/stock_part/capacitor = 1, /datum/stock_part/scanning_module = 1, @@ -1571,10 +1571,9 @@ greyscale_colors = CIRCUIT_COLOR_SUPPLY build_path = /obj/machinery/bouldertech/refinery req_components = list( - /obj/item/reagent_containers/cup/beaker = 1, /obj/item/assembly/igniter/condenser = 1, /datum/stock_part/servo = 2, - /datum/stock_part/matter_bin = 1, + /datum/stock_part/matter_bin = 2, ) /obj/item/circuitboard/machine/smelter diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm index fe663efec48..08a4394346a 100644 --- a/code/game/objects/structures/lavaland/ore_vent.dm +++ b/code/game/objects/structures/lavaland/ore_vent.dm @@ -2,6 +2,7 @@ #define MINERAL_TYPE_OPTIONS_RANDOM 4 #define OVERLAY_OFFSET_START 0 #define OVERLAY_OFFSET_EACH 5 +#define MINERALS_PER_BOULDER 3 /obj/structure/ore_vent name = "ore vent" @@ -22,13 +23,8 @@ var/unique_vent = FALSE /// What icon_state do we use when the ore vent has been tapped? var/icon_state_tapped = "ore_vent_active" - /// A weighted list of what minerals are contained in this vent, with weight determining how likely each mineral is to be picked in produced boulders. var/list/mineral_breakdown = list() - /// How many rolls on the mineral_breakdown list are made per boulder produced? EG: 3 rolls means 3 minerals per boulder, with order determining percentage. - var/minerals_per_boulder = 3 - /// How many minerals are picked to be in the ore vent? These are added to the mineral_breakdown list. - var/minerals_per_breakdown = MINERAL_TYPE_OPTIONS_RANDOM /// What size boulders does this vent produce? var/boulder_size = BOULDER_SIZE_SMALL /// Reference to this ore vent's NODE drone, to track wave success. @@ -67,9 +63,9 @@ var/artifact_chance = 0 /// We use a cooldown to prevent the wave defense from being started multiple times. COOLDOWN_DECLARE(wave_cooldown) + /// We use a cooldown to prevent players from tapping boulders rapidly from vents. COOLDOWN_DECLARE(manual_vent_cooldown) - /obj/structure/ore_vent/Initialize(mapload) if(mapload) generate_description() @@ -121,14 +117,14 @@ if(do_after(user, boulder_size * 1 SECONDS, src)) user.apply_damage(20, STAMINA) playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE) - produce_boulder() + produce_boulder(TRUE) visible_message(span_notice("You've successfully produced a boulder! Boy are your arms tired.")) /obj/structure/ore_vent/attack_basic_mob(mob/user, list/modifiers) . = ..() if(!HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) return - produce_boulder() + produce_boulder(TRUE) /obj/structure/ore_vent/is_buckle_possible(mob/living/target, force, check_loc) . = ..() @@ -155,17 +151,6 @@ context[SCREENTIP_CONTEXT_LMB] = "Scan vent" return CONTEXTUAL_SCREENTIP_SET -/** - * Picks n types of materials to pack into a boulder created by this ore vent, where n is this vent's minerals_per_boulder. - * Then assigns custom_materials based on boulder_size, assigned via the ore_quantity_function - */ -/obj/structure/ore_vent/proc/create_mineral_contents() - var/list/refined_list = list() - for(var/iteration in 1 to minerals_per_boulder) - var/datum/material/material = pick_weight(mineral_breakdown) - refined_list[material] += ore_quantity_function(iteration) - return refined_list - /** * This proc is called when the ore vent is initialized, in order to determine what minerals boulders it spawns can contain. * The materials available are determined by SSore_generation.ore_vent_minerals, which is a list of all minerals that can be contained in ore vents for a given cave generation. @@ -372,22 +357,38 @@ * @params apply_cooldown Should we apply a cooldown to producing boulders? Default's false, used by manual boulder production (goldgrubs, golems, etc). */ /obj/structure/ore_vent/proc/produce_boulder(apply_cooldown = FALSE) - if(!COOLDOWN_FINISHED(src, manual_vent_cooldown)) + RETURN_TYPE(/obj/item/boulder) + + //cooldown applies only for manual processing by hand + if(apply_cooldown && !COOLDOWN_FINISHED(src, manual_vent_cooldown)) return + + //produce the boulder var/obj/item/boulder/new_rock if(prob(artifact_chance)) new_rock = new /obj/item/boulder/artifact(loc) else new_rock = new /obj/item/boulder(loc) - var/list/mats_list = create_mineral_contents() Shake(duration = 1.5 SECONDS) + + //decorate the boulder with materials + var/list/mats_list = list() + for(var/iteration in 1 to MINERALS_PER_BOULDER) + var/datum/material/material = pick_weight(mineral_breakdown) + mats_list[material] += ore_quantity_function(iteration) new_rock.set_custom_materials(mats_list) - new_rock.flavor_boulder(src) + + //set size & durability + new_rock.boulder_size = boulder_size + new_rock.durability = rand(2, boulder_size) //randomize durability a bit for some flavor. + new_rock.boulder_string = boulder_icon_state + new_rock.update_appearance(UPDATE_ICON_STATE) + + //start the cooldown & return the boulder if(apply_cooldown) COOLDOWN_START(src, manual_vent_cooldown, 10 SECONDS) return new_rock - //comes with the station, and is already tapped. /obj/structure/ore_vent/starter_resources name = "active ore vent" @@ -402,12 +403,6 @@ ) /obj/structure/ore_vent/random - /// Static list of ore vent types, for random generation. - var/static/list/ore_vent_types = list( - BOULDER_SIZE_SMALL, - BOULDER_SIZE_MEDIUM, - BOULDER_SIZE_LARGE, - ) /obj/structure/ore_vent/random/Initialize(mapload) . = ..() @@ -446,7 +441,7 @@ /mob/living/simple_animal/hostile/asteroid/wolf, ) ore_vent_options = list( - "small", + SMALL_VENT_TYPE, ) /obj/structure/ore_vent/random/icebox/lower @@ -459,12 +454,11 @@ /mob/living/simple_animal/hostile/asteroid/wolf, ) ore_vent_options = list( - "small", - "medium", - "large", + SMALL_VENT_TYPE = 3, + MEDIUM_VENT_TYPE = 5, + LARGE_VENT_TYPE = 7, ) - /obj/structure/ore_vent/boss name = "menacing ore vent" desc = "An ore vent, brimming with underground ore. This one has an evil aura about it. Better be careful." @@ -536,3 +530,4 @@ #undef MINERAL_TYPE_OPTIONS_RANDOM #undef OVERLAY_OFFSET_START #undef OVERLAY_OFFSET_EACH +#undef MINERALS_PER_BOULDER diff --git a/code/modules/mining/boulder_processing/_boulder_processing.dm b/code/modules/mining/boulder_processing/_boulder_processing.dm index 3372f77ebb5..d7d4be2557e 100644 --- a/code/modules/mining/boulder_processing/_boulder_processing.dm +++ b/code/modules/mining/boulder_processing/_boulder_processing.dm @@ -3,185 +3,264 @@ desc = "You shouldn't be seeing this! And bouldertech isn't even a real company!" icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "ore_redemption" + active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.5 anchored = TRUE density = TRUE /// What is the efficiency of minerals produced by the machine? var/refining_efficiency = 1 - /// How many boulders can we process maximum per loop? - var/boulders_processing_max = 1 - /// What boulder(s) are we holding? - var/list/boulders_contained = list() + /// How much durability of an boulder can we reduce + var/boulders_processing_count = 2 /// How many boulders can we hold maximum? var/boulders_held_max = 1 - /// Does this machine have a mineral storage link to the silo? - var/holds_minerals = FALSE - /// What materials do we accept and process out of boulders? Removing iron from an iron/glass boulder would leave a boulder with glass. - var/list/processable_materials = list() - /// If we get a boulder with one of these inside, we'll drop it back out. - var/static/list/drop_if_contained = list( - /obj/item/relic, - ) - /// What sound plays when a thing operates? var/usage_sound = 'sound/machines/mining/wooping_teleport.ogg' - /// Cooldown associated with the usage_sound played. - COOLDOWN_DECLARE(sound_cooldown) - /// Silo link to it's materials list. var/datum/component/remote_materials/silo_materials - ///Does this machine hold mining points? - var/holds_mining_points = FALSE /// Mining points held by the machine for miners. var/points_held = 0 + ///The action verb to display to players + var/action = "processing" + + /// Cooldown associated with the sound played for collecting mining points. + COOLDOWN_DECLARE(sound_cooldown) + /// Cooldown associated with taking in boulds. + COOLDOWN_DECLARE(accept_cooldown) /obj/machinery/bouldertech/Initialize(mapload) . = ..() + + silo_materials = AddComponent( + /datum/component/remote_materials, \ + mapload, \ + mat_container_flags = MATCONTAINER_NO_INSERT \ + ) + register_context() - if(holds_minerals) - silo_materials = AddComponent(/datum/component/remote_materials, mapload) /obj/machinery/bouldertech/LateInitialize() . = ..() - if(!holds_minerals) - return var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) /obj/machinery/bouldertech/Destroy() - boulders_contained = null silo_materials = null return ..() -/obj/machinery/bouldertech/update_icon_state() - . = ..() - if(anchored) - icon_state ="[initial(icon_state)]" - else - icon_state ="[initial(icon_state)]-off" - -/obj/machinery/bouldertech/wrench_act(mob/living/user, obj/item/tool) - . = ITEM_INTERACT_BLOCKING - if(default_unfasten_wrench(user, tool, time = 1.5 SECONDS) == SUCCESSFUL_UNFASTEN) - update_appearance(UPDATE_ICON_STATE) - START_PROCESSING(SSmachines, src) - return ITEM_INTERACT_SUCCESS - -/obj/machinery/bouldertech/screwdriver_act(mob/living/user, obj/item/tool) - . = ..() - if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-off", initial(icon_state), tool)) - return ITEM_INTERACT_SUCCESS - -/obj/machinery/bouldertech/crowbar_act(mob/living/user, obj/item/tool) - . = ..() - if(default_pry_open(tool, close_after_pry = TRUE, closed_density = FALSE)) - return ITEM_INTERACT_SUCCESS - if(default_deconstruction_crowbar(tool)) - return ITEM_INTERACT_SUCCESS - -/obj/machinery/bouldertech/attackby(obj/item/attacking_item, mob/user, params) - if(holds_minerals && istype(attacking_item, /obj/item/boulder)) - var/obj/item/boulder/my_boulder = attacking_item - update_boulder_count() - if(!accept_boulder(my_boulder)) - balloon_alert_to_viewers("full!") - return - balloon_alert_to_viewers("accepted") - START_PROCESSING(SSmachines, src) - return TRUE - if(istype(attacking_item, /obj/item/card/id) && holds_mining_points) - if(points_held <= 0) - balloon_alert_to_viewers("no points to claim!") - if(!COOLDOWN_FINISHED(src, sound_cooldown)) - return TRUE - COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, FALSE) - return FALSE - var/obj/item/card/id/id_card = attacking_item - var/amount = tgui_input_number(user, "How many mining points do you wish to claim? ID Balance: [id_card.registered_account.mining_points], stored mining points: [points_held]", "Transfer Points", max_value = points_held, min_value = 0, round_value = 1) - if(!amount) - return TRUE - if(amount > points_held) - amount = points_held - id_card.registered_account.mining_points += amount - points_held = round(points_held - amount) - to_chat(user, span_notice("You claim [amount] mining points from \the [src] to [id_card].")) - return TRUE - return ..() - -/obj/machinery/bouldertech/attack_hand_secondary(mob/user, list/modifiers) - . = ..() - if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) - return - if(!anchored) - balloon_alert(user, "anchor first!") - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - if(!holds_minerals) - return SECONDARY_ATTACK_CONTINUE_CHAIN - if(!length(boulders_contained)) - balloon_alert_to_viewers("No boulders to remove!") - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - remove_boulder(pick(boulders_contained)) - return SECONDARY_ATTACK_CONTINUE_CHAIN - /obj/machinery/bouldertech/on_deconstruction(disassembled) if(length(contents)) for(var/obj/item/boulder/boulder in contents) remove_boulder(boulder) -/obj/machinery/bouldertech/process() - if(!anchored) - return PROCESS_KILL - var/stop_processing_check = FALSE - var/boulders_concurrent = boulders_processing_max ///How many boulders can we touch this process() call - for(var/obj/item/potential_boulder as anything in boulders_contained) - if(QDELETED(potential_boulder)) - boulders_contained -= potential_boulder - break - if(boulders_concurrent <= 0) - break //Try again next time +/obj/machinery/bouldertech/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = CONTEXTUAL_SCREENTIP_SET - if(!istype(potential_boulder, /obj/item/boulder)) - potential_boulder.forceMove(drop_location()) - CRASH("\The [src] had a non-boulder in it's boulders contained!") + if(isnull(held_item)) + context[SCREENTIP_CONTEXT_RMB] = "Remove Boulder" + return - var/obj/item/boulder/boulder = potential_boulder - if(boulder.durability < 0) - CRASH("\The [src] had a boulder with negative durability!") - if(!check_for_processable_materials(boulder.custom_materials)) //Checks for any new materials we can process. - boulders_concurrent-- //We count skipped boulders - remove_boulder(boulder) - continue - boulders_concurrent-- - boulder.durability-- //One less durability to the processed boulder. - if(COOLDOWN_FINISHED(src, sound_cooldown)) - COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS) - playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) //This can get annoying. One play per process() call. - stop_processing_check = TRUE - if(boulder.durability <= 0) - breakdown_boulder(boulder) //Crack that bouwlder open! - continue - if(!stop_processing_check) - playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE) - return PROCESS_KILL + if(istype(held_item, /obj/item/boulder)) + context[SCREENTIP_CONTEXT_LMB] = "Insert boulder" + else if(istype(held_item, /obj/item/card/id) && points_held > 0) + context[SCREENTIP_CONTEXT_LMB] = "Claim mining points" + else if(held_item.tool_behaviour == TOOL_SCREWDRIVER) + context[SCREENTIP_CONTEXT_LMB] = "[panel_open ? "Close" : "Open"] Panel" + else if(held_item.tool_behaviour == TOOL_WRENCH) + context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "" : "Un"] Anchor" + else if(panel_open && held_item.tool_behaviour == TOOL_CROWBAR) + context[SCREENTIP_CONTEXT_LMB] = "Deconstruct" +/obj/machinery/bouldertech/examine(mob/user) + . = ..() + . += span_notice("The machine reads that it has [span_bold("[points_held] mining points")] stored. Swipe an ID to claim them.") + . += span_notice("Click to remove a stored boulder.") + + var/boulder_count = 0 + for(var/obj/item/boulder/potential_boulder in contents) + boulder_count += 1 + . += span_notice("Storage capacity = [boulder_count]/[boulders_held_max] boulders.") + . += span_notice("Can process upto [boulders_processing_count] boulders at a time.") + + if(anchored) + . += span_notice("Its [EXAMINE_HINT("anchored")] in place.") + else + . += span_warning("It needs to be [EXAMINE_HINT("anchored")] to start operations.") + + . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + + if(panel_open) + . += span_notice("The whole machine can be [EXAMINE_HINT("pried")] apart.") + +/obj/machinery/bouldertech/update_icon_state() + . = ..() + var/suffix = "" + if(!anchored || !is_operational || (machine_stat & (BROKEN | NOPOWER)) || panel_open) + suffix = "-off" + icon_state ="[initial(icon_state)][suffix]" + +/obj/machinery/bouldertech/wrench_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_unfasten_wrench(user, tool, time = 1.5 SECONDS) == SUCCESSFUL_UNFASTEN) + if(anchored) + begin_processing() + else + end_processing() + update_appearance(UPDATE_ICON_STATE) + return ITEM_INTERACT_SUCCESS + +/obj/machinery/bouldertech/screwdriver_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-off", initial(icon_state), tool)) + update_appearance(UPDATE_ICON_STATE) + return ITEM_INTERACT_SUCCESS + +/obj/machinery/bouldertech/crowbar_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_deconstruction_crowbar(tool)) + return ITEM_INTERACT_SUCCESS /obj/machinery/bouldertech/CanAllowThrough(atom/movable/mover, border_dir) if(!anchored) return FALSE - if(boulders_contained.len >= boulders_held_max) - return FALSE if(istype(mover, /obj/item/boulder)) var/obj/item/boulder/boulder = mover - return boulder.can_get_processed() + return can_process_boulder(boulder) return ..() -/obj/machinery/bouldertech/examine(mob/user) +/** + * Can we process the boulder, checks only the boulders state & machines capacity + * Arguments + * + * * obj/item/boulder/new_boulder - the boulder we are checking + */ +/obj/machinery/bouldertech/proc/can_process_boulder(obj/item/boulder/new_boulder) + PRIVATE_PROC(TRUE) + SHOULD_BE_PURE(TRUE) + + //machine not operational + if(!anchored || panel_open || !is_operational || machine_stat & (BROKEN | NOPOWER)) + return FALSE + + //not a valid boulder + if(!istype(new_boulder) || QDELETED(new_boulder)) + return FALSE + + //someone just processed this + if(new_boulder.processed_by) + return FALSE + + //no space to hold boulders + var/boulder_count = 0 + for(var/obj/item/boulder/potential_boulder in contents) + boulder_count += 1 + if(boulder_count >= boulders_held_max) + return FALSE + + //did we cooldown enough to accept a boulder + return COOLDOWN_FINISHED(src, accept_cooldown) + +/** + * Accepts a boulder into the machine. Used when a boulder is first placed into the machine. + * Arguments + * + * * obj/item/boulder/new_boulder - the boulder to accept + */ +/obj/machinery/bouldertech/proc/accept_boulder(obj/item/boulder/new_boulder) + if(!can_process_boulder(new_boulder)) + return FALSE + + new_boulder.forceMove(src) + + COOLDOWN_START(src, accept_cooldown, 1.5 SECONDS) + + return TRUE + +/obj/machinery/bouldertech/proc/on_entered(datum/source, atom/movable/atom_movable) + SIGNAL_HANDLER + + if(!can_process_boulder(atom_movable)) + return + + INVOKE_ASYNC(src, PROC_REF(accept_boulder), atom_movable) + +/** + * Looks for a boost to the machine's efficiency, and applies it if found. + * Applied more on the chemistry integration but can be used for other things if desired. + */ +/obj/machinery/bouldertech/proc/check_for_boosts() + PROTECTED_PROC(TRUE) + + refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100%. + +/** + * Checks if this machine can process this material + * Arguments + * + * * datum/material/mat - the material to process + */ +/obj/machinery/bouldertech/proc/can_process_material(datum/material/mat) + PROTECTED_PROC(TRUE) + + return FALSE + +/obj/machinery/bouldertech/attackby(obj/item/attacking_item, mob/user, params) + if(panel_open) + return ..() + + if(istype(attacking_item, /obj/item/boulder)) + . = TRUE + var/obj/item/boulder/my_boulder = attacking_item + if(!accept_boulder(my_boulder)) + balloon_alert_to_viewers("cannot accept!") + return + balloon_alert_to_viewers("accepted") + return + + if(istype(attacking_item, /obj/item/card/id)) + . = TRUE + if(points_held <= 0) + balloon_alert_to_viewers("no points to claim!") + if(!COOLDOWN_FINISHED(src, sound_cooldown)) + return + COOLDOWN_START(src, sound_cooldown, 1.5 SECONDS) + playsound(src, 'sound/machines/buzz-sigh.ogg', 30, FALSE) + return + + var/obj/item/card/id/id_card = attacking_item + var/amount = tgui_input_number(user, "How many mining points do you wish to claim? ID Balance: [id_card.registered_account.mining_points], stored mining points: [points_held]", "Transfer Points", max_value = points_held, min_value = 0, round_value = 1) + if(!amount) + return + if(amount > points_held) + amount = points_held + id_card.registered_account.mining_points += amount + points_held = round(points_held - amount) + to_chat(user, span_notice("You claim [amount] mining points from \the [src] to [id_card].")) + return + + return ..() + +/obj/machinery/bouldertech/attack_hand_secondary(mob/user, list/modifiers) . = ..() - if(holds_mining_points) - . += span_notice("The machine reads that it has [span_bold("[points_held] mining points")] stored. Swipe an ID to claim them.") + if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || panel_open) + return + if(!anchored) + balloon_alert(user, "anchor first!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(panel_open) + balloon_alert(user, "close panel!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + var/obj/item/boulder/boulder = locate(/obj/item/boulder) in src + if(!boulder) + balloon_alert_to_viewers("no boulders to remove!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(!remove_boulder(boulder)) + balloon_alert_to_viewers("no space to remove!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /** * Accepts a boulder into the machinery, then converts it into minerals. @@ -190,159 +269,93 @@ * @param chosen_boulder The boulder to being breaking down into minerals. */ /obj/machinery/bouldertech/proc/breakdown_boulder(obj/item/boulder/chosen_boulder) + PRIVATE_PROC(TRUE) + if(QDELETED(chosen_boulder)) return FALSE if(chosen_boulder.loc != src) return FALSE - if(!length(chosen_boulder.custom_materials)) - qdel(chosen_boulder) - playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - update_boulder_count() - return FALSE - if(isnull(silo_materials)) - return FALSE - //here we loop through the boulder's ores - var/list/processable_ores = list() - var/tripped = FALSE - //If a material is in the boulder's custom_materials, but not in the processable_materials list, we add it to the processable_ores list to add back to a leftover boulder. - for(var/datum/material/possible_mat as anything in chosen_boulder.custom_materials) - if(!is_type_in_list(possible_mat, processable_materials)) - continue - var/quantity = chosen_boulder.custom_materials[possible_mat] - points_held = round(points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER)) // put point total here into machine - processable_ores += possible_mat - processable_ores[possible_mat] = quantity - chosen_boulder.custom_materials -= possible_mat //Remove it from the boulder now that it's tracked - tripped = TRUE - if(!tripped) - remove_boulder(chosen_boulder) - say("Nothing to process!") - return FALSE //we shouldn't spend more time processing a boulder with contents we don't care about. - use_power(BASE_MACHINE_ACTIVE_CONSUMPTION) - check_for_boosts() //Calls the relevant behavior for boosting the machine's efficiency, if able. - var/is_artifact = (istype(chosen_boulder, /obj/item/boulder/artifact)) //We need to know if it's an artifact so we can carry it over to the new boulder. - var/obj/item/boulder/disposable_boulder = new (src) - disposable_boulder.custom_materials = processable_ores - silo_materials.insert_item(disposable_boulder, refining_efficiency) - qdel(disposable_boulder) + //if boulders are kept inside because there is no space to eject them, then they could be reprocessed, lets avoid that + if(!chosen_boulder.processed_by) + check_for_boosts() - refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100% now that we've processed any relevant ores. - if(!length(chosen_boulder.custom_materials)) - playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - if(is_artifact) - points_held = round((points_held + MINER_POINT_MULTIPLIER) * MINING_POINT_MACHINE_MULTIPLIER) /// Artifacts give bonus points! - chosen_boulder.break_apart() - update_boulder_count() - return TRUE //We've processed all the materials in the boulder, so we can just destroy it in break_apart. + //here we loop through the boulder's ores + var/list/rejected_mats = list() + for(var/datum/material/possible_mat as anything in chosen_boulder.custom_materials) + var/quantity = chosen_boulder.custom_materials[possible_mat] * refining_efficiency + if(!can_process_material(possible_mat)) + rejected_mats[possible_mat] = quantity + continue + points_held = round(points_held + (quantity * possible_mat.points_per_unit * MINING_POINT_MACHINE_MULTIPLIER)) // put point total here into machine + if(!silo_materials.mat_container.insert_amount_mat(quantity, possible_mat)) + rejected_mats[possible_mat] = quantity + use_power(active_power_usage) - chosen_boulder.restart_processing_cooldown() //So that we don't pick it back up! - chosen_boulder.durability = rand(chosen_boulder.boulder_size, chosen_boulder.boulder_size + BOULDER_SIZE_SMALL) //Reset durability to a random value between the boulder's size and a little more. + //puts back materials that couldn't be processed + chosen_boulder.set_custom_materials(rejected_mats, refining_efficiency) + + //break the boulder down if we have processed all its materials + if(!length(chosen_boulder.custom_materials)) + playsound(loc, usage_sound, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + if(istype(chosen_boulder, /obj/item/boulder/artifact)) + points_held = round((points_held + MINER_POINT_MULTIPLIER) * MINING_POINT_MACHINE_MULTIPLIER) /// Artifacts give bonus points! + chosen_boulder.break_apart() + return TRUE //We've processed all the materials in the boulder, so we can just destroy it in break_apart. + + chosen_boulder.processed_by = src + + //eject the boulder since we are done with it remove_boulder(chosen_boulder) - return TRUE -/** - * Accepts a boulder into the machine. Used when a boulder is first placed into the machine. - * @param new_boulder The boulder to be accepted. - */ -/obj/machinery/bouldertech/proc/accept_boulder(obj/item/boulder/new_boulder) - if(isnull(new_boulder)) - return FALSE - if(boulders_contained.len >= boulders_held_max) //Full already - return FALSE - if(!istype(new_boulder)) //Can't be processed - return FALSE - if(!new_boulder.custom_materials) //Shouldn't happen, but just in case. - qdel(new_boulder) - playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - return FALSE - new_boulder.forceMove(src) - boulders_contained += new_boulder - SSore_generation.available_boulders -= new_boulder - START_PROCESSING(SSmachines, src) //Starts processing if we aren't already. - return TRUE +/obj/machinery/bouldertech/process() + if(!anchored || panel_open || !is_operational || machine_stat & (BROKEN | NOPOWER)) + return + + var/boulders_found = FALSE + var/boulders_processed = boulders_processing_count + for(var/obj/item/boulder/potential_boulder in contents) + boulders_found = TRUE + if(boulders_processed <= 0) + break //Try again next time + boulders_processed-- + + if(potential_boulder.durability > 0) + potential_boulder.durability -= 1 + if(potential_boulder.durability > 0) + continue + + breakdown_boulder(potential_boulder) + boulders_found = FALSE + + //when the boulder is removed it plays sound and displays a balloon alert. don't overlap when that happens + if(boulders_found) + playsound(loc, usage_sound, 29, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + balloon_alert_to_viewers(action) /** * Ejects a boulder from the machine. Used when a boulder is finished processing, or when a boulder can't be processed. - * @param drop_turf The location to eject the boulder to. If null, it will eject to the machine's drop_location(). - * @param specific_boulder The boulder to be ejected. + * Arguments + * + * * obj/item/boulder/specific_boulder - the boulder to remove */ -/obj/machinery/bouldertech/proc/remove_boulder(obj/item/boulder/specific_boulder, turf/drop_turf = null) - if(isnull(specific_boulder)) - CRASH("remove_boulder() called with no boulder!") - if(!length(specific_boulder.custom_materials)) - qdel(specific_boulder) - update_boulder_count() - playsound(loc, 'sound/weapons/drill.ogg', 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - return FALSE - specific_boulder.restart_processing_cooldown() //Reset the cooldown so we don't pick it back up by the same machine. - if(isturf(drop_turf)) - specific_boulder.forceMove(drop_turf) - else - specific_boulder.forceMove(drop_location()) - if(!update_boulder_count()) +/obj/machinery/bouldertech/proc/remove_boulder(obj/item/boulder/specific_boulder) + PRIVATE_PROC(TRUE) + + if(QDELETED(specific_boulder)) return TRUE - STOP_PROCESSING(SSmachines, src) - balloon_alert_to_viewers("clear!") + if(locate(/obj/item/boulder) in loc) //There is an boulder in our loc. it has be removed so we don't clog up our loc with even more boulders + return FALSE + + //Reset durability to little random lower value cause we have crushed it so many times + var/size = specific_boulder.boulder_size + if(size == BOULDER_SIZE_SMALL) + specific_boulder.durability = rand(2, BOULDER_SIZE_SMALL - 1) + else + specific_boulder.durability = rand(BOULDER_SIZE_SMALL, size - 1) + specific_boulder.processed_by = src //so we don't take in the boulder again after we just ejected it + specific_boulder.forceMove(drop_location()) + specific_boulder.processed_by = null //now since move is done we can safely clear the reference playsound(loc, 'sound/machines/ping.ogg', 50, FALSE) + return TRUE - -/** - * Getter proc to determine how many boulders are contained in the machine. - * Also adds their reference to the boulders_contained list. - */ -/obj/machinery/bouldertech/proc/update_boulder_count() - boulders_contained = list() - for(var/obj/item/boulder/boulder in contents) - boulders_contained += boulder - return boulders_contained.len - -/obj/machinery/bouldertech/proc/on_entered(datum/source, atom/movable/atom_movable) - SIGNAL_HANDLER - INVOKE_ASYNC(src, PROC_REF(accept_boulder), atom_movable) - -/** - * Looks for a boost to the machine's efficiency, and applies it if found. - * Applied more on the chemistry integration but can be used for other things if desired. - */ -/obj/machinery/bouldertech/proc/check_for_boosts() - refining_efficiency = initial(refining_efficiency) //Reset refining efficiency to 100%. - -/** - * Checks if a custom_material is in a list of processable materials in the machine. - * @param list/custom_material A list of materials, presumably taken from a boulder. If a material that this machine can process is in this list, it will return true, inclusively. - */ -/obj/machinery/bouldertech/proc/check_for_processable_materials(list/boulder_mats) - for(var/material as anything in boulder_mats) - if(is_type_in_list(material, processable_materials)) - return TRUE - return FALSE - -///Beacon to launch a new mining setup when activated. For testing and speed! -/obj/item/boulder_beacon - name = "boulder beacon" - desc = "N.T. approved boulder beacon, toss it down and you will have a full bouldertech mining station." - icon = 'icons/obj/machines/floor.dmi' - icon_state = "floor_beacon" - /// Number of activations left on this beacon. Uses will be removed as the beacon is used and each triggers a different machine to be spawned from it. - var/uses = 3 - -/obj/item/boulder_beacon/attack_self() - loc.visible_message(span_warning("\The [src] begins to beep loudly!")) - addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS) - -/** - * Spawns a new bouldertech machine from the beacon, then removes a use from the beacon. - * Use one spawns a BRM teleporter, then a refinery, and lastly a smelter. - */ -/obj/item/boulder_beacon/proc/launch_payload() - playsound(src, SFX_SPARKS, 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - switch(uses) - if(3) - new /obj/machinery/bouldertech/brm(drop_location()) - if(2) - new /obj/machinery/bouldertech/refinery(drop_location()) - if(1) - new /obj/machinery/bouldertech/refinery/smelter(drop_location()) - qdel(src) - uses-- diff --git a/code/modules/mining/boulder_processing/beacon.dm b/code/modules/mining/boulder_processing/beacon.dm new file mode 100644 index 00000000000..576e05baf53 --- /dev/null +++ b/code/modules/mining/boulder_processing/beacon.dm @@ -0,0 +1,28 @@ +///Beacon to launch a new mining setup when activated. For testing and speed! +/obj/item/boulder_beacon + name = "boulder beacon" + desc = "N.T. approved boulder beacon, toss it down and you will have a full bouldertech mining station." + icon = 'icons/obj/machines/floor.dmi' + icon_state = "floor_beacon" + /// Number of activations left on this beacon. Uses will be removed as the beacon is used and each triggers a different machine to be spawned from it. + var/uses = 3 + +/obj/item/boulder_beacon/attack_self() + visible_message(span_warning("\The [src] begins to beep loudly!")) + addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS) + +/** + * Spawns a new bouldertech machine from the beacon, then removes a use from the beacon. + * Use one spawns a BRM teleporter, then a refinery, and lastly a smelter. + */ +/obj/item/boulder_beacon/proc/launch_payload() + playsound(src, SFX_SPARKS, 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + switch(uses) + if(3) + new /obj/machinery/brm(drop_location()) + if(2) + new /obj/machinery/bouldertech/refinery(drop_location()) + if(1) + new /obj/machinery/bouldertech/refinery/smelter(drop_location()) + qdel(src) + uses-- diff --git a/code/modules/mining/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 77260eef088..699358c6adb 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -12,38 +12,15 @@ throw_range = 2 throw_speed = 0.5 drag_slowdown = 1.5 // It's still a big rock. + ///When a refinery machine is working on this boulder, we'll set this. Re reset when the process is finished, but the boulder may still be refined/operated on further. - var/obj/machinery/bouldertech/processed_by = null + var/obj/machinery/processed_by = null /// How many steps of refinement this boulder has gone through. Starts at 5-8, goes down one each machine process. var/durability = 5 /// What was the size of the boulder when it was spawned? This is used for inheiriting the icon_state. var/boulder_size = BOULDER_SIZE_SMALL /// Used in inheriting the icon_state from our parent vent in update_icon. var/boulder_string = "boulder" - /// Cooldown used to prevents boulders from getting processed back into a machine immediately after being processed. - COOLDOWN_DECLARE(processing_cooldown) - - /// Static list of all minerals to populate gulag boulders with. - var/list/static/gulag_minerals = list( - /datum/material/diamond = 1, - /datum/material/gold = 8, - /datum/material/iron = 95, - /datum/material/plasma = 30, - /datum/material/silver = 20, - /datum/material/titanium = 8, - /datum/material/uranium = 3, - ) - /// Static list of all minerals to populate gulag boulders with, but with bluespace added where safe. - var/list/static/expanded_gulag_minerals = list( - /datum/material/bluespace = 1, - /datum/material/diamond = 1, - /datum/material/gold = 8, - /datum/material/iron = 94, - /datum/material/plasma = 30, - /datum/material/silver = 20, - /datum/material/titanium = 8, - /datum/material/uranium = 3, - ) /obj/item/boulder/Initialize(mapload) . = ..() @@ -55,18 +32,37 @@ processed_by = null return ..() +/obj/item/boulder/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + if(held_item?.tool_behaviour == TOOL_MINING || HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) + context[SCREENTIP_CONTEXT_RMB] = "Crush boulder into ore" + return CONTEXTUAL_SCREENTIP_SET + /obj/item/boulder/examine(mob/user) . = ..() . += span_notice("This boulder would take [durability] more steps to refine or break.") + if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) + . += span_notice("You can crush this boulder with your bare hands.") /obj/item/boulder/examine_more(mob/user) . = ..() . += span_notice("[span_bold("Boulders")] can either be cracked open by [span_bold("mining tools")], or processed into sheets with [span_bold("refineries or smelters")]. Undisturbed boulders can be collected by the [span_bold("BRM")].") -/obj/item/boulder/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) - if(held_item?.tool_behaviour == TOOL_MINING || HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) - context[SCREENTIP_CONTEXT_RMB] = "Crush boulder into ore" - return CONTEXTUAL_SCREENTIP_SET +/obj/item/boulder/update_icon_state() + . = ..() + switch(boulder_size) + if(BOULDER_SIZE_SMALL) + icon_state = "[boulder_string]_small" + if(BOULDER_SIZE_MEDIUM) + icon_state = "[boulder_string]_medium" + if(BOULDER_SIZE_LARGE) + icon_state = "[boulder_string]_large" + else + icon_state = "[boulder_string]_small" + +/obj/item/boulder/CanAllowThrough(atom/movable/mover, border_dir) + . = ..() + if(istype(mover, /obj/item/boulder)) //This way, boulders can only go one at a time on conveyor belts, but everyone else can go through. + return FALSE /obj/item/boulder/attack_self(mob/user, list/modifiers) . = ..() @@ -84,11 +80,6 @@ manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/item/boulder/CanAllowThrough(atom/movable/mover, border_dir) - . = ..() - if(istype(mover, /obj/item/boulder)) //This way, boulders can only go one at a time on conveyor belts, but everyone else can go through. - return FALSE - /obj/item/boulder/attackby_secondary(obj/item/weapon, mob/user, params) . = ..() if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER) || HAS_TRAIT(weapon, TRAIT_BOULDER_BREAKER)) @@ -107,18 +98,6 @@ manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER) //A little hacky but it works around the speed of the blackboard task selection process for now. return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/item/boulder/update_icon_state() - . = ..() - switch(boulder_size) - if(BOULDER_SIZE_SMALL) - icon_state = "[boulder_string]_small" - if(BOULDER_SIZE_MEDIUM) - icon_state = "[boulder_string]_medium" - if(BOULDER_SIZE_LARGE) - icon_state = "[boulder_string]_large" - else - icon_state = "[boulder_string]_small" - /** * This is called when a boulder is processed by a mob or tool, and reduces the durability of the boulder. * @param obj/item/weapon The weapon that is being used to process the boulder, that we pull toolspeed from. If null, we use the override_speed_multiplier instead. @@ -185,104 +164,12 @@ cracked_ore = new cracked_ore_type (drop_location(), quantity) SSblackbox.record_feedback("tally", "ore_mined", quantity, cracked_ore) -/** - * Handles the boulder's processing cooldown to check if it's ready to be processed again. - */ -/obj/item/boulder/proc/can_get_processed() - return COOLDOWN_FINISHED(src, processing_cooldown) - -/** - * Starts the boulder's processing cooldown. - */ -/obj/item/boulder/proc/restart_processing_cooldown() - COOLDOWN_START(src, processing_cooldown, 2 SECONDS) - -/** - * Moves boulder contents to the drop location, and then deletes the boulder. - */ +///Moves boulder contents to the drop location, and then deletes the boulder. /obj/item/boulder/proc/break_apart() - var/list/quips = list("Clang!", "Crack!", "Bang!", "Clunk!", "Clank!") if(length(contents)) + var/list/quips = list("Clang!", "Crack!", "Bang!", "Clunk!", "Clank!") visible_message(span_notice("[pick(quips)] Something falls out of \the [src]!")) playsound(loc, 'sound/effects/picaxe1.ogg', 60, FALSE) for(var/obj/item/content as anything in contents) content.forceMove(get_turf(src)) qdel(src) - -/** - * This is called when a boulder is spawned from a vent, and is used to set the boulder's icon as well as durability. - * We also set our boulder_size variable, which is used for inheiriting the icon_state later on if processed. - * @param obj/structure/ore_vent/parent_vent The vent that spawned this boulder to generate consistent boulder icons. If null, we use the default size. - * @param size The size of the boulder to spawn. If parent_vent is defined, this is ignored. - * @param is_artifact Whether or not this boulder is an artifact boulder. If true, we use the artifact boulder icon state regardless of size. - */ -/obj/item/boulder/proc/flavor_boulder(obj/structure/ore_vent/parent_vent, size = BOULDER_SIZE_SMALL, is_artifact = FALSE) - var/durability_min = size - var/durability_max = size + BOULDER_SIZE_SMALL - if(parent_vent) - durability_min = parent_vent.boulder_size - durability_max = parent_vent.boulder_size + BOULDER_SIZE_SMALL - durability = rand(durability_min, durability_max) //randomize durability a bit for some flavor. - boulder_size = size - if(parent_vent) - boulder_size = parent_vent.boulder_size - boulder_string = parent_vent.boulder_icon_state - update_appearance(UPDATE_ICON_STATE) - -/** - * Unique proc for gulag-style boulders, which adds a random amount of minerals to the boulder. - */ -/obj/item/boulder/proc/add_gulag_minerals() - var/datum/material/new_material = pick_weight(gulag_minerals) - var/list/new_mats = list() - new_mats[new_material] = SHEET_MATERIAL_AMOUNT * rand(1,3) //We only want a few sheets of material in the gulag boulders - set_custom_materials(new_mats) - -/obj/item/boulder/artifact - name = "artifact boulder" - desc = "This boulder is brimming with strange energy. Cracking it open could contain something unusual for science." - icon_state = "boulder_artifact" - /// This is the type of item that will be inside the boulder. Default is a strange object. - var/artifact_type = /obj/item/relic - /// References to the relic inside the boulder, if any. - var/obj/item/artifact_inside - -/obj/item/boulder/artifact/Initialize(mapload) - . = ..() - artifact_inside = new artifact_type(src) /// This could be poggers for archaeology in the future. - -/obj/item/boulder/artifact/Destroy(force) - QDEL_NULL(artifact_inside) - return ..() - -/obj/item/boulder/artifact/convert_to_ore() - . = ..() - artifact_inside.forceMove(drop_location()) - artifact_inside = null - -/obj/item/boulder/artifact/break_apart() - artifact_inside = null - return ..() - - -/obj/item/boulder/gulag - name = "low-quality boulder" - desc = "This rocks. It's a low quality boulder, so it's probably not worth as much." - -/obj/item/boulder/gulag/Initialize(mapload) - . = ..() - add_gulag_minerals(gulag_minerals) - -/obj/item/boulder/gulag_expanded - name = "low-density boulder" - desc = "This rocks. It's not very well packed, and can't contain as many minerals." - -/obj/item/boulder/gulag_expanded/Initialize(mapload) - . = ..() - add_gulag_minerals(expanded_gulag_minerals) - -/obj/item/boulder/shabby - name = "shabby boulder" - desc = "A bizzare, twisted boulder. Wait, wait no, it's just a rock." - custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.1, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.1) - durability = 1 diff --git a/code/modules/mining/boulder_processing/boulder_types.dm b/code/modules/mining/boulder_processing/boulder_types.dm new file mode 100644 index 00000000000..08ed961404c --- /dev/null +++ b/code/modules/mining/boulder_processing/boulder_types.dm @@ -0,0 +1,76 @@ +///Boulders with special artificats that can give higher mining points +/obj/item/boulder/artifact + name = "artifact boulder" + desc = "This boulder is brimming with strange energy. Cracking it open could contain something unusual for science." + icon_state = "boulder_artifact" + /// This is the type of item that will be inside the boulder. Default is a strange object. + var/artifact_type = /obj/item/relic + /// References to the relic inside the boulder, if any. + var/obj/item/artifact_inside + +/obj/item/boulder/artifact/Initialize(mapload) + . = ..() + artifact_inside = new artifact_type(src) /// This could be poggers for archaeology in the future. + +/obj/item/boulder/artifact/Destroy(force) + QDEL_NULL(artifact_inside) + return ..() + +/obj/item/boulder/artifact/convert_to_ore() + . = ..() + artifact_inside.forceMove(drop_location()) + artifact_inside = null + +/obj/item/boulder/artifact/break_apart() + artifact_inside = null + return ..() + +///Boulders usually spawned in lavaland labour camp area +/obj/item/boulder/gulag + name = "low-quality boulder" + desc = "This rocks. It's a low quality boulder, so it's probably not worth as much." + +/obj/item/boulder/gulag/Initialize(mapload) + . = ..() + + /// Static list of all minerals to populate gulag boulders with. + var/list/static/gulag_minerals = list( + /datum/material/diamond = 1, + /datum/material/gold = 8, + /datum/material/iron = 95, + /datum/material/plasma = 30, + /datum/material/silver = 20, + /datum/material/titanium = 8, + /datum/material/uranium = 3, + ) + + set_custom_materials(list(pick_weight(gulag_minerals) = SHEET_MATERIAL_AMOUNT * rand(1, 3))) + +///Boulders usually spawned in lavaland labour camp area but with bluespace material +/obj/item/boulder/gulag_expanded + name = "low-density boulder" + desc = "This rocks. It's not very well packed, and can't contain as many minerals." + +/obj/item/boulder/gulag_expanded/Initialize(mapload) + . = ..() + + /// Static list of all minerals to populate gulag boulders with, but with bluespace added where safe. + var/list/static/expanded_gulag_minerals = list( + /datum/material/bluespace = 1, + /datum/material/diamond = 1, + /datum/material/gold = 8, + /datum/material/iron = 94, + /datum/material/plasma = 30, + /datum/material/silver = 20, + /datum/material/titanium = 8, + /datum/material/uranium = 3, + ) + + set_custom_materials(list(pick_weight(expanded_gulag_minerals) = SHEET_MATERIAL_AMOUNT * rand(1, 3))) + +///lowgrade boulder, most commonly spawned +/obj/item/boulder/shabby + name = "shabby boulder" + desc = "A bizzare, twisted boulder. Wait, wait no, it's just a rock." + custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.1, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.1) + durability = 1 diff --git a/code/modules/mining/boulder_processing/brm.dm b/code/modules/mining/boulder_processing/brm.dm index c76ec9dabbd..8c1205f5d4e 100644 --- a/code/modules/mining/boulder_processing/brm.dm +++ b/code/modules/mining/boulder_processing/brm.dm @@ -1,187 +1,319 @@ +///Sound played when boulders are teleported manually by hand #define MANUAL_TELEPORT_SOUND 'sound/machines/mining/manual_teleport.ogg' +///Sound played when boulders are teleported automatically in process() #define AUTO_TELEPORT_SOUND 'sound/machines/mining/auto_teleport.ogg' +///Time taken to spawn a boulder, also the cooldown applied before the next manual teleportation +#define TELEPORTATION_TIME (1.5 SECONDS) +///Cooldown for automatic teleportation after processing boulders_processing_max number of boulders +#define BATCH_COOLDOWN (3 SECONDS) +///Special case when we are trying to teleport a boulder but there is already another boulder in our loc +#define TURF_BLOCKED_BY_BOULDER -1 -/obj/machinery/bouldertech/brm +/obj/machinery/brm name = "boulder retrieval matrix" desc = "A teleportation matrix used to retrieve boulders excavated by mining NODEs from ore vents." + icon = 'icons/obj/machines/mining_machines.dmi' icon_state = "brm" + active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.5 circuit = /obj/item/circuitboard/machine/brm - usage_sound = MANUAL_TELEPORT_SOUND processing_flags = START_PROCESSING_MANUALLY - boulders_held_max = 2 + anchored = TRUE + density = TRUE + + /// How many boulders can we process maximum per loop? + var/boulders_processing_max = 1 /// Are we trying to actively collect boulders automatically? var/toggled_on = FALSE - /// How long does it take to collect a boulder? - var/teleportation_time = 1.5 SECONDS + ///Have we finished processing a full batch of boulders + var/batch_processing = FALSE + /// Cooldown used for left click teleportation. COOLDOWN_DECLARE(manual_teleport_cooldown) + /// Cooldown used for automatic teleportation after processing boulders_processing_max number of boulders. + COOLDOWN_DECLARE(batch_start_cooldown) -/obj/machinery/bouldertech/brm/Initialize(mapload) +/obj/machinery/brm/Initialize(mapload) . = ..() - set_wires(new /datum/wires/brm(src)) + register_context() + +/obj/machinery/brm/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = CONTEXTUAL_SCREENTIP_SET + + if(isnull(held_item)) + context[SCREENTIP_CONTEXT_LMB] = "Teleport single boulder" + context[SCREENTIP_CONTEXT_RMB] = "Toggle [toggled_on ? "Off" : "On"] automatic boulder retrieval" + return + + if(!isnull(held_item)) + if(held_item.tool_behaviour == TOOL_WRENCH) + context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "" : "Un"] Anchor" + return + if(held_item.tool_behaviour == TOOL_SCREWDRIVER) + context[SCREENTIP_CONTEXT_LMB] = "[panel_open ? "Close" : "Open"] Panel" + return + + if(panel_open) + if(held_item.tool_behaviour == TOOL_CROWBAR) + context[SCREENTIP_CONTEXT_LMB] = "Deconstruct" + + return CONTEXTUAL_SCREENTIP_SET + +/obj/machinery/brm/examine(mob/user) + . = ..() + . += span_notice("The small screen reads there are [span_boldnotice("[SSore_generation.available_boulders.len] boulders")] available to teleport.") + . += span_notice("Can collect upto [boulders_processing_max] boulders at a time.") + . += span_notice("Automatic boulder retrival can be toggled [EXAMINE_HINT("[toggled_on ? "Off" : "On"]")] with [EXAMINE_HINT("Right Click")].") + + if(anchored) + . += span_notice("Its [EXAMINE_HINT("anchored")] in place.") + else + . += span_warning("It needs to be [EXAMINE_HINT("anchored")] to start operations.") + + . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "Closed" : "Open"].") + + if(panel_open) + . += span_notice("The whole machine can be [EXAMINE_HINT("pried")] apart.") + +/obj/machinery/brm/update_icon_state() + icon_state = initial(icon_state) + + if(!anchored || !is_operational || machine_stat & (BROKEN | NOPOWER) || panel_open) + icon_state = "[icon_state]-off" + return + + if(toggled_on) + icon_state = "[icon_state]-toggled" + return -/obj/machinery/bouldertech/brm/Destroy() - QDEL_NULL(wires) return ..() -/obj/machinery/bouldertech/brm/attack_hand(mob/living/user, list/modifiers) - . = ..() - if(!handle_teleport_conditions(user)) - return - pre_collect_boulder() +/obj/machinery/brm/wrench_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_unfasten_wrench(user, tool, time = 1.5 SECONDS) == SUCCESSFUL_UNFASTEN) + update_appearance(UPDATE_ICON_STATE) + return ITEM_INTERACT_SUCCESS - COOLDOWN_START(src, manual_teleport_cooldown, teleportation_time) +/obj/machinery/brm/screwdriver_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-off", initial(icon_state), tool)) + update_appearance(UPDATE_ICON_STATE) + return ITEM_INTERACT_SUCCESS -/obj/machinery/bouldertech/brm/attack_robot(mob/user) - if(!handle_teleport_conditions(user)) - return - pre_collect_boulder() +/obj/machinery/brm/crowbar_act(mob/living/user, obj/item/tool) + . = ITEM_INTERACT_BLOCKING + if(default_deconstruction_crowbar(tool)) + return ITEM_INTERACT_SUCCESS - COOLDOWN_START(src, manual_teleport_cooldown, teleportation_time) - -/obj/machinery/bouldertech/brm/attackby(obj/item/attacking_item, mob/user, params) - if(is_wire_tool(attacking_item) && panel_open) - wires.interact(user) +///To allow boulders on a conveyer belt to move unobstructed if multiple machines are made on a single line +/obj/machinery/brm/CanAllowThrough(atom/movable/mover, border_dir) + if(!anchored) + return FALSE + if(istype(mover, /obj/item/boulder)) return TRUE return ..() -/obj/machinery/bouldertech/brm/attack_hand_secondary(mob/user, list/modifiers) +/obj/machinery/brm/RefreshParts() . = ..() - if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) + + boulders_processing_max = 0 + for(var/datum/stock_part/part in component_parts) + boulders_processing_max += part.tier + + boulders_processing_max = ROUND_UP((boulders_processing_max / 12) * 7) + +/obj/machinery/brm/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(. || panel_open) return - if(!anchored) - balloon_alert(user, "anchor first!") - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - toggle_auto_on(user) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - -/obj/machinery/bouldertech/brm/attack_robot_secondary(mob/user, list/modifiers) - . = ..() - if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) + if(!handle_teleport_conditions(user)) return - if(!anchored) - balloon_alert(user, "anchor first!") - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - toggle_auto_on(user) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN -/obj/machinery/bouldertech/brm/process() - if(SSore_generation.available_boulders.len < 1) - say("No boulders to collect. Entering idle mode.") - toggled_on = FALSE - update_appearance(UPDATE_ICON_STATE) - return PROCESS_KILL - for(var/i in 1 to boulders_processing_max) - if(pre_collect_boulder()) - continue - toggled_on = FALSE - update_appearance(UPDATE_ICON_STATE) - return PROCESS_KILL - for(var/obj/item/boulder/ground_rocks in loc.contents) - boulders_contained += ground_rocks - if(boulders_contained.len < boulders_held_max) - continue - toggled_on = FALSE - boulders_contained.Cut() - update_appearance(UPDATE_ICON_STATE) - return PROCESS_KILL + var/result = pre_collect_boulder() + if(result == TURF_BLOCKED_BY_BOULDER) + balloon_alert(user, "no space") + else if(result) + balloon_alert(user, "teleporting") + COOLDOWN_START(src, manual_teleport_cooldown, TELEPORTATION_TIME) -/obj/machinery/bouldertech/brm/add_context(atom/source, list/context, obj/item/held_item, mob/user) - . = ..() - context[SCREENTIP_CONTEXT_LMB] = "Teleport single boulder" - context[SCREENTIP_CONTEXT_RMB] = "Toggle automatic boulder retrieval" - return CONTEXTUAL_SCREENTIP_SET - -/obj/machinery/bouldertech/brm/examine(mob/user) - . = ..() - . += span_notice("The small screen reads there are [span_boldnotice("[SSore_generation.available_boulders.len] boulders")] available to teleport.") - -/obj/machinery/bouldertech/brm/RefreshParts() - . = ..() - var/scanner_stack = 0 - var/laser_stack = 0 - for(var/datum/stock_part/scanning_module/scanner in component_parts) - scanner_stack += scanner.tier - boulders_processing_max = scanner_stack - for(var/datum/stock_part/micro_laser/laser in component_parts) - laser_stack += laser.tier - boulders_held_max = laser_stack + 1 - -/obj/machinery/bouldertech/brm/update_icon_state() - if(toggled_on && !panel_open) - icon_state = "[initial(icon_state)]-toggled" - return - return ..() + return TRUE /** * Handles qualifiers for enabling teleportation of boulders. * Returns TRUE if the teleportation can proceed, FALSE otherwise. + * Arguments + * + * * mob/user - the mob to inform if conditions aren't met */ -/obj/machinery/bouldertech/brm/proc/handle_teleport_conditions(mob/user) +/obj/machinery/brm/proc/handle_teleport_conditions(mob/user) + PRIVATE_PROC(TRUE) + if(!COOLDOWN_FINISHED(src, manual_teleport_cooldown)) return FALSE if(panel_open) balloon_alert(user, "close panel first!") return FALSE + if(batch_processing) + balloon_alert(user, "batch still processing!") + return FALSE playsound(src, MANUAL_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) return TRUE -/** - * Begins to collect a boulder from the available boulders list in SSore_generation. - * Boulders must not be processed by another BRM or machine, and must be in the available boulders list. - * A selected boulder is picked randomly. - * The actual movement is then handled by collect_boulder() after a timed callback. - */ -/obj/machinery/bouldertech/brm/proc/pre_collect_boulder() - if(!SSore_generation.available_boulders.len) - playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE) - balloon_alert_to_viewers("no boulders to collect!") - return FALSE //Nothing to collect - var/obj/item/boulder/random_boulder = pick(SSore_generation.available_boulders) - if(random_boulder.processed_by) - return FALSE +/obj/machinery/brm/attack_robot(mob/user) + . = ..() + if(. || panel_open) + return + if(!handle_teleport_conditions(user)) + return + + var/result = pre_collect_boulder() + if(result == TURF_BLOCKED_BY_BOULDER) + balloon_alert(user, "no space") + else if(result) + balloon_alert(user, "teleporting") + + COOLDOWN_START(src, manual_teleport_cooldown, TELEPORTATION_TIME) - random_boulder.processed_by = src - random_boulder.Shake(duration = 1.5 SECONDS) - SSore_generation.available_boulders -= random_boulder - addtimer(CALLBACK(src, PROC_REF(collect_boulder), random_boulder), 1.5 SECONDS) return TRUE -/** - * Collects a boulder from the available boulders list in SSore_generation. - * Handles the movement of the boulder as well as visual effects on the BRM. - * @param obj/item/boulder/random_boulder The boulder to collect. - */ -/obj/machinery/bouldertech/brm/proc/collect_boulder(obj/item/boulder/random_boulder) - flick("brm-flash", src) - if(QDELETED(random_boulder)) - playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE) - balloon_alert_to_viewers("target lost!") - return FALSE - playsound(src, AUTO_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - random_boulder.forceMove(drop_location()) - random_boulder.processed_by = null - random_boulder.pixel_x = rand(-2, 2) - random_boulder.pixel_y = rand(-2, 2) - balloon_alert_to_viewers("boulder appears!") - random_boulder.visible_message(span_warning("[random_boulder] suddenly appears!")) - use_power(BASE_MACHINE_ACTIVE_CONSUMPTION * 0.1) - return TRUE +/obj/machinery/brm/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || panel_open) + return + if(!anchored) + balloon_alert(user, "anchor first!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + toggle_auto_on(user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /** * Toggles automatic boulder retrieval on. * Adjusts the teleportation sound, icon state, and begins processing. * @param mob/user The user who toggled the BRM. */ -/obj/machinery/bouldertech/brm/proc/toggle_auto_on(mob/user) +/obj/machinery/brm/proc/toggle_auto_on(mob/user) + PRIVATE_PROC(TRUE) + if(panel_open) - if(user) - balloon_alert(user, "close panel first!") + balloon_alert(user, "close panel first!") return - toggled_on = TRUE - START_PROCESSING(SSmachines, src) + if(!anchored) + balloon_alert(user, "anchor first!") + return + if(!is_operational || machine_stat & (BROKEN | NOPOWER)) + return + + toggled_on = ! toggled_on + if(toggled_on) + begin_processing() + else + end_processing() update_appearance(UPDATE_ICON_STATE) - usage_sound = AUTO_TELEPORT_SOUND + +/obj/machinery/brm/attack_robot_secondary(mob/user, list/modifiers) + . = ..() + if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || panel_open) + return + if(!anchored) + balloon_alert(user, "anchor first!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + toggle_auto_on(user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + +/obj/machinery/brm/process() + if(!toggled_on) + return PROCESS_KILL + + //have some cooldown after processing the previous batch of boulders + if(!COOLDOWN_FINISHED(src, batch_start_cooldown)) + return + + pre_collect_boulder(FALSE, boulders_processing_max) + +/** + * Begins to collect a boulder from the available boulders list in SSore_generation. + * Boulders must be in the available boulders list. + * A selected boulder is picked randomly. + * The actual movement is then handled by collect_boulder() after a timed callback. + * Arguments + * + * * feedback - should we play sound and display allert if now boulders are available + * * boulders_remaining - how many boulders we want to try & collect spawning a boulder every TELEPORTATION_TIME seconds + * * new_batch - is this the very 1st boulder processed from boulders_remaining. Used to wait for all the boulders to be collected + */ +/obj/machinery/brm/proc/pre_collect_boulder(feedback = TRUE, boulders_remaining = 1, new_batch = TRUE) + PRIVATE_PROC(TRUE) + + if(!anchored || panel_open || !is_operational || machine_stat & (BROKEN | NOPOWER)) + return FALSE + + //There is an boulder in our loc. it has be removed so we don't clog up our loc with even more boulders + if(locate(/obj/item/boulder) in loc) + batch_processing = FALSE + return TURF_BLOCKED_BY_BOULDER + + //no more boulders + if(!SSore_generation.available_boulders.len) + if(feedback) + playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE) + balloon_alert_to_viewers("no boulders to collect!") + batch_processing = FALSE + return FALSE + + //we are trying to process a new batch of boulders + if(new_batch) + if(batch_processing) //the previous one hasen't completed yet, wait + return FALSE + batch_processing = TRUE + + var/obj/item/boulder/random_boulder = pick(SSore_generation.available_boulders) + if(random_boulder.processed_by) + return FALSE + SSore_generation.available_boulders -= random_boulder + random_boulder.processed_by = src + random_boulder.Shake(shake_interval = TELEPORTATION_TIME) + addtimer(CALLBACK(src, PROC_REF(collect_boulder), random_boulder, feedback, boulders_remaining), TELEPORTATION_TIME) + return TRUE + +/** + * Callback to spawn a boulder collected in pre_collect_boulder(). Can be used to collect + * multiple boulders by setting boulders_remaining but must only be called by pre_collect_boulder() + * and not directly + * Arguments + * + * * obj/item/boulder/random_boulder - the boulder we are trying to move out + * * feedback - see pre_collect_boulder() + * * boulders_remaining - passed back to pre_collect_boulder() if count > 0 + */ +/obj/machinery/brm/proc/collect_boulder(obj/item/boulder/random_boulder, feedback, boulders_remaining) + if(QDELETED(random_boulder)) + playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE) + balloon_alert_to_viewers("target lost!") + return FALSE + + if(locate(/obj/item/boulder) in loc) + batch_processing = FALSE + return + + flick("brm-flash", src) + playsound(src, toggled_on ? AUTO_TELEPORT_SOUND : MANUAL_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + random_boulder.forceMove(drop_location()) + random_boulder.pixel_x = rand(-2, 2) + random_boulder.pixel_y = rand(-2, 2) + random_boulder.processed_by = null + balloon_alert_to_viewers("boulder appears!") + use_power(active_power_usage) + + boulders_remaining -= 1 + if(boulders_remaining <= 0) + COOLDOWN_START(src, batch_start_cooldown, BATCH_COOLDOWN) + batch_processing = FALSE + return TRUE + else + return pre_collect_boulder(feedback, boulders_remaining, FALSE) #undef MANUAL_TELEPORT_SOUND #undef AUTO_TELEPORT_SOUND +#undef TELEPORTATION_TIME +#undef BATCH_COOLDOWN +#undef TURF_BLOCKED_BY_BOULDER diff --git a/code/modules/mining/boulder_processing/refinery.dm b/code/modules/mining/boulder_processing/refinery.dm index 764816ec6d3..662bb3e75e1 100644 --- a/code/modules/mining/boulder_processing/refinery.dm +++ b/code/modules/mining/boulder_processing/refinery.dm @@ -7,44 +7,34 @@ name = "boulder refinery" desc = "BR for short. Accepts boulders and refines non-metallic ores into sheets using internal chemicals." icon_state = "stacker" - holds_minerals = TRUE - processable_materials = list( - /datum/material/glass, - /datum/material/plasma, - /datum/material/diamond, - /datum/material/bluespace, - /datum/material/bananium, - /datum/material/plastic, - ) circuit = /obj/item/circuitboard/machine/refinery usage_sound = 'sound/machines/mining/refinery.ogg' - holds_mining_points = TRUE + action = "crushing" -/// okay so var that holds mining points to claim -/// add total of pts from minerals mined in parent proc -/// then, little mini UI showing points to collect? +/obj/machinery/bouldertech/refinery/can_process_material(datum/material/possible_mat) + var/static/list/processable_materials + if(!length(processable_materials)) + processable_materials = list( + /datum/material/glass, + /datum/material/plasma, + /datum/material/diamond, + /datum/material/bluespace, + /datum/material/bananium, + /datum/material/plastic, + ) + return is_type_in_list(possible_mat, processable_materials) /obj/machinery/bouldertech/refinery/RefreshParts() . = ..() - var/manipulator_stack = 0 - var/matter_bin_stack = 0 - for(var/datum/stock_part/servo/servo in component_parts) - manipulator_stack += servo.tier - 1 - boulders_processing_max = clamp(manipulator_stack, 1, 6) + + boulders_held_max = 0 for(var/datum/stock_part/matter_bin/bin in component_parts) - matter_bin_stack += bin.tier - boulders_held_max = matter_bin_stack - - -/obj/machinery/bouldertech/refinery/add_context(atom/source, list/context, obj/item/held_item, mob/user) - . = ..() - if(istype(held_item, /obj/item/boulder)) - context[SCREENTIP_CONTEXT_LMB] = "Insert boulder" - if(istype(held_item, /obj/item/card/id) && points_held > 0) - context[SCREENTIP_CONTEXT_LMB] = "Claim mining points" - context[SCREENTIP_CONTEXT_RMB] = "Remove boulder" - return CONTEXTUAL_SCREENTIP_SET + boulders_held_max += bin.tier + boulders_processing_count = 0 + for(var/datum/stock_part/servo/servo in component_parts) + boulders_processing_count += servo.tier + boulders_processing_count = ROUND_UP((boulders_processing_count / 8) * boulders_held_max) /** * Your other new favorite industrial waste magnet! @@ -55,36 +45,43 @@ name = "boulder smelter" desc = "BS for short. Accept boulders and refines metallic ores into sheets." icon_state = "smelter" - processable_materials = list( - /datum/material/iron, - /datum/material/titanium, - /datum/material/silver, - /datum/material/gold, - /datum/material/uranium, - /datum/material/mythril, - /datum/material/adamantine, - /datum/material/runite, - ) light_system = OVERLAY_LIGHT - light_range = 1 - light_power = 2 + light_range = 2 + light_power = 3 light_color = "#ffaf55" - light_on = FALSE circuit = /obj/item/circuitboard/machine/smelter usage_sound = 'sound/machines/mining/smelter.ogg' + action = "smelting" -/obj/machinery/bouldertech/refinery/smelter/RefreshParts() +/obj/machinery/bouldertech/refinery/smelter/Initialize(mapload) . = ..() - light_power = boulders_processing_max + set_light_on(TRUE) -/obj/machinery/bouldertech/refinery/smelter/accept_boulder(obj/item/boulder/new_boulder) +/obj/machinery/bouldertech/refinery/smelter/can_process_material(datum/material/possible_mat) + var/static/list/processable_materials + if(!length(processable_materials)) + processable_materials = list( + /datum/material/iron, + /datum/material/titanium, + /datum/material/silver, + /datum/material/gold, + /datum/material/uranium, + ) + return is_type_in_list(possible_mat, processable_materials) + +/obj/machinery/bouldertech/refinery/smelter/set_light_on(new_value) + if(panel_open || !anchored || !is_operational || machine_stat & (BROKEN | NOPOWER)) + new_value = FALSE + return ..() + +/obj/machinery/bouldertech/refinery/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) . = ..() - if(.) - set_light_on(TRUE) - return TRUE + set_light_on(TRUE) -/obj/machinery/bouldertech/refinery/smelter/process() +/obj/machinery/bouldertech/refinery/default_unfasten_wrench(mob/user, obj/item/wrench, time) . = ..() - if(. == PROCESS_KILL) - set_light_on(FALSE) + set_light_on(TRUE) + +/obj/machinery/bouldertech/refinery/smelter/on_set_is_operational(old_value) + set_light_on(TRUE) diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi index 91f7f434ad34d7410385c293c8bfba359bdd63de..c1a4076e3a2f5130ca3acc772da738479b4dcad7 100644 GIT binary patch literal 6266 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 UF)b7RE(Xw0d8+(F(JJWw1L>rypa1{> diff --git a/tgstation.dme b/tgstation.dme index 5930f2bd0ec..44599fa69d9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1834,7 +1834,6 @@ #include "code\datums\wires\airlock.dm" #include "code\datums\wires\apc.dm" #include "code\datums\wires\autolathe.dm" -#include "code\datums\wires\brm.dm" #include "code\datums\wires\conveyor.dm" #include "code\datums\wires\ecto_sniffer.dm" #include "code\datums\wires\emitter.dm" @@ -4442,7 +4441,9 @@ #include "code\modules\mining\shelters.dm" #include "code\modules\mining\voucher_sets.dm" #include "code\modules\mining\boulder_processing\_boulder_processing.dm" +#include "code\modules\mining\boulder_processing\beacon.dm" #include "code\modules\mining\boulder_processing\boulder.dm" +#include "code\modules\mining\boulder_processing\boulder_types.dm" #include "code\modules\mining\boulder_processing\brm.dm" #include "code\modules\mining\boulder_processing\refinery.dm" #include "code\modules\mining\equipment\explorer_gear.dm" diff --git a/tools/UpdatePaths/Scripts/81358_brm.txt b/tools/UpdatePaths/Scripts/81358_brm.txt new file mode 100644 index 00000000000..c0970d41fa2 --- /dev/null +++ b/tools/UpdatePaths/Scripts/81358_brm.txt @@ -0,0 +1 @@ +/obj/machinery/bouldertech/brm : /obj/machinery/brm{@OLD} \ No newline at end of file