diff --git a/scripts/scr_specialist_training/scr_specialist_training.gml b/scripts/scr_specialist_training/scr_specialist_training.gml index a2375806e..4ebc26ac4 100644 --- a/scripts/scr_specialist_training/scr_specialist_training.gml +++ b/scripts/scr_specialist_training/scr_specialist_training.gml @@ -73,20 +73,7 @@ function apothecary_training(){ if (apothecary_recruit_points>=48){ if (recruit_count>0){ - var _data = spec_train_data[3]; - var marine_company=0; - var random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); + random_marine=scr_random_marine(novice_type,0); // show_message(marine_position); // show_message(obj_ini.role[0,marine_position]); if (random_marine != "none"){ @@ -122,7 +109,20 @@ function apothecary_training(){ apothecary_recruit_points=0; } }else if (apothecary_recruit_points>=4) and (recruit_count==0){ - random_marine=scr_random_marine([obj_ini.role[100][8],obj_ini.role[100][18],obj_ini.role[100][10],obj_ini.role[100][9]],60,{"stat":[["technology", 30, "more"],["intelligence", 45, "more"]]}); + var _data = spec_train_data[3]; + var marine_company=0; + var random_marine=scr_random_marine( + [ + obj_ini.role[100][8], + obj_ini.role[100][18], + obj_ini.role[100][10], + obj_ini.role[100][9] + ], + _data.min_exp, + { + "stat":_data.req + } + ); if (random_marine != "none"){ marine_position=random_marine[1]; @@ -320,20 +320,7 @@ function techmarine_training(){ if (tech_points>=360){ if (recruit_count>0){ - var _data = spec_train_data[0]; - var marine_company=0; - var random_marine=scr_random_marine( - [ - obj_ini.role[100][8], - obj_ini.role[100][18], - obj_ini.role[100][10], - obj_ini.role[100][9] - ], - _data.min_exp, - { - "stat":_data.req - } - ); + random_marine=scr_random_marine(novice_type,0); if (random_marine != "none"){ unit = fetch_unit(random_marine) tech_points-=360; @@ -345,7 +332,7 @@ function techmarine_training(){ r=0; unit.religion="cult_mechanicus"; unit.add_trait("mars_trained"); - scr_alert("green",$"recruitment {unit.name()} returns from Mars, a "+unit.role()+".",0,0); + scr_alert("green","recruitment",$"{unit.name()} returns from Mars, a {unit.role()}.",0,0); warn=""; if (unit.update_weapon_one(obj_ini.wep1[100,16]) == "no_items"){ @@ -430,4 +417,4 @@ function techmarine_training(){ } } } -} \ No newline at end of file +}