diff options
Diffstat (limited to 'db')
-rw-r--r-- | db/constants.conf | 54 | ||||
-rw-r--r-- | db/item_options.conf | 1026 | ||||
-rw-r--r-- | db/pre-re/item_db.conf | 153 | ||||
-rw-r--r-- | db/pre-re/job_db.conf | 13 | ||||
-rw-r--r-- | db/pre-re/map_zone_db.conf | 28 | ||||
-rw-r--r-- | db/pre-re/mob_db.conf | 4 | ||||
-rw-r--r-- | db/pre-re/skill_db.conf | 46 | ||||
-rw-r--r-- | db/quest_db.conf | 20 | ||||
-rw-r--r-- | db/re/item_db.conf | 135 | ||||
-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 |
12 files changed, 1469 insertions, 258 deletions
diff --git a/db/constants.conf b/db/constants.conf index c349ae152..d108e0976 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3504,6 +3504,51 @@ constants_db: { 4_F_REBELLION2: 10201 4_F_REBELLION3: 10202 4_M_ILYA: 10203 + // Free ID - 10204 + 4_ELDER: 10205 + 4_LUNATIC: 10206 + 4_F_NOVICE2: 10207 + 4_WICKEDNYMPH: 10208 + 4_F_PREMI: 10209 + 4_M_COSTELL: 10210 + 4_M_YATTWARP: 10211 + 4_M_EVOKASCUDI: 10212 + 4_M_JOHNNYJAMES: 10213 + 4_M_ALBERTFORD: 10214 + 4_M_SEANMCCURDY: 10215 + 4_M_KARAMPUCCI: 10216 + 4_M_CACTUSMAN1: 10217 + 4_M_CACTUSMAN2: 10218 + 4_M_CACTUSMAN3: 10219 + 4_M_CACTUSLADY: 10220 + 4_M_GAST: 10221 + 4_M_CACTUSCHILD: 10222 + 4_KING: 10223 + 4_F_BOMI: 10224 + 4_M_CACTUSCHIEF: 10225 + 4_F_CACTUSCHILD2: 10226 + 4_F_CACTUSLADY2: 10227 + 4_F_CACTUSLADY3: 10228 + 4_M_CACTUS: 10229 + 4_M_COWRAIDERS1: 10230 + 4_M_COWRAIDERS2: 10231 + 4_M_COWRAIDERS3: 10232 + 4_F_JP14THEVT: 10233 + 4_M_POORSCHOLAR: 10234 + 4_M_PEPPERROTI: 10235 + JP_NPC01: 10236 + 4_PURPLE_WARP: 10237 + 4_F_NARIN: 10238 + 4_M_URGENT_MAN: 10239 + 4_M_KEEN_SOLDIER: 10240 + 4_F_SLOPPY_WOMAN: 10241 + 4_F_DRKAFRA01: 10242 + 4_M_DRZONDA01: 10243 + 4_M_SWD_RENO: 10244 + 4_M_KNG_RENO: 10245 + 4_M_AC_RUMIN: 10246 + 4_M_HIGH_WIZARD: 10247 + 4_SYSTEM_BOX: 10248 comment__: "Mercenary IDs" MER_LIF: 6001 @@ -3664,14 +3709,14 @@ constants_db: { PC_PARTY: 1 PC_GUILD: 2 PC_MAP: 3 - + comment__: "strnpcinfo" NPC_NAME: 0 NPC_NAME_VISIBLE: 1 NPC_NAME_HIDDEN: 2 NPC_NAME_UNIQUE: 3 NPC_MAP: 4 - + comment__: "getcharid" CHAR_ID_CHAR: 0 CHAR_ID_PARTY: 1 @@ -3709,6 +3754,11 @@ constants_db: { GETTIME_YEAR: 7 GETTIME_DAYOFYEAR: 8 + comment__: "gettimer" + TIMER_COUNT: 0 + TIMER_TICK_NEXT: 1 + TIMER_TICK_LAST: 2 + comment__: "unit types" UNITTYPE_PC: 0 UNITTYPE_NPC: 1 diff --git a/db/item_options.conf b/db/item_options.conf new file mode 100644 index 000000000..fb0efa170 --- /dev/null +++ b/db/item_options.conf @@ -0,0 +1,1026 @@ +//================= Hercules Database ===================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 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 +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Items Options Database +//========================================================================= + +item_options_db: ( +/************************************************************************** + ************* Entry structure ******************************************** + ************************************************************************** +{ + Id: (int) This value must be unique, with an index + that is represented client-side in + data/luafiles514/lua files/datainfo/addrandomoptionnametable.lub + Name: (string) Must be a unique string since it is used + as a constant. + Script: <""> Script effect of the option. Utilizes getequippedoptioninfo + for a variable bonus effect. +}, +*/ +{ + Id: 1 + Name: "VAR_MAXHPAMOUNT" + Script: <" bonus(bMaxHP, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 2 + Name: "VAR_MAXSPAMOUNT" + Script: <" bonus(bMaxSP, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 3 + Name: "VAR_STRAMOUNT" + Script: <" bonus(bStr, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 4 + Name: "VAR_AGIAMOUNT" + Script: <" bonus(bAgi, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 5 + Name: "VAR_VITAMOUNT" + Script: <" bonus(bVit, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 6 + Name: "VAR_INTAMOUNT" + Script: <" bonus(bInt, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 7 + Name: "VAR_DEXAMOUNT" + Script: <" bonus(bDex, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 8 + Name: "VAR_LUKAMOUNT" + Script: <" bonus(bLuk, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 9 + Name: "VAR_MAXHPPERCENT" + Script: <" bonus(bMaxHPrate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 10 + Name: "VAR_MAXSPPERCENT" + Script: <" bonus(bMaxSPrate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 11 + Name: "VAR_HPACCELERATION" + Script: <" bonus(bHPrecovRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 12 + Name: "VAR_SPACCELERATION" + Script: <" bonus(bSPrecovRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 13 + Name: "VAR_ATKPERCENT" + Script: <" bonus(bAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 14 + Name: "VAR_MAGICATKPERCENT" + Script: <" bonus(bMatkRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 15 + Name: "VAR_PLUSASPD" + Script: <" bonus(bAspd, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 16 + Name: "VAR_PLUSASPDPERCENT" + Script: <" bonus(bAspdRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 17 + Name: "VAR_ATTPOWER" + Script: <" bonus(bAtk, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 18 + Name: "VAR_HITSUCCESSVALUE" + Script: <" bonus(bHit, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 19 + Name: "VAR_ATTMPOWER" + Script: <" bonus(bMatk, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 20 + Name: "VAR_ITEMDEFPOWER" + Script: <" bonus(bDef, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 21 + Name: "VAR_MDEFPOWER" + Script: <" bonus(bMdef, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 22 + Name: "VAR_AVOIDSUCCESSVALUE" + Script: <" bonus(bFlee, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 23 + Name: "VAR_PLUSAVOIDSUCCESSVALUE" + Script: <" bonus(bFlee2, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 24 + Name: "VAR_CRITICALSUCCESSVALUE" + Script: <" bonus(bCritical, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 25 + Name: "ATTR_TOLERACE_NOTHING" + Script: <" bonus2(bSubEle, Ele_Neutral, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 26 + Name: "ATTR_TOLERACE_WATER" + Script: <" bonus2(bSubEle, Ele_Water, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 27 + Name: "ATTR_TOLERACE_GROUND" + Script: <" bonus2(bSubEle, Ele_Earth, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 28 + Name: "ATTR_TOLERACE_FIRE" + Script: <" bonus2(bSubEle, Ele_Fire, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 29 + Name: "ATTR_TOLERACE_WIND" + Script: <" bonus2(bSubEle, Ele_Wind, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 30 + Name: "ATTR_TOLERACE_POISON" + Script: <" bonus2(bSubEle, Ele_Poison, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 31 + Name: "ATTR_TOLERACE_SAINT" + Script: <" bonus2(bSubEle, Ele_Holy, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 32 + Name: "ATTR_TOLERACE_DARKNESS" + Script: <" bonus2(bSubEle, Ele_Dark, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 33 + Name: "ATTR_TOLERACE_TELEKINESIS" + Script: <" bonus2(bSubEle, Ele_Ghost, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 34 + Name: "ATTR_TOLERACE_UNDEAD" + Script: <" bonus2(bSubEle, Ele_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 35 + Name: "ATTR_TOLERACE_ALL" + Script: <" bonus2(bSubEle, Ele_All, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +// TODO: Confirm if damage reduction is implemented correctly. +// kRO desc : <ELEMENT> 몬스터로부터 받는 물리 데미지 %d%% 감소. +{ + Id: 36 + Name: "DAMAGE_PROPERTY_NOTHING_USER" + Script: <" bonus3(bSubEle, Ele_Neutral, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 37 + Name: "DAMAGE_PROPERTY_NOTHING_TARGET" + Script: <" bonus2(bAddEle, Ele_Neutral, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 38 + Name: "DAMAGE_PROPERTY_WATER_USER" + Script: <" bonus3(bSubEle, Ele_Water, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 39 + Name: "DAMAGE_PROPERTY_WATER_TARGET" + Script: <" bonus2(bAddEle, Ele_Water, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 40 + Name: "DAMAGE_PROPERTY_GROUND_USER" + Script: <" bonus3(bSubEle, Ele_Earth, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 41 + Name: "DAMAGE_PROPERTY_GROUND_TARGET" + Script: <" bonus2(bAddEle, Ele_Earth, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 42 + Name: "DAMAGE_PROPERTY_FIRE_USER" + Script: <" bonus3(bSubEle, Ele_Fire, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 43 + Name: "DAMAGE_PROPERTY_FIRE_TARGET" + Script: <" bonus2(bAddEle, Ele_Fire, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 44 + Name: "DAMAGE_PROPERTY_WIND_USER" + Script: <" bonus3(bSubEle, Ele_Wind, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 45 + Name: "DAMAGE_PROPERTY_WIND_TARGET" + Script: <" bonus2(bAddEle, Ele_Wind, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 46 + Name: "DAMAGE_PROPERTY_POISON_USER" + Script: <" bonus3(bSubEle, Ele_Poison, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 47 + Name: "DAMAGE_PROPERTY_POISON_TARGET" + Script: <" bonus2(bAddEle, Ele_Poison, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 48 + Name: "DAMAGE_PROPERTY_SAINT_USER" + Script: <" bonus3(bSubEle, Ele_Holy, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 49 + Name: "DAMAGE_PROPERTY_SAINT_TARGET" + Script: <" bonus2(bAddEle, Ele_Holy, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 50 + Name: "DAMAGE_PROPERTY_DARKNESS_USER" + Script: <" bonus3(bSubEle, Ele_Dark, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 51 + Name: "DAMAGE_PROPERTY_DARKNESS_TARGET" + Script: <" bonus2(bAddEle, Ele_Dark, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 52 + Name: "DAMAGE_PROPERTY_TELEKINESIS_USER" + Script: <" bonus3(bSubEle, Ele_Ghost, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 53 + Name: "DAMAGE_PROPERTY_TELEKINESIS_TARGET" + Script: <" bonus2(bAddEle, Ele_Ghost, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 54 + Name: "DAMAGE_PROPERTY_UNDEAD_USER" + Script: <" bonus3(bSubEle, Ele_Undead, getequippedoptioninfo(IT_OPT_VALUE), BF_NORMAL); "> +}, +{ + Id: 55 + Name: "DAMAGE_PROPERTY_UNDEAD_TARGET" + Script: <" bonus2(bAddEle, Ele_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 56 + Name: "MDAMAGE_PROPERTY_NOTHING_USER" + Script: <" bonus3(bSubEle, Ele_Neutral, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 57 + Name: "MDAMAGE_PROPERTY_NOTHING_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Neutral, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 58 + Name: "MDAMAGE_PROPERTY_WATER_USER" + Script: <" bonus3(bSubEle, Ele_Water, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 59 + Name: "MDAMAGE_PROPERTY_WATER_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Water, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 60 + Name: "MDAMAGE_PROPERTY_GROUND_USER" + Script: <" bonus3(bSubEle, Ele_Earth, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 61 + Name: "MDAMAGE_PROPERTY_GROUND_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Earth, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 62 + Name: "MDAMAGE_PROPERTY_FIRE_USER" + Script: <" bonus3(bSubEle, Ele_Fire, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 63 + Name: "MDAMAGE_PROPERTY_FIRE_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Fire, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 64 + Name: "MDAMAGE_PROPERTY_WIND_USER" + Script: <" bonus3(bSubEle, Ele_Wind, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 65 + Name: "MDAMAGE_PROPERTY_WIND_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Wind, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 66 + Name: "MDAMAGE_PROPERTY_POISON_USER" + Script: <" bonus3(bSubEle, Ele_Poison, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 67 + Name: "MDAMAGE_PROPERTY_POISON_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Poison, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 68 + Name: "MDAMAGE_PROPERTY_SAINT_USER" + Script: <" bonus3(bSubEle, Ele_Holy, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 69 + Name: "MDAMAGE_PROPERTY_SAINT_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Holy, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 70 + Name: "MDAMAGE_PROPERTY_DARKNESS_USER" + Script: <" bonus3(bSubEle, Ele_Dark, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 71 + Name: "MDAMAGE_PROPERTY_DARKNESS_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Dark, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 72 + Name: "MDAMAGE_PROPERTY_TELEKINESIS_USER" + Script: <" bonus3(bSubEle, Ele_Ghost, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 73 + Name: "MDAMAGE_PROPERTY_TELEKINESIS_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Ghost, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 74 + Name: "MDAMAGE_PROPERTY_UNDEAD_USER" + Script: <" bonus3(bSubEle, Ele_Undead, getequippedoptioninfo(IT_OPT_VALUE), BF_MAGIC); "> +}, +{ + Id: 75 + Name: "MDAMAGE_PROPERTY_UNDEAD_TARGET" + Script: <" bonus2(bMagicAddEle, Ele_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 76 + Name: "BODY_ATTR_NOTHING" + Script: <" bonus(bDefEle, Ele_Neutral); "> +}, +{ + Id: 77 + Name: "BODY_ATTR_WATER" + Script: <" bonus(bDefEle, Ele_Water); "> +}, +{ + Id: 78 + Name: "BODY_ATTR_GROUND" + Script: <" bonus(bDefEle, Ele_Earth); "> +}, +{ + Id: 79 + Name: "BODY_ATTR_FIRE" + Script: <" bonus(bDefEle, Ele_Fire); "> +}, +{ + Id: 80 + Name: "BODY_ATTR_WIND" + Script: <" bonus(bDefEle, Ele_Wind); "> +}, +{ + Id: 81 + Name: "BODY_ATTR_POISON" + Script: <" bonus(bDefEle, Ele_Poison); "> +}, +{ + Id: 82 + Name: "BODY_ATTR_SAINT" + Script: <" bonus(bDefEle, Ele_Holy); "> +}, +{ + Id: 83 + Name: "BODY_ATTR_DARKNESS" + Script: <" bonus(bDefEle, Ele_Dark); "> +}, +{ + Id: 84 + Name: "BODY_ATTR_TELEKINESIS" + Script: <" bonus(bDefEle, Ele_Ghost); "> +}, +{ + Id: 85 + Name: "BODY_ATTR_UNDEAD" + Script: <" bonus(bDefEle, Ele_Undead); "> +}, +{ + Id: 86 + Name: "BODY_ATTR_ALL" + Script: <" /* Needs more info */ "> +}, +{ + Id: 87 + Name: "RACE_TOLERACE_NOTHING" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 88 + Name: "RACE_TOLERACE_UNDEAD" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 89 + Name: "RACE_TOLERACE_ANIMAL" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 90 + Name: "RACE_TOLERACE_PLANT" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 91 + Name: "RACE_TOLERACE_INSECT" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 92 + Name: "RACE_TOLERACE_FISHS" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 93 + Name: "RACE_TOLERACE_DEVIL" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 94 + Name: "RACE_TOLERACE_HUMAN" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 95 + Name: "RACE_TOLERACE_ANGEL" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 96 + Name: "RACE_TOLERACE_DRAGON" + Script: <" + if (RENEWAL) + bonus2(bAddRaceTolerance, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); + else + bonus2(bSubRace, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); + "> +}, +{ + Id: 97 + Name: "RACE_DAMAGE_NOTHING" + Script: <" bonus2(bAddRace, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 98 + Name: "RACE_DAMAGE_UNDEAD" + Script: <" bonus2(bAddRace, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 99 + Name: "RACE_DAMAGE_ANIMAL" + Script: <" bonus2(bAddRace, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 100 + Name: "RACE_DAMAGE_PLANT" + Script: <" bonus2(bAddRace, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 101 + Name: "RACE_DAMAGE_INSECT" + Script: <" bonus2(bAddRace, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 102 + Name: "RACE_DAMAGE_FISHS" + Script: <" bonus2(bAddRace, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 103 + Name: "RACE_DAMAGE_DEVIL" + Script: <" bonus2(bAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 104 + Name: "RACE_DAMAGE_HUMAN" + Script: <" bonus2(bAddRace, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 105 + Name: "RACE_DAMAGE_ANGEL" + Script: <" bonus2(bAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 106 + Name: "RACE_DAMAGE_DRAGON" + Script: <" bonus2(bAddRace, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 107 + Name: "RACE_MDAMAGE_NOTHING" + Script: <" bonus2(bMagicAddRace, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 108 + Name: "RACE_MDAMAGE_UNDEAD" + Script: <" bonus2(bMagicAddRace, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 109 + Name: "RACE_MDAMAGE_ANIMAL" + Script: <" bonus2(bMagicAddRace, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 110 + Name: "RACE_MDAMAGE_PLANT" + Script: <" bonus2(bMagicAddRace, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 111 + Name: "RACE_MDAMAGE_INSECT" + Script: <" bonus2(bMagicAddRace, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 112 + Name: "RACE_MDAMAGE_FISHS" + Script: <" bonus2(bMagicAddRace, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 113 + Name: "RACE_MDAMAGE_DEVIL" + Script: <" bonus2(bMagicAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 114 + Name: "RACE_MDAMAGE_HUMAN" + Script: <" bonus2(bMagicAddRace, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 115 + Name: "RACE_MDAMAGE_ANGEL" + Script: <" bonus2(bMagicAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 116 + Name: "RACE_MDAMAGE_DRAGON" + Script: <" bonus2(bMagicAddRace, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 117 + Name: "RACE_CRI_PERCENT_NOTHING" + Script: <" bonus2(bCriticalAddRace, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 118 + Name: "RACE_CRI_PERCENT_UNDEAD" + Script: <" bonus2(bCriticalAddRace, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 119 + Name: "RACE_CRI_PERCENT_ANIMAL" + Script: <" bonus2(bCriticalAddRace, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 120 + Name: "RACE_CRI_PERCENT_PLANT" + Script: <" bonus2(bCriticalAddRace, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 121 + Name: "RACE_CRI_PERCENT_INSECT" + Script: <" bonus2(bCriticalAddRace, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 122 + Name: "RACE_CRI_PERCENT_FISHS" + Script: <" bonus2(bCriticalAddRace, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 123 + Name: "RACE_CRI_PERCENT_DEVIL" + Script: <" bonus2(bCriticalAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 124 + Name: "RACE_CRI_PERCENT_HUMAN" + Script: <" bonus2(bCriticalAddRace, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 125 + Name: "RACE_CRI_PERCENT_ANGEL" + Script: <" bonus2(bCriticalAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 126 + Name: "RACE_CRI_PERCENT_DRAGON" + Script: <" bonus2(bCriticalAddRace, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> +}, +{ + Id: 127 + Name: "RACE_IGNORE_DEF_PERCENT_NOTHING" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 128 + Name: "RACE_IGNORE_DEF_PERCENT_UNDEAD" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 129 + Name: "RACE_IGNORE_DEF_PERCENT_ANIMAL" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 130 + Name: "RACE_IGNORE_DEF_PERCENT_PLANT" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 131 + Name: "RACE_IGNORE_DEF_PERCENT_INSECT" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 132 + Name: "RACE_IGNORE_DEF_PERCENT_FISHS" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 133 + Name: "RACE_IGNORE_DEF_PERCENT_DEVIL" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 134 + Name: "RACE_IGNORE_DEF_PERCENT_HUMAN" + Script: <" bonus2(bIgnoreDefRaceRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 135 + Name: "RACE_IGNORE_DEF_PERCENT_ANGEL" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 136 + Name: "RACE_IGNORE_DEF_PERCENT_DRAGON" + Script: <" bonus2(bIgnoreDefRaceRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 137 + Name: "RACE_IGNORE_MDEF_PERCENT_NOTHING" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 138 + Name: "RACE_IGNORE_MDEF_PERCENT_UNDEAD" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 139 + Name: "RACE_IGNORE_MDEF_PERCENT_ANIMAL" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 140 + Name: "RACE_IGNORE_MDEF_PERCENT_PLANT" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 141 + Name: "RACE_IGNORE_MDEF_PERCENT_INSECT" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 142 + Name: "RACE_IGNORE_MDEF_PERCENT_FISHS" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 143 + Name: "RACE_IGNORE_MDEF_PERCENT_DEVIL" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 144 + Name: "RACE_IGNORE_MDEF_PERCENT_HUMAN" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 145 + Name: "RACE_IGNORE_MDEF_PERCENT_ANGEL" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 146 + Name: "RACE_IGNORE_MDEF_PERCENT_DRAGON" + Script: <" bonus2(bIgnoreMdefRaceRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 147 + Name: "CLASS_DAMAGE_NORMAL_TARGET" + Script: <" bonus2(bAddClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 148 + Name: "CLASS_DAMAGE_BOSS_TARGET" + Script: <" bonus2(bAddClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 149 + Name: "CLASS_DAMAGE_NORMAL_USER" + Script: <" bonus2(bSubClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 150 + Name: "CLASS_DAMAGE_BOSS_USER" + Script: <" bonus2(bSubClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 151 + Name: "CLASS_MDAMAGE_NORMAL" + Script: <" bonus2(bMagicAddClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 152 + Name: "CLASS_MDAMAGE_BOSS" + Script: <" bonus2(bMagicAddClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 153 + Name: "CLASS_IGNORE_DEF_PERCENT_NORMAL" + Script: <" bonus2(bIgnoreDefClassRate, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 154 + Name: "CLASS_IGNORE_DEF_PERCENT_BOSS" + Script: <" bonus2(bIgnoreDefClassRate, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 155 + Name: "CLASS_IGNORE_MDEF_PERCENT_NORMAL" + Script: <" bonus2(bIgnoreMdefClassRate, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 156 + Name: "CLASS_IGNORE_MDEF_PERCENT_BOSS" + Script: <" bonus2(bIgnoreMdefClassRate, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 157 + Name: "DAMAGE_SIZE_SMALL_TARGET" + Script: <" bonus2(bAddSize, Size_Small, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 158 + Name: "DAMAGE_SIZE_MIDIUM_TARGET" + Script: <" bonus2(bAddSize, Size_Medium, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 159 + Name: "DAMAGE_SIZE_LARGE_TARGET" + Script: <" bonus2(bAddSize, Size_Large, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 160 + Name: "DAMAGE_SIZE_SMALL_USER" + Script: <" bonus2(bSubSize, Size_Small, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 161 + Name: "DAMAGE_SIZE_MIDIUM_USER" + Script: <" bonus2(bSubSize, Size_Medium, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 162 + Name: "DAMAGE_SIZE_LARGE_USER" + Script: <" bonus2(bSubSize, Size_Large, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 163 + Name: "DAMAGE_SIZE_PERFECT" + Script: <" bonus(bNoSizeFix, 1); "> +}, +{ + Id: 164 + Name: "DAMAGE_CRI_TARGET" + Script: <" bonus(bCritAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 165 + Name: "DAMAGE_CRI_USER" + Script: <" bonus(bCriticalDef, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 166 + Name: "RANGE_ATTACK_DAMAGE_TARGET" + Script: <" bonus(bLongAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 167 + Name: "RANGE_ATTACK_DAMAGE_USER" + Script: <" bonus(bLongAtkDef, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 168 + Name: "HEAL_VALUE" + Script: <" bonus(bHealPower, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 169 + Name: "HEAL_MODIFY_PERCENT" + Script: <" bonus(bHealPower2, getequippedoptioninfo(IT_OPT_VALUE)); "> +}, +{ + Id: 170 + Name: "DEC_SPELL_CAST_TIME" + Script: <" bonus(bVariableCastrate, -(getequippedoptioninfo(IT_OPT_VALUE))); "> +}, +{ + Id: 171 + Name: "DEC_SPELL_DELAY_TIME" + Script: <" bonus(bDelayrate, -(getequippedoptioninfo(IT_OPT_VALUE))); "> +}, +{ + Id: 172 + Name: "DEC_SP_CONSUMPTION" + Script: <" bonus(bUseSPrate, -(getequippedoptioninfo(IT_OPT_VALUE))); "> +}, +{ + Id: 173 + Name: "HP_DRAIN" + Script: <" /* Needs more info */ "> +}, +{ + Id: 174 + Name: "SP_DRAIN" + Script: <" /* Needs more info */ "> +}, +{ + Id: 175 + Name: "WEAPON_ATTR_NOTHING" + Script: <" bonus(bAtkEle, Ele_Neutral); "> +}, +{ + Id: 176 + Name: "WEAPON_ATTR_WATER" + Script: <" bonus(bAtkEle, Ele_Water); "> +}, +{ + Id: 177 + Name: "WEAPON_ATTR_GROUND" + Script: <" bonus(bAtkEle, Ele_Earth); "> +}, +{ + Id: 178 + Name: "WEAPON_ATTR_FIRE" + Script: <" bonus(bAtkEle, Ele_Fire); "> +}, +{ + Id: 179 + Name: "WEAPON_ATTR_WIND" + Script: <" bonus(bAtkEle, Ele_Wind); "> +}, +{ + Id: 180 + Name: "WEAPON_ATTR_POISON" + Script: <" bonus(bAtkEle, Ele_Poison); "> +}, +{ + Id: 181 + Name: "WEAPON_ATTR_SAINT" + Script: <" bonus(bAtkEle, Ele_Holy); "> +}, +{ + Id: 182 + Name: "WEAPON_ATTR_DARKNESS" + Script: <" bonus(bAtkEle, Ele_Dark); "> +}, +{ + Id: 183 + Name: "WEAPON_ATTR_TELEKINESIS" + Script: <" bonus(bAtkEle, Ele_Ghost); "> +}, +{ + Id: 184 + Name: "WEAPON_ATTR_UNDEAD" + Script: <" bonus(bAtkEle, Ele_Undead); "> +}, +{ + Id: 185 + Name: "WEAPON_INDESTRUCTIBLE" + Script: <" bonus(bUnbreakableWeapon, 1); "> +}, +{ + Id: 186 + Name: "BODY_INDESTRUCTIBLE" + Script: <" bonus(bUnbreakableArmor, 1); "> +} +) diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index ed400e270..cfa7cb7d1 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-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) @@ -1196,6 +1197,9 @@ item_db: ( Buy: 2000 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_ENDURE,1; "> }, { @@ -1206,6 +1210,9 @@ item_db: ( Buy: 1500 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_SELFPROVOKE,1; "> }, { @@ -74740,11 +74747,15 @@ item_db: ( Name: "Paralyze" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74753,11 +74764,15 @@ item_db: ( Name: "Leech End" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74766,11 +74781,15 @@ item_db: ( Name: "Oblivion Curse" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74779,11 +74798,15 @@ item_db: ( Name: "Disheart" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74792,11 +74815,15 @@ item_db: ( Name: "Toxin" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74805,11 +74832,15 @@ item_db: ( Name: "Pyrexia" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74818,11 +74849,16 @@ item_db: ( Name: "Magic Mushroom" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + BuyingStore: true + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK; "> }, { @@ -74831,11 +74867,15 @@ item_db: ( Name: "Venom Bleed" Type: 0 Buy: 2 - Weight: 100 + Weight: 20 + Job: { + Assassin: true + } + Upper: 8 BuyingStore: true Script: <" specialeffect2 EF_ENCHANTPOISON; - sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; + sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK; "> }, @@ -74847,6 +74887,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Delay: 120000 Trade: { @@ -74862,7 +74905,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_REFRESH,1; "> + Script: <" itemskill RK_REFRESH, 1; "> }, { Id: 12726 @@ -74871,6 +74914,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Delay: 30000 Trade: { @@ -74886,7 +74932,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_CRUSHSTRIKE,1; "> + Script: <" itemskill RK_CRUSHSTRIKE, 1; "> }, { Id: 12727 @@ -74895,6 +74941,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Delay: 60000 Trade: { @@ -74910,7 +74959,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_MILLENNIUMSHIELD,1; "> + Script: <" itemskill RK_MILLENNIUMSHIELD, 1; "> }, { Id: 12728 @@ -74919,6 +74968,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Trade: { nodrop: true @@ -74933,7 +74985,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_VITALITYACTIVATION,1; "> + Script: <" itemskill RK_VITALITYACTIVATION, 1; "> }, { Id: 12729 @@ -74942,6 +74994,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Trade: { nodrop: true @@ -74956,7 +75011,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_FIGHTINGSPIRIT,1; "> + Script: <" itemskill RK_FIGHTINGSPIRIT, 1; "> }, { Id: 12730 @@ -74965,6 +75020,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Trade: { nodrop: true @@ -74979,7 +75037,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_ABUNDANCE,1; "> + Script: <" itemskill RK_ABUNDANCE, 1; "> }, { Id: 12731 @@ -74988,6 +75046,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Trade: { nodrop: true @@ -75002,7 +75063,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_GIANTGROWTH,1; "> + Script: <" itemskill RK_GIANTGROWTH, 1; "> }, { Id: 12732 @@ -75011,6 +75072,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Delay: 1000 Trade: { @@ -75026,7 +75090,7 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_STORMBLAST,1; "> + Script: <" itemskill RK_STORMBLAST, 1; "> }, { Id: 12733 @@ -75035,6 +75099,9 @@ item_db: ( Type: 11 Buy: 100 Weight: 100 + Job: { + Knight: true + } Upper: 8 Trade: { nodrop: true @@ -75049,9 +75116,10 @@ item_db: ( sitting: true } Stack: [20, 1] - Script: <" itemskill RK_STONEHARDSKIN,1; "> + Script: <" itemskill RK_STONEHARDSKIN, 1; "> }, -// Rune Knight Rune Ores + +//== Rune Knight Rune Ores ============================= { Id: 12734 AegisName: "Runstone_Quality" @@ -75059,10 +75127,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } - Upper: 8 BuyingStore: true Script: <" makerune 5; "> }, @@ -75073,10 +75137,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } - Upper: 8 BuyingStore: true Script: <" makerune 11; "> }, @@ -75087,10 +75147,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } - Upper: 8 BuyingStore: true Script: <" makerune 14; "> }, @@ -75101,10 +75157,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } - Upper: 8 BuyingStore: true Script: <" makerune 2; "> }, @@ -75115,10 +75167,6 @@ item_db: ( Type: 0 Buy: 2 Weight: 100 - Job: { - Knight: true - } - Upper: 8 BuyingStore: true Script: <" makerune 8; "> }, @@ -96075,7 +96123,20 @@ item_db: ( Type: 11 Buy: 2 Weight: 100 + Job: { + Knight: true + } + Upper: 8 Delay: 60000 + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nogstorage: true + nomail: true + noauction: true + } Stack: [20, 1] Script: <" itemskill RK_LUXANIMA,1; "> }, diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf index 5f5131726..186e5bd99 100644 --- a/db/pre-re/job_db.conf +++ b/db/pre-re/job_db.conf @@ -102,12 +102,12 @@ Novice: { 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90 - 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100 - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110 - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120 - 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 + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 91 - 100 + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 101 - 110 + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 111 - 120 + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 121 - 130 + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 131 - 140 + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 141 - 150 } Swordsman: { Weight: 28000 @@ -335,6 +335,7 @@ Priest: { Mace: 600 TwoHandMace: 600 Rod: 600 + // Knuckle: 500 /* Note. Official value is 2000 (default). To normalize aspd remove comment to this line. */ Book: 600 TwoHandRod: 600 } diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf index cab00bbb9..b8797a6d3 100644 --- a/db/pre-re/map_zone_db.conf +++ b/db/pre-re/map_zone_db.conf @@ -66,7 +66,7 @@ zones: ( //heal: 70 } skill_damage_cap: { - //Exemple Below caps firebolt damage in maps within this zone to a maximum 50 damage, + //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") @@ -334,6 +334,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 */ @@ -347,6 +360,19 @@ zones: ( SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" } + + mapflags: ( + "nobranch", + "noicewall", + "nomemo", + "nosave SavePoint", + "noteleport", + "monster_noteleport", + "nowarpto", + "partylock", + "pvp off", + "src4instance", + ) }, { name: "Towns" diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index 82501748d..40635cd68 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-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/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 95683a9e0..80527b4f6 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-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 @@ -6041,7 +6041,7 @@ skill_db: ( DamageType: { NoDamage: true } - SkillData2: 3000 + SkillData2: 5000 CoolDown: 0 }, { @@ -6177,18 +6177,7 @@ skill_db: ( } SplashRange: 1 SkillData1: 5000 - SkillData2: { - Lv1: 8000 - Lv2: 9000 - Lv3: 10000 - Lv4: 11000 - Lv5: 12000 - Lv6: 13000 - Lv7: 14000 - Lv8: 15000 - Lv9: 16000 - Lv10: 17000 - } + SkillData2: 30000 CoolDown: 0 Requirements: { SPCost: 20 @@ -14881,11 +14870,10 @@ skill_db: ( Range: -9 Hit: "BDT_MULTIHIT" SkillType: { - Self: true + Enemy: true } SkillInfo: { Spirit: true - NoCastSelf: true } AttackType: "Weapon" Element: "Ele_Weapon" @@ -17953,7 +17941,7 @@ skill_db: ( SplashRange: 1 KnockBackTiles: 5 AfterCastActDelay: 2000 - SkillData2: 2000 + SkillData2: 5000 CoolDown: 0 Requirements: { HPCost: 10 @@ -24041,16 +24029,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 Requirements: { @@ -24806,7 +24789,13 @@ skill_db: ( Lv9: 9 Lv10: 10 } - SkillData1: 1000 + SkillData1: { + Lv1: 1000 + Lv2: 2000 + Lv3: 2000 + Lv4: 3000 + Lv5: 3000 + } CoolDown: 3000 Requirements: { SPCost: { @@ -29853,6 +29842,7 @@ skill_db: ( } Requirements: { SPCost: 40 + State: "Cart" } }, { diff --git a/db/quest_db.conf b/db/quest_db.conf index 015692b07..49952d94b 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -9040,6 +9040,14 @@ quest_db: ( Name: "Shortage of Roast Beef" }, { + Id: 11204 + Name: "Mora Village..." +}, +{ + Id: 11205 + Name: "Pauchon's Friend" +}, +{ Id: 11206 Name: "Quick Delivery Yoneseu" }, @@ -15275,6 +15283,18 @@ quest_db: ( TimeLimit: 14400 }, { + Id: 60211 + Name: "Thor Volcano base camp" +}, +{ + Id: 60212 + Name: "Thor Volcano base camp" +}, +{ + Id: 60213 + Name: "Thor Volcano base camp" +}, +{ Id: 60301 Name: "Dragon Hunting" Targets: ( diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 67617bec9..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; "> }, @@ -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 |