From 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 18 Sep 2015 13:09:16 +0200 Subject: More aggressive whitespace cleanup. Follow up to 51329e6 Signed-off-by: Haru --- db/cashshop_db.conf | 24 +++---- db/const.txt | 2 +- db/pet_db2.txt | 1 - db/pre-re/exp.txt | 2 - db/pre-re/exp_homun.txt | 2 +- db/pre-re/item_group.conf | 12 ++-- db/pre-re/skill_require_db.txt | 6 +- db/pre-re/skill_tree.conf | 142 ++++++++++++++++++++--------------------- db/pre-re/skill_unit_db.txt | 10 +-- db/produce_db.txt | 6 +- db/re/exp_homun.txt | 2 +- db/re/item_db.conf | 60 ++++++++--------- db/re/item_group.conf | 12 ++-- db/re/item_packages.conf | 10 +-- db/re/level_penalty.txt | 2 +- db/re/mob_skill_db.txt | 6 +- db/re/pet_db.txt | 2 +- db/re/skill_require_db.txt | 6 +- db/re/skill_tree.conf | 142 ++++++++++++++++++++--------------------- db/re/skill_unit_db.txt | 10 +-- db/skill_changematerial_db.txt | 32 +++++----- db/translations.conf | 12 ++-- 22 files changed, 248 insertions(+), 255 deletions(-) (limited to 'db') diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf index ecd17daf8..e610a5aa3 100644 --- a/db/cashshop_db.conf +++ b/db/cashshop_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= //= http://herc.ws/board/topic/367-introducing-cash-shop-support/ //==================================================== @@ -26,37 +26,37 @@ cash_shop: ( Apple:100 ID531:250 } - + cat_1: { //Popular ID513:100 Banana_Juice:250 } - + cat_2: { //Limited Grape:100 ID533:250 } - + cat_3: { //Rental ID515:100 Carrot_Juice:250 } - + cat_4: { //Permanent Green_Herb:100 ID510:250 } - + cat_5: { //Scroll ID501:100 ID502:250 } - + cat_6: { //Usable White_Potion:150 Blue_Potion:500 } - + cat_7: { //Other ID909:400 ID907:500 diff --git a/db/const.txt b/db/const.txt index 47192a04e..78d64345e 100644 --- a/db/const.txt +++ b/db/const.txt @@ -642,7 +642,7 @@ Eff_Confusion 7 Eff_Blind 8 Eff_Bleeding 9 Eff_DPoison 10 -Eff_Fear 11 +Eff_Fear 11 Eff_Cold 12 Eff_Burning 13 Eff_Deepsleep 14 diff --git a/db/pet_db2.txt b/db/pet_db2.txt index cf2248dc4..c690248a9 100644 --- a/db/pet_db2.txt +++ b/db/pet_db2.txt @@ -50,4 +50,3 @@ //A single pet can have petloot, petskillbonus, petskillattack and //petskillsupport at the same time, but only one of each. - diff --git a/db/pre-re/exp.txt b/db/pre-re/exp.txt index 7fff53932..840a216eb 100644 --- a/db/pre-re/exp.txt +++ b/db/pre-re/exp.txt @@ -45,8 +45,6 @@ //Job - Super Novice & Baby Super Novice 99,23:4045,1,30,43,58,76,116,180,220,272,336,520,604,699,802,948,1125,1668,1937,2226,3040,3988,5564,6272,7021,9114,11473,15290,16891,18570,23229,28359,36478,39716,43088,52417,62495,78160,84175,90404,107611,125915,153941,191781,204351,248352,286212,386371,409795,482092,509596,982092,992092,1002092,1012092,1022092,1032092,1042092,1052092,1062092,1072092,1082092,1092092,1102092,1112092,1122092,1132092,1142092,1152092,1162092,1172092,1182092,1192092,1202092,1212092,1222092,1232092,1242092,1252092,1262092,1272092,1282092,1292092,1302092,1312092,1322092,1332092,1342092,1352092,1362092,1372092,1382092,1392092,1402092,1412092,1422092,1432092,1442092,1452092,1462092,1491333,1521159,1551582,1582613,1614265,1646550,1679480,1713069,1747330,1782276,1817921,1854279,1891364,1929191,1967774,2007129,2047271,2088216,2129980,2172579,2216030,2260350,2305556,2351667,2398700,2446673,2495606,2545518,2596428,2648356,2701323,2755349,2810455,2866664,2923997,2982476,3042125,3102967,3165026,3228326,3292892,3358749,3425923,3494441,3564329,3635615,3708327,3782493,3858142,3935304,4014010,4094290,4176175,4259698,4344891,4431788,4520423,4610831,4703047,4797107,4893049,4990909,5090727,5192541,5296391,5402318,5510364,5620571,5732982,5847641,5964593,6083884,6205561,6329672,6456265,6585390,6717097,6851438,6988466,7128235,7270799,7416214,7564538,7715828,7870144,8027546,8188096,8351857,8518893,8689270,8863055,9040315,9221121,9405543,9593653,9785525,9981235,10180859,10384475,10592164,10804007,11020086,11240487,11465296,11694601,11928492,12167061,12410401,12658608,12911779,13170014,13433414,13702082,13976123,14255645,14540757,14831571,15128202,15430765,15739380,16054167,16375250,16702754,17036808,17377543,17725094,18079595,18441187,18810011,19186211,19569935,19961334,20360560,20767770,21183125,21606786,22038921,22479697,22929289,23387873,23855628,24332740,24819394,25315781,25822095,26338537,26865306,27402611,27950663,28509676,29079868,29661464,30254692,30859785,31476979,32106518 - - //================================ // Renewal content (required for some core features) //================================ diff --git a/db/pre-re/exp_homun.txt b/db/pre-re/exp_homun.txt index 9b48412dd..f8b443526 100644 --- a/db/pre-re/exp_homun.txt +++ b/db/pre-re/exp_homun.txt @@ -97,4 +97,4 @@ 9165840 9553880 9945920 -0 +0 diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index f03762790..54d71d1c8 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-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: /* : ( - "Item_Name" or + "Item_Name" or ("Item_Name",Repeat_Count) ) */ diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index d70d9175d..8b09f085e 100644 --- a/db/pre-re/skill_require_db.txt +++ b/db/pre-re/skill_require_db.txt @@ -711,7 +711,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# //**** @@ -730,8 +730,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/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf index 1b9ad25a5..b5fcd5aca 100644 --- a/db/pre-re/skill_tree.conf +++ b/db/pre-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/pre-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/pre-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 @@ -1853,7 +1853,7 @@ Stalker: { Creator: { inherit: ( "Alchemist" ); - skills: { + skills: { CR_SLIMPITCHER: { MaxLevel: 10 AM_POTIONPITCHER: 5 @@ -1876,7 +1876,7 @@ Creator: { Clown: { inherit: ( "Bard" ); - skills: { + skills: { CG_ARROWVULCAN: { MaxLevel: 10 AC_SHOWER: 5 @@ -1912,7 +1912,7 @@ Clown: { Gypsy: { inherit: ( "Dancer" ); - skills: { + skills: { CG_ARROWVULCAN: { MaxLevel: 10 AC_SHOWER: 5 @@ -2011,7 +2011,7 @@ Super_Baby: { Taekwon: { inherit: ( "Novice" ); - skills: { + skills: { TK_RUN: 10 TK_READYSTORM: { MaxLevel: 1 @@ -2057,7 +2057,7 @@ Taekwon: { Star_Gladiator: { inherit: ( "Taekwon" ); - skills: { + skills: { SG_FEEL: 3 SG_SUN_WARM: { MaxLevel: 3 @@ -2123,7 +2123,7 @@ Star_Gladiator: { Soul_Linker: { inherit: ( "Taekwon" ); - skills: { + skills: { SL_ALCHEMIST: 5 SL_MONK: 5 SL_STAR: 5 @@ -2224,7 +2224,7 @@ Dark_Collector: { Rune_Knight: { inherit: ( "Knight" ); - skills: { + skills: { RK_ENCHANTBLADE: { MaxLevel: 5 RK_RUNEMASTERY: 2 @@ -2279,7 +2279,7 @@ Rune_Knight: { Warlock: { inherit: ( "Wizard" ); - skills: { + skills: { WL_WHITEIMPRISON: { MaxLevel: 5 WL_SOULEXPANSION: 3 @@ -2375,7 +2375,7 @@ Warlock: { Ranger: { inherit: ( "Hunter" ); - skills: { + skills: { RA_ARROWSTORM: { MaxLevel: 10 RA_AIMEDBOLT: 5 @@ -2470,7 +2470,7 @@ Ranger: { Arch_Bishop: { inherit: ( "Priest" ); - skills: { + skills: { AB_JUDEX: { MaxLevel: 5 PR_TURNUNDEAD: 1 @@ -2563,7 +2563,7 @@ Arch_Bishop: { Mechanic: { inherit: ( "Blacksmith" ); - skills: { + skills: { NC_MADOLICENCE: 5 NC_BOOSTKNUCKLE: { MaxLevel: 5 @@ -2680,7 +2680,7 @@ Mechanic: { Guillotine_Cross: { inherit: ( "Assassin" ); - skills: { + skills: { GC_VENOMIMPRESS: { MaxLevel: 5 AS_ENCHANTPOISON: 3 @@ -2763,7 +2763,7 @@ Warlock_Trans: { inherit: ( "High_Wizard", "Warlock" ); } Ranger_Trans: { - inherit: ( "Sniper", "Ranger" ); + inherit: ( "Sniper", "Ranger" ); } Arch_Bishop_Trans: { inherit: ( "High_Priest", "Arch_Bishop" ); @@ -2777,7 +2777,7 @@ Guillotine_Cross_Trans: { Royal_Guard: { inherit: ( "Crusader" ); - skills: { + skills: { LG_CANNONSPEAR: { MaxLevel: 5 LG_PINPOINTATTACK: 1 @@ -2864,7 +2864,7 @@ Royal_Guard: { Sorcerer: { inherit: ( "Sage" ); - skills: { + skills: { SO_FIREWALK: { MaxLevel: 5 SA_VOLCANO: 1 @@ -2991,7 +2991,7 @@ Sorcerer: { Minstrel: { inherit: ( "Bard" ); - skills: { + skills: { MI_RUSH_WINDMILL: { MaxLevel: 5 WM_LULLABY_DEEPSLEEP: 1 @@ -3103,7 +3103,7 @@ Minstrel: { Wanderer: { inherit: ( "Dancer" ); - skills: { + skills: { WA_SWING_DANCE: { MaxLevel: 5 WM_LULLABY_DEEPSLEEP: 1 @@ -3215,7 +3215,7 @@ Wanderer: { Sura: { inherit: ( "Monk" ); - skills: { + skills: { SR_DRAGONCOMBO: { MaxLevel: 10 MO_TRIPLEATTACK: 5 @@ -3324,7 +3324,7 @@ Sura: { Genetic: { inherit: ( "Alchemist" ); - skills: { + skills: { GN_TRAINING_SWORD: 5 GN_REMODELING_CART: 5 GN_CART_TORNADO: { @@ -3399,7 +3399,7 @@ Genetic: { Shadow_Chaser: { inherit: ( "Rogue" ); - skills: { + skills: { SC_FATALMENACE: { MaxLevel: 5 RG_INTIMIDATE: 5 @@ -3560,7 +3560,7 @@ Baby_Shadow_Chaser: { Expanded_Super_Novice: { inherit: ( "Super_Novice" ); - skills: { + skills: { PR_IMPOSITIO: 5 PR_SANCTUARY: { MaxLevel: 10 @@ -3668,12 +3668,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 @@ -3763,9 +3763,9 @@ Kagerou: { } } Oboro: { - inherit: ( "Ninja" ); + inherit: ( "Ninja" ); - skills: { + skills: { KO_YAMIKUMO: { MaxLevel: 1 NJ_KIRIKAGE: 5 @@ -3855,7 +3855,7 @@ Oboro: { } } Rebellion: { - inherit: ( "Gunslinger" ); + inherit: ( "Gunslinger" ); skills: { RL_RICHS_COIN: { diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index f91ccf2b9..406152b27 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -165,7 +165,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 @@ -181,7 +181,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 diff --git a/db/produce_db.txt b/db/produce_db.txt index 83499bb53..4d8b1a2ca 100644 --- a/db/produce_db.txt +++ b/db/produce_db.txt @@ -186,7 +186,7 @@ 12053,13,0,0,7474,0,966,20,961,10,518,1,7453,1 //-- Tentacle and Cheese Gratin <-- 10 Tentacle, 10 Cheese, 5 Yam, 1 Sweet Sauce 12058,13,0,0,7474,0,962,10,548,10,549,5,7453,1 -//-- Fried Sweet Potato with Syrup <-- 10 Potato, 10 Yam, 1 Sweet Potato, 1 Sweet Sauce +//-- Fried Sweet Potato with Syrup <-- 10 Potato, 10 Yam, 1 Sweet Potato, 1 Sweet Sauce 12068,13,0,0,7474,0,516,10,549,10,633,1,7453,1 //--------------------LEVEL 4----------- @@ -197,7 +197,7 @@ 12054,14,0,0,7475,0,962,30,509,10,7194,10,7031,1,1024,20 //-- Rib with Herbs and Spices <-- 5 Meat, 3 Red Herb, 2 Yellow Herb, 3 Green Herb, 1 Sweet Sauce, 1 Lemon 12044,14,0,0,7475,0,517,5,507,3,508,2,511,3,7453,1,568,1 -//-- Cream Sandwich <-- 5 Bread, 15 Milk, 10 Cheese, 10 Yellow Herb, 1 Meat, 1 Sweet Sauce +//-- Cream Sandwich <-- 5 Bread, 15 Milk, 10 Cheese, 10 Yellow Herb, 1 Meat, 1 Sweet Sauce 12064,14,0,0,7475,0,580,5,519,15,548,10,508,10,517,1,7453,1 //-- Lutie Mixed Cold Noodles <-- 3 Grain, 1 Hot Sauce, 10 Ice Cubic, 10 Carrot, 10 Jack o' Pumpkin 12059,14,0,0,7475,0,577,3,7455,1,7066,10,515,10,1062,10 @@ -471,7 +471,7 @@ 1046,26,2494,1,955,40,753,5 //-- Petite DiablOfs Horn <-- GN_CHANGEMATERIAL Lv1, 5 Stone Heart, 10 Resin 1038,26,2494,1,953,5,907,10 -//-- Root Of Maneater <-- GN_CHANGEMATERIAL Lv1, 25 Talon, 20 Tooth Of +//-- Root Of Maneater <-- GN_CHANGEMATERIAL Lv1, 25 Talon, 20 Tooth Of 1033,26,2494,1,917,25,1044,20 //-- Conch <-- GN_CHANGEMATERIAL Lv1, 5 Gill, 25 Immortal Heart 961,26,2494,1,956,5,929,25 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_db.conf b/db/re/item_db.conf index 1f5c9d9ec..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 */ "> }, { @@ -112227,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; } "> @@ -117820,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 */ "> }, { @@ -118554,7 +118553,6 @@ item_db: ( EquipLv: 10 View: 729 Script: <" - bonus bMdef,3; bonus2 bAddRaceTolerance,RC_Dragon,5; bonus2 bAddRace,RC_Dragon,5; @@ -119348,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; "> }, @@ -120063,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); "> }, @@ -120403,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; "> }, { @@ -120785,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; "> }, @@ -121444,7 +121442,6 @@ item_db: ( Loc: 256 View: 888 Script: <" - bonus bStr,2; bonus bMaxHP,100; "> @@ -122106,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); "> }, @@ -122207,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; @@ -123703,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 */ "> }, { @@ -123719,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 */ "> }, { @@ -123825,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); } "> }, @@ -124037,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%. */ "> }, { @@ -124055,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 */ "> }, { @@ -125005,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; @@ -132041,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: /* : ( - "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/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/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 index 22f7d553f..f8495c784 100644 --- a/db/re/pet_db.txt +++ b/db/re/pet_db.txt @@ -118,4 +118,4 @@ 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; } \ No newline at end of file +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/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 diff --git a/db/skill_changematerial_db.txt b/db/skill_changematerial_db.txt index 78920cd66..3fb92139e 100644 --- a/db/skill_changematerial_db.txt +++ b/db/skill_changematerial_db.txt @@ -4,17 +4,17 @@ // ProductID,BaseRate,MakeAmount1,MakeAmountRate1,MakeAmount2,MakeAmountRate2 // MakeAmount3,MakeAmountRate3,MakeAmount4,MakeAmountRate4,MakeAmount5,MakeAmountRate5 //==================================================== -// NOTE: +// NOTE: // Up to 5 ID/Amount pairs can be specified. // Rate = n/10% //==================================================== -703,4,800,2,200 // Hinalle +703,4,800,2,200 // Hinalle 958,800,9,1000 // Horrendous_Mouth 959,800,7,1000 // Rotten_Scale -960,1000,6,800,9,200 // Nipper +960,1000,6,800,9,200 // Nipper 961,800,3,1000 // Conch -962,1000,4,800,6,200 // Tentacle +962,1000,4,800,6,200 // Tentacle 963,800,3,1000 // Sharp_Scale 964,800,8,1000 // Crap_Shell 967,800,4,1000 // Turtle_Shell @@ -22,9 +22,9 @@ 970,800,9,1000 // Alchol 971,800,5,1000 // Detrimindexta 973,800,4,1000 // Counteragent -974,1000,4,800,6,200 // Mixture -991,1000,1,500,1,500 // Crystal_Blue -992,1000,1,500,1,500 // Wind_Of_Verdure +974,1000,4,800,6,200 // Mixture +991,1000,1,500,1,500 // Crystal_Blue +992,1000,1,500,1,500 // Wind_Of_Verdure 999,1000,10,1000 // Steel 1003,500,1,1000 // Coal 1008,800,6,1000 // Frozen_Heart @@ -34,21 +34,21 @@ 1012,800,3,1000 // Lizard_Scruff 1013,9,800,13,200 // Colorful_Shell 1014,4,800,6,200 // Jaws_Of_Ant -1016,1000,7,800,10,200 // Rat_Tail +1016,1000,7,800,10,200 // Rat_Tail 1019,800,2,1000 // Wooden_Block -1020,1000,4,800,6,200 // Long_Hair +1020,1000,4,800,6,200 // Long_Hair 1021,800,4,1000 // Dokkaebi_Horn -1022,1000,2,800,3,200 // Fox_Tail +1022,1000,2,800,3,200 // Fox_Tail 1024,800,4,1000 // Chinese_Ink 1025,800,8,1000 // Spiderweb 1026,800,4,1000 // Acorn 1030,800,2,1000 // Tiger_Footskin -1033,1000,4,800,6,200 // Root_Of_Maneater -1034,1000,6,800,9,200 // Cobold_Hair -1035,1000,8,800,12,200 // Dragon_Canine +1033,1000,4,800,6,200 // Root_Of_Maneater +1034,1000,6,800,9,200 // Cobold_Hair +1035,1000,8,800,12,200 // Dragon_Canine 1037,800,6,1000 // Dragon_Train -1038,1000,1,1000 // Petite_Dablofs_Horn -1040,1000,8,800,12,200 // Elder_Pixie's_Beard +1038,1000,1,1000 // Petite_Dablofs_Horn +1040,1000,8,800,12,200 // Elder_Pixie's_Beard 1041,800,3,1000 // Lantern 1042,800,6,1000 // Short_Leg 1043,800,6,1000 // Nail_Of_Orc @@ -57,7 +57,7 @@ 1049,800,6,1000 // Skirt_Of_Virgin 1050,800,3,1000 // Tendon 1051,800,7,1000 // Detonator -1053,1000,6,800,9,200 // Tooth_Of_Ancient_Fish +1053,1000,6,800,9,200 // Tooth_Of_Ancient_Fish 1056,800,8,1000 // Grit 1058,800,5,1000 // Wing_Of_Moth 1059,1000,5,1000 // Transparent_Cloth diff --git a/db/translations.conf b/db/translations.conf index fc8144636..a93e86384 100644 --- a/db/translations.conf +++ b/db/translations.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= //= http://herc.ws/board/topic/8687-hercules-ultimate-localization-design/ //==================================================== @@ -17,4 +17,4 @@ translations: ( //"path/to/my/Language.po", //"db/Spanish.po", //(Example) -) \ No newline at end of file +) -- cgit v1.2.3-60-g2f50