Fix Errors from Previous Commit

This commit is contained in:
GreenComfyTea
2023-09-03 13:58:52 +03:00
parent 8ae3928fdc
commit b52c903af3
6 changed files with 35 additions and 11 deletions

View File

@@ -115,8 +115,8 @@ function this.update_ruby_and_gold_wirebugs(player, player_data)
local endemic_life_buff_key = marionette_mode_types[marionette_mode_type];
buffs.update_generic_timer(this.list, endemic_life_buffs_type_name, endemic_life_buff_key, this.get_endemic_life_name,
player_data, wirebug_powerup_timer_field);
buffs.update_generic_buff(this.list, endemic_life_buffs_type_name, endemic_life_buff_key, this.get_endemic_life_name,
nil, nil, player_data, wirebug_powerup_timer_field);
end
function this.update_butterflame(player_data)
@@ -131,8 +131,8 @@ function this.update_butterflame(player_data)
return;
end
buffs.update_generic_timer(this.list, endemic_life_buffs_type_name, "butterflame", this.get_endemic_life_name,
player_data, atk_up_buff_second_timer_field);
buffs.update_generic_buff(this.list, endemic_life_buffs_type_name, "butterflame", this.get_endemic_life_name,
nil, nil, player_data, atk_up_buff_second_timer_field);
end
function this.update_peepersects(player_data)

View File

@@ -74,7 +74,7 @@ function this.update_stamina_use_down(player_data)
return;
end
buffs.update_generic(this.list, misc_buffs_type_name, "stamina_use_down", 1,
buffs.update_generic(this.list, misc_buffs_type_name, "stamina_use_down", this.get_misc_buff_name, 1,
stamina_up_buff_second_timer / 60, endemic_life_buffs.peepersects_duration);
end

View File

@@ -320,7 +320,6 @@ local is_predicament_power_up_method = player_base_type_def:get_method("isPredic
-- Resuscitate
local is_debuff_state_method = player_base_type_def:get_method("isDebuffState");
local player_skill_list_type_def = get_player_skill_list_method:get_return_type();
local get_skill_data_method = player_skill_list_type_def:get_method("getSkillData");
@@ -687,6 +686,18 @@ function this.update_spiribirds_call(player_data)
end
function this.get_skill_name(skill_key)
local skill_data = skill_data_list[skill_key];
if skill_data == nil then
local skill_name = language.current_language.skills[skill_key];
if skill_name == nil then
return skill_key;
end
return skill_name;
end
local skill_name = get_name_method:call(nil, skill_data_list[skill_key].id);
if skill_name == nil then
error_handler.report("skills.get_skill_name", string.format("Failed to access Data: %s_name", skill_key));

View File

@@ -1195,8 +1195,15 @@ end
function this.get_weapon_skill_name(weapon_skill_key)
if weapon_skill_ids[weapon_skill_key] == nil then
return language.current_language.weapon_skills[weapon_skill_key];
else
local weapon_skill_name = language.current_language.weapon_skills[weapon_skill_key];
if weapon_skill_name == nil then
return weapon_skill_key;
end
return weapon_skill_name;
end
local weapon_skill_name = get_name_method:call(nil, weapon_skill_ids[weapon_skill_key]);
if weapon_skill_name == nil then
error_handler.report("weapon_skills.get_weapon_skill_name", string.format("Failed to access Data: %s_name", weapon_skill_key));
@@ -1204,7 +1211,6 @@ function this.get_weapon_skill_name(weapon_skill_key)
end
return weapon_skill_name;
end
end

View File

@@ -217,6 +217,10 @@ this.default_language = {
frenzy_overcome = "Frenzy Overcome"
},
skills = {
kushala_daora_soul = "Kushala Daora Soul"
},
weapon_skills = {
-- Great Sword
power_sheathe = "Power Sheathe",

View File

@@ -435,6 +435,9 @@
"wingclaws": "Wingclaws",
"wings": "Wings"
},
"skills": {
"kushala_daora_soul": "Kushala Daora Soul"
},
"stats": {
"affinity": "Affinity",
"attack": "Attack",