diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 2ddcb0e55..02a8506ad 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -173,7 +173,6 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon9.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -184,6 +183,7 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy6.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"instructions.txt","CopyToMask":9223372036854775807,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol2.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",}, @@ -396,10 +396,10 @@ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"eldar.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"genestealercult.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"hulk.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, - {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, + {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"sector.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"space_marine.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"star.json","CopyToMask":-1,"filePath":"datafiles/main/names",}, @@ -1443,6 +1443,6 @@ ], "templateType": null, "TextureGroups": [ - {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,}, ], } \ No newline at end of file diff --git a/objects/obj_creation/Draw_0.gml b/objects/obj_creation/Draw_0.gml index 2455f6ac0..1b5384e2a 100644 --- a/objects/obj_creation/Draw_0.gml +++ b/objects/obj_creation/Draw_0.gml @@ -1266,31 +1266,31 @@ if (slide=3){ var trial_data = scr_trial_data(); var current_trial = trial_data[aspirant_trial]; - draw_text_transformed(80,180,"Aspirant Trial",0.6,0.6,0); - draw_text_transformed(110,210,current_trial.name,0.5,0.5,0); + draw_text_transformed(80,80,"Aspirant Trial",0.6,0.6,0) + draw_text_transformed(10,130,current_trial.name,0.5,0.5,0); var asp_info; asp_info = scr_compile_trial_bonus_string(current_trial); - draw_text_ext_transformed(100,244,asp_info,64,950,0.5,0.5,0); + draw_text_ext_transformed(10,160,asp_info,64,750,0.5,0.5,0); - if (scr_hit(50,480,950,510)){ + if (scr_hit(80,80,80 + string_width("Aspirant Trial"), 80 + string_height("Aspirant Trial"))){ tooltip="Aspirant Trial"; tooltip2="A special challenge is needed for Aspirants to be judged worthy of becoming Astartes. After completing the Trial they then become a Neophyte, beginning implantation and training (This can be changed once in game but the chosen trial here will effect the spawn characteristics of your starting marines)."; } if (custom>1){ - draw_sprite_stretched(spr_creation_arrow,0,00,200,32,32); - if (point_and_click([00,200,00+32,200+32]) and (cooldown<=0)){ + draw_sprite_stretched(spr_creation_arrow,0,00,80,32,32); + if (point_and_click([00,80,00+32,80+32]) and (cooldown<=0)){ var onceh=0;cooldown=8000; aspirant_trial++; if (aspirant_trial>=array_length(trial_data)){ aspirant_trial=0 } } - draw_sprite_stretched(spr_creation_arrow,1,38,200,32,32); + draw_sprite_stretched(spr_creation_arrow,1,38,80,32,32); - if (point_and_click([38,200,38+32,200+32]) and (mouse_left>=1) and (cooldown<=0)){ + if (point_and_click([38,80,38+32,80+32]) and (mouse_left>=1) and (cooldown<=0)){ var onceh=0;cooldown=8000; aspirant_trial--; if (aspirant_trial<0){ diff --git a/scripts/scr_recruit_data/scr_recruit_data.gml b/scripts/scr_recruit_data/scr_recruit_data.gml index c87d99f4e..dca1cf742 100644 --- a/scripts/scr_recruit_data/scr_recruit_data.gml +++ b/scripts/scr_recruit_data/scr_recruit_data.gml @@ -400,7 +400,7 @@ function scr_compile_trial_bonus_string(trial_data){ } if (struct_exists(trial_data,"train_time")){ var train_time_data = trial_data.train_time; - bonus_string+=$"years training : {train_time_string(train_time_data.base)}\n"; + bonus_string+=$"Years training : {train_time_string(train_time_data.base)}\n"; if (struct_exists(train_time_data, "planets")){ var planets = struct_get_names(train_time_data.planets); for (var i=0;i