diff options
| author | Frost <jedzkie13@rocketmail.com> | 2015-09-17 14:38:26 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-09-17 15:01:14 +0200 |
| commit | 51329e6c6f783cbfbb51f928c921afd3b114a72a (patch) | |
| tree | 6efe2d828325abf55fe5f6f064394bf1d3c0b514 | |
| parent | 18f222b67d03dc8ad7584b972025bf58dbf39c1a (diff) | |
| download | hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.gz hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.bz2 hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.tar.xz hercules-51329e6c6f783cbfbb51f928c921afd3b114a72a.zip | |
corrected some white spaces and added missing EOL.
Split from #558 (and added a few more corrections)
Signed-off-by: Haru <haru@dotalux.com>
32 files changed, 353 insertions, 418 deletions
diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 5089fa4a5..e10f03d82 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -16,7 +16,7 @@ packet_obfuscation: 1 // Minimum delay between whisper/global/party/guild messages (in ms) -// Messages that break this threshold are silently omitted. +// Messages that break this threshold are silently omitted. min_chat_delay: 0 // Valid range of dyes and styles on the client. @@ -24,7 +24,7 @@ min_hair_style: 0 max_hair_style: 29 min_hair_color: 0 max_hair_color: 8 -min_cloth_color: 0 +min_cloth_color: 0 max_cloth_color: 4 // When set to yes, the damage field in packets sent from woe maps will be set @@ -77,7 +77,7 @@ save_clothcolor: yes // Do not display cloth colors for the wedding costume? // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled -// for this option to take effect. Set this to yes if your cloth palettes +// for this option to take effect. Set this to yes if your cloth palettes // pack doesn't has wedding palettes (or has less than the other jobs) wedding_ignorepalette: no diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf index 91c39fe71..59fc78c51 100644 --- a/conf/battle/guild.conf +++ b/conf/battle/guild.conf @@ -17,7 +17,8 @@ guild_exp_limit: 50 guild_max_castles: 0 // Restart guild skills cooldown by relog? (Note 1) -// When "no", you relog with the same cooldown remaining as from when you logged out, "yes" restarts the cooldown upon login to its full duration. +// When "no", you relog with the same cooldown remaining as from when you +// logged out, "yes" restarts the cooldown upon login to its full duration. guild_skill_relog_delay: no // Damage adjustments for WOE battles against defending Guild monsters (Note 2) @@ -46,4 +47,4 @@ guild_notice_changemap: 2 // Can guild members invite/expel members inside guild castles in WoE/GvG? (Note 1) // default: no guild_castle_invite: no -guild_castle_expulsion: no
\ No newline at end of file +guild_castle_expulsion: no diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index 3167c11b1..23087ec78 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -27,13 +27,13 @@ monster_max_aspd: 199 // attacked (eg: GrimTooth), otherwise, their rude attack" is only activated // if they can't melee reach the target (eg: sniping) // 0x004: If not set, mobs that can change target only do so when melee attacked -// (distance player/mob < 3), otherwise mobs may change target and chase +// (distance player/mob < 3), otherwise mobs may change target and chase // ranged attackers. This flag also overrides the 'provoke' target. // 0x008: When set, mobs scatter as soon as they lose their target. Use this mode // to make it much harder to mob-train by hiding and collecting them on a // single spot (ie: GrimTooth training) // 0x010: If set, mob skills defined for friends will also trigger on themselves. -// 0x020: When set, the monster ai is executed for all monsters in maps that +// 0x020: When set, the monster ai is executed for all monsters in maps that // have players on them, instead of only for mobs who are in the vicinity // of players. // 0x040: When set, when the mob's target changes map, the mob will walk towards @@ -45,7 +45,7 @@ monster_max_aspd: 199 // the same skill, instead, only to that particular entry (eg: Mob has heal // on six lines in the mob_skill_db, only the entry that is actually used // will receive the delay). This will make monsters harder, especially MvPs. -// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they +// 0x400: Set this to make mobs have a range of 9 for all skills. Otherwise, they // will obey the normal skill range rules. // Example: 0x140 -> Chase players through warps + use skills in random order. monster_ai: 0 @@ -56,7 +56,7 @@ monster_ai: 0 // 2: Every 2 cells moved // 3: Every 3 cells moved (official) // x: Every x cells moved -// Regardless of this setting, a monster will always rethink its chase if it has +// Regardless of this setting, a monster will always rethink its chase if it has // reached its target. Increase this value if you want to make monsters continue // moving after they lost their target (hide, no line of sight, etc.). monster_chase_refresh: 3 @@ -120,7 +120,7 @@ plant_spawn_delay: 100 boss_spawn_delay: 100 // Should mobs not spawn within the viewing range of players? -// 0 is disabled, otherwise it is the number of retries before giving up +// 0 is disabled, otherwise it is the number of retries before giving up // and spawning the mob within player-view anyway, unless the max (100) is used, // in which case the mob will not be spawned, and it'll be retried again in // 5 seconds. @@ -195,7 +195,7 @@ mob_remove_delay: 300000 // Defines on who the mob npc_event gets executed when a mob is killed. // Type 1: On the player that killed the mob (if killed by a non-player, resorts to type 0) // Type 0: On the player that did the most damage to the mob. -// NOTE: This affects who gains the Castle when the Emperium is broken. +// NOTE: This affects who gains the Castle when the Emperium is broken. mob_npc_event_type: 1 // Time in milliseconds to activate protection against Kill Steal @@ -235,4 +235,4 @@ mob_size_influence: no // Default (least exploitable): mob - 75, boss - 0 // Default (most official): mob - 220, boss - 1 mob_icewall_walk_block: 220 -boss_icewall_walk_block: 1
\ No newline at end of file +boss_icewall_walk_block: 1 diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf index ea54d3f2e..2b4184e11 100644 --- a/conf/battlegrounds.conf +++ b/conf/battlegrounds.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //==================================================== //= http://herc.ws/board/topic/928-memory-slasher-may-30-patch/ //==================================================== @@ -21,12 +21,12 @@ battlegrounds: ( { /* feature is not complete */ - feature_off:true + feature_off: true /* character variable for global bg delay */ global_delay_var: "BG_Delay_Tick" /* how many seconds to consider a player "afk" and kick him out? */ maximum_afk_seconds: 30 - + /* one can add as many as he wishes */ /* for custom ones, need to edit "lua files/entryqueue/entryqueuelist.lua" [Ind/Hercules] */ arenas: ({ diff --git a/conf/groups.conf b/conf/groups.conf index d31f46f24..3f0c34ffb 100644 --- a/conf/groups.conf +++ b/conf/groups.conf @@ -5,7 +5,7 @@ Player groups configuration file This file defines "player groups" and their privileges. -Each group has its id and name, lists of available commands and other +Each group has its id and name, lists of available commands and other permissions, and a list of other groups it inherits from. @@ -15,15 +15,15 @@ Group settings Unique group number. The only required field. <name> -Any string. If empty, defaults to "Group <id>". It is used in several @who +Any string. If empty, defaults to "Group <id>". It is used in several @who commands. <level> -Equivalent of GM level, which was used in revisions before r15572. You can -set it to any number, but usually it's between 0 (default) and 99. Members of -groups with lower level can not perform some actions/commands (like @kick) on -members of groups with higher level. It is what script command getgmlevel() -returns. Group level can also be used to override trade restrictions +Equivalent of GM level, which was used in revisions before r15572. You can set +it to any number, but usually it's between 0 (default) and 99. Members of +groups with lower level can not perform some actions/commands (like @kick) on +members of groups with higher level. It is what script command getgmlevel() +returns. Group level can also be used to override trade restrictions (db/item_trade.txt). <commands> @@ -31,15 +31,15 @@ A group of settings <command name> : <bool> or <commandname> : [ <bool>, <bool> ] -First boolean value is for atcommand, second one for charcommand. If set to -true, group can use command. If only atcommand value is provided, false is -assumed for charcommand. If a command name is not included, false is assumed for -both atcommand and charcommand. +First boolean value is for atcommand, second one for charcommand. If set to +true, group can use command. If only atcommand value is provided, false is +assumed for charcommand. If a command name is not included, false is assumed +for both atcommand and charcommand. For a full list of available commands, see: doc/atcommands.txt. Command names must not be aliases. <log_commands> -Boolean value. If true then all commands used by the group will be logged to +Boolean value. If true then all commands used by the group will be logged to atcommandlog. If setting is omitted in a group definition, false is assumed. Requires 'log_commands' to be enabled in 'conf/logs.conf'. @@ -50,7 +50,7 @@ If a permission is not included, false is assumed. For a full list of available permissions, see: doc/permissions.txt <inherit> -A list of group names that given group will inherit commands and permissions +A list of group names that given group will inherit commands and permissions from. Group names are case-sensitive. Inheritance results @@ -58,19 +58,19 @@ Inheritance results Both multiple inheritance (Group 2 -> Group 1 and Group 3 -> Group 1) and recursive inheritance (Group 3 -> Group 2 -> Group 1) are allowed. -Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, -and Group inherits from Group 1 at the same time). Configuration with cycles is +Inheritance rules should not create cycles (eg Group 1 inherits from Group 2, +and Group inherits from Group 1 at the same time). Configuration with cycles is considered faulty and can't be processed fully by server. -Command or permission is inherited ONLY if it's not already defined for the +Command or permission is inherited ONLY if it's not already defined for the group. -If group inherits from multiple groups, and the same command or permission is -defined for more than one of these groups, it's undefined which one will be +If group inherits from multiple groups, and the same command or permission is +defined for more than one of these groups, it's undefined which one will be inherited. Syntax ------ -This config file uses libconfig syntax: +This config file uses libconfig syntax: http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files */ @@ -84,8 +84,8 @@ groups: ( /* no commands by default */ } permissions: { - /* without this basic permissions regular players could not - trade or party */ + /* without this basic permissions regular players could not + * trade or party */ can_trade: true can_party: true } @@ -273,4 +273,3 @@ groups: ( } } ) - diff --git a/conf/packet.conf b/conf/packet.conf index 85996f4e3..33de0e901 100644 --- a/conf/packet.conf +++ b/conf/packet.conf @@ -45,7 +45,6 @@ order: deny,allow // deny: 127.0.0.1 - //---- DDoS Protection Settings ---- // If ddos_count connection request are made within ddos_interval msec, it assumes it's a DDoS attack @@ -62,5 +61,4 @@ ddos_count: 5 // (default is 600000 msecs, 10 minutes) ddos_autoreset: 600000 - import: conf/import/packet_conf.txt diff --git a/conf/script.conf b/conf/script.conf index 57442e87f..1512aa15a 100644 --- a/conf/script.conf +++ b/conf/script.conf @@ -2,7 +2,6 @@ // Hercules Script Configuration File //-------------------------------------------------------- - warn_func_mismatch_paramnum: yes check_cmdcount: 655360 diff --git a/db/guild_skill_tree.txt b/db/guild_skill_tree.txt index 8572244aa..9c5d06c18 100644 --- a/db/guild_skill_tree.txt +++ b/db/guild_skill_tree.txt @@ -11,7 +11,6 @@ // // NOTE: MAX_GUILD_SKILL_REQUIRE (typically 5) ID/Lv pairs must be specified. - 10000,1,0,0,0,0,0,0,0,0,0,0 //GD_APPROVAL#Official Guild Approval# 10001,1,10000,1,0,0,0,0,0,0,0,0 //GD_KAFRACONTRACT#Contract with Kafra# 10002,1,10000,1,0,0,0,0,0,0,0,0 //GD_GUARDRESEARCH#Guardian Research# diff --git a/db/homun_skill_tree.txt b/db/homun_skill_tree.txt index b920ccee4..f39f698fd 100644 --- a/db/homun_skill_tree.txt +++ b/db/homun_skill_tree.txt @@ -14,102 +14,122 @@ // // NOTE: MAX_PC_SKILL_REQUIRE (typically 5) ID/Lv pairs must be specified. -//Lif +// Lif 6001,8001,5,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL 6001,8002,5,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID 6001,8003,5,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN -//Amistr + +// Amistr 6002,8005,5,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE 6002,8006,5,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE 6002,8007,5,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN -//Filir + +// Filir 6003,8009,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON 6003,8010,5,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET 6003,8011,5,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED -//Vanilmirth + +// Vanilmirth 6004,8013,5,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE 6004,8014,5,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC 6004,8015,5,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT -//Lif2 + +// Lif2 6005,8001,5,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL 6005,8002,5,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID 6005,8003,5,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN -//Amistr2 + +// Amistr2 6006,8005,5,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE 6006,8006,5,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE 6006,8007,5,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN -//Filir2 + +// Filir2 6007,8009,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON 6007,8010,5,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET 6007,8011,5,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED -//Vanilmirth2 + +// Vanilmirth2 6008,8013,5,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE 6008,8014,5,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC 6008,8015,5,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT -//Lif_H + +// Lif_H 6009,8001,5,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL 6009,8002,5,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID 6009,8003,5,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN 6009,8004,3,0,0,0,0,0,0,0,0,0,0,910 //HLIF_CHANGE + //Amistr_H 6010,8005,5,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE 6010,8006,5,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE 6010,8007,5,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN 6010,8008,3,0,0,0,0,0,0,0,0,0,0,910 //HAMI_BLOODLUST -//Filir_H + +// Filir_H 6011,8009,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON 6011,8010,5,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET 6011,8011,5,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED 6011,8012,3,0,0,0,0,0,0,0,0,0,0,910 //HFLI_SBR44 -//Vanilmirth_H + +// Vanilmirth_H 6012,8013,5,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE 6012,8014,5,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC 6012,8015,5,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT 6012,8016,3,0,0,0,0,0,0,0,0,0,0,910 //HVAN_EXPLOSION -//Lif2_H + +// Lif2_H 6013,8001,5,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL 6013,8002,5,8001,3,0,0,0,0,0,0,0,0,0 //HLIF_AVOID 6013,8003,5,8001,5,0,0,0,0,0,0,0,0,0 //HLIF_BRAIN 6013,8004,3,0,0,0,0,0,0,0,0,0,0,910 //HLIF_CHANGE -//Amistr2_H + +// Amistr2_H 6014,8005,5,0,0,0,0,0,0,0,0,0,0,0 //HAMI_CASTLE 6014,8006,5,8005,5,0,0,0,0,0,0,0,0,0 //HAMI_DEFENCE 6014,8007,5,8006,3,0,0,0,0,0,0,0,0,0 //HAMI_SKIN 6014,8008,3,0,0,0,0,0,0,0,0,0,0,910 //HAMI_BLOODLUST -//Filir2_H + +// Filir2_H 6015,8009,5,0,0,0,0,0,0,0,0,0,0,0 //HFLI_MOON 6015,8010,5,8009,3,0,0,0,0,0,0,0,0,0 //HFLI_FLEET 6015,8011,5,8010,3,0,0,0,0,0,0,0,0,0 //HFLI_SPEED 6015,8012,3,0,0,0,0,0,0,0,0,0,0,910 //HFLI_SBR44 -//Vanilmirth2_H + +// Vanilmirth2_H 6016,8013,5,0,0,0,0,0,0,0,0,0,0,0 //HVAN_CAPRICE 6016,8014,5,8013,3,0,0,0,0,0,0,0,0,0 //HVAN_CHAOTIC 6016,8015,5,8013,5,0,0,0,0,0,0,0,0,0 //HVAN_INSTRUCT 6016,8016,3,0,0,0,0,0,0,0,0,0,0,910 //HVAN_EXPLOSION -//Eira + +// Eira 6048,8022,5,0,0,0,0,0,0,0,0,0,0,0 //MH_LIGHT_OF_REGENE 6048,8023,5,0,0,0,0,0,0,0,0,0,0,0 //MH_OVERED_BOOST 6048,8024,5,0,0,0,0,0,0,0,0,0,0,0 //MH_ERASER_CUTTER 6048,8025,5,0,0,0,0,0,0,0,0,0,0,0 //MH_XENO_SLASHER 6048,8026,5,0,0,0,0,0,0,0,0,0,0,0 //MH_SILENT_BREEZE -//Bayeri + +// Bayeri 6049,8031,5,0,0,0,0,0,0,0,0,0,0,0 //MH_STAHL_HORN 6049,8032,5,0,0,0,0,0,0,0,0,0,0,0 //MH_GOLDENE_FERSE 6049,8033,5,0,0,0,0,0,0,0,0,0,0,0 //MH_STEINWAND 6049,8034,5,0,0,0,0,0,0,0,0,0,0,0 //MH_HEILIGE_STANGE 6049,8035,5,0,0,0,0,0,0,0,0,0,0,0 //MH_ANGRIFFS_MODUS -//Sera + +// Sera 6050,8018,5,0,0,0,0,0,0,0,0,0,0,0 //MH_SUMMON_LEGION 6050,8019,5,0,0,0,0,0,0,0,0,0,0,0 //MH_NEEDLE_OF_PARALYZE 6050,8020,5,0,0,0,0,0,0,0,0,0,0,0 //MH_POISON_MIST 6050,8021,5,0,0,0,0,0,0,0,0,0,0,0 //MH_PAIN_KILLER -//Dieter + +// Dieter 6051,8039,5,0,0,0,0,0,0,0,0,0,0,0 //MH_MAGMA_FLOW 6051,8040,5,0,0,0,0,0,0,0,0,0,0,0 //MH_GRANITIC_ARMOR 6051,8041,5,0,0,0,0,0,0,0,0,0,0,0 //MH_LAVA_SLIDE 6051,8042,5,0,0,0,0,0,0,0,0,0,0,0 //MH_PYROCLASTIC 6051,8043,5,0,0,0,0,0,0,0,0,0,0,0 //MH_VOLCANIC_ASH -//Elanor + +// Elanor 6052,8027,1,0,0,0,0,0,0,0,0,0,0,0 //MH_STYLE_CHANGE 6052,8028,5,0,0,0,0,0,0,0,0,0,0,0 //MH_SONIC_CRAW 6052,8029,5,0,0,0,0,0,0,0,0,0,0,0 //MH_SILVERVEIN_RUSH diff --git a/db/job_db2.txt b/db/job_db2.txt index 19e19e192..c2cc06064 100644 --- a/db/job_db2.txt +++ b/db/job_db2.txt @@ -11,7 +11,7 @@ // 4 = INT increased by 1 at this job level // 5 = DEX increased by 1 at this job level // 6 = LUK increased by 1 at this job level -// + // Novice 0,0,6,5,0,2,3,0,1,4,0 // Swordman @@ -289,4 +289,3 @@ 4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5 // Rebellion 4215,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1 - diff --git a/db/map_index.txt b/db/map_index.txt index 7eafc7f66..7e43f7cd2 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -1,13 +1,13 @@ //====================================================================================== // Map Index //====================================================================================== -//Contains the list of maps with their respective IDs for inter-server use. -//IDs must never change, therefore any new maps need to be added at the end, -//and old ones must not be removed, but may be replaced. -//Format: -//mapname<tab>index <- specifies index for this map -//mapname <- map will use index of previous map +1 -//Note that map index 0 is special and reserved for "error" status. +// Contains the list of maps with their respective IDs for inter-server use. +// IDs must never change, therefore any new maps need to be added at the end, +// and old ones must not be removed, but may be replaced. +// Format: +// mapname<tab>index <- specifies index for this map +// mapname <- map will use index of previous map +1 +// Note that map index 0 is special and reserved for "error" status. alb_ship 1 alb2trea diff --git a/db/mob_skill_db2.txt b/db/mob_skill_db2.txt index bc1384f2f..4fb5b84a1 100644 --- a/db/mob_skill_db2.txt +++ b/db/mob_skill_db2.txt @@ -53,7 +53,7 @@ // -2: added for all normal types. // -4: added for all mobs. -// rAthena Dev Team +// Athena Dev Team //1900,Valaris@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, //1900,Valaris@AL_TELEPORT,walk,26,1,500,0,5000,yes,self,rudeattacked,,,,,,,, //1900,Valaris@KN_BRANDISHSPEAR,attack,57,10,2000,500,5000,no,target,always,0,,,,,,29, @@ -114,7 +114,7 @@ //1921,Easter Bunny@NPC_SUMMONSLAVE,attack,196,5,10000,3000,10000,no,self,slavele,2,1063,,,,,, //1921,Easter Bunny@NPC_SUMMONSLAVE,idle,196,5,5000,2000,40000,no,self,always,2,1920,,,,,, -//Custom Fire Poring. Warning, Colides with META_DENIRO +// Custom Fire Poring. Warning, Colides with META_DENIRO //1239,Fire Poring@AL_HEAL,idle,28,10,10000,0,2000,yes,self,always,0,,,,,,4, //1239,Fire Poring@AL_HEAL,walk,28,10,10000,0,2000,yes,self,always,0,,,,,,4, //1239,Fire Poring@AL_TELEPORT,attack,26,1,1000,5000,60000,no,self,myhpltmaxrate,30,,,,,,, @@ -128,7 +128,7 @@ //1239,Fire Poring@RG_STRIPSHIELD,attack,216,5,2000,0,3000,yes,target,always,0,,,,,,, //1239,Fire Poring@RG_STRIPWEAPON,attack,215,5,2000,0,3000,yes,target,always,0,,,,,,, -//iRO Halloween Event 2009 +// iRO Halloween Event 2009 //3014,Halloween Whisper@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,, //3014,Halloween Whisper@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,, //3014,Halloween Whisper@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,,,,,,, diff --git a/db/pre-re/item_chain.conf b/db/pre-re/item_chain.conf index 744b1cbcf..57eaef05e 100644 --- a/db/pre-re/item_chain.conf +++ b/db/pre-re/item_chain.conf @@ -1,22 +1,20 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= // http://herc.ws/board/topic/1244-official-item-grouppackagechain //==================================================== // Structure of file: /* - ITMCHAIN_<Name>: { <Item_Name>: <chance> } - */ ITMCHAIN_ORE: { @@ -39,7 +37,7 @@ ITMCHAIN_ORE: { Elunium: 20 Oridecon: 20 Gold: 10 - Emperium: 5 + Emperium: 5 } ITMCHAIN_GEM: { @@ -58,7 +56,7 @@ ITMCHAIN_GEM: { Crystal_Jewel: 150 Crystal_Jewel_: 80 Crystal_Jewel__: 50 - Crystal_Jewel___: 30 + Crystal_Jewel___: 30 } ITMCHAIN_HEAL: { diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf index a25453f3f..2a7df83ab 100644 --- a/db/pre-re/item_packages.conf +++ b/db/pre-re/item_packages.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= // http://herc.ws/board/topic/1244-official-item-grouppackagechain //==================================================== @@ -13547,4 +13547,4 @@ Old_Ore_Box: { Random: 1 Rate: 50 } -}
\ No newline at end of file +} diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf index ff83db27a..52db40eff 100644 --- a/db/pre-re/job_db.conf +++ b/db/pre-re/job_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= // http://hercs.ws/board/topic/9082-job-db1txt-redesign/ //============== pRE Structure Example =============== @@ -47,6 +47,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so // Note: If table index size is smaller than the max level the server will automatically generate the missing index based on the average increase per level. } */ + //==================================================== Novice: { BaseASPD: { @@ -88,7 +89,7 @@ Novice: { 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 + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150] // 141 - 150 } Swordsman: { Weight: 28000 @@ -103,7 +104,7 @@ Swordsman: { TwoHandAxe: 750 Mace: 650 TwoHandMace: 700 - } + } HPTable:[ 40, 46, 53, 61, 70, 79, 89, 100, 111, 123, // 1 - 10 136, 149, 163, 178, 194, 210, 227, 245, 263, 282, // 11 - 20 302, 322, 343, 365, 388, 411, 435, 460, 485, 511, // 21 - 30 @@ -133,7 +134,7 @@ Swordsman: { 232, 234, 236, 238, 240, 242, 244, 246, 248, 250, // 111 - 120 252, 254, 256, 258, 260, 262, 264, 266, 268, 270, // 121 - 130 272, 274, 276, 278, 280, 282, 284, 286, 288, 290, // 131 - 140 - 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150 + 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150 } Magician: { Weight: 22000 @@ -172,7 +173,7 @@ Magician: { 676, 682, 688, 694, 700, 706, 712, 718, 724, 730, // 111 - 120 736, 742, 748, 754, 760, 766, 772, 778, 784, 790, // 121 - 130 796, 802, 808, 814, 820, 826, 832, 838, 844, 850, // 131 - 140 - 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150 + 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150 } Archer: { Weight: 26000 @@ -236,7 +237,7 @@ Acolyte: { 565, 570, 575, 580, 585, 590, 595, 600, 605, 610, // 111 - 120 615, 620, 625, 630, 635, 640, 645, 650, 655, 660, // 121 - 130 665, 670, 675, 680, 685, 690, 695, 700, 705, 710, // 131 - 140 - 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150 + 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150 } Merchant: { Weight: 28000 @@ -264,7 +265,7 @@ Merchant: { 343, 346, 349, 352, 355, 358, 361, 364, 367, 370, // 111 - 120 373, 376, 379, 382, 385, 388, 391, 394, 397, 400, // 121 - 130 403, 406, 409, 412, 415, 418, 421, 424, 427, 430, // 131 - 140 - 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150 + 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150 } Thief: { Weight: 24000 @@ -387,7 +388,7 @@ Wizard: { 1009, 1018, 1027, 1036, 1045, 1054, 1063, 1072, 1081, 1090, // 111 - 120 1099, 1108, 1117, 1126, 1135, 1144, 1153, 1162, 1171, 1180, // 121 - 130 1189, 1198, 1207, 1216, 1225, 1234, 1243, 1252, 1261, 1270, // 131 - 140 - 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150 + 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150 } Blacksmith: { Weight: 30000 @@ -530,7 +531,7 @@ Crusader: { 531, 536, 541, 545, 550, 555, 559, 564, 569, 574, // 111 - 120 578, 583, 588, 592, 597, 602, 606, 611, 616, 621, // 121 - 130 625, 630, 635, 639, 644, 649, 653, 658, 663, 668, // 131 - 140 - 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150 + 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150 } Rogue: { Weight: 24000 @@ -698,7 +699,7 @@ Taekwon: { 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 111 - 120 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 121 - 130 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 131 - 140 - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150 + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150 } Star_Gladiator: { Inherit: ("Taekwon") @@ -731,7 +732,7 @@ Star_Gladiator: { 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 111 - 120 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 121 - 130 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 131 - 140 - 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150 + 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150 } Soul_Linker: { Weight: 24000 @@ -770,7 +771,7 @@ Soul_Linker: { 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 111 - 120 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 121 - 130 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 131 - 140 - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150 + 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150 } Gunslinger: { Weight: 28000 @@ -797,7 +798,7 @@ Gunslinger: { 528, 534, 540, 546, 552, 558, 564, 570, 576, 582, // 111 - 120 588, 594, 600, 606, 612, 618, 624, 630, 636, 642, // 121 - 130 648, 654, 660, 666, 672, 678, 684, 690, 696, 702, // 131 - 140 - 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150 + 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150 } Ninja: { Weight: 26000 @@ -885,7 +886,7 @@ Rune_Knight: { TwoHandAxe: 520 Mace: 450 TwoHandMace: 520 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -911,7 +912,7 @@ Warlock: { Sword: 600 Rod: 500 TwoHandRod: 560 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -935,7 +936,7 @@ Ranger: { Fist: 400 Dagger: 500 Bow: 490 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -963,7 +964,7 @@ Arch_Bishop: { Knuckle: 500 Book: 440 TwoHandRod: 550 - } + } } Mechanic: { Weight: 38000 @@ -976,7 +977,7 @@ Mechanic: { TwoHandAxe: 480 Mace: 480 TwoHandMace: 500 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1002,7 +1003,7 @@ Guillotine_Cross: { Sword: 650 Axe: 800 Katar: 420 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1027,7 +1028,7 @@ Shadow_Chaser: { Dagger: 430 Sword: 470 Bow: 470 - } + } } Royal_Guard: { Inherit: ("Guillotine_Cross") @@ -1043,7 +1044,7 @@ Royal_Guard: { TwoHandAxe: 520 Mace: 440 TwoHandMace: 500 - } + } } Sorcerer: { Weight: 30000 @@ -1055,7 +1056,7 @@ Sorcerer: { Rod: 450 Book: 450 TwoHandRod: 550 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1080,14 +1081,14 @@ Minstrel: { Dagger: 520 Bow: 490 Instrument: 440 - } + } } Wanderer: { Inherit: ("Ranger") BaseASPD: { Whip: 440 Instrument: 2000 - } + } } Sura: { Weight: 30000 @@ -1099,7 +1100,7 @@ Sura: { Rod: 480 Knuckle: 390 TwoHandRod: 500 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1127,7 +1128,7 @@ Genetic: { TwoHandAxe: 510 Mace: 440 TwoHandMace: 480 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1152,14 +1153,14 @@ Kagerou: { Fist: 400 Dagger: 450 FuumaShuriken: 500 - } + } } Oboro: { Inherit: ("Kagerou") } Rebellion: { Inherit: ("Gunslinger") - InheritHP: ("Soul_Linker") + InheritHP: ("Soul_Linker") } Novice_High: { Inherit: ("Novice") @@ -1370,4 +1371,4 @@ Expanded_Super_Novice: { } Expanded_Super_Baby: { Inherit: ("Novice") -}
\ No newline at end of file +} diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf index 2d0ffee49..11559512d 100644 --- a/db/pre-re/map_zone_db.conf +++ b/db/pre-re/map_zone_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //==================================================== //= Hercules Map Zone Database [Ind/Hercules] //================ More Information ================== @@ -24,7 +24,6 @@ //= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE //==================================================== - zones: ( { /* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */ @@ -41,10 +40,10 @@ zones: ( //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 @@ -61,7 +60,7 @@ zones: ( /* 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" @@ -69,43 +68,43 @@ zones: ( SO_ARRULLO: "PLAYER" CG_HERMODE: "PLAYER" } - + disabled_items: { - + } mapflags: ( ) - + }, { /* PvP zone is applied to all maps with a pvp mapflag */ name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { BS_GREED: "PLAYER" CG_HERMODE: "PLAYER" } - + disabled_items: { Greed_Scroll: true } - + mapflags: ( "nocashshop", ) - + }, { /* PK Mode zone is only used when server is on pk_mode (battle.conf), it applies to all pvp maps that don't have their own zone */ name: "PK Mode" /* changing this name requires MAP_ZONE_PK_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { - + } - + disabled_items: { - + } /* PK Mode Damage Reductions */ @@ -125,7 +124,7 @@ zones: ( { /* GvG zone is applied to all maps with a gvg mapflag */ name: "GvG" /* changing this name requires MAP_ZONE_GVG_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { AL_TELEPORT: "PLAYER" AL_WARP: "PLAYER" @@ -145,7 +144,7 @@ zones: ( SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" } - + disabled_items: { Assumptio_5_Scroll: true Greed_Scroll: true @@ -170,12 +169,12 @@ zones: ( "nocashshop", "gvg_noparty", ) - + }, { /* Battlegrounds zone is applied to all maps with a battlegrounds mapflag */ name: "Battlegrounds" /* changing this name requires MAP_ZONE_BG_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { AL_TELEPORT: "PLAYER" AL_WARP: "PLAYER" @@ -214,8 +213,8 @@ zones: ( disabled_items: { Assumptio_5_Scroll: true Pty_Assumptio_Scroll: true - } - + } + /* knockback disabled */ /* Battlegrounds Damage Reductions */ /* - weapon_damage_rate -30% */ @@ -235,7 +234,7 @@ zones: ( }, { name: "Aldebaran Turbo Track" - + disabled_skills: { SM_ENDURE: "PLAYER" AL_TELEPORT: "PLAYER" @@ -256,7 +255,7 @@ zones: ( SC_DIMENSIONDOOR: "PLAYER" GN_CARTBOOST: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true Anodyne: true @@ -266,12 +265,12 @@ zones: ( }, { name: "Jail" - + disabled_skills: { TK_JUMPKICK: "PLAYER" TK_HIGHJUMP: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true Wing_Of_Butterfly: true @@ -284,14 +283,14 @@ zones: ( }, { name: "Izlude Battle Arena" - + disabled_skills: { RG_INTIMIDATE: "PLAYER" AL_TELEPORT: "PLAYER" SC_FATALMENACE: "PLAYER" - SC_DIMENSIONDOOR: "PLAYER" + SC_DIMENSIONDOOR: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true } @@ -299,7 +298,7 @@ zones: ( { name: "GvG2" inherit: ( "GvG" ) /* will import all gvg has */ - + disabled_skills: { TK_HIGHJUMP: "PLAYER" SA_ABRACADABRA: "PLAYER" @@ -307,7 +306,7 @@ zones: ( }, { name: "Sealed Shrine" - + disabled_skills: { MG_SAFETYWALL: "PLAYER" AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY" @@ -320,7 +319,7 @@ zones: ( }, { name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */ - + disabled_skills: { AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY" WZ_ICEWALL: "PLAYER" @@ -333,7 +332,7 @@ zones: ( }, { name: "Towns" - + disabled_skills: { AM_CANNIBALIZE: "PLAYER" AM_SPHEREMINE: "PLAYER" @@ -343,7 +342,7 @@ zones: ( WM_POEMOFNETHERWORLD: "PLAYER" GN_WALLOFTHORN: "PLAYER" } - + disabled_items: { Greed_Scroll: true } diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt index e854d4a6e..c86690676 100644 --- a/db/pre-re/mob_skill_db.txt +++ b/db/pre-re/mob_skill_db.txt @@ -1,4 +1,4 @@ -// Mob Skill Database +// Mob Skill Database // Based on Aegis Episode 11.3 // // Structure of Database: @@ -4325,7 +4325,7 @@ 1795,Bloody Knight@WZ_STORMGUST,attack,89,10,10000,1000,20000,no,target,always,,,,,,,, 1795,Bloody Knight@WZ_VERMILION,attack,85,20,10000,1000,20000,no,target,always,,,,,,,, 1795,Bloody Knight@WZ_METEOR,attack,83,11,10000,1000,20000,no,target,always,,,,,,,, -// Guild Dungeon SE (13.1) +// Guild Dungeon SE (13.1) 1796,Aunoe@MG_THUNDERSTORM,attack,21,5,500,1500,10000,no,target,always,0,,,,,,, 1796,Aunoe@MG_THUNDERSTORM,chase,21,5,500,1500,10000,no,target,always,0,,,,,,, 1796,Aunoe@NPC_HOLYATTACK,attack,189,2,500,0,5000,yes,target,always,0,,,,,,, @@ -5773,6 +5773,7 @@ 2082,Piranha@MG_COLDBOLT,chase,14,3,500,1000,5000,yes,target,always,0,,,,,,, 2082,Piranha@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6, 2082,Piranha@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,, + //**** // NC Mechanic Summons 2042,Silver Sniper@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,, diff --git a/db/pre-re/pet_db.txt b/db/pre-re/pet_db.txt index 37401dca4..6ea29486e 100644 --- a/db/pre-re/pet_db.txt +++ b/db/pre-re/pet_db.txt @@ -25,31 +25,32 @@ // 20. change_target_rate Rate of which the pet will change its attack target. // 21. pet_script Script to execute when the pet is hatched. // 22. loyal_script Script to execute when the pet is hatched (requires at least pet_equip_min_friendly intimacy, independent of pet_script). -//NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. +// NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. -//In theory you can use any valid script, but it is run only once upon pet -//loading, so it is recommended you use the specific pet scripts: +// In theory you can use any valid script, but it is run only once upon pet +// loading, so it is recommended you use the specific pet scripts: -//petskillattack skillid, skilllv, hits, rate, bonusrate -//Skill attack that triggers while the pet is attacking. Rate is the base -//chance of execution per attack. Bonusrate is an additional success rate when -//intimacy reaches max. If hits is specified and different than 0, it will make -//the pet cast the skill with a fixed amount of damage inflicted and the -//specified number of hits. A value of zero uses the skill's defaults. +// petskillattack skillid, skilllv, hits, rate, bonusrate Skill attack that +// triggers while the pet is attacking. Rate is the base chance of execution +// per attack. Bonusrate is an additional success rate when intimacy reaches +// max. If hits is specified and different than 0, it will make the pet cast +// the skill with a fixed amount of damage inflicted and the specified number +// of hits. A value of zero uses the skill's defaults. -//petskillsupport skillid, skilllv, delay, hp%, sp% -//Casts a support skill when the health levels are below the specified hp% and -//sp%. Delay is the minimum time in seconds before the skill can be cast again +// petskillsupport skillid, skilllv, delay, hp%, sp% Casts a support skill when +// the health levels are below the specified hp% and sp%. Delay is the minimum +// time in seconds before the skill can be cast again -//petrecovery type, delay: Cures the "type" status effect after "delay" seconds +// petrecovery type, delay: Cures the "type" status effect after "delay" +// seconds -//petskillbonus type, value, duration, delay -//Gives bonus stats. Type is the stat to increase (bStr, bLuk), value is the -//amount by which it is increased, duration signals how long the bonus lasts -//delay is the time elapsed after the bonus ends and before it starts again. +// petskillbonus type, value, duration, delay Gives bonus stats. Type is the +// stat to increase (bStr, bLuk), value is the amount by which it is increased, +// duration signals how long the bonus lasts delay is the time elapsed after +// the bonus ends and before it starts again. -//A single pet can have petloot, petskillbonus, petskillattack and -//petskillsupport at the same time, but only one of each. +// A single pet can have petloot, petskillbonus, petskillattack and +// petskillsupport at the same time, but only one of each. 1002,PORING,Poring,619,9001,10013,531,80,60,50,100,250,20,2000,150,1,0,350,400,800,{ petloot 10; },{ bonus bLuk,2; bonus bCritical,1; } 1113,DROPS,Drops,620,9002,10013,508,80,60,40,100,250,20,1500,150,1,0,300,400,500,{ petloot 10; },{ bonus bHit,3; bonus bAtk,3; } diff --git a/db/pre-re/size_fix.txt b/db/pre-re/size_fix.txt index 81bba5044..ae0049db0 100644 --- a/db/pre-re/size_fix.txt +++ b/db/pre-re/size_fix.txt @@ -1,7 +1,7 @@ // Database for size fix for weapon damage. -//Columns: Weapon type, Rows: Target size. -//Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff +// Columns: Weapon type, Rows: Target size. +// Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff 100,100, 75, 75, 75, 75, 50, 50, 75,100,100,100,100, 75, 75,100, 75,100,100,100,100,100,100,100 // Size: Small 100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100,100,100 // Size: Medium 100, 50, 75,100,100,100,100,100,100,100,100, 75, 50, 75, 50, 50, 75,100,100,100,100,100,100,100 // Size: Large diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index cbe004662..98c1720f5 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -16,7 +16,6 @@ // - Makes lvl 1 have 1000 (1s) cool down, lvl 2 2500 (2.5s), lvl 3 3000, and so on. //========================================== - //===== Swordman =========================== //-- SM_PROVOKE 6,0,0,0,30000,0,1000 @@ -26,7 +25,6 @@ 8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000 //========================================== - //===== Mage =============================== //-- MG_SIGHT 10,0,0,0,10000,0,0 @@ -54,7 +52,6 @@ 21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0,0 //========================================== - //===== Acolyte ============================ //-- AL_RUWACH 24,0,0,0,10000,0,0 @@ -82,7 +79,6 @@ 35,0,1000,0,0,6000,0 //========================================== - //===== Archer ============================= //-- AC_CONCENTRATION 45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0 @@ -92,7 +88,6 @@ 47,0,0,0,100,0,0 //========================================== - //===== Thief ============================== //-- TF_HIDING 51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0 @@ -100,13 +95,11 @@ 52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0 //========================================== - //===== First planned to be shared ========= //-- ALL_RESURRECTION 54,6000:4000:2000:0,0:1000:2000:3000,0,0,0,0 //========================================== - //===== Knight ============================= //-- KN_BRANDISHSPEAR 57,700,0,0,0,0,0 @@ -121,7 +114,6 @@ 62,700,0,0,0,0,0 //========================================== - //===== Priest ============================= //-- PR_IMPOSITIO 66,0,3000,0,60000,0,0 @@ -153,7 +145,6 @@ 79,15000,4000,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0,0 //========================================== - //===== Wizard ============================= //-- WZ_FIREPILLAR 80,3000:2700:2400:2100:1800:1500:1200:900:600:300,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0 @@ -181,7 +172,6 @@ 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0 //========================================== - //===== Blacksmith ========================= //-- BS_REPAIRWEAPON 108,7500,0,0,0,0,0 @@ -197,7 +187,6 @@ 114,0,0,0,1000:2000:3000:4000:5000,0,0 //========================================== - //===== Hunter ============================= //-- HT_SKIDTRAP 115,0,0,0,300000:240000:180000:120000:60000,0,0 @@ -225,7 +214,6 @@ 129,1500,1000,0,0,0,0 //========================================== - //===== Assassin =========================== //-- AS_CLOAKING 135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0 @@ -242,7 +230,6 @@ //========================================== - //===== 1st Jobs Quest Skills=============== //-- NV_TRICKDEAD 143,0,0,0,600000,0,0 @@ -268,7 +255,6 @@ 157,5000,0,0,300000,0,0 //========================================== - //===== NPC Skills Part 1 ================== //-- NPC_ATTRICHANGE 161,0,0,0,1800000,0,0 @@ -323,7 +309,6 @@ 207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0 //========================================== - //===== Rogue ============================== //-- RG_BACKSTAB 212,0,500,0,0,0,0 @@ -343,7 +328,6 @@ 220,0,0,0,180000,0,0 //========================================== - //===== Alchemist ========================== //-- AM_DEMONSTRATION 229,1000,0,0,40000:45000:50000:55000:60000,0,0 @@ -367,7 +351,6 @@ 247,2000,0,0,0,0,0 //========================================== - //===== Crusader =========================== //-- CR_AUTOGUARD 249,0,0,0,300000,0,0 @@ -391,7 +374,6 @@ 258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0 //========================================== - //===== Monk =============================== //-- MO_CALLSPIRITS 261,1000,0,0,600000,0,0 @@ -448,7 +430,6 @@ 294,0,0,0,1200000,0,0 //========================================== - //===== Bard & Dancer (Ensemble Skills) ==== //-- BD_ADAPTATION 304,0,0,0,0,5000,0 @@ -471,7 +452,6 @@ 313,0,0,0,60000,60000,0 //========================================== - //===== Bard =============================== //-- BA_MUSICALSTRIKE 316,1500,0,0,0,0,0 @@ -489,7 +469,6 @@ 322,0,0,0,180000,20000,0 //========================================== - //===== Dancer ============================= //-- DC_THROWARROW 324,1500,0,0,0,0,0 @@ -507,7 +486,6 @@ 330,0,0,0,180000,20000,0 //========================================== - //===== Wedding Skills ===================== //-- WE_MALE 334,3000,0,0,0,0,0 @@ -517,7 +495,6 @@ 336,0,0,0,20000,0,0 //========================================== - //===== NPC Skills Part 2 ================== //-- NPC_GRANDDARKNESS 339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0 @@ -535,7 +512,6 @@ 354,0,0:500:1000:1500:2000:2500,0,0,0,0 //========================================== - //===== Lord Knight ======================== //-- LK_AURABLADE 355,0,0,0,40000:60000:80000:100000:120000,0,0 @@ -551,7 +527,6 @@ 360,0,0,0,300000,0,0 //========================================== - //===== High Priest ======================== //-- HP_ASSUMPTIO 361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0 @@ -559,7 +534,6 @@ 362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000,0 //========================================== - //===== High Wzard ========================= //-- HW_MAGICCRASHER 365,300,300,0,0,0,0 @@ -567,7 +541,6 @@ 366,700,0,0,30000,0,0 //========================================== - //===== Paladin ============================ //-- PA_PRESSURE 367,2000:2500:3000:3500:4000,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0 @@ -577,7 +550,6 @@ 369,0,0,0,60000,60000,0 //========================================== - //===== Champion =========================== //-- CH_PALMSTRIKE 370,0,300,0,0,0,0 @@ -587,7 +559,6 @@ 372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0,0 //========================================== - //===== Professor ========================== //-- PF_HPCONVERSION 373,0,1000:1200:1400:1600:1800,0,0,0,0 @@ -597,7 +568,6 @@ 375,0,0,0,0,0,10000:10000:10000:10000:15000 //========================================== - //===== Assassin Cross ===================== //-- ASC_EDP 378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0 @@ -605,7 +575,6 @@ 379,700,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0 //========================================== - //===== Sniper ============================= //-- SN_SIGHT 380,0,0,0,30000,0,0 @@ -617,7 +586,6 @@ 383,2000:2400:2800:3200:3600:4000:4400:4800:5200:5600,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0,0 //========================================== - //===== Whitesmith ========================= //-- WS_MELTDOWN 384,500:500:600:600:700:700:800:800:900:1000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000,0 @@ -626,7 +594,6 @@ 387,0,0,0,60000,0,0 //========================================== - //===== Stalker ============================ //-- ST_CHASEWALK 389,1200,0,0,10000,30000,0 @@ -634,7 +601,6 @@ 390,0,0,0,300000,0,0 //========================================== - //===== Clown / Gypsy ====================== //-- CG_ARROWVULCAN 394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,2800:2800:2800:2800:2800:3000:3000:3000:3000:3000,2000,0,0,0 @@ -669,7 +635,6 @@ 407,0,500,0,0,0,0 //========================================== - //===== Adoption Skills ==================== //-- WE_BABY 408,3000,0,0,300000,0,0 @@ -679,7 +644,6 @@ 410,0,0,0,20000,0,0 //========================================== - //===== Taekwon ============================ //-- TK_RUN 411,6000:5000:4000:3000:2000:1000:0:0:0:0,0,0,1000,150000,0 @@ -833,7 +797,6 @@ 499,0,0,0,100,0,0 //========================================== - //===== Gunslinger ========================= //-- GS_GLITTERING 500,0,0,0,600000,0,0 @@ -869,7 +832,6 @@ 521,2000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0 //========================================== - //===== Ninja ============================== //-- NJ_KUNAI 524,0,1000,0,0,0,0 @@ -1104,7 +1066,7 @@ 2015,0,0,0,180000,10000,0 //-- RK_VITALITYACTIVATION 2016,0,0,0,180000,0,0 -//-- RK_STORMBLAST +//-- RK_STORMBLAST 2017,2000,2000,0,0,0,0 //-- RK_FIGHTINGSPIRIT 2018,0,0,0,180000,0,0 @@ -1144,7 +1106,7 @@ 2034,0,1000,0,0,0,0 //-- GC_HALLUCINATIONWALK 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000 -//-- GC_ROLLINGCUTTER +//-- GC_ROLLINGCUTTER 2036,0,200,0,3000,0,0 //-- GC_CROSSRIPPERSLASHER 2037,0,1000,0,0,0,0 @@ -1157,7 +1119,7 @@ 2038,2000,500,0,0,0,0 //-- AB_ANCILLA 2039,1000,1000,0,0,0,0 -//-- AB_ADORAMUS +//-- AB_ADORAMUS 2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000 //-- AB_CLEMENTIA 2041,3000,0,0,120000:180000:240000,0,0 @@ -1194,7 +1156,7 @@ //========================================== //===== Warlock ============================ -//-- WL_WHITEIMPRISON +//-- WL_WHITEIMPRISON 2201,0,0,0,6000:8000:10000:12000:14000,15000,4000 //-- WL_SOULEXPANSION 2202,2000,500,0,0,0,0 @@ -1202,13 +1164,13 @@ 2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000 //-- WL_JACKFROST 2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0 -//-- WL_MARSHOFABYSS +//-- WL_MARSHOFABYSS 2205,0,1000,0,30000,0,2500:3000:3500:4000:4500 //-- WL_RECOGNIZEDSPELL 2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000 -//-- WL_SIENNAEXECRATE +//-- WL_SIENNAEXECRATE 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0 -//-- WL_STASIS +//-- WL_STASIS 2209,3000,2000,0,10000:15000:20000:25000:30000,1000,180000:190000:200000:210000:220000 //-- WL_DRAINLIFE 2210,4000,0,0,0,0,2000 @@ -1216,11 +1178,11 @@ 2211,5000,2000,0,5000,0,5000 //-- WL_HELLINFERNO 2212,3000,1000,0,20000:30000:40000:50000:60000,0,0 -//-- WL_COMET +//-- WL_COMET 2213,10000:11000:12000:13000:14000,0,0,100,42000,60000 -//-- WL_CHAINLIGHTNING +//-- WL_CHAINLIGHTNING 2214,3500:4000:4500:5000:5500,0,0,100,0,3000 -//-- WL_EARTHSTRAIN +//-- WL_EARTHSTRAIN 2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000 //-- WL_TETRAVORTEX 2217,5000:6000:7000:8000:9000,2000,0,15000:120000:40000:5000,0,15000 @@ -1232,7 +1194,7 @@ 2224,2000,0,0,120000:160000:200000:240000:280000,0,0 //-- WL_SUMMONSTONE 2229,2000,0,0,120000:160000:200000:240000:280000,0,0 -//-- WL_READING_SB +//-- WL_READING_SB 2231,5000,500,0,0,0,0 //-- WL_TELEKINESIS_INTENSE 5012,1000,0,0,60000,0,300000 @@ -1248,9 +1210,9 @@ 2236,4000,1000,0,0,0,0 //-- RA_DETONATOR 2237,0,0,0,1000,0,0 -//-- RA_ELECTRICSHOCKER +//-- RA_ELECTRICSHOCKER 2238,0,0,0,15000,20000:22000:24000:26000:28000,0 -//-- RA_CLUSTERBOMB +//-- RA_CLUSTERBOMB 2239,0,0,0,15000,0,0 //-- RA_WUGMASTERY 2240,0,1000,0,0,0,0 @@ -1341,7 +1303,7 @@ //===== Shadow Chaser ====================== //-- SC_FATALMENACE 2284,0,500,0,0,0,0 -//-- SC_REPRODUCE +//-- SC_REPRODUCE 2285,0,1000,0,60000,0,0 //-- SC_AUTOSHADOWSPELL 2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0 @@ -1395,7 +1357,7 @@ 2310,0,0,0,3500:4000:4500:5000:5500,0,2000 //-- LG_REFLECTDAMAGE 2311,0,0,0,300000,0,0 -//-- LG_PINPOINTATTACK +//-- LG_PINPOINTATTACK 2312,0,1000,0,5000,0,5000 //-- LG_FORCEOFVANGUARD 2313,0,1000,0,300000,0,0 @@ -1432,7 +1394,7 @@ 2326,0,0,0,3000,0,0 //-- SR_SKYNETBLOW 2327,0,500,0,0,0,0 -//-- SR_EARTHSHAKER +//-- SR_EARTHSHAKER 2328,0,0,0,1000,0,3000 //-- SR_FALLENEMPIRE 2329,0,0,0,500:1000:1500:2000:2500,0,0 @@ -1465,7 +1427,7 @@ 2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000 //-- SR_GENTLETOUCH_CURE 2345,0,1000,0,0,0,1000:1500:2000:2500:3000 -//-- SR_GENTLETOUCH_ENERGYGAIN +//-- SR_GENTLETOUCH_ENERGYGAIN 2346,1000,1000,0,240000,0,0 //-- SR_GENTLETOUCH_CHANGE 2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000 @@ -1561,7 +1523,7 @@ 2451,1000,1000,0,60000,0,2000 //-- SO_WARMER 2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000 -//-- SO_VACUUM_EXTREME +//-- SO_VACUUM_EXTREME 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,1000,5000 //-- SO_VARETYR_SPEAR 2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000 @@ -1569,15 +1531,15 @@ 2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000 //-- SO_EL_CONTROL 2456,2000,0,0,0,0,5000 -//-- SO_SUMMON_AGNI +//-- SO_SUMMON_AGNI 2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000 //-- SO_SUMMON_AQUA 2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000 -//-- SO_SUMMON_VENTUS +//-- SO_SUMMON_VENTUS 2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000 -//-- SO_SUMMON_TERA +//-- SO_SUMMON_TERA 2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000 -//-- SO_EL_ACTION +//-- SO_EL_ACTION 2461,0,0,0,0,0,5000 //-- SO_EL_ANALYSIS 2462,0,0,0,0,0,0 @@ -1611,7 +1573,7 @@ 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000 //-- GN_WALLOFTHORN 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000 -//-- GN_CRAZYWEED +//-- GN_CRAZYWEED 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000 //-- GN_CRAZYWEED_ATK 2484,0,0,0,100,0,0 @@ -1627,7 +1589,7 @@ //-- GN_HELLS_PLANT 2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0 -//-- GN_HELLS_PLANT_ATK +//-- GN_HELLS_PLANT_ATK 2491,0,0,0,20000,0,0 //-- GN_MANDRAGORA 2492,1000,500,0,10000:15000:20000:25000:30000,0,10000 @@ -1753,7 +1715,7 @@ //-- MH_SUMMON_LEGION 8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0 -//-- MH_NEEDLE_OF_PARALYZE +//-- MH_NEEDLE_OF_PARALYZE 8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0 //-- MH_POISON_MIST 8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0 @@ -1770,14 +1732,14 @@ //-- MH_SILENT_BREEZE 8026,1000:1200:1400:1600:1800,0,0,9000:12000:15000:18000:21000,0,0 //-- MH_STYLE_CHANGE -//8027,0,0,0,0,0,0,0 +//8027,0,0,0,0,0,0,0 //-- MH_SONIC_CRAW -//8028,0,0,0,0,0,0,0 +//8028,0,0,0,0,0,0,0 //-- MH_SILVERVEIN_RUSH -//8029,0,0,0,0,0,0,0 +//8029,0,0,0,0,0,0,0 //-- MH_MIDNIGHT_FRENZY -//8030,0,0,0,0,0,0,0 -//-- MH_STAHL_HORN +//8030,0,0,0,0,0,0,0 +//-- MH_STAHL_HORN 8031,800:600:400:200:0,0,0,5000,0,0 //-- MH_GOLDENE_FERSE 8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0 @@ -1788,11 +1750,11 @@ //-- MH_ANGRIFFS_MODUS 8035,200:400:600:800:1000,0,0,30000:45000:60000:75000:90000,0,0 //-- MH_TINDER_BREAKER -//8036,0,0,0,0,0,0,0 +//8036,0,0,0,0,0,0,0 //-- MH_CBC -//8037,0,0,0,0,0,0,0 +//8037,0,0,0,0,0,0,0 //-- MH_EQC -//8038,0,0,0,0,0,0,0 +//8038,0,0,0,0,0,0,0 //-- MH_MAGMA_FLOW 8039,2000:2500:3000:3500:4000,0,0,30000:45000:60000:75000:90000,0,0 //-- MH_GRANITIC_ARMOR diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 9feec142c..5f8553127 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -18,7 +18,7 @@ // 0x80 - Skill ignores target's def cards // 07 splash/effect range (-1 for screen-wide) // 08 MaxLv -// 09 Number of hits (when positive, damage is increased by hits, +// 09 Number of hits (when positive, damage is increased by hits, // negative values just show number of hits without increasing total damage) // 10 Cast interrupted when hit? // 11 defense-reduction rate during cast. @@ -45,6 +45,7 @@ // 15 Blowcount (amount of tiles skill knockbacks) // 16 Name // 17 Description + 1,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NV_BASIC,Basic Skill 2,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_SWORD,Sword Mastery 3,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_TWOHAND,Two-Handed Sword Mastery @@ -760,7 +761,7 @@ 2211,11,8,1,3,0x2,3,5,-7,yes,0,0,0,magic,3, WL_CRIMSONROCK,Crimson Rock 2212,11,6,1,3,0,0,5,1,yes,0,0,0,magic,0, WL_HELLINFERNO,Hell Inferno 2213,11,8,2,0,0,0,5,-20,yes,0,0,0,magic,2, WL_COMET,Comet -2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning +2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning 2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack 2216,3,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0, WL_EARTHSTRAIN,Earth Strain 2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0, WL_TETRAVORTEX,Tetra Vortex @@ -771,7 +772,7 @@ 2222,0,6,4,3,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONFB,Summon Fire Ball 2223,0,6,4,4,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONBL,Summon Lightning Ball 2224,0,6,4,1,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONWB,Summon Water Ball -2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire +2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire 2226,11,6,1,4,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WIND,Summon Attack Wind 2227,11,6,1,1,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WATER,Summon Attack Water 2228,11,6,1,2,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_GROUND,Summon Attack Earth @@ -1064,7 +1065,7 @@ 3006,7:8:9:10:11,6,2,0,0x2,2,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai 3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai 3008,9,8,2,0,0x12,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage -3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka +3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka 3010,3,6,4,0,0x42,0,5,1,no,0,0x80,0,weapon,0, KO_MAKIBISHI,Makibishi 3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui 3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7, KO_ZANZOU,Zanzou @@ -1073,7 +1074,7 @@ 3015,0,6,4,3,0x1,0,1,1,no,0,0,0,none,0, KO_KAHU_ENTEN,Kahu Enten 3016,0,6,4,1,0x1,0,1,1,no,0,0,0,none,0, KO_HYOUHU_HUBUKI,Hyouhu Hubuki 3017,0,6,4,4,0x1,0,1,1,no,0,0,0,none,0, KO_KAZEHU_SEIRAN,Kazehu Seiran -3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai +3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai 3019,11,6,1,0,0,0,5,0,no,0,0,0,magic,0, KO_KAIHOU,Technique Kaihou 3020,7,6,2,0,0,0,1,3,yes,0,0,0,magic,0, KO_ZENKAI,Zenkai 3021,5:6:7:8:9,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KO_GENWAKU,Genwaku diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf index 744b1cbcf..57eaef05e 100644 --- a/db/re/item_chain.conf +++ b/db/re/item_chain.conf @@ -1,22 +1,20 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= // http://herc.ws/board/topic/1244-official-item-grouppackagechain //==================================================== // Structure of file: /* - ITMCHAIN_<Name>: { <Item_Name>: <chance> } - */ ITMCHAIN_ORE: { @@ -39,7 +37,7 @@ ITMCHAIN_ORE: { Elunium: 20 Oridecon: 20 Gold: 10 - Emperium: 5 + Emperium: 5 } ITMCHAIN_GEM: { @@ -58,7 +56,7 @@ ITMCHAIN_GEM: { Crystal_Jewel: 150 Crystal_Jewel_: 80 Crystal_Jewel__: 50 - Crystal_Jewel___: 30 + Crystal_Jewel___: 30 } ITMCHAIN_HEAL: { diff --git a/db/re/job_db.conf b/db/re/job_db.conf index 38d79597b..d7a2e6679 100644 --- a/db/re/job_db.conf +++ b/db/re/job_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= // http://herc.ws/board/topic/9082-job-db1txt-redesign/ //============== RE Structure Example ================ @@ -92,7 +92,7 @@ Novice: { 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 - 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160 + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160 } Swordsman: { Weight: 28000 @@ -139,7 +139,7 @@ Swordsman: { 232, 234, 236, 238, 240, 242, 244, 246, 248, 250, // 111 - 120 252, 254, 256, 258, 260, 262, 264, 266, 268, 270, // 121 - 130 272, 274, 276, 278, 280, 282, 284, 286, 288, 290, // 131 - 140 - 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150 + 292, 294, 296, 298, 300, 302, 304, 306, 308, 310] // 141 - 150 } Magician: { Weight: 22000 @@ -180,7 +180,7 @@ Magician: { 676, 682, 688, 694, 700, 706, 712, 718, 724, 730, // 111 - 120 736, 742, 748, 754, 760, 766, 772, 778, 784, 790, // 121 - 130 796, 802, 808, 814, 820, 826, 832, 838, 844, 850, // 131 - 140 - 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150 + 856, 862, 868, 874, 880, 886, 892, 898, 904, 910] // 141 - 150 } Archer: { Weight: 26000 @@ -248,7 +248,7 @@ Acolyte: { 565, 570, 575, 580, 585, 590, 595, 600, 605, 610, // 111 - 120 615, 620, 625, 630, 635, 640, 645, 650, 655, 660, // 121 - 130 665, 670, 675, 680, 685, 690, 695, 700, 705, 710, // 131 - 140 - 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150 + 715, 720, 725, 730, 735, 740, 745, 750, 755, 760] // 141 - 150 } Merchant: { Weight: 28000 @@ -277,7 +277,7 @@ Merchant: { 343, 346, 349, 352, 355, 358, 361, 364, 367, 370, // 111 - 120 373, 376, 379, 382, 385, 388, 391, 394, 397, 400, // 121 - 130 403, 406, 409, 412, 415, 418, 421, 424, 427, 430, // 131 - 140 - 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150 + 433, 436, 439, 442, 445, 448, 451, 454, 457, 460] // 141 - 150 } Thief: { Weight: 24000 @@ -405,7 +405,7 @@ Wizard: { 1009, 1018, 1027, 1036, 1045, 1054, 1063, 1072, 1081, 1090, // 111 - 120 1099, 1108, 1117, 1126, 1135, 1144, 1153, 1162, 1171, 1180, // 121 - 130 1189, 1198, 1207, 1216, 1225, 1234, 1243, 1252, 1261, 1270, // 131 - 140 - 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150 + 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, 1351, 1360] // 141 - 150 } Blacksmith: { Weight: 30000 @@ -547,7 +547,7 @@ Crusader: { 531, 536, 541, 545, 550, 555, 559, 564, 569, 574, // 111 - 120 578, 583, 588, 592, 597, 602, 606, 611, 616, 621, // 121 - 130 625, 630, 635, 639, 644, 649, 653, 658, 663, 668, // 131 - 140 - 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150 + 672, 677, 682, 686, 691, 696, 700, 705, 710, 715] // 141 - 150 } Rogue: { Weight: 24000 @@ -721,7 +721,7 @@ Taekwon: { 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 111 - 120 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 121 - 130 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, // 131 - 140 - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150 + 200, 200, 200, 200, 200, 200, 200, 200, 200, 200] // 141 - 150 } Star_Gladiator: { Inherit: ("Taekwon") @@ -754,7 +754,7 @@ Star_Gladiator: { 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 111 - 120 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 121 - 130 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, // 131 - 140 - 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150 + 500, 500, 500, 500, 500, 500, 500, 500, 500, 500] // 141 - 150 } Soul_Linker: { Weight: 24000 @@ -794,7 +794,7 @@ Soul_Linker: { 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 111 - 120 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 121 - 130 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, // 131 - 140 - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150 + 900, 900, 900, 900, 900, 900, 900, 900, 900, 900] // 141 - 150 } Gunslinger: { Weight: 28000 @@ -822,7 +822,7 @@ Gunslinger: { 528, 534, 540, 546, 552, 558, 564, 570, 576, 582, // 111 - 120 588, 594, 600, 606, 612, 618, 624, 630, 636, 642, // 121 - 130 648, 654, 660, 666, 672, 678, 684, 690, 696, 702, // 131 - 140 - 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150 + 708, 714, 720, 726, 732, 738, 744, 750, 756, 762] // 141 - 150 } Ninja: { Weight: 26000 @@ -912,7 +912,7 @@ Rune_Knight: { Mace: 45 TwoHandMace: 52 Shield: 5 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -959,7 +959,7 @@ Warlock: { Rod: 50 TwoHandRod: 56 Shield: 5 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1004,7 +1004,7 @@ Ranger: { Dagger: 50 Bow: 49 Shield: 8 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1102,7 +1102,7 @@ Mechanic: { Mace: 48 TwoHandMace: 50 Shield: 6 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1154,7 +1154,7 @@ Guillotine_Cross: { /* GrenadeLauncher: 100 */ /* FuumaShuriken: 110 */ Shield: 9 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1284,7 +1284,7 @@ Sorcerer: { Book: 45 TwoHandRod: 55 Shield: 5 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1358,7 +1358,7 @@ Wanderer: { Bow: 49 Whip: 44 Shield: 7 - } + } } Sura: { Weight: 30000 @@ -1371,7 +1371,7 @@ Sura: { Knuckle: 39 TwoHandRod: 50 Shield: 5 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1403,7 +1403,7 @@ Genetic: { Mace: 44 TwoHandMace: 48 Shield: 4 - } + } HPTable:[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // 1 - 10 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 11 - 20 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 21 - 30 @@ -1501,7 +1501,7 @@ Oboro: { } Rebellion: { Inherit: ("Gunslinger") - InheritHP: ("Soul_Linker") + InheritHP: ("Soul_Linker") } Novice_High: { Inherit: ("Novice") @@ -1712,4 +1712,4 @@ Expanded_Super_Novice: { } Expanded_Super_Baby: { Inherit: ("Novice") -}
\ No newline at end of file +} diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index be7d3317a..0622368a6 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //==================================================== //= Hercules Map Zone Database [Ind/Hercules] //================ More Information ================== @@ -24,7 +24,6 @@ //= PLAYER, HOMUN, MERCENARY, MONSTER, PET, ELEMENTAL, MOB_BOSS, CLONE, ALL and NONE //==================================================== - zones: ( { /* All zone is a dynamic (very special) zone that is forcebly inherited by ALL maps automatically */ @@ -41,10 +40,10 @@ zones: ( //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 @@ -61,7 +60,7 @@ zones: ( /* 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" @@ -69,7 +68,7 @@ zones: ( SO_ARRULLO: "PLAYER" CG_HERMODE: "PLAYER" } - + disabled_items: { Velum_Jamadhar: true Velum_Scare: true @@ -106,22 +105,22 @@ zones: ( } mapflags: ( ) - + }, { /* PvP zone is applied to all maps with a pvp mapflag */ name: "PvP" /* changing this name requires MAP_ZONE_PVP_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { BS_GREED: "PLAYER" CG_HERMODE: "PLAYER" } - + disabled_items: { Greed_Scroll: true C_Beginner_Cap: true } - + /* cashshop disabled in pvp maps */ mapflags: ( "nocashshop", @@ -131,13 +130,13 @@ zones: ( /* PK Mode zone is only used when server is on pk_mode (battle.conf), it applies to all pvp maps that don't have their own zone */ name: "PK Mode" /* changing this name requires MAP_ZONE_PK_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { - + } - + disabled_items: { - + } /* PK Mode Damage Reductions */ @@ -157,7 +156,7 @@ zones: ( { /* GvG zone is applied to all maps with a gvg mapflag */ name: "GvG" /* changing this name requires MAP_ZONE_GVG_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { AL_TELEPORT: "PLAYER" AL_WARP: "PLAYER" @@ -177,7 +176,7 @@ zones: ( SC_FATALMENACE: "PLAYER" SC_DIMENSIONDOOR: "PLAYER" } - + disabled_items: { Assumptio_5_Scroll: true Greed_Scroll: true @@ -235,12 +234,12 @@ zones: ( "nocashshop", "gvg_noparty", ) - + }, { /* Battlegrounds zone is applied to all maps with a battlegrounds mapflag */ name: "Battlegrounds" /* changing this name requires MAP_ZONE_BG_NAME to also be changed in src/map/map.h file */ - + disabled_skills: { AL_TELEPORT: "PLAYER" AL_WARP: "PLAYER" @@ -312,8 +311,8 @@ zones: ( Siege_Suits: true Siege_Robe: true C_Beginner_Cap: true - } - + } + /* knockback disabled */ /* Battlegrounds Damage Reductions */ /* - weapon_damage_rate -30% */ @@ -333,7 +332,7 @@ zones: ( }, { name: "Aldebaran Turbo Track" - + disabled_skills: { SM_ENDURE: "PLAYER" AL_TELEPORT: "PLAYER" @@ -354,7 +353,7 @@ zones: ( SC_DIMENSIONDOOR: "PLAYER" GN_CARTBOOST: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true Anodyne: true @@ -364,12 +363,12 @@ zones: ( }, { name: "Jail" - + disabled_skills: { TK_JUMPKICK: "PLAYER" TK_HIGHJUMP: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true Wing_Of_Butterfly: true @@ -382,14 +381,14 @@ zones: ( }, { name: "Izlude Battle Arena" - + disabled_skills: { RG_INTIMIDATE: "PLAYER" AL_TELEPORT: "PLAYER" SC_FATALMENACE: "PLAYER" - SC_DIMENSIONDOOR: "PLAYER" + SC_DIMENSIONDOOR: "PLAYER" } - + disabled_items: { Wing_Of_Fly: true } @@ -397,7 +396,7 @@ zones: ( { name: "GvG2" inherit: ( "GvG" ) /* will import all gvg has */ - + disabled_skills: { TK_HIGHJUMP: "PLAYER" SA_ABRACADABRA: "PLAYER" @@ -405,7 +404,7 @@ zones: ( }, { name: "Sealed Shrine" - + disabled_skills: { MG_SAFETYWALL: "PLAYER" AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY" @@ -418,7 +417,7 @@ zones: ( }, { name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */ - + disabled_skills: { AL_TELEPORT: "PLAYER | MONSTER | HOMUN | MERCENARY" WZ_ICEWALL: "PLAYER" @@ -431,7 +430,7 @@ zones: ( }, { name: "Towns" - + disabled_skills: { AM_CANNIBALIZE: "PLAYER" AM_SPHEREMINE: "PLAYER" @@ -441,7 +440,7 @@ zones: ( WM_POEMOFNETHERWORLD: "PLAYER" GN_WALLOFTHORN: "PLAYER" } - + disabled_items: { Greed_Scroll: true Velum_Jamadhar: true diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 345a7b039..a212b3632 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -2363,6 +2363,7 @@ //3353,PAD_PLESIOS //3354,PAD_BRACHY //3355,PAD_BRACHYS + // 2014 Halloween Event 3381,DARK_SOUL,Dark Soul,Dark Soul,10,20,1,0,0,1,20,20,0,0,1,1,1,1,1,1,0,0,1,6,27,0x81,100,1960,960,504,0,0,0,0,0,0,0,12192,2000,6914,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 3382,WANDERING_SOUL,Wandering Soul,Wandering Soul,1,10,1,0,0,1,10,10,0,0,1,1,1,1,1,1,0,0,1,6,28,0x81,100,912,1248,576,0,0,0,0,0,0,0,12192,2000,6915,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/re/size_fix.txt b/db/re/size_fix.txt index f83560a87..e8e3774d5 100644 --- a/db/re/size_fix.txt +++ b/db/re/size_fix.txt @@ -1,7 +1,7 @@ // Database for size fix for weapon damage. -//Columns: Weapon type, Rows: Target size. -//Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff +// Columns: Weapon type, Rows: Target size. +// Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff 100,100, 75, 75, 75, 75, 50, 50, 75, 75,100,100,100, 75, 75,100, 75,100,100,100,100,100, 75,100 // Size: Small 100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100, 75,100 // Size: Medium 100, 50, 75,100,100,100,100,100,100,100,100, 75, 50, 75, 50, 50, 75,100,100,100,100,100,100,100 // Size: Large diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 7d73fccef..2e349205a 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -8,7 +8,7 @@ // AfterCastWalkDleay : amount of time before character can move again, in milliseconds // Duration1 / Duration2 : usually the durations used by the skill, at special cases it is used to hold special data // Cool Down : amount of time until character can re-use this skill, in milliseconds -// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time) +// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time) //== Extra // On all fields you can use ':' as a delimiter to level-specific values, // - Example using SM_PROVOKE @@ -17,7 +17,6 @@ // - Makes lvl 1 have 1000 (1s) cool down, lvl 2 2500 (2.5s), lvl 3 3000, and so on. //========================================== - //===== Swordman =========================== //-- SM_PROVOKE 6,0,0,0,30000,0,0,0 @@ -27,7 +26,6 @@ 8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000,0 //========================================== - //===== Mage =============================== //-- MG_SIGHT 10,0,0,0,10000,0,0,0 @@ -55,7 +53,6 @@ 21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,2000:2000:2000:2000:2000:2000:2000:2000:2000:2000,0,500,0,0,160:320:480:640:800:960:1120:1280:1440:1600 //========================================== - //===== Acolyte ============================ //-- AL_RUWACH 24,0,0,0,10000,0,0,0 @@ -83,7 +80,6 @@ 35,0,1000,0,0,6000,0,0 //========================================== - //===== Archer ============================= //-- AC_CONCENTRATION 45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0 @@ -93,7 +89,6 @@ 47,0,100,0,100,0,0,0 //========================================== - //===== Thief ============================== //-- TF_HIDING 51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0 @@ -101,13 +96,11 @@ 52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0 //========================================== - //===== First planned to be shared ========= //-- ALL_RESURRECTION 54,4800:3200:1600:0,0:1000:2000:3000,0,0,0,0,1200:800:400:0 //========================================== - //===== Knight ============================= //-- KN_BRANDISHSPEAR 57,350,0,0,0,0,0,350 @@ -121,7 +114,6 @@ 62,350,0,0,0,0,0,350 //========================================== - //===== Priest ============================= //-- PR_IMPOSITIO 66,0,3000,0,60000,0,0,0 @@ -154,7 +146,6 @@ //========================================== - //===== Wizard ============================= //-- WZ_FIREPILLAR 80,1920:1728:1536:1344:1152:960:768:576:384:192,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0,480:432:384:336:288:240:192:144:96:48 @@ -182,7 +173,6 @@ 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,0 //========================================== - //===== Blacksmith ========================= //-- BS_REPAIRWEAPON 108,2500,0,0,0,0,0,2500 @@ -198,7 +188,6 @@ 114,0,0,0,1000:2000:3000:4000:5000,0,0,0 //========================================== - //===== Hunter ============================= //-- HT_SKIDTRAP 115,0,0,0,300000:240000:180000:120000:60000,0,0,0 @@ -224,7 +213,6 @@ 129,800,1000,0,0,0,0,200 //========================================== - //===== Assassin =========================== //-- AS_CLOAKING 135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0,0 @@ -240,7 +228,6 @@ 141,500,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,7500:8000:8500:9000:9500:10000:10500:11000:11500:12000,500 //========================================== - //===== 1st Jobs Quest Skills=============== //-- NV_TRICKDEAD 143,0,0,0,600000,0,0,0 @@ -268,7 +255,6 @@ 157,0,0,0,300000,0,0,5000 //========================================== - //===== NPC Skills Part 1 ================== //-- NPC_ATTRICHANGE 161,0,0,0,1800000,0,0,0 @@ -322,7 +308,6 @@ 207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0,0 //========================================== - //===== Rogue ============================== //-- RG_BACKSTAP 212,0,500,0,5000,0,0,0 @@ -340,7 +325,6 @@ 220,0,0,0,180000,0,0,0 //========================================== - //===== Alchemist ========================== //-- AM_DEMONSTRATION 229,800,500,0,40000:45000:50000:55000:60000,0,0,200 @@ -364,7 +348,6 @@ 247,2000,0,0,0,0,0,1000 //========================================== - //===== Crusader =========================== //-- CR_AUTOGUARD 249,0,0,0,300000,0,0,0 @@ -388,7 +371,6 @@ 258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0 //========================================== - //===== Monk =============================== //-- MO_CALLSPIRITS 261,500,0,0,600000,0,0,500 @@ -439,7 +421,6 @@ 294,0,0,0,1200000,0,0,0 //========================================== - //===== Bard & Dancer (Ensemble Skills) ==== //-- BD_ADAPTATION 304,0,0,0,0,5000,0,0 @@ -461,7 +442,6 @@ 313,0,0,0,60000,60000,0,0 //========================================== - //===== Bard =============================== //-- BA_MUSICALSTRIKE 316,1200,0,0,0,0,0,300 @@ -479,7 +459,6 @@ 322,0,0,0,180000,20000,0,0 //========================================== - //===== Dancer ============================= //-- DC_THROWARROW 324,1200,0,0,0,0,0,300 @@ -497,7 +476,6 @@ 330,0,0,0,180000,20000,0,0 //========================================== - //===== Wedding Skills ===================== //-- WE_MALE 334,1500,0,0,0,0,0,1500 @@ -507,7 +485,6 @@ 336,0,0,0,20000,0,0,0 //========================================== - //===== NPC Skills Part 2 ================== //-- NPC_GRANDDARKNESS 339,0,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0 @@ -525,7 +502,6 @@ 354,0,0,0,0,0,0,0 //========================================== - //===== Lord Knight ======================== //-- LK_AURABLADE 355,0,0,0,40000:60000:80000:100000:120000,0,0,0 @@ -541,7 +517,6 @@ 360,0,0,0,300000,0,0,0 //========================================== - //===== High Priest ======================== //-- HP_ASSUMPTIO 361,800:1200:1600:2000:2400:2400:2400:2400:2400:2400,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0,200:300:400:500:600 @@ -549,15 +524,13 @@ 362,0,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000,0,5000:6000:7000:8000:9000 //========================================== - //===== High Wzard ========================= //-- HW_MAGICCRASHER 365,240,300,0,0,0,0,60 -//-- HW_MAGICPOWER +//-- HW_MAGICPOWER 366,0,0,0,30000,0,0, //========================================== - //===== Paladin ============================ //-- PA_PRESSURE 367,1600,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0,400 @@ -565,7 +538,6 @@ 369,0,0,0,60000,60000,0, //========================================== - //===== Champion =========================== //-- CH_PALMSTRIKE 370,0,300,0,0,0,0, @@ -573,7 +545,6 @@ 371,0,0,0,0,2000:4000:6000:8000:10000,0, //========================================== - //===== Professor ========================== //-- PF_HPCONVERSION 373,1000:1200:1400:1600:1800,0,0,0,0,0, @@ -583,7 +554,6 @@ 375,0,0,0,0,0,10000:10000:10000:10000:15000,0 //========================================== - //===== Assassin Cross ===================== //-- ASC_EDP 378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0,0 @@ -591,7 +561,6 @@ 379,250,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,250 //========================================== - //===== Sniper ============================= //-- SN_SIGHT 380,0,0,0,30000,0,0,0 @@ -603,7 +572,6 @@ 383,1500:1800:2100:2400:2700:3000:3300:3600:3900:4200,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0,0,500:600:700:800:900:1000:1100:1200:1300:1400 //========================================== - //===== Whitesmith ========================= //-- WS_MELTDOWN 384,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000,0,5:5:6:6:7:7:8:8:9:10 @@ -611,7 +579,6 @@ 387,0,0,0,60000,0,0,0 //========================================== - //===== Stalker ============================ //-- ST_CHASEWALK 389,500,0,0,10000,30000,0,500 @@ -619,7 +586,6 @@ 390,0,0,0,300000,0,0, //========================================== - //===== Clown / Gypsy ====================== //-- CG_ARROWVULCAN 394,1600:1760:1920:2080:2240:2400:2560:2720:2880:3040,2000,2000,0,0,0,400:440:480:520:560:600:640:680:720:760 @@ -658,7 +624,6 @@ 407,0,5000,0,0,0,0,0 //========================================== - //===== Adoption Skills ==================== //-- WE_BABY 408,0,0,0,300000,0,0,2000 @@ -668,7 +633,6 @@ 410,0,0,0,20000,0,0,0 //========================================== - //===== Taekwon ============================ //-- TK_RUN 411,3000:2500:2000:1500:100:500:0:0:0:0,300,0,1000,150000,0,3000:2500:2000:1500:1000:500:0:0:0:0 @@ -836,7 +800,6 @@ 499,0,100,0,100,0,0,0 //========================================== - //===== Gunslinger ========================= //-- GS_GLITTERING 500,0,0,0,600000,0,0,0 @@ -872,7 +835,6 @@ 521,800,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0,200 //========================================== - //===== Ninja ============================== //-- NJ_KUNAI 524,0,1000,0,0,0,0,0 @@ -1107,7 +1069,7 @@ 2015,0,0,0,180000,10000,0,2000 //-- RK_VITALITYACTIVATION 2016,0,0,0,180000,0,0,-1 -//-- RK_STORMBLAST +//-- RK_STORMBLAST 2017,2000,2000,0,0,0,0,-1 //-- RK_FIGHTINGSPIRIT 2018,0,0,0,180000,0,0,-1 @@ -1147,7 +1109,7 @@ 2034,0,1000,0,0,0,0,-1 //-- GC_HALLUCINATIONWALK 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000,-1 -//-- GC_ROLLINGCUTTER +//-- GC_ROLLINGCUTTER 2036,0,200,0,3000,0,0,-1 //-- GC_CROSSRIPPERSLASHER 2037,0,1000,0,0,0,0,-1 @@ -1160,7 +1122,7 @@ 2038,2000,500,0,0,0,0,500 //-- AB_ANCILLA 2039,1000,1000,0,0,0,0,-1 -//-- AB_ADORAMUS +//-- AB_ADORAMUS 2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000,-1 //-- AB_CLEMENTIA 2041,3000,0,0,120000:180000:240000,0,0,1000 @@ -1197,7 +1159,7 @@ //========================================== //===== Warlock ============================ -//-- WL_WHITEIMPRISON +//-- WL_WHITEIMPRISON 2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,-1 //-- WL_SOULEXPANSION 2202,2000,500,0,0,0,0,-1 @@ -1205,13 +1167,13 @@ 2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500 //-- WL_JACKFROST 2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0,1000 -//-- WL_MARSHOFABYSS +//-- WL_MARSHOFABYSS 2205,0,1000,0,30000,0,2500:3000:3500:4000:4500,500 //-- WL_RECOGNIZEDSPELL 2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000,1000 -//-- WL_SIENNAEXECRATE +//-- WL_SIENNAEXECRATE 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0,-1 -//-- WL_STASIS +//-- WL_STASIS 2209,3000,2000,0,10000:15000:20000:25000:30000,1000,180000:190000:200000:210000:220000,1000 //-- WL_DRAINLIFE 2210,4000,0,0,0,0,2000,1000 @@ -1219,11 +1181,11 @@ 2211,5000,2000,0,5000,0,5000,1000 //-- WL_HELLINFERNO 2212,3000,1000,0,20000:30000:40000:50000:60000,0,0,1000 -//-- WL_COMET +//-- WL_COMET 2213,10000:11000:12000:13000:14000,0,0,100,42000,60000,1000:1500:2000:2500:3000 -//-- WL_CHAINLIGHTNING +//-- WL_CHAINLIGHTNING 2214,3500:4000:4500:5000:5500,0,0,100,0,3000,1000 -//-- WL_EARTHSTRAIN +//-- WL_EARTHSTRAIN 2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000,2000 //-- WL_TETRAVORTEX 2217,5000:6000:7000:8000:9000,2000,0,15000:120000:40000:5000,0,15000,2000 @@ -1235,7 +1197,7 @@ 2224,2000,0,0,120000:160000:200000:240000:280000,0,0,-1 //-- WL_SUMMONSTONE 2229,2000,0,0,120000:160000:200000:240000:280000,0,0,-1 -//-- WL_READING_SB +//-- WL_READING_SB 2231,5000,500,0,0,0,0,1000 //-- WL_TELEKINESIS_INTENSE 5012,1000,0,0,60000,0,300000,-1 @@ -1251,9 +1213,9 @@ 2236,4000,1000,0,0,0,0,500 //-- RA_DETONATOR 2237,0,0,0,1000,0,0,-1 -//-- RA_ELECTRICSHOCKER +//-- RA_ELECTRICSHOCKER 2238,0,0,0,15000,20000:22000:24000:26000:28000,0,-1 -//-- RA_CLUSTERBOMB +//-- RA_CLUSTERBOMB 2239,0,0,0,15000,0,0,-1 //-- RA_WUGMASTERY 2240,0,1000,0,0,0,0,-1 @@ -1344,7 +1306,7 @@ //===== Shadow Chaser ====================== //-- SC_FATALMENACE 2284,0,500,0,0,0,0,-1 -//-- SC_REPRODUCE +//-- SC_REPRODUCE 2285,0,1000,0,60000,0,0,-1 //-- SC_AUTOSHADOWSPELL 2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0,2000 @@ -1398,7 +1360,7 @@ 2310,0,0,0,3500:4000:4500:5000:5500,0,2000,-1 //-- LG_REFLECTDAMAGE 2311,0,0,0,300000,0,0,-1 -//-- LG_PINPOINTATTACK +//-- LG_PINPOINTATTACK 2312,0,1000,0,5000,0,5000,-1 //-- LG_FORCEOFVANGUARD 2313,0,1000,0,300000,0,0,-1 @@ -1435,7 +1397,7 @@ 2326,0,0,0,3000,0,0,-1 //-- SR_SKYNETBLOW 2327,0,500,0,0,0,0,-1 -//-- SR_EARTHSHAKER +//-- SR_EARTHSHAKER 2328,0,0,0,1000,0,3000,-1 //-- SR_FALLENEMPIRE 2329,0,0,0,500:1000:1500:2000:2500,0,0,-1 @@ -1468,7 +1430,7 @@ 2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,-1 //-- SR_GENTLETOUCH_CURE 2345,0,1000,0,0,0,1000:1500:2000:2500:3000,-1 -//-- SR_GENTLETOUCH_ENERGYGAIN +//-- SR_GENTLETOUCH_ENERGYGAIN 2346,1000,1000,0,240000,0,0,1000:1500:2000:2500:3000 //-- SR_GENTLETOUCH_CHANGE 2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000 @@ -1564,7 +1526,7 @@ 2451,1000,1000,0,60000,0,2000,-1 //-- SO_WARMER 2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000 -//-- SO_VACUUM_EXTREME +//-- SO_VACUUM_EXTREME 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,-1 //-- SO_VARETYR_SPEAR 2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000 @@ -1572,15 +1534,15 @@ 2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,800:600:400:200:-1 //-- SO_EL_CONTROL 2456,2000,0,0,0,0,5000,0 -//-- SO_SUMMON_AGNI +//-- SO_SUMMON_AGNI 2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000 //-- SO_SUMMON_AQUA 2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000 -//-- SO_SUMMON_VENTUS +//-- SO_SUMMON_VENTUS 2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000 -//-- SO_SUMMON_TERA +//-- SO_SUMMON_TERA 2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000 -//-- SO_EL_ACTION +//-- SO_EL_ACTION 2461,0,0,0,0,0,5000,0 //-- SO_EL_ANALYSIS 2462,0,0,0,0,0,0,2000 @@ -1614,7 +1576,7 @@ 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,-1 //-- GN_WALLOFTHORN 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1 -//-- GN_CRAZYWEED +//-- GN_CRAZYWEED 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,-1 //-- GN_CRAZYWEED_ATK 2484,0,0,0,100,0,0,-1 @@ -1630,7 +1592,7 @@ //-- GN_HELLS_PLANT 2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,-1 -//-- GN_HELLS_PLANT_ATK +//-- GN_HELLS_PLANT_ATK 2491,0,0,0,20000,0,0,-1 //-- GN_MANDRAGORA 2492,1000,500,0,10000:15000:20000:25000:30000,0,10000,-1 @@ -1769,7 +1731,7 @@ //-- MH_SUMMON_LEGION 8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0,400:600:800:1000:1200 -//-- MH_NEEDLE_OF_PARALYZE +//-- MH_NEEDLE_OF_PARALYZE 8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0,500:400:300:200:100 //-- MH_POISON_MIST 8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0,500 @@ -1793,7 +1755,7 @@ //8029,0,0,0,0,0,0,0 //-- MH_MIDNIGHT_FRENZY //8030,0,0,0,0,0,0,0 -//-- MH_STAHL_HORN +//-- MH_STAHL_HORN 8031,800:600:400:200:0,0,0,5000,0,0,200:400:600:800:1000 //-- MH_GOLDENE_FERSE 8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0,-1 diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 8e4a4c022..eb875fc56 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -18,7 +18,7 @@ // 0x80 - Skill ignores target's def cards // 07 splash/effect range (-1 for screen-wide) // 08 MaxLv -// 09 Number of hits (when positive, damage is increased by hits, +// 09 Number of hits (when positive, damage is increased by hits, // negative values just show number of hits without increasing total damage) // 10 Cast interrupted when hit? // 11 defense-reduction rate during cast. @@ -45,6 +45,7 @@ // 15 Blowcount (amount of tiles skill knockbacks) // 16 Name // 17 Description + 1,0,0,0,0,0,0,9,0,no,0,0,0,none,0, NV_BASIC,Basic Skill 2,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_SWORD,Sword Mastery 3,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, SM_TWOHAND,Two-Handed Sword Mastery @@ -772,7 +773,7 @@ 2211,11,8,1,3,0x2,3,5,-7,yes,0,0,0,magic,3, WL_CRIMSONROCK,Crimson Rock 2212,11,6,1,3,0,0,5,1,yes,0,0,0,magic,0, WL_HELLINFERNO,Hell Inferno 2213,11,8,2,0,0,0,5,-20,yes,0,0,0,magic,2, WL_COMET,Comet -2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning +2214,11,6,1,0,0,3,5,1,yes,0,0,0,magic,0, WL_CHAINLIGHTNING,Chain Lightning 2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack 2216,3,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0, WL_EARTHSTRAIN,Earth Strain 2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0, WL_TETRAVORTEX,Tetra Vortex @@ -783,7 +784,7 @@ 2222,0,6,4,3,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONFB,Summon Fire Ball 2223,0,6,4,4,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONBL,Summon Lightning Ball 2224,0,6,4,1,0x1,0,5,1,yes,0,0,0,magic,0, WL_SUMMONWB,Summon Water Ball -2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire +2225,11,6,1,3,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_FIRE,Summon Attack Fire 2226,11,6,1,4,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WIND,Summon Attack Wind 2227,11,6,1,1,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_WATER,Summon Attack Water 2228,11,6,1,2,0,0,5,1,no,0,0,1,magic,0, WL_SUMMON_ATK_GROUND,Summon Attack Earth @@ -1076,7 +1077,7 @@ 3006,7:8:9:10:11,6,2,0,0x2,2,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai 3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai 3008,9,8,2,0,0x12,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage -3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka +3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka 3010,3,6,4,0,0x42,0,5,1,no,0,0x80,0,weapon,0, KO_MAKIBISHI,Makibishi 3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui 3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7, KO_ZANZOU,Zanzou @@ -1085,7 +1086,7 @@ 3015,0,6,4,3,0x1,0,1,1,no,0,0,0,none,0, KO_KAHU_ENTEN,Kahu Enten 3016,0,6,4,1,0x1,0,1,1,no,0,0,0,none,0, KO_HYOUHU_HUBUKI,Hyouhu Hubuki 3017,0,6,4,4,0x1,0,1,1,no,0,0,0,none,0, KO_KAZEHU_SEIRAN,Kazehu Seiran -3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai +3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai 3019,11,6,1,0,0,0,5,0,no,0,0,0,magic,0, KO_KAIHOU,Technique Kaihou 3020,7,6,2,0,0,0,1,3,yes,0,0,0,magic,0, KO_ZENKAI,Zenkai 3021,5:6:7:8:9,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KO_GENWAKU,Genwaku diff --git a/db/roulette_db.conf b/db/roulette_db.conf index c82bb0830..6ab579dba 100644 --- a/db/roulette_db.conf +++ b/db/roulette_db.conf @@ -1,12 +1,12 @@ //==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ //= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| //= | | | | __/ | | (__| |_| | | __/\__ \ //= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://herc.ws/board/ +//= +//= http://herc.ws/board/ //================= More Information ================= //= http://herc.ws/board/topic/7618-2014-10-22-roulette-and-per-char-gender/ //==================================================== @@ -74,4 +74,3 @@ roulette: ( } } ) - diff --git a/db/sc_config.txt b/db/sc_config.txt index cd0b050f6..650409f6c 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -11,8 +11,8 @@ // 32 - SC considered as debuff and be removed by Gospel and etc. // 64 - SC cannot be reset when MADO Gear is taken off. // 128 - SC cannot be reset by 'sc_end SC_ALL' and status change clear. -//Example: -//SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21) +// Example: +// SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21) SC_PROVOKE, 32 SC_ENDURE, 21 diff --git a/src/config/core.h b/src/config/core.h index da9296bda..3832b185e 100644 --- a/src/config/core.h +++ b/src/config/core.h @@ -64,7 +64,6 @@ /// Uncomment to enable real-time server stats (in and out data and ram usage). [Ai4rei] //#define SHOW_SERVER_STATS - /// Comment to disable autotrade persistency (where autotrading merchants survive server restarts) #define AUTOTRADE_PERSISTENCY diff --git a/src/map/battle.c b/src/map/battle.c index fb6a1c580..aa70525a9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7085,7 +7085,6 @@ static const struct battle_data { { "mail_show_status", &battle_config.mail_show_status, 0, 0, 2, }, { "client_limit_unit_lv", &battle_config.client_limit_unit_lv, 0, 0, BL_ALL, }, { "client_emblem_max_blank_percent", &battle_config.client_emblem_max_blank_percent, 100, 0, 100, }, - // BattleGround Settings { "bg_update_interval", &battle_config.bg_update_interval, 1000, 100, INT_MAX, }, { "bg_flee_penalty", &battle_config.bg_flee_penalty, 20, 0, INT_MAX, }, @@ -7121,7 +7120,6 @@ static const struct battle_data { { "feature.banking", &battle_config.feature_banking, 1, 0, 1, }, { "feature.auction", &battle_config.feature_auction, 0, 0, 2, }, { "idletime_criteria", &battle_config.idletime_criteria, 0x25, 1, INT_MAX, }, - { "mon_trans_disable_in_gvg", &battle_config.mon_trans_disable_in_gvg, 0, 0, 1, }, { "case_sensitive_aegisnames", &battle_config.case_sensitive_aegisnames, 1, 0, 1, }, { "guild_castle_invite", &battle_config.guild_castle_invite, 0, 0, 1, }, |