Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bipod now gives you an option to switch to full auto when deploying #5638

Merged
merged 6 commits into from
Feb 14, 2024
Merged

Bipod now gives you an option to switch to full auto when deploying #5638

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b318df
first pass
VileBeggar Feb 1, 2024
a981b42
add custom icon, fix action not appearing, remove action when deattac…
VileBeggar Feb 2, 2024
34a5029
renames a couple of one letter vars in bipod code, tweaks the icon sl…
VileBeggar Feb 2, 2024
979b409
flush old_firemode just in case
VileBeggar Feb 2, 2024
215410d
removes usr instances
VileBeggar Feb 3, 2024
6ad8664
fix logical inconsistency with reverting firemodes
VileBeggar Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 84 additions & 28 deletions code/modules/projectiles/gun_attachables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3264,6 +3264,10 @@ Defined in conflicts.dm of the #defines folder.
var/bipod_deployed = FALSE
/// If this should anchor the user while in use
var/heavy_bipod = FALSE
// Are switching to full auto when deploying the bipod
var/full_auto_switch = FALSE
// Store our old firemode so we can switch to it when undeploying the bipod
var/old_firemode = null

/obj/item/attachable/bipod/New()
..()
Expand All @@ -3274,14 +3278,31 @@ Defined in conflicts.dm of the #defines folder.
scatter_mod = SCATTER_AMOUNT_TIER_9
recoil_mod = RECOIL_AMOUNT_TIER_5

/obj/item/attachable/bipod/Attach(obj/item/weapon/gun/G)
/obj/item/attachable/bipod/Attach(obj/item/weapon/gun/gun)
..()

RegisterSignal(G, COMSIG_ITEM_DROPPED, PROC_REF(handle_drop))
if((GUN_FIREMODE_AUTOMATIC in gun.gun_firemode_list) || (gun.flags_gun_features & GUN_SUPPORT_PLATFORM))
var/given_action = FALSE
if(usr && (gun == usr.l_hand || gun == usr.r_hand))
VileBeggar marked this conversation as resolved.
Show resolved Hide resolved
give_action(usr, /datum/action/item_action/bipod/toggle_full_auto_switch, src, gun)
given_action = TRUE
if(!given_action)
new /datum/action/item_action/bipod/toggle_full_auto_switch(src, gun)

RegisterSignal(gun, COMSIG_ITEM_DROPPED, PROC_REF(handle_drop))

/obj/item/attachable/bipod/Detach(mob/user, obj/item/weapon/gun/detaching_gub)
UnregisterSignal(detaching_gub, COMSIG_ITEM_DROPPED)

//clear out anything related to full auto switching
full_auto_switch = FALSE
old_firemode = null
for(var/item_action in detaching_gub.actions)
var/datum/action/item_action/bipod/toggle_full_auto_switch/target_action = item_action
if(target_action.target == src)
qdel(item_action)
break

if(bipod_deployed)
undeploy_bipod(detaching_gub)
..()
Expand All @@ -3297,86 +3318,96 @@ Defined in conflicts.dm of the #defines folder.
if(istype(loc, /obj/item/weapon/gun))
var/obj/item/weapon/gun/gun = loc
gun.update_attachable(slot)
for(var/datum/action/A as anything in gun.actions)
A.update_button_icon()
for(var/datum/action/item_action as anything in gun.actions)
if(!istype(item_action, /datum/action/item_action/bipod/toggle_full_auto_switch))
item_action.update_button_icon()

/obj/item/attachable/bipod/proc/handle_drop(obj/item/weapon/gun/G, mob/living/carbon/human/user)
/obj/item/attachable/bipod/proc/handle_drop(obj/item/weapon/gun/gun, mob/living/carbon/human/user)
SIGNAL_HANDLER

UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK)

if(bipod_deployed)
undeploy_bipod(G)
undeploy_bipod(gun)
user.apply_effect(1, SUPERSLOW)
user.apply_effect(2, SLOW)

/obj/item/attachable/bipod/proc/undeploy_bipod(obj/item/weapon/gun/G)
REMOVE_TRAIT(G, TRAIT_GUN_BIPODDED, "attached_bipod")
/obj/item/attachable/bipod/proc/undeploy_bipod(obj/item/weapon/gun/gun)
REMOVE_TRAIT(gun, TRAIT_GUN_BIPODDED, "attached_bipod")
bipod_deployed = FALSE
accuracy_mod = -HIT_ACCURACY_MULT_TIER_5
scatter_mod = SCATTER_AMOUNT_TIER_9
recoil_mod = RECOIL_AMOUNT_TIER_5
burst_scatter_mod = 0
delay_mod = FIRE_DELAY_TIER_12
G.recalculate_attachment_bonuses()
G.stop_fire()

//if we are no longer on fullauto, don't bother switching back to the old firemode
if(full_auto_switch && gun.gun_firemode == GUN_FIREMODE_AUTOMATIC)
gun.do_toggle_firemode(usr, null, old_firemode)

gun.recalculate_attachment_bonuses()
gun.stop_fire()
var/mob/living/user
if(isliving(G.loc))
user = G.loc
if(isliving(gun.loc))
user = gun.loc
SEND_SIGNAL(user, COMSIG_MOB_UNDEPLOYED_BIPOD)
UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK)

if(G.flags_gun_features & GUN_SUPPORT_PLATFORM)
G.remove_firemode(GUN_FIREMODE_AUTOMATIC)
if(gun.flags_gun_features & GUN_SUPPORT_PLATFORM)
gun.remove_firemode(GUN_FIREMODE_AUTOMATIC)

