Skip to content

fix: Save/loading breakage due to controller var #681

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 1 commit into from
Apr 4, 2025
Merged

fix: Save/loading breakage due to controller var #681

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
106 changes: 0 additions & 106 deletions objects/obj_controller/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,109 +1787,3 @@ remov=string_length(string(temp[65])+string(temp[66])+string(temp[67])+string(te
action_set_alarm(2, 0);

instance_create(0,0,obj_tooltip );

get_command_slots_data = function(){
var _command_slots_data = [
{
search_params: {},
role_group_params: {
group: "captain_candidates",
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Captain Candidates",
purpose_code: "captain_promote",
button_text: "New Captain Required",
unit_check: "captain"
},
{
search_params: {
stat: [["weapon_skill", 44, "more"]],
companies: managing
},
role_group_params: {
group: [SPECIALISTS_STANDARD, true, true],
location: "",
opposite: true
},
purpose: $"{int_to_roman(managing)} Company Champion Candidates",
purpose_code: "champion_promote",
button_text: "Champion Required",
unit_check: "champion"
},
{
search_params: {
companies: managing
},
role_group_params: {
group: [SPECIALISTS_STANDARD, true, true],
location: "",
opposite: true
},
purpose: $"{int_to_roman(managing)} Company Ancient Candidates",
purpose_code: "ancient_promote",
button_text: "Ancient Required",
unit_check: "ancient"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_CHAPLAINS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Chaplain Candidates",
purpose_code: "chaplain_promote",
button_text: "Chaplain Required",
unit_check: "chaplain"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_APOTHECARIES, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Apothecary Candidates",
purpose_code: "apothecary_promote",
button_text: "Apothecary Required",
unit_check: "apothecary"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_TECHS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Tech Marine Candidates",
purpose_code: "tech_marine_promote",
button_text: "Tech Marine Required",
unit_check: "tech_marine"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_LIBRARIANS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Librarian Candidates",
purpose_code: "librarian_promote",
button_text: "Librarian Required",
unit_check: "lib"
}
];

return _command_slots_data;
}

command_slots_count=array_length(get_command_slots_data());
2 changes: 1 addition & 1 deletion scripts/macros/macros.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#macro CM_GREEN_COLOR #34bc75
#macro CM_RED_COLOR #bf4040
#macro MANAGE_MAN_SEE 34
#macro MANAGE_MAN_MAX array_length(obj_controller.display_unit) + obj_controller.command_slots_count
#macro MANAGE_MAN_MAX array_length(obj_controller.display_unit) + 7

enum luck {
bad = -1,
Expand Down
104 changes: 104 additions & 0 deletions scripts/scr_ui_manage/scr_ui_manage.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,110 @@ function scr_ui_manage() {

//tooltip text to tell you if a unit is eligible for special roles

get_command_slots_data = function(){
var _command_slots_data = [
{
search_params: {},
role_group_params: {
group: "captain_candidates",
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Captain Candidates",
purpose_code: "captain_promote",
button_text: "New Captain Required",
unit_check: "captain"
},
{
search_params: {
stat: [["weapon_skill", 44, "more"]],
companies: managing
},
role_group_params: {
group: [SPECIALISTS_STANDARD, true, true],
location: "",
opposite: true
},
purpose: $"{int_to_roman(managing)} Company Champion Candidates",
purpose_code: "champion_promote",
button_text: "Champion Required",
unit_check: "champion"
},
{
search_params: {
companies: managing
},
role_group_params: {
group: [SPECIALISTS_STANDARD, true, true],
location: "",
opposite: true
},
purpose: $"{int_to_roman(managing)} Company Ancient Candidates",
purpose_code: "ancient_promote",
button_text: "Ancient Required",
unit_check: "ancient"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_CHAPLAINS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Chaplain Candidates",
purpose_code: "chaplain_promote",
button_text: "Chaplain Required",
unit_check: "chaplain"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_APOTHECARIES, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Apothecary Candidates",
purpose_code: "apothecary_promote",
button_text: "Apothecary Required",
unit_check: "apothecary"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_TECHS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Tech Marine Candidates",
purpose_code: "tech_marine_promote",
button_text: "Tech Marine Required",
unit_check: "tech_marine"
},
{
search_params: {
companies: [managing, 0]
},
role_group_params: {
group: [SPECIALISTS_LIBRARIANS, false, false],
location: "",
opposite: false
},
purpose: $"{int_to_roman(managing)} Company Librarian Candidates",
purpose_code: "librarian_promote",
button_text: "Librarian Required",
unit_check: "lib"
}
];

return _command_slots_data;
}

if (!obj_controller.view_squad) {
var repetitions = min(man_max, MANAGE_MAN_SEE);
man_count = 0;
Expand Down