Skip to content

feat: Recovery text, gene-seed recovery, string functions #654

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 5 commits into from
Apr 1, 2025
Merged

feat: Recovery text, gene-seed recovery, string functions #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5578bbe
A lot of string/array related function stuff
EttyKitty Mar 31, 2025
91fd350
Fix roster strings
EttyKitty Mar 31, 2025
8ef11bf
Recovery battlelog improvments
EttyKitty Mar 31, 2025
0ec4930
Minor gene-seed recovery alteration and string improvments
EttyKitty Mar 31, 2025
1f55d52
JSDocs
EttyKitty Apr 1, 2025
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
76 changes: 35 additions & 41 deletions objects/obj_controller/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,12 +1534,12 @@ vih=string_pos(",",temp[njm]);
temp[njm]=string_delete(temp[njm],vih,1);
njm+=1;
temp[njm] = "Specialist branches staffed by";
if (techa > 0) then temp[njm] += $", {techa} {string_plural(obj_ini.role[100][16], techa)}";
if (old_dudes > 0) then temp[njm] += $", {old_dudes} {string_plural(obj_ini.role[100][14], old_dudes)}";
if (apotha > 0) then temp[njm] += $", {apotha} {string_plural(obj_ini.role[100][15], apotha)}";
if (libra > 0) then temp[njm] += $", {libra} {string_plural(obj_ini.role[100,17], libra)}";
if (coda > 0) then temp[njm] += $", {coda} {string_plural("Codiciery", coda)}";
if (lexa > 0) then temp[njm] += $", {lexa} {string_plural("Lexicanum", lexa)}.";
if (techa > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][16], techa)}";
if (old_dudes > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][14], old_dudes)}";
if (apotha > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][15], apotha)}";
if (libra > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100,17], libra)}";
if (coda > 0) then temp[njm] += $", {string_plural_count("Codiciery", coda)}";
if (lexa > 0) then temp[njm] += $", {string_plural_count("Lexicanum", lexa)}.";

vih=string_pos(",",temp[njm]);
temp[njm]=string_delete(temp[njm],vih,1);
Expand Down Expand Up @@ -1608,30 +1608,30 @@ for(var company=0; company<10; company++){
else{temp[njm]="";}
}

if (capt > 0) then temp[njm] += $", {capt} {string_plural(obj_ini.role[100][5], capt)}";
if (chap > 0) then temp[njm] += $", {chap} {string_plural(obj_ini.role[100][14], chap)}";
if (apoth > 0) then temp[njm] += $", {apoth} {string_plural(obj_ini.role[100][15], apoth)}";
if (techa > 0) then temp[njm] += $", {techa} {string_plural(obj_ini.role[100][16], techa)}";
if (standard > 0) then temp[njm] += $", {standard} {string_plural(obj_ini.role[100][11], standard)}";
if (champ > 0) then temp[njm] += $", {champ} {string_plural(obj_ini.role[100][7], champ)}";
if (lib > 0) then temp[njm] += $", {lib} {string_plural(obj_ini.role[100][17], lib)}";

if (serg > 0) then temp[njm] += $", {serg} {string_plural(obj_ini.role[100][18], serg)}";
if (vet_serg > 0) then temp[njm] += $", {vet_serg} {string_plural(obj_ini.role[100][19], vet_serg)}";
if (termi > 0) then temp[njm] += $", {termi} {string_plural(obj_ini.role[100][4], termi)}";
if (veter > 0) then temp[njm] += $", {veter} {string_plural(obj_ini.role[100][3], veter)}";
if (tact > 0) then temp[njm] += $", {tact} {string_plural(obj_ini.role[100][8], tact)}";
if (assa > 0) then temp[njm] += $", {assa} {string_plural(obj_ini.role[100][10], assa)}";
if (deva > 0) then temp[njm] += $", {deva} {string_plural(obj_ini.role[100][9], deva)}";
if (scou > 0) then temp[njm] += $", {scou} {string_plural(obj_ini.role[100][12], scou)}";
if (dread > 0) then temp[njm] += $", {dread} {string_plural(obj_ini.role[100][6], dread)}";
if (capt > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][5], capt)}";
if (chap > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][14], chap)}";
if (apoth > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][15], apoth)}";
if (techa > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][16], techa)}";
if (standard > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][11], standard)}";
if (champ > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][7], champ)}";
if (lib > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][17], lib)}";

if (serg > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][18], serg)}";
if (vet_serg > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][19], vet_serg)}";
if (termi > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][4], termi)}";
if (veter > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][3], veter)}";
if (tact > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][8], tact)}";
if (assa > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][10], assa)}";
if (deva > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][9], deva)}";
if (scou > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][12], scou)}";
if (dread > 0) then temp[njm] += $", {string_plural_count(obj_ini.role[100][6], dread)}";

if (raider > 0) then temp[njm] += $", {raider} {string_plural("Land Raider", raider)}";
if (pred > 0) then temp[njm] += $", {pred} {string_plural("Predator", pred)}";
if (whirl > 0) then temp[njm] += $", {whirl} {string_plural("Whirlwind", whirl)}";
if (rhino > 0) then temp[njm] += $", {rhino} {string_plural("Rhino", rhino)}";
if (speeder > 0) then temp[njm] += $", {speeder} {string_plural("Land Speeder", speeder)}";
if (bike > 0) then temp[njm] += $", {bike} {string_plural("Attack Bike", bike)}";
if (raider > 0) then temp[njm] += $", {string_plural_count("Land Raider", raider)}";
if (pred > 0) then temp[njm] += $", {string_plural_count("Predator", pred)}";
if (whirl > 0) then temp[njm] += $", {string_plural_count("Whirlwind", whirl)}";
if (rhino > 0) then temp[njm] += $", {string_plural_count("Rhino", rhino)}";
if (speeder > 0) then temp[njm] += $", {string_plural_count("Land Speeder", speeder)}";
if (bike > 0) then temp[njm] += $", {string_plural_count("Attack Bike", bike)}";

