From 454a2340b5d372a92013e77794abf44daf9dcc07 Mon Sep 17 00:00:00 2001 From: John Doe Date: Mon, 4 Sep 2023 17:23:52 -0700 Subject: [PATCH] allows scope to hit closer + antivehicle --- code/__DEFINES/conflict.dm | 2 +- code/modules/projectiles/ammo_datums.dm | 1 + code/modules/projectiles/gun_attachables.dm | 4 ++-- code/modules/vehicles/multitile/multitile_interaction.dm | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm index 241bcb469622..0820c709cdae 100644 --- a/code/__DEFINES/conflict.dm +++ b/code/__DEFINES/conflict.dm @@ -26,7 +26,7 @@ #define AMMO_IGNORE_RESIST (1<<10) #define AMMO_BALLISTIC (1<<11) #define AMMO_IGNORE_COVER (1<<12) -// (1<<13) unused, previously was AMMO_SCANS_NEARBY +#define AMMO_ANTIVEHICLE (1<<13) #define AMMO_STOPPED_BY_COVER (1<<14) #define AMMO_SPECIAL_EMBED (1<<15) /// If the projectile hits a dense turf it'll do on_hit_turf on the turf just in front of the turf instead of on the turf itself diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 9a7cb344096b..b5e51db88998 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1648,6 +1648,7 @@ accurate_range_min = 10 handful_state = "vulture_bullet" sound_hit = 'sound/bullets/bullet_vulture_impact.ogg' + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER|AMMO_ANTIVEHICLE /datum/ammo/bullet/sniper/anti_materiel/vulture/on_hit_mob(mob/hit_mob, obj/item/projectile/bullet) . = ..() diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 32f07ef51d2e..d69f7b15ced2 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1148,11 +1148,11 @@ Defined in conflicts.dm of the #defines folder. /// How far out the player should see by default var/start_scope_range = 12 /// The bare minimum distance the scope can be from the player - var/min_scope_range = 15 + var/min_scope_range = 12 /// The maximum distance the scope can be from the player var/max_scope_range = 25 /// How far in the perpendicular axis the scope can move in either direction - var/perpendicular_scope_range = 7 // Might want to redo this to be something better or more sane + var/perpendicular_scope_range = 7 /// How far in each direction the scope should see. Default human view size is 7 var/scope_viewsize = 7 /// The current X position of the scope within the sniper's view box. 0 is center diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index f956d64ebf12..e3c69d10e17c 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -295,7 +295,7 @@ if(P.runtime_iff_group && get_target_lock(P.runtime_iff_group)) return - if(ammo_flags & AMMO_ANTISTRUCT) + if(ammo_flags & AMMO_ANTISTRUCT|AMMO_ANTIVEHICLE) // Multiplier based on tank railgun relationship, so might have to reconsider multiplier for AMMO_SIEGE in general damage = round(damage*ANTISTRUCT_DMG_MULT_TANK) if(ammo_flags & AMMO_ACIDIC)