Big commit

- Add missing Tired Timer to Stamina UI;
- Replace per-tick updates of HP, Stamina and Rage to per-event;
-- Stamina UI on Small Monsters is now deprecated;
-
This commit is contained in:
GreenComfyTea
2022-07-10 20:00:56 +03:00
parent 9c1ba9ac4c
commit 06a29637bd
8 changed files with 662 additions and 470 deletions

View File

@@ -39,26 +39,34 @@ function large_monster.new(enemy)
monster.dead_or_captured = false;
monster.is_disp_icon_mini_map = true;
monster.is_tired = false;
monster.stamina = 0;
monster.max_stamina = 1000;
monster.stamina_percentage = 0;
monster.missing_stamina = 0;
monster.tired_timer = 0;
monster.tired_duration = 600;
monster.tired_total_seconds_left = 0;
monster.tired_minutes_left = 0;
monster.tired_seconds_left = 0;
monster.tired_timer_percentage = 0;
monster.is_in_rage = false;
monster.rage_point = 0;
monster.rage_limit = 3000;
monster.rage_timer = 0;
monster.rage_duration = 600;
monster.rage_count = 0;
monster.rage_percentage = 0;
monster.rage_timer = 0;
monster.rage_duration = 600;
monster.rage_total_seconds_left = 0;
monster.rage_minutes_left = 0;
monster.rage_seconds_left = 0;
monster.rage_timer_percentage = 0;
monster.game_object = nil;
monster.transform = nil;
monster.position = Vector3f.new(0, 0, 0);
monster.distance = 0;
@@ -83,6 +91,17 @@ function large_monster.new(enemy)
if large_monster.list[enemy] == nil then
large_monster.list[enemy] = monster;
end
large_monster.update_position(enemy, monster);
large_monster.update(enemy, monster);
local physical_param = large_monster.update_health(enemy, monster);
large_monster.update_parts(enemy, monster, physical_param);
large_monster.update_stamina(enemy, monster, nil);
large_monster.update_stamina_timer(enemy, monster, nil);
large_monster.update_rage(enemy, monster, nil);
large_monster.update_rage_timer(enemy, monster, nil);
return monster;
end
@@ -95,6 +114,7 @@ function large_monster.get_monster(enemy)
end
local enemy_character_base_type_def = sdk.find_type_definition("snow.enemy.EnemyCharacterBase");
local enemy_type_field = enemy_character_base_type_def:get_field("<EnemyType>k__BackingField");
local get_monster_list_register_scale_method = enemy_character_base_type_def:get_method("get_MonsterListRegisterScale");
@@ -196,7 +216,8 @@ function large_monster.init_dynamic_UI(monster)
cached_config.stamina.bar,
cached_config.stamina.text_label,
cached_config.stamina.value_label,
cached_config.stamina.percentage_label
cached_config.stamina.percentage_label,
cached_config.stamina.timer_label
);
monster.rage_dynamic_UI = rage_UI_entity.new(
@@ -254,7 +275,8 @@ function large_monster.init_static_UI(monster)
cached_config.stamina.bar,
cached_config.stamina.text_label,
cached_config.stamina.value_label,
cached_config.stamina.percentage_label
cached_config.stamina.percentage_label,
cached_config.stamina.timer_label
);
monster.rage_static_UI = rage_UI_entity.new(
@@ -309,7 +331,8 @@ function large_monster.init_highlighted_UI(monster)
cached_config.stamina.bar,
cached_config.stamina.text_label,
cached_config.stamina.value_label,
cached_config.stamina.percentage_label
cached_config.stamina.percentage_label,
cached_config.stamina.timer_label
);
monster.rage_highlighted_UI = rage_UI_entity.new(
@@ -355,16 +378,20 @@ local get_current_method = vital_param_type:get_method("get_Current");
local get_max_method = vital_param_type:get_method("get_Max");
local stamina_param_type = stamina_param_field:get_type();
local is_tired_method = stamina_param_type:get_method("isTired");
local get_stamina_method = stamina_param_type:get_method("getStamina");
local get_max_stamina_method = stamina_param_type:get_method("getMaxStamina");
local get_remaining_tired_time_method = stamina_param_type:get_method("getStaminaRemainingTime");
local get_total_tired_time_method = stamina_param_type:get_method("get_TiredSec");
local anger_param_type = anger_param_field:get_type();
local is_anger_method = anger_param_type:get_method("isAnger");
local get_anger_point_method = anger_param_type:get_method("get_AngerPoint");
local get_limit_anger_method = anger_param_type:get_method("get_LimitAnger");
local anger_param_get_timer_method = anger_param_type:get_method("get_Timer");
local get_timer_anger_method = anger_param_type:get_method("get_TimerAnger");
local get_count_anger_method = anger_param_type:get_method("get_CountAnger");
local get_remaining_anger_time_method = anger_param_type:get_method("getAngerRemainingTime");
local get_total_anger_time_method = anger_param_type:get_method("get_TimerAnger");
local mario_param_field = enemy_character_base_type_def:get_field("<MarioParam>k__BackingField");
@@ -374,18 +401,15 @@ local get_mario_player_index_method = mario_param_type:get_method("get_MarioPlay
local get_pos_field = enemy_character_base_type_def:get_method("get_Pos");
function large_monster.update_position(enemy)
function large_monster.update_position(enemy, monster)
if not config.current_config.large_monster_UI.dynamic.enabled then
return;
end
local monster = large_monster.get_monster(enemy);
if monster == nil then
return;
local position = get_pos_field:call(enemy);
if position ~= nil then
monster.position = position;
end
local position = get_pos_field:call(enemy) or monster.position;
monster.position = position;
end
-- Code by coavins
@@ -406,7 +430,7 @@ function large_monster.update_all_riders()
end
function large_monster.update(enemy)
function large_monster.update(enemy, monster)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
@@ -419,25 +443,24 @@ function large_monster.update(enemy)
return;
end
local monster = large_monster.get_monster(enemy);
local dead_or_captured = check_die_method:call(enemy);
monster.dead_or_captured = (dead_or_captured == nil and false) or dead_or_captured;
local is_disp_icon_mini_map = is_disp_icon_mini_map_method:call(enemy)
local is_disp_icon_mini_map = is_disp_icon_mini_map_method:call(enemy);
monster.is_disp_icon_mini_map = (is_disp_icon_mini_map == nil and false) or is_disp_icon_mini_map;
local physical_param = large_monster.update_health(enemy, monster);
large_monster.update_stamina(enemy, monster);
large_monster.update_rage(enemy, monster);
large_monster.update_parts(enemy, monster, physical_param);
ailments.update_ailments(enemy, monster);
end
function large_monster.update_health(enemy, monster)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.health.visibility
and not cached_config.static.health.visibility
and not cached_config.highlighted.health.visibility then
@@ -469,61 +492,155 @@ function large_monster.update_health(enemy, monster)
return physical_param;
end
function large_monster.update_stamina(enemy, monster)
function large_monster.update_stamina(enemy, monster, stamina_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.stamina.visibility
and not cached_config.static.stamina.visibility
and not cached_config.highlighted.stamina.visibility then
return;
end
local stamina_param = stamina_param_field:get_data(enemy)
if stamina_param == nil then
customization_menu.status = "No stamina param";
return;
stamina_param = stamina_param_field:get_data(enemy);
if stamina_param == nil then
customization_menu.status = "No stamina param";
return;
end
end
local is_tired = is_tired_method:call(stamina_param, false);
if is_tired ~= nil then
monster.is_tired = is_tired;
end
monster.stamina = get_stamina_method:call(stamina_param) or monster.stamina;
monster.max_stamina = get_max_stamina_method:call(stamina_param) or monster.max_stamina;
monster.missing_stamina = monster.max_stamina - monster.stamina;
if monster.max_stamina ~= 0 then
monster.stamina_percentage = monster.stamina / monster.max_stamina;
end
end
function large_monster.update_rage(enemy, monster)
function large_monster.update_stamina_timer(enemy, monster, stamina_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.stamina.visibility
and not cached_config.static.stamina.visibility
and not cached_config.highlighted.stamina.visibility then
return;
end
if stamina_param == nil then
stamina_param = stamina_param_field:get_data(enemy);
if stamina_param == nil then
customization_menu.status = "No stamina param";
return;
end
end
local is_tired = is_tired_method:call(stamina_param, false);
if is_tired ~= nil then
monster.is_tired = is_tired;
end
monster.tired_timer = get_remaining_tired_time_method:call(stamina_param) or monster.tired_timer;
monster.tired_duration = get_total_tired_time_method:call(stamina_param) or monster.tired_duration;
if monster.is_tired then
monster.tired_total_seconds_left = monster.tired_timer;
if monster.tired_total_seconds_left < 0 then
monster.tired_total_seconds_left = 0;
end
monster.tired_minutes_left = math.floor(monster.tired_total_seconds_left / 60);
monster.tired_seconds_left = monster.tired_total_seconds_left - 60 * monster.tired_minutes_left;
if monster.tired_duration ~= 0 then
monster.tired_timer_percentage = monster.tired_total_seconds_left / monster.tired_duration;
end
end
end
function large_monster.update_rage(enemy, monster, anger_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.rage.visibility
and not cached_config.static.rage.visibility
and not cached_config.highlighted.rage.visibility then
return;
end
local anger_param = anger_param_field:get_data(enemy);
if anger_param == nil then
customization_menu.status = "No anger param";
return;
anger_param = anger_param_field:get_data(enemy);
if anger_param == nil then
customization_menu.status = "No anger param";
return;
end
end
local is_in_rage = is_anger_method:call(anger_param);
monster.is_in_rage = (is_in_rage == nil and false) or is_in_rage;
monster.rage_point = get_anger_point_method:call(anger_param) or monster.rage_point;
monster.rage_limit = get_limit_anger_method:call(anger_param)or monster.rage_limit;
monster.rage_timer = anger_param_get_timer_method:call(anger_param) or monster.rage_timer;
monster.rage_duration = get_timer_anger_method:call(anger_param) or monster.rage_duration;
monster.rage_count = get_count_anger_method:call(anger_param) or monster.rage_count;
if monster.rage_limit ~= 0 then
monster.rage_percentage = monster.rage_point / monster.rage_limit;
end
end
function large_monster.update_rage_timer(enemy, monster, anger_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.rage.visibility
and not cached_config.static.rage.visibility
and not cached_config.highlighted.rage.visibility then
return;
end
if anger_param == nil then
anger_param = anger_param_field:get_data(enemy);
if anger_param == nil then
customization_menu.status = "No anger param";
return;
end
end
local is_in_rage = is_anger_method:call(anger_param);
if is_in_rage ~= nil then
monster.is_in_rage = is_in_rage;
end
monster.rage_timer = get_remaining_anger_time_method:call(anger_param) or monster.rage_timer;
monster.rage_duration = get_total_anger_time_method:call(anger_param) or monster.rage_duration;
if monster.is_in_rage then
monster.rage_total_seconds_left = monster.rage_duration - monster.rage_timer;
monster.rage_total_seconds_left = monster.rage_timer;
if monster.rage_total_seconds_left < 0 then
monster.rage_total_seconds_left = 0;
end
@@ -540,6 +657,12 @@ end
function large_monster.update_parts(enemy, monster, physical_param)
local cached_config = config.current_config.large_monster_UI;
if not cached_config.dynamic.enabled
and not cached_config.static.enabled
and not cached_config.highlighted.enabled then
return;
end
if not cached_config.dynamic.body_parts.visibility
and not cached_config.static.body_parts.visibility
and not cached_config.highlighted.body_parts.visibility then
@@ -644,7 +767,9 @@ function large_monster.update_parts(enemy, monster, physical_param)
if enemy_parts_info ~= nil then
local _is_severed = enemy_parts_info:call("get_PartsLossState");
is_severed = (_is_severed == nil and false) or is_severed;
if _is_severed ~= nil then
is_severed = _is_severed;
end
end
body_part.update_loss(part, part_loss_current, part_loss_max, is_severed)
@@ -908,7 +1033,7 @@ function large_monster.draw_highlighted(monster, position_on_screen, opacity_sca
ailment_buildup.draw_highlighted(monster, ailment_buildups_position_on_screen, opacity_scale);
end
function large_monster.init_list()
function large_monster.init_list()
large_monster.list = {};
end