power cell rework

citadel.dme

@@ -288,6 +288,7 @@
 #include "code\__DEFINES\overmaps\misc.dm"
 #include "code\__DEFINES\overmaps\overmap.dm"
 #include "code\__DEFINES\power\balancing.dm"
+#include "code\__DEFINES\power\cell.dm"
 #include "code\__DEFINES\power\power.dm"
 #include "code\__DEFINES\preferences\data_keys_character.dm"
 #include "code\__DEFINES\preferences\data_keys_global.dm"
@@ -819,6 +820,7 @@
 #include "code\datums\design\designs\ammo\shotgun.dm"
 #include "code\datums\design\designs\ammo\smg.dm"
 #include "code\datums\design\designs\devices\assemblies.dm"
+#include "code\datums\design\designs\devices\cells.dm"
 #include "code\datums\design\designs\devices\devices.dm"
 #include "code\datums\design\designs\machines\assemblies.dm"
 #include "code\datums\design\designs\machines\circuits.dm"
@@ -4313,7 +4315,6 @@
 #include "code\modules\power\cable.dm"
 #include "code\modules\power\cable_ender.dm"
 #include "code\modules\power\cable_heavyduty.dm"
-#include "code\modules\power\cell.dm"
 #include "code\modules\power\crypto_miner.dm"
 #include "code\modules\power\fractal_reactor.dm"
 #include "code\modules\power\generator.dm"
@@ -4330,8 +4331,17 @@
 #include "code\modules\power\antimatter\containment_jar.dm"
 #include "code\modules\power\antimatter\control.dm"
 #include "code\modules\power\antimatter\shielding.dm"
-#include "code\modules\power\cells\device_cells.dm"
-#include "code\modules\power\cells\power_cells.dm"
+#include "code\modules\power\cells\cell.dm"
+#include "code\modules\power\cells\cells_legacy.dm"
+#include "code\modules\power\cells\power_cell.dm"
+#include "code\modules\power\cells\datums\basic.dm"
+#include "code\modules\power\cells\datums\infinite.dm"
+#include "code\modules\power\cells\datums\microfission.dm"
+#include "code\modules\power\cells\datums\regen.dm"
+#include "code\modules\power\cells\types\large.dm"
+#include "code\modules\power\cells\types\medium.dm"
+#include "code\modules\power\cells\types\small.dm"
+#include "code\modules\power\cells\types\weapon.dm"
 #include "code\modules\power\engines\rust\_setup.dm"
 #include "code\modules\power\engines\rust\fusion_circuits.dm"
 #include "code\modules\power\engines\rust\fusion_reactions.dm"

code/__DEFINES/power/balancing.dm

@@ -2,18 +2,21 @@
 
 //* Cells
 
+#define CELLRATE_DEFAULT 0.5
 /// the closest thing we'll get to a cvar - cellrate is kJ per cell unit. kJ to avoid float precision loss.
-GLOBAL_VAR_INIT(cellrate, 0.5)
-/**
- * current calculations
- * cellrate 0.5 = 0.5 kj/unit
- * for 10k cell, 5000kj
- * 1 Wh = 60J-S*60s/m = 3600J = 3.6kJ
- * 10k cell --> 1388.89 Wh
- * damn, future cells be pogging
- */
-/// the closest thing we'll get to a cvar - affects cell use_scaled - higher = things use less energy. handheld devices usually use this.
-GLOBAL_VAR_INIT(cellefficiency, 1)
+GLOBAL_VAR_INIT(cellrate, CELLRATE_DEFAULT)
+
+#define POWER_CELL_CAPACITY_BASE 1000
+
+#define POWER_CELL_MULTIPLIER_SMALL (1.2)
+#define POWER_CELL_MULTIPLIER_MEDIUM (1.2 * 5)
+#define POWER_CELL_MULTIPLIER_LARGE (1.2 * 5 * 5)
+#define POWER_CELL_MULTIPLIER_WEAPON (1.2 * 2.5)
+
+#define POWER_CELL_CAPACITY_MULTIPLIER_SMALL (POWER_CELL_CAPACITY_BASE * POWER_CELL_MULTIPLIER_SMALL)
+#define POWER_CELL_CAPACITY_MULTIPLIER_MEDIUM (POWER_CELL_CAPACITY_BASE * POWER_CELL_MULTIPLIER_MEDIUM)
+#define POWER_CELL_CAPACITY_MULTIPLIER_LARGE (POWER_CELL_CAPACITY_BASE * POWER_CELL_MULTIPLIER_LARGE)
+#define POWER_CELL_CAPACITY_MULTIPLIER_WEAPON (POWER_CELL_CAPACITY_BASE * POWER_CELL_MULTIPLIER_WEAPON)
 
 //* Computers
 

