Skip to content

feat: Armour textures and efficiency improvements #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OH296 merged 5 commits into from
Mar 13, 2025
Merged

feat: Armour textures and efficiency improvements #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4589e9d
new shading bits
OH296 Mar 8, 2025
637cbf1
solve hands banner
OH296 Mar 9, 2025
a627018
texture to armour attempt
OH296 Mar 10, 2025
661a49f
stable and working textures
OH296 Mar 13, 2025
2aa2668
tweaks and errors
OH296 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ChapterMaster.yyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"dark_angels","folderPath":"folders/Sprites/Marine Viewer/helms/dark_angels.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"sergeant","folderPath":"folders/Sprites/Marine Viewer/helms/sergeant.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"packs","folderPath":"folders/Sprites/Marine Viewer/packs.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"textures","folderPath":"folders/Sprites/Marine Viewer/textures.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"unused","folderPath":"folders/Sprites/Marine Viewer/unused.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons_terminator","folderPath":"folders/Sprites/Marine Viewer/weapons_terminator.yy",},
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"weapons","folderPath":"folders/Sprites/Marine Viewer/weapons.yy",},
Expand All @@ -112,7 +113,6 @@
{"resourceType":"GMFolder","resourceVersion":"1.0","name":"Timelines","folderPath":"folders/Timelines.yy",},
],
"IncludedFiles": [
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.md","CopyToMask":-1,"filePath":"datafiles",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"traits.json","CopyToMask":-1,"filePath":"datafiles/data",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"custom_icons_help.txt","CopyToMask":153157610357391598,"filePath":"datafiles/icons",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/images/advisor/splash",},
Expand Down Expand Up @@ -190,6 +190,7 @@
{"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",},
Expand All @@ -200,7 +201,6 @@
{"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":"1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy/icons",},
Expand Down Expand Up @@ -455,10 +455,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.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":"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":"ork.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",},
Expand All @@ -483,6 +483,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"README.md","CopyToMask":-1,"filePath":"datafiles",},
],
"isEcma": false,
"LibraryEmitters": [],
Expand Down Expand Up @@ -783,6 +784,7 @@
{"id":{"name":"spr_mk6_mongol_chest_variants","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},},
{"id":{"name":"spr_maximus_colors2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},},
{"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},},
{"id":{"name":"spr_hazzard_texture","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},},
{"id":{"name":"spr_diplomacy_dae","path":"sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy",},},
{"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},},
{"id":{"name":"spr_mk4_left_arm","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},},
Expand Down Expand Up @@ -853,7 +855,6 @@
{"id":{"name":"spr_mk5_colors","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},},
{"id":{"name":"spr_chaplain_term_helm","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},},
{"id":{"name":"spr_ship_slam","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},},
{"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},
{"id":{"name":"spr_ship_hulk","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},},
{"id":{"name":"spr_fighta","path":"sprites/spr_fighta/spr_fighta.yy",},},
{"id":{"name":"spr_weapon_comgrav","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},},
Expand All @@ -863,6 +864,7 @@
{"id":{"name":"spr_mk7_colors","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},},
{"id":{"name":"spr_mk4_colors","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},},
{"id":{"name":"spr_mk4_mongol_chest_variants","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},},
{"id":{"name":"spr_helm_stripe_term","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},},
{"id":{"name":"spr_ship_shadow","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},},
{"id":{"name":"spr_mk4_complex_backpack","path":"sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy",},},
{"id":{"name":"spr_ws_mk5_helm","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},},
Expand All @@ -874,6 +876,7 @@
{"id":{"name":"spr_ultra_right_shoulder_hanging","path":"sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy",},},
{"id":{"name":"spr_ship_custodian","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},},
{"id":{"name":"spr_ship_protector","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},},
{"id":{"name":"armour_texture","path":"shaders/armour_texture/armour_texture.yy",},},
{"id":{"name":"spr_ship_emissary","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},},
{"id":{"name":"spr_ship_warden","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},},
{"id":{"name":"spr_ballistic_skill_icon","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},},
Expand Down Expand Up @@ -957,6 +960,7 @@
{"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},},
{"id":{"name":"spr_ground_las","path":"sprites/spr_ground_las/spr_ground_las.yy",},},
{"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},},
{"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},},
{"id":{"name":"spr_green_las","path":"sprites/spr_green_las/spr_green_las.yy",},},
{"id":{"name":"spr_ground_conv","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},},
{"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},},
Expand Down Expand Up @@ -1185,6 +1189,7 @@
{"id":{"name":"spr_p_name_bg","path":"sprites/spr_p_name_bg/spr_p_name_bg.yy",},},
{"id":{"name":"scr_company_load","path":"scripts/scr_company_load/scr_company_load.yy",},},
{"id":{"name":"spr_ba_mk6_helm","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},},
{"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},},
{"id":{"name":"scr_load_all","path":"scripts/scr_load_all/scr_load_all.yy",},},
{"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},},
{"id":{"name":"spr_bionic_leg_left","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},},
Expand Down Expand Up @@ -1319,6 +1324,7 @@
{"id":{"name":"scr_add_stc_fragment","path":"scripts/scr_add_stc_fragment/scr_add_stc_fragment.yy",},},
{"id":{"name":"action_another_room","path":"scripts/action_another_room/action_another_room.yy",},},
{"id":{"name":"spr_tartaros_head_variants","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},},
{"id":{"name":"spr_checker_texture","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},},
{"id":{"name":"action_color","path":"scripts/action_color/action_color.yy",},},
{"id":{"name":"action_draw_ellipse","path":"scripts/action_draw_ellipse/action_draw_ellipse.yy",},},
{"id":{"name":"action_if_number","path":"scripts/action_if_number/action_if_number.yy",},},
Expand Down Expand Up @@ -1624,6 +1630,6 @@
],
"templateType": null,
"TextureGroups": [
{"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,},
{"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,},
],
}
Binary file modified fonts/fnt_menu/fnt_menu.old.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/fnt_menu/fnt_menu.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions objects/obj_controller/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@

The Machine God watches over you.
*/
marine_surface = surface_create(600, 600);
scr_colors_initialize();
is_test_map=false;
target_navy_number=5;
Expand Down
3 changes: 2 additions & 1 deletion objects/obj_controller/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,10 @@ if (menu==1 && (managing>0 || managing<0)){
try{
temp[121].destroy_image();
}
delete temp[121];
}
temp[121] = unit.draw_unit_image();
show_debug_message("calc growth stats")

temp[122] = unit.handle_stat_growth();
/*if (man[sel]="vehicle"){
// TODO
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_creation/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ successor_y = 250;
custom_y = 463;
/// y coord of Other section heading
other_y = 593;

marine_surface = surface_create(600, 600);
var show_debug = false;
if(show_debug){
show_debug_overlay(true);
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_pnunit/Alarm_5.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if (obj_ncombat.defeat == 0) {

if (obj_controller.stc_bonus[3] = 4) {
_survival_roll = 80 + _vehicles_priority[$ veh_type[i]];
_dice_roll = irandom(1, 100);
_dice_roll = irandom_range(1, 100);
if (_dice_roll > _survival_roll) && (veh_dead[i] != 2) {
veh_hp[i] = 10;
veh_dead[i] = 0;
Expand Down
Loading