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.

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

Gang locker movement #18561

Merged
merged 8 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
6 changes: 6 additions & 0 deletions code/datums/controllers/process/gang.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@
imgroup.add_image(objective_image)
broadcast_to_all_gangs("<span style='font-size:24px'> We're dropping off weapons & ammunition at <b>\the [drop_zone.name]!</b> It'll arrive in [GANG_CRATE_DROP_TIME/(1 MINUTE)] minute[s_es(GANG_CRATE_DROP_TIME/(1 MINUTE))] so get fortifying!</span>")

var/datum/game_mode/gang/gamemode = ticker.mode
for(var/datum/gang/targetGang as anything in gamemode.gangs) //create loot bags for this gang (so they get pinged)
var/datum/targetable/abil = targetGang.leader?.current?.getAbility(/datum/targetable/gang/move_gang_base)
if (abil)
abil.last_cast = world.time + GANG_CRATE_DROP_TIME + 5 MINUTES
targetGang.leader.current.abilityHolder?.updateButtons()

SPAWN(GANG_CRATE_DROP_TIME - 30 SECONDS)
if(drop_zone != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@
if (length(T.controlling_gangs))
boutput(M, SPAN_ALERT("You can't place your base in another gang's turf!"))
return FALSE
for (var/obj/ganglocker/locker in range(1.5*GANG_TAG_INFLUENCE, T))
if(!IN_EUCLIDEAN_RANGE(locker, T, 1.5*GANG_TAG_INFLUENCE)) continue
for (var/obj/ganglocker/locker in range(2*GANG_TAG_INFLUENCE, T))
if(!IN_EUCLIDEAN_RANGE(locker, T, 2*GANG_TAG_INFLUENCE)) continue
boutput(M, SPAN_ALERT("You can't place your base so close to another gang's locker!"))
return FALSE

Expand Down Expand Up @@ -272,5 +272,76 @@
antag_role.gang.locker = locker

M.abilityHolder.removeAbility(/datum/targetable/gang/set_gang_base)

var/datum/targetable/gang/move_gang_base/newAbil = M.abilityHolder.addAbility(/datum/targetable/gang/move_gang_base)
newAbil.doCooldown()
return



/datum/targetable/gang/move_gang_base
TDHooligan marked this conversation as resolved.
Show resolved Hide resolved
name = "Migrate Gang Base"
desc = "Moves your locker to another area inside your gang's territory."
icon_state = "reset-gang-base"
targeted = 0
can_cast_anytime = 1
cooldown = 15 MINUTES

proc/check_valid(mob/M, area/targetArea)
if(!istype(targetArea, /area/station))
boutput(M, SPAN_ALERT("You can only set your gang's base on the station."))
return FALSE

if(M.stat)
boutput(M, SPAN_ALERT("Not when you're incapacitated."))
return FALSE
var/datum/gang/userGang = M.get_gang()
//stop people setting up a locker they can't place
var/turf/T = get_turf(M)
if (!T.controlling_gangs || !T.controlling_gangs[userGang])
boutput(M, SPAN_ALERT("You can only move your base to your turf!"))
return FALSE
if (T.controlling_gangs && (length(T.controlling_gangs) > 1))
boutput(M, SPAN_ALERT("You can't place your base in contested turf!"))
return FALSE
for (var/obj/ganglocker/locker in range(2*GANG_TAG_INFLUENCE, T))
if(locker == userGang.locker || !IN_EUCLIDEAN_RANGE(locker, T, 2*GANG_TAG_INFLUENCE)) continue
boutput(M, SPAN_ALERT("You can't place your base so close to another gang's locker!"))
return FALSE

if((targetArea.teleport_blocked) || istype(targetArea, /area/supply) || istype(targetArea, /area/shuttle/))
boutput(M, SPAN_ALERT("You can't place your base here!"))
return FALSE
return TRUE

cast()
..()
var/mob/M = holder.owner
var/area/area = get_area(M)

if (!check_valid(M, area))
return CAST_ATTEMPT_FAIL_NO_COOLDOWN
var/datum/antagonist/gang_leader/antag_role = M.mind.get_antagonist(ROLE_GANG_LEADER)
if (!antag_role)
return CAST_ATTEMPT_FAIL_NO_COOLDOWN

if (!check_valid(M, area))
return CAST_ATTEMPT_FAIL_NO_COOLDOWN

var/result = tgui_alert(M, "Are you sure you want to move your locker here?", "Move Gang Base", list("Yes", "No"), 30 SECONDS)
if (result != "Yes")
return CAST_ATTEMPT_FAIL_NO_COOLDOWN
for(var/datum/mind/member in antag_role.gang.members)
boutput(member.current, SPAN_ALERT("Your gang's base has been moved to \the [area]!"))

var/obj/ganglocker/locker = antag_role.gang.locker
if (!locker) //just in case some Wicked Loser has managed to find out a locker-deleting exploit or something
locker = new /obj/ganglocker(get_turf(M))
locker.set_gang(antag_role.gang)
antag_role.gang.locker = locker
else
antag_role.gang.unclaim_tiles(locker.loc, GANG_TAG_INFLUENCE_LOCKER, GANG_TAG_SIGHT_RANGE_LOCKER)
locker.set_loc(get_turf(M))
antag_role.gang.claim_tiles(locker.loc, GANG_TAG_INFLUENCE_LOCKER, GANG_TAG_SIGHT_RANGE_LOCKER)


return CAST_ATTEMPT_SUCCESS
Binary file modified icons/mob/gang_abilities.dmi
Binary file not shown.
Loading