Skip to content

Commit 792e0a4

Browse files
authored
fix: Issue wrong spawn name would spawn for home planet (Adeptus-Dominus#460)
1 parent 38c150b commit 792e0a4

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

objects/obj_controller/Alarm_1.gml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,9 @@ if (did){
6262
add_ship_to_fleet(f, fleet);
6363
}
6464

65-
var ii=0;
66-
ii+=fleet.capital_number;
67-
ii+=round((fleet.frigate_number/2));
68-
ii+=round((fleet.escort_number/4));
69-
if (ii<=1) then ii=1;
70-
fleet.image_index=ii;
65+
with (fleet){
66+
set_player_fleet_image();
67+
}
7168

7269
if (obj_ini.load_to_ships[0]>0){
7370
scr_start_load(fleet,_current_system,obj_ini.load_to_ships);
@@ -92,7 +89,8 @@ if (did){
9289

9390
_current_system=instance_nearest(px,py,obj_star);
9491
_current_system.star="white2";
95-
_current_system.planet[1]=1;_current_system.planet[2]=1;
92+
_current_system.planet[1]=1;
93+
_current_system.planet[2]=1;
9694
_current_system.image_index=4;
9795
_current_system.p_type[1]="Forge";
9896
_current_system.p_type[2]="Ice";

scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ function find_player_spawn_star(){
5252
}
5353
name=obj_ini.recruiting_name;
5454
}*/
55+
5556
function player_home_star(home_planet){
5657

5758
p_type[home_planet]=obj_ini.home_type;
@@ -92,14 +93,16 @@ function player_home_star(home_planet){
9293

9394
function set_player_recruit_planet(recruit_planet){
9495
p_type[recruit_planet]=obj_ini.recruiting_type;
95-
var recruit_name = obj_ini.recruiting_name;
96-
if (recruit_name!="random"){
97-
array_push(global.name_generator.star_used_names, recruit_name);
98-
if (star_by_name(recruit_name) != "none" ){
99-
star_by_name(recruit_name).name = global.name_generator.generate_star_name();
100-
}
101-
name=recruit_name;
102-
}
96+
if (obj_ini.recruit_relative_loc==2 || obj_ini.fleet_type!=ePlayerBase.home_world){
97+
var recruit_name = obj_ini.recruiting_name;
98+
if (recruit_name!="random"){
99+
array_push(global.name_generator.star_used_names, recruit_name);
100+
if (star_by_name(recruit_name) != "none" ){
101+
star_by_name(recruit_name).name = global.name_generator.generate_star_name();
102+
}
103+
name=recruit_name;
104+
}
105+
}
103106
array_push(p_feature[recruit_planet], new NewPlanetFeature(P_features.Recruiting_World));//recruiting world
104107
if (p_type[recruit_planet]=="random") then p_type[recruit_planet]=choose("Death","Temperate","Desert","Ice","Hive", "Fuedal");
105108
if (global.chapter_name!="Lamenters") then obj_controller.recruiting_worlds+=string(name)+" II|";

0 commit comments

Comments
 (0)