Bullet rework

.vscode/launch.json

@@ -1,12 +1,31 @@
 {
-    "version": "0.2.0",
-    "configurations": [
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch and Build TGUI and DM",
+      "preLaunchTask": "TGUI Compile",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    },
+    {
+      "name": "C/C++ Runner: Debug Session",
+      "type": "cppdbg",
+      "request": "launch",
+      "args": [],
+      "stopAtEntry": false,
+      "externalConsole": true,
+      "cwd": "c:/Users/MLGTASTIC/Desktop/Eris-SS13/CEV-Eris/tgui/.yarn/unplugged/ttf2woff2-npm-4.0.4-e71f070912/node_modules/ttf2woff2/csrc/woff2",
+      "program": "c:/Users/MLGTASTIC/Desktop/Eris-SS13/CEV-Eris/tgui/.yarn/unplugged/ttf2woff2-npm-4.0.4-e71f070912/node_modules/ttf2woff2/csrc/woff2/build/Debug/outDebug",
+      "MIMode": "gdb",
+      "miDebuggerPath": "gdb",
+      "setupCommands": [
         {
-            "type": "byond",
-            "request": "launch",
-            "name": "Launch and Build TGUI and DM",
-            "preLaunchTask": "TGUI Compile",
-            "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
         }
-    ]
+      ]
+    }
+  ]
 }

cev_eris.dme

@@ -15,7 +15,9 @@
 #include "code\hub.dm"
 #include "code\stylesheet.dm"
 #include "code\world.dm"
+#include "code\__DEFINES\___byondbase.dm"
 #include "code\__DEFINES\__atomFlags.dm"
+#include "code\__DEFINES\_bullets.dm"
 #include "code\__DEFINES\_compile_options.dm"
 #include "code\__DEFINES\_globals.dm"
 #include "code\__DEFINES\_hydro_setup.dm"
@@ -89,6 +91,7 @@
 #include "code\__DEFINES\verb_manager.dm"
 #include "code\__DEFINES\weapons.dm"
 #include "code\__DEFINES\ZAS.dm"
+#include "code\__DEFINES\dcs\_attachmentFlags.dm"
 #include "code\__DEFINES\dcs\flags.dm"
 #include "code\__DEFINES\dcs\helpers.dm"
 #include "code\__DEFINES\dcs\signals.dm"
@@ -227,6 +230,7 @@
 #include "code\controllers\subsystems\alarm.dm"
 #include "code\controllers\subsystems\assets.dm"
 #include "code\controllers\subsystems\atoms.dm"
+#include "code\controllers\subsystems\bullets.dm"
 #include "code\controllers\subsystems\chat.dm"
 #include "code\controllers\subsystems\chemistry.dm"
 #include "code\controllers\subsystems\chunks.dm"
@@ -2410,6 +2414,7 @@
 #include "code\modules\projectiles\gun.dm"
 #include "code\modules\projectiles\gun_firemode.dm"
 #include "code\modules\projectiles\gun_hud_actions.dm"
+#include "code\modules\projectiles\hitbox_datums.dm"
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\ammunition\ammo_kits.dm"
 #include "code\modules\projectiles\ammunition\boxes.dm"

code/ATMOSPHERICS/atmospherics.dm

@@ -33,6 +33,10 @@ Pipelines + Other Objects -> Pipe network
 	var/obj/machinery/atmospherics/node1
 	var/obj/machinery/atmospherics/node2
 
+/// Pending a full implementation of hitbox for every atom
+/obj/machinery/atmospherics/bullet_act(obj/item/projectile/P, def_zone, hitboxFlags)
+	return PROJECTILE_CONTINUE
+
 /obj/machinery/atmospherics/Initialize(mapload, d)
 	if(!icon_manager)
 		icon_manager = new()
@@ -58,6 +62,15 @@ Pipelines + Other Objects -> Pipe network
 		return
 	..()
 
