From 19e0b4dcdcfb418e5d4245102ea6c746832400cb Mon Sep 17 00:00:00 2001 From: srv-config Date: Fri, 13 Oct 2023 01:08:15 +0200 Subject: [PATCH] Changes of 18.2.2.15 S --- Data/AntiHack.ini | 16 +--- Data/Common.ini | 12 +++ Data/FormulaData.xml | 92 ++++++++++++------- ...nt_ArcaBattle_Loser_GuildMaster_Reward.xml | 27 ++++++ ...iege_Loser_Alliance_GuildMaster_Reward.xml | 27 ++++++ ...tleSiege_Loser_Main_GuildMaster_Reward.xml | 27 ++++++ ...ge_Winner_Alliance_GuildMaster_Reward.xml} | 4 +- ...eSiege_Winner_Main_GuildMaster_Reward.xml} | 2 +- Data/Items/Drop/ItemDropRateControl.ini | 20 +++- Data/JewelsManager.ini | 10 ++ Data/Scripts/ItemBags/ItemBagScript.lua | 28 +++--- Data/Skills/SkillSettings.ini | 6 ++ 12 files changed, 202 insertions(+), 69 deletions(-) create mode 100644 Data/ItemBags/Event_ArcaBattle_Loser_GuildMaster_Reward.xml create mode 100644 Data/ItemBags/Event_CastleSiege_Loser_Alliance_GuildMaster_Reward.xml create mode 100644 Data/ItemBags/Event_CastleSiege_Loser_Main_GuildMaster_Reward.xml rename Data/ItemBags/{Event_CastleSiege_Winner_GuildMaster_Reward.xml => Event_CastleSiege_Winner_Alliance_GuildMaster_Reward.xml} (73%) rename Data/ItemBags/{Event_ArcaBattle_Winner_GuildMaster_Reward.xml => Event_CastleSiege_Winner_Main_GuildMaster_Reward.xml} (79%) diff --git a/Data/AntiHack.ini b/Data/AntiHack.ini index 5a680ee..b623969 100644 --- a/Data/AntiHack.ini +++ b/Data/AntiHack.ini @@ -108,17 +108,6 @@ CashShopPotionDelayTime = 100 ;------------------------------------------------------------------------------------------------------------- PacketLimit = 255 -;------------------------------------------------------------------------------------------------------------- -;-- Enables/Disables Anti-Speed Hack System :: VALUES 0/1 -;------------------------------------------------------------------------------------------------------------- -EnablePacketTimeCheck = 1 - -;------------------------------------------------------------------------------------------------------------- -;-- Changing may cause issues, :: MAX VALUE 20000, Changing to lower than than 18500 will decrease -;-- Speed Hacks detection power. False detections: may occur by using computer or internet speed boosters -;------------------------------------------------------------------------------------------------------------- -PacketTimeMinTimeMsec = 18500 - ;------------------------------------------------------------------------------------------------------------- ;-- Enables/Disables Hack Detect Message for caught player :: VALUES 0/1 ;------------------------------------------------------------------------------------------------------------- @@ -236,12 +225,9 @@ BeAttackEffectPositionCheckMaxCount = 20 ;------------------------------------------------------------------------------------------------------------- ;-- Below options must be sorted, only then will be described ;------------------------------------------------------------------------------------------------------------- -CheckSumCheck = 0 ; 1: On, 0: Off ItemSerialCheck = 1 ; 1: On, 0: Off SerialZeroCheck = 0 ; 1: On, 0: Off DisconnectHackUser = 1 ; 1: On, 0: Off DetectedHackKickCount = 10 SpeedHackPenalty = 1 -IsIgnorePacketHackDetect = 0 ; 1: On, 0: Off -EnableCheckPenetrationSkill = 1 ; 1: On, 0: Off -CheckSpeedHack = 1 ; 1: On, 0: Off \ No newline at end of file +IsIgnorePacketHackDetect = 0 ; 1: On, 0: Off \ No newline at end of file diff --git a/Data/Common.ini b/Data/Common.ini index d71f573..20e7558 100644 --- a/Data/Common.ini +++ b/Data/Common.ini @@ -36,6 +36,18 @@ MaxMasterLevel = 1150 ;------------------------------------------------------------------------------------------------------------- MaxMasterLevelFor3rdClass = 400 +;------------------------------------------------------------------------------------------------------------- +;-- Allows to select a system to build number of exp required for next levels, AKA Exp Table +;-- 0: Use FormulaData.xml::Level section formulas +;-- 1: Use ExpCalc.lua::SetExpTable_Normal, SetExpTable_Master +;-- +;-- Changes to exp table calculation require Exp Fixer to be run +;-- 1) Run Essential Tools → Database Maintenance → Character Exp Fixer +;-- 2) For each exp type set max range of specific level type and click "Fix It!" +;------------------------------------------------------------------------------------------------------------- +UseLuaForNormalExpCalc = 0 +UseLuaForMasterExpCalc = 0 + ;------------------------------------------------------------------------------------------------------------- ;-- Minimum monster level to gain master experience for third class character ;------------------------------------------------------------------------------------------------------------- diff --git a/Data/FormulaData.xml b/Data/FormulaData.xml index 8a96dde..b2f7291 100644 --- a/Data/FormulaData.xml +++ b/Data/FormulaData.xml @@ -78,45 +78,57 @@ // ### FormulaData::Character::Formula ### // ID: Next unique ID of formula, starts from 0 // Data: The formula data, no spaces -// 0: Berserker skill conversion -// 1: Berserker Attack Speed Increase -// 2: Berserker HP decrease -// 3: Berserker Defense deduction -// 4: Darkness skill conversion -// 5: Darkness Defense addition -// 6: Darkness HP decrease -// 7: Weakness Attack Decrease -// 8: Innovation Defense Decrease -// 17: Mastery Shield Damage Reduction Taken Instead -// 30: Spiral Charge Attack Damage Increase -// 31: Spiral Charge Defense Increase -// 32: Crusher Charge Attack Speed Increase -// 33: Crusher Charge Defense Increase -// 34: Elemental Charge Wizardry Increase -// 35: Elemental Charge Defense Increase -// 36: Elemental Damage Increase -// 37: Duration time for formulas 36 and 38 -// 38: Elemental Defense Increase -// 39: Dex Booster Duration Time -// 40: Dex Booster Attack Speed Increase -// 42: Illusion Blade Attack Damage +// ~ 0: Berserker skill conversion +// ~ 1: Berserker Attack Speed Increase +// ~ 2: Berserker HP decrease +// ~ 3: Berserker Defense deduction +// ~ 4: Darkness skill conversion +// ~ 5: Darkness Defense addition +// ~ 6: Darkness HP decrease +// ~ 7: Weakness Attack Decrease +// ~ 8: Innovation Defense Decrease +// ~ 17: Mastery Shield Damage Reduction Taken Instead +// ~ 30: Spiral Charge Attack Damage Increase +// ~ 31: Spiral Charge Defense Increase +// ~ 32: Crusher Charge Attack Speed Increase +// ~ 33: Crusher Charge Defense Increase +// ~ 34: Elemental Charge Wizardry Increase +// ~ 35: Elemental Charge Defense Increase +// ~ 36: Elemental Damage Increase +// ~ 37: Duration time for formulas 36 and 38 +// ~ 38: Elemental Defense Increase +// ~ 39: Dex Booster Duration Time +// ~ 40: Dex Booster Attack Speed Increase +// ~ 42: Illusion Blade Attack Damage // // ### FormulaData::CombatPower::Formula ### // ID: Next unique ID of formula, starts from 0 // Data: The formula data, no spaces -// 0: Combat Power base calculation for item of level lower than 11 (outputs CombatPowerResult) -// 1: Combat Power base calculation for item of level greater or equal than 11 (outputs CombatPowerResult) -// 2: Combat Power adjustment formula for normal item of level lower than 11 -// 3: Combat Power adjustment formula for normal item of level greater or equal than 11 -// 4: Combat Power adjustment formula for excellent item of level lower than 11 -// 5: Combat Power adjustment formula for excellent item of level greater or equal than 11 -// 6: Combat Power adjustment formula for ancient item -// 7: Two weapons Combat Power adjustment formula: CombatPowerAttackDamage = TwoWeaponCombatPower * Constant / 100 -// 8: One weapon Combat Power adjustment formula: CombatPowerAttackDamage = OneWeaponCombatPower * Constant / 100 -// 9: Base Combat Power formula for Knight class -// 10: Base Combat Power formula for Magic Gladiator class -// 11: Base Combat Power formula for Rage Fighter class -// 12: Base Combat Power formula for Slayer class +// ~ 0: Combat Power base calculation for item of level lower than 11 (outputs CombatPowerResult) +// ~ 1: Combat Power base calculation for item of level greater or equal than 11 (outputs CombatPowerResult) +// ~ 2: Combat Power adjustment formula for normal item of level lower than 11 +// ~ 3: Combat Power adjustment formula for normal item of level greater or equal than 11 +// ~ 4: Combat Power adjustment formula for excellent item of level lower than 11 +// ~ 5: Combat Power adjustment formula for excellent item of level greater or equal than 11 +// ~ 6: Combat Power adjustment formula for ancient item +// ~ 7: Two weapons Combat Power adjustment formula: CombatPowerAttackDamage = TwoWeaponCombatPower * Constant / 100 +// ~ 8: One weapon Combat Power adjustment formula: CombatPowerAttackDamage = OneWeaponCombatPower * Constant / 100 +// ~ 9: Base Combat Power formula for Knight class +// ~ 10: Base Combat Power formula for Magic Gladiator class +// ~ 11: Base Combat Power formula for Rage Fighter class +// ~ 12: Base Combat Power formula for Slayer class +// +// ### FormulaData::LevelExp::Formula ### +// ID: Next unique ID of formula, starts from 0 +// Data: The formula data, no spaces +// ~ 0: Regular level exp for range 1 to 255 +// ~ 1: Regular level exp for range 255 to max regular level +// ~ 2: Master level exp for range 1 to 600 +// ~ 3: Master level exp for range 601 to 770 +// ~ 4: Master level exp for range 771 to 800 +// ~ 5: Master level exp for range 801 to 999 +// ~ 6: Master level exp for range 1000 to 1449 +// ~ 7: Master level exp for range 1450 to max master level // // STRICTLY NO COMMENTS INSIDE TAGS --> @@ -741,4 +753,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Data/ItemBags/Event_ArcaBattle_Loser_GuildMaster_Reward.xml b/Data/ItemBags/Event_ArcaBattle_Loser_GuildMaster_Reward.xml new file mode 100644 index 0000000..98f713c --- /dev/null +++ b/Data/ItemBags/Event_ArcaBattle_Loser_GuildMaster_Reward.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/ItemBags/Event_CastleSiege_Loser_Alliance_GuildMaster_Reward.xml b/Data/ItemBags/Event_CastleSiege_Loser_Alliance_GuildMaster_Reward.xml new file mode 100644 index 0000000..776c012 --- /dev/null +++ b/Data/ItemBags/Event_CastleSiege_Loser_Alliance_GuildMaster_Reward.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/ItemBags/Event_CastleSiege_Loser_Main_GuildMaster_Reward.xml b/Data/ItemBags/Event_CastleSiege_Loser_Main_GuildMaster_Reward.xml new file mode 100644 index 0000000..c5e04c0 --- /dev/null +++ b/Data/ItemBags/Event_CastleSiege_Loser_Main_GuildMaster_Reward.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/ItemBags/Event_CastleSiege_Winner_GuildMaster_Reward.xml b/Data/ItemBags/Event_CastleSiege_Winner_Alliance_GuildMaster_Reward.xml similarity index 73% rename from Data/ItemBags/Event_CastleSiege_Winner_GuildMaster_Reward.xml rename to Data/ItemBags/Event_CastleSiege_Winner_Alliance_GuildMaster_Reward.xml index 7d24c34..44ef30a 100644 --- a/Data/ItemBags/Event_CastleSiege_Winner_GuildMaster_Reward.xml +++ b/Data/ItemBags/Event_CastleSiege_Winner_Alliance_GuildMaster_Reward.xml @@ -12,7 +12,7 @@ --> - + @@ -20,7 +20,7 @@ - + diff --git a/Data/ItemBags/Event_ArcaBattle_Winner_GuildMaster_Reward.xml b/Data/ItemBags/Event_CastleSiege_Winner_Main_GuildMaster_Reward.xml similarity index 79% rename from Data/ItemBags/Event_ArcaBattle_Winner_GuildMaster_Reward.xml rename to Data/ItemBags/Event_CastleSiege_Winner_Main_GuildMaster_Reward.xml index c68a72a..8082d0d 100644 --- a/Data/ItemBags/Event_ArcaBattle_Winner_GuildMaster_Reward.xml +++ b/Data/ItemBags/Event_CastleSiege_Winner_Main_GuildMaster_Reward.xml @@ -12,7 +12,7 @@ --> - + diff --git a/Data/Items/Drop/ItemDropRateControl.ini b/Data/Items/Drop/ItemDropRateControl.ini index 36a6949..9c7c962 100644 --- a/Data/Items/Drop/ItemDropRateControl.ini +++ b/Data/Items/Drop/ItemDropRateControl.ini @@ -32,25 +32,37 @@ AppleDropRate = 2000 AppleDropMonsterMaxLevel = 20 ;------------------------------------------------------------------------------------------------------------- -;-- Chance rate of drop of non-excellent items with Luck, common drop only, values 1-100 (percentage) +;-- Chance rate of drop of non-excellent items with Luck, common drop only, percentage, 1-100 ;------------------------------------------------------------------------------------------------------------- ItemLuckRate = 50 ;------------------------------------------------------------------------------------------------------------- -;-- Chance rate of drop of non-excellent items with Skill, common drop only, values 1-100 (percentage) +;-- Chance rate of drop of non-excellent items with Skill, common drop only, percentage, 1-100 ;------------------------------------------------------------------------------------------------------------- ItemSkillRate = 50 ;------------------------------------------------------------------------------------------------------------- -;-- Chance rate of drop of excellent items with Luck, common drop only, values 1-100 (percentage) +;-- Chance rate of drop of excellent items with Luck, common drop only, percentage, 1-100 ;------------------------------------------------------------------------------------------------------------- ExcItemLuckRate = 50 ;------------------------------------------------------------------------------------------------------------- -;-- Chance rate of drop of excellent items with Skill, common drop only, values 1-100 (percentage) +;-- Chance rate of drop of excellent items with Skill, common drop only, percentage, 1-100 ;------------------------------------------------------------------------------------------------------------- ExcItemSkillRate = 50 +;------------------------------------------------------------------------------------------------------------- +;-- Chance rate of drop of ancient items with Luck, common drop only, percentage, 1-100 +;-- If item is excellent ancient then ExcItemLuckRate is in use +;------------------------------------------------------------------------------------------------------------- +AncItemLuckRate = 4 + +;------------------------------------------------------------------------------------------------------------- +;-- Chance rate of drop of ancient items with Skill, common drop only, percentage, 1-100 +;-- If item is excellent ancient then ExcItemSkillRate is in use +;------------------------------------------------------------------------------------------------------------- +AncItemSkillRate = 6 + ;------------------------------------------------------------------------------------------------------------- ;-- Lifts limit of mastery items drop in Nars location only, 0/1 ;------------------------------------------------------------------------------------------------------------- diff --git a/Data/JewelsManager.ini b/Data/JewelsManager.ini index 7cae67e..b92d888 100644 --- a/Data/JewelsManager.ini +++ b/Data/JewelsManager.ini @@ -23,11 +23,21 @@ ExcRegularSetItem = 0 ;------------------------------------------------------------------------------------------------------------- ExcMasterySetItem = 0 +;------------------------------------------------------------------------------------------------------------- +;-- Allow to use Jewel of Kondar and Jewel of Excess ONHLY with excellent items that are not ancient and not mastery, 0/1 +;------------------------------------------------------------------------------------------------------------- +ExcRegularItem = 0 + ;------------------------------------------------------------------------------------------------------------- ;-- Allow use of custom jewels with Bound items, 0/1 ;------------------------------------------------------------------------------------------------------------- AllowEnchantBoundItemByJewels = 0 +;------------------------------------------------------------------------------------------------------------- +;-- Allow use of custom jewels with Event Wings (12, 266-268), 0/1 +;------------------------------------------------------------------------------------------------------------- +AllowEnchantEventWings = 0 + ;------------------------------------------------------------------------------------------------------------- ;-- Success rate of Jewel of Dark Bless use, makes item level +6 instantly, 0-100 ;------------------------------------------------------------------------------------------------------------- diff --git a/Data/Scripts/ItemBags/ItemBagScript.lua b/Data/Scripts/ItemBags/ItemBagScript.lua index 0f11d70..eada77a 100644 --- a/Data/Scripts/ItemBags/ItemBagScript.lua +++ b/Data/Scripts/ItemBags/ItemBagScript.lua @@ -48,11 +48,12 @@ EVENTBAG_LORDMIX = 25 EVENTBAG_KUNDUN = 26 EVENTBAG_ACHERONGUARDIAN = 27 --- 28 - EVENTBAG_CS_WINNER_GUILDMASTER = 29 - EVENTBAG_ARCA_WINNER_GUILDMASTER = 30 - EVENTBAG_MAPLELEAF = 31 --- 32 - 33 + EVENTBAG_CS_LOSER_GUILDMASTER = 28 + EVENTBAG_CS_LOSER_SUPPORT_GUILDMASTER = 29 + EVENTBAG_CS_WINNER_GUILDMASTER = 30 + EVENTBAG_CS_WINNER_SUPPORT_GUILDMASTER = 31 + EVENTBAG_ARCA_LOSER_GUILDMASTER = 32 + EVENTBAG_ARCA_WINNER_GUILDMASTER = 33 EVENTBAG_ITR_1 = 34 -- Illusion Temple Renewal 1 EVENTBAG_ITR_2 = 35 -- Illusion Temple Renewal 2 EVENTBAG_ITR_3 = 36 -- Illusion Temple Renewal 3 @@ -98,6 +99,7 @@ EVENTBAG_IWC_PLAYER = 79 EVENTBAG_ITL = 80 EVENTBAG_ITL_WINNER = 81 + EVENTBAG_MAPLELEAF = 82 -- Define Item Kind A values ITEM_KIND_A_COMMON = 0 @@ -373,7 +375,7 @@ function LoadItemBag() -- Bags Load AddItemBag(BAG_MONSTER, 0,930,'Monster_(930)_Elite_Bloody_Wolf_of_Fresh_Blood') -- DropFunction /2/ AddItemBag(BAG_MONSTER, 0,931,'Monster_(931)_Elite_Bloody_Beam_Knight') -- DropFunction /2/ AddItemBag(BAG_MONSTER, 0,932,'Monster_(932)_Elite_Bloody_Tantalus') -- DropFunction /2/ - + -- ==================================================================== -- EventBags -- BagType, EventID, 0, 'FileName' -- ==================================================================== @@ -403,11 +405,12 @@ function LoadItemBag() -- Bags Load AddItemBag(BAG_EVENT, 25,0, 'Mix_Senior_Reward') -- DropFunction /4/ AddItemBag(BAG_EVENT, 26,0, 'Monster_(275)_Kundun') -- DropFunction /3/ AddItemBag(BAG_EVENT, 27,0, 'Event_AcheronGuardian_Reward') -- DropFunction /3/ --- 28 - AddItemBag(BAG_EVENT, 29,0, 'Event_CastleSiege_Winner_GuildMaster_Reward') -- DropFunction /3/ - AddItemBag(BAG_EVENT, 30,0, 'Event_ArcaBattle_Winner_GuildMaster_Reward') -- DropFunction /3/ - AddItemBag(BAG_EVENT, 31,0, 'Mix_Maple_Leaf_Reward') -- DropFunction /4/ --- 32 - 33 + AddItemBag(BAG_EVENT, 28,0, 'Event_CastleSiege_Loser_Main_GuildMaster_Reward') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 29,0, 'Event_CastleSiege_Loser_Alliance_GuildMaster_Reward') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 30,0, 'Event_CastleSiege_Winner_Main_GuildMaster_Reward') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 31,0, 'Event_CastleSiege_Winner_Alliance_GuildMaster_Reward') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 32,0, 'Event_ArcaBattle_Loser_GuildMaster_Reward') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 33,0, 'Event_ArcaBattle_Winner_GuildMaster_Reward') -- DropFunction /3/ AddItemBag(BAG_EVENT, 34,0, 'Event_IllusionTemple_Renewal_1') -- DropFunction /3/ AddItemBag(BAG_EVENT, 35,0, 'Event_IllusionTemple_Renewal_2') -- DropFunction /3/ AddItemBag(BAG_EVENT, 36,0, 'Event_IllusionTemple_Renewal_3') -- DropFunction /3/ @@ -441,7 +444,8 @@ function LoadItemBag() -- Bags Load AddItemBag(BAG_EVENT, 76,0, 'Item_(14,464,0)_[Lvl5]_Monster_Soul_Converter') -- DropFunction /3/ -- 77 - 79 IWC AddItemBag(BAG_EVENT, 80,0, 'Event_IllusionTemple_League_Match_Win') -- DropFunction /3/ - AddItemBag(BAG_EVENT, 81,0, 'Event_IllusionTemple_League_Tournament_Win') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 81,0, 'Event_IllusionTemple_League_Tournament_Win') -- DropFunction /3/ + AddItemBag(BAG_EVENT, 82,0, 'Mix_Maple_Leaf_Reward') -- DropFunction /4/ -- Bags for purpose of Cherry Blossom Mix System AddItemBag(BAG_EVENT, 13,0, 'Mix_Cherry_Blossom_Red_Reward') -- DropFunction /4/ diff --git a/Data/Skills/SkillSettings.ini b/Data/Skills/SkillSettings.ini index 33972b4..c917acc 100644 --- a/Data/Skills/SkillSettings.ini +++ b/Data/Skills/SkillSettings.ini @@ -134,6 +134,12 @@ RemoveReflectFlinchAllPets = 0 LancerBurstTime = 10 LancerBurstValue = 500 +;--------------------------------------------------------------------------------------------- +;-- Minimum value of HP that must stay on character after use of Berserker or Darkness skills +;--------------------------------------------------------------------------------------------- +BerserkerDecHPMinVal = 50 +DarknessDecHPMinVal = 50 + [EliteMonster] ;--------------------------------------------------------------------------------------------- ;-- Success rate of application of Elite Monster Debuff upon attack, n/10000