diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /db/item_options.conf | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'db/item_options.conf')
| -rw-r--r-- | db/item_options.conf | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/db/item_options.conf b/db/item_options.conf index 750aecfc9..9eabad237 100644 --- a/db/item_options.conf +++ b/db/item_options.conf @@ -523,16 +523,18 @@ item_options_db: ( 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)); + bonus2(bAddRaceTolerance, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); else - bonus2(bSubRace, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); + bonus2(bSubRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +*/ { Id: 93 Name: "RACE_TOLERACE_DEVIL" @@ -598,11 +600,13 @@ item_options_db: ( 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)); "> + Script: <" bonus2(bAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +*/ { Id: 103 Name: "RACE_DAMAGE_DEVIL" @@ -648,11 +652,13 @@ item_options_db: ( 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)); "> + Script: <" bonus2(bMagicAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +*/ { Id: 113 Name: "RACE_MDAMAGE_DEVIL" @@ -698,11 +704,13 @@ item_options_db: ( 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); "> + Script: <" bonus2(bCriticalAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE) / 10); "> }, +*/ { Id: 123 Name: "RACE_CRI_PERCENT_DEVIL" @@ -748,11 +756,13 @@ item_options_db: ( Name: "RACE_IGNORE_DEF_PERCENT_INSECT" Script: <" bonus2(bIgnoreDefRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +/* { Id: 132 Name: "RACE_IGNORE_DEF_PERCENT_FISHS" - Script: <" bonus2(bIgnoreDefRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> + Script: <" bonus2(bIgnoreDefRate, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +*/ { Id: 133 Name: "RACE_IGNORE_DEF_PERCENT_DEVIL" @@ -798,11 +808,13 @@ item_options_db: ( Name: "RACE_IGNORE_MDEF_PERCENT_INSECT" Script: <" bonus2(bIgnoreMdefRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +/* { Id: 142 Name: "RACE_IGNORE_MDEF_PERCENT_FISHS" - Script: <" bonus2(bIgnoreMdefRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); "> + Script: <" bonus2(bIgnoreMdefRate, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); "> }, +*/ { Id: 143 Name: "RACE_IGNORE_MDEF_PERCENT_DEVIL" |