+/// Yes this is necesarry due to how atmos is handled
+/// In a perfect world this wouldn't be necesarry
+/// and i do not have the willpower to rework all of atmos yet
+/// SPCR - 2024
+/obj/machinery/atmospherics/proc/getHitboxData()
+	if(invisibility == 101)
+		return null
+	return initialize_directions
+
 /obj/machinery/atmospherics/proc/add_underlay(var/turf/T, var/obj/machinery/atmospherics/node, var/direction, var/icon_connect_type)
 	if(node)
 		if(T && !T.is_plating() && node.level == BELOW_PLATING_LEVEL && istype(node, /obj/machinery/atmospherics/pipe))

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -53,6 +53,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on
 	use_power = IDLE_POWER_USE
 	icon_state = "map_vent_out"
+	hitbox = /datum/hitboxDatum/atom/atmosphericVentScrubber
 
 /obj/machinery/atmospherics/unary/vent_pump/siphon
 	pump_direction = 0

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -40,6 +40,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on
 	use_power = IDLE_POWER_USE
 	icon_state = "map_scrubber_on"
+	hitbox = /datum/hitboxDatum/atom/atmosphericVentScrubber
 
 /obj/machinery/atmospherics/unary/vent_scrubber/Initialize(mapload, d)
 	. = ..()

code/ATMOSPHERICS/pipes.dm

@@ -7,9 +7,19 @@
 	layer = GAS_PIPE_HIDDEN_LAYER
 	use_power = NO_POWER_USE
 
+	hitbox = /datum/hitboxDatum/atom/polygon/atmosphericPipe
+
 	var/alert_pressure = 80*ONE_ATMOSPHERE
 		//minimum pressure before check_pressure(...) should be called
 
+/// Pending a full implementation of hitbox for every atom
+/obj/machinery/atmospherics/pipe/bullet_act(obj/item/projectile/P, def_zone, hitboxFlags)
+	take_damage(P.get_structure_damage())
+	if(QDELETED(src))
+		return PROJECTILE_CONTINUE
+	return PROJECTILE_STOP
+
+
 /obj/machinery/atmospherics/pipe/Initialize(mapload, d)
 	. = ..()
 	AddComponent(/datum/component/buckling, buckleFlags = BUCKLE_MOB_ONLY | BUCKLE_REQUIRE_RESTRAINTED | BUCKLE_REQUIRE_NOT_BUCKLED | BUCKLE_FORCE_LIE)
@@ -191,6 +201,11 @@
 		invisibility = i ? 101 : 0
 	update_icon()
 
+/obj/machinery/atmospherics/pipe/simple/getHitboxData()
+	if(invisibility == 101)
+		return null
+	return initialize_directions
+
 /obj/machinery/atmospherics/pipe/simple/Process()
 	if(!parent) //This should cut back on the overhead calling build_network thousands of times per cycle
 		..()

code/ZAS/Airflow.dm

@@ -242,6 +242,6 @@ obj/item/check_airflow_movable(n)
 	. = list()
 	for(var/turf/T in contents)
 		for(var/atom/movable/A in T)
-			if(!A.simulated || A.anchored || istype(A, /obj/effect) || isobserver(A))
+			if(A.anchored || istype(A, /obj/effect) || isobserver(A))
 				continue
 			. += A

code/__DEFINES/___byondbase.dm

@@ -0,0 +1,8 @@
+#define NORTH 1
+#define SOUTH 2
+#define EAST 4
+#define WEST 8
+#define LISTNORTH "1"
+#define LISTSOUTH "2"
+#define LISTEAST "4"
+#define LISTWEST "8"

code/__DEFINES/__atomFlags.dm

@@ -1,6 +1,17 @@
 /// This ATOM gets its proper icon after update icon / new has been called . This makes path2icon instantiate it and grab it from there
-#define AF_ICONGRABNEEDSINSTANTATION 1<<1
+#define AF_ICONGRABNEEDSINSTANTATION (1<<1)
 /// This atom's layer shouldn't adjust itself
-#define AF_LAYER_UPDATE_HANDLED 1<<2
+#define AF_LAYER_UPDATE_HANDLED (1<<2)
 /// This atom's plane shouldn't adjust itself
