From 7ae57485b251d4c38bdc8df5cf26a238508bc7d9 Mon Sep 17 00:00:00 2001 From: Oen44 Date: Tue, 1 Dec 2020 13:21:49 +0100 Subject: [PATCH] Added missing variables, fixed Conditions --- upgrade_system_core.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/upgrade_system_core.lua b/upgrade_system_core.lua index e4e519f..558c911 100644 --- a/upgrade_system_core.lua +++ b/upgrade_system_core.lua @@ -1,6 +1,6 @@ dofile("data/upgrade_system_const.lua") -local UPGRADE_SYSTEM_VERSION = "2.4.4" +local UPGRADE_SYSTEM_VERSION = "2.4.5" print(">> Loaded Upgrade System v" .. UPGRADE_SYSTEM_VERSION) US_CONDITIONS = {} @@ -295,6 +295,8 @@ function us_onEquip(cid, iuid, slot) end local item = Item(iuid) if player and item then + local maxHP = player:getMaxHealth() + local maxMP = player:getMaxMana() local newBonuses = item:getBonusAttributes() for key, value in pairs(newBonuses) do local attr = US_ENCHANTMENTS[value[1]] @@ -310,7 +312,7 @@ function us_onEquip(cid, iuid, slot) if not US_CONDITIONS[value[1]][value[2]][itemId] then US_CONDITIONS[value[1]][value[2]][itemId] = Condition(attr.condition) if attr.condition ~= CONDITION_MANASHIELD then - US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_SUBID, 1000 + math.random(value[1] * value[2])) + US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_SUBID, 1000 + itemId) US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(attr.param, attr.percentage == true and 100 + value[2] or value[2]) US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_TICKS, -1) else @@ -461,6 +463,8 @@ function us_onLogin(player) player:registerEvent("UpgradeSystemMana") player:registerEvent("UpgradeSystemPD") + local maxHP = player:getMaxHealth() + local maxMP = player:getMaxMana() for slot = CONST_SLOT_HEAD, CONST_SLOT_AMMO do local item = player:getSlotItem(slot) if item then @@ -480,7 +484,7 @@ function us_onLogin(player) if not US_CONDITIONS[value[1]][value[2]][itemId] then US_CONDITIONS[value[1]][value[2]][itemId] = Condition(attr.condition) if attr.condition ~= CONDITION_MANASHIELD then - US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_SUBID, 1000 + math.random(value[1] * value[2])) + US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_SUBID, 1000 + itemId) US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(attr.param, attr.percentage == true and 100 + value[2] or value[2]) US_CONDITIONS[value[1]][value[2]][itemId]:setParameter(CONDITION_PARAM_TICKS, -1) else