Skip to content
Open
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
12 changes: 11 additions & 1 deletion scripts/scr_ChapterTraits/scr_ChapterTraits.gml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,10 @@ function setup_chapter_traits() {
function ChapterGameData(data = {}) constructor {
chapter_suspicion = 0;

faction_disp_mods = array_create(14, {"int_mod": 0, "mult": 1});
faction_disp_mods = [];
for (var _i = 0; _i < 14; _i++) {
faction_disp_mods[_i] = {"int_mod": 0, "mult": 1, "strings": []};
}

equipment_tag_mods = {};

Expand Down Expand Up @@ -420,6 +423,13 @@ function ChapterGameData(data = {}) constructor {
alter_value = floor(alter_value * _mods.mult);
}

//ensure alter value never brings disposition higher thann 100 or lower than 0
var _final_disp_val = alter_value + obj_controller.disposition[faction];
if (_final_disp_val > 100){
alter_value -= _final_disp_val - 100;
} else if (_final_disp_val < 0){
alter_value += (_final_disp_val * -1);
}
return alter_value;
};

Expand Down
21 changes: 17 additions & 4 deletions scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,30 @@ function relationship_hostility_matrix(faction) {
return _rela;
}

function alter_disposition(faction, alter_value) {
function alter_disposition(faction, alter_value, return_string = false) {
chap_data = obj_ini.chapter_data;

alter_value = chap_data.calc_final_disp_value(faction, alter_value);

obj_controller.disposition[faction] = clamp(obj_controller.disposition[faction] + alter_value, -100, 100);
obj_controller.disposition[faction] += alter_value;

if (return_string){
return $"{global.faction_names[faction]} : {string_plus_minus(alter_value)}{alter_value}";
}
}

function alter_dispositions(alterations) {
function alter_dispositions(alterations, return_strings) {
var _string;
var _strings = [];
for (var i = 0; i < array_length(alterations); i++) {
alter_disposition(alterations[i][0], alterations[i][1]);
_string = alter_disposition(alterations[i][0], alterations[i][1], return_strings);
if (return_strings){
array_push(_strings, _string);
}
}

if (return_strings){
return _strings;
}
}

Expand Down
Loading