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

Reverts the FLYBY change and baby-proofs the UI #4692

Closed
wants to merge 2 commits into from
Closed

Reverts the FLYBY change and baby-proofs the UI #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7e7202
Revert "changed flyby tgui (#4600)"
TheGamerdk Oct 15, 2023
96f32c2
Update DropshipFlightControl.tsx
TheGamerdk Oct 15, 2023
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
1 change: 0 additions & 1 deletion code/__DEFINES/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
#define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
#define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"

#define DROPSHIP_FLYBY_ID "special_flight"
#define DROPSHIP_LZ1 "dropship-lz1"
#define DROPSHIP_LZ2 "dropship-lz2"

Expand Down
32 changes: 11 additions & 21 deletions code/modules/shuttle/computers/dropship_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,13 @@
.["primary_lz"] = SSticker.mode.active_lz?.linked_lz
if(shuttle.destination)
.["target_destination"] = shuttle.in_flyby? "Flyby" : shuttle.destination.name
.["destinations"] = list()

.["door_status"] = is_remote ? list() : shuttle.get_door_data()

.["flight_configuration"] = is_set_flyby ? "flyby" : "ferry"
.["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)

.["destinations"] = list()
// add flight
.["destinations"] += list(
list(
"id" = DROPSHIP_FLYBY_ID,
"name" = "Flyby",
"available" = TRUE,
"error" = FALSE
)
)

for(var/obj/docking_port/stationary/dock in compatible_landing_zones)
var/dock_reserved = FALSE
for(var/obj/docking_port/mobile/other_shuttle in SSshuttle.mobile)
Expand Down Expand Up @@ -371,36 +362,35 @@
to_chat(usr, SPAN_WARNING("You can't move to a new destination right now."))
return TRUE

if(is_set_flyby && !skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT))
to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby."))
return FALSE
var/is_optimised = FALSE
// automatically apply optimisation if user is a pilot
if(skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT))
is_optimised = TRUE
update_equipment(is_optimised)
var/dock_id = params["target"]
if(dock_id == DROPSHIP_FLYBY_ID)
if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT))
to_chat(user, SPAN_WARNING("You don't have the skill to perform a flyby."))
return FALSE
if(is_set_flyby)
to_chat(user, SPAN_NOTICE("You begin the launch sequence for a flyby."))
link.log_ares_flight(user.name, "Launched Dropship [shuttle.name] on a flyby.")
var/log = "[key_name(user)] launched the dropship [src.shuttleId] on flyby."
msg_admin_niche(log)
log_interact(user, msg = "[log]")
shuttle.send_for_flyby()
return TRUE

var/dockId = params["target"]
var/list/local_data = ui_data(user)
var/found = FALSE
playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1)
for(var/destination in local_data["destinations"])
if(destination["id"] == dock_id)
if(destination["id"] == dockId)
found = TRUE
break
if(!found)
log_admin("[key_name(user)] may be attempting a href dock exploit on [src] with target location \"[dock_id]\"")
to_chat(user, SPAN_WARNING("The [dock_id] dock is not available at this time."))
log_admin("[key_name(user)] may be attempting a href dock exploit on [src] with target location \"[dockId]\"")
to_chat(user, SPAN_WARNING("The [dockId] dock is not available at this time."))
return
var/obj/docking_port/stationary/dock = SSshuttle.getDock(dock_id)
var/obj/docking_port/stationary/dock = SSshuttle.getDock(dockId)
var/dock_reserved = FALSE
for(var/obj/docking_port/mobile/other_shuttle in SSshuttle.mobile)
if(dock == other_shuttle.destination)
Expand Down
32 changes: 16 additions & 16 deletions tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ export const DropshipDestinationSelection = (_, context) => {
selected={siteselection}
onClick={(value) => {
setSiteSelection(value);
if (data.flight_configuration === 'flyby') {
act('set-ferry');
}
act('button-push');
}}
/>
Expand Down Expand Up @@ -190,27 +193,20 @@ const FlybyControl = (props, context) => {
className="flybyControl"
buttons={
<>
{data.flight_configuration === 'flyby' && (
<Button icon="road" onClick={() => act('set-ferry')}>
Set ferry
</Button>
)}
{data.has_flyby_skill === 1 && data.flight_configuration === 'ferry' && (
<Button icon="jet-fighter" onClick={() => act('set-flyby')}>
Set flyby
{data.has_flyby_skill === 1 && data.shuttle_mode === 'idle' && (
<Button
color="red"
icon="jet-fighter"
onClick={() => {
act('set-flyby');
act('move', { target: null });
}}>
Launch Flyby
</Button>
)}
{data.has_flyby_skill === 1 && data.shuttle_mode === 'called' && (
<Button onClick={() => act('cancel-flyby')}>cancel flyby</Button>
)}
{data.has_flyby_skill === 1 && data.shuttle_mode === 'idle' && (
<Button
icon="rocket"
disabled={data.flight_configuration === 'ferry'}
onClick={() => act('move')}>
Launch
</Button>
)}
</>
}
/>
Expand Down Expand Up @@ -317,6 +313,10 @@ const RenderScreen = (props, context) => {
return (
<>
{data.can_set_automated === 1 && <AutopilotConfig />}
{data.can_fly_by === 1 &&
(data.shuttle_mode === 'idle' || data.shuttle_mode === 'called') && (
<FlybyControl />
)}
{data.shuttle_mode === 'idle' && <DropshipDestinationSelection />}
{data.shuttle_mode === 'igniting' && <LaunchCountdown />}
{data.shuttle_mode === 'pre-arrival' && <TouchdownCooldown />}
Expand Down
Loading