Skip to content

refactor: Fixing some misc bugs. #1307

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
EttyKitty merged 6 commits into from
Jul 8, 2026
Merged

refactor: Fixing some misc bugs. #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe2c797
refactor: Global variables should be delcared at start.
carys-the-weed-cloud Jul 7, 2026
cf5de26
refactor: Cleanup combat code.
carys-the-weed-cloud Jul 7, 2026
e48e097
fix: Ensure the enemy exists before fighting it.
carys-the-weed-cloud Jul 7, 2026
baa7fe8
refactor: Cleanup Allied ship code.
carys-the-weed-cloud Jul 8, 2026
a65e7c1
fix: Misc scr_culture_cisuals corrections.
carys-the-weed-cloud Jul 8, 2026
93520a7
refactor: Enforce enemy existence during combat.
carys-the-weed-cloud Jul 8, 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
1 change: 1 addition & 0 deletions objects/obj_al_ship/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class = "";
hp = 0;
maxhp = 0;
conditions = "";
owner = eFACTION.IMPERIUM;
shields = 1;
maxshields = 1;
armour_front = 0;
Expand Down
138 changes: 39 additions & 99 deletions objects/obj_al_ship/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,46 @@
// Manages space combat, checks if ships are destroyed and does the targeting and pointing of the ship
image_angle = direction;

var bull, ok, targe = 0, rdir = 0, dist = 9999, xx = x, yy = y;
var front = 0, right = 0, left = 0, rear = 0;
var f = 0, facing = "", ammo = 0, range = 0, wep = "", dam = 0;
var o_dist = 0, spid = 0;
var gud = 0;
if (obj_fleet.start != 5) {
exit;
}
// Need to every couple of seconds check this
// with obj_en_ship if not big then disable, check nearest, and activate once more
if (instance_exists(obj_en_ship)) {
target = instance_nearest(x, y, obj_en_ship);
}
if (!instance_exists(target)) {
Comment thread
carys-the-weed-cloud marked this conversation as resolved.
exit;
}