code/__DEFINES/power/cell.dm

@@ -0,0 +1,70 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons                             *//
+
+//* /obj/item/cell/var/cell_type *//
+
+/// handheld devices
+#define CELL_TYPE_SMALL (1<<1)
+/// medium size devices like inducers, bulky handheld equipment, etc
+#define CELL_TYPE_MEDIUM (1<<2)
+/// mecha, apcs, large drills, etc
+#define CELL_TYPE_LARGE (1<<3)
+/// energy weapons that don't use special cells / specific other types
+#define CELL_TYPE_WEAPON (1<<4)
+
+DEFINE_BITFIELD_NEW(cell_type, list(
+	/obj/item/cell = list(
+		"cell_type",
+	),
+	/datum/object_system/cell_slot = list(
+		"cell_type",
+	),
+), list(
+	BITFIELD_NEW("Small", CELL_TYPE_SMALL),
+	BITFIELD_NEW("Medium", CELL_TYPE_MEDIUM),
+	BITFIELD_NEW("Large", CELL_TYPE_LARGE),
+	BITFIELD_NEW("Weapon", CELL_TYPE_WEAPON),
+))
+
+/// generate /small, /medium, /large, and /weapon cells for a power cell datum
+#define POWER_CELL_GENERATE_TYPES(DATUM_TYPEPATH, CELL_TYPEPATH, PROTOTYPE_ID) \
+/obj/item/cell/small##CELL_TYPEPATH { \
+	name = "small power cell (" + ##DATUM_TYPEPATH::cell_name + ")"; \
+	desc = "A small power cell used in handheld electronics. " + ##DATUM_TYPEPATH::cell_desc; \
+	prototype_id = "cell-" + ##PROTOTYPE_ID + "-small"; \
+	max_charge = /obj/item/cell/small::max_charge * ##DATUM_TYPEPATH::typegen_capacity_multiplier_small * ##DATUM_TYPEPATH::typegen_capacity_multiplier; \
+	stripe_color = ##DATUM_TYPEPATH::typegen_visual_stripe_color; \
+	indicator_color = ##DATUM_TYPEPATH::typegen_visual_indicator_color; \
+	typegen_active = TRUE; \
+	cell_datum = ##DATUM_TYPEPATH; \
+} \
+/obj/item/cell/medium##CELL_TYPEPATH { \
+	name = "medium power cell (" + ##DATUM_TYPEPATH::cell_name + ")"; \
+	desc = "A decently sized cell used in many pieces of modern equipment. " + ##DATUM_TYPEPATH::cell_desc; \
+	prototype_id = "cell-" + ##PROTOTYPE_ID + "-medium"; \
+	max_charge = /obj/item/cell/medium::max_charge * ##DATUM_TYPEPATH::typegen_capacity_multiplier_medium * ##DATUM_TYPEPATH::typegen_capacity_multiplier; \
+	stripe_color = ##DATUM_TYPEPATH::typegen_visual_stripe_color; \
+	indicator_color = ##DATUM_TYPEPATH::typegen_visual_indicator_color; \
+	typegen_active = TRUE; \
+	cell_datum = ##DATUM_TYPEPATH; \
+} \
+/obj/item/cell/large##CELL_TYPEPATH { \
+	name = "large power cell (" + ##DATUM_TYPEPATH::cell_name + ")"; \
+	desc = "A bulky power cell used in industrial equipment and power supply systems. " + ##DATUM_TYPEPATH::cell_desc; \
+	prototype_id = "cell-" + ##PROTOTYPE_ID + "-large"; \
+	max_charge = /obj/item/cell/large::max_charge * ##DATUM_TYPEPATH::typegen_capacity_multiplier_large * ##DATUM_TYPEPATH::typegen_capacity_multiplier; \
+	stripe_color = ##DATUM_TYPEPATH::typegen_visual_stripe_color; \
+	indicator_color = ##DATUM_TYPEPATH::typegen_visual_indicator_color; \
+	typegen_active = TRUE; \
+	cell_datum = ##DATUM_TYPEPATH; \
+} \
+/obj/item/cell/weapon##CELL_TYPEPATH { \
+	name = "weapon power cell (" + ##DATUM_TYPEPATH::cell_name + ")"; \
+	desc = "A power cell accepted by many kinds of handheld weaponry. " + ##DATUM_TYPEPATH::cell_desc; \
+	prototype_id = "cell-" + ##PROTOTYPE_ID + "-weapon"; \
+	max_charge = /obj/item/cell/weapon::max_charge + ##DATUM_TYPEPATH::typegen_capacity_multiplier_weapon * ##DATUM_TYPEPATH::typegen_capacity_multiplier; \
+	stripe_color = ##DATUM_TYPEPATH::typegen_visual_stripe_color; \
+	indicator_color = ##DATUM_TYPEPATH::typegen_visual_indicator_color; \
+	typegen_active = TRUE; \
+	cell_datum = ##DATUM_TYPEPATH; \
+}

