Make the electrolyzer not a wait game (#50598)

* Electrolyzer balances

* better sprites(thanks trollbreeder!)

* reduce h2 export cost a bit

* h2 canister sprite change
This commit is contained in:
Ghilker
2020-04-26 00:06:37 -03:00
committed by GitHub
parent bda4d9e118
commit 838b2b2ba7
9 changed files with 87 additions and 17 deletions
+5 -5
View File
@@ -21,7 +21,7 @@
var/on = FALSE
///check what mode the machine should be (WORKING, STANDBY)
var/mode = ELECTROLYZER_MODE_STANDBY
///Increase the amount of moles worked on, changed by upgrading the laser tier
///Increase the amount of moles worked on, changed by upgrading the electrolite tier
var/workingPower = 1
///Decrease the amount of power usage, changed by upgrading the capacitor tier
var/efficiency = 0.5
@@ -103,14 +103,14 @@
cell.use((5 * proportion * workingPower) / (efficiency + workingPower))
/obj/machinery/electrolyzer/RefreshParts()
var/laser = 0
var/electrolite = 0
var/cap = 0
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
laser += M.rating
for(var/obj/item/stock_parts/electrolite/M in component_parts)
electrolite += M.rating
for(var/obj/item/stock_parts/capacitor/M in component_parts)
cap += M.rating
workingPower = laser //used in the amount of moles processed
workingPower = electrolite //used in the amount of moles processed
efficiency = (cap + 1) * 0.5 //used in the amount of charge in power cell uses
@@ -503,12 +503,10 @@
icon_state = "generic"
build_path = /obj/machinery/electrolyzer
req_components = list(
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stack/cable_coil = 3,
/obj/item/stack/sheet/glass = 1,
/obj/item/stack/sheet/mineral/gold = 1,
/obj/item/stack/sheet/mineral/silver = 1)
/obj/item/stock_parts/electrolite = 2,
/obj/item/stock_parts/capacitor = 2,
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/glass = 1)
needs_anchored = FALSE
@@ -174,7 +174,7 @@
/obj/machinery/portable_atmospherics/canister/hydrogen
name = "hydrogen canister"
desc = "Hydrogen, highly flammable"
icon_state = "grey"
icon_state = "h2"
gas_type = /datum/gas/hydrogen
filled = 1
+1 -1
View File
@@ -139,5 +139,5 @@
worth += gases[/datum/gas/tritium][MOLES]*5
worth += gases[/datum/gas/pluoxium][MOLES]*5
worth += gases[/datum/gas/freon][MOLES]*15
worth += gases[/datum/gas/hydrogen][MOLES]*25
worth += gases[/datum/gas/hydrogen][MOLES]*10
return worth
@@ -246,6 +246,51 @@
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
//electrolite
/datum/design/basic_electrolite
name = "Basic Electrolite"
desc = "A stock part used in the construction of various devices."
id = "basic_electrolite"
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/glass = 100)
build_path = /obj/item/stock_parts/electrolite
category = list("Stock Parts","Machinery","initial")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/adv_electrolite
name = "Advanced Electrolite"
desc = "A stock part used in the construction of various devices."
id = "adv_electrolite"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 150, /datum/material/glass = 150)
build_path = /obj/item/stock_parts/electrolite/adv
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/super_electrolite
name = "Super Electrolite"
desc = "A stock part used in the construction of various devices."
id = "super_electrolite"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100, /datum/material/silver = 100)
build_path = /obj/item/stock_parts/electrolite/super
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
/datum/design/bluespace_electrolite
name = "Bluespace Electrolite"
desc = "A stock part used in the construction of various devices."
id = "bluespace_electrolite"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 200, /datum/material/glass = 200, /datum/material/gold = 100, /datum/material/silver = 100, /datum/material/diamond = 100)
build_path = /obj/item/stock_parts/electrolite/bluespace
category = list("Stock Parts")
lathe_time_factor = 0.2
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
//T-Comms devices
/datum/design/subspace_ansible
name = "Subspace Ansible"
+27
View File
@@ -162,6 +162,12 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
icon_state = "matter_bin"
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite
name = "electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "electrolite"
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 2
/obj/item/stock_parts/capacitor/adv
@@ -199,6 +205,13 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
rating = 2
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/adv
name = "advanced electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "adv_electrolite"
rating = 2
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 3
/obj/item/stock_parts/capacitor/super
@@ -236,6 +249,13 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
rating = 3
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/super
name = "super electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "super_electrolite"
rating = 3
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
//Rating 4
/obj/item/stock_parts/capacitor/quadratic
@@ -273,6 +293,13 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
rating = 4
custom_materials = list(/datum/material/iron=80)
/obj/item/stock_parts/electrolite/bluespace
name = "super electrolite"
desc = "An electrolite component to separate matters into others"
icon_state = "bluespace_electrolite"
rating = 4
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
// Subspace stock parts
/obj/item/stock_parts/subspace/ansible
+4 -4
View File
@@ -8,7 +8,7 @@
display_name = "Basic Research Technology"
description = "NT default research technologies."
// Default research tech, prevents bricking
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "basic_electrolite", "c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "bepis", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
"paystand", "space_heater", "bucket", "sec_rshot", "sec_beanbag_slug", "sec_bshot", "sec_slug", "sec_Islug", "sec_dart", "sec_38", "rglass", "plasteel",
"plastitanium", "plasmaglass", "plasmareinforcedglass", "titaniumglass", "plastitaniumglass", "plastic_knife", "plastic_fork", "plastic_spoon", "conveyor_belt", "conveyor_switch")
@@ -144,7 +144,7 @@
design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "scanner_gate",
"atmosalerts", "atmos_control", "recycler", "autolathe", "high_micro_laser", "nano_mani", "mesons", "welding_goggles", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod",
"apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine",
"oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer")
"oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "electrolyzer", "adv_electrolite")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 5000
@@ -171,7 +171,7 @@
display_name = "High Efficiency Parts"
description = "Finely-tooled manufacturing techniques allowing for picometer-perfect precision levels."
prereq_ids = list("engineering", "datatheory")
design_ids = list("pico_mani", "super_matter_bin")
design_ids = list("pico_mani", "super_matter_bin", "super_electrolite")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
export_price = 5000
@@ -208,7 +208,7 @@
display_name = "Miniaturized Bluespace Research"
description = "Extreme reduction in space required for bluespace engines, leading to portable bluespace technology."
prereq_ids = list("bluespace_travel", "practical_bluespace", "high_efficiency")
design_ids = list("bluespace_matter_bin", "femto_mani", "bluespacebodybag", "triphasic_scanning", "quantum_keycard", "wormholeprojector", "swapper")
design_ids = list("bluespace_matter_bin", "femto_mani", "bluespacebodybag", "triphasic_scanning", "quantum_keycard", "wormholeprojector", "swapper", "bluespace_electrolite")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 5000
Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB