summaryrefslogtreecommitdiff
path: root/db/re
diff options
context:
space:
mode:
Diffstat (limited to 'db/re')
-rw-r--r--db/re/exp_homun.txt2
-rw-r--r--db/re/item_chain.conf16
-rw-r--r--db/re/item_db.conf106
-rw-r--r--db/re/item_group.conf12
-rw-r--r--db/re/item_packages.conf10
-rw-r--r--db/re/job_db.conf54
-rw-r--r--db/re/level_penalty.txt2
-rw-r--r--db/re/map_zone_db.conf71
-rw-r--r--db/re/mob_db.txt3
-rw-r--r--db/re/mob_skill_db.txt6
-rw-r--r--db/re/pet_db.txt121
-rw-r--r--db/re/size_fix.txt4
-rw-r--r--db/re/skill_cast_db.txt94
-rw-r--r--db/re/skill_db.txt11
-rw-r--r--db/re/skill_require_db.txt6
-rw-r--r--db/re/skill_tree.conf142
-rw-r--r--db/re/skill_unit_db.txt10
17 files changed, 394 insertions, 276 deletions
diff --git a/db/re/exp_homun.txt b/db/re/exp_homun.txt
index 3c479cfa4..f74c5016c 100644
--- a/db/re/exp_homun.txt
+++ b/db/re/exp_homun.txt
@@ -148,4 +148,4 @@
8922000
8966000
9094000
-0
+0
diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf
index 744b1cbcf..57eaef05e 100644
--- a/db/re/item_chain.conf
+++ b/db/re/item_chain.conf
@@ -1,22 +1,20 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//================= More Information =================
// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
// Structure of file:
/*
-
ITMCHAIN_<Name>: {
<Item_Name>: <chance>
}
-
*/
ITMCHAIN_ORE: {
@@ -39,7 +37,7 @@ ITMCHAIN_ORE: {
Elunium: 20
Oridecon: 20
Gold: 10
- Emperium: 5
+ Emperium: 5
}
ITMCHAIN_GEM: {
@@ -58,7 +56,7 @@ ITMCHAIN_GEM: {
Crystal_Jewel: 150
Crystal_Jewel_: 80
Crystal_Jewel__: 50
- Crystal_Jewel___: 30
+ Crystal_Jewel___: 30
}
ITMCHAIN_HEAL: {
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 53d217551..c00cc9d9b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -21094,9 +21094,9 @@ item_db: (
bonus2 bAddRaceTolerance,RC_NonBoss,30;
bonus2 bAddRaceTolerance,RC_Boss,30;
bonus bUnbreakableShield,0;
-/* When you receive Melee Physical damage, chance of casting Protective Light for 60 seconds. */
-/* Cancels Stun, Sleep, Curse, Stone Curse, Poison, Blind, Silence, Bleeding, Chaos, and Frozen. */
-/* Protects the user against such effects for a set duration. */
+/* When you receive Melee Physical damage, chance of casting Protective Light for 60 seconds. */
+/* Cancels Stun, Sleep, Curse, Stone Curse, Poison, Blind, Silence, Bleeding, Chaos, and Frozen. */
+/* Protects the user against such effects for a set duration. */
">
},
{
@@ -40704,7 +40704,7 @@ item_db: (
bonus bInt,1;
bonus bIgnoreMdefRate,2;
bonus bIgnoreMdefRate,getrefine()/4;
- }
+ }
">
},
{
@@ -41726,7 +41726,7 @@ item_db: (
Loc: 16
Script: <"
bonus bAtk,30;
- /* When attacked by enemy, drain 5 SP from user. */
+ /* When attacked by enemy, drain 5 SP from user. */
">
},
{
@@ -48393,8 +48393,7 @@ item_db: (
Loc: 256
View: 341
Script: <"
-
- bonus bLuk,3;
+ bonus bLuk,3;
bonus2 bAddRaceTolerance,RC_Angel, 5;
bonus2 bAddRace,RC_Angel, 5;
bonus2 bMagicAddRace,RC_Angel,5;
@@ -57747,7 +57746,7 @@ item_db: (
bonus2 bSubEle,Ele_Neutral,5;
bonus2 bAddRaceTolerance,RC_Dragon,5;
bonus2 bHPLossRate,600,4000;
- bonus3 bAutoSpellWhenHit,HP_ASSUMPTIO,5,20; /* Custom - IRO */
+ bonus3 bAutoSpellWhenHit,HP_ASSUMPTIO,5,20; /* Custom - IRO */
bonus bUnbreakableHelm,0;
">
},
@@ -57852,7 +57851,7 @@ item_db: (
EquipLv: 10
View: 1105
Script: <"
- bonus5 bAutoSpell,DC_SCREAM,5,50,BF_WEAPON|BF_MAGIC,0; /* Custom - TWRO */
+ bonus5 bAutoSpell,DC_SCREAM,5,50,BF_WEAPON|BF_MAGIC,0; /* Custom - TWRO */
">
},
{
@@ -64478,8 +64477,8 @@ item_db: (
},
{
Id: 6593
- AegisName: "Cryptura_Hair_Coupon"
- Name: "Kuritura Hairstyle Coupon"
+ AegisName: "Criatura_Hair_Coupon"
+ Name: "Criatura Hair Coupon"
Buy: 0
Trade: {
nodrop: true
@@ -75013,6 +75012,13 @@ item_db: (
Weight: 10
},
{
+ Id: 11060
+ AegisName: "Energy_Xtal_Combi_Book"
+ Name: "Energy Crystal Book"
+ Buy: 0
+ Weight: 10
+},
+{
Id: 11500
AegisName: "Light_Yellow_Pot"
Name: "Light Yellow Potion"
@@ -85893,6 +85899,39 @@ item_db: (
">
},
{
+ Id: 12845
+ AegisName: "Amatsu_Butterfly_Wing"
+ Name: "Amatsu Butterfly Wing"
+},
+{
+ Id: 12846
+ AegisName: "Little_Unripe_Apple"
+ Name: "Little Unripe Apple"
+ Type: 2
+ Buy: 10
+ Weight: 50
+ Nouse: {
+ sitting: true
+ }
+ Script: <" pet 2398; ">
+},
+{
+ Id: 12847
+ AegisName: "Old_Equipment_Box"
+ Name: "Old Equipment Box"
+ Type: 0
+ Weight: 10
+ Trade: {
+ nodrop: true
+ notrade: true
+ noselltonpc: true
+ nocart: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+},
+{
Id: 12848
AegisName: "Falcon_Flute"
Name: "Falcon Flute"
@@ -112187,7 +112226,7 @@ item_db: (
Loc: 16
EquipLv: 105
Script: <"
- bonus3 bAutoSpell,DC_WINKCHARM,1,20; /* Custom - IDRO */
+ bonus3 bAutoSpell,DC_WINKCHARM,1,20; /* Custom - IDRO */
if(getrefine()>4) { bonus bCritAtkRate,4; }
if(getrefine()>6) { bonus bCritAtkRate,6; }
">
@@ -117780,7 +117819,7 @@ item_db: (
bonus bMdef,3;
bonus bHit,10;
bonus bDelayrate,-5;
- if(getrefine()>6) { bonus2 bAddMonsterDropItem,522,(getrefine()*100)-600; } /* Custom - KRO */
+ if(getrefine()>6) { bonus2 bAddMonsterDropItem,522,(getrefine()*100)-600; } /* Custom - KRO */
">
},
{
@@ -118514,7 +118553,6 @@ item_db: (
EquipLv: 10
View: 729
Script: <"
-
bonus bMdef,3;
bonus2 bAddRaceTolerance,RC_Dragon,5;
bonus2 bAddRace,RC_Dragon,5;
@@ -119308,9 +119346,9 @@ item_db: (
EquipLv: 10
View: 766
Script: <"
- bonus bMdef,3;
- autobonus "{ bonus bAtkEle,Ele_Dark; }",30,60000;
- bonus2 bSubEle,Ele_Holy,-10;
+ bonus bMdef,3;
+ autobonus "{ bonus bAtkEle,Ele_Dark; }",30,60000;
+ bonus2 bSubEle,Ele_Holy,-10;
bonus2 bSubRace,RC_Angel,-10;
">
},
@@ -120023,7 +120061,7 @@ item_db: (
EquipLv: 80
View: 804
Script: <"
- bonus2 bHPDrainRate,10*(5+1*(getrefine()>7)+2*(getrefine()>8)+2*(getrefine()>9)),1+2*(getrefine()>5)+2*(getrefine()>7)+3*(getrefine()>9);
+ bonus2 bHPDrainRate,10*(5+1*(getrefine()>7)+2*(getrefine()>8)+2*(getrefine()>9)),1+2*(getrefine()>5)+2*(getrefine()>7)+3*(getrefine()>9);
bonus2 bSPDrainRate,10*(5+1*(getrefine()>8)+2*(getrefine()>9)),1+(getrefine()>7)+2*(getrefine()>9);
">
},
@@ -120363,9 +120401,9 @@ item_db: (
Loc: 256
View: 11
Script: <"
- bonus bAgi,3;
- bonus bAspdRate,1;
- bonus2 bSPLossRate,5,10000;
+ bonus bAgi,3;
+ bonus bAspdRate,1;
+ bonus2 bSPLossRate,5,10000;
">
},
{
@@ -120745,7 +120783,7 @@ item_db: (
Refine: false
View: 844
Script: <"
- bonus2 bSubRace,RC_Fish,15;
+ bonus2 bSubRace,RC_Fish,15;
bonus3 bAddMonsterDropItem,579,RC_Fish,5;
">
},
@@ -121163,7 +121201,7 @@ item_db: (
},
{
Id: 18730
- AegisName: "Cryptura_Academy_Hat"
+ AegisName: "Criatura_Academy_Hat"
Name: "Criatura Hat"
Type: 5
Buy: 100
@@ -121404,7 +121442,6 @@ item_db: (
Loc: 256
View: 888
Script: <"
-
bonus bStr,2;
bonus bMaxHP,100;
">
@@ -122066,7 +122103,7 @@ item_db: (
EquipLv: 20
View: 899
Script: <"
- bonus2 bAddMonsterDropItem,921,100+((getrefine()/2)*20); /* Custom - JRO */
+ bonus2 bAddMonsterDropItem,921,100+((getrefine()/2)*20); /* Custom - JRO */
bonus2 bAddMonsterDropItem,7033,100+((getrefine()/2)*20);
">
},
@@ -122167,7 +122204,7 @@ item_db: (
bonus2 bSkillAtk,WL_CHAINLIGHTNING,5;
bonus2 bIgnoreMdefRate,RC_NonBoss,10;
bonus2 bIgnoreMdefRate,RC_NonBoss,getrefine()*2;
- if(getrefine()>6) {
+ if(getrefine()>6) {
bonus2 bSkillAtk,WL_CRIMSONROCK,5;
bonus2 bSkillAtk,WL_JACKFROST,5;
bonus2 bSkillAtk,WL_EARTHSTRAIN,5;
@@ -123663,7 +123700,7 @@ item_db: (
View: 1034
Script: <"
bonus bAllStats,1;
- bonus5 bAutoSpellWhenHit,AL_RUWACH,1,50,BF_WEAPON,0; /* Custom - PRO */
+ bonus5 bAutoSpellWhenHit,AL_RUWACH,1,50,BF_WEAPON,0; /* Custom - PRO */
">
},
{
@@ -123679,7 +123716,7 @@ item_db: (
View: 1035
Script: <"
bonus bAllStats,1;
- bonus5 bAutoSpellWhenHit,AL_RUWACH,1,50,BF_WEAPON,0; /* Custom - PRO */
+ bonus5 bAutoSpellWhenHit,AL_RUWACH,1,50,BF_WEAPON,0; /* Custom - PRO */
">
},
{
@@ -123785,7 +123822,7 @@ item_db: (
View: 1065
Script: <"
bonus bDex,2;
- bonus5 bAutoSpellWhenHit,WZ_STORMGUST,5,50,BF_WEAPON,0; /* Custom - IRO */
+ bonus5 bAutoSpellWhenHit,WZ_STORMGUST,5,50,BF_WEAPON,0; /* Custom - IRO */
if(getrefine()>=8) { bonus bDex,1+((getrefine()/2)-4); }
">
},
@@ -123997,8 +124034,8 @@ item_db: (
bonus bStr,3;
bonus bAtkRate,4;
if(BaseLevel<100) { bonus bStr,getrefine()/2; } else { bonus bStr,getrefine(); }
- /* +Giant Lance, when using Joint Beat, auto cast Lv.1 Spiral pierce, */
- /* every refine of lance increase the chance of trigger and increase damage of spiral pierce by 5%. */
+ /* +Giant Lance, when using Joint Beat, auto cast Lv.1 Spiral pierce, */
+ /* every refine of lance increase the chance of trigger and increase damage of spiral pierce by 5%. */
">
},
{
@@ -124015,7 +124052,7 @@ item_db: (
bonus bDefRate,-50;
bonus bMdefRate,-50;
bonus2 bSubRace,RC_Insect,getrefine();
- bonus3 bAutoSpell,NPC_WIDECONFUSE,2,100+(getrefine()*10); /* Custom - JRO */
+ bonus3 bAutoSpell,NPC_WIDECONFUSE,2,100+(getrefine()*10); /* Custom - JRO */
">
},
{
@@ -124965,8 +125002,7 @@ item_db: (
Refine: false
View: 712
Script: <"
-
- bonus bUnbreakableHelm,0;
+ bonus bUnbreakableHelm,0;
bonus2 bAddRaceTolerance,RC_Angel,1;
bonus2 bAddRaceTolerance,RC_Demon,1;
bonus3 bAddMonsterDropItem,523,RC_Angel,400;
@@ -132001,7 +132037,7 @@ item_db: (
View: 3
Script: <"
bonus bCritAtkRate,getrefine()*2;
- bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50; /* Custom - JRO */
+ bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50; /* Custom - JRO */
">
},
{
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 699be4048..82a17a339 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -1,19 +1,19 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//================= More Information =================
// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
// Structure of file:
/*
<Container_Item_Name>: (
- "Item_Name" or
+ "Item_Name" or
("Item_Name",Repeat_Count)
)
*/
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index 8fc9a2e17..0c90d737c 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -1,12 +1,12 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//================= More Information =================
// http://herc.ws/board/topic/1244-official-item-grouppackagechain
//====================================================
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 38d79597b..d7a2e6679 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -1,12 +1,12 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//================= More Information =================
// http://herc.ws/board/topic/9082-job-db1txt-redesign/
//============== RE Structure Example ================
@@ -92,7 +92,7 @@ Novice: {
121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
- 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
}
Swordsman: {
Weight: 28000
@@ -139,7 +139,7 @@ Swordsman: {
232, 234, 236, 238, 240, 242, 244, 246, 248, 250, // 111 - 120
252, 254, 256, 258, 260, 262, 264, 266, 268, 270, // 121 - 130
272, 274, 276, 278, 280, 282, 284, 286, 288, 290, // 131 - 140
- 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150
+ 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150
}
Magician: {
Weight: 22000
@@ -180,7 +180,7 @@ Magician: {
676, 682, 688, 694, 700, 706, 712, 718, 724, 730, // 111 - 120
736, 742, 748, 754, 760, 766, 772, 778, 784, 790, // 121 - 130
796, 802, 808, 814, 820, 826, 832, 838, 844, 850, // 131 - 140
- 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150
+ 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150
}
Archer: {
Weight: 26000
@@ -248,7 +248,7 @@ Acolyte: {
565, 570, 575, 580, 585, 590, 595, 600, 605, 610, // 111 - 120
615, 620, 625, 630, 635, 640, 645, 650, 655, 660, // 121 - 130
665, 670, 675, 680, 685, 690, 695, 700, 705, 710, // 131 - 140
- 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150
+ 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150
}
Merchant: {
Weight: 28000
@@ -277,7 +277,7 @@ Merchant: {
343, 346, 349, 352, 355, 358, 361, 364, 367, 370, // 111 - 120
373, 376, 379, 382, 385, 388, 391, 394, 397, 400, // 121 - 130
403, 406, 409, 412, 415, 418, 421, 424, 427, 430, // 131 - 140
- 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150
+ 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150
}
Thief: {
Weight: 24000
@@ -405,7 +405,7 @@ Wizard: {
1009, 1018, 1027, 1036, 1045, 1054, 1063, 1072, 1081, 1090, // 111 - 120
1099, 1108, 1117, 1126, 1135, 1144, 1153, 1162, 1171, 1180, // 121 - 130
1189, 1198, 1207, 1216, 1225, 1234, 1243, 1252, 1261, 1270, // 131 - 140
- 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150
+ 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150
}
Blacksmith: {
Weight: 30000
@@ -547,7 +547,7 @@ Crusader: {
531, 536, 541, 545, 550, 555, 559, 564, 569, 574, // 111 - 120
578, 583, 588, 592, 597, 602, 606, 611, 616, 621, // 121 - 130
625, 630, 635, 639, 644, 649, 653, 658, 663, 668, // 131 - 140
- 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150
+ 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150
}
Rogue: {
Weight: 24000
@@ -721,7 +721,7 @@ Taekwon: {
200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 111 - 120
200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 121 - 130
200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 131 - 140
- 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150
+ 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150
}
Star_Gladiator: {
Inherit: ("Taekwon")
@@ -754,7 +754,7 @@ Star_Gladiator: {
500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 111 - 120
500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 121 - 130
500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 131 - 140
- 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150
+ 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150
}
Soul_Linker: {
Weight: 24000
@@ -794,7 +794,7 @@ Soul_Linker: {
900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 111 - 120
900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 121 - 130
900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 131 - 140
- 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150
+ 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150
}
Gunslinger: {
Weight: 28000
@@ -822,7 +822,7 @@ Gunslinger: {
528, 534, 540, 546, 552, 558, 564, 570, 576, 582, // 111 - 120
588, 594, 600, 606, 612, 618, 624, 630, 636, 642, // 121 - 130
648, 654, 660, 666, 672, 678, 684, 690, 696, 702, // 131 - 140
- 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150
+ 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150
}
Ninja: {
Weight: 26000
@@ -912,7 +912,7 @@ Rune_Knight: {
Mace: 45
TwoHandMace: 52
Shield: 5
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -959,7 +959,7 @@ Warlock: {
Rod: 50
TwoHandRod: 56
Shield: 5
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1004,7 +1004,7 @@ Ranger: {
Dagger: 50
Bow: 49
Shield: 8
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1102,7 +1102,7 @@ Mechanic: {
Mace: 48
TwoHandMace: 50
Shield: 6
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1154,7 +1154,7 @@ Guillotine_Cross: {
/* GrenadeLauncher: 100 */
/* FuumaShuriken: 110 */
Shield: 9
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1284,7 +1284,7 @@ Sorcerer: {
Book: 45
TwoHandRod: 55
Shield: 5
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1358,7 +1358,7 @@ Wanderer: {
Bow: 49
Whip: 44
Shield: 7
- }
+ }
}
Sura: {
Weight: 30000
@@ -1371,7 +1371,7 @@ Sura: {
Knuckle: 39
TwoHandRod: 50
Shield: 5
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1403,7 +1403,7 @@ Genetic: {
Mace: 44
TwoHandMace: 48
Shield: 4
- }
+ }
HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30
@@ -1501,7 +1501,7 @@ Oboro: {
}
Rebellion: {
Inherit: ("Gunslinger")
- InheritHP: ("Soul_Linker")
+ InheritHP: ("Soul_Linker")
}
Novice_High: {
Inherit: ("Novice")
@@ -1712,4 +1712,4 @@ Expanded_Super_Novice: {
}
Expanded_Super_Baby: {
Inherit: ("Novice")
-} \ No newline at end of file
+}
diff --git a/db/re/level_penalty.txt b/db/re/level_penalty.txt
index 81b33c141..882aca91b 100644
--- a/db/re/level_penalty.txt
+++ b/db/re/level_penalty.txt
@@ -7,7 +7,7 @@
// 1=experience, 2=item drop
// RACE:
// 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect,
-// 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon,
+// 5=Fish, 6=Demon, 7=Demi-Human, 8=Angel, 9=Dragon,
// 10=Boss monsters, 11=Normal monsters
//
// Note: RENEWAL_DROP and/or RENEWAL_EXP must be enabled.
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index be7d3317a..0622368a6 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -1,12 +1,12 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//====================================================
//= Hercules Map Zone Database [Ind/Hercules]
//================ More Information ==================
@@ -24,7 +24,6 @@
//= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE
//====================================================
-
zones: (
{
/* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */
@@ -41,10 +40,10 @@ zones: (
//Apple: true
//ID501: true
}
-
+
mapflags: (
)
-
+
/* "command:min-group-lv-to-override" e.g. "heal: 70" */
disabled_commands: {
//Example Below makes @heal be used in maps within this zone only by those group lv 70 and above
@@ -61,7 +60,7 @@ zones: (
/* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */
/* However, it wont be applied to maps with its own zones (specified through mapflag) */
name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */
-
+
disabled_skills: {
WM_LULLABY_DEEPSLEEP: "PLAYER"
WM_SIRCLEOFNATURE: "PLAYER"
@@ -69,7 +68,7 @@ zones: (
SO_ARRULLO: "PLAYER"
CG_HERMODE: "PLAYER"
}
-
+
disabled_items: {
Velum_Jamadhar: true
Velum_Scare: true
@@ -106,22 +105,22 @@ zones: (
}
mapflags: (
)
-
+
},
{
/* PvP zone is applied to all maps with a pvp mapflag */
name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */
-
+
disabled_skills: {
BS_GREED: "PLAYER"
CG_HERMODE: "PLAYER"
}
-
+
disabled_items: {
Greed_Scroll: true
C_Beginner_Cap: true
}
-
+
/* cashshop disabled in pvp maps */
mapflags: (
"nocashshop",
@@ -131,13 +130,13 @@ zones: (
/* PK Mode zone is only used when server is on pk_mode (battle.conf),
it applies to all pvp maps that don't have their own zone */
name: "PK Mode" /* changing this name requires MAP_ZONE_PK_NAME to also be changed in src/map/map.h file */
-
+
disabled_skills: {
-
+
}
-
+
disabled_items: {
-
+
}
/* PK Mode Damage Reductions */
@@ -157,7 +156,7 @@ zones: (
{
/* GvG zone is applied to all maps with a gvg mapflag */
name: "GvG" /* changing this name requires MAP_ZONE_GVG_NAME to also be changed in src/map/map.h file */
-
+
disabled_skills: {
AL_TELEPORT: "PLAYER"
AL_WARP: "PLAYER"
@@ -177,7 +176,7 @@ zones: (
SC_FATALMENACE: "PLAYER"
SC_DIMENSIONDOOR: "PLAYER"
}
-
+
disabled_items: {
Assumptio_5_Scroll: true
Greed_Scroll: true
@@ -235,12 +234,12 @@ zones: (
"nocashshop",
"gvg_noparty",
)
-
+
},
{
/* Battlegrounds zone is applied to all maps with a battlegrounds mapflag */
name: "Battlegrounds" /* changing this name requires MAP_ZONE_BG_NAME to also be changed in src/map/map.h file */
-
+
disabled_skills: {
AL_TELEPORT: "PLAYER"
AL_WARP: "PLAYER"
@@ -312,8 +311,8 @@ zones: (
Siege_Suits: true
Siege_Robe: true
C_Beginner_Cap: true
- }
-
+ }
+
/* knockback disabled */
/* Battlegrounds Damage Reductions */
/* - weapon_damage_rate -30% */
@@ -333,7 +332,7 @@ zones: (
},
{
name: "Aldebaran Turbo Track"
-
+
disabled_skills: {
SM_ENDURE: "PLAYER"
AL_TELEPORT: "PLAYER"
@@ -354,7 +353,7 @@ zones: (
SC_DIMENSIONDOOR: "PLAYER"
GN_CARTBOOST: "PLAYER"
}
-
+
disabled_items: {
Wing_Of_Fly: true
Anodyne: true
@@ -364,12 +363,12 @@ zones: (
},
{
name: "Jail"
-
+
disabled_skills: {
TK_JUMPKICK: "PLAYER"
TK_HIGHJUMP: "PLAYER"
}
-
+
disabled_items: {
Wing_Of_Fly: true
Wing_Of_Butterfly: true
@@ -382,14 +381,14 @@ zones: (
},
{
name: "Izlude Battle Arena"
-
+
disabled_skills: {
RG_INTIMIDATE: "PLAYER"
AL_TELEPORT: "PLAYER"
SC_FATALMENACE: "PLAYER"
- SC_DIMENSIONDOOR: "PLAYER"
+ SC_DIMENSIONDOOR: "PLAYER"
}
-
+
disabled_items: {
Wing_Of_Fly: true
}
@@ -397,7 +396,7 @@ zones: (
{
name: "GvG2"
inherit: ( "GvG" ) /* will import all gvg has */
-
+
disabled_skills: {
TK_HIGHJUMP: "PLAYER"
SA_ABRACADABRA: "PLAYER"
@@ -405,7 +404,7 @@ zones: (
},
{
name: "Sealed Shrine"
-
+
disabled_skills: {
MG_SAFETYWALL: "PLAYER"
AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY"
@@ -418,7 +417,7 @@ zones: (
},
{
name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
-
+
disabled_skills: {
AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY"
WZ_ICEWALL: "PLAYER"
@@ -431,7 +430,7 @@ zones: (
},
{
name: "Towns"
-
+
disabled_skills: {
AM_CANNIBALIZE: "PLAYER"
AM_SPHEREMINE: "PLAYER"
@@ -441,7 +440,7 @@ zones: (
WM_POEMOFNETHERWORLD: "PLAYER"
GN_WALLOFTHORN: "PLAYER"
}
-
+
disabled_items: {
Greed_Scroll: true
Velum_Jamadhar: true
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index d1f21667a..a212b3632 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -1547,7 +1547,7 @@
//2395,SEIREN
//2396,POSEIDON
//2397,KRAKEN_BABY
-2398,LITTLE_PORING,LITTLE_PORING,Baby Poring,1,40,1,18,10,1,8,1,2,5,6,1,1,0,6,5,10,12,0,3,21,0x0,400,1872,672,480,0,0,0,0,0,0,0,909,9000,1202,100,938,1000,512,5000,507,1000,512,500,507,1000,0,0,0,0,4545,100
+2398,LITTLE_PORING,LITTLE_PORING,Baby Poring,1,40,1,18,10,1,8,1,2,5,6,1,1,0,6,5,10,12,0,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,9000,1202,100,938,1000,512,5000,507,1000,512,500,507,1000,0,0,0,0,4545,100
//2399,E_MINI_DEMON
//2400,E_DIABOLIC
2401,G_PORING,G_PORING,Poring,1,60,1,0,0,1,8,1,2,5,6,1,1,0,6,5,10,12,1,3,21,0x0,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -2363,6 +2363,7 @@
//3353,PAD_PLESIOS
//3354,PAD_BRACHY
//3355,PAD_BRACHYS
+
// 2014 Halloween Event
3381,DARK_SOUL,Dark Soul,Dark Soul,10,20,1,0,0,1,20,20,0,0,1,1,1,1,1,1,0,0,1,6,27,0x81,100,1960,960,504,0,0,0,0,0,0,0,12192,2000,6914,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3382,WANDERING_SOUL,Wandering Soul,Wandering Soul,1,10,1,0,0,1,10,10,0,0,1,1,1,1,1,1,0,0,1,6,28,0x81,100,912,1248,576,0,0,0,0,0,0,0,12192,2000,6915,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 04c870045..a521a348a 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -1,4 +1,4 @@
-// Mob Skill Database
+// Mob Skill Database
// Based on Aegis Episode 14.2
//
// Structure of Database:
@@ -4202,7 +4202,7 @@
1794,Roween@NPC_COMBOATTACK,attack,171,4,500,500,5000,no,target,always,,,,,,,6,
1794,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,,22,0x308D,,,,,
1794,Roween@NPC_WINDATTACK,attack,187,2,500,500,5000,no,target,always,,,,,,,,
-// Guild Dungeon SE (13.1)
+// Guild Dungeon SE (13.1)
1796,Aunoe@AL_HEAL,attack,28,5,3000,0,5000,yes,friend,friendhpltmaxrate,50,,,,,,3,
1796,Aunoe@AL_HEAL,idle,28,5,3000,0,5000,yes,friend,friendhpltmaxrate,50,,,,,,3,
1796,Aunoe@AL_HEAL,chase,28,5,3000,0,5000,yes,friend,friendhpltmaxrate,50,,,,,,3,
@@ -9960,4 +9960,4 @@
//3074,Timeholder@NPC_HELLJUDGEMENT,attack,662,10,10000,1000,10000,no,self,always,0,,,,,,,
//3074,Timeholder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,,
//3074,Timeholder@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,,
-//3074,Timeholder@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,, \ No newline at end of file
+//3074,Timeholder@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,,
diff --git a/db/re/pet_db.txt b/db/re/pet_db.txt
new file mode 100644
index 000000000..bc0c91932
--- /dev/null
+++ b/db/re/pet_db.txt
@@ -0,0 +1,121 @@
+// Pet Database
+//
+// Structure of Database:
+// MobID,Name,JName,LureID,EggID,EquipID,FoodID,Fullness,HungryDelay,R_Hungry,R_Full,Intimate,Die,Capture,Speed,S_Performance,talk_convert_class,attack_rate,defence_attack_rate,change_target_rate,pet_script,loyal_script
+//
+// 01. MobID Monster ID of the pet.
+// 02. Name Name of the monster as defined in the database.
+// 03. JName The display name of the monster when hatched.
+// 04. LureID Pet Tame Item ID.
+// 05. EggID Pet Egg ID.
+// 06. EquipID Pet Accessory ID.
+// 07. FoodID Pet Food ID.
+// 08. Fullness The amount of hunger points increasing with each feeding.
+// 09. HungryDelay The amount of time it takes for hunger to decrease after feeding. (Default: 60 seconds)
+// 10. R_Hungry Amount of Intimacy that is increased when fed.
+// 11. R_Full Amount of Intimacy that is decreased when over-fed.
+// 12. Intimate Amount of Intimacy the pet starts with.
+// 13. Die Amount of Intimacy that is decreased when the pet owner dies.
+// 14. Capture Capture succes rate (10000 = 100%)
+// 15. Speed Pet's walk speed. (Defaul: 150)
+// 16. S_Performance Special Performance. (Yes = 1, No = 0)
+// 17. talk_convert_class Disables pet talk (instead of talking they emote with /!.)
+// 18. attack_rate Rate of which the pet will attack (requires at least pet_support_min_friendly intimacy).
+// 19. defence_attack_rate Rate of which the pet will retaliate when master is being attacked (requires at least pet_support_min_friendly intimacy).
+// 20. change_target_rate Rate of which the pet will change its attack target.
+// 21. pet_script Script to execute when the pet is hatched.
+// 22. loyal_script Script to execute when the pet is hatched (requires at least pet_equip_min_friendly intimacy, independent of pet_script).
+//NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000.
+
+//In theory you can use any valid script, but it is run only once upon pet
+//loading, so it is recommended you use the specific pet scripts:
+
+//petskillattack skillid, skilllv, hits, rate, bonusrate
+//Skill attack that triggers while the pet is attacking. Rate is the base
+//chance of execution per attack. Bonusrate is an additional success rate when
+//intimacy reaches max. If hits is specified and different than 0, it will make
+//the pet cast the skill with a fixed amount of damage inflicted and the
+//specified number of hits. A value of zero uses the skill's defaults.
+
+//petskillsupport skillid, skilllv, delay, hp%, sp%
+//Casts a support skill when the health levels are below the specified hp% and
+//sp%. Delay is the minimum time in seconds before the skill can be cast again
+
+//petrecovery type, delay: Cures the "type" status effect after "delay" seconds
+
+//petskillbonus type, value, duration, delay
+//Gives bonus stats. Type is the stat to increase (bStr, bLuk), value is the
+//amount by which it is increased, duration signals how long the bonus lasts
+//delay is the time elapsed after the bonus ends and before it starts again.
+
+//A single pet can have petloot, petskillbonus, petskillattack and
+//petskillsupport at the same time, but only one of each.
+
+1002,PORING,Poring,619,9001,10013,531,80,60,50,100,250,20,2000,150,1,0,350,400,800,{ petloot 10; },{ bonus bLuk,2; bonus bCritical,1; }
+1113,DROPS,Drops,620,9002,10013,508,80,60,40,100,250,20,1500,150,1,0,300,400,500,{ petloot 10; },{ bonus bHit,3; bonus bAtk,3; }
+1031,POPORING,Poporing,621,9003,10013,511,80,60,30,100,250,20,1000,150,1,0,300,500,400,{ petloot 15; },{ bonus bLuk,2; bonus2 bSubEle,Ele_Poison,10; }
+1063,LUNATIC,Lunatic,622,9004,10007,534,80,60,40,100,250,20,1500,150,0,0,300,300,1000,{ petskillbonus bLuk,3,10,50; },{ bonus bCritical,2; bonus bAtk,2; }
+1049,PICKY,Picky,623,9005,10012,507,80,60,40,100,250,20,2000,150,1,0,500,600,50,{ petskillbonus bStr,3,10,50;},{ bonus bStr,1; bonus bAtk,5; }
+1011,CHONCHON,ChonChon,624,9006,10002,537,80,60,30,100,250,20,1500,150,1,0,500,500,250,{ petskillbonus bAgi,4,10,50; },{ bonus bAgi,1; bonus bFlee,2; }
+1042,STEEL_CHONCHON,Steel ChonChon,625,9007,10002,1002,80,60,20,100,250,20,1000,150,1,0,500,500,200,{ petskillbonus bAgiVit,4,20,40; },{ bonus bFlee,6; bonus bAgi,-1; }
+1035,HUNTER_FLY,Hunter Fly,626,9008,10002,716,80,60,10,100,250,20,500,150,1,0,500,500,200,{ petskillattack "NPC_WINDATTACK",888,2,0,10; },{ bonus bFlee,-5; bonus bFlee2,2; }
+1167,SAVAGE_BABE,Savage Babe,627,9009,10015,537,80,60,40,100,250,20,1500,150,0,0,500,500,200,{ petskillbonus bVit,4,10,50; },{ bonus bVit,1; bonus bMaxHP,50; }
+1107,DESERT_WOLF_B,Baby Desert Wolf,628,9010,10003,537,80,60,40,100,250,20,1000,150,0,0,400,400,400,{ petskillattack "SM_PROVOKE",1,0,0,5;},{ bonus bInt,1; bonus bMaxSP,50; }
+1052,ROCKER,Rocker,629,9011,10014,537,80,60,30,100,250,20,1500,150,0,0,350,350,600,{ petskillbonus bAllStats,1,10,50; },{ bonus bHPrecovRate,5; bonus bMaxHP,25; }
+1014,SPORE,Spore,630,9012,10017,537,80,60,30,100,250,20,1500,150,0,0,350,500,500,{ petrecovery SC_POISON,60; },{ bonus bHit,5; bonus bAtk,-2; }
+1077,POISON_SPORE,Poison Spore,631,9013,10017,537,80,60,20,100,250,20,1000,150,0,0,600,200,400,{ petskillattack "NPC_POISON",20,0,0,10; },{ bonus bStr,1; bonus bInt,1; }
+1019,PECOPECO,PecoPeco,632,9014,10010,537,80,60,30,100,250,20,1000,150,1,0,400,500,800,{ petskillbonus bSpeedRate,25,20,20; },{ bonus bMaxHP,150; bonus bMaxSP,-10; }
+1056,SMOKIE,Smokie,633,9015,10019,537,80,60,30,100,250,20,1000,150,1,0,600,600,100,{ petskillbonus bPerfectHide,1,3600,0; },{ bonus bAgi,1; bonus bFlee2,1; }
+1057,YOYO,Yoyo,634,9016,10018,532,80,60,20,100,250,20,1000,150,1,0,300,800,400,{ petloot 20; },{ bonus bCritical,3; bonus bLuk,-1; }
+1023,ORK_WARRIOR,Orc Warrior,635,9017,10009,537,80,60,20,100,250,20,500,150,1,0,600,200,300,{ petskillattack "NPC_PIERCINGATT",100,1,0,10; },{ bonus bAtk,10; bonus bDef,-3; }
+1026,MUNAK,Munak,636,9018,10008,537,80,60,20,100,250,20,500,150,0,0,300,750,300,{ petskillattack "NPC_DARKNESSATTACK",444,1,0,10; },{ bonus bInt,1; bonus bDef,1; }
+1110,DOKEBI,Dokebi,637,9019,10005,537,80,60,20,100,250,20,500,150,0,0,300,300,800,{ petskillattack "BS_HAMMERFALL",1,0,0,10; },{ bonus bMatkRate,1; bonus bAtkRate,-1; }
+1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petskillsupport AL_HEAL,10,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
+1029,ISIS,Isis,639,9021,10006,537,80,60,10,100,250,20,500,150,0,0,650,450,150,{ petskillsupport "PR_MAGNIFICAT",2,60,50,50; },{ bonus bMatkRate,-1; bonus bAtkRate,1; }
+1155,PETIT,Petite,640,9022,10011,537,80,60,20,100,250,20,500,150,0,0,800,400,100,{ petskillattack "WZ_HEAVENDRIVE",500,1,0,10; },{ bonus bDef,-2; bonus bMdef,-2; bonus bAspdRate,1; }
+1109,DEVIRUCHI,Deviruchi,641,9023,10004,711,80,60,10,100,250,20,500,150,0,0,800,200,100,{ petskillbonus bAgiDexStr,6,20,40; },{ bonus bMatkRate,1; bonus bAtkRate,1; bonus bMaxHPrate,-3; bonus bMaxSPrate,-3; }
+1101,BAPHOMET_,Baphomet Jr.,642,9024,10001,518,80,60,10,100,250,20,200,150,0,0,1000,100,200,{ petskillattack "NPC_DARKNESSATTACK",1776,4,0,5; },{ bonus bDef,1; bonus bMdef,1; bonus2 bResEff,Eff_Stun,-100; }
+1188,BON_GUN,Bon Gun,659,9025,10020,537,80,60,30,100,250,20,500,150,1,0,600,200,400,{ petskillattack "NPC_DARKNESSATTACK",555,1,1,1; },{ bonus bVit,1; bonus2 bResEff,Eff_Stun,100; }
+1200,ZHERLTHSH,Zealotus,660,9026,0,929,80,60,10,100,250,20,300,150,0,0,1000,100,500,{ petskillattack "AS_SONICBLOW",1,0,0,3; },{ bonus2 bAddRace,RC_DemiPlayer,2; bonus2 bMagicAddRace,RC_DemiPlayer,2; }
+1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
+1815,EVENT_RICECAKE,Rice Cake,0,9028,0,511,80,60,50,100,250,20,2000,150,1,0,500,500,200,{ petskillsupport "CR_DEFENDER",3,240,50,100; },{ bonus2 bSubEle,Ele_Neutral,1; bonus bMaxHPrate,-1; }
+1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "MG_SIGHT",5,0,5,5; },{ bonus bMaxHP,30; bonus2 bSubEle,Ele_Water,1; }
+
+// Newest pets.
+1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; if (RENEWAL) { bonus2 bAddRaceTolerance,RC_DemiPlayer,1; } else { bonus2 bSubRace,RC_DemiPlayer,1; } }
+1879,ECLIPSE_P,Spring Rabbit,0,9031,0,7766,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "TF_THROWSTONE",1,0,5,5; },{}
+1122,GOBLIN_1,Goblin,14569,9032,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_WINDATTACK",5,0,5,5; },{}
+1123,GOBLIN_2,Goblin,14570,9033,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_FIREATTACK",5,0,5,5; },{}
+1125,GOBLIN_4,Goblin,14571,9034,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_GROUNDATTACK",5,0,5,5; },{}
+1385,DELETER_,Deleter,14572,9035,0,7822,80,60,20,100,250,20,800,150,0,0,300,300,800,{ petskillattack "SM_MAGNUM",5,0,5,5; },{}
+1382,DIABOLIC,Diabolic,14573,9036,0,7823,80,60,10,100,250,20,800,150,0,0,300,300,800,{ petskillattack "WZ_METEOR",2,0,5,5; },{}
+1208,WANDER_MAN,Wanderer,14574,9037,0,7824,80,60,20,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_UNDEADATTACK",5,0,5,5; },{}
+
+1963,P_CHUNG_E,New Year Doll,0,9038,0,554,80,60,30,100,250,20,800,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{}
+
+// New pets JapanRO Mobile
+1040,GOLEM,Golem,12371,9053,10035,6111,80,60,20,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxHP,100; bonus bFlee,-5; }
+1143,MARIONETTE,Marionette,12361,9043,10025,6098,80,60,10,100,250,20,500,150,0,0,300,300,800,{},{ bonus bSPrecovRate,3; }
+1148,MEDUSA,Medusa,12368,9050,10032,6108,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus bVit,1; bonus2 bResEff,Eff_Stone,500; }
+1179,WHISPER,Whisper,12363,9045,10027,6100,80,60,20,100,250,20,500,150,0,0,300,300,800,{},{ bonus bFlee,7; bonus bDef,-3; }
+1299,GOBLIN_LEADER,Goblin Leader,12364,9046,10028,6104,80,60,10,100,250,20,50,150,0,0,300,300,800,{},{ bonus2 bAddRace,RC_DemiPlayer,3; }
+1370,SUCCUBUS,Succubus,12373,9055,10037,6113,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bHPDrainRate,50,5; }
+1374,INCUBUS,Incubus,12370,9052,10034,6110,80,60,10,100,250,20,50,150,0,0,300,300,800,{},{ bonus bMaxSPrate,3; }
+1379,NIGHTMARE_TERROR,Nightmare Terror,12372,9054,10036,6112,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bResEff,Eff_Sleep,10000; }
+1401,SHINOBI,Shinobi,12362,9044,10026,6099,80,60,20,100,250,20,500,150,0,0,300,300,800,{},{ bonus bAgi,2; }
+1404,MIYABI_NINGYO,Miyabi Doll,12366,9048,10030,6106,80,60,15,100,250,20,200,150,0,0,300,300,800,{},{ bonus bInt,1; bonus bCastrate,-3; }
+1416,WICKED_NYMPH,Evil Nymph,12365,9047,10029,6105,80,60,15,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxSP,30; bonus bSPrecovRate,5; }
+1495,STONE_SHOOTER,Stone Shooter,12369,9051,10033,6109,80,60,20,100,250,20,500,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,3; }
+1504,DULLAHAN,Dullahan,12367,9049,10031,6107,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus bCritAtkRate,5; }
+1505,LOLI_RURI,Loli Ruri,12360,9042,10024,6097,80,60,15,100,250,20,200,150,0,0,300,300,800,{},{ bonus bMaxHPrate,3; bonus3 bAutoSpellWhenHit,"AL_HEAL",1,50; }
+1513,CIVIL_SERVANT,Mao Guai,12358,9040,10022,6095,80,60,10,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxSP,10; }
+1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ if (RENEWAL) { bonus2 bAddRaceTolerance,RC_Brute,2; } else { bonus2 bSubRace,RC_Brute,3; } }
+1630,BACSOJIN_,White Lady,12357,9039,10021,6094,80,60,10,100,250,20,2000,150,0,0,300,300,800,{},{}
+1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; }
+
+// Brasilis Quest - Suspicious Beach [UNHATCHABLE]
+2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // kRO version
+2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // iRO/cRO version
+
+// 14.2 Academy
+2398,LITTLE_PORING,Little Poring,12846,9062,10013,531,80,60,50,100,250,20,2000,150,1,0,350,400,800,{ petloot 10; },{ bonus bLuk,2; bonus bCritical,1; }
diff --git a/db/re/size_fix.txt b/db/re/size_fix.txt
index f83560a87..e8e3774d5 100644
--- a/db/re/size_fix.txt
+++ b/db/re/size_fix.txt
@@ -1,7 +1,7 @@
// Database for size fix for weapon damage.
-//Columns: Weapon type, Rows: Target size.
-//Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff
+// Columns: Weapon type, Rows: Target size.
+// Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff
100,100, 75, 75, 75, 75, 50, 50, 75, 75,100,100,100, 75, 75,100, 75,100,100,100,100,100, 75,100 // Size: Small
100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100, 75,100 // Size: Medium
100, 50, 75,100,100,100,100,100,100,100,100, 75, 50, 75, 50, 50, 75,100,100,100,100,100,100,100 // Size: Large
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 7d73fccef..2e349205a 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -8,7 +8,7 @@
// AfterCastWalkDleay : amount of time before character can move again, in milliseconds
// Duration1 / Duration2 : usually the durations used by the skill, at special cases it is used to hold special data
// Cool Down : amount of time until character can re-use this skill, in milliseconds
-// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time)
+// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time)
//== Extra
// On all fields you can use ':' as a delimiter to level-specific values,
// - Example using SM_PROVOKE
@@ -17,7 +17,6 @@
// - Makes lvl 1 have 1000 (1s) cool down, lvl 2 2500 (2.5s), lvl 3 3000, and so on.
//==========================================
-
//===== Swordman ===========================
//-- SM_PROVOKE
6,0,0,0,30000,0,0,0
@@ -27,7 +26,6 @@
8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000,0
//==========================================
-
//===== Mage ===============================
//-- MG_SIGHT
10,0,0,0,10000,0,0,0
@@ -55,7 +53,6 @@
21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,2000:2000:2000:2000:2000:2000:2000:2000:2000:2000,0,500,0,0,160:320:480:640:800:960:1120:1280:1440:1600
//==========================================
-
//===== Acolyte ============================
//-- AL_RUWACH
24,0,0,0,10000,0,0,0
@@ -83,7 +80,6 @@
35,0,1000,0,0,6000,0,0
//==========================================
-
//===== Archer =============================
//-- AC_CONCENTRATION
45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
@@ -93,7 +89,6 @@
47,0,100,0,100,0,0,0
//==========================================
-
//===== Thief ==============================
//-- TF_HIDING
51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
@@ -101,13 +96,11 @@
52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0
//==========================================
-
//===== First planned to be shared =========
//-- ALL_RESURRECTION
54,4800:3200:1600:0,0:1000:2000:3000,0,0,0,0,1200:800:400:0
//==========================================
-
//===== Knight =============================
//-- KN_BRANDISHSPEAR
57,350,0,0,0,0,0,350
@@ -121,7 +114,6 @@
62,350,0,0,0,0,0,350
//==========================================
-
//===== Priest =============================
//-- PR_IMPOSITIO
66,0,3000,0,60000,0,0,0
@@ -154,7 +146,6 @@
//==========================================
-
//===== Wizard =============================
//-- WZ_FIREPILLAR
80,1920:1728:1536:1344:1152:960:768:576:384:192,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0,480:432:384:336:288:240:192:144:96:48
@@ -182,7 +173,6 @@
92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,0
//==========================================
-
//===== Blacksmith =========================
//-- BS_REPAIRWEAPON
108,2500,0,0,0,0,0,2500
@@ -198,7 +188,6 @@
114,0,0,0,1000:2000:3000:4000:5000,0,0,0
//==========================================
-
//===== Hunter =============================
//-- HT_SKIDTRAP
115,0,0,0,300000:240000:180000:120000:60000,0,0,0
@@ -224,7 +213,6 @@
129,800,1000,0,0,0,0,200
//==========================================
-
//===== Assassin ===========================
//-- AS_CLOAKING
135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0,0
@@ -240,7 +228,6 @@
141,500,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,7500:8000:8500:9000:9500:10000:10500:11000:11500:12000,500
//==========================================
-
//===== 1st Jobs Quest Skills===============
//-- NV_TRICKDEAD
143,0,0,0,600000,0,0,0
@@ -268,7 +255,6 @@
157,0,0,0,300000,0,0,5000
//==========================================
-
//===== NPC Skills Part 1 ==================
//-- NPC_ATTRICHANGE
161,0,0,0,1800000,0,0,0
@@ -322,7 +308,6 @@
207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0,0
//==========================================
-
//===== Rogue ==============================
//-- RG_BACKSTAP
212,0,500,0,5000,0,0,0
@@ -340,7 +325,6 @@
220,0,0,0,180000,0,0,0
//==========================================
-
//===== Alchemist ==========================
//-- AM_DEMONSTRATION
229,800,500,0,40000:45000:50000:55000:60000,0,0,200
@@ -364,7 +348,6 @@
247,2000,0,0,0,0,0,1000
//==========================================
-
//===== Crusader ===========================
//-- CR_AUTOGUARD
249,0,0,0,300000,0,0,0
@@ -388,7 +371,6 @@
258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
//==========================================
-
//===== Monk ===============================
//-- MO_CALLSPIRITS
261,500,0,0,600000,0,0,500
@@ -439,7 +421,6 @@
294,0,0,0,1200000,0,0,0
//==========================================
-
//===== Bard & Dancer (Ensemble Skills) ====
//-- BD_ADAPTATION
304,0,0,0,0,5000,0,0
@@ -461,7 +442,6 @@
313,0,0,0,60000,60000,0,0
//==========================================
-
//===== Bard ===============================
//-- BA_MUSICALSTRIKE
316,1200,0,0,0,0,0,300
@@ -479,7 +459,6 @@
322,0,0,0,180000,20000,0,0
//==========================================
-
//===== Dancer =============================
//-- DC_THROWARROW
324,1200,0,0,0,0,0,300
@@ -497,7 +476,6 @@
330,0,0,0,180000,20000,0,0
//==========================================
-
//===== Wedding Skills =====================
//-- WE_MALE
334,1500,0,0,0,0,0,1500
@@ -507,7 +485,6 @@
336,0,0,0,20000,0,0,0
//==========================================
-
//===== NPC Skills Part 2 ==================
//-- NPC_GRANDDARKNESS
339,0,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
@@ -525,7 +502,6 @@
354,0,0,0,0,0,0,0
//==========================================
-
//===== Lord Knight ========================
//-- LK_AURABLADE
355,0,0,0,40000:60000:80000:100000:120000,0,0,0
@@ -541,7 +517,6 @@
360,0,0,0,300000,0,0,0
//==========================================
-
//===== High Priest ========================
//-- HP_ASSUMPTIO
361,800:1200:1600:2000:2400:2400:2400:2400:2400:2400,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0,200:300:400:500:600
@@ -549,15 +524,13 @@
362,0,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000,0,5000:6000:7000:8000:9000
//==========================================
-
//===== High Wzard =========================
//-- HW_MAGICCRASHER
365,240,300,0,0,0,0,60
-//-- HW_MAGICPOWER
+//-- HW_MAGICPOWER
366,0,0,0,30000,0,0,
//==========================================
-
//===== Paladin ============================
//-- PA_PRESSURE
367,1600,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0,400
@@ -565,7 +538,6 @@
369,0,0,0,60000,60000,0,
//==========================================
-
//===== Champion ===========================
//-- CH_PALMSTRIKE
370,0,300,0,0,0,0,
@@ -573,7 +545,6 @@
371,0,0,0,0,2000:4000:6000:8000:10000,0,
//==========================================
-
//===== Professor ==========================
//-- PF_HPCONVERSION
373,1000:1200:1400:1600:1800,0,0,0,0,0,
@@ -583,7 +554,6 @@
375,0,0,0,0,0,10000:10000:10000:10000:15000,0
//==========================================
-
//===== Assassin Cross =====================
//-- ASC_EDP
378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0,0
@@ -591,7 +561,6 @@
379,250,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,250
//==========================================
-
//===== Sniper =============================
//-- SN_SIGHT
380,0,0,0,30000,0,0,0
@@ -603,7 +572,6 @@
383,1500:1800:2100:2400:2700:3000:3300:3600:3900:4200,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0,0,500:600:700:800:900:1000:1100:1200:1300:1400
//==========================================
-
//===== Whitesmith =========================
//-- WS_MELTDOWN
384,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000,0,5:5:6:6:7:7:8:8:9:10
@@ -611,7 +579,6 @@
387,0,0,0,60000,0,0,0
//==========================================
-
//===== Stalker ============================
//-- ST_CHASEWALK
389,500,0,0,10000,30000,0,500
@@ -619,7 +586,6 @@
390,0,0,0,300000,0,0,
//==========================================
-
//===== Clown / Gypsy ======================
//-- CG_ARROWVULCAN
394,1600:1760:1920:2080:2240:2400:2560:2720:2880:3040,2000,2000,0,0,0,400:440:480:520:560:600:640:680:720:760
@@ -658,7 +624,6 @@
407,0,5000,0,0,0,0,0
//==========================================
-
//===== Adoption Skills ====================
//-- WE_BABY
408,0,0,0,300000,0,0,2000
@@ -668,7 +633,6 @@
410,0,0,0,20000,0,0,0
//==========================================
-
//===== Taekwon ============================
//-- TK_RUN
411,3000:2500:2000:1500:100:500:0:0:0:0,300,0,1000,150000,0,3000:2500:2000:1500:1000:500:0:0:0:0
@@ -836,7 +800,6 @@
499,0,100,0,100,0,0,0
//==========================================
-
//===== Gunslinger =========================
//-- GS_GLITTERING
500,0,0,0,600000,0,0,0
@@ -872,7 +835,6 @@
521,800,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0,200
//==========================================
-
//===== Ninja ==============================
//-- NJ_KUNAI
524,0,1000,0,0,0,0,0
@@ -1107,7 +1069,7 @@
2015,0,0,0,180000,10000,0,2000
//-- RK_VITALITYACTIVATION
2016,0,0,0,180000,0,0,-1
-//-- RK_STORMBLAST
+//-- RK_STORMBLAST
2017,2000,2000,0,0,0,0,-1
//-- RK_FIGHTINGSPIRIT
2018,0,0,0,180000,0,0,-1
@@ -1147,7 +1109,7 @@
2034,0,1000,0,0,0,0,-1
//-- GC_HALLUCINATIONWALK
2035,0,0,0,30000:35000:40000:45000:50000,25000,300000,-1
-//-- GC_ROLLINGCUTTER
+//-- GC_ROLLINGCUTTER
2036,0,200,0,3000,0,0,-1
//-- GC_CROSSRIPPERSLASHER
2037,0,1000,0,0,0,0,-1
@@ -1160,7 +1122,7 @@
2038,2000,500,0,0,0,0,500
//-- AB_ANCILLA
2039,1000,1000,0,0,0,0,-1
-//-- AB_ADORAMUS
+//-- AB_ADORAMUS
2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000,-1
//-- AB_CLEMENTIA
2041,3000,0,0,120000:180000:240000,0,0,1000
@@ -1197,7 +1159,7 @@
//==========================================
//===== Warlock ============================
-//-- WL_WHITEIMPRISON
+//-- WL_WHITEIMPRISON
2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,-1
//-- WL_SOULEXPANSION
2202,2000,500,0,0,0,0,-1
@@ -1205,13 +1167,13 @@
2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500
//-- WL_JACKFROST
2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0,1000
-//-- WL_MARSHOFABYSS
+//-- WL_MARSHOFABYSS
2205,0,1000,0,30000,0,2500:3000:3500:4000:4500,500
//-- WL_RECOGNIZEDSPELL
2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000,1000
-//-- WL_SIENNAEXECRATE
+//-- WL_SIENNAEXECRATE
2207,2000,2000,0,10000:12000:14000:16000:18000,0,0,-1
-//-- WL_STASIS
+//-- WL_STASIS
2209,3000,2000,0,10000:15000:20000:25000:30000,1000,180000:190000:200000:210000:220000,1000
//-- WL_DRAINLIFE
2210,4000,0,0,0,0,2000,1000
@@ -1219,11 +1181,11 @@
2211,5000,2000,0,5000,0,5000,1000
//-- WL_HELLINFERNO
2212,3000,1000,0,20000:30000:40000:50000:60000,0,0,1000
-//-- WL_COMET
+//-- WL_COMET
2213,10000:11000:12000:13000:14000,0,0,100,42000,60000,1000:1500:2000:2500:3000
-//-- WL_CHAINLIGHTNING
+//-- WL_CHAINLIGHTNING
2214,3500:4000:4500:5000:5500,0,0,100,0,3000,1000
-//-- WL_EARTHSTRAIN
+//-- WL_EARTHSTRAIN
2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000,2000
//-- WL_TETRAVORTEX
2217,5000:6000:7000:8000:9000,2000,0,15000:120000:40000:5000,0,15000,2000
@@ -1235,7 +1197,7 @@
2224,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
//-- WL_SUMMONSTONE
2229,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
-//-- WL_READING_SB
+//-- WL_READING_SB
2231,5000,500,0,0,0,0,1000
//-- WL_TELEKINESIS_INTENSE
5012,1000,0,0,60000,0,300000,-1
@@ -1251,9 +1213,9 @@
2236,4000,1000,0,0,0,0,500
//-- RA_DETONATOR
2237,0,0,0,1000,0,0,-1
-//-- RA_ELECTRICSHOCKER
+//-- RA_ELECTRICSHOCKER
2238,0,0,0,15000,20000:22000:24000:26000:28000,0,-1
-//-- RA_CLUSTERBOMB
+//-- RA_CLUSTERBOMB
2239,0,0,0,15000,0,0,-1
//-- RA_WUGMASTERY
2240,0,1000,0,0,0,0,-1
@@ -1344,7 +1306,7 @@
//===== Shadow Chaser ======================
//-- SC_FATALMENACE
2284,0,500,0,0,0,0,-1
-//-- SC_REPRODUCE
+//-- SC_REPRODUCE
2285,0,1000,0,60000,0,0,-1
//-- SC_AUTOSHADOWSPELL
2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0,2000
@@ -1398,7 +1360,7 @@
2310,0,0,0,3500:4000:4500:5000:5500,0,2000,-1
//-- LG_REFLECTDAMAGE
2311,0,0,0,300000,0,0,-1
-//-- LG_PINPOINTATTACK
+//-- LG_PINPOINTATTACK
2312,0,1000,0,5000,0,5000,-1
//-- LG_FORCEOFVANGUARD
2313,0,1000,0,300000,0,0,-1
@@ -1435,7 +1397,7 @@
2326,0,0,0,3000,0,0,-1
//-- SR_SKYNETBLOW
2327,0,500,0,0,0,0,-1
-//-- SR_EARTHSHAKER
+//-- SR_EARTHSHAKER
2328,0,0,0,1000,0,3000,-1
//-- SR_FALLENEMPIRE
2329,0,0,0,500:1000:1500:2000:2500,0,0,-1
@@ -1468,7 +1430,7 @@
2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,-1
//-- SR_GENTLETOUCH_CURE
2345,0,1000,0,0,0,1000:1500:2000:2500:3000,-1
-//-- SR_GENTLETOUCH_ENERGYGAIN
+//-- SR_GENTLETOUCH_ENERGYGAIN
2346,1000,1000,0,240000,0,0,1000:1500:2000:2500:3000
//-- SR_GENTLETOUCH_CHANGE
2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000
@@ -1564,7 +1526,7 @@
2451,1000,1000,0,60000,0,2000,-1
//-- SO_WARMER
2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000
-//-- SO_VACUUM_EXTREME
+//-- SO_VACUUM_EXTREME
2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,-1
//-- SO_VARETYR_SPEAR
2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000
@@ -1572,15 +1534,15 @@
2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,800:600:400:200:-1
//-- SO_EL_CONTROL
2456,2000,0,0,0,0,5000,0
-//-- SO_SUMMON_AGNI
+//-- SO_SUMMON_AGNI
2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
//-- SO_SUMMON_AQUA
2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_SUMMON_VENTUS
+//-- SO_SUMMON_VENTUS
2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_SUMMON_TERA
+//-- SO_SUMMON_TERA
2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_EL_ACTION
+//-- SO_EL_ACTION
2461,0,0,0,0,0,5000,0
//-- SO_EL_ANALYSIS
2462,0,0,0,0,0,0,2000
@@ -1614,7 +1576,7 @@
2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,-1
//-- GN_WALLOFTHORN
2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1
-//-- GN_CRAZYWEED
+//-- GN_CRAZYWEED
2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,-1
//-- GN_CRAZYWEED_ATK
2484,0,0,0,100,0,0,-1
@@ -1630,7 +1592,7 @@
//-- GN_HELLS_PLANT
2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,-1
-//-- GN_HELLS_PLANT_ATK
+//-- GN_HELLS_PLANT_ATK
2491,0,0,0,20000,0,0,-1
//-- GN_MANDRAGORA
2492,1000,500,0,10000:15000:20000:25000:30000,0,10000,-1
@@ -1769,7 +1731,7 @@
//-- MH_SUMMON_LEGION
8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0,400:600:800:1000:1200
-//-- MH_NEEDLE_OF_PARALYZE
+//-- MH_NEEDLE_OF_PARALYZE
8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0,500:400:300:200:100
//-- MH_POISON_MIST
8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0,500
@@ -1793,7 +1755,7 @@
//8029,0,0,0,0,0,0,0
//-- MH_MIDNIGHT_FRENZY
//8030,0,0,0,0,0,0,0
-//-- MH_STAHL_HORN
+//-- MH_STAHL_HORN
8031,800:600:400:200:0,0,0,5000,0,0,200:400:600:800:1000
//-- MH_GOLDENE_FERSE
8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0,-1
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 8e4a4c022..eb875fc56 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -18,7 +18,7 @@
// 0x80 - Skill ignores target's def cards
// 07 splash/effect range (-1 for screen-wide)
// 08 MaxLv
-// 09 Number of hits (when positive, damage is increased by hits,
+// 09 Number of hits (when positive, damage is increased by hits,
// negative values just show number of hits without increasing total damage)
// 10 Cast interrupted when hit?
// 11 defense-reduction rate during cast.
@@ -45,6 +45,7 @@
// 15 Blowcount (amount of tiles skill knockbacks)
// 16 Name
// 17 Description
+
1,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NV_BASIC,Basic Skill
2,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_SWORD,Sword Mastery
3,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_TWOHAND,Two-Handed Sword Mastery
@@ -772,7 +773,7 @@
2211,11,8,1,3,0x2,3,5,-7,yes,0,0,0,magic,3, WL_CRIMSONROCK,Crimson Rock
2212,11,6,1,3,0,0,5,1,yes,0,0,0,magic,0, WL_HELLINFERNO,Hell Inferno
2213,11,8,2,0,0,0,5,-20,yes,0,0,0,magic,2, WL_COMET,Comet
-2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning
+2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning
2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack
2216,3,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0, WL_EARTHSTRAIN,Earth Strain
2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0, WL_TETRAVORTEX,Tetra Vortex
@@ -783,7 +784,7 @@
2222,0,6,4,3,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONFB,Summon Fire Ball
2223,0,6,4,4,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONBL,Summon Lightning Ball
2224,0,6,4,1,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONWB,Summon Water Ball
-2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire
+2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire
2226,11,6,1,4,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WIND,Summon Attack Wind
2227,11,6,1,1,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WATER,Summon Attack Water
2228,11,6,1,2,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_GROUND,Summon Attack Earth
@@ -1076,7 +1077,7 @@
3006,7:8:9:10:11,6,2,0,0x2,2,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai
3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai
3008,9,8,2,0,0x12,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage
-3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
+3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
3010,3,6,4,0,0x42,0,5,1,no,0,0x80,0,weapon,0, KO_MAKIBISHI,Makibishi
3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui
3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7, KO_ZANZOU,Zanzou
@@ -1085,7 +1086,7 @@
3015,0,6,4,3,0x1,0,1,1,no,0,0,0,none,0, KO_KAHU_ENTEN,Kahu Enten
3016,0,6,4,1,0x1,0,1,1,no,0,0,0,none,0, KO_HYOUHU_HUBUKI,Hyouhu Hubuki
3017,0,6,4,4,0x1,0,1,1,no,0,0,0,none,0, KO_KAZEHU_SEIRAN,Kazehu Seiran
-3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai
+3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai
3019,11,6,1,0,0,0,5,0,no,0,0,0,magic,0, KO_KAIHOU,Technique Kaihou
3020,7,6,2,0,0,0,1,3,yes,0,0,0,magic,0, KO_ZENKAI,Zenkai
3021,5:6:7:8:9,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KO_GENWAKU,Genwaku
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index 0b9f86efe..ed9f94b47 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -715,7 +715,7 @@
2347,0,0,40:50:60:70:80,-2:-4:-6:-8:-10,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_GENTLETOUCH_CHANGE#Gentle Touch - Change#
2348,0,0,40:50:60:70:80,0,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_GENTLETOUCH_REVITALIZE#Gentle Touch - Revitalize#
//More from SR Sura (but not following ID order)
-2517,0,0,40:45:50:55:60,0,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_HOWLINGOFLION#Howling of Lion#
+2517,0,0,40:45:50:55:60,0,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_HOWLINGOFLION#Howling of Lion#
2518,0,0,40:50:60:70:80,0,0,0,99,0,0,none,1:2:3:4:5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_RIDEINLIGHTNING#Ride In Lightening#
//****
@@ -734,8 +734,8 @@
// WM Wanderer/Minstrel
2413,0,0,64:68:72:76:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound#
2414,0,0,28:32:38:42:48,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation#
-2415,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_REVERBERATION_MELEE#Reverberation Melee#
-2416,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_REVERBERATION_MAGIC#Reverberation Magic#
+2415,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_REVERBERATION_MELEE#Reverberation Melee#
+2416,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_REVERBERATION_MAGIC#Reverberation Magic#
2417,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse#
2418,0,0,80:90:100:110:120,0,0,0,11,1,20,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm#
2419,0,0,12:16:20:24:28,0,0,0,13:14,0,0,none,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_POEMOFNETHERWORLD#Poem of Netherworld#
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 0da4479d4..a29b924aa 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -1,24 +1,24 @@
//====================================================
-//= _ _ _
-//= | | | | | |
-//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
//= | | | | __/ | | (__| |_| | | __/\__ \
//= \_| |_/\___|_| \___|\__,_|_|\___||___/
-//=
-//= http://herc.ws/board/
+//=
+//= http://herc.ws/board/
//================= More Information =================
// http://herc.ws/board/topic/1188-skill-tree-db-redesign/
//================ Structure Example =================
/*
Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
- inherit: ( "Other_Job_Name" ); // Base job from which this job will inherit its skill tree. NV_TRICKDEAD inheritance is skipped for non-novices from the source
+ inherit: ( "Other_Job_Name" ); // Base job from which this job will inherit its skill tree. NV_TRICKDEAD inheritance is skipped for non-novices from the source
- skills: { // SKILL_NAMEs come from the Name (16th column) value in db/re/skill_db.txt
- SKILL_NAME1: Max_Level // Use this for skills that don't have other skill prerequisite; Max_Level is a numeric value that should match your client side files
- SKILL_NAME2: { // Use this for skills which have other skills as prerequisites
- MaxLevel: Max_Level // Max_Level is a numeric value that should match your client side files
- SKILL_NAME_PREREQUISITE: Level_Prerequisite // The prerequisite skill and min level for having this skill available. Should also match your client side files
+ skills: { // SKILL_NAMEs come from the Name (16th column) value in db/re/skill_db.txt
+ SKILL_NAME1: Max_Level // Use this for skills that don't have other skill prerequisite; Max_Level is a numeric value that should match your client side files
+ SKILL_NAME2: { // Use this for skills which have other skills as prerequisites
+ MaxLevel: Max_Level // Max_Level is a numeric value that should match your client side files
+ SKILL_NAME_PREREQUISITE: Level_Prerequisite // The prerequisite skill and min level for having this skill available. Should also match your client side files
SKILL_NAME_PREREQUISITE2: Level_Prerequisite2 // You can add as many prerequisite skills as you want. Minimum of 1 if you add a skill this way
}
}
@@ -26,7 +26,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
//====================================================
Novice: {
- skills: {
+ skills: {
NV_BASIC: 9
NV_FIRSTAID: 1
NV_TRICKDEAD: 1
@@ -39,7 +39,7 @@ Novice: {
Swordsman: {
inherit: ( "Novice" );
- skills: {
+ skills: {
SM_SWORD: 10
SM_TWOHAND: {
MaxLevel: 10
@@ -64,7 +64,7 @@ Swordsman: {
Magician: {
inherit: ( "Novice" );
- skills: {
+ skills: {
MG_SRECOVERY: 10
MG_SIGHT: 1
MG_NAPALMBEAT: 10
@@ -104,7 +104,7 @@ Magician: {
Archer: {
inherit: ( "Novice" );
- skills: {
+ skills: {
AC_OWL: 10
AC_VULTURE: {
MaxLevel: 10
@@ -126,7 +126,7 @@ Archer: {
Acolyte: {
inherit: ( "Novice" );
- skills: {
+ skills: {
AL_DP: 10
AL_DEMONBANE: {
MaxLevel: 10
@@ -177,7 +177,7 @@ Acolyte: {
Merchant: {
inherit: ( "Novice" );
- skills: {
+ skills: {
MC_INCCARRY: 10
MC_DISCOUNT: {
MaxLevel: 10
@@ -209,7 +209,7 @@ Merchant: {
Thief: {
inherit: ( "Novice" );
- skills: {
+ skills: {
TF_DOUBLE: 10
TF_MISS: 10
TF_STEAL: 10
@@ -231,7 +231,7 @@ Thief: {
Knight: {
inherit: ( "Swordsman" );
- skills: {
+ skills: {
KN_SPEARMASTERY: 10
KN_PIERCE: {
MaxLevel: 10
@@ -284,7 +284,7 @@ Knight: {
Priest: {
inherit: ( "Acolyte" );
- skills: {
+ skills: {
MG_SRECOVERY: 10
MG_SAFETYWALL: {
MaxLevel: 10
@@ -353,7 +353,7 @@ Priest: {
Wizard: {
inherit: ( "Magician" );
- skills: {
+ skills: {
WZ_FIREPILLAR: {
MaxLevel: 10
MG_FIREWALL: 1
@@ -416,7 +416,7 @@ Wizard: {
Blacksmith: {
inherit: ( "Merchant" );
- skills: {
+ skills: {
BS_IRON: 5
BS_STEEL: {
MaxLevel: 5
@@ -500,7 +500,7 @@ Blacksmith: {
Hunter: {
inherit: ( "Archer" );
- skills: {
+ skills: {
HT_SKIDTRAP: 5
HT_LANDMINE: 5
HT_ANKLESNARE: {
@@ -576,7 +576,7 @@ Hunter: {
Assassin: {
inherit: ( "Thief" );
- skills: {
+ skills: {
AS_RIGHT: 5
AS_LEFT: {
MaxLevel: 5
@@ -620,7 +620,7 @@ Assassin: {
Crusader: {
inherit: ( "Swordsman" );
- skills: {
+ skills: {
KN_RIDING: {
MaxLevel: 1
SM_ENDURE: 1
@@ -694,7 +694,7 @@ Crusader: {
Monk: {
inherit: ( "Acolyte" );
- skills: {
+ skills: {
MO_IRONHAND: {
MaxLevel: 10
AL_DEMONBANE: 10
@@ -767,7 +767,7 @@ Monk: {
Sage: {
inherit: ( "Magician" );
- skills: {
+ skills: {
WZ_ESTIMATION: 1
WZ_EARTHSPIKE: {
MaxLevel: 5
@@ -860,7 +860,7 @@ Sage: {
Rogue: {
inherit: ( "Thief" );
- skills: {
+ skills: {
SM_SWORD: 10
AC_VULTURE: 10
AC_DOUBLE: {
@@ -943,7 +943,7 @@ Rogue: {
Alchemist: {
inherit: ( "Merchant" );
- skills: {
+ skills: {
AM_AXEMASTERY: 10
AM_LEARNINGPOTION: 10
AM_PHARMACY: {
@@ -1017,7 +1017,7 @@ Alchemist: {
Bard: {
inherit: ( "Archer" );
- skills: {
+ skills: {
BA_MUSICALLESSON: 10
BA_MUSICALSTRIKE: {
MaxLevel: 5
@@ -1091,7 +1091,7 @@ Bard: {
Dancer: {
inherit: ( "Archer" );
- skills: {
+ skills: {
DC_DANCINGLESSON: 10
DC_THROWARROW: {
MaxLevel: 5
@@ -1304,7 +1304,7 @@ Super_Novice: {
Gunslinger: {
inherit: ( "Novice" );
- skills: {
+ skills: {
GS_GLITTERING: 5
GS_FLING: {
MaxLevel: 1
@@ -1395,7 +1395,7 @@ Gunslinger: {
Ninja: {
inherit: ( "Novice" );
- skills: {
+ skills: {
NJ_TOBIDOUGU: 10
NJ_SYURIKEN: {
MaxLevel: 10
@@ -1491,7 +1491,7 @@ Ninja: {
}
}
Novice_High: {
- inherit: ( "Novice" );
+ inherit: ( "Novice" );
}
Swordsman_High: {
inherit: ( "Swordsman" );
@@ -1513,7 +1513,7 @@ Thief_High: {
}
Lord_Knight: {
inherit: ( "Knight" );
- skills: {
+ skills: {
LK_AURABLADE: {
MaxLevel: 5
SM_BASH: 5
@@ -1565,7 +1565,7 @@ Lord_Knight: {
High_Priest: {
inherit: ( "Priest" );
- skills: {
+ skills: {
HP_ASSUMPTIO: {
MaxLevel: 5
AL_ANGELUS: 1
@@ -1594,7 +1594,7 @@ High_Priest: {
High_Wizard: {
inherit: ( "Wizard" );
- skills: {
+ skills: {
HW_SOULDRAIN: {
MaxLevel: 10
MG_SRECOVERY: 5
@@ -1625,7 +1625,7 @@ High_Wizard: {
Whitesmith: {
inherit: ( "Blacksmith" );
- skills: {
+ skills: {
WS_MELTDOWN: {
MaxLevel: 10
BS_SKINTEMPER: 3
@@ -1659,7 +1659,7 @@ Whitesmith: {
Sniper: {
inherit: ( "Hunter" );
- skills: {
+ skills: {
SN_SIGHT: {
MaxLevel: 10
AC_OWL: 10
@@ -1688,7 +1688,7 @@ Sniper: {
Assassin_Cross: {
inherit: ( "Assassin" );
- skills: {
+ skills: {
ASC_KATAR: {
MaxLevel: 5
TF_DOUBLE: 5
@@ -1723,7 +1723,7 @@ Assassin_Cross: {
Paladin: {
inherit: ( "Crusader" );
- skills: {
+ skills: {
PA_PRESSURE: {
MaxLevel: 5
SM_ENDURE: 5
@@ -1751,7 +1751,7 @@ Paladin: {
Champion: {
inherit: ( "Monk" );
- skills: {
+ skills: {
CH_PALMSTRIKE: {
MaxLevel: 5
MO_IRONHAND: 7
@@ -1781,7 +1781,7 @@ Champion: {
Professor: {
inherit: ( "Sage" );
- skills: {
+ skills: {
PF_HPCONVERSION: {
MaxLevel: 5
MG_SRECOVERY: 1
@@ -1827,7 +1827,7 @@ Professor: {
Stalker: {
inherit: ( "Rogue" );
- skills: {
+ skills: {
ST_CHASEWALK: {
MaxLevel: 5
TF_HIDING: 5
@@ -1850,7 +1850,7 @@ Stalker: {
Creator: {
inherit: ( "Alchemist" );
- skills: {
+ skills: {
CR_SLIMPITCHER: {
MaxLevel: 10
AM_POTIONPITCHER: 5
@@ -1873,7 +1873,7 @@ Creator: {
Clown: {
inherit: ( "Bard" );
- skills: {
+ skills: {
CG_ARROWVULCAN: {
MaxLevel: 10
AC_SHOWER: 5
@@ -1909,7 +1909,7 @@ Clown: {
Gypsy: {
inherit: ( "Dancer" );
- skills: {
+ skills: {
CG_ARROWVULCAN: {
MaxLevel: 10
AC_SHOWER: 5
@@ -2008,7 +2008,7 @@ Super_Baby: {
Taekwon: {
inherit: ( "Novice" );
- skills: {
+ skills: {
TK_RUN: 10
TK_READYSTORM: {
MaxLevel: 1
@@ -2054,7 +2054,7 @@ Taekwon: {
Star_Gladiator: {
inherit: ( "Taekwon" );
- skills: {
+ skills: {
SG_FEEL: 3
SG_SUN_WARM: {
MaxLevel: 3
@@ -2120,7 +2120,7 @@ Star_Gladiator: {
Soul_Linker: {
inherit: ( "Taekwon" );
- skills: {
+ skills: {
SL_ALCHEMIST: 5
SL_MONK: 5
SL_STAR: 5
@@ -2221,7 +2221,7 @@ Dark_Collector: {
Rune_Knight: {
inherit: ( "Knight" );
- skills: {
+ skills: {
RK_ENCHANTBLADE: {
MaxLevel: 5
RK_RUNEMASTERY: 2
@@ -2276,7 +2276,7 @@ Rune_Knight: {
Warlock: {
inherit: ( "Wizard" );
- skills: {
+ skills: {
WL_WHITEIMPRISON: {
MaxLevel: 5
WL_SOULEXPANSION: 3
@@ -2372,7 +2372,7 @@ Warlock: {
Ranger: {
inherit: ( "Hunter" );
- skills: {
+ skills: {
RA_ARROWSTORM: {
MaxLevel: 10
RA_AIMEDBOLT: 5
@@ -2467,7 +2467,7 @@ Ranger: {
Arch_Bishop: {
inherit: ( "Priest" );
- skills: {
+ skills: {
AB_JUDEX: {
MaxLevel: 5
PR_TURNUNDEAD: 1
@@ -2560,7 +2560,7 @@ Arch_Bishop: {
Mechanic: {
inherit: ( "Blacksmith" );
- skills: {
+ skills: {
NC_MADOLICENCE: 5
NC_BOOSTKNUCKLE: {
MaxLevel: 5
@@ -2677,7 +2677,7 @@ Mechanic: {
Guillotine_Cross: {
inherit: ( "Assassin" );
- skills: {
+ skills: {
GC_VENOMIMPRESS: {
MaxLevel: 5
AS_ENCHANTPOISON: 3
@@ -2760,7 +2760,7 @@ Warlock_Trans: {
inherit: ( "High_Wizard", "Warlock" );
}
Ranger_Trans: {
- inherit: ( "Sniper", "Ranger" );
+ inherit: ( "Sniper", "Ranger" );
}
Arch_Bishop_Trans: {
inherit: ( "High_Priest", "Arch_Bishop" );
@@ -2774,7 +2774,7 @@ Guillotine_Cross_Trans: {
Royal_Guard: {
inherit: ( "Crusader" );
- skills: {
+ skills: {
LG_CANNONSPEAR: {
MaxLevel: 5
LG_PINPOINTATTACK: 1
@@ -2861,7 +2861,7 @@ Royal_Guard: {
Sorcerer: {
inherit: ( "Sage" );
- skills: {
+ skills: {
SO_FIREWALK: {
MaxLevel: 5
SA_VOLCANO: 1
@@ -2988,7 +2988,7 @@ Sorcerer: {
Minstrel: {
inherit: ( "Bard" );
- skills: {
+ skills: {
MI_RUSH_WINDMILL: {
MaxLevel: 5
WM_LULLABY_DEEPSLEEP: 1
@@ -3100,7 +3100,7 @@ Minstrel: {
Wanderer: {
inherit: ( "Dancer" );
- skills: {
+ skills: {
WA_SWING_DANCE: {
MaxLevel: 5
WM_LULLABY_DEEPSLEEP: 1
@@ -3212,7 +3212,7 @@ Wanderer: {
Sura: {
inherit: ( "Monk" );
- skills: {
+ skills: {
SR_DRAGONCOMBO: {
MaxLevel: 10
MO_TRIPLEATTACK: 5
@@ -3321,7 +3321,7 @@ Sura: {
Genetic: {
inherit: ( "Alchemist" );
- skills: {
+ skills: {
GN_TRAINING_SWORD: 5
GN_REMODELING_CART: 5
GN_CART_TORNADO: {
@@ -3396,7 +3396,7 @@ Genetic: {
Shadow_Chaser: {
inherit: ( "Rogue" );
- skills: {
+ skills: {
SC_FATALMENACE: {
MaxLevel: 5
RG_INTIMIDATE: 5
@@ -3557,7 +3557,7 @@ Baby_Shadow_Chaser: {
Expanded_Super_Novice: {
inherit: ( "Super_Novice" );
- skills: {
+ skills: {
PR_IMPOSITIO: 5
PR_SANCTUARY: {
MaxLevel: 10
@@ -3665,12 +3665,12 @@ Expanded_Super_Novice: {
}
}
Expanded_Super_Baby: {
- inherit: ( "Expanded_Super_Novice" );
+ inherit: ( "Expanded_Super_Novice" );
}
Kagerou: {
- inherit: ( "Ninja" );
+ inherit: ( "Ninja" );
- skills: {
+ skills: {
KO_YAMIKUMO: {
MaxLevel: 1
NJ_KIRIKAGE: 5
@@ -3760,9 +3760,9 @@ Kagerou: {
}
}
Oboro: {
- inherit: ( "Ninja" );
+ inherit: ( "Ninja" );
- skills: {
+ skills: {
KO_YAMIKUMO: {
MaxLevel: 1
NJ_KIRIKAGE: 5
@@ -3852,7 +3852,7 @@ Oboro: {
}
}
Rebellion: {
- inherit: ( "Gunslinger" );
+ inherit: ( "Gunslinger" );
skills: {
RL_RICHS_COIN: {
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index ffc451a0e..fc74dcbce 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -168,7 +168,7 @@
5010,0xfe, , 0, 2, -1,enemy, 0x000 //SC_ESCAPE
8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST
-8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND
+8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND
8025,0x86, , 0, 2:2:3:3:4,1000,enemy, 0x018 //MH_XENO_SLASHER
8041,0xf6, , 1:1:2:2:3, 0,2000,enemy, 0x01A //MH_LAVA_SLIDE
8043,0xf7, , 1, 0,-1,enemy, 0x2018 //MH_VOLCANIC_ASH
@@ -184,7 +184,7 @@
8409,0xef, , 0, 1, -1,friend,0x2018 //EL_ZEPHYR
8412,0xf0, , 0, 1, -1,friend,0x2018 //EL_POWER_OF_GAIA
-10006,0xc1, , 2, 0, -1,sameguild, 0x040 //GD_LEADERSHIP
-10007,0xc2, , 2, 0, -1,sameguild, 0x040 //GD_GLORYWOUNDS
-10008,0xc3, , 2, 0, -1,sameguild, 0x040 //GD_SOULCOLD
-10009,0xc4, , 2, 0, -1,sameguild, 0x040 //GD_HAWKEYES
+10006,0xc1, , 2, 0, -1,sameguild, 0x040 //GD_LEADERSHIP
+10007,0xc2, , 2, 0, -1,sameguild, 0x040 //GD_GLORYWOUNDS
+10008,0xc3, , 2, 0, -1,sameguild, 0x040 //GD_SOULCOLD
+10009,0xc4, , 2, 0, -1,sameguild, 0x040 //GD_HAWKEYES
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 03:44:06 +0000