-#define AF_PLANE_UPDATE_HANDLED 1<<3
+#define AF_PLANE_UPDATE_HANDLED (1<<3)
+/// This atom should be able to always move however it wants with no restrictions(used for bullets after they hit.) It also isn't counted for any interactions regarding crossing , etc.
+#define AF_VISUAL_MOVE (1<<4)
+/// Our hitbox is offset by an attachment.
+#define AF_HITBOX_OFFSET_BY_ATTACHMENT (1<<5)
+#define AF_IGNORE_ON_BULLETSCAN (1<<6)
+/// This atom will get ignored by explosions
+#define AF_EXPLOSION_IGNORANT (1<<8)
+/// Uses the aiming level for shooting at the shooter instead.
+#define AF_PASS_AIMING_LEVEL (1<<9)
+/// This is a wall-mounted atom and should be treated as such on initialization.
+#define AF_WALL_MOUNTED (1<<10)

code/__DEFINES/_bullets.dm

@@ -0,0 +1,41 @@
+/// These define the MAXIMUM height for a level (as in a standing human height is considered)
+#define LEVEL_BELOW 0
+#define LEVEL_TURF 3
+#define LEVEL_LYING 6
+#define LEVEL_LOWWALL 9
+#define LEVEL_TABLE 15
+#define LEVEL_LEGS 15
+#define LEVEL_GROIN 20
+#define LEVEL_CHEST 28
+#define LEVEL_HEAD 30
+#define LEVEL_ABOVE 32
+
+// update these , using max() on defines wont give you constants
+#define LEVEL_MAX 3
+#define LEVEL_MIN 0
+
+// return flags for aimingLevels ,this makes it so it uses the shooter's default aiming level , be it by their current level or def zone they are aiming at.
+#define HBF_NOLEVEL -99999
+#define HBF_USEMEDIAN -100000
+
+#define PIXEL_FUDGE (1/1024)
+
+proc/snapNum(n)
+	. = n
+	n = round(n,1)
+	if(abs(.-n) < PIXEL_FUDGE) . = n
+
+
+//  return flags for the hitboxDatum , with functionality implemented in bullet_act. passed under hitboxFlags
+// these have no excuse to be general , add them for any object you want to add special functonality to with regards to where it is hit.
+/// GENERAL
+#define HB_AIMED 1<<1
+/// mob/living/carbon/human and any subtypes
+#define HB_HEAD 1<<2
+#define HB_CHESTARMS 1<<3
+#define HB_GROIN 1<<4
+#define HB_LEGS 1<<5
+// barricades and whatever object implements this
+#define HB_WEAKPOINT 1<<6
+
+

code/__DEFINES/dcs/_attachmentFlags.dm

@@ -0,0 +1,36 @@
+
+/// This denotes that we are attached to a supporting atom
+#define ATFA_ATTACHED (0<<0)
+/// This denotes that we are a supporting atom to the thing attached to us
+#define ATFS_SUPPORTER (1<<0)
+
+/// ATFS - Attachment flags for the supporting atom
+/// DEPENDING on wheter its an attached or a supporter, the bitflags change meaning
+/// If the supporter is marked for deletion/deleted , also delete the attached atoms. Default behaviour
+#define ATFS_DELETE_RECURSIVE (1<<1)
+/// Will detach all attached atoms and drop them on the turf
+#define ATFS_DROP_ATTACHED (1<<2)
+/// The supporting atom shall relay signals to all its attached atoms
+#define ATFS_RELAY_SIGNALS (1<<3)
+/// This will cause all attached atoms to be checked first for hitbox collisions instead of us
+#define ATFS_PRIORITIZE_ATTACHED_FOR_HITS (1<<4)
+/// This will make all bullets ignore the attached atom
+#define ATFS_IGNORE_HITS (1<<5)
+
+/// ATFA - Attachment flags for the attached atom
+/// This denotes that we are holding onto the supporting atom.
+#define ATFA_HOLDING (1<<1)
+/// We can be detached from the wall(either through a interaction or verb)
+#define ATFA_DETACHABLE (1<<2)
+/// This is embedded into the wall , removeable using surgical clamps or pliers, and not by normal means.
+#define ATFA_EMBEDDED (1<<3)
+/// The player must be next to the wall to interact with the attached
+#define ATFA_CLOSE_INTERACTIVE (1<<4)
+/// Player has to be near the turf the attached is facing to interact with it. Default behaviour
+#define ATFA_EASY_INTERACTIVE (1<<5)
+/// This can only be hit if the bullets come from the direction it is facing or if they are penetrating  ,but otherwise not.
+#define ATFA_DIRECTIONAL_HITTABLE_STRICT (1<<6)
+/// The bullet can come from any axis that shares a direction bit-flag with ourselves
+#define ATFA_DIRECTIONAL_HITTABLE (1<<7)
+/// Will force any hit-checking to be relatively offset by our position compared to the supporting atom.
+#define ATFA_CENTER_ON_SUPPORTER (1<<8)