code/__DEFINES/power/power.dm

@@ -147,7 +147,8 @@
  * #define SMESMAXOUTPUT 250000
  */
 
-/* cells */
+//* Cells *//
+
 // Cells practically use their own power systems
 // "Use power from cell" for **handheld/portable devices**, semantically, should always use cell units and not a "real unit"
 // This way we can tweak balance with just cellrate.
@@ -175,6 +176,18 @@
 #define DYNAMIC_CELL_UNITS_TO_KWM(U)		(((U) * GLOB.cellrate) / (60))
 #define DYNAMIC_CELL_UNITS_TO_WM(U)			(((U) * GLOB.cellrate) / (60 / 1000))
 
+//* Cells - Static; These use CELLRATE_DEFAULT *//
+
+#define STATIC_KW_TO_CELL_UNITS(KW, DT)		((KW) * (DT) / CELLRATE_DEFAULT)
+#define STATIC_W_TO_CELL_UNITS(W, DT)		(((W) * 0.001) * (DT) / CELLRATE_DEFAULT)
+#define STATIC_J_TO_CELL_UNITS(J)			(((J) * 0.001) / CELLRATE_DEFAULT)
+#define STATIC_KJ_TO_CELL_UNITS(KJ)			((KJ) / CELLRATE_DEFAULT)
+
+#define STATIC_CELL_UNITS_TO_KW(U, DT)		((U) * CELLRATE_DEFAULT / (DT))
+#define STATIC_CELL_UNITS_TO_W(U, DT)		((U) * CELL_RATE_DEFAULT / (DT) * 1000)
+#define STATIC_CELL_UNITS_TO_J(U)			((U) * CELL_RATE_DEFAULT * 1000)
+#define STATIC_CELL_UNITS_TO_KJ(U)			((U) * CELL_RATE_DEFAULT)
+
 /**
  * LEGACY ENUMS
  *

code/__DEFINES/radiation/simulation.dm

@@ -32,6 +32,8 @@
 #define RAD_FALLOFF_ENGINE_SINGULARITY 0.5
 /// materials
 #define RAD_FALLOFF_MATERIALS 0.5
+/// breached microfission cell
+#define RAD_FALLOFF_CELL_MICROFISSION 0.5
 
 //! Pulse - Z Falloff
 //* Keep in mind that these are low because things are usually really far away and the point of Z rad is to hit most things.
@@ -53,6 +55,10 @@
 #define RAD_INTENSITY_STANDALONE_DEFIB 100
 /// standalone shockpaddles - fail tick
 #define RAD_INTENSITY_STANDALONE_DEFIB_FAIL 150
+/// minimum intensity of a breached microfission cell
+#define RAD_INTENSITY_CELL_MICROFISSION_LEAK_MINIMUM 75
+/// maximum intensity of a breached microfission cell
+#define RAD_INTENSITY_CELL_MICROFISSION_LEAK_MAXIMUM 350
 
 //? machines
 /// gravity generator grav per tick while charging/discharging

code/datums/design/designs/devices/cells.dm

@@ -0,0 +1,29 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons                             *//
+
+/datum/design/cell
+	abstract_type = /datum/design/cell
+
+/datum/design/cell/small
+	id = "cell-basic-small"
+	lathe_type = LATHE_TYPE_AUTOLATHE
+	design_unlock = DESIGN_UNLOCK_INTRINSIC
+	build_path = /obj/item/cell/basic/small
+
+/datum/design/cell/medium
+	id = "cell-basic-medium"
+	lathe_type = LATHE_TYPE_AUTOLATHE
+	design_unlock = DESIGN_UNLOCK_INTRINSIC
+	build_path = /obj/item/cell/basic/medium
+
+/datum/design/cell/large
+	id = "cell-basic-large"
+	lathe_type = LATHE_TYPE_AUTOLATHE
+	design_unlock = DESIGN_UNLOCK_INTRINSIC
+	build_path = /obj/item/cell/basic/large
+
+/datum/design/cell/weapon
+	id = "cell-basic-weapon"
+	lathe_type = LATHE_TYPE_AUTOLATHE
+	design_unlock = DESIGN_UNLOCK_INTRINSIC
+	build_path = /obj/item/cell/basic/weapon

