diff options
Diffstat (limited to 'db/re')
-rw-r--r-- | db/re/item_db.conf | 137 | ||||
-rw-r--r-- | db/re/map_zone_db.conf | 188 | ||||
-rw-r--r-- | db/re/mob_db.conf | 4 | ||||
-rw-r--r-- | db/re/skill_db.conf | 56 |
4 files changed, 211 insertions, 174 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf index cac13166d..d1f416b08 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -86,6 +86,7 @@ item_db: ( EquipLv: Equip required level (int, defaults to 0) EquipLv: [min, max] (alternative syntax with min / max level) Refine: Refineable (boolean, defaults to true) + DisableOptions: true/false (boolean, defaults to false !!for equipments only!!) [Smokexyz] View: View ID (int, defaults to 0) BindOnEquip: true/false (boolean, defaults to false) ForceSerial: true/false (boolean, defaults to false) @@ -1217,6 +1218,9 @@ item_db: ( Buy: 2000 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_ENDURE,1; "> }, { @@ -1227,6 +1231,9 @@ item_db: ( Buy: 1500 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_SELFPROVOKE,1; "> }, { @@ -31571,7 +31578,8 @@ item_db: ( EquipLv: 100 Script: <" bonus bMaxSP,40; - bonus bAgi,-7+min(getequiprefinerycnt(EQI_SHOES),8); + if (getrefine() >= 8) + bonus bAgi, getrefine() - 7; "> }, { @@ -94151,10 +94159,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94164,10 +94176,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94177,10 +94193,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94190,10 +94210,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94203,10 +94227,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94216,10 +94244,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94229,10 +94261,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -94242,10 +94278,14 @@ item_db: ( Type: 0 Buy: 2 Weight: 20 + Job: { + Assassin: true + } + Upper: 56 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK; "> }, @@ -94257,6 +94297,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Delay: 120000 Trade: { nodrop: true @@ -94271,7 +94315,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_REFRESH,1; "> + Script: <" itemskill RK_REFRESH, 1; "> }, { Id: 12726 @@ -94280,6 +94324,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Delay: 30000 Trade: { nodrop: true @@ -94294,7 +94342,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_CRUSHSTRIKE,1; "> + Script: <" itemskill RK_CRUSHSTRIKE, 1; "> }, { Id: 12727 @@ -94303,6 +94351,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Delay: 60000 Trade: { nodrop: true @@ -94317,7 +94369,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_MILLENNIUMSHIELD,1; "> + Script: <" itemskill RK_MILLENNIUMSHIELD, 1; "> }, { Id: 12728 @@ -94326,6 +94378,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Trade: { nodrop: true notrade: true @@ -94339,7 +94395,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_VITALITYACTIVATION,1; "> + Script: <" itemskill RK_VITALITYACTIVATION, 1; "> }, { Id: 12729 @@ -94348,6 +94404,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Trade: { nodrop: true notrade: true @@ -94361,7 +94421,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_FIGHTINGSPIRIT,1; "> + Script: <" itemskill RK_FIGHTINGSPIRIT, 1; "> }, { Id: 12730 @@ -94370,6 +94430,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Trade: { nodrop: true notrade: true @@ -94383,7 +94447,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_ABUNDANCE,1; "> + Script: <" itemskill RK_ABUNDANCE, 1; "> }, { Id: 12731 @@ -94392,6 +94456,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Trade: { nodrop: true notrade: true @@ -94405,7 +94473,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_GIANTGROWTH,1; "> + Script: <" itemskill RK_GIANTGROWTH, 1; "> }, { Id: 12732 @@ -94414,6 +94482,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Delay: 1000 Trade: { nodrop: true @@ -94428,7 +94500,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_STORMBLAST,1; "> + Script: <" itemskill RK_STORMBLAST, 1; "> }, { Id: 12733 @@ -94437,6 +94509,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Trade: { nodrop: true notrade: true @@ -94450,8 +94526,10 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_STONEHARDSKIN,1; "> + Script: <" itemskill RK_STONEHARDSKIN, 1; "> }, + +//== Rune Knight Rune Ores ============================= { Id: 12734 AegisName: "Runstone_Quality" @@ -94459,9 +94537,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } BuyingStore: true Script: <" makerune 5; "> }, @@ -94472,9 +94547,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } BuyingStore: true Script: <" makerune 11; "> }, @@ -94485,9 +94557,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } BuyingStore: true Script: <" makerune 14; "> }, @@ -94498,9 +94567,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } BuyingStore: true Script: <" makerune 2; "> }, @@ -94511,9 +94577,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } BuyingStore: true Script: <" makerune 8; "> }, @@ -146789,7 +146852,7 @@ item_db: ( nomail: true noauction: true } - Script: <" unitskilluseid getcharid(CHAR_ID_ACCOUNT), "AL_TELEPORT", 3; "> + Script: <" warp "moc_para01", 171, 115; "> }, { Id: 22514 @@ -146813,6 +146876,10 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 56 Delay: 60000 Trade: { nodrop: true @@ -146824,7 +146891,7 @@ item_db: ( noauction: true } Stack: [20, 1] - Script: <" itemskill RK_LUXANIMA,1; "> + Script: <" itemskill RK_LUXANIMA, 1; "> }, { Id: 22669 diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index 282a85abb..133cc5337 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -55,37 +55,6 @@ zones: ( //Both examples below disable apple (id 501) //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 - //heal: 70 - } - skill_damage_cap: { - //Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage, - // (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h) - // when cast vs players and monsters. - //MG_COLDBOLT: (50,"PLAYER | MONSTER") - } -}, -{ - /* 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" - WM_SATURDAY_NIGHT_FEVER: "PLAYER" - SO_ARRULLO: "PLAYER" - CG_HERMODE: "PLAYER" - } - - disabled_items: { Velum_Jamadhar: true Velum_Scare: true Velum_Buster: true @@ -124,6 +93,37 @@ zones: ( 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 + //heal: 70 + } + skill_damage_cap: { + //Example Below caps Cold Bolt damage in maps within this zone to a maximum 50 damage, + // (depends on HMAP_ZONE_DAMAGE_CAP_TYPE in src/config/core.h) + // when cast vs players and monsters. + //MG_COLDBOLT: (50,"PLAYER | MONSTER") + } +}, +{ + /* 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" + WM_SATURDAY_NIGHT_FEVER: "PLAYER" + SO_ARRULLO: "PLAYER" + CG_HERMODE: "PLAYER" + } + + disabled_items: { + } + + mapflags: ( + ) + }, { /* PvP zone is applied to all maps with a pvp mapflag */ @@ -137,6 +137,38 @@ zones: ( disabled_items: { Greed_Scroll: true C_Beginner_Cap: true + Velum_Jamadhar: false + Velum_Scare: false + Velum_Buster: false + Velum_Guillotine: false + Velum_Spear: false + Velum_Glaive: false + Velum_Bible: false + Velum_Encyclopedia: false + Velum_Claw: false + Velum_Arc_Wand: false + Velum_Damascus: false + Velum_Stunner: false + Velum_Flail: false + Velum_Arbalest: false + Velum_CrossBow: false + Velum_Claymore: false + Velum_Katzbalger: false + Siege_Arrow_A: false + Siege_Arrow_S: false + Siege_Greave: false + Siege_Boots: false + Siege_Shoes: false + Siege_Manteau: false + Siege_Muffler: false + Siege_White_Potion: false + Siege_Blue_Potion: false + Woe_Violet_Potion: false + Woe_White_Potion: false + Woe_Blue_Potion: false + Siege_Plate: false + Siege_Suits: false + Siege_Robe: false } /* cashshop disabled in pvp maps */ @@ -298,40 +330,6 @@ zones: ( disabled_items: { Assumptio_5_Scroll: true Pty_Assumptio_Scroll: true - Velum_Jamadhar: true - Velum_Scare: true - Velum_Buster: true - Velum_Guillotine: true - Velum_Spear: true - Velum_Glaive: true - Velum_Bible: true - Velum_Encyclopedia: true - Velum_Claw: true - Velum_Arc_Wand: true - Velum_Damascus: true - Velum_Stunner: true - Velum_Flail: true - Velum_Arbalest: true - Velum_CrossBow: true - Velum_Claymore: true - Velum_Katzbalger: true - Siege_Arrow_A: true - Siege_Arrow_S: true - Siege_Greave: true - Siege_Boots: true - Siege_Shoes: true - Siege_Manteau: true - Siege_Muffler: true - Siege_White_Potion: true - Siege_Blue_Potion: true - Woe_Violet_Potion: true - Woe_White_Potion: true - Woe_Blue_Potion: true - TE_White_Potion: true - TE_White_Slim_Potion: true - Siege_Plate: true - Siege_Suits: true - Siege_Robe: true C_Beginner_Cap: true } @@ -445,6 +443,19 @@ zones: ( SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" } + + mapflags: ( + "nobranch", + "noicewall", + "nomemo", + "nosave SavePoint", + "noteleport", + "monster_noteleport", + "nowarpto", + "partylock", + "pvp off", + "src4instance", + ) }, { name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */ @@ -458,6 +469,19 @@ zones: ( SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" } + + mapflags: ( + "nobranch", + "noicewall", + "nomemo", + "nosave SavePoint", + "noteleport", + "monster_noteleport", + "nowarpto", + "partylock", + "pvp off", + "src4instance", + ) }, { name: "Towns" @@ -474,40 +498,6 @@ zones: ( disabled_items: { Greed_Scroll: true - Velum_Jamadhar: true - Velum_Scare: true - Velum_Buster: true - Velum_Guillotine: true - Velum_Spear: true - Velum_Glaive: true - Velum_Bible: true - Velum_Encyclopedia: true - Velum_Claw: true - Velum_Arc_Wand: true - Velum_Damascus: true - Velum_Stunner: true - Velum_Flail: true - Velum_Arbalest: true - Velum_CrossBow: true - Velum_Claymore: true - Velum_Katzbalger: true - Siege_Arrow_A: true - Siege_Arrow_S: true - Siege_Greave: true - Siege_Boots: true - Siege_Shoes: true - Siege_Manteau: true - Siege_Muffler: true - Siege_White_Potion: true - Siege_Blue_Potion: true - Woe_Violet_Potion: true - Woe_White_Potion: true - Woe_Blue_Potion: true - TE_White_Potion: true - TE_White_Slim_Potion: true - Siege_Plate: true - Siege_Suits: true - Siege_Robe: true } } ) diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index caa92b718..188654cf8 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -57,8 +57,8 @@ mob_db: ( } ViewRange: view range (int, defaults to 1) ChaseRange: chase range (int, defaults to 1) - Size: size (int, defaults to 1) - Race: race (int, defaults to 0) + Size: size (string, defaults to "Size_Medium") + Race: race (string, defaults to "RC_Formless") Element: (type, level) Mode: { CanMove: true/false (bool, defaults to false) diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 8eb2b40fa..2a59785fa 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2016 Hercules Dev Team +//= Copyright (C) 2014-2017 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -6271,7 +6271,7 @@ skill_db: ( DamageType: { NoDamage: true } - SkillData2: 3000 + SkillData2: 5000 FixedCastTime: 0 }, { @@ -6408,18 +6408,7 @@ skill_db: ( } SplashRange: 3 SkillData1: 5000 - SkillData2: { - Lv1: 8000 - Lv2: 9000 - Lv3: 10000 - Lv4: 11000 - Lv5: 12000 - Lv6: 13000 - Lv7: 14000 - Lv8: 15000 - Lv9: 16000 - Lv10: 17000 - } + SkillData2: 20000 FixedCastTime: 0 Requirements: { SPCost: 20 @@ -18494,7 +18483,7 @@ skill_db: ( SplashRange: 1 KnockBackTiles: 5 AfterCastActDelay: 2000 - SkillData2: 2000 + SkillData2: 5000 FixedCastTime: -1 Requirements: { HPCost: 10 @@ -24690,16 +24679,11 @@ skill_db: ( } AttackType: "Weapon" SkillData1: { - Lv1: 3500 - Lv2: 4000 - Lv3: 4500 - Lv4: 5000 - Lv5: 5500 - Lv6: 6000 - Lv7: 6500 - Lv8: 7000 - Lv9: 7500 - Lv10: 8000 + Lv1: 5500 + Lv2: 6000 + Lv3: 6500 + Lv4: 7000 + Lv5: 7500 } CoolDown: 2000 FixedCastTime: -1 @@ -25464,7 +25448,13 @@ skill_db: ( Lv9: 9 Lv10: 10 } - SkillData1: 1000 + SkillData1: { + Lv1: 1000 + Lv2: 2000 + Lv3: 2000 + Lv4: 3000 + Lv5: 3000 + } CoolDown: 3000 FixedCastTime: -1 Requirements: { @@ -30667,6 +30657,7 @@ skill_db: ( } Requirements: { SPCost: 40 + State: "Cart" } }, { @@ -33999,18 +33990,7 @@ skill_db: ( NoDamage: true } NumberOfHits: 0 - SkillData2: { - Lv1: 60000 - Lv2: 70000 - Lv3: 80000 - Lv4: 90000 - Lv5: 129000 - Lv6: 129000 - Lv7: 129000 - Lv8: 129000 - Lv9: 129000 - Lv10: 129000 - } + CoolDown: 1000 FixedCastTime: -1 Requirements: { SPCost: 10 |