code/__DEFINES/error_handler.dm

@@ -4,4 +4,4 @@
 #define ERROR_MAX_COOLDOWN (ERROR_COOLDOWN * ERROR_LIMIT)
 #define ERROR_SILENCE_TIME 6000 // How long a unique error will be silenced for
 // How long to wait between messaging admins about occurrences of a unique error
-#define ERROR_MSG_DELAY 50
+#define ERROR_MSG_DELAY 50

code/__DEFINES/maths.dm

@@ -18,7 +18,11 @@
 
 #define CEILING(x, y) ( -round(-(x) / (y)) * (y) )
 
-#define DIST_EUCLIDIAN(x1,y1,x2,y2) (sqrt((x1-x2)**2 + (y1-y2)**2))
+#define DIST_EUCLIDIAN_2D(x1,y1,x2,y2) (sqrt((x1-x2)**2 + (y1-y2)**2))
+
+#define DIST_EUCLIDIAN_3D(x1,y1,z1,x2,y2,z2) (sqrt((x1-x2)**2 + (y1-y2)**2 + (z1-z2)**2))
+
+
 
 // round() acts like floor(x, 1) by default but can't handle other values
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )

code/__DEFINES/misc.dm

@@ -157,10 +157,10 @@
 
 
 // Special return values from bullet_act(). Positive return values are already used to indicate the blocked level of the projectile.
-#define PROJECTILE_STOP					 1 //if the projectile should stop flying after calling bullet_act()
-#define PROJECTILE_CONTINUE				-1 //if the projectile should continue flying after calling bullet_act()
-#define PROJECTILE_FORCE_MISS			-2 //if the projectile should treat the attack as a miss (suppresses attack and admin logs) - only applies to mobs.
-#define PROJECTILE_FORCE_MISS_SILENCED	-2.5 //if the projectile should do the same thing as above, but not give the miss message
+#define PROJECTILE_STOP 1 //if the projectile should stop flying after calling bullet_act()
+#define PROJECTILE_CONTINUE 2//if the projectile should continue flying after calling bullet_act()
+#define PROJECTILE_FORCE_MISS 4 //if the projectile should treat the attack as a miss (suppresses attack and admin logs) - only applies to mobs.
+#define PROJECTILE_FORCE_MISS_SILENCED 8//if the projectile should do the same thing as above, but not give the miss message
 
 //Camera capture modes
 #define CAPTURE_MODE_REGULAR 0 //Regular polaroid camera mode
@@ -228,6 +228,10 @@
 #define EMAIL_BROADCAST "[email protected]"
 #define EMAIL_PAYROLL "[email protected]"
 
+#ifdef BULLETDEBUG
+GLOBAL_LIST_EMPTY(initVis)
+#endif
+
 #define LEGACY_RECORD_STRUCTURE(X, Y) GLOBAL_LIST_EMPTY(##X);/datum/computer_file/data/##Y/var/list/fields[0];/datum/computer_file/data/##Y/New(){..();GLOB.##X.Add(src);}/datum/computer_file/data/##Y/Destroy(){. = ..();GLOB.##X.Remove(src);}
 
 //Number of slots a modular computer has which can be tweaked via gear tweaks.
