Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ All notable changes to this project will be documented in this file.
- everything that a normal player doesn't need to know.
----------------------------------

## [0.9.4.1]

### Fixed:
- garrisons crashing and returning the game to map
- crash during enemy end turn with chaos fleets

## [0.9.4.0]

### IMPORTANT:
Expand Down
2 changes: 2 additions & 0 deletions objects/obj_pnunit/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ defenses=0;
highlight=0;
highlight2=0;
highlight3="";
siz = 0;
x_offset = 0;
// let="";let=string_delete(obj_ini.psy_powers,2,string_length(obj_ini.psy_powers)-1);let=string_upper(let);
// LET might be different for each marine; need a way of determining this

Expand Down
12 changes: 9 additions & 3 deletions objects/obj_pnunit/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ var pos=880;
if (instance_exists(obj_centerline)){
diff=x-obj_centerline.x;
}
if (instance_exists(obj_enunit)) {
siz=min(400,(men*0.5)+(medi)+(veh*2.5)+(dreads*2));
} else {
siz = 0;
}
if (siz>0){
if ((x_offset)>817) and ((x_offset)<1575){
if (scr_hit([x_offset,450-(siz/2),x_offset+10,450+(siz/2)])){
Expand All @@ -23,11 +28,12 @@ if (highlight2!=highlight){
highlight2=highlight;
highlight3="";

for (var i=0;i<array_length(dudes_num);i++){
var dudes_len = array_length(dudes_num);
for (var i = 0; i < dudes_len; i++){

if (dudes_num[i]>0) and (dudes_num[i+1]>0){
if (dudes_num[i] > 0 and dudes_num[i+1] > 0) {
highlight3+=$"{dudes_num[i]}X {dudes[i]}, "
}else if (dudes_num[i]>0) and (dudes_num[i+1]<=0){
} else if (dudes_num[i] > 0 and dudes_num[i+1] <= 0) {
highlight3+=$"{dudes_num[i]}X {dudes[i]}.";
break;
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_hit/scr_hit.gml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function point_and_click(rect) {
}

if (controller_exist && obj_controller.cooldown > 0) {
show_debug_message("point_and_click: ignored click for cooldown, " + string(obj_controller.cooldown) + " steps remaining");
// show_debug_message("point_and_click: ignored click for cooldown, " + string(obj_controller.cooldown) + " steps remaining");
return false;
}

Expand Down