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

Fm timeing changes #6097

Merged
merged 12 commits into from
May 1, 2024
Merged

Fm timeing changes #6097

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
091a285
notworking status
uuuuhuuuu Feb 10, 2024
4849e16
makes it work right
uuuuhuuuu Feb 10, 2024
e84db44
looks finished, might not be
uuuuhuuuu Feb 10, 2024
0be437d
number changes
uuuuhuuuu Mar 29, 2024
e412db3
var fix
uuuuhuuuu Apr 30, 2024
7ab98fc
Update code/game/cas_manager/datums/cas_fire_envelope.dm
cuberound Apr 30, 2024
c6309c7
Update code/game/cas_manager/datums/cas_fire_envelope.dm
cuberound Apr 30, 2024
9d116b9
Update code/game/cas_manager/datums/cas_fire_envelope.dm
cuberound Apr 30, 2024
31e5203
Update code/game/cas_manager/datums/cas_fire_mission.dm
cuberound Apr 30, 2024
42ebc57
refactors the warnings
uuuuhuuuu Apr 30, 2024
40da469
Merge branch 'master' into FM-timeing-changes
cuberound Apr 30, 2024
6dfbc76
Update autodoc comments
Drulikar May 1, 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
106 changes: 75 additions & 31 deletions code/game/cas_manager/datums/cas_fire_envelope.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
var/list/datum/cas_fire_mission/missions
var/fire_length
var/grace_period //how much time you have after initiating fire mission and before you can't change firemissions
var/flyto_period //how much time it takes from sound alarm start to first hit. CAS is vulnerable here
var/first_warning
var/second_warning
var/third_warning
var/execution_start
var/flyoff_period //how much time it takes after shots fired to get off the map. CAS is vulnerable here
var/cooldown_period //how much time you have to wait before new Fire Mission run
var/soundeffect //what sound effect to play
Expand Down Expand Up @@ -36,10 +39,6 @@
for(var/datum/cas_fire_mission/mission in missions)
.["missions"] += list(mission.ui_data(user))


/datum/cas_fire_envelope/proc/get_total_duration()
return grace_period+flyto_period+flyoff_period

/datum/cas_fire_envelope/proc/update_weapons(list/obj/structure/dropship_equipment/weapon/weapons)
for(var/datum/cas_fire_mission/mission in missions)
mission.update_weapons(weapons, fire_length)
Expand Down Expand Up @@ -245,11 +244,55 @@
/**
* Execute firemission.
*/
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
/datum/cas_fire_envelope/proc/play_sound(atom/target_turf)
stat = FIRE_MISSION_STATE_ON_TARGET
change_current_loc(target_turf)
playsound(target_turf, soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8)

/datum/cas_fire_envelope/proc/chat_warning(atom/target_turf, range = 10, warning_number = 1)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
var/ds_identifier = "LARGE BIRD"
var/fm_identifier = "SPIT FIRE"
var/relative_dir
for(var/mob/mob in range(15, target_turf))
if (mob.mob_flags & KNOWS_TECHNOLOGY)
ds_identifier = "DROPSHIP"
fm_identifier = "FIRE"
if(get_turf(mob) == target_turf)
relative_dir = 0
else
relative_dir = Get_Compass_Dir(mob, target_turf)
switch(warning_number)
if(1)
mob.show_message( \
SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!"),SHOW_MESSAGE_VISIBLE, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU!") , SHOW_MESSAGE_AUDIBLE \
)
if(2)
mob.show_message( \
SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
)
if(3)
mob.show_message( \
SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
)

/datum/cas_fire_envelope/proc/open_fire(atom/target_turf,datum/cas_fire_mission/mission,dir)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
stat = FIRE_MISSION_STATE_FIRING
mission.execute_firemission(linked_console, target_turf, dir, fire_length, step_delay, src)
stat = FIRE_MISSION_STATE_OFF_TARGET

/datum/cas_fire_envelope/proc/flyoff()
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
stat = FIRE_MISSION_STATE_COOLDOWN

/datum/cas_fire_envelope/proc/end_cooldown()
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
stat = FIRE_MISSION_STATE_IDLE


/datum/cas_fire_envelope/proc/execute_firemission_unsafe(datum/cas_signal/signal, turf/target_turf, dir, datum/cas_fire_mission/mission)
stat = FIRE_MISSION_STATE_IN_TRANSIT
to_chat(usr, SPAN_ALERT("Firemission underway!"))
sleep(grace_period)
stat = FIRE_MISSION_STATE_ON_TARGET
if(!target_turf)
stat = FIRE_MISSION_STATE_IDLE
mission_error = "Target Lost."
Expand All @@ -258,29 +301,27 @@
stat = FIRE_MISSION_STATE_IDLE
mission_error = "Target is off bounds or obstructed."
return
change_current_loc(target_turf)
playsound(source = target_turf, soundin = soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8)

for(var/mob/mob in range(15, target_turf))
var/ds_identifier = "LARGE BIRD"
var/fm_identifier = "SPIT FIRE"
if (mob.mob_flags & KNOWS_TECHNOLOGY)
ds_identifier = "DROPSHIP"
fm_identifier = "FIRE"
var/obj/effect/firemission_effect = new(target_turf)