if(heavy_bipod)
user.anchored = FALSE

if(!QDELETED(G))
if(!QDELETED(gun))
playsound(user,'sound/items/m56dauto_rotate.ogg', 55, 1)
update_icon()

/obj/item/attachable/bipod/activate_attachment(obj/item/weapon/gun/G,mob/living/user, turn_off)
/obj/item/attachable/bipod/activate_attachment(obj/item/weapon/gun/gun, mob/living/user, turn_off)
if(turn_off)
if(bipod_deployed)
undeploy_bipod(G)
undeploy_bipod(gun)
else
var/obj/support = check_bipod_support(G, user)
var/obj/support = check_bipod_support(gun, user)
if(!support&&!bipod_deployed)
to_chat(user, SPAN_NOTICE("You start deploying [src] on the ground."))
if(!do_after(user, 15, INTERRUPT_ALL, BUSY_ICON_HOSTILE, G,INTERRUPT_DIFF_LOC))
if(!do_after(user, 15, INTERRUPT_ALL, BUSY_ICON_HOSTILE, gun, INTERRUPT_DIFF_LOC))
return FALSE

bipod_deployed = !bipod_deployed
if(user)
if(bipod_deployed)
ADD_TRAIT(G, TRAIT_GUN_BIPODDED, "attached_bipod")
ADD_TRAIT(gun, TRAIT_GUN_BIPODDED, "attached_bipod")
to_chat(user, SPAN_NOTICE("You deploy [src] [support ? "on [support]" : "on the ground"]."))
SEND_SIGNAL(user, COMSIG_MOB_DEPLOYED_BIPOD)
playsound(user,'sound/items/m56dauto_rotate.ogg', 55, 1)
accuracy_mod = HIT_ACCURACY_MULT_TIER_5
scatter_mod = -SCATTER_AMOUNT_TIER_10
recoil_mod = -RECOIL_AMOUNT_TIER_4
burst_scatter_mod = -SCATTER_AMOUNT_TIER_8
if(istype(G,/obj/item/weapon/gun/rifle/sniper/M42A))
if(istype(gun, /obj/item/weapon/gun/rifle/sniper/M42A))
delay_mod = -FIRE_DELAY_TIER_7
else
delay_mod = -FIRE_DELAY_TIER_12
G.recalculate_attachment_bonuses()
G.stop_fire()
gun.recalculate_attachment_bonuses()
gun.stop_fire()

initial_mob_dir = user.dir
RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look))

if(G.flags_gun_features & GUN_SUPPORT_PLATFORM)
G.add_firemode(GUN_FIREMODE_AUTOMATIC)
if(gun.flags_gun_features & GUN_SUPPORT_PLATFORM)
gun.add_firemode(GUN_FIREMODE_AUTOMATIC)

if(heavy_bipod)
user.anchored = TRUE

if(full_auto_switch && gun.gun_firemode != GUN_FIREMODE_AUTOMATIC)
old_firemode = gun.gun_firemode
gun.do_toggle_firemode(user, null, GUN_FIREMODE_AUTOMATIC)

else
to_chat(user, SPAN_NOTICE("You retract [src]."))
undeploy_bipod(G)
undeploy_bipod(gun)

update_icon()

Expand All @@ -3393,10 +3424,10 @@ Defined in conflicts.dm of the #defines folder.


//when user fires the gun, we check if they have something to support the gun's bipod.
/obj/item/attachable/proc/check_bipod_support(obj/item/weapon/gun/G, mob/living/user)
/obj/item/attachable/proc/check_bipod_support(obj/item/weapon/gun/gun, mob/living/user)
return 0

/obj/item/attachable/bipod/check_bipod_support(obj/item/weapon/gun/G, mob/living/user)
/obj/item/attachable/bipod/check_bipod_support(obj/item/weapon/gun/gun, mob/living/user)
var/turf/T = get_turf(user)
for(var/obj/O in T)
if(O.throwpass && O.density && O.dir == user.dir && O.flags_atom & ON_BORDER)
Expand All @@ -3408,6 +3439,31 @@ Defined in conflicts.dm of the #defines folder.
return O2
return 0

//item actions for handling deployment to full auto.
/datum/action/item_action/bipod/toggle_full_auto_switch/New(Target, obj/item/holder)
. = ..()
name = "Toggle Full Auto Switch"
action_icon_state = "full_auto_switch"
button.name = name
button.overlays.Cut()
button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state)

/datum/action/item_action/bipod/toggle_full_auto_switch/action_activate()
var/obj/item/weapon/gun/holder_gun = holder_item
var/obj/item/attachable/bipod/attached_bipod = holder_gun.attachments["under"]

attached_bipod.full_auto_switch = !attached_bipod.full_auto_switch
to_chat(usr, SPAN_NOTICE("[icon2html(holder_gun, usr)] You will [attached_bipod.full_auto_switch? "<B>start</b>" : "<B>stop</b>"] switching to full auto when deploying the bipod."))
playsound(usr, 'sound/weapons/handling/gun_burst_toggle.ogg', 15, 1)
VileBeggar marked this conversation as resolved.
Show resolved Hide resolved

if(attached_bipod.full_auto_switch)
button.icon_state = "template_on"
else
button.icon_state = "template"

button.overlays.Cut()
button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state)


/obj/item/attachable/bipod/m60
name = "bipod"
Expand Down
Binary file modified icons/mob/hud/actions.dmi
View file
Open in desktop
Binary file not shown.
Loading