From 6adf32ca56941699b9736e5f9d57790aa800198f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 24 Oct 2016 19:09:39 +0300 Subject: Update different files from hercules. --- conf/map/battle/player.conf | 5 +- conf/map/help.txt | 2 +- conf/messages.conf | 3 +- db/constants.conf | 15 + db/re/map_zone_db.conf | 2 + db/re/skill_db.conf | 806 +++++++++++++++++++++++++++++++++++++++++++- db/sc_config.txt | 4 + 7 files changed, 816 insertions(+), 21 deletions(-) diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index 04c40898..f4e73484 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -110,9 +110,12 @@ max_parameter: 99 // Same as max_parameter, but for 3rd classes. max_third_parameter: 130 -// Same as max_parameter, but for extend classes (Ex. Super Novice, Kagero/Oboro, Rebellion). +// Same as max_parameter, but for extended classes (Ex. Super Novice, Kagero/Oboro, Rebellion). max_extended_parameter: 125 +// Same as max_parameter, but for summoner class +max_summoner_parameter: 120 + // Same as max_parameter, but for baby classes. max_baby_parameter: 80 diff --git a/conf/map/help.txt b/conf/map/help.txt index a65c7de7..846c1627 100644 --- a/conf/map/help.txt +++ b/conf/map/help.txt @@ -102,7 +102,7 @@ jobchange: "Params: \n" "Changes your job.\n" " 23 Super Novice 24 Gunslinger 25 Ninja 4045 Super Baby\n" "4046 Taekwon 4047 Star Gladiator 4049 Soul Linker 4050 Gangsi\n" "4051 Death Knight 4052 Dark Collector 4190 Ex. Super Novice 4191 Ex. Super Baby\n" - "4211 Kagerou 4212 Oboro 4215 Rebellion\n" + "4211 Kagerou 4212 Oboro 4215 Rebellion 4218 Summoner\n" "----- Baby Novice And Baby 1st Class -----\n" "4023 Baby Novice 4024 Baby Swordman 4025 Baby Magician 4026 Baby Archer\n" "4027 Baby Acolyte 4028 Baby Merchant 4029 Baby Thief\n" diff --git a/conf/messages.conf b/conf/messages.conf index 6055dcdd..383394d4 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -607,8 +607,9 @@ 666: Sura T 667: Genetic T 668: Shadow Chaser T +669: Summoner -//669-855 FREE (please start using from the top if you need, leave the 669+ range for new jobs) +//670-855 FREE (please start using from the top if you need, leave the 670+ range for new jobs) // MvP Tomb 856: Tomb diff --git a/db/constants.conf b/db/constants.conf index edc2c2a7..8b2c8491 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -225,6 +225,8 @@ constants_db: { Job_Oboro: 4212 Job_Rebellion: 4215 + Job_Summoner: 4218 + comment__: "Job masks / Job map_ids" EAJL_2_1: 0x0100 EAJL_2_2: 0x0200 @@ -248,6 +250,7 @@ constants_db: { EAJ_GUNSLINGER: 0x0009 EAJ_NINJA: 0x000A EAJ_GANGSI: 0x000D + EAJ_SUMMONER: 0x000E EAJ_SUPER_NOVICE: 0x0100 EAJ_KNIGHT: 0x0101 @@ -1380,6 +1383,18 @@ constants_db: { SC_G_LIFEPOTION: 640 SC_MYSTICPOWDER: 641 + // Summoner + SC_SUHIDE: 642 + SC_SU_STOOP: 643 + SC_SPRITEMABLE: 644 + SC_CATNIPPOWDER: 645 + SC_SV_ROOTTWIST: 646 + SC_BITESCAR: 647 + SC_ARCLOUSEDASH: 648 + SC_TUNAPARTY: 649 + SC_SHRIMP: 650 + SC_FRESHSHRIMP: 651 + comment__: "petstat" PET_CLASS: 1 PET_NAME: 2 diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index 262574a4..e508c780 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -142,6 +142,7 @@ zones: ( BS_GREED: "PLAYER" SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" + SU_LOPE: "PLAYER" } disabled_items: { @@ -205,6 +206,7 @@ zones: ( CASH_ASSUMPTIO: "PLAYER" SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" + SU_LOPE: "PLAYER" } disabled_items: { } diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 73e5ae82..beb84894 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -33024,57 +33024,715 @@ skill_db: ( } }, { - Id: 5015 - Name: "SR_FLASHCOMBO_ATK_STEP1" - Description: "Flash Combo Attack Step 1" + Id: 5018 + Name: "SU_BASIC_SKILL" + Description: "New Basic Skill" + MaxLevel: 1 + NumberOfHits: 0 +}, +{ + Id: 5019 + Name: "SU_BITE" + Description: "Bite" + MaxLevel: 1 + Range: 2 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + InterruptCast: true + CastTime: 1000 + AfterCastActDelay: 1000 + FixedCastTime: 0 + Requirements: { + SPCost: 10 + } +}, +{ + Id: 5020 + Name: "SU_HIDE" + Description: "Hide" + MaxLevel: 1 + Hit: "BDT_SKILL" + SkillType: { + Self: true + } + DamageType: { + NoDamage: true + } + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: -1 + CoolDown: 15000 + FixedCastTime: 0 + Requirements: { + SPCost: 30 + } +}, +{ + Id: 5021 + Name: "SU_SCRATCH" + Description: "Scratch" + MaxLevel: 3 + Range: 2 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + DamageType: { + SplashArea: true + } + SplashRange: 1 + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: 10000 + CoolDown: { + Lv1: 3000 + Lv2: 2000 + Lv3: 1000 + Lv4: 1 + Lv5: 1 + Lv6: 1 + Lv7: 1 + Lv8: 1 + Lv9: 1 + Lv10: 1 + } + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 20 + Lv2: 25 + Lv3: 30 + Lv4: 35 + Lv5: 40 + Lv6: 45 + Lv7: 50 + Lv8: 55 + Lv9: 60 + Lv10: 65 + } + } +}, +{ + Id: 5022 + Name: "SU_STOOP" + Description: "Stoop" + MaxLevel: 1 + Hit: "BDT_SKILL" + SkillType: { + Self: true + } + DamageType: { + NoDamage: true + } + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: 6000 + CoolDown: 15000 + FixedCastTime: 0 + Requirements: { + SPCost: 10 + } +}, +{ + Id: 5023 + Name: "SU_LOPE" + Description: "Lope" + MaxLevel: 3 + Range: { + Lv1: 6 + Lv2: 10 + Lv3: 14 + Lv4: 18 + Lv5: 22 + Lv6: 26 + Lv7: 30 + Lv8: 34 + Lv9: 38 + Lv10: 42 + } + Hit: "BDT_SKILL" + SkillType: { + Place: true + } + DamageType: { + NoDamage: true + } + InterruptCast: true + CastTime: 500 + AfterCastActDelay: 1000 + CoolDown: { + Lv1: 2000 + Lv2: 4000 + Lv3: 6000 + Lv4: 8000 + Lv5: 10000 + Lv6: 12000 + Lv7: 14000 + Lv8: 16000 + Lv9: 18000 + Lv10: 20000 + } + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 30 + Lv2: 30 + Lv3: 30 + Lv4: 30 + Lv5: 30 + Lv6: 30 + Lv7: 30 + Lv8: 30 + Lv9: 30 + Lv10: 30 + } + } +}, +{ + Id: 5024 + Name: "SU_SPRITEMABLE" + Description: "Spirit Marble" + MaxLevel: 1 + NumberOfHits: 0 +}, +{ + Id: 5025 + Name: "SU_POWEROFLAND" + Description: "Power of Land" + MaxLevel: 1 + NumberOfHits: 0 +}, +{ + Id: 5026 + Name: "SU_SV_STEMSPEAR" + Description: "Silvervine Stem Spear" + MaxLevel: 5 + Range: 9 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + AttackType: "Magic" + Element: { + Lv1: "Ele_Earth" + Lv2: "Ele_Fire" + Lv3: "Ele_Water" + Lv4: "Ele_Wind" + Lv5: "Ele_Ghost" + } + InterruptCast: true + CastTime: 2500 + AfterCastActDelay: 1000 + SkillData1: 10000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 40 + Lv2: 40 + Lv3: 40 + Lv4: 40 + Lv5: 40 + Lv6: 40 + Lv7: 40 + Lv8: 40 + Lv9: 40 + Lv10: 40 + } + } +}, +{ + Id: 5027 + Name: "SU_CN_POWDERING" + Description: "Catnip Powdering" + MaxLevel: 5 + Range: 9 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + DamageType: { + NoDamage: true + SplashArea: true + } + SplashRange: { + Lv1: 3 + Lv2: 3 + Lv3: 5 + Lv4: 5 + Lv5: 7 + } + InterruptCast: true + SkillInstances: 1 + CastTime: 1500 + AfterCastActDelay: 1000 + SkillData1: { + Lv1: 3000 + Lv2: 4000 + Lv3: 5000 + Lv4: 6000 + Lv5: 7000 + } + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 40 + Lv2: 36 + Lv3: 32 + Lv4: 28 + Lv5: 24 + } +// Items: { +// Catnip_Fruit: 1 +// } + } + Unit: { + Id: 0x106 + Layout: { + Lv1: 1 + Lv2: 1 + Lv3: 2 + Lv4: 2 + Lv5: 3 + } + Interval: -1 + Target: "Enemy" + Flag: { + UF_PATHCHECK: true + UF_RANGEDSINGLEUNIT: true + } + } +}, +{ + Id: 5028 + Name: "SU_CN_METEOR" + Description: "Catnip Meteor" + MaxLevel: 5 + Range: 9 + Hit: "BDT_MULTIHIT" + SkillType: { + Place: true + } + AttackType: "Magic" + SplashRange: { + Lv1: 3 + Lv2: 3 + Lv3: 5 + Lv4: 5 + Lv5: 7 + } + NumberOfHits: { + Lv1: 1 + Lv2: 2 + Lv3: 3 + Lv4: 4 + Lv5: 5 + } + InterruptCast: true + CastTime: 6000 + AfterCastActDelay: 1000 + SkillData1: { + Lv1: 1500 + Lv2: 2000 + Lv3: 2500 + Lv4: 3000 + Lv5: 3500 + } + SkillData2: 20000 + CoolDown: { + Lv1: 2000 + Lv2: 3000 + Lv3: 4000 + Lv4: 5000 + Lv5: 6000 + + } + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 20 + Lv2: 35 + Lv3: 50 + Lv4: 65 + Lv5: 80 + } +// Items: { +// Catnip_Fruit: 1 +// } + } + Unit: { + Id: 0x86 + Range: 1 + Interval: 500 + Target: "Enemy" + Flag: { + UF_PATHCHECK: true + } + } +}, +{ + Id: 5029 + Name: "SU_SV_ROOTTWIST" + Description: "Silvervine Root Twist" + MaxLevel: 5 + Range: 9 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + DamageType: { + NoDamage: true + } + InterruptCast: true + SkillInstances: 1 + AfterCastActDelay: 1000 + SkillData1: { + Lv1: 7000 + Lv2: 9000 + Lv3: 11000 + Lv4: 13000 + Lv5: 15000 + Lv6: 17000 + Lv7: 19000 + Lv8: 21000 + Lv9: 23000 + Lv10: 25000 + } + CoolDown: 3000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 10 + Lv2: 12 + Lv3: 14 + Lv4: 16 + Lv5: 18 + Lv6: 20 + Lv7: 22 + Lv8: 24 + Lv9: 26 + Lv10: 28 + } + } + Unit: { + Id: 0x107 + Interval: 1000 + Target: "Enemy" + Flag: { + UF_PATHCHECK: true + } + } +}, +{ + Id: 5030 + Name: "SU_SV_ROOTTWIST_ATK" + Description: "Silver Vine Root Twist Attack" + MaxLevel: 5 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + AttackType: "Magic" + Element: "Ele_Poison" + DamageType: { + IgnoreElement: true + IgnoreDefense: true + } + SkillInstances: 1 + AfterCastActDelay: 1000 + FixedCastTime: 0 + Requirements: { + SPCost: 1 + } +}, +{ + Id: 5031 + Name: "SU_POWEROFLIFE" + Description: "Power of Life" + MaxLevel: 1 + NumberOfHits: 0 +}, +{ + Id: 5032 + Name: "SU_SCAROFTAROU" + Description: "Scar of Tarou" + MaxLevel: 5 + Range: 9 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + InterruptCast: true + CastTime: 500 + AfterCastActDelay: 1000 + SkillData1: 9000 + SkillData2: 1000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 10 + Lv2: 14 + Lv3: 18 + Lv4: 22 + Lv5: 26 + Lv6: 30 + Lv7: 34 + Lv8: 38 + Lv9: 42 + Lv10: 46 + } + } +}, +{ + Id: 5033 + Name: "SU_PICKYPECK" + Description: "Picky Peck" + MaxLevel: 5 + Range: 9 + Hit: "BDT_MULTIHIT" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + NumberOfHits: -5 + InterruptCast: true + CastTime: 2500 + AfterCastActDelay: 1000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 10 + Lv2: 19 + Lv3: 28 + Lv4: 37 + Lv5: 46 + Lv6: 55 + Lv7: 64 + Lv8: 73 + Lv9: 82 + Lv10: 91 + } + } +}, +{ + Id: 5034 + Name: "SU_PICKYPECK_DOUBLE_ATK" + Description: "Picky Peck Double Attack" + MaxLevel: 5 + Hit: "BDT_MULTIHIT" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + NumberOfHits: -5 + InterruptCast: true + AfterCastActDelay: 1000 + FixedCastTime: 0 + Requirements: { + SPCost: 1 + } +}, +{ + Id: 5035 + Name: "SU_ARCLOUSEDASH" + Description: "Arclouse Dash" MaxLevel: 5 Hit: "BDT_SKILL" SkillType: { - Self: true + Friend: true } DamageType: { NoDamage: true } + InterruptCast: true + CastTime: 2500 + AfterCastActDelay: 1000 + SkillData1: { + Lv1: 60000 + Lv2: 70000 + Lv3: 80000 + Lv4: 90000 + Lv5: 100000 + Lv6: 110000 + Lv7: 120000 + Lv8: 130000 + Lv9: 140000 + Lv10: 150000 + } + CoolDown: 10000 + FixedCastTime: 0 Requirements: { - SPCost: 1 + SPCost: { + Lv1: 12 + Lv2: 20 + Lv3: 28 + Lv4: 36 + Lv5: 44 + Lv6: 52 + Lv7: 60 + Lv8: 68 + Lv9: 76 + Lv10: 84 + } + } +}, +{ + Id: 5036 + Name: "SU_LUNATICCARROTBEAT" + Description: "Lunatic Carrot Beat" + MaxLevel: 5 + Range: 9 + Hit: "BDT_MULTIHIT" + SkillType: { + Enemy: true + } + AttackType: "Weapon" + Element: "Ele_Weapon" + DamageType: { + SplashArea: true + } + SplashRange: { + Lv1: 1 + Lv2: 1 + Lv3: 2 + Lv4: 2 + Lv5: 3 + Lv6: 3 + Lv7: 4 + Lv8: 4 + Lv9: 5 + Lv10: 5 + } + NumberOfHits: { + Lv1: 1 + Lv2: 2 + Lv3: 3 + Lv4: 4 + Lv5: 5 + Lv6: 6 + Lv7: 7 + Lv8: 8 + Lv9: 9 + Lv10: 10 + } + InterruptCast: true + CastTime: 3000 + AfterCastActDelay: 1000 + SkillData1: 1000 + CoolDown: 8000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 15 + Lv2: 25 + Lv3: 35 + Lv4: 45 + Lv5: 55 + Lv6: 65 + Lv7: 75 + Lv8: 85 + Lv9: 95 + Lv10: 105 + } } }, { - Id: 5016 - Name: "SR_FLASHCOMBO_ATK_STEP2" - Description: "Flash Combo Attack Step 2" + Id: 5037 + Name: "SU_POWEROFSEA" + Description: "Power of Sea" + MaxLevel: 1 + NumberOfHits: 0 +}, +{ + Id: 5038 + Name: "SU_TUNABELLY" + Description: "Tuna Belly" MaxLevel: 5 + Range: 9 Hit: "BDT_SKILL" SkillType: { - Self: true + Friend: true } DamageType: { NoDamage: true } + InterruptCast: true + CastTime: 2000 + AfterCastActDelay: 1000 + CoolDown: { + Lv1: 8000 + Lv2: 10000 + Lv3: 12000 + Lv4: 14000 + Lv5: 16000 + Lv6: 18000 + Lv7: 20000 + Lv8: 22000 + Lv9: 24000 + Lv10: 26000 + } + FixedCastTime: 0 Requirements: { - SPCost: 1 + SPCost: { + Lv1: 20 + Lv2: 30 + Lv3: 40 + Lv4: 50 + Lv5: 60 + Lv6: 70 + Lv7: 80 + Lv8: 90 + Lv9: 100 + Lv10: 110 + } } }, { - Id: 5017 - Name: "SR_FLASHCOMBO_ATK_STEP3" - Description: "Flash Combo Attack Step 3" + Id: 5039 + Name: "SU_TUNAPARTY" + Description: "Tuna Party" MaxLevel: 5 + Range: 9 Hit: "BDT_SKILL" SkillType: { - Self: true + Friend: true } DamageType: { NoDamage: true } + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: 30000 + CoolDown: 20000 + FixedCastTime: 0 Requirements: { - SPCost: 1 + SPCost: { + Lv1: 20 + Lv2: 30 + Lv3: 40 + Lv4: 50 + Lv5: 60 + Lv6: 70 + Lv7: 80 + Lv8: 90 + Lv9: 100 + Lv10: 110 + } } }, { - Id: 5018 - Name: "SR_FLASHCOMBO_ATK_STEP4" - Description: "Flash Combo Attack Step 4" + Id: 5040 + Name: "SU_BUNCHOFSHRIMP" + Description: "Bunch of Shrimp" MaxLevel: 5 Hit: "BDT_SKILL" SkillType: { @@ -33082,7 +33740,119 @@ skill_db: ( } DamageType: { NoDamage: true + SplashArea: true + } + SplashRange: -1 + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: { + Lv1: 60000 + Lv2: 90000 + Lv3: 120000 + Lv4: 150000 + Lv5: 180000 + Lv6: 210000 + Lv7: 240000 + Lv8: 270000 + Lv9: 300000 + Lv10: 330000 + } + CoolDown: 10000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 44 + Lv2: 48 + Lv3: 52 + Lv4: 56 + Lv5: 60 + Lv6: 64 + Lv7: 68 + Lv8: 72 + Lv9: 76 + Lv10: 80 + } +// Items: { +// Prawn: 1 +// } + + } +}, +{ + Id: 5041 + Name: "SU_FRESHSHRIMP" + Description: "Fresh Shrimp" + MaxLevel: 5 + Range: 9 + Hit: "BDT_SKILL" + SkillType: { + Friend: true + } + DamageType: { + NoDamage: true + SplashArea: true + } + InterruptCast: true + AfterCastActDelay: 1000 + SkillData1: 120000 + CoolDown: 7000 + FixedCastTime: 0 + Requirements: { + SPCost: { + Lv1: 22 + Lv2: 24 + Lv3: 26 + Lv4: 28 + Lv5: 30 + Lv6: 32 + Lv7: 34 + Lv8: 36 + Lv9: 38 + Lv10: 40 + } + } +}, +{ + Id: 5042 + Name: "SU_CN_METEOR_ATK" + Description: "" + MaxLevel: 5 + Hit: "BDT_SKILL" + SkillType: { + Place: true + } + SkillInfo: { + Chorus: true + } + AttackType: "Magic" + InterruptCast: true + Requirements: { + SPCost: { + Lv1: 20 + Lv2: 35 + Lv3: 50 + Lv4: 65 + Lv5: 80 + } +// Items: { +// Catnip_Fruit: 1 +// } + } +}, +{ + Id: 5043 + Name: "SU_LUNATICCARROTBEAT2" + Description: "Lunatic Carrot Beat 2" + MaxLevel: 5 + Hit: "BDT_SKILL" + SkillType: { + Enemy: true + } + SkillInfo: { + Chorus: true } + AttackType: "Weapon" + InterruptCast: true Requirements: { SPCost: 1 } diff --git a/db/sc_config.txt b/db/sc_config.txt index e0b65c7e..5571cf70 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -492,6 +492,10 @@ SC_TIME_ACCESSORY, 463 SC_MAGICAL_FEATHER, 463 SC_BLOSSOM_FLUTTERING, 463 +// Summoner +SC_SPRITEMABLE, 205 +SC_BITESCAR, 4 + // Cant Clear SC_ALL_RIDING, 397 -- cgit v1.2.3-70-g09d2