code/datums/outfits/outfit.dm

@@ -261,8 +261,8 @@
 	suit = /obj/item/clothing/suit/armor/combat/imperial
 	back = /obj/item/storage/backpack/satchel
 	belt = /obj/item/storage/belt/security/tactical/bandolier
-	l_pocket = /obj/item/cell/device/weapon
-	r_pocket = /obj/item/cell/device/weapon
+	l_pocket = /obj/item/cell/weapon/basic
+	r_pocket = /obj/item/cell/weapon/basic
 	r_hand = /obj/item/melee/transforming/energy/sword/imperial
 	l_hand = /obj/item/shield/transforming/energy/imperial
 	suit_store = /obj/item/gun/energy/imperial
@@ -277,8 +277,8 @@
 	mask = /obj/item/clothing/mask/gas/imperial
 	suit = /obj/item/clothing/suit/armor/combat/imperial/centurion
 	belt = /obj/item/storage/belt/security/tactical/bandolier
-	l_pocket = /obj/item/cell/device/weapon
-	r_pocket = /obj/item/cell/device/weapon
+	l_pocket = /obj/item/cell/weapon/basic
+	r_pocket = /obj/item/cell/weapon/basic
 	r_hand = /obj/item/melee/transforming/energy/sword/imperial
 	l_hand = /obj/item/shield/transforming/energy/imperial
 	suit_store = /obj/item/gun/energy/imperial

code/datums/recipe/crafting_recipes/recipes_misc.dm

