Skip to content

fix: force exit combat when enter is pressed with 0 enemies #520

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 1 commit into from
Feb 26, 2025
Merged

fix: force exit combat when enter is pressed with 0 enemies #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_ncombat/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if (nope!=1){audio_sound_gain(snd_battle,0.25*obj_controller.master_volume*obj_c


//limit on the size of the players forces allowed
enter_pressed = 0
man_size_limit = 0;
man_limit_reached = false;
man_size_count = 0;
Expand Down
6 changes: 4 additions & 2 deletions objects/obj_ncombat/KeyPress_13.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ if __b__
// 135;
// instance_activate_object(obj_cursor);


if (enemy_forces<=0) { // Combat for whatever reason sometimes bugs out when there are no enemies, so if enter is pressed 6 times at this state it will set started to 2
enter_pressed++
}

if (started>=2) then instance_activate_object(obj_pnunit);

Expand All @@ -38,7 +40,7 @@ if (started=3){



if (turn_count >= 50){
if (turn_count >= 50 || enter_pressed > 5) {
started=2;
}
if ((started=2) or (started=4)){
Expand Down