Skip to content

fix: Rename variables and upgrade shield sprites to multipart #1155

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 3 commits into from
May 14, 2026
Merged

fix: Rename variables and upgrade shield sprites to multipart #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13d10e8
improvements to shields
OH296 Apr 29, 2026
95623c1
Merge remote-tracking branch 'adeptus/main' into weapon_sys_upgrades
OH296 May 14, 2026
255562f
fix left right draw issue
OH296 May 14, 2026
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
5 changes: 3 additions & 2 deletions ChapterMaster.yyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,8 +1836,9 @@
{"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},},
{"id":{"name":"spr_weapon_standard","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},},
{"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},},
{"id":{"name":"spr_weapon_storm_tall_2","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},},
{"id":{"name":"spr_weapon_storm_tall","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},},
{"id":{"name":"spr_weapon_storm_boss","path":"sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy",},},
{"id":{"name":"spr_weapon_storm_complex","path":"sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy",},},
{"id":{"name":"spr_weapon_storm_primary_decoration","path":"sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy",},},
{"id":{"name":"spr_weapon_storm","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},},
{"id":{"name":"spr_weapon_storm2","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},},
{"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},},
Expand Down
10 changes: 5 additions & 5 deletions scripts/scr_ComplexSet/scr_ComplexSet.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ function ComplexSet(_unit) constructor {

// // Draw weapons

if (!weapon_right.new_weapon_draw) {
if (!weapon_right.single_left_right_profile) {
if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) {
if ((weapon_right.ui_twoh == false && weapon_left.ui_twoh == false) || weapon_right.ui_twoh == true) {
draw_weapon(weapon_right, "right_weapon", 0);
Expand All @@ -920,7 +920,7 @@ function ComplexSet(_unit) constructor {
}
}

if (!weapon_left.new_weapon_draw) {
if (!weapon_left.single_left_right_profile) {
if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite) && (weapon_right.ui_twoh == false)) {
draw_weapon(weapon_left, "left_weapon", 1);
}
Expand Down Expand Up @@ -991,7 +991,7 @@ function ComplexSet(_unit) constructor {
},
"melee_twohand": {
ui_spec: true,
new_weapon_draw: true,
single_left_right_profile: true,
hand_type: 2,
hand_on_top: true,
},
Expand Down Expand Up @@ -1046,7 +1046,7 @@ function ComplexSet(_unit) constructor {
"hand_type",
"arm_type",
"ui_weapon",
"new_weapon_draw",
"single_left_right_profile",
"ui_twoh",
"ui_spec",
"sprite",
Expand All @@ -1060,7 +1060,7 @@ function ComplexSet(_unit) constructor {
if (armour_type == eARMOUR_TYPE.TERMINATOR && !array_contains(["terminator_ranged", "terminator_melee", "terminator_fist"], _arm.display_type)) {
_arm.ui_ymod -= 20;
if (_arm.display_type == "normal_ranged") {
if (_arm.new_weapon_draw) {
if (_arm.single_left_right_profile) {
_arm.ui_xmod += 24;
} else {
_arm.ui_xmod -= 24;
Expand Down
Loading
Loading