@@ -225,7 +225,7 @@
 /datum/crafting_recipe/goldenbox
 	name = "Gold Plated Toolbox"
 	result = /obj/item/storage/toolbox/gold_fake
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	reqs = list(/obj/item/stack/material/cardboard = 1, //so we dont null items in crafting
 				/obj/item/stack/cable_coil = 10,
@@ -276,7 +276,7 @@
 
 /datum/crafting_recipe/brass_driver
 	name = "Brass Screwdriver"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/tool/screwdriver/brass
 	reqs = list(/obj/item/tool/screwdriver = 1,
@@ -291,7 +291,7 @@
 
 /datum/crafting_recipe/brass_welder
 	name = "Brass Welding Tool"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/weldingtool/brass
 	reqs = list(/obj/item/weldingtool = 1,
@@ -306,7 +306,7 @@
 
 /datum/crafting_recipe/clockwelder
 	name = "Replica Clockwork Welding Tool"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/weldingtool/experimental/brass
 	reqs = list(/obj/item/weldingtool/experimental = 1,
@@ -321,7 +321,7 @@
 
 /datum/crafting_recipe/brass_wirecutters
 	name = "Brass Wirecutters"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/tool/wirecutters/brass
 	reqs = list(/obj/item/tool/wirecutters = 1,
@@ -336,7 +336,7 @@
 
 /datum/crafting_recipe/brass_crowbar
 	name = "Brass Crowbar"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/tool/crowbar/brass
 	reqs = list(/obj/item/tool/crowbar = 1,
@@ -351,7 +351,7 @@
 
 /datum/crafting_recipe/brass_wrench
 	name = "Brass Wrench"
-	tools = list(/obj/item/cell/high,
+	tools = list(/obj/item/cell/medium,
 				/obj/item/reagent_containers/glass/beaker)
 	result = /obj/item/tool/wrench/brass
 	reqs = list(/obj/item/tool/wrench = 1,

code/datums/uplink/ammunition.dm

@@ -124,22 +124,18 @@
 	path = /obj/item/storage/box/flashshells
 	item_cost = 10 // Discount due to it being LTL.
 
-/datum/uplink_item/item/ammo/cell
-	name = "weapon cell"
-	path = /obj/item/cell/device/weapon
-
-/datum/uplink_item/item/ammo/highcell
-	name = "High capacity cell"
-	path = /obj/item/cell/high
-	item_cost = 15
-
-/datum/uplink_item/item/ammo/supercell
-	name = "Super capacity cell"
-	path = /obj/item/cell/super
-	item_cost = 30
-/* Cell type not present on Cit
-/datum/uplink_item/item/ammo/voidcell
-	name = "Void cell"
-	path = /obj/item/cell/device/recharge/alien/hybrid
-	item_cost = DEFAULT_TELECRYSTAL_AMOUNT * 1.5
-*/
+/datum/uplink_item/item/ammo/weapon_cell
+	name = "weapon power cell"
+	path = /obj/item/cell/weapon
+
+/datum/uplink_item/item/ammo/small
+	name = "small power cell"
+	path = /obj/item/cell/small
+
+/datum/uplink_item/item/ammo/medium_cell
+	name = "medium power cell"
+	path = /obj/item/cell/medium
+
+/datum/uplink_item/item/ammo/large_cell
+	name = "large power cell"
+	path = /obj/item/cell/large

code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/engineering.dm

@@ -20,8 +20,9 @@
 	contains = list(
 		/obj/item/storage/toolbox/electrical = 2,
 		/obj/item/clothing/gloves/yellow = 2,
-		/obj/item/cell = 2,
-		/obj/item/cell/high = 2,
+		/obj/item/cell/small = 2,
+		/obj/item/cell/medium = 2,
+		/obj/item/cell/large = 2,
 	)
 	worth = 300
 	container_type = /obj/structure/closet/crate/engineering/electrical

code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/miscellaneous.dm

@@ -172,7 +172,7 @@
 	name = "Belt-miner gear crate"
 	contains = list(
 		/obj/item/gun/energy/particle = 2,
-		/obj/item/cell/device/weapon = 2,
+		/obj/item/cell/weapon = 2,
 		/obj/item/storage/firstaid/regular = 1,
 		/obj/item/gps = 2,
 		/obj/item/storage/box/traumainjectors = 1,

code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/munitions.dm

@@ -182,7 +182,7 @@
 /datum/supply_pack/nanotrasen/munitions/pcellammo
 	name = "Ammunition - Power cell"
 	contains = list(
-		/obj/item/cell/device/weapon = 3,
+		/obj/item/cell/weapon = 3,
 	)
 	container_access = list()
 

code/game/content/factions/corporations/nanotrasen/nanotrasen-supply/robotics.dm

@@ -15,7 +15,8 @@
 		/obj/item/assembly/prox_sensor = 3,
 		/obj/item/storage/toolbox/electrical,
 		/obj/item/flash = 4,
-		/obj/item/cell/high = 2,
+		/obj/item/cell/medium = 2,
+		/obj/item/cell/large = 2,
 	)
 	worth = 250 // literally only because of the flashes; nerf flashes when?