if (string_length(temp[njm])>0) then temp[njm]+=".";

Expand All @@ -1647,13 +1647,7 @@ temp[60] = $"{temp[59]}\n\n{temp[34]}\n\n{temp[35]}##{temp[36]}##{temp[37]}##{te


temp[61]="\n\nYour armamentarium contains some spare equipment- \n";
for(var u=0; u<=30; u++){
if (obj_ini.equipment[u]!="") then temp[61]+=$"{obj_ini.equipment_number[u]} {string_plural(obj_ini.equipment[u], obj_ini.equipment_number[u])}, ";
if (obj_ini.equipment[u]=="") and (obj_ini.equipment[u-1]!=""){
temp[61]=string_delete(temp[61],string_length(temp[61]),3);
temp[61]+=".";
}
}
temp[61] += arrays_to_string_with_counts(obj_ini.equipment, obj_ini.equipment_number, true, true);


temp[62]="##Your fleet contains ";
Expand Down Expand Up @@ -1685,27 +1679,27 @@ for(var mm=0; mm<array_length(obj_ini.ship); mm++){
codex_discovered[mm]=0;
}

temp[62]+=string(ships)+$" {string_plural("warship")}-\n";
temp[62]+=$" {string_plural_count("warship", ships)}-\n";

if (obj_ini.fleet_type != ePlayerBase.home_world || bb == 1) {
temp[62] += $"Your flagship, Battle Barge {obj_ini.ship[0]}.";
temp[62] += "\n";
bb--;
}
if (bb > 0) {
temp[62] += $"{bb} {string_plural("Battle Barge")}: {array_to_string_order(bb_names)}.";
temp[62] += $"{string_plural_count("Battle Barge", bb)}: {array_to_string_order(bb_names, true)}";
temp[62] += "\n";
}
if (sk > 0) {
temp[62] += $"{sk} {string_plural("Strike Cruiser")}: {array_to_string_order(sk_names)}.";
temp[62] += $"{string_plural_count("Strike Cruiser", sk)}: {array_to_string_order(sk_names, true)}";
temp[62] += "\n";
}
if (glad > 0) {
temp[62] += $"{glad} {string_plural("Gladius Escort")}: {array_to_string_order(glad_names)}.";
temp[62] += $"{string_plural_count("Gladius Escort", glad)}: {array_to_string_order(glad_names, true)}";
temp[62] += "\n";
}
if (hunt > 0) {
temp[62] += $"{hunt} {string_plural("Hunter Escort")}: {array_to_string_order(hunt_names)}.";
temp[62] += $"{string_plural_count("Hunter Escort", hunt)}: {array_to_string_order(hunt_names, true)}";
temp[62] += "\n";
}

Expand Down
4 changes: 1 addition & 3 deletions objects/obj_controller/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,7 @@ try {
_tooltip += $"\nKnown Powers: ";
for (var i = 0; i < _psy_powers_count; i++) {
_tooltip += get_power_data(_psy_powers_known[i], "name");
if (i < _psy_powers_count - 1) {
_tooltip += ", ";
}
_tooltip += smart_delimeter_sign(_psy_powers_count, i, false);
}
temp[123] = _tooltip;
}
Expand Down
20 changes: 5 additions & 15 deletions objects/obj_enunit/Draw_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,18 @@ if (draw_size > 0){
if (obj_ncombat.enemy!=1){
composition_string += block_composition_string();
} else {
var variety, variety_num, stop, sofar, compl, vas;
stop = 0;
var variety, variety_num, sofar, compl;
variety = [];
variety_num = [];
sofar = 0;
compl = "";
vas = "";

var variety_len = array_length(variety);
for (var q = 0; q < variety_len; q++) {
variety[q] = "";
variety_num[q] = 0;
}

var dudes_len = array_length(dudes);
for (var q = 0; q < dudes_len; q++) {
if (dudes[q] != "") and(string_count(string(dudes[q]) + "|", compl) = 0) {
Expand All @@ -47,6 +46,7 @@ if (draw_size > 0){
sofar += 1;
}
}

var dudes_len = array_length(dudes);
for (var q = 0; q < dudes_len; q++) {
if (dudes[q] != "") {
Expand All @@ -55,19 +55,9 @@ if (draw_size > 0){
if (dudes[q] = variety[i]) then variety_num[i] += dudes_num[q];
}
}

}
stop = 0;
var variety_num_len = array_length(variety_num);
for (var i = 0; i < variety_num_len; i++) {
if (stop = 0) {
if (variety_num[i] > 0) and(variety_num[i + 1] > 0) then composition_string += string(variety_num[i]) + "x " + string(variety[i]) + ", ";
if (variety_num[i] > 0) and(variety_num[i + 1] <= 0) {
composition_string += string(variety_num[i]) + "x " + string(variety[i]) + ". ";
stop = 1;
}
}
}

_composition_string += arrays_to_string_with_counts(variety, variety_num, true);
}
}

Expand Down
2 changes: 1 addition & 1 deletion objects/obj_ncombat/Alarm_3.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if ((messages>0) and (messages_shown<24)) and (messages_shown<=100){
newline=message[that];
if (message_priority[that]>0) then newline_color="bright";
if (string_count("lost",newline)>0) then newline_color="red";
if (string_count("critically injured",newline)>0) then newline_color="red";
if (string_count("critically damaged",newline)>0) then newline_color="red";
if (string_count("^",newline)>0){
newline=string_replace(newline,"^","");
newline_color="white";
Expand Down
Loading