Skip to content

Commit

Permalink
fix: Return trade ships home or delete them (Adeptus-Dominus#218)
Browse files Browse the repository at this point in the history
trade ships will now hopefully return home but if no valid location will just destroy and stop cluttering the map.
https://discord.com/channels/714022226810372107/1299419464907100280
  • Loading branch information
OH296 authored Dec 16, 2024
1 parent 280bba3 commit c9d1150
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions scripts/scr_fleet_functions/scr_fleet_functions.gml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ function scr_efleet_arrive_at_trade_loc(){
trade_goods="return";
if (target!=noone) then target=noone;

if (owner=eFACTION.Eldar){
if (owner==eFACTION.Eldar){
cur_star = nearest_star_with_ownership(xx,yy, eFACTION.Eldar);
if (cur_star!="none"){
cur_star=targ.x;
Expand All @@ -349,6 +349,9 @@ function scr_efleet_arrive_at_trade_loc(){
action="";

set_fleet_movement();
if (action_eta==0){
instance_destroy();
}
}
}
function scr_orbiting_fleet(faction){
Expand Down Expand Up @@ -443,7 +446,7 @@ function fleet_arrival_logic(){



if (trade_goods="return") and (action="move"){
if (trade_goods="return"){
// with(instance_nearest(x,y,obj_star)){present_fleets-=1;}
instance_destroy();
}
Expand Down

0 comments on commit c9d1150

Please sign in to comment.