if (owner != 6) {
image_angle = direction;
if ((shields > 0) && (shields < maxshields)) {
shields += (owner == eFACTION.ELDAR) ? 0.03 : 0.02;
}

if (obj_fleet.start != 5) {
exit;
}
var bull = noone;
var ok = 0;
var targe = noone;
var dist = 9999;
var front = 0;
var right = 0;
var left = 0;
var rear = 0;
var facing = "";
var ammo = 0;
var range = 0;
var wep = "";
var dam = 0;
var o_dist = 0;
var spid = 0;
var gud = 0;

if (owner != eFACTION.ELDAR) {
if ((class == "Daemon") && (image_alpha < 1)) {
image_alpha += 0.006;
}

o_dist = 0;
spid = 0;

if ((shields > 0) && (shields < maxshields)) {
shields += 0.02;
}

// Need to every couple of seconds check this
// with obj_en_ship if not big then disable, check nearest, and activate once more
if (instance_exists(obj_en_ship)) {
target = instance_nearest(x, y, obj_en_ship);
}
if (!instance_exists(target)) {
exit;
}
// Check if ship is destroyed
if (hp <= 0) {
gud = 0;
for (var wh = 1; wh <= 5; wh++) {
if (obj_fleet.enemy[wh] == owner) {
gud = wh;
Expand Down Expand Up @@ -161,10 +167,10 @@ if (owner != 6) {

dist = point_distance(x, y, target.x, target.y) - max(sprite_get_width(sprite_index), sprite_get_height(sprite_index));
// For example here we could improve the options and how ships beheave...
if ((target != 0) && (action == "attack")) {
if ((target != noone) && (action == "attack")) {
direction = turn_towards_point(direction, x, y, target.x, target.y, 0.1);
}
if ((target != 0) && (action == "broadside") && (dist > o_dist)) {
if ((target != noone) && (action == "broadside") && (dist > o_dist)) {
if (y >= target.y) {
dist = point_distance(x, y, target.x + lengthdir_x(64, target.direction - 180), target.y + lengthdir_y(128, target.direction - 90)) - max(sprite_get_width(sprite_index), sprite_get_height(sprite_index));
}
Expand Down Expand Up @@ -223,11 +229,7 @@ if (owner != 6) {
turret_cool -= 1;
}

targe = 0;
rdir = 0;
dist = 9999;
xx = x;
yy = y;
// Turret targetting
if ((turrets > 0) && instance_exists(obj_en_in) && (turret_cool == 0)) {
targe = instance_nearest(x, y, obj_en_in);
Expand All @@ -248,41 +250,29 @@ if (owner != 6) {
bull.direction += choose(random(10), 1 * -random(10));
}
}
targe = 0;
dist = 9999;
xx = lengthdir_x(64, direction + 90);
yy = lengthdir_y(64, direction + 90);

// TODO we could implement facing with stronger shields or other stuff
front = 0;
right = 0;
left = 0;
rear = 0;

targe = instance_nearest(xx, yy, obj_en_ship);
rdir = point_direction(x, y, target.x, target.y);
target_l = instance_nearest(x + lengthdir_x(64, direction + 90), y + lengthdir_y(64, direction + 90), obj_en_ship);
target_r = instance_nearest(x + lengthdir_x(64, direction + 270), y + lengthdir_y(64, direction + 270), obj_en_ship);

if (collision_line(x, y, x + lengthdir_x(2000, direction), y + lengthdir_y(2000, direction), obj_en_ship, 0, 1)) {
front = 1;
}

f = 0;
facing = "";
ammo = 0;
range = 0;
wep = "";
dam = 0;

for (var gg = 1; gg <= weapons; gg++) {
// Resets
ok = 0;
f += 1;
facing = "";
ammo = 0;
range = 0;
wep = "";
dam = 0;
Comment thread
carys-the-weed-cloud marked this conversation as resolved.

if ((cooldown[gg] <= 0) && (weapon[gg] != "") && (weapon_ammo[gg] > 0)) {
ok = 1;
Expand All @@ -293,7 +283,6 @@ if (owner != 6) {
range = weapon_range[gg];
}

targe = target;
if ((facing == "front") && (front == 1)) {
ok = 2;
}
Expand All @@ -303,10 +292,7 @@ if (owner != 6) {
if (facing == "special") {
ok = 2;
}
if (!instance_exists(targe)) {
exit;
}
dist = point_distance(x, y, targe.x, targe.y);
dist = point_distance(x, y, target.x, target.y);
if ((facing == "right") && (point_direction(x, y, target_r.x, target_r.y) < 337) && (point_direction(x, y, target_r.x, target_r.y) > 203)) {
ok = 2;
}
Expand All @@ -330,9 +316,6 @@ if (owner != 6) {
bull = instance_create(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), obj_al_round);
bull.speed = 20;
bull.dam = dam;
if (targe == target) {
bull.direction = point_direction(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), target.x, target.y);
}
if (facing != "front") {
bull.direction = point_direction(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), target.x, target.y);
}
Expand Down Expand Up @@ -432,27 +415,8 @@ if (owner != 6) {
}
}
// Checks if the enemy fleet is Eldar
if (owner == 6) {
image_angle = direction;

if (obj_fleet.start != 5) {
exit;
}

o_dist = 0;
spid = 0;

if ((shields > 0) && (shields < maxshields)) {
shields += 0.03;
}
// Need to every couple of seconds check this
// with obj_en_ship if not big then disable, check nearest, and activate once more
if (instance_exists(obj_en_ship)) {
target = instance_nearest(x, y, obj_en_ship);
}

if (owner == eFACTION.ELDAR) {
if (hp <= 0) {
gud = 0;
for (var wh = 1; wh <= 5; wh++) {
if (obj_fleet.enemy[wh] == owner) {
gud = wh;
Expand Down Expand Up @@ -544,10 +508,7 @@ if (owner == 6) {
turret_cool -= 1;
}

targe = 0;
dist = 9999;
xx = x;
yy = y;

if ((turrets > 0) && instance_exists(obj_en_in) && (turret_cool == 0)) {
targe = instance_nearest(x, y, obj_en_in);
Expand All @@ -572,41 +533,27 @@ if (owner == 6) {
bull.direction += choose(random(10), 1 * -random(10));
}
}
targe = 0;
rdir = 0;
dist = 9999;

xx = lengthdir_x(64, direction + 90);
yy = lengthdir_y(64, direction + 90);

front = 0;
right = 0;
left = 0;
rear = 0;

targe = instance_nearest(xx, yy, obj_en_ship);
rdir = point_direction(x, y, target.x, target.y);
target_l = instance_nearest(x + lengthdir_x(64, direction + 90), y + lengthdir_y(64, direction + 90), obj_en_ship);
target_r = instance_nearest(x + lengthdir_x(64, direction + 270), y + lengthdir_y(64, direction + 270), obj_en_ship);

if (collision_line(x, y, x + lengthdir_x(2000, direction), y + lengthdir_y(2000, direction), obj_en_ship, 0, 1)) {
front = 1;
}

f = 0;
facing = "";
ammo = 0;
range = 0;
wep = "";
dam = 0;

for (var gg = 1; gg <= weapons; gg++) {
ok = 0;
f += 1;
facing = "";
ammo = 0;
range = 0;
wep = "";
dam = 0;

if ((cooldown[gg] <= 0) && (weapon[gg] != "") && (weapon_ammo[gg] > 0)) {
ok = 1;
Expand All @@ -617,7 +564,6 @@ if (owner == 6) {
range = weapon_range[gg];
}

targe = target;
if ((facing == "front") && (front == 1)) {
ok = 2;
}
Expand All @@ -627,10 +573,7 @@ if (owner == 6) {
if (facing == "special") {
ok = 2;
}
if (!instance_exists(targe)) {
exit;
}
dist = point_distance(x, y, targe.x, targe.y);
dist = point_distance(x, y, target.x, target.y);

if ((facing == "right") && (point_direction(x, y, target_r.x, target_r.y) < 337) && (point_direction(x, y, target_r.x, target_r.y) > 203)) {
ok = 2;
Expand All @@ -655,9 +598,6 @@ if (owner == 6) {
bull = instance_create(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), obj_al_round);
bull.speed = 20;
bull.dam = dam;
if (targe == target) {
bull.direction = point_direction(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), target.x, target.y);
}
if (facing != "front") {
bull.direction = point_direction(x + lengthdir_x(32, direction), y + lengthdir_y(32, direction), target.x, target.y);
}
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_enunit/Alarm_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if (!engaged) {

var cm_present = false;
var cm_index = -1;
var cm_block = false;
var cm_block = noone;
with (obj_pnunit) {
for (var u = 0; u < array_length(unit_struct); u++) {
if (marine_type[u] == obj_ini.role[100][eROLE.CHAPTERMASTER]) {
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_enunit/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
unit = "";
unit = undefined;
men = 0;
veh = 0;
dreads = 0;
Expand Down
Loading
Loading