@@ -367,3 +371,7 @@
 #define TTS_SEED_DEFAULT_FEMALE "Female_1"
 #define TTS_SEED_DEFAULT_MALE "Male_1"
 #define TTS_SEED_ANNOUNCER "Robot_2"
+
+#define BBOX(x1,y1,x2,y2, minLevel, maxLevel, flags) list(x1,y1,x2,y2, minLevel, maxLevel, flags)
+#define BLINE(x1,y1,x2,y2, minLevel, maxLevel, flags) list(x1,y1,x2,y2, minLevel, maxLevel, flags)
+#define TRIGSLOPE(x1,y1,x2,y2) ((y2-y1)/(x2-x1))

code/__DEFINES/projectile_defines.dm

@@ -41,7 +41,3 @@
 #define SLOT_UNDERBARREL "underbarrel"
 #define SLOT_MECHANICS "mechanics"
 #define SLOT_BAYONET "bayonet slot"
-
-#define HEIGHT_LOW 1
-#define HEIGHT_CENTER 0
-#define HEIGHT_HIGH 2

code/__DEFINES/subsystems-priority.dm

@@ -15,6 +15,7 @@ var/list/bitflags = list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096
 #define FIRE_PRIORITY_TIMER 700
 #define SS_PRIORITY_TICKER			200	// Gameticker processing.
 #define FIRE_PRIORITY_TGUI 110
+#define SS_PRIORITY_BULLETS 102
 #define FIRE_PRIORITY_EXPLOSIONS 105 // Explosions!
 #define FIRE_PRIORITY_THROWING 106 // Throwing! after explosions since they influence throw direction
 #define SS_PRIORITY_HUMAN			101	// Human Life().

code/__DEFINES/subsystems.dm

@@ -117,12 +117,13 @@
 #define INIT_ORDER_XKEYSCORE -10
 #define INIT_ORDER_STICKY_BAN -10
 #define INIT_ORDER_TICKETS -10
+#define INIT_ORDER_BULLETS -11
+#define INIT_ORDER_LIGHTING -20
 #define INIT_ORDER_JAMMING -22
 #define INIT_ORDER_SQUEAK -40
 #define INIT_ORDER_XENOARCH	-50
 #define INIT_ORDER_PERSISTENCE -100
 #define INIT_OPEN_SPACE -150
-#define INIT_ORDER_LIGHTING -160
 #define INIT_ORDER_LATELOAD -180
 #define INIT_ORDER_CHAT	-185
 #define INIT_ORDER_SHUTTLE -190

code/__HELPERS/_lists.dm

@@ -27,6 +27,44 @@
 #define SANITIZE_LIST(L) ( islist(L) ? L : list() )
 #define reverseList(L) reverseRange(L.Copy())
 
+/// L - List, I - Item , K = Key . For associative lists
+#define ASSLADD(L, I, K) \
+	if(!length(L))\
+		L = list();\
+	L[K] = I;\
+
+/// L - List, K = Key . For associative lists
+#define ASSLREMOVE(L, K)\
+	if(length(L)){\
+		L -= K;\
+		if(length(L) == 0){\
+			del(L);};\
+	};
+
+/// L - List, I - Item , K = Key . For lists indexed by associative
+#define ASSLLADD(L, I, K) \
+	if(length(L)){\
+		if(!length(L[K])){\
+			L[K] = list(I);}\
+		else{\
+			L[K] += I;};\
+	}\
+	else\
+		L = list();\
+		L[K] = list(I);\
+
+/// L - List, I - Item , K = Key . For lists indexed by associtive
+#define ASSLLREMOVE(L, I, K)\
+	if(length(L))\
+		if(length(L[K]) > 1)\
+			L[K] -= I;\
+		else\
+			L -= K;\
+			if(length(L) == 0)\
+				del(L);\
+
+
+
 //Sets the value of a key in an assoc list
 #define LAZYSET(L,K,V) if(!L) { L = list(); } L[K] = V;