Skip to content

feat: welcome message and string functions edits #70

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
merged 14 commits into from
Nov 4, 2024
Merged

feat: welcome message and string functions edits #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
763a74e
String functions fiddle
EttyKitty Nov 3, 2024
f869643
Fix welcome message names and improve it a bit
EttyKitty Nov 3, 2024
68aa752
All string functions in one file
EttyKitty Nov 3, 2024
23dce2b
Capitalize arg to int to word func
EttyKitty Nov 3, 2024
ed60ebd
Place handle_exception() into most catch
EttyKitty Nov 3, 2024
9155496
Fix some error in the string functions
EttyKitty Nov 3, 2024
dde63f0
Wrapping up welcome message and string function edits
EttyKitty Nov 3, 2024
5b410b7
Rework how ordinal function options works
EttyKitty Nov 3, 2024
9422530
fix: check for count before plural
EttyKitty Nov 4, 2024
23035b2
Renamer integer_to_letters into integer_to_words
EttyKitty Nov 4, 2024
6034c7b
JSDoc to all string functions, minor var name changes
EttyKitty Nov 4, 2024
255b7ce
Fix page count display, add mixin tag
EttyKitty Nov 4, 2024
de1114f
New array function, edit how fleet is listed
EttyKitty Nov 4, 2024
b1f301f
Hopefully solve first characters getting deleted and text going over …
EttyKitty Nov 4, 2024
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
8 changes: 1 addition & 7 deletions ChapterMaster.yyp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

269 changes: 134 additions & 135 deletions objects/obj_controller/Create_0.gml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions objects/obj_controller/Draw_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
try{
scr_ui_manage();
} catch(_exception){
Copy link

@OH296 OH296 Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in general while messing around would be best to sling these in try_and_report_loop maybe?

Copy link
Owner Author

@EttyKitty EttyKitty Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in general while messing around would be best to sling these in try_and_report_loop maybe?

I think try/catch and handle_exception combo should do the same thing.
I've created handle_exception as a light version of try_and_report_loop, for cases where you don't need custom functions to run on catch. It's just more compact, but works mostly the same way, I think?

Copy link

@OH296 OH296 Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i guess that's true, i suppose i was mostly just thinking that try_and_report_loop("ui Manage"), scr_ui_manage) is just less lines and coudl have as you say a custom catch function, but it's probably outside of scope for this pr

show_debug_message(_exception);
handle_exception(_exception);
manage = 0;
menu = 0;

}
try{
scr_ui_advisors();
} catch(_exception){
show_debug_message(_exception);
handle_exception(_exception);
manage = 0;
menu = 0;
}
try{
scr_ui_diplomacy();
} catch(_exception){
show_debug_message(_exception);
handle_exception(_exception);
manage = 0;
menu = 0;
}
try{
scr_ui_settings();
} catch(_exception){
show_debug_message(_exception);
handle_exception(_exception);
manage = 0;
menu = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_star/Draw_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if (!global.load && (obj_controller.zoomed || in_camera_view(star_box_shape())))
var faction_sprite = obj_img.force[owner];
draw_sprite_ext(faction_sprite,faction_index,xx+(panel_width/2)-30,yy+25, 0.60, 0.60, 0, c_white, 1);
} catch(_exception){
show_debug_message("{0}", _exception);
handle_exception(_exception);
}
} else {
draw_sprite_ext(faction_sprite,faction_index,xx+(panel_width/2)-30,yy+25, 0.60, 0.60, 0, c_white, 1);
Expand Down
4 changes: 2 additions & 2 deletions scripts/JsonFileListLoader/JsonFileListLoader.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ function JsonFileListLoader() constructor {
result.is_success = true;

debugl($"Successfully loaded {item_total} values from {relative_file_path}");
} catch (_ex) {
debugl($"Could not load data from {relative_file_path}: {_ex.message}.");
} catch (_exception) {
handle_exception(_exception);
result.values = {}; // do not return incomplete/invalid data
} finally {
if (is_undefined(file_buffer) == false) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/UIRenderComponents/UIRenderComponents.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function UISpriteRendererComponent(owner, name) : UIRenderComponent(owner, name)
alpha
)
} catch(_exception){
show_debug_message(_exception.message);
handle_exception(_exception);
}
img_index = (img_index + img_speed) % __spr_frames;
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_add_artifact/scr_add_artifact.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ function corrupt_artifact_collectors(last_artifact){
}
}
catch( _exception){
show_debug_message(_exception.message);
handle_exception(_exception);
}
}

Expand Down
29 changes: 28 additions & 1 deletion scripts/scr_array_functions/scr_array_functions.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,31 @@ function array_to_string_list(_array) {
}
}
return _string_list;
}
}

/// @function array_to_string_order
/// @description Converts an array into a string, with "," after each member and "and" before the last one.
/// @param {array} _strings_array An array of strings.
/// @return {string}
function array_to_string_order(_strings_array) {
var result = "";
var length = array_length(_strings_array);

// Loop through the array
for (var i = 0; i < length; i++) {
// Append the current string
result += _strings_array[i];

// Check if it's the last string
if (i < length - 1) {
// If it's the second last item, add " and " before the last one
if (i == length - 2) {
result += " and ";
} else {
result += ", ";
}
}
}

return result;
}
3 changes: 0 additions & 3 deletions scripts/scr_cheatcode/scr_cheatcode.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,6 @@ function scr_cheatcode(argument0) {
}
}
} catch(_exception) {
log_into_file(_exception.longMessage);
log_into_file(_exception.script);
log_into_file(_exception.stacktrace);
show_debug_message(_exception.longMessage);
}
}
2 changes: 1 addition & 1 deletion scripts/scr_company_order/scr_company_order.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function temp_marine_variables(co, unit_num){
break;
}
} catch( _exception) {
show_debug_message("{0}",_exception);
handle_exception(_exception);
unit.squad="none";
}
}
Expand Down
15 changes: 0 additions & 15 deletions scripts/scr_convert_to_string/scr_convert_to_string.gml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/scr_convert_to_string/scr_convert_to_string.yy
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/scr_has_adv/scr_has_adv.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function scr_has_adv(advantage){
result = array_contains(obj_ini.adv, advantage);
}
} catch (_exception){
show_debug_message(_exception);
handle_exception(_exception);
result = false;
}
return result;
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_has_disadv/scr_has_disadv.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function scr_has_disadv(disadvantage){
result = array_contains(obj_ini.dis, disadvantage);
}
} catch (_exception){
show_debug_message(_exception);
handle_exception(_exception);
result = false;
}
return result;
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_librarium/scr_librarium.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ function scr_librarium(){
try{
artif_descr = obj_ini.artifact_struct[menu_artifact].description();
} catch( _exception){
show_debug_message(_exception.message);
handle_exception(_exception);
}
tooltip = "";
tooltip_other = "";
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_random_event/scr_random_event.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ function scr_random_event(execute_now) {
evented = true;
}
catch(_exception){
show_debug_message("{0} \n hulk error",_exception);
handle_exception(_exception);
}
}
}
Expand Down
26 changes: 0 additions & 26 deletions scripts/scr_string/scr_string.gml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/scr_string/scr_string.yy
View file
Open in desktop

This file was deleted.

Loading