Skip to content

Commit

Permalink
Job Improvement Project - Rune Knight (Part 2) (#4709)
Browse files Browse the repository at this point in the history 
* Fixes #4708.
* kRO Changelog: http://ro.gnjoy.com/news/update/View.asp?seq=243&curpage=1
Thanks to @ecdarreola, @Litro, @Haydrich, and @LordWhiplash!
  • Loading branch information
@aleos89
aleos89 committed May 18, 2020
1 parent d1e5127 commit 44e5c5b
Show file tree
Hide file tree
Showing 13 changed files with 205 additions and 187 deletions.
30 changes: 15 additions & 15 deletions db/re/item_db.txt
View file
Expand Up @@ -7044,23 +7044,23 @@
//===================================================================
// Rune Knight's Rune Stones
//===================================================================
12725,Runstone_Nosiege,Nauthiz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1; },{},{}
12726,Runstone_Rhydo,Raido Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1; },{},{}
12727,Runstone_Verkana,Berkana Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1; },{},{}
12728,Runstone_Isia,Isa Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1; },{},{}
12729,Runstone_Asir,Othila Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1; },{},{}
12730,Runstone_Urj,Uruz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1; },{},{}
12731,Runstone_Turisus,Thurisaz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1; },{},{}
12732,Runstone_Pertz,Wyrd Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1; },{},{}
12733,Runstone_Hagalas,Hagalaz Rune,2,100,,100,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1; },{},{}
12725,Runstone_Nosiege,Nauthiz Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_REFRESH",1; },{},{}
12726,Runstone_Rhydo,Raido Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_CRUSHSTRIKE",1; },{},{}
12727,Runstone_Verkana,Berkana Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_MILLENNIUMSHIELD",1; },{},{}
12728,Runstone_Isia,Isa Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_VITALITYACTIVATION",1; },{},{}
12729,Runstone_Asir,Othila Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_FIGHTINGSPIRIT",1; },{},{}
12730,Runstone_Urj,Uruz Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_ABUNDANCE",1; },{},{}
12731,Runstone_Turisus,Thurisaz Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_GIANTGROWTH",1; },{},{}
12732,Runstone_Pertz,Wyrd Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STORMBLAST",1; },{},{}
12733,Runstone_Hagalas,Hagalaz Rune,2,100,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) unitskilluseid getcharid(3),"RK_STONEHARDSKIN",1; },{},{}
//===================================================================
// Rune Knight Rune Ores
//===================================================================
12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 5; },{},{}
12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 11; },{},{}
12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 14; },{},{}
12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 2; },{},{}
12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 8; },{},{}
12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 8; },{},{}
12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 30; },{},{}
12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 60; },{},{}
12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 4; },{},{}
12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,56,2,,,,,,{ makerune 15; },{},{}
//===================================================================
// More usable items
//===================================================================
Expand Down Expand Up @@ -11371,7 +11371,7 @@
22536,WorkerScroll_B,Scroll Summoning Workers(Female),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22537,PrizeOfHero,Prize Of Hero,2,0,,100,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getrandgroupitem(IG_PrizeOfHero,1); },{},{}
22538,Hanbok_bag,Hanbok bag,2,0,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_HANBOK,600000,0; },{},{}
22540,Runstone_Lux,Lux Anima Runestone,11,2,,100,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
22540,Runstone_Lux,Lux Anima Runestone,11,2,,10,,,,,0xFFFFFFFF,56,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
22541,PC_Room_Coupon_Box_VI,PC Room Coupon Box VI,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{},{},{}
22542,Center_Potion_B,Concentration Potion,2,10,,100,,,,0,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,4; },{},{}
22543,Berserk_Potion_B,Berserk Potion,2,10,,200,,,,0,0x6,63,2,,,,,,{ sc_start SC_ASPDPOTION2,1800000,9; },{},{}
Expand Down
2 changes: 2 additions & 0 deletions db/re/item_delay.txt
View file
Expand Up @@ -99,6 +99,8 @@
//12207,60000 //Vit_Dish10_
22508,1200000 //Para_Team_Mark_

22540,5000,SC_REUSE_LIMIT_LUXANIMA //Runstone_Lux

// Bed of Honor
22687,5000,SC_REUSE_LIMIT_F // Pieces_Of_Sentiment

Expand Down
9 changes: 0 additions & 9 deletions db/re/item_stack.txt
View file
Expand Up @@ -17,14 +17,5 @@
// Example:
// 512,4,12 // Will not allow more than 4 Apples in storages.

// Rune Knight
12725,60,1 // Nauthiz Rune
12726,60,1 // Raido Rune
12727,60,1 // Berkana Rune
12728,60,1 // Isa Rune
12730,60,1 // Uruz Rune
12733,60,1 // Hagalaz Rune
22540,60,1 // Lux Anima Rune

