Skip to content

Commit 976c6a2

Browse files
fix: Homeworld and recruiting world names mixing up (Adeptus-Dominus#465)
1 parent e94211b commit 976c6a2

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

scripts/scr_system_spawn_functions/scr_system_spawn_functions.gml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function player_home_star(home_planet){
9393

9494
function set_player_recruit_planet(recruit_planet){
9595
p_type[recruit_planet]=obj_ini.recruiting_type;
96-
if (obj_ini.recruit_relative_loc==2 || obj_ini.fleet_type!=ePlayerBase.home_world){
96+
if (obj_ini.fleet_type==ePlayerBase.home_world && obj_ini.recruit_relative_loc==2){ // Possibly a temporary fix, Fleet-based Chapters use Homeworld names for the Recruiting stars for some reason
9797
var recruit_name = obj_ini.recruiting_name;
9898
if (recruit_name!="random"){
9999
array_push(global.name_generator.star_used_names, recruit_name);
@@ -102,6 +102,14 @@ function set_player_recruit_planet(recruit_planet){
102102
}
103103
name=recruit_name;
104104
}
105+
} else {
106+
if (obj_ini.home_name!="random"){
107+
array_push(global.name_generator.star_used_names, obj_ini.home_name);
108+
if (star_by_name(obj_ini.home_name) != "none" ){
109+
star_by_name(obj_ini.home_name).name = global.name_generator.generate_star_name();
110+
}
111+
name=obj_ini.home_name;
112+
}
105113
}
106114
array_push(p_feature[recruit_planet], new NewPlanetFeature(P_features.Recruiting_World));//recruiting world
107115
if (p_type[recruit_planet]=="random") then p_type[recruit_planet]=choose("Death","Temperate","Desert","Ice","Hive", "Fuedal");

0 commit comments

Comments
 (0)