From 934fe06db5a695bc79d19e4909b5a657f1d018ae Mon Sep 17 00:00:00 2001 From: srv-config Date: Wed, 3 Feb 2021 16:37:19 +0100 Subject: [PATCH] Changes of 16.1.2.9 --- Data/Events/CastleSiege.xml | 26 +++++---- Data/Items/ItemList.xml | 58 ++++++++++----------- Data/Langs/English.xml | 1 + Data/MapServerInfo.xml | 18 ++++--- Data/Scripts/Skills/MasterSkillCalc_4th.lua | 21 +++++++- Data/Scripts/Skills/RegularSkillCalc.lua | 17 ++++++ 6 files changed, 93 insertions(+), 48 deletions(-) diff --git a/Data/Events/CastleSiege.xml b/Data/Events/CastleSiege.xml index c5205a4..00c43db 100644 --- a/Data/Events/CastleSiege.xml +++ b/Data/Events/CastleSiege.xml @@ -14,6 +14,12 @@ // ResetAccumulatedTimeAfterKill: Resets accumulated time after killing Guild Master, 0/1 // ResetAccumulatedTimeAfterMove: Resets accumulated time after move, 0/1 // LordMixDailyLimit: Daily limit of Lord Mixes +// LordMixMinGuildPosition: Minimum guild position to use Lord Mix +// ~ 0: Regular guild member +// ~ 1: Battle Master +// ~ 2: Guild Assistant +// ~ 3: Guild Master +// // LiftAllyRequirement: Enables ability to enter the Castle Tower and Hunt Zone without Guild Alliance by Siege winning Guild, 0/1 // CrownSwitchMinGuildPosition: Minimum guild position to use Crown Switch: // CrownMinGuildPos: Minimum guild position to use Crown: @@ -42,15 +48,15 @@ // // ### CastleSiegeEvent::CycleSettings::Cycle ### - configuration of stages at specified days of cycle // Stage: Definition of event stage type: -// 1 ~ Registration for Castle Siege -// 2 ~ Idle -// 3 ~ Register Mark Of The Lord -// 4 ~ Idle -// 5 ~ Castle Attack Guild Notification -// 6 ~ Reading the state of Castle Siege -// 7 ~ Start of Castle Siege event -// 8 ~ End of Castle Siege event -// 9 ~ End of Castle Siege cycle +// ~ 1: Registration for Castle Siege +// ~ 2: Idle +// ~ 3: Register Mark Of The Lord +// ~ 4: Idle +// ~ 5: Castle Attack Guild Notification +// ~ 6: Reading the state of Castle Siege +// ~ 7: Start of Castle Siege event +// ~ 8: End of Castle Siege event +// ~ 9: End of Castle Siege cycle // Day: Day of a Cycle to run specified State, 0 is used for registration period before event cycle start // Hour: Hour to run specified state of the cycle, 0-23 // Minute: Minute to run specified state of the cycle, 0-60 @@ -129,7 +135,7 @@ // STRICTLY NO COMMENTS INSIDE TAGS --> - + diff --git a/Data/Items/ItemList.xml b/Data/Items/ItemList.xml index 91c72c1..0584a66 100644 --- a/Data/Items/ItemList.xml +++ b/Data/Items/ItemList.xml @@ -60,7 +60,7 @@ // ReqEnergy (sections 0-12, 15): Minimum energy required to use an item (normal +0), max 65535 // ReqVitality (sections 0-11): Minimum vitality required to use an item (normal +0), max 65535 // ReqCommand (sections 0-12): Minimum command required to use an item (normal +0), max 65535 -// Money (sections 12, 14-15): Buy (from NPC) money (Zen), 2147483648 +// Money (sections 12, 14-15, 20): Buy (from NPC) money (Zen), 2147483648 // SetAttrib (sections 0-11, 13): Defines attribute type to add on set item, value of final option output is dependent from set item tier (5/10): // ~ 0: none // ~ 1: Agility @@ -3190,33 +3190,33 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/Data/Langs/English.xml b/Data/Langs/English.xml index 90f44b4..c687c76 100644 --- a/Data/Langs/English.xml +++ b/Data/Langs/English.xml @@ -812,6 +812,7 @@ + diff --git a/Data/MapServerInfo.xml b/Data/MapServerInfo.xml index 0e363ce..f2104f9 100644 --- a/Data/MapServerInfo.xml +++ b/Data/MapServerInfo.xml @@ -17,10 +17,12 @@ // Initiation: 1 ~ allows to move to any map which is located outside specified server, 0 ~ limits moves among maps defined within ServerMapping for the server // IP: Address of the Server, WAN (External) address type for usual configuration type, allowed values: IP (version 4) or DNS Names - (maximum 15 characters) // Port: Port of the server, value must match configuration of the server in ServerList.xml and GameServer.ini of the server -// MinEntryReset: Minimum reset required to join the server, -1 if not applies -// MaxEntryReset: Maximum reset required to join the server, -1 if not applies // MinEntryGrandReset: Minimum grand reset required to join the server, -1 if not applies // MaxEntryGrandReset: Maximum grand reset required to join the server, -1 if not applies +// MinEntryReset: Minimum reset required to join the server, -1 if not applies +// MaxEntryReset: Maximum reset required to join the server, -1 if not applies +// MinEntryLevel: Minimum level required to join the server, -1 if not applies +// MaxEntryLevel: Maximum level required to join the server, -1 if not applies // Name: Name of the Server, used for in-file description purpose helping easier recognition of server //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~ Server Code for Battle Core server is unmodifiable and must be set to 120). Group should stay configured at 6 @@ -39,12 +41,12 @@ - - - - - - + + + + + + diff --git a/Data/Scripts/Skills/MasterSkillCalc_4th.lua b/Data/Scripts/Skills/MasterSkillCalc_4th.lua index 53d4d28..a54e899 100644 --- a/Data/Scripts/Skills/MasterSkillCalc_4th.lua +++ b/Data/Scripts/Skills/MasterSkillCalc_4th.lua @@ -232,7 +232,26 @@ function LightningStorm_4thEnchant_RuneWizard(InDamage, Strength, Dexterity, Vit return OutDamage end --- SkillID: 1159, Bat Flock Enhancement - (Damage over time) - (Slayer, Royal Slayer, Master Slayer, Slaughterer) +-- SkillID: 1155, Death Scythe Enhancement +function DeadScythe_4thEnchant_Summoner(InDamage, TargetClass, Strength, Dexterity, Vitality, Energy, BarrageCount) + local OutDamage = 0 + + if (BarrageCount == 1) then + OutDamage = InDamage * 0.8 + elseif (BarrageCount == 2) then + OutDamage = InDamage * 1.0 + elseif (BarrageCount == 3) then + OutDamage = InDamage * 1.1 + elseif (BarrageCount == 4) then + OutDamage = InDamage * 1.2 + elseif (BarrageCount == 5) then + OutDamage = InDamage * 1.3 + end + + return OutDamage +end + +-- SkillID: 1159, Bat Flock Enhancement - (Damage over time) function BatFlock_DotDamage_4thEnchant_Slayer(InDamage, Strength, Energy) local Damage = InDamage local DotDamage = (InDamage / 10) diff --git a/Data/Scripts/Skills/RegularSkillCalc.lua b/Data/Scripts/Skills/RegularSkillCalc.lua index 18ce831..f38db88 100644 --- a/Data/Scripts/Skills/RegularSkillCalc.lua +++ b/Data/Scripts/Skills/RegularSkillCalc.lua @@ -457,6 +457,23 @@ function SummonerBerserkerMagicDamage(Energy, Effect) return MagicMin, MagicMax end +-- SkillID: 288, Death Scythe +function DeadScythe_Summoner(InDamage, TargetClass, Strength, Dexterity, Vitality, Energy, BarrageCount) + local OutDamage = 0 + + if (BarrageCount == 1) then + OutDamage = InDamage * 0.8 + elseif (BarrageCount == 2) then + OutDamage = InDamage * 1.0 + elseif (BarrageCount == 3) then + OutDamage = InDamage * 1.1 + elseif (BarrageCount == 4) then + OutDamage = InDamage * 1.2 + end + + return OutDamage +end + -- SkillID: 289, Darkness function SummonerDarkness(Energy) local SkillEffectUP = (Energy / 30)