mob.show_message( \
SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!"),SHOW_MESSAGE_VISIBLE, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU!") , SHOW_MESSAGE_AUDIBLE \
)
firemission_effect.icon = 'icons/obj/items/weapons/projectiles.dmi'
firemission_effect.icon_state = "laser_target2"
firemission_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
firemission_effect.invisibility = INVISIBILITY_MAXIMUM
QDEL_IN(firemission_effect, 12 SECONDS)

sleep(flyto_period)
stat = FIRE_MISSION_STATE_FIRING
mission.execute_firemission(linked_console, target_turf, dir, fire_length, step_delay, src)
stat = FIRE_MISSION_STATE_OFF_TARGET
sleep(flyoff_period)
stat = FIRE_MISSION_STATE_COOLDOWN
sleep(cooldown_period)
stat = FIRE_MISSION_STATE_IDLE

notify_ghosts(header = "CAS Fire Mission", message = "[usr ? usr : "Someone"] is launching Fire Mission '[mission.name]' at [get_area(target_turf)].", source = firemission_effect)
msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[mission.name]' at ([target_turf.x],[target_turf.y],[target_turf.z]) [ADMIN_JMP(target_turf)]")


addtimer(CALLBACK(src, PROC_REF(play_sound), target_turf), grace_period)
addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 15, 1), first_warning)
addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 15, 2), second_warning)
addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 10, 3), third_warning)
addtimer(CALLBACK(src, PROC_REF(open_fire), target_turf, mission,dir), execution_start)
addtimer(CALLBACK(src, PROC_REF(flyoff)), flyoff_period)
addtimer(CALLBACK(src, PROC_REF(end_cooldown)), cooldown_period)

/**
* Change attack vector for firemission
Expand Down Expand Up @@ -324,10 +365,13 @@

/datum/cas_fire_envelope/uscm_dropship
fire_length = 12
grace_period = 5 SECONDS
flyto_period = 4 SECONDS //sleep in the FM itself has been increased by one more second
flyoff_period = 5 SECONDS
cooldown_period = 10 SECONDS
grace_period = 5 SECONDS
first_warning = 6 SECONDS
second_warning = 8 SECONDS
third_warning = 9 SECONDS
execution_start = 10 SECONDS
flyoff_period = 15 SECONDS
cooldown_period = 25 SECONDS
soundeffect = 'sound/weapons/dropship_sonic_boom.ogg' //BOOM~WOOOOOSH~HSOOOOOW~BOOM
step_delay = 3
max_offset = 12
Expand Down
45 changes: 0 additions & 45 deletions code/game/cas_manager/datums/cas_fire_mission.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,51 +164,6 @@
if(initial_turf == null || check(linked_console) != FIRE_MISSION_ALL_GOOD)
return FIRE_MISSION_NOT_EXECUTABLE

var/obj/effect/firemission_effect = new(initial_turf)

firemission_effect.icon = 'icons/obj/items/weapons/projectiles.dmi'
firemission_effect.icon_state = "laser_target2"
firemission_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
firemission_effect.invisibility = INVISIBILITY_MAXIMUM
QDEL_IN(firemission_effect, 5 SECONDS)

notify_ghosts(header = "CAS Fire Mission", message = "[usr ? usr : "Someone"] is launching Fire Mission '[name]' at [get_area(initial_turf)].", source = firemission_effect)
msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[name]' at ([initial_turf.x],[initial_turf.y],[initial_turf.z]) [ADMIN_JMP(initial_turf)]")

var/relative_dir
for(var/mob/mob in range(15, initial_turf))
if(get_turf(mob) == initial_turf)
relative_dir = 0
else
relative_dir = Get_Compass_Dir(mob, initial_turf)

var/ds_identifier = "LARGE BIRD"
if (mob.mob_flags & KNOWS_TECHNOLOGY)
ds_identifier = "DROPSHIP"

mob.show_message( \
SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
)

// Xenos have time to react to the first message
sleep(1.5 SECONDS)

for(var/mob/mob in range(10, initial_turf))
if(get_turf(mob) == initial_turf)
relative_dir = 0
else
relative_dir = Get_Compass_Dir(mob, initial_turf)

var/ds_identifier = "LARGE BIRD"
if (mob.mob_flags & KNOWS_TECHNOLOGY)
ds_identifier = "DROPSHIP"

mob.show_message( \
SPAN_HIGHDANGER("A [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \
SPAN_HIGHDANGER("YOU HEAR SOMETHING FIRE [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 2 \
)

var/turf/current_turf = initial_turf
var/tally_step = steps / mission_length //how much shots we need before moving to next turf
var/next_step = tally_step //when we move to next turf
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/dropship_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL)
to_chat(user, SPAN_WARNING("Has to be in Fly By mode"))
return FALSE
if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.get_total_duration())
if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period)
to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission"))
return FALSE
var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc
Expand Down
Loading