// Arch Bishop
12333,3,1 // Ancilla
90 changes: 65 additions & 25 deletions db/re/skill_db.yml
View file
Expand Up @@ -17392,6 +17392,8 @@ Body:
MaxLevel: 10
Type: Weapon
TargetType: Attack
DamageFlags:
Critical: true
Range:
- Level: 1
Size: 7
Expand Down Expand Up @@ -17488,10 +17490,33 @@ Body:
MaxLevel: 10
Type: Weapon
TargetType: Attack
Range: 5
DamageFlags:
Splash: true
Range: 7
Hit: Multi_Hit
HitCount: -5
Element: Weapon
SplashArea:
- Level: 1
Area: 1
- Level: 2
Area: 1
- Level: 3
Area: 1
- Level: 4
Area: 1
- Level: 5
Area: 2
- Level: 6
Area: 2
- Level: 7
Area: 2
- Level: 8
Area: 2
- Level: 9
Area: 3
- Level: 10
Area: 3
CastTime:
- Level: 1
Time: 1000
Expand Down Expand Up @@ -17526,33 +17551,50 @@ Body:
Description: Wind Cutter
MaxLevel: 5
Type: Weapon
TargetType: Ground
TargetType: Self
DamageFlags:
Splash: true
Range: 1
Hit: Single
HitCount: 1
Element: Wind
SplashArea: 2
Knockback: 3
Element: Weapon
SplashArea:
- Level: 1
Area: 1
- Level: 2
Area: 1
- Level: 3
Area: 2
- Level: 4
Area: 2
- Level: 5
Area: 3
CopyFlags:
Skill:
Reproduce: true
Duration1: 15000
Cooldown: 2000
FixedCastTime: -1
AfterCastActDelay: 1000
Cooldown:
- Level: 1
Time: 800
- Level: 2
Time: 650
- Level: 3
Time: 500
- Level: 4
Time: 350
- Level: 5
Time: 200
Requires:
SpCost:
- Level: 1
Amount: 20
Amount: 34
- Level: 2
Amount: 24
Amount: 38
- Level: 3
Amount: 28
Amount: 42
- Level: 4
Amount: 32
Amount: 46
- Level: 5
Amount: 36
Amount: 50
Weapon:
Dagger: true
1hSword: true
Expand All @@ -17567,6 +17609,7 @@ Body:
TargetType: Self
DamageFlags:
Splash: true
Critical: true
Hit: Single
HitCount: 1
Element: Weapon
Expand Down Expand Up @@ -17717,7 +17760,7 @@ Body:
Hit: Single
HitCount: 1
AfterCastActDelay: 1000
Duration1: 180000
Duration1: 900000
Duration2: 60000
FixedCastTime: -1
Requires:
Expand Down Expand Up @@ -17770,7 +17813,7 @@ Body:
Hit: Single
HitCount: 1
CastCancel: true
Duration1: 180000
Duration1: 900000
FixedCastTime: 1000
CastTimeFlags:
IgnoreDex: true
Expand All @@ -17788,7 +17831,7 @@ Body:
Hit: Single
HitCount: 1
CastCancel: true
Duration1: 180000
Duration1: 900000
Duration2: 10000
FixedCastTime: 2000
CastTimeFlags:
Expand All @@ -17807,7 +17850,7 @@ Body:
Hit: Single
HitCount: 1
CastCancel: true
Duration1: 180000
Duration1: 900000
FixedCastTime: -1
Requires:
SpCost: 1
Expand All @@ -17819,13 +17862,13 @@ Body:
TargetType: Self
DamageFlags:
Splash: true
Critical: true
Flags:
TargetTrap: true
Hit: Single
HitCount: 1
Element: Weapon
SplashArea: 3
Knockback: 7
CastTime: 2000
FixedCastTime: -1
Requires:
Expand All @@ -17840,9 +17883,8 @@ Body:
Splash: true
Hit: Single
HitCount: 1
SplashArea: -1
CastCancel: true
Duration1: 180000
Duration1: 900000
FixedCastTime: -1
Requires:
SpCost: 1
Expand All @@ -17858,7 +17900,7 @@ Body:
HitCount: 1
Element: Holy
CastCancel: true
Duration1: 180000
Duration1: 900000
FixedCastTime: -1
Requires:
SpCost: 1
Expand Down Expand Up @@ -31739,11 +31781,9 @@ Body:
TargetType: Self
DamageFlags:
NoDamage: true
Splash: true
Hit: Single
HitCount: 1
SplashArea: 3
Duration1: 60000
Duration1: 900000
FixedCastTime: -1
Requires:
SpCost: 1
Expand Down
3 changes: 2 additions & 1 deletion doc/item_bonus.txt
View file
Expand Up @@ -168,7 +168,8 @@ bonus2 bSkillUseSPrate,sk,n; Decreases SP consumption of skill sk by n%
Atk/Def
-------
bonus2 bSkillAtk,sk,n; Increases damage of skill sk by n%
bonus bLongAtkRate,n; Increases damage of ranged attacks by n%
bonus bShortAtkRate,n; Increases damage of short ranged attacks by n%
bonus bLongAtkRate,n; Increases damage of long ranged attacks by n%
bonus bCritAtkRate,n; Increases critical damage by +n%
bonus bCriticalDef,n; Decreases the chance of being hit by critical hits by n%
bonus2 bWeaponAtk,w,n; Adds n ATK when weapon of type w is equipped
Expand Down

2 comments on commit 44e5c5b

@Masao87
Copy link

@Masao87 Masao87 commented on 44e5c5b May 19, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has the new buff Icon for spear dynamo and aura blade been added with this release?

Source: https://www.divine-pride.net/forum/index.php?/topic/3723-kro-jobs-improvement-project/&tab=comments#comment-6275

Unbenannt

@qwerty7vp
Copy link
Contributor

@qwerty7vp qwerty7vp commented on 44e5c5b May 19, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

image

I mean the icons already there before this commit tho

Please sign in to comment.