Skip to content

Commit

Permalink
Changes of 16.1.2.47
Browse files Browse the repository at this point in the history
  • Loading branch information
@wezzzyrek1
wezzzyrek1 committed Sep 2, 2021
1 parent 3b86a63 commit f2c22fd
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 32 deletions.
7 changes: 7 additions & 0 deletions Data/CalcCharacter.ini
View file
Expand Up @@ -692,6 +692,13 @@ RWPvMDamageRate = 100
SLAPvMDamageRate = 100
GCPvMDamageRate = 100

;----------------------------------------------------------------------------------------------~~~~~~
;-- Cooldown time of specific options of Radiance Errtel, seconds
;----------------------------------------------------------------------------------------------~~~~~~
RadianceBleedingCooldown = 60
RadianceParalyzeCooldown = 60
RadianceBindingCooldown = 60

[ComboDamage]
;----------------------------------------------------------------------------------------------~~~~~~
;-- Below options take an effect on final damage of combo skill (PvP) so should be configured
Expand Down
6 changes: 3 additions & 3 deletions Data/FormulaData.xml
View file
Expand Up @@ -470,8 +470,8 @@
<Formula ID="0" Data="(140+(%d^1.5*15))" /> <!-- WingsLevel -->
<Formula ID="1" Data="((((%d-10)^1.3)*5)^1.6)" /> <!-- WingsLevel -->
</Wing4thDefense>
<Group8>
<Formula ID="0" Data="(%d/3.5)+(%d-(%d*0.86))*(%d*0.002)" /> <!-- -->
<Summoner>
<Formula ID="0" Data="(%d/3.5)+(%d-(%d*0.86))*(%d*0.002)" /> <!-- Energy, CurseAddDamage, CurseAddDamage, CurseAddDamage -->
<Formula ID="1" Data="%d/500" /> <!-- -->
<Formula ID="2" Data="(%d/300)*0.01" /> <!-- -->
<Formula ID="3" Data="(%d/200)*0.01" /> <!-- -->
Expand All @@ -496,7 +496,7 @@
<Formula ID="22" Data="250" /> <!-- -->
<Formula ID="23" Data="150" /> <!-- -->
<Formula ID="24" Data="30" /> <!-- -->
</Group8>
</Summoner>
<GuardianItem>
<Formula ID="0" Data="20+((9+%d)/2)^2" /> <!-- ItemLevel -->
<Formula ID="1" Data="20+((9+%d)/2)^2" /> <!-- ItemLevel -->
Expand Down
2 changes: 1 addition & 1 deletion Data/RuudShop.xml
View file
Expand Up @@ -94,7 +94,7 @@
<Item Cat="14" Index="390" Level="0" Durability="5" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="2500" /> <!-- Elemental Nixie's Fragment x5 -->
<Item Cat="14" Index="450" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="100000" /> <!-- Soul Moru -->
<Item Cat="14" Index="449" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="50000" /> <!-- Cold Marriage -->
<Item Cat="14" Index="495" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="50000" /> <!-- Blue Eye Anvil -->
<Item Cat="14" Index="495" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="100000" /> <!-- Blue Eye Anvil -->
<Item Cat="14" Index="502" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="100000" /> <!-- Silver Heart's Anvil -->
<Item Cat="14" Index="501" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="50000" /> <!-- Manticore Soul -->
<Item Cat="14" Index="458" Level="0" Skill="0" Luck="0" Option="0" Exc="-1" SetItem="0" SocketCount="0" Element="0" Duration="0" Price="25000" /> <!-- Ancestral Frame -->
Expand Down
30 changes: 20 additions & 10 deletions Data/Scripts/Character/CalcCharacter.lua
View file
Expand Up @@ -39,19 +39,25 @@ function WizardDamageCalc(Strength, Dexterity, Vitality, Energy)
end

-- Character Damage - Fist Fighting - (Dark Knight, Blade Knight, Blade Master)
function KnightDamageCalc(Strength, Dexterity, Vitality, Energy)
function KnightDamageCalc(Strength, Dexterity, Vitality, Energy, IsStrongBeliefActive)
local AttackDamageMinLeft = 0
local AttackDamageMaxLeft = 0
local AttackDamageMinRight = 0
local AttackDamageMaxRight = 0

AttackDamageMinLeft = Strength / 6 -- Minimum Left Hand Damage
AttackDamageMinRight = Strength / 6 -- Minimum Right Hand Damage
AttackDamageMaxLeft = Strength / 4 -- Maximum Left Hand Damage
AttackDamageMaxRight = Strength / 4 -- Maximum Right Hand Damage
if (IsStrongBeliefActive == true) then
AttackDamageMinLeft = Strength / 6 -- Minimum Left Hand Damage
AttackDamageMinRight = Strength / 6 -- Minimum Right Hand Damage
AttackDamageMaxLeft = Strength / 4 -- Maximum Left Hand Damage
AttackDamageMaxRight = Strength / 4 -- Maximum Right Hand Damage
else
AttackDamageMinLeft = Strength / 9 -- Minimum Left Hand Damage
AttackDamageMinRight = Strength / 9 -- Minimum Right Hand Damage
AttackDamageMaxLeft = Strength / 6 -- Maximum Left Hand Damage
AttackDamageMaxRight = Strength / 6 -- Maximum Right Hand Damage
end

return AttackDamageMinLeft, AttackDamageMinRight, AttackDamageMaxLeft, AttackDamageMaxRight

end

-- Character Damage without bow - Fist Fighting - (Fairy Elf, Muse Elf, Hight Elf)
Expand Down Expand Up @@ -265,8 +271,8 @@ function SummonerMagicDamageCalc(Energy)

MagicDamageMin = Energy / 9 -- Minimum Magic Damage
MagicDamageMax = Energy / 4 + 0.015 -- Minimum Magic Damage
CurseDamageMin = Energy / 9 -- Minimum Curse Damage
CurseDamageMax = Energy / 4 + 0.015 -- Minimum Curse Damage
CurseDamageMin = Energy / 18 -- Minimum Curse Damage
CurseDamageMax = Energy / 10 + 0.015 -- Minimum Curse Damage

return MagicDamageMin, MagicDamageMax, CurseDamageMin, CurseDamageMax
end
Expand Down Expand Up @@ -435,13 +441,17 @@ function CalcDefenseSuccessRate_PvM(Class, Strength, Dexterity, Vitality, Energy
end

-- Character Defense - General
function CalcDefense(Class, Dexterity)
function CalcDefense(Class, Dexterity, IsSpecialBuff)
local Defense = 0

if(Class == CLASS_WIZARD) then
Defense = Dexterity / 4
elseif(Class == CLASS_KNIGHT) then
Defense = Dexterity / 3
if (IsSpecialBuff == true) then -- Strong Belief
Defense = Dexterity / 2
else
Defense = Dexterity / 3
end
elseif(Class == CLASS_ELF) then
Defense = Dexterity / 10
elseif(Class == CLASS_GLADIATOR) then
Expand Down
25 changes: 11 additions & 14 deletions Data/Scripts/Skills/MasterSkillCalc_3rd.lua
View file
Expand Up @@ -1044,7 +1044,7 @@ function RageFighterPhoenixShot_Level2(InDamage, Dexterity, Vitality)
return OutDamage
end

-- SkillID: 765, Burst Enhancement - (Grand Rune Master)
-- SkillID: 765, Burst Strengthener - (Grand Rune Master)
function RuneWizardBurstCalc_Level1(Energy)
local SkillEffect1 = Energy / 30
local SkillEffect2 = Energy / 100
Expand All @@ -1053,19 +1053,19 @@ function RuneWizardBurstCalc_Level1(Energy)
return SkillEffect1, SkillEffect2, SkillTime
end

-- SkillID: 765, Burst Enhancement - (Grand Rune Master)
function RuneWizardHasteCalc_Level1(Index, TargetIndex, TargetClass, Energy)
local SkillEffect1 = Energy / 100
local SkillEffect2 = Energy / 30
-- SkillID: 766, Burst Mastery - (Grand Rune Master)
function RuneWizardBurstCalc_Level2(Energy)
local SkillEffect1 = Energy / 30
local SkillEffect2 = Energy / 100
local SkillTime = Energy / 20 + 30

return SkillEffect1, SkillEffect2, SkillTime
end

-- SkillID: 766, Burst Mastery - (Grand Rune Master)
function RuneWizardBurstCalc_Level2(Energy)
local SkillEffect1 = Energy / 30
local SkillEffect2 = Energy / 100
-- SkillID: 768, Haste Strengthener - (Grand Rune Master)
function RuneWizardHasteCalc_Level1(Index, TargetIndex, TargetClass, Energy)
local SkillEffect1 = Energy / 100
local SkillEffect2 = Energy / 30
local SkillTime = Energy / 20 + 30

return SkillEffect1, SkillEffect2, SkillTime
Expand Down Expand Up @@ -1261,12 +1261,9 @@ function StrikeOfDestructionCalc_MasterLevel2_Knight(InDamage, Strength, Dexteri
end

-- SkillID: 810, Strong Belief Strengthener
function KnightStrongBelief_MasterLevel1(NormalLevel, MasterLevel, Strength, Dexterity, Vitality, Energy, SkillTreeValue)
local DefenseUp = 20 + SkillTreeValue
local DmgDownPercent = 10 -- 1-100
function KnightStrongBelief_MasterLevel1(NormalLevel, MasterLevel, Strength, Dexterity, Vitality, Energy)
local Duration = (NormalLevel + MasterLevel) / 4 + 20

return DefenseUp, DmgDownPercent, Duration
return Duration
end

-- SkillID: 811, Tornado Cutting Strengthener
Expand Down
5 changes: 1 addition & 4 deletions Data/Scripts/Skills/RegularSkillCalc.lua
View file
Expand Up @@ -959,11 +959,8 @@ end

-- SkillID: 1502, Strong Belief
function KnightStrongBelief(NormalLevel, MasterLevel, Strength, Dexterity, Vitality, Energy)
local DefenseUp = 20
local DmgDownPercent = 8 -- 1-100
local Duration = (NormalLevel + MasterLevel) / 4 + 20

return DefenseUp, DmgDownPercent, Duration
return Duration
end

-- SkillID: 1503, Solid Protection
Expand Down

0 comments on commit f2c22fd

Please sign in to comment.