Utilize this keyword everywhere

This commit is contained in:
GreenComfyTea
2023-04-21 10:19:12 +03:00
parent 94e9e5d18b
commit 9b1ff5b264
49 changed files with 1398 additions and 1403 deletions

View File

@@ -1,4 +1,4 @@
local large_monster = {};
local this = {};
local singletons;
local customization_menu;
@@ -52,9 +52,9 @@ local os = os;
local ValueType = ValueType;
local package = package;
large_monster.list = {};
this.list = {};
function large_monster.new(enemy)
function this.new(enemy)
local monster = {};
monster.enemy = enemy;
monster.is_large = true;
@@ -124,35 +124,35 @@ function large_monster.new(enemy)
monster.static_UI = {};
monster.highlighted_UI = {};
large_monster.init(monster, enemy);
large_monster.init_UI(monster, monster.dynamic_UI, config.current_config.large_monster_UI.dynamic);
large_monster.init_UI(monster, monster.static_UI, config.current_config.large_monster_UI.static);
large_monster.init_UI(monster, monster.highlighted_UI, config.current_config.large_monster_UI.highlighted);
this.init(monster, enemy);
this.init_UI(monster, monster.dynamic_UI, config.current_config.large_monster_UI.dynamic);
this.init_UI(monster, monster.static_UI, config.current_config.large_monster_UI.static);
this.init_UI(monster, monster.highlighted_UI, config.current_config.large_monster_UI.highlighted);
large_monster.update_position(enemy, monster);
this.update_position(enemy, monster);
local physical_param = large_monster.update_health(enemy, monster);
local physical_param = this.update_health(enemy, monster);
large_monster.update_stamina(enemy, monster, nil);
large_monster.update_stamina_timer(enemy, monster, nil);
this.update_stamina(enemy, monster, nil);
this.update_stamina_timer(enemy, monster, nil);
large_monster.update_rage(enemy, monster, nil);
large_monster.update_rage_timer(enemy, monster, nil);
this.update_rage(enemy, monster, nil);
this.update_rage_timer(enemy, monster, nil);
large_monster.update(enemy, monster);
pcall(large_monster.update_parts, enemy, monster, physical_param);
this.update(enemy, monster);
pcall(this.update_parts, enemy, monster, physical_param);
if large_monster.list[enemy] == nil then
large_monster.list[enemy] = monster;
if this.list[enemy] == nil then
this.list[enemy] = monster;
end
return monster;
end
function large_monster.get_monster(enemy)
local monster = large_monster.list[enemy];
function this.get_monster(enemy)
local monster = this.list[enemy];
if monster == nil then
monster = large_monster.new(enemy);
monster = this.new(enemy);
end
return monster;
end
@@ -178,7 +178,7 @@ local get_set_info_method = enemy_character_base_type_def:get_method("get_SetInf
local set_info_type = get_set_info_method:get_return_type();
local get_unique_id_method = set_info_type:get_method("get_UniqueId");
function large_monster.init(monster, enemy)
function this.init(monster, enemy)
local enemy_type = enemy_type_field:get_data(enemy);
if enemy_type == nil then
customization_menu.status = "No enemy type";
@@ -257,7 +257,7 @@ function large_monster.init(monster, enemy)
monster.is_capturable = is_capture_enable and not is_anomaly;
end
function large_monster.init_UI(monster, monster_UI, cached_config)
function this.init_UI(monster, monster_UI, cached_config)
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
monster_UI.monster_name_label = utils.table.deep_copy(cached_config.monster_name_label);
@@ -383,7 +383,7 @@ local system_array_type_def = sdk.find_type_definition("System.Array");
local length_method = system_array_type_def:get_method("get_Length");
local get_value_method = system_array_type_def:get_method("GetValue(System.Int32)");
function large_monster.update_position(enemy, monster)
function this.update_position(enemy, monster)
if not config.current_config.large_monster_UI.dynamic.enabled and
config.current_config.large_monster_UI.static.sorting.type ~= "Distance" then
return;
@@ -396,8 +396,8 @@ function large_monster.update_position(enemy, monster)
end
-- Code by coavins
function large_monster.update_all_riders()
for enemy, monster in pairs(large_monster.list) do
function this.update_all_riders()
for enemy, monster in pairs(this.list) do
-- get marionette rider
local mario_param = enemy:get_field("<MarioParam>k__BackingField");
if mario_param ~= nil then
@@ -422,7 +422,7 @@ function large_monster.update_all_riders()
end
function large_monster.update(enemy, monster)
function this.update(enemy, monster)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -471,7 +471,7 @@ function large_monster.update(enemy, monster)
pcall(ailments.update_ailments, enemy, monster);
end
function large_monster.update_health(enemy, monster)
function this.update_health(enemy, monster)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -511,7 +511,7 @@ function large_monster.update_health(enemy, monster)
return physical_param;
end
function large_monster.update_stamina(enemy, monster, stamina_param)
function this.update_stamina(enemy, monster, stamina_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -548,7 +548,7 @@ function large_monster.update_stamina(enemy, monster, stamina_param)
end
end
function large_monster.update_stamina_timer(enemy, monster, stamina_param)
function this.update_stamina_timer(enemy, monster, stamina_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -595,7 +595,7 @@ function large_monster.update_stamina_timer(enemy, monster, stamina_param)
end
end
function large_monster.update_rage(enemy, monster, anger_param)
function this.update_rage(enemy, monster, anger_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -627,7 +627,7 @@ function large_monster.update_rage(enemy, monster, anger_param)
end
end
function large_monster.update_rage_timer(enemy, monster, anger_param)
function this.update_rage_timer(enemy, monster, anger_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -673,7 +673,7 @@ function large_monster.update_rage_timer(enemy, monster, anger_param)
end
end
function large_monster.update_parts(enemy, monster, physical_param)
function this.update_parts(enemy, monster, physical_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -807,7 +807,7 @@ function large_monster.update_parts(enemy, monster, physical_param)
end
end
function large_monster.draw(monster, type, cached_config, position_on_screen, opacity_scale)
function this.draw(monster, type, cached_config, position_on_screen, opacity_scale)
local monster_UI;
if type == "dynamic" then
@@ -904,11 +904,11 @@ function large_monster.draw(monster, type, cached_config, position_on_screen, op
drawing.draw_label(monster_UI.monster_name_label, position_on_screen, opacity_scale, monster_name_text);
end
function large_monster.init_list()
large_monster.list = {};
function this.init_list()
this.list = {};
end
function large_monster.init_module()
function this.init_module()
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
language = require("MHR_Overlay.Misc.language");
@@ -931,4 +931,4 @@ function large_monster.init_module()
ailment_buildup = require("MHR_Overlay.Monsters.ailment_buildup");
end
return large_monster;
return this;