Small correction

* Moved the emotion in NPC_EMOTION and NPC_EMOTION_ON skills in a separated field
** "...always,0,9,0x308D,,,,," : the emotion "9" is now saved in emotion2, this emotion coming from another table != the "global" emotion
* the corrections on NPC_EMOTION and NPC_EMOTION_ON are reverted, the corrections will be made in next PR after merge of mob skill DB

conf/atcommands.yml

@@ -1010,6 +1010,9 @@ Body:
     Aliases:
       - famepoint
       - famepoints
+  - Command: enchantgradeui
+    Help: |
+      Opens the enchantgrade UI.
 
 Footer:
   Imports:

conf/battle/battle.conf

@@ -167,3 +167,9 @@ warg_can_falcon: no
 // Should the target be able of dodging damage by snapping away to the edge of the screen?
 // Official behavior is "no"
 snap_dodge: no
+
+// Grant player skills/items the ability to "break" non-player equipment. (Note 1)
+// This will effectively apply the strip equip effect to the non-player target.
+// NOTE: WS_MELTDOWN is exempt from this check when disabled.
+// Official: no
+break_mob_equip: no

conf/battle/monster.conf

@@ -19,52 +19,57 @@ monster_hp_rate: 100
 monster_max_aspd: 199
 
 // Defines various mob AI related settings. (Note 3)
-// 0x001: When enabled mobs will update their target cell every few iterations
-//        (normally they never update their target cell until they reach it while
-//        chasing)
-// 0x002: Makes mob use their "rude attack" skill (usually warping away) if they
-//        are attacked and they can't attack back regardless of how they were
-//        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 attacked within a
-//        distance of [attack range+1], 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 
-//        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
-//        any npc-warps in it's sight of view (use with mob_warp below)
-// 0x080: If not set, mobs on attack state will only change targets when attacked
-//        by normal attacks. Set this if you want mobs to also switch targets when
-//        hit by skills.
-// 0x100: When set, a mob will pick a random skill from it's list and start from
-//        that instead of checking skills in orders (when unset, if a mob has too
-//        many skills, the ones near the end will rarely get selected)
-// 0x200: When set, a mob's skill re-use delay will not be applied to all entries of
-//        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 
-//        will obey the normal skill range rules.
-// 0x800: When set, monsters that are provoked will always change target to the
-//        provoking person, even if they would usually not change target on attack.
+// 0x0001: When enabled mobs will update their target cell every few iterations
+//         (normally they never update their target cell until they reach it while
+//         chasing)
+// 0x0002: Makes mob use their "rude attack" skill (usually warping away) if they
+//         are attacked and they can't attack back regardless of how they were
+//         attacked (eg: GrimTooth), otherwise, their "rude attack" is only activated
+//         if they can't melee reach the target (eg: sniping)
+// 0x0004: If not set, mobs that can change target only do so when attacked within a
+//         distance of [attack range+1], otherwise mobs may change target and chase 
+//         ranged attackers. This flag also overrides the 'provoke' target.
+// 0x0008: 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)
+// 0x0010: If set, mob skills defined for friends will also trigger on themselves.
+// 0x0020: 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.
+// 0x0040: When set, when the mob's target changes map, the mob will walk towards
+//         any npc-warps in it's sight of view (use with mob_warp below)
+// 0x0080: If not set, mobs on attack state will only change targets when attacked
+//         by normal attacks. Set this if you want mobs to also switch targets when
+//         hit by skills.
+// 0x0100: When set, a mob will pick a random skill from it's list and start from
+//         that instead of checking skills in orders (when unset, if a mob has too
+//         many skills, the ones near the end will rarely get selected)
+// 0x0200: When set, a mob's skill re-use delay will not be applied to all entries of
+//         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.
+// 0x0400: Set this to make mobs have a range of 9 for all skills. Otherwise, they 
+//         will obey the normal skill range rules.
+// 0x0800: When set, monsters that are provoked will always change target to the
+//         provoking person, even if they would usually not change target on attack.
+// 0x1000: When set, when a monster picks a skill but can't use it because there is
+//         no valid target in range, it will look for another skill it can use.
+//         This makes e.g. Greatest General use "Earth Spike" at range 8-9 whereas
+//         officially it would only use it after already having used "Blind Attack"
+//         at range 0-7.
 // Example: 0x140 -> Chase players through warps + use skills in random order.
 monster_ai: 0
 
 // How often should a monster rethink its chase?
 // 0: Every 100ms (MIN_MOBTHINKTIME)
 // 1: Every cell moved
-// 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 
-// 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
+// x: Every x cells moved or at end of the chase path
+// 30 (max): Only at end of the chase path (official)
+// Regardless of this setting, a monster will always check for targets in attack
+// range. Decrease this value if you want to make monsters to be more reactive while
+// chasing. This also defines the maximum amount of cells monsters will move after
+// they lost their target (hide, no line of sight, etc.).
+monster_chase_refresh: 30
 
 // Should mobs be able to be warped (add as needed)?
 // 0: Disable.

conf/battle/player.conf

@@ -155,8 +155,8 @@ friend_auto_add: yes
 invite_request_check: yes
 
 // Players' will drop a 'Skull' when killed?
-// Note: The 'Skull' item (ID 7420) is trade restricted by default. Please check
-// the item_trade database to adjust accordingly.
+// Note: The 'Skull' item (ID 7420) is trade restricted by default. You need
+// to remove the "NoTrade" flag on the item for this feature to work.
 // 0 = Disabled
 // 1 = Dropped only in PvP maps
 // 2 = Dropped in all situations

conf/battle/skill.conf

@@ -174,8 +174,13 @@ sense_type: 1
 finger_offensive_type: 0
 
 // Grandcross Settings (Don't mess with these)
-// If set to no, hit interval is increased based on the amount of mobs standing on the same cell
-// (means that when there's stacked mobs in the same cell, they won't receive all hits)
+// Officially, Grand Cross has four damage waves, but each cell will stop
+// dealing damage on the next wave after it already dealt at least 3 hits.
+// A moving monster can take up to 4 hits, while a stack of monsters may only
+// take 1-3 hits.
+// Set this to yes if you want all waves to deal damage to all targets.
+// Hint: If you want to reduce the number of waves, you need to reduce the
+// duration of the skill (e.g. to 800ms for three damage waves).
 gx_allhit: no
 
 // Grandcross display type (Default 1)
@@ -220,6 +225,10 @@ backstab_bow_penalty: yes
 // Use 0 to disable (max allowed value is 255)
 skill_steal_max_tries: 0
 
+// Should random options be applied to stolen items? (Note 1)
+// Official: no
+skill_steal_random_options: no
+
 // Level and Strength of "MVP heal". When someone casts a heal of this level or
 // above, the heal formula is bypassed and this value is used instead.
 max_heal: 9999

conf/groups.conf

@@ -1,303 +0,0 @@
-/*
-
-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 
-permissions, and a list of other groups it inherits from.
-
-
-Group settings
---------------
-<id>
-Unique group number. The only required field.
-
-<name>
-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 
-(db/item_trade.txt).
-
-<commands>
-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.
-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 
-atcommandlog. If setting is omitted in a group definition, false is assumed.
-Requires 'log_commands' to be enabled in 'conf/log_athena.conf'.
-
-<permissions>
-A group of settings
-	<permission> : <bool>
-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 
-from. Group names are case-sensitive.
-
-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 
-considered faulty and can't be processed fully by server.
-
-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 
-inherited.
-
-Syntax
-------
-This config file uses libconfig syntax: 
-http://www.hyperrealm.com/libconfig/libconfig_manual.html#Configuration-Files
-
-
-Upgrading from revisions before r15572
--------------------------------------
-http://rathena.org/board/index.php?showtopic=58877
-*/
-
-groups: (
-{
-	id: 0 /* group 0 is the default group for every new account */
-	name: "Player"
-	level: 0
-	inherit: ( /*empty list*/ )
-	commands: {
-		changedress: true
-		resurrect: true
-	}
-	permissions: {
-		/* without this basic permissions regular players could not 
-		trade or party */
-		can_trade: true
-		can_party: true
-		attendance: true
-	}
-},
-{
-	id: 1
-	name: "Super Player"
-	inherit: ( "Player" ) /* can do everything Players can and more */
-	level: 0
-	commands: {
-		/* informational commands */
-		commands: true
-		charcommands: true
-		help: true
-		rates: true
-		uptime: true
-		showdelay: true
-		exp: true
-		mobinfo: true
-		iteminfo: true
-		whodrops: true
-		time: true
-		jailtime: true
-		hominfo: true
-		homstats: true
-		showexp: true
-		showzeny: true
-		whereis: true
-		/* feature commands */
-		refresh: true
-		noask: true
-		noks: true
-		autoloot: true
-		alootid: true
-		autoloottype: true
-		autotrade: true
-		request: true
-		go: true
-		breakguild: true
-		channel: true
-		langtype: true
-	}
-	permissions: {
-		attendance: false
-	}
-},
-{
-	id: 2
-	name: "Support"
-	inherit: ( "Super Player" )
-	level: 1
-	commands: {
-		version: true
-		where: true
-		jumpto: true
-		who: true
-		who2: true
-		who3: true
-		whomap: true
-		whomap2: true
-		whomap3: true
-		users: true
-		broadcast: true
-		localbroadcast: true
-	}
-	log_commands: true
-	permissions: {
-		receive_requests: true
-		view_equipment: true
-	}
-},
-{
-	id: 3
-	name: "Script Manager"
-	inherit: ( "Support" )
-	level: 1
-	commands: {
-		tonpc: true
-		hidenpc: true
-		shownpc: true
-		loadnpc: true
-		unloadnpc: true
-		npcmove: true
-		addwarp: true
-	}
-	log_commands: true
-	permissions: {
-		any_warp: true
-	}
-},
-{
-	id: 4
-	name: "Event Manager"
-	inherit: ( "Support" )
-	level: 1
-	commands: {
-		monster: true
-		monstersmall: true
-		monsterbig: true
-		killmonster2: true
-		cleanarea: true
-		cleanmap: true
-		item: [true, true]
-		zeny: [true, true]
-		disguise: [true, true]
-		undisguise: [true, true]
-		size: [true, true]
-		raise: true
-		raisemap: true
-		day: true
-		night: true
-		skillon: true
-		skilloff: true
-		pvpon: true
-		pvpoff: true
-		gvgon: true
-		gvgoff: true
-		allowks: true
-		me: true
-		marry: true
-		divorce: true
-		refreshall: true
-	}
-	log_commands: true
-	permissions: {
-		can_trade: false
-		any_warp: true
-	}
-},
-{
-	id: 5
-	name: "VIP"
-	inherit: ( "Player" ) /* can do everything Players can */
-	level: 0
-	commands: {
-		rates: true
-		who: true
-	}
-	permissions: {
-		/* no permissions by default */
-	}
-},
-{
-	id: 10
-	name: "Law Enforcement"
-	inherit: ( "Support" )
-	level: 2
-	commands: {
-		hide: true
-		follow: true
-		kick: true
-		disguise: true
-		fakename: true
-		option: true
-		speed: true
-		warp: true
-		kill: true
-		recall: true
-		ban: true
-		block: true
-		jail: true
-		jailfor: true
-		mute: true
-		storagelist: true
-		cartlist: true
-		itemlist: true
-		stats: true
-	}
-	log_commands: true
-	permissions: {
-		join_chat: true
-		kick_chat: true
-		hide_session: true
-		who_display_aid: true
-		hack_info: true
-		any_warp: true
-		view_hpmeter: true
-	}
-},
-{
-	id: 99
-	name: "Admin"
-	level: 99
-	inherit: ( "Support", "Law Enforcement" )
-	commands: {
-		/* not necessary due to all_commands: true */
-	}
-	log_commands: true
-	permissions: {
-		can_trade: true
-		can_party: true
-		command_enable: true
-		all_skill: false
-		all_equipment: false
-		skill_unconditional: false
-		use_check: true
-		use_changemaptype: true
-		all_commands: true
-		channel_admin: true
-		can_trade_bounded: true
-		item_unconditional: false
-		bypass_stat_onclone: true
-		bypass_max_stat: true
-		/* all_permission: true */
-	}
-}
-)
-

conf/groups.yml

@@ -0,0 +1,245 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Player Group Database
+###########################################################################
+#
+# Player Group Settings
+#
+###########################################################################
+# - Id                    Group ID.
+#   Name                  Group name.
+#   Level                 GM Level used for ranking groups. (Default: 0)
+#   LogCommands           Whether atcommands should be logged or not. (Default: false)
+#   Commands:             List of atcommands that can be used by this group. (Default: none)
+#     <atcommand name>    Whether the specified atcommand can be used by this group or not.
+#   CharCommands:         List of charcommands that can be used by this group. (Default: none)
+#     <charcommand name>  Whether the specified charcommand can be used by this group or not.
+#   Permissions:          List of permissions the group has. (Default: none)
+#     <permission name>   Whether the group has this permission or not.
+#   Inherit:              List of groups that will be inherited. (Default: none)
+#     <group name>        Whether this group will be inherited or not.
+###########################################################################
+
+Header:
+  Type: PLAYER_GROUP_DB
+  Version: 1
+
+Body:
+  - Id: 0
+    # group 0 is the default group for every new account
+    Name: Player
+    Level: 0
+    Commands:
+      changedress: true
+      resurrect: true
+    Permissions:
+      # without this basic permissions regular players could not trade or party
+      can_trade: true
+      can_party: true
+      attendance: true
+  - Id: 1
+    Name: Super Player
+    # Can do everything Players can and more
+    Inherit:
+      Player: true
+    Level: 0
+    Commands:
+      # Informational commands
+      commands: true
+      charcommands: true
+      help: true
+      rates: true
+      uptime: true
+      showdelay: true
+      exp: true
+      mobinfo: true
+      iteminfo: true
+      whodrops: true
+      time: true
+      jailtime: true
+      hominfo: true
+      homstats: true
+      showexp: true
+      showzeny: true
+      whereis: true
+      # Feature commands
+      refresh: true
+      noask: true
+      noks: true
+      autoloot: true
+      alootid: true
+      autoloottype: true
+      autotrade: true
+      request: true
+      go: true
+      breakguild: true
+      channel: true
+      langtype: true
+    Permissions:
+      attendance: false
+  - Id: 2
+    Name: Support
+    Inherit:
+      Super Player: true
+    Level: 1
+    Commands:
+      version: true
+      where: true
+      jumpto: true
+      who: true
+      who2: true
+      who3: true
+      whomap: true
+      whomap2: true
+      whomap3: true
+      users: true
+      broadcast: true
+      localbroadcast: true
+    LogCommands: true
+    Permissions:
+      receive_requests: true
+      view_equipment: true
+  - Id: 3
+    Name: Script Manager
+    Inherit:
+      Support: true
+    Level: 1
+    Commands:
+      tonpc: true
+      hidenpc: true
+      shownpc: true
+      loadnpc: true
+      unloadnpc: true
+      npcmove: true
+      addwarp: true
+    LogCommands: true
+    Permissions:
+      any_warp: true
+  - Id: 4
+    Name: Event Manager
+    Inherit:
+      Support: true
+    Level: 1
+    Commands:
+      monster: true
+      monstersmall: true
+      monsterbig: true
+      killmonster2: true
+      cleanarea: true
+      cleanmap: true
+      item: true
+      zeny: true
+      disguise: true
+      undisguise: true
+      size: true
+      raise: true
+      raisemap: true
+      day: true
+      night: true
+      skillon: true
+      skilloff: true
+      pvpon: true
+      pvpoff: true
+      gvgon: true
+      gvgoff: true
+      allowks: true
+      me: true
+      marry: true
+      divorce: true
+      refreshall: true
+    CharCommands:
+      item: true
+      zeny: true
+      disguise: true
+      undisguise: true
+      size: true
+    LogCommands: true
+    Permissions:
+      can_trade: false
+      any_warp: true
+  - Id: 5
+    Name: VIP
+    # Can do everything Players can
+    Inherit:
+      Player: true
+    Level: 0
+    Commands:
+      rates: true
+      who: true
+  - Id: 10
+    Name: Law Enforcement
+    Inherit:
+      Support: true
+    Level: 2
+    Commands:
+      hide: true
+      follow: true
+      kick: true
+      disguise: true
+      fakename: true
+      option: true
+      speed: true
+      warp: true
+      kill: true
+      recall: true
+      ban: true
+      block: true
+      jail: true
+      jailfor: true
+      mute: true
+      storagelist: true
+      cartlist: true
+      itemlist: true
+      stats: true
+    LogCommands: true
+    Permissions:
+      join_chat: true
+      kick_chat: true
+      hide_session: true
+      who_display_aid: true
+      hack_info: true
+      any_warp: true
+      view_hpmeter: true
+  - Id: 99
+    Name: Admin
+    Level: 99
+    Inherit:
+      Support: true
+      Law Enforcement: true
+    LogCommands: true
+    Permissions:
+      can_trade: true
+      can_party: true
+      command_enable: true
+      all_skill: false
+      all_equipment: false
+      skill_unconditional: false
+      use_check: true
+      use_changemaptype: true
+      all_commands: true
+      channel_admin: true
+      can_trade_bounded: true
+      item_unconditional: false
+      bypass_stat_onclone: true
+      bypass_max_stat: true
+      #all_permission: true
+
+Footer:
+  Imports:
+  - Path: conf/import/groups.yml

conf/import-tmpl/groups.yml

@@ -0,0 +1,41 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Player Group Database
+###########################################################################
+#
+# Player Group Settings
+#
+###########################################################################
+# - Id                    Group ID.
+#   Name                  Group name.
+#   Level                 GM Level used for ranking groups. (Default: 0)
+#   LogCommands           Whether atcommands should be logged or not. (Default: false)
+#   Commands:             List of atcommands that can be used by this group. (Default: none)
+#     <atcommand name>    Whether the specified atcommand can be used by this group or not.
+#   CharCommands:         List of charcommands that can be used by this group. (Default: none)
+#     <charcommand name>  Whether the specified charcommand can be used by this group or not.
+#   Permissions:          List of permissions the group has. (Default: none)
+#     <permission name>   Whether the group has this permission or not.
+#   Inherit:              List of groups that will be inherited. (Default: none)
+#     <group name>        Whether this group will be inherited or not.
+###########################################################################
+
+Header:
+  Type: PLAYER_GROUP_DB
+  Version: 1

conf/log_athena.conf

@@ -8,37 +8,40 @@
 //--------------------------------------------------------------
 
 // Enable Logs? (Note 3)
-// 0x0000000 - Don't log at all
-// 0x0000001 - (T) Log trades
-// 0x0000002 - (V) Log vending transactions
-// 0x0000004 - (P) Log items drop/picked by players
-// 0x0000008 - (L) Log items drop/looted by monsters
-// 0x0000010 - (S) Log NPC transactions (buy/sell)
-// 0x0000020 - (N) Log Script transactions (items deleted/acquired through quests)
-// 0x0000040 - (D) Log items stolen from mobs (Steal/Gank)
-// 0x0000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
-// 0x0000100 - (O) Log produced/ingredient items
-// 0x0000200 - (U) Log MVP prize items
-// 0x0000400 - (A) Log player created/deleted items (through @/# commands)
-// 0x0000800 - (R) Log items placed/retrieved from storage.
-// 0x0001000 - (G) Log items placed/retrieved from guild storage.
-// 0x0002000 - (E) Log mail system transactions.
-// 0x0004000 - (I) Log auction system transactions.
-// 0x0008000 - (B) Log buying store transactions
-// 0x0010000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
+// 0x00000000 - Don't log at all
+// 0x00000001 - (T) Log trades
+// 0x00000002 - (V) Log vending transactions
+// 0x00000004 - (P) Log items drop/picked by players
+// 0x00000008 - (L) Log items drop/looted by monsters
+// 0x00000010 - (S) Log NPC transactions (buy/sell)
+// 0x00000020 - (N) Log Script transactions (items deleted/acquired through quests)
+// 0x00000040 - (D) Log items stolen from mobs (Steal/Gank)
+// 0x00000080 - (C) Log player-used items (consumables/pet&hom&merc food/items used for skills&attacks)
+// 0x00000100 - (O) Log produced/ingredient items
+// 0x00000200 - (U) Log MVP prize items
+// 0x00000400 - (A) Log player created/deleted items (through @/# commands)
+// 0x00000800 - (R) Log items placed/retrieved from storage.
+// 0x00001000 - (G) Log items placed/retrieved from guild storage.
+// 0x00002000 - (E) Log mail system transactions.
+// 0x00004000 - (I) Log auction system transactions.
+// 0x00008000 - (B) Log buying store transactions
+// 0x00010000 - (X) Log all other transactions (rentals expiring/inserting cards/items removed by item_check/
 //           rings deleted by divorce/pet egg (un)hatching/pet armor (un)equipping/Weapon Refine skill/Remove Trap skill/Stylist)
-// 0x0020000 - ($) Log cash transactions
-// 0x0040000 - (K) Log account bank transactions
-// 0x0080000 - (F) Removed bound items when guild/party is broken
-// 0x0100000 - (Y) Log Roulette Lottery
-// 0x0200000 - (Z) Merged items from item mergers process.
-// 0x0400000 - (Q) Log items given from quest-granted drops.
-// 0x0800000 - (H) Log items consumed by Private Airship system
-// 0x1000000 - (J) Log Barter Shop transactions
-// 0x2000000 - (W) Log Laphine system transactions
+// 0x00020000 - ($) Log cash transactions
+// 0x00040000 - (K) Log account bank transactions
+// 0x00080000 - (F) Removed bound items when guild/party is broken
+// 0x00100000 - (Y) Log Roulette Lottery
+// 0x00200000 - (Z) Merged items from item mergers process.
+// 0x00400000 - (Q) Log items given from quest-granted drops.
+// 0x00800000 - (H) Log items consumed by Private Airship system
+// 0x01000000 - (J) Log Barter Shop transactions
+// 0x02000000 - (W) Log Laphine system transactions
+// 0x04000000 - (0) Enchantgrade UI
+// 0x08000000 - (1) Reform UI
+// 0x10000000 - (2) Enchant UI
 // Example: Log trades+vending+script items+created items: 1+2+32+1024 = 1059
 // Please note that moving items from inventory to cart and back is not logged by design.
-enable_logs: 0xFFFFFFF
+enable_logs: 0xFFFFFFFF
 
 // Use MySQL Logs? (Note 1)
 sql_logs: yes

conf/maps_athena.conf

@@ -1483,5 +1483,25 @@ map: verus02_b
 map: tur_d04ia
 map: tur_d04ib
 
+// Episode 19
+map: icecastle
+map: icas_in
+map: jor_tail
+map: jor_back1
+map: jor_back2
+map: jor_back3
+map: jor_nest
+map: jor_dun01
+map: jor_dun02
+map: jor_dun03
+map: jor_ab01
+map: jor_ab02
+map: jor_que
+map: air_if
+map: 1@iwp
+map: 1@jorchs
+map: 1@jorlab
+map: 1@whl
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------

conf/msg_conf/map_msg.conf

@@ -921,7 +921,10 @@
 // @mobinfo RES/MRES
 827:  RES:%d  MRES:%d
 
-//828-899 free
+// General packet version check messages
+828: This command requires packet version %s or newer.
+
+//829-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1106,8 +1109,7 @@
 // @partyrecall
 1035: Please enter a party name/ID (usage: @partyrecall <party_name/ID>).
 
-// @reloadatcommand
-1036: Error reading groups.conf, reload failed.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_chn.conf

@@ -865,8 +865,7 @@
 // @partyrecall
 1035: 請輸入隊伍名稱/ID (用法: @partyrecall <party_name/ID>).
 
-// @reloadatcommand
-1036: Error reading groups.conf, reload failed.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_frn.conf

@@ -877,8 +877,7 @@
 // @partyrecall
 1035: Entrez un nom/ID d'Equipe (usage: @partyrecall <nom/ID_party>).
 
-// @reloadatcommand
-1036: Erreur à la lecture de groups.conf, reload échoué.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_idn.conf

@@ -964,8 +964,7 @@
 // @partyrecall
 1035: Harap masukkan nama party/ID. (Penggunaan: @partyrecall <nama party/ID>).
 
-// @reloadatcommand
-1036: Terjadi kesalahan saat membaca groups.conf, tidak berhasil dimuat ulang.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_por.conf

@@ -1046,8 +1046,7 @@
 // @partyrecall
 1035: Digite o nome/ID de um grupo (uso: @partyrecall <nome/ID_do_grupo>).
 
-// @reloadatcommand
-1036: Erro na leitura do grups.conf, recarregamento falhou.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_rus.conf

@@ -878,8 +878,7 @@
 // @partyrecall
 1035: Введите ID/название группы (Использование: @partyrecall <ID/название группы>).
 
-// @reloadatcommand
-1036: Ошибка чтения файла groups.conf, перезагрузка не удалась.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_spn.conf

@@ -1015,8 +1015,7 @@
 // @partyrecall
 1035: Introduce el nombre/ID de un grupo (instrucciones: @partyrecall <nombre/ID del grupo>).
 
-// @reloadatcommand
-1036: Ha ocurrido un error al cargar el archivo groups.conf.
+//1036 free
 //1037 free
 
 // @mapinfo

conf/msg_conf/map_msg_tha.conf

@@ -871,8 +871,7 @@
 // @partyrecall
 1035: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>×<EFBFBD>ט<EFBFBD>/ID party (<28><>¸<EFBFBD>ד×י: @partyrecall <×<>ט<EFBFBD>/ID party>).
 
-// @reloadatcommand
-1036: א<><D790>´¢י<C2A2>¼<EFBFBD>´¾<C2B4><C2BE>´ד¹<D793><C2B9><EFBFBD>¼ט<C2BC>¹ה<C2B9><D794>ל groups.conf, <20><><EFBFBD>ג<EFBFBD><D792>´ד<C2B4><D793>ט<EFBFBD>י<EFBFBD>א<EFBFBD><D790><EFBFBD>.
+//1036 free
 //1037 free
 
 // @mapinfo

db/castle_db.yml

@@ -32,6 +32,169 @@ Header:
   Type: CASTLE_DB
   Version: 1
 
+Body:
+# WOE FE castle
+  - Id: 0
+    Map: aldeg_cas01
+    Name: Neuschwanstein
+    #Name: Noisyubantian
+    Npc: Agit#aldeg_cas01
+  - Id: 1
+    Map: aldeg_cas02
+    Name: Hohenschwangau
+    #Name: Hohensyubangawoo
+    Npc: Agit#aldeg_cas02
+  - Id: 2
+    Map: aldeg_cas03
+    Name: Nuernberg
+    #Name: Nyirenverk
+    Npc: Agit#aldeg_cas03
+  - Id: 3
+    Map: aldeg_cas04
+    Name: Wuerzburg
+    #Name: Byirtsburi
+    Npc: Agit#aldeg_cas04
+  - Id: 4
+    Map: aldeg_cas05
+    Name: Rothenburg
+    #Name: Rotenburk
+    Npc: Agit#aldeg_cas05
+  - Id: 5
+    Map: gefg_cas01
+    Name: Repherion
+    #Name: Reprion
+    Npc: Agit#gefg_cas01
+  - Id: 6
+    Map: gefg_cas02
+    Name: Eeyolbriggar
+    #Name: Yolbriger
+    Npc: Agit#gefg_cas02
+  - Id: 7
+    Map: gefg_cas03
+    Name: Yesnelph
+    #Name: Isinlife
+    Npc: Agit#gefg_cas03
+  - Id: 8
+    Map: gefg_cas04
+    Name: Bergel
+    #Name: Berigel
+    Npc: Agit#gefg_cas04
+  - Id: 9
+    Map: gefg_cas05
+    Name: Mersetzdeitz
+    #Name: Melsedetsu
+    Npc: Agit#gefg_cas05
+  - Id: 10
+    Map: payg_cas01
+    Name: Bright Arbor
+    #Name: Mingting
+    Npc: Agit#payg_cas01
+  - Id: 11
+    Map: payg_cas02
+    Name: Scarlet Palace
+    #Name: Tiantan
+    Npc: Agit#payg_cas02
+  - Id: 12
+    Map: payg_cas03
+    Name: Holy Shadow
+    #Name: Fuying
+    Npc: Agit#payg_cas03
+  - Id: 13
+    Map: payg_cas04
+    Name: Sacred Altar
+    #Name: Honglou
+    Npc: Agit#payg_cas04
+  - Id: 14
+    Map: payg_cas05
+    Name: Bamboo Grove Hill
+    #Name: Zhulinxian
+    Npc: Agit#payg_cas05
+  - Id: 15
+    Map: prtg_cas01
+    Name: Kriemhild
+    #Name: Creamhilt
+    Npc: Agit#prtg_cas01
+  - Id: 16
+    Map: prtg_cas02
+    Name: Swanhild
+    #Name: Sbanhealt
+    Npc: Agit#prtg_cas02
+  - Id: 17
+    Map: prtg_cas03
+    Name: Fadhgridh
+    #Name: Lazrigees
+    Npc: Agit#prtg_cas03
+  - Id: 18
+    Map: prtg_cas04
+    Name: Skoegul
+    #Name: Squagul
+    Npc: Agit#prtg_cas04
+  - Id: 19
+    Map: prtg_cas05
+    Name: Gondul
+    #Name: Guindull
+    Npc: Agit#prtg_cas05
+
+# WOE NGuild castle
+  - Id: 20
+    Map: nguild_alde
+    Name: Earth
+    Npc: Agit_N01
+  - Id: 21
+    Map: nguild_gef
+    Name: Air
+    Npc: Agit_N02
+  - Id: 22
+    Map: nguild_pay
+    Name: Water
+    Npc: Agit_N03
+  - Id: 23
+    Map: nguild_prt
+    Name: Fire
+    Npc: Agit_N04
+
+# WOE SE castle
+  - Id: 24
+    Map: schg_cas01
+    Name: Himinn
+    Npc: Manager#schg_cas01
+  - Id: 25
+    Map: schg_cas02
+    Name: Andlangr
+    Npc: Manager#schg_cas02
+  - Id: 26
+    Map: schg_cas03
+    Name: Viblainn
+    Npc: Manager#schg_cas03
+  - Id: 27
+    Map: schg_cas04
+    Name: Hljod
+    Npc: Manager#schg_cas04
+  - Id: 28
+    Map: schg_cas05
+    Name: Skidbladnir
+    Npc: Manager#schg_cas05
+  - Id: 29
+    Map: arug_cas01
+    Name: Mardol
+    Npc: Manager#arug_cas01
+  - Id: 30
+    Map: arug_cas02
+    Name: Cyr
+    Npc: Manager#arug_cas02
+  - Id: 31
+    Map: arug_cas03
+    Name: Horn
+    Npc: Manager#arug_cas03
+  - Id: 32
+    Map: arug_cas04
+    Name: Gefn
+    Npc: Manager#arug_cas04
+  - Id: 33
+    Map: arug_cas05
+    Name: Bandis
+    Npc: Manager#arug_cas05
+
 Footer:
   Imports:
   - Path: db/pre-re/castle_db.yml

db/enchantgrade.yml

@@ -0,0 +1,58 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Enchantgrade Database
+###########################################################################
+#
+# Enchantgrade Settings
+#
+###########################################################################
+# - Type                                Item type.
+#   Levels:                             Enchantgrade settings per item level.
+#     - Level                           Item level.
+#       Grades:                         Enchantgrade settings per grade level.
+#         - Grade                       Enchantgrade level.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
+#           Bonus                       Enchantgrade bonus. (Default: 0)
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           Catalyst:                   Catalyst item to increase chance of success.
+#             Item                      The item that can be used.
+#             AmountPerStep             Amount of Item needed.
+#                                       Set to 0 to disable the catalyst.
+#             MaximumSteps              Maximum amount of times Item can be used.
+#             ChanceIncrease            Amount at which the chance increases for each Item used.
+#           Options:                    Success chance based on cost type.
+#             - Option                  Index of the client option.
+#               Item                    Required item.
+#               Amount                  Amount of required item. (Default: 1)
+#                                       Set to 0 to remove an option.
+#               Price                   Amount of zeny required. (Default: 0)
+#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
+#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
+###########################################################################
+
+Header:
+  Type: ENCHANTGRADE_DB
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/re/enchantgrade.yml
+    Mode: Renewal
+  - Path: db/import/enchantgrade.yml

db/import-tmpl/enchantgrade.yml

@@ -0,0 +1,52 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Enchantgrade Database
+###########################################################################
+#
+# Enchantgrade Settings
+#
+###########################################################################
+# - Type                                Item type.
+#   Levels:                             Enchantgrade settings per item level.
+#     - Level                           Item level.
+#       Grades:                         Enchantgrade settings per grade level.
+#         - Grade                       Enchantgrade level.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
+#           Bonus                       Enchantgrade bonus. (Default: 0)
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           Catalyst:                   Catalyst item to increase chance of success.
+#             Item                      The item that can be used.
+#             AmountPerStep             Amount of Item needed.
+#                                       Set to 0 to disable the catalyst.
+#             MaximumSteps              Maximum amount of times Item can be used.
+#             ChanceIncrease            Amount at which the chance increases for each Item used.
+#           Options:                    Success chance based on cost type.
+#             - Option                  Index of the client option.
+#               Item                    Required item.
+#               Amount                  Amount of required item. (Default: 1)
+#                                       Set to 0 to remove an option.
+#               Price                   Amount of zeny required. (Default: 0)
+#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
+#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
+###########################################################################
+
+Header:
+  Type: ENCHANTGRADE_DB
+  Version: 1

db/import-tmpl/job_stats.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 #Body:
 ###########################################################################

db/import-tmpl/mob_avail.yml

@@ -33,6 +33,7 @@
 #   HeadTop                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadMid                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadLow                 Item name of headgear (if Sprite is a player). (Default: 0)
+#   Robe                    Item name of robe (if Sprite is a player). (Default: 0)
 #   PetEquip                Item name of pet equipment (if Mob is a valid pet). (Default: 0)
 #   Options:                Set an option for an object. (Optional)
 #     <Option>: bool
@@ -68,6 +69,7 @@ Header:
 #    HeadTop: Sahkkat
 #    HeadMid: Sunglasses
 #    HeadLow: Cigar
+#    Robe: Archangel_Wing
 #    Options:
 #      Falcon: true
   # Valaris Worshiper

db/import-tmpl/mob_skill_db.txt

@@ -43,6 +43,7 @@
 //	afterskill		After mob casts the specified skill.
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
+//	mobnearbygt		When monsters in range become greater than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /

db/import-tmpl/mob_skill_db.yml

@@ -0,0 +1,861 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Monster Skill Database
+###########################################################################
+#
+# Monster Skill Settings
+#
+###########################################################################
+# - Mob                     Monster AegisName.
+#   Skills:                 List of Skills casted by the monster.
+#    - Index                Unique Index in the list to edit the skill on import.
+#      Name                 Skill AegisName.
+#      Level                Skill Level.
+#      State                State of the monster to cast the skill. (Default: ATTACK)
+#      CastRate             Rate to cast the skill (from 1-10000). (Default: 10000)
+#      CastTime             Time in millisecond to cast the skill. (Default: 0)
+#      CastDelay            Delay in millisecond to recast the skill. (Default: 5000)
+#      CastCancel           Whether the skill is cancelable or not. (Default: true)
+#      Target               Target of the skill. (Default: TARGET)
+#      Condition            Type of condition. (Default: ALWAYS)
+#      ConditionValue1      Value given at certain conditions.
+#      ConditionValue2      Value given at certain conditions.
+#      Ai                   Change the monster mode using the given Aegis monster type AI. (Default: 00)
+#      Summon:              List of monsters to summon, required for certain skills. (Default: null) 
+#        - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+#          Mob              Monster AegisName.
+#          Clear            True to remove the given monster at this index. (Optional)
+#      Emotion              Emotion displayed on the monster after the cast. (Default: ET_NONE)
+#      Chat                 Chat ID to display the associated sentence defined in mob_chat_db.yml. (Default: 0)
+#      Clear                True to remove the skill. (Optional)
+###########################################################################
+
+Header:
+  Type: MOB_SKILL_DB
+  Version: 1
+
+# Body:
+# rAthena Dev Team
+  # - Mob: VALARIS
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: WALK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 2
+        # Name: KN_BRANDISHSPEAR
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 3
+        # Name: MO_BODYRELOCATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 200
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_ARMORBRAKE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 6
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: NPC_DARKBREATH
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 8
+        # Name: NPC_DARKSTRIKE
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: NPC_GUIDEDATTACK
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 20000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+        # Emotion: ET_FRET
+      # - Index: 11
+        # Name: NPC_SUMMONSLAVE
+        # Level: 6
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 700
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: MC_CAMERI
+      # - Index: 12
+        # Name: NPC_SUMMONSLAVE
+        # Level: 6
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 700
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: MC_CAMERI
+      # - Index: 13
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 14
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 15
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: SKILLUSED
+        # ConditionValue1: MG_FIREWALL
+        # Emotion: ET_KIK
+  # - Mob: VALARIS_WORSHIPPER
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: NPC_CURSEATTACK
+        # Level: 3
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 2
+        # Name: NPC_DARKNESSATTACK
+        # Level: 2
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_FRET
+      # - Index: 3
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: WALK
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_DELIGHT
+      # - Index: 4
+        # Name: NPC_HALLUCINATION
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 5
+        # Name: NPC_HALLUCINATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 50
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 6
+        # Name: SA_DISPELL
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 0
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+  # - Mob: MC_CAMERI
+    # Skills:
+      # - Index: 0
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 1
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: WALK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 2
+        # Name: KN_BRANDISHSPEAR
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 3
+        # Name: MO_BODYRELOCATION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 200
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_ARMORBRAKE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_DARKBREATH
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 800
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 6
+        # Name: NPC_DARKSTRIKE
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 1000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: NPC_GUIDEDATTACK
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 20000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 8
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+        # Emotion: ET_FRET
+      # - Index: 9
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 10
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 11
+        # Name: WZ_VERMILION
+        # Level: 10
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 500
+        # CastDelay: 2000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: SKILLUSED
+        # ConditionValue1: MG_FIREWALL
+        # Emotion: ET_KIK
+  # - Mob: POKI
+    # Skills:
+      # - Index: 0
+        # Name: AC_DOUBLE
+        # Level: 10
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 1
+        # Name: AC_SHOWER
+        # Level: 8
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ATTACKPCGT
+        # ConditionValue1: 2
+      # - Index: 2
+        # Name: BS_MAXIMIZE
+        # Level: 5
+        # State: CHASE
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 3
+        # Name: BS_MAXIMIZE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 4
+        # Name: NPC_AGIUP
+        # Level: 5
+        # State: CHASE
+        # CastRate: 2500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 5
+        # Name: NPC_POWERUP
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 30000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 6
+        # Name: SN_SHARPSHOOTING
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 1000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 7
+        # Name: HT_SKIDTRAP
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_KIK
+      # - Index: 8
+        # Name: HT_FLASHER
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: HT_FREEZINGTRAP
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: AC_CHARGEARROW
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 11
+        # Name: HT_FLASHER
+        # Level: 5
+        # State: IDLE
+        # CastRate: 50
+        # CastTime: 0
+        # CastDelay: 300000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 12
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 120000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 1
+        # Summon:
+          # - Index: 0
+            # Mob: G_WHIKEBAIN
+          # - Index: 1
+            # Mob: G_ARMAIA
+          # - Index: 2
+            # Mob: G_EREND
+          # - Index: 3
+            # Mob: G_KAVAC
+          # - Index: 4
+            # Mob: G_RAWREL
+        # Emotion: ET_SURPRISE
+      # - Index: 13
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 10000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 14
+        # Name: NPC_CALLSLAVE
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 10000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 15
+        # Name: NPC_CHANGEWATER
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 600000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 16
+        # Name: NPC_CHANGETELEKINESIS
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 500
+        # CastTime: 2000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 10
+        # Emotion: ET_ANGER
+      # - Index: 17
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+  # - Mob: MOROCC_4
+    # Skills:
+      # - Index: 0
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 3000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 2
+        # Summon:
+          # - Index: 0
+            # Mob: LUNATIC
+      # - Index: 1
+        # Name: NPC_SUMMONSLAVE
+        # Level: 5
+        # State: IDLE
+        # CastRate: 5000
+        # CastTime: 2000
+        # CastDelay: 40000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: ALWAYS
+        # ConditionValue1: 2
+        # Summon:
+          # - Index: 0
+            # Mob: MOROCC_3
+# Custom Fire Poring. Warning, Colides with META_DENIRO
+  # - Mob: FIRE_PORING
+    # Skills:
+      # - Index: 0
+        # Name: AL_HEAL
+        # Level: 10
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 2000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_SWEAT
+      # - Index: 1
+        # Name: AL_HEAL
+        # Level: 10
+        # State: WALK
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 2000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Emotion: ET_SWEAT
+      # - Index: 2
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 5000
+        # CastDelay: 60000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: MYHPLTMAXRATE
+        # ConditionValue1: 30
+      # - Index: 3
+        # Name: AL_TELEPORT
+        # Level: 1
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 0
+        # CastDelay: 0
+        # CastCancel: true
+        # Target: SELF
+        # Condition: RUDEATTACKED
+      # - Index: 4
+        # Name: NPC_DARKBLESSING
+        # Level: 1
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 2000
+        # CastDelay: 5000
+        # CastCancel: false
+        # Target: TARGET
+        # Condition: ALWAYS
+        # Emotion: ET_SMILE
+      # - Index: 5
+        # Name: NPC_SUMMONSLAVE
+        # Level: 16
+        # State: ATTACK
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: G_DOKEBI
+          # - Index: 1
+            # Mob: G_BAPHOMET_
+          # - Index: 2
+            # Mob: G_DEVIRUCHI
+        # Emotion: ET_SMILE
+      # - Index: 6
+        # Name: NPC_SUMMONSLAVE
+        # Level: 16
+        # State: IDLE
+        # CastRate: 10000
+        # CastTime: 2000
+        # CastDelay: 10000
+        # CastCancel: false
+        # Target: SELF
+        # Condition: SLAVELE
+        # ConditionValue1: 3
+        # Summon:
+          # - Index: 0
+            # Mob: G_DOKEBI
+          # - Index: 1
+            # Mob: G_BAPHOMET_
+          # - Index: 2
+            # Mob: G_DEVIRUCHI
+        # Emotion: ET_SMILE
+      # - Index: 7
+        # Name: RG_INTIMIDATE
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 1000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 8
+        # Name: RG_STRIPARMOR
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 9
+        # Name: RG_STRIPHELM
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 10
+        # Name: RG_STRIPSHIELD
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+      # - Index: 11
+        # Name: RG_STRIPWEAPON
+        # Level: 5
+        # State: ATTACK
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 3000
+        # CastCancel: true
+        # Target: TARGET
+        # Condition: ALWAYS
+# iRO Halloween Event 2009
+  # - Mob: HALLOWEEN_WHISPER
+    # Skills:
+      # - Index: 0
+        # Name: AS_CLOAKING
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 200
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 1
+        # Name: AS_CLOAKING
+        # Level: 1
+        # State: CHASE
+        # CastRate: 2000
+        # CastTime: 200
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 2
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: IDLE
+        # CastRate: 2000
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+      # - Index: 3
+        # Name: NPC_EMOTION
+        # Level: 1
+        # State: CHASE
+        # CastRate: 200
+        # CastTime: 0
+        # CastDelay: 5000
+        # CastCancel: true
+        # Target: SELF
+        # Condition: ALWAYS
+        # Ai: 01
+        # Emotion: ET_PROFUSELY_SWEAT

db/import-tmpl/quest_db.yml

@@ -22,37 +22,29 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################
 
 Header:
   Type: QUEST_DB
-  Version: 2
+  Version: 3

db/job_stats.yml

@@ -23,11 +23,11 @@
 #
 ###########################################################################
 # - Jobs:                    List of jobs associated to group.
-#     Job                    Job ID.
+#     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Footer:
   Imports:

db/map_index.txt

@@ -1143,6 +1143,25 @@ que_thr
 tur_d04ia
 tur_d04ib
 wolfvill
+icecastle
+icas_in
+jor_tail
+jor_back1
+jor_back2
+jor_back3
+jor_nest
+jor_dun01
+jor_dun02
+jor_dun03
+jor_ab01
+jor_ab02
+jor_que
+air_if
+1@iwp
+1@jorchs
+1@jorlab
+1@whl
+
 
 //======================================================================================
 // - Other/Extra maps -

db/mob_skill_db.yml

@@ -0,0 +1,59 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Monster Skill Database
+###########################################################################
+#
+# Monster Skill Settings
+#
+###########################################################################
+# - Mob                     Monster AegisName.
+#   Skills:                 List of Skills casted by the monster.
+#    - Index                Unique Index in the list to edit the skill on import.
+#      Name                 Skill AegisName.
+#      Level                Skill Level.
+#      State                State of the monster to cast the skill. (Default: ATTACK)
+#      CastRate             Rate to cast the skill (from 1-10000). (Default: 10000)
+#      CastTime             Time in millisecond to cast the skill. (Default: 0)
+#      CastDelay            Delay in millisecond to recast the skill. (Default: 5000)
+#      CastCancel           Whether the skill is cancelable or not. (Default: true)
+#      Target               Target of the skill. (Default: TARGET)
+#      Condition            Type of condition. (Default: ALWAYS)
+#      ConditionValue1      Value given at certain conditions.
+#      ConditionValue2      Value given at certain conditions.
+#      Ai                   Change the monster mode using the given Aegis monster type AI. (Default: 00)
+#      Summon:              List of monsters to summon, required for certain skills. (Default: null) 
+#        - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+#          Mob              Monster AegisName.
+#          Clear            True to remove the given monster at this index. (Optional)
+#      Emotion              Emotion displayed on the monster after the cast. (Default: ET_NONE)
+#      Chat                 Chat ID to display the associated sentence defined in mob_chat_db.yml. (Default: 0)
+#      Clear                True to remove the skill. (Optional)
+###########################################################################
+
+Header:
+  Type: MOB_SKILL_DB
+  Version: 1
+
+Footer:
+  Imports:
+  - Path: db/pre-re/mob_skill_db.yml
+    Mode: Prerenewal
+  - Path: db/re/mob_skill_db.yml
+    Mode: Renewal
+  - Path: db/import/mob_skill_db.yml

db/pre-re/castle_db.yml

@@ -31,208 +31,3 @@
 Header:
   Type: CASTLE_DB
   Version: 1
-
-Body:
-# WOE FE castle
-  - Id: 0
-    Map: aldeg_cas01
-    Name: Neuschwanstein
-    #Name: Noisyubantian
-    Npc: Agit#aldeg_cas01
-  - Id: 1
-    Map: aldeg_cas02
-    Name: Hohenschwangau
-    #Name: Hohensyubangawoo
-    Npc: Agit#aldeg_cas02
-  - Id: 2
-    Map: aldeg_cas03
-    Name: Nuernberg
-    #Name: Nyirenverk
-    Npc: Agit#aldeg_cas03
-  - Id: 3
-    Map: aldeg_cas04
-    Name: Wuerzburg
-    #Name: Byirtsburi
-    Npc: Agit#aldeg_cas04
-  - Id: 4
-    Map: aldeg_cas05
-    Name: Rothenburg
-    #Name: Rotenburk
-    Npc: Agit#aldeg_cas05
-  - Id: 5
-    Map: gefg_cas01
-    Name: Repherion
-    #Name: Reprion
-    Npc: Agit#gefg_cas01
-  - Id: 6
-    Map: gefg_cas02
-    Name: Eeyolbriggar
-    #Name: Yolbriger
-    Npc: Agit#gefg_cas02
-  - Id: 7
-    Map: gefg_cas03
-    Name: Yesnelph
-    #Name: Isinlife
-    Npc: Agit#gefg_cas03
-  - Id: 8
-    Map: gefg_cas04
-    Name: Bergel
-    #Name: Berigel
-    Npc: Agit#gefg_cas04
-  - Id: 9
-    Map: gefg_cas05
-    Name: Mersetzdeitz
-    #Name: Melsedetsu
-    Npc: Agit#gefg_cas05
-  - Id: 10
-    Map: payg_cas01
-    Name: Bright Arbor
-    #Name: Mingting
-    Npc: Agit#payg_cas01
-  - Id: 11
-    Map: payg_cas02
-    Name: Scarlet Palace
-    #Name: Tiantan
-    Npc: Agit#payg_cas02
-  - Id: 12
-    Map: payg_cas03
-    Name: Holy Shadow
-    #Name: Fuying
-    Npc: Agit#payg_cas03
-  - Id: 13
-    Map: payg_cas04
-    Name: Sacred Altar
-    #Name: Honglou
-    Npc: Agit#payg_cas04
-  - Id: 14
-    Map: payg_cas05
-    Name: Bamboo Grove Hill
-    #Name: Zhulinxian
-    Npc: Agit#payg_cas05
-  - Id: 15
-    Map: prtg_cas01
-    Name: Kriemhild
-    #Name: Creamhilt
-    Npc: Agit#prtg_cas01
-  - Id: 16
-    Map: prtg_cas02
-    Name: Swanhild
-    #Name: Sbanhealt
-    Npc: Agit#prtg_cas02
-  - Id: 17
-    Map: prtg_cas03
-    Name: Fadhgridh
-    #Name: Lazrigees
-    Npc: Agit#prtg_cas03
-  - Id: 18
-    Map: prtg_cas04
-    Name: Skoegul
-    #Name: Squagul
-    Npc: Agit#prtg_cas04
-  - Id: 19
-    Map: prtg_cas05
-    Name: Gondul
-    #Name: Guindull
-    Npc: Agit#prtg_cas05
-
-# WOE NGuild castle
-  - Id: 20
-    Map: nguild_alde
-    Name: Earth
-    Npc: Agit_N01
-  - Id: 21
-    Map: nguild_gef
-    Name: Air
-    Npc: Agit_N02
-  - Id: 22
-    Map: nguild_pay
-    Name: Water
-    Npc: Agit_N03
-  - Id: 23
-    Map: nguild_prt
-    Name: Fire
-    Npc: Agit_N04
-
-# WOE SE castle
-  - Id: 24
-    Map: schg_cas01
-    Name: Himinn
-    Npc: Manager#schg_cas01
-  - Id: 25
-    Map: schg_cas02
-    Name: Andlangr
-    Npc: Manager#schg_cas02
-  - Id: 26
-    Map: schg_cas03
-    Name: Viblainn
-    Npc: Manager#schg_cas03
-  - Id: 27
-    Map: schg_cas04
-    Name: Hljod
-    Npc: Manager#schg_cas04
-  - Id: 28
-    Map: schg_cas05
-    Name: Skidbladnir
-    Npc: Manager#schg_cas05
-  - Id: 29
-    Map: arug_cas01
-    Name: Mardol
-    Npc: Manager#arug_cas01
-  - Id: 30
-    Map: arug_cas02
-    Name: Cyr
-    Npc: Manager#arug_cas02
-  - Id: 31
-    Map: arug_cas03
-    Name: Horn
-    Npc: Manager#arug_cas03
-  - Id: 32
-    Map: arug_cas04
-    Name: Gefn
-    Npc: Manager#arug_cas04
-  - Id: 33
-    Map: arug_cas05
-    Name: Bandis
-    Npc: Manager#arug_cas05
-
-# WOE TE castle
-  - Id: 34
-    Map: te_aldecas1
-    Name: Kafragarten 1
-    Npc: Manager_TE#Glaris
-  - Id: 35
-    Map: te_aldecas2
-    Name: Kafragarten 2
-    Npc: Manager_TE#Defolty
-  - Id: 36
-    Map: te_aldecas3
-    Name: Kafragarten 3
-    Npc: Manager_TE#Sorin
-  - Id: 37
-    Map: te_aldecas4
-    Name: Kafragarten 4
-    Npc: Manager_TE#Bennit
-  - Id: 38
-    Map: te_aldecas5
-    Name: Kafragarten 5
-    Npc: Manager_TE#W
-  - Id: 39
-    Map: te_prtcas01
-    Name: Gloria 1
-    Npc: Manager_TE#Gaebolg
-  - Id: 40
-    Map: te_prtcas02
-    Name: Gloria 2
-    Npc: Manager_TE#Richard
-  - Id: 41
-    Map: te_prtcas03
-    Name: Gloria 3
-    Npc: Manager_TE#Wigner
-  - Id: 42
-    Map: te_prtcas04
-    Name: Gloria 4
-    Npc: Manager_TE#Heine
-  - Id: 43
-    Map: te_prtcas05
-    Name: Gloria 5
-    Npc: Manager_TE#Nerious

db/pre-re/item_db_equip.yml

@@ -844,7 +844,6 @@ Body:
     Refineable: true
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
       bonus2 bAddRace,RC_DemiHuman,5;
       bonus2 bAddRace,RC_Player_Human,5;
   - Id: 1131
@@ -10432,8 +10431,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -10485,8 +10485,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1627
     AegisName: Staffy
     Name: Staffy
@@ -10781,9 +10782,10 @@ Body:
       bonus bInt,3;
       bonus bDex,3;
       bonus bMatkRate,20;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,getrefine();
-      bonus bDelayRate,-(getrefine()*3/2);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,.@r;
+      bonus bDelayRate,-(.@r*3/2);
   - Id: 1637
     AegisName: Eraser
     Name: Eraser
@@ -10908,12 +10910,14 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
-      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((getrefine()>5) ? 5 : 0);
-      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((getrefine()>5) ? 5 : 0);
+      .@r = getrefine();
+      bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25 + ((.@r>5) ? 5 : 0);
+      bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25 + ((.@r>5) ? 5 : 0);
       bonus bUnbreakableWeapon;
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus bCastrate,-5;
          bonus bDelayRate,-5;
          bonus bMatkRate,5;
@@ -10948,17 +10952,19 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
+      bonus bMatkRate,15;
       bonus bHealPower,14;
       bonus bDelayRate,-10;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
+      .@r = getrefine();
+      if (.@r>5) {
          bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5;
          bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5;
-         bonus bHealPower,5+(getrefine()-5)*2;
+         bonus bHealPower,5+(.@r-5)*2;
       }
-      if (getrefine()>8)
+      if (.@r>8)
          bonus5 bAutoSpellOnSkill,"AL_HEAL","AL_HEAL",10,100,1;
-      if (getrefine()>9) {
+      if (.@r>9) {
          bonus bHealPower,10;
       }
   - Id: 1642
@@ -11016,10 +11022,11 @@ Body:
     EquipLevelMin: 70
     Refineable: true
     Script: |
-      bonus bMatk,15;
+      bonus bMatkRate,15;
       bonus bInt,4;
-      if (getrefine()>5) {
-         bonus bInt,getrefine()-5;
+      .@r = getrefine();
+      if (.@r>5) {
+         bonus bInt,.@r-5;
          bonus bMaxHP,-200;
          bonus bMaxSP,-100;
       }
@@ -11057,8 +11064,9 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus2 bIgnoreMdefClassRate,Class_Normal,10+getrefine();
-      bonus2 bIgnoreMdefClassRate,Class_Boss,10+getrefine();
+      .@r = getrefine();
+      bonus2 bIgnoreMdefClassRate,Class_Normal,10+.@r;
+      bonus2 bIgnoreMdefClassRate,Class_Boss,10+.@r;
   - Id: 1645
     AegisName: Lich_Bone_Wand_M
     Name: Lich's Bone Wand
@@ -11096,8 +11104,9 @@ Body:
       bonus bDex,1;
       bonus bAtkEle,Ele_Undead;
       bonus bMatkRate,20;
-      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine();
-      if (getrefine()>=9) {
+      .@r = getrefine();
+      bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+.@r;
+      if (.@r>=9) {
          bonus bMatkRate,3;
          bonus bMaxSP,300;
       }
@@ -11125,9 +11134,10 @@ Body:
     Script: |
       bonus bInt,4;
       bonus bMatkRate,15;
-      bonus bMdef,getrefine();
-      bonus2 bSkillAtk,"WZ_STORMGUST",getrefine();
-      if (getrefine()>9)
+      .@r = getrefine();
+      bonus bMdef,.@r;
+      bonus2 bSkillAtk,"WZ_STORMGUST",.@r;
+      if (.@r>9)
          bonus2 bCastrate,"WZ_STORMGUST",-8;
   - Id: 1647
     AegisName: Croce_Staff
@@ -14223,11 +14233,12 @@ Body:
     EquipLevelMin: 80
     Refineable: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2001
     AegisName: Divine_Cross
@@ -14281,19 +14292,20 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,getrefine();
+      .@r = getrefine();
+      bonus bMatkRate,15 + .@r;
       bonus2 bMagicAddRace,RC_DemiHuman,15;
       bonus2 bMagicAddRace,RC_Player_Human,15;
       bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,25;
       bonus2 bIgnoreMdefRaceRate,RC_Player_Human,25;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5) {
-         bonus2 bMagicAddRace,RC_DemiHuman,(getrefine()-5)*2;
-         bonus2 bMagicAddRace,RC_Player_Human,(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(getrefine()-5)*2;
-         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(getrefine()-5)*2;
+      if (.@r>5) {
+         bonus2 bMagicAddRace,RC_DemiHuman,(.@r-5)*2;
+         bonus2 bMagicAddRace,RC_Player_Human,(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(.@r-5)*2;
+         bonus2 bIgnoreMdefRaceRate,RC_Player_Human,5+(.@r-5)*2;
       }
-      if (getrefine()>8) {
+      if (.@r>8) {
          bonus5 bAutoSpellOnSkill,"WZ_STORMGUST","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_METEOR","MG_SAFETYWALL",10,200,1;
          bonus5 bAutoSpellOnSkill,"WZ_VERMILION","MG_SAFETYWALL",10,200,1;
@@ -14326,11 +14338,12 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bMatkRate,25+getrefine()/2;
+      .@r = getrefine();
+      bonus bMatkRate,25+(.@r/2);
       bonus bInt,3;
       bonus bAgi,10;
-      bonus bUseSPrate,(getrefine()*2);
-      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20);
+      bonus bUseSPrate,(.@r*2);
+      bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(.@r*20);
       bonus2 bCastrate,"HW_MAGICPOWER",-50;
   - Id: 2004
     AegisName: Kronos
@@ -14353,9 +14366,10 @@ Body:
     EquipLevelMin: 50
     Refineable: true
     Script: |
+      .@r = getrefine();
       bonus bMatkRate,20;
-      bonus bInt,3+(getrefine()/2);
-      bonus bMaxHP,300+(50*getrefine()/2);
+      bonus bInt,3+(.@r/2);
+      bonus bMaxHP,300+(50*.@r/2);
       autobonus "{ bonus bMatkRate,12; bonus buseSPRate,20; }",1,5000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }";
   - Id: 2005
     AegisName: Dea_Staff
@@ -14384,29 +14398,6 @@ Body:
       bonus bInt,6;
       bonus bVit,2;
       autobonus3 "{ }",20,1000,"AL_HEAL","{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }";
-  - Id: 2006
-    AegisName: G_Staff_Of_Light
-    Name: Staff Of Light
-    Type: Weapon
-    SubType: 2hStaff
-    Buy: 20
-    Weight: 1900
-    Attack: 80
-    Range: 1
-    Jobs:
-      Mage: true
-      Sage: true
-      SoulLinker: true
-      Wizard: true
-    Locations:
-      Both_Hand: true
-    WeaponLevel: 4
-    EquipLevelMin: 60
-    Refineable: true
-    Script: |
-      /* bonus bMatk,150;
-      */ bonus bAtkEle,Ele_Holy;
-      bonus bInt,6;
   - Id: 2101
     AegisName: Guard
     Name: Guard
@@ -24702,7 +24693,6 @@ Body:
     Script: |
       bonus bMaxSP,100;
       skill "TF_DOUBLE",3;
-      bonus bDoubleRate,15;
       skill "TF_STEAL",1;
       skill "TF_HIDING",1;
       skill "TF_POISON",1;
@@ -28300,8 +28290,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,10;
       skill "AL_RUWACH",1;
-    UnEquipScript: |
-      sc_end SC_RUWACH;
   - Id: 5213
     AegisName: Black_Bunny_Band
     Name: Sheila Hairnet
@@ -29769,7 +29757,6 @@ Body:
       bonus bMaxHP,50;
       bonus bMaxSP,50;
       skill "TF_DOUBLE",2;
-      bonus bDoubleRate,10;
       bonus2 bSubRace,RC_DemiHuman,3;
       bonus2 bSubRace,RC_Player_Human,3;
   - Id: 5284
@@ -31603,8 +31590,6 @@ Body:
     Script: |
       bonus bVit,1;
       skill "AL_ANGELUS",1;
-    UnEquipScript: |
-      sc_end SC_ANGELUS;
   - Id: 5383
     AegisName: Hunting_Cap
     Name: Hunter's Cap
@@ -31732,7 +31717,6 @@ Body:
       NoGuildStorage: true
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
   - Id: 5389
     AegisName: Angel_Spirit
     Name: Angel Spirit
@@ -34175,9 +34159,7 @@ Body:
     View: 525
     Script: |
       bonus bDex,2;
-      .@bonus = max(getskilllv("TF_DOUBLE"), 5);
-      skill "TF_DOUBLE",.@bonus;
-      bonus bDoubleRate,.@bonus * 5;
+      skill "TF_DOUBLE",5;
   - Id: 5532
     AegisName: Pirate_Dagger_J
     Name: Pirate Dagger
@@ -39967,7 +39949,6 @@ Body:
     WeaponLevel: 4
     Script: |
       skill "TF_DOUBLE",5;
-      bonus bDoubleRate,25;
       bonus2 bAddRace,RC_DemiHuman,40;
       bonus2 bAddRace,RC_Player_Human,40;
   - Id: 13408
@@ -40354,14 +40335,16 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      bonus bInt,getrefine()-5;
+      .@r = getrefine();
+      bonus bInt,6;
+      bonus bInt,.@r-5;
       bonus bMatkRate,10;
       bonus bUnbreakableWeapon;
-      if (getrefine()>5)
+      if (.@r>5)
          bonus bUseSPrate,-10;
-      if (getrefine()>8)
+      if (.@r>8)
          bonus4 bAutoSpellOnSkill,"PA_PRESSURE","PR_LEXAETERNA",1,1000;
-      if (getrefine()>9)
+      if (.@r>9)
          bonus bInt,5;
   - Id: 13419
     AegisName: Holy_Saber

db/pre-re/item_db_etc.yml

@@ -4026,7 +4026,6 @@ Body:
       BuyingStore: true
     Script: |
       skill "TF_DOUBLE",1;
-      bonus bDoubleRate,5;
   - Id: 4118
     AegisName: Petit_Card
     Name: Earth Petite Card
@@ -6451,8 +6450,6 @@ Body:
       BuyingStore: true
     Script: |
       bonus3 bAutoSpellWhenHit,"CR_AUTOGUARD",3+7*(getskilllv("CR_AUTOGUARD") == 10),30;
-    UnEquipScript: |
-      sc_end SC_AUTOGUARD;
   - Id: 4300
     AegisName: Chimera_Card
     Name: Chimera Card

db/pre-re/job_basepoints.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Body:
   - Jobs:

db/pre-re/job_exp.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Body:
   - Jobs:

db/pre-re/job_stats.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Body:
   - Jobs:
@@ -109,7 +109,7 @@ Body:
       Swordman: true
     MaxWeight: 28000
     HpFactor: 70
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -162,7 +162,7 @@ Body:
       Mage: true
     MaxWeight: 22000
     HpFactor: 30
-    SpFactor: 600
+    SpIncrease: 600
     BaseASPD:
       Fist: 500
       Dagger: 600
@@ -209,7 +209,7 @@ Body:
       Archer: true
     MaxWeight: 26000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -255,7 +255,7 @@ Body:
       Acolyte: true
     MaxWeight: 24000
     HpFactor: 40
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -303,7 +303,7 @@ Body:
       Merchant: true
     MaxWeight: 28000
     HpFactor: 40
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -353,7 +353,7 @@ Body:
       Thief: true
     MaxWeight: 24000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -402,7 +402,7 @@ Body:
       Knight2: true
     MaxWeight: 28000
     HpFactor: 150
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -479,7 +479,7 @@ Body:
       Priest: true
     MaxWeight: 26000
     HpFactor: 75
-    SpFactor: 800
+    SpIncrease: 800
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -552,7 +552,7 @@ Body:
       Wizard: true
     MaxWeight: 24000
     HpFactor: 55
-    SpFactor: 900
+    SpIncrease: 900
     BaseASPD:
       Fist: 500
       Dagger: 575
@@ -623,7 +623,7 @@ Body:
       Blacksmith: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -697,7 +697,7 @@ Body:
       Hunter: true
     MaxWeight: 27000
     HpFactor: 85
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -767,7 +767,7 @@ Body:
       Assassin: true
     MaxWeight: 24000
     HpFactor: 110
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -840,8 +840,8 @@ Body:
       Crusader2: true
     MaxWeight: 28000
     HpFactor: 110
-    HpMultiplicator: 700
-    SpFactor: 470
+    HpIncrease: 700
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -918,8 +918,8 @@ Body:
       Monk: true
     MaxWeight: 26000
     HpFactor: 90
-    HpMultiplicator: 650
-    SpFactor: 470
+    HpIncrease: 650
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Mace: 575
@@ -992,7 +992,7 @@ Body:
       Sage: true
     MaxWeight: 24000
     HpFactor: 75
-    SpFactor: 700
+    SpIncrease: 700
     BaseASPD:
       Fist: 450
       Dagger: 525
@@ -1064,7 +1064,7 @@ Body:
       Rogue: true
     MaxWeight: 24000
     HpFactor: 85
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -1135,7 +1135,7 @@ Body:
       Alchemist: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -1209,8 +1209,8 @@ Body:
       Bard: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -1281,8 +1281,8 @@ Body:
       Dancer: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -1425,8 +1425,8 @@ Body:
       Gunslinger: true
     MaxWeight: 28000
     HpFactor: 89
-    HpMultiplicator: 0
-    SpFactor: 469
+    HpIncrease: 0
+    SpIncrease: 469
     BaseASPD:
       Fist: 500
       Revolver: 700
@@ -1487,8 +1487,8 @@ Body:
       Ninja: true
     MaxWeight: 26000
     HpFactor: 80
-    HpMultiplicator: 0
-    SpFactor: 540
+    HpIncrease: 0
+    SpIncrease: 540
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -1572,7 +1572,7 @@ Body:
       Swordman_High: true
     MaxWeight: 28000
     HpFactor: 70
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -1625,7 +1625,7 @@ Body:
       Mage_High: true
     MaxWeight: 22000
     HpFactor: 30
-    SpFactor: 600
+    SpIncrease: 600
     BaseASPD:
       Fist: 500
       Dagger: 600
@@ -1672,7 +1672,7 @@ Body:
       Archer_High: true
     MaxWeight: 26000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -1718,7 +1718,7 @@ Body:
       Acolyte_High: true
     MaxWeight: 24000
     HpFactor: 40
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -1766,7 +1766,7 @@ Body:
       Merchant_High: true
     MaxWeight: 28000
     HpFactor: 40
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -1816,7 +1816,7 @@ Body:
       Thief_High: true
     MaxWeight: 24000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -1865,7 +1865,7 @@ Body:
       Lord_Knight2: true
     MaxWeight: 28000
     HpFactor: 150
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -1972,7 +1972,7 @@ Body:
       High_Priest: true
     MaxWeight: 26000
     HpFactor: 75
-    SpFactor: 800
+    SpIncrease: 800
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -2075,7 +2075,7 @@ Body:
       High_Wizard: true
     MaxWeight: 24000
     HpFactor: 55
-    SpFactor: 900
+    SpIncrease: 900
     BaseASPD:
       Fist: 500
       Dagger: 575
@@ -2176,7 +2176,7 @@ Body:
       Whitesmith: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -2280,7 +2280,7 @@ Body:
       Sniper: true
     MaxWeight: 27000
     HpFactor: 85
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -2380,7 +2380,7 @@ Body:
       Assassin_Cross: true
     MaxWeight: 24000
     HpFactor: 110
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -2483,8 +2483,8 @@ Body:
       Paladin2: true
     MaxWeight: 28000
     HpFactor: 110
-    HpMultiplicator: 700
-    SpFactor: 470
+    HpIncrease: 700
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -2591,8 +2591,8 @@ Body:
       Champion: true
     MaxWeight: 26000
     HpFactor: 90
-    HpMultiplicator: 650
-    SpFactor: 470
+    HpIncrease: 650
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Mace: 575
@@ -2695,7 +2695,7 @@ Body:
       Professor: true
     MaxWeight: 24000
     HpFactor: 75
-    SpFactor: 700
+    SpIncrease: 700
     BaseASPD:
       Fist: 450
       Dagger: 525
@@ -2797,7 +2797,7 @@ Body:
       Stalker: true
     MaxWeight: 24000
     HpFactor: 85
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -2898,7 +2898,7 @@ Body:
       Creator: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -3002,8 +3002,8 @@ Body:
       Clown: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -3104,8 +3104,8 @@ Body:
       Gypsy: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -3217,7 +3217,7 @@ Body:
       Baby_Swordman: true
     MaxWeight: 28000
     HpFactor: 70
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -3270,7 +3270,7 @@ Body:
       Baby_Mage: true
     MaxWeight: 22000
     HpFactor: 30
-    SpFactor: 600
+    SpIncrease: 600
     BaseASPD:
       Fist: 500
       Dagger: 600
@@ -3317,7 +3317,7 @@ Body:
       Baby_Archer: true
     MaxWeight: 26000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -3363,7 +3363,7 @@ Body:
       Baby_Acolyte: true
     MaxWeight: 24000
     HpFactor: 40
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -3411,7 +3411,7 @@ Body:
       Baby_Merchant: true
     MaxWeight: 28000
     HpFactor: 40
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -3461,7 +3461,7 @@ Body:
       Baby_Thief: true
     MaxWeight: 24000
     HpFactor: 50
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -3510,7 +3510,7 @@ Body:
       Baby_Knight2: true
     MaxWeight: 28000
     HpFactor: 150
-    SpFactor: 300
+    SpIncrease: 300
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -3587,7 +3587,7 @@ Body:
       Baby_Priest: true
     MaxWeight: 26000
     HpFactor: 75
-    SpFactor: 800
+    SpIncrease: 800
     BaseASPD:
       Fist: 400
       Mace: 600
@@ -3660,7 +3660,7 @@ Body:
       Baby_Wizard: true
     MaxWeight: 24000
     HpFactor: 55
-    SpFactor: 900
+    SpIncrease: 900
     BaseASPD:
       Fist: 500
       Dagger: 575
@@ -3731,7 +3731,7 @@ Body:
       Baby_Blacksmith: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -3805,7 +3805,7 @@ Body:
       Baby_Hunter: true
     MaxWeight: 27000
     HpFactor: 85
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 600
@@ -3875,7 +3875,7 @@ Body:
       Baby_Assassin: true
     MaxWeight: 24000
     HpFactor: 110
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -3948,8 +3948,8 @@ Body:
       Baby_Crusader2: true
     MaxWeight: 28000
     HpFactor: 110
-    HpMultiplicator: 700
-    SpFactor: 470
+    HpIncrease: 700
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -4026,8 +4026,8 @@ Body:
       Baby_Monk: true
     MaxWeight: 26000
     HpFactor: 90
-    HpMultiplicator: 650
-    SpFactor: 470
+    HpIncrease: 650
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Mace: 575
@@ -4100,7 +4100,7 @@ Body:
       Baby_Sage: true
     MaxWeight: 24000
     HpFactor: 75
-    SpFactor: 700
+    SpIncrease: 700
     BaseASPD:
       Fist: 450
       Dagger: 525
@@ -4172,7 +4172,7 @@ Body:
       Baby_Rogue: true
     MaxWeight: 24000
     HpFactor: 85
-    SpFactor: 500
+    SpIncrease: 500
     BaseASPD:
       Fist: 400
       Dagger: 500
@@ -4243,7 +4243,7 @@ Body:
       Baby_Alchemist: true
     MaxWeight: 30000
     HpFactor: 90
-    SpFactor: 400
+    SpIncrease: 400
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -4317,8 +4317,8 @@ Body:
       Baby_Bard: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -4389,8 +4389,8 @@ Body:
       Baby_Dancer: true
     MaxWeight: 27000
     HpFactor: 75
-    HpMultiplicator: 300
-    SpFactor: 600
+    HpIncrease: 300
+    SpIncrease: 600
     BaseASPD:
       Fist: 400
       Dagger: 550
@@ -4533,7 +4533,7 @@ Body:
       Taekwon: true
     MaxWeight: 28000
     HpFactor: 70
-    SpFactor: 200
+    SpIncrease: 200
     BaseASPD:
       Fist: 400
     BonusStats:
@@ -4578,8 +4578,8 @@ Body:
       Star_Gladiator2: true
     MaxWeight: 28000
     HpFactor: 90
-    HpMultiplicator: 650
-    SpFactor: 470
+    HpIncrease: 650
+    SpIncrease: 470
     BaseASPD:
       Fist: 400
       Book: 500
@@ -4648,7 +4648,7 @@ Body:
       Soul_Linker: true
     MaxWeight: 24000
     HpFactor: 75
-    SpFactor: 900
+    SpIncrease: 900
     BaseASPD:
       Fist: 500
       Dagger: 575

db/pre-re/mob_db.yml

@@ -40631,10 +40631,10 @@ Body:
     BaseExp: 74288
     JobExp: 77950
     MvpExp: 37144
-    Attack: 1060
-    Attack2: 2022
-    Defense: 7
-    MagicDefense: 36
+    Attack: 3304
+    Attack2: 4266
+    Defense: 32
+    MagicDefense: 66
     Str: 140
     Agi: 99
     Vit: 30
@@ -40645,42 +40645,49 @@ Body:
     SkillRange: 10
     ChaseRange: 12
     Size: Large
-    Race: Formless
+    Race: Brute
     Element: Fire
     ElementLevel: 3
     WalkSpeed: 200
-    AttackDelay: 1150
-    AttackMotion: 1150
-    DamageMotion: 288
+    AttackDelay: 1152
+    AttackMotion: 1152
+    DamageMotion: 576
     Ai: 21
     Class: Boss
     Modes:
       Mvp: true
+    MvpDrops:
+      - Item: Old_Violet_Box
+        Rate: 5500
+      - Item: Old_Violet_Box
+        Rate: 5000
+      - Item: Old_Card_Album
+        Rate: 2000
     Drops:
       - Item: Treasure_Box
         Rate: 5000
-      - Item: Elunium
-        Rate: 1000
-      - Item: Oridecon
-        Rate: 1000
-      - Item: Yggdrasilberry
-        Rate: 500
       - Item: Hurricane_Fury
         Rate: 100
       - Item: Hunting_Spear
         Rate: 100
+      - Item: Yggdrasilberry
+        Rate: 500
+      - Item: Elunium
+        Rate: 1000
+      - Item: Oridecon
+        Rate: 1000
       - Item: Hell_Fire
         Rate: 100
   - Id: 2069
     AegisName: IARA
     Name: Iara
     Level: 79
-    Hp: 5890
-    BaseExp: 1070
-    JobExp: 890
-    Attack: 171
-    Attack2: 270
-    MagicDefense: 39
+    Hp: 18952
+    BaseExp: 5517
+    JobExp: 1500
+    Attack: 614
+    Attack2: 713
+    MagicDefense: 76
     Str: 69
     Agi: 14
     Vit: 41
@@ -40695,36 +40702,36 @@ Body:
     Element: Water
     ElementLevel: 3
     WalkSpeed: 200
-    AttackDelay: 672
-    AttackMotion: 380
+    AttackDelay: 384
+    AttackMotion: 672
     DamageMotion: 288
     Ai: 17
     Drops:
+      - Item: Mistic_Frozen
+        Rate: 5
       - Item: Heart_Of_Mermaid
         Rate: 9000
       - Item: Fin
         Rate: 500
-      - Item: Crystal_Mirror
-        Rate: 100
       - Item: Witherless_Rose
         Rate: 50
+      - Item: Crystal_Mirror
+        Rate: 100
       - Item: Illusion_Flower
         Rate: 10
-      - Item: Mistic_Frozen
-        Rate: 5
       - Item: Mage_Coat
         Rate: 1
   - Id: 2070
     AegisName: PIRANHA
     Name: Piranha
     Level: 75
-    Hp: 4522
-    BaseExp: 899
-    JobExp: 1023
-    Attack: 182
-    Attack2: 223
-    Defense: 2
-    MagicDefense: 10
+    Hp: 15882
+    BaseExp: 3877
+    JobExp: 2023
+    Attack: 549
+    Attack2: 590
+    Defense: 7
+    MagicDefense: 12
     Str: 69
     Agi: 45
     Vit: 30
@@ -40734,41 +40741,41 @@ Body:
     AttackRange: 1
     SkillRange: 10
     ChaseRange: 12
-    Size: Medium
+    Size: Large
     Race: Fish
     Element: Water
     ElementLevel: 3
     WalkSpeed: 200
     AttackDelay: 768
-    AttackMotion: 768
-    DamageMotion: 384
-    Ai: 20
+    AttackMotion: 480
+    DamageMotion: 864
+    Ai: 04
     Drops:
-      - Item: Sharp_Scale
-        Rate: 9000
       - Item: Gill
         Rate: 600
+      - Item: Mistic_Frozen
+        Rate: 5
+      - Item: Sharp_Scale
+        Rate: 9000
       - Item: Tooth_Of_Ancient_Fish
         Rate: 500
       - Item: Lip_Of_Ancient_Fish
         Rate: 500
-      - Item: Mistic_Frozen
-        Rate: 5
-      - Item: Fisherman's_Dagger
-        Rate: 5
       - Item: Scalpel
         Rate: 1
+      - Item: Fisherman's_Dagger
+        Rate: 5
   - Id: 2071
     AegisName: HEADLESS_MULE
     Name: Headless Mule
     Level: 80
-    Hp: 6620
-    BaseExp: 1011
-    JobExp: 1120
-    Attack: 210
-    Attack2: 267
-    Defense: 7
-    MagicDefense: 27
+    Hp: 20065
+    BaseExp: 6666
+    JobExp: 4111
+    Attack: 903
+    Attack2: 960
+    Defense: 33
+    MagicDefense: 44
     Str: 68
     Agi: 51
     Vit: 50
@@ -40792,29 +40799,29 @@ Body:
     Drops:
       - Item: Burning_Horse_Shoe
         Rate: 4000
+      - Item: Plate_Armor_
+        Rate: 5
       - Item: Burning_Heart
         Rate: 1000
       - Item: Hot_Hair
         Rate: 1000
-      - Item: Plate_Armor_
-        Rate: 5
-      - Item: Jamadhar_
-        Rate: 2
       - Item: Inverse_Scale
         Rate: 1
       - Item: Plate_Armor_
         Rate: 1
+      - Item: Jamadhar_
+        Rate: 2
   - Id: 2072
     AegisName: JAGUAR
     Name: Jaguar
     Level: 71
-    Hp: 3914
-    BaseExp: 720
-    JobExp: 512
-    Attack: 192
-    Attack2: 234
-    Defense: 9
-    MagicDefense: 12
+    Hp: 12590
+    BaseExp: 1820
+    JobExp: 1012
+    Attack: 538
+    Attack2: 580
+    Defense: 44
+    MagicDefense: 15
     Str: 69
     Agi: 30
     Vit: 45
@@ -40829,10 +40836,10 @@ Body:
     Element: Earth
     ElementLevel: 2
     WalkSpeed: 150
-    AttackDelay: 1250
-    AttackMotion: 580
-    DamageMotion: 360
-    Ai: 04
+    AttackDelay: 576
+    AttackMotion: 1248
+    DamageMotion: 480
+    Ai: 17
     Drops:
       - Item: Leopard_Skin
         Rate: 3000
@@ -40848,13 +40855,13 @@ Body:
     AegisName: TOUCAN
     Name: Toucan
     Level: 70
-    Hp: 3640
-    BaseExp: 659
-    JobExp: 544
-    Attack: 166
-    Attack2: 201
-    Defense: 3
-    MagicDefense: 10
+    Hp: 10555
+    BaseExp: 1002
+    JobExp: 1552
+    Attack: 478
+    Attack2: 513
+    Defense: 12
+    MagicDefense: 12
     Str: 54
     Agi: 14
     Vit: 40
@@ -40864,37 +40871,37 @@ Body:
     AttackRange: 1
     SkillRange: 10
     ChaseRange: 12
-    Size: Small
+    Size: Medium
     Race: Brute
     Element: Wind
     ElementLevel: 2
     WalkSpeed: 155
-    AttackDelay: 1450
-    AttackMotion: 960
-    DamageMotion: 480
-    Ai: 04
+    AttackDelay: 960
+    AttackMotion: 1440
+    DamageMotion: 960
+    Ai: 03
     Drops:
       - Item: Talon
         Rate: 3000
       - Item: Cyfar
         Rate: 1000
-      - Item: Flower_Ring
-        Rate: 200
-      - Item: Yellow_Herb
-        Rate: 100
       - Item: Blue_Herb
         Rate: 50
+      - Item: Yellow_Herb
+        Rate: 100
+      - Item: Flower_Ring
+        Rate: 200
   - Id: 2074
     AegisName: CURUPIRA
     Name: Curupira
     Level: 68
-    Hp: 3096
-    BaseExp: 622
-    JobExp: 450
-    Attack: 140
-    Attack2: 175
-    Defense: 9
-    MagicDefense: 10
+    Hp: 8669
+    BaseExp: 1209
+    JobExp: 850
+    Attack: 409
+    Attack2: 444
+    Defense: 42
+    MagicDefense: 12
     Str: 32
     Agi: 23
     Vit: 38
@@ -40905,27 +40912,25 @@ Body:
     SkillRange: 10
     ChaseRange: 12
     Size: Medium
-    Race: Demon
+    Race: Demihuman
     Element: Earth
     ElementLevel: 1
     WalkSpeed: 250
-    AttackDelay: 530
-    AttackMotion: 530
+    AttackDelay: 528
+    AttackMotion: 480
     DamageMotion: 384
     Ai: 07
-    Modes:
-      Detector: true
     Drops:
       - Item: Meat
         Rate: 3000
-      - Item: Tiger_Skin_Panties
-        Rate: 500
       - Item: Elunium_Stone
         Rate: 250
-      - Item: Mace_
-        Rate: 100
       - Item: Emveretarcon
         Rate: 10
+      - Item: Tiger_Skin_Panties
+        Rate: 500
+      - Item: Mace_
+        Rate: 100
 #  - Id: 2075
 #    AegisName: E_VADON_X
 #    Name: Vadon
@@ -41086,12 +41091,16 @@ Body:
     AegisName: E_HYDRA
     Name: Strange Hydra
     JapaneseName: Suspicious Hydra
-    Level: 34
-    Hp: 854
-    Attack: 1
-    Attack2: 2
+    Level: 14
+    Hp: 660
+    Attack: 22
+    Attack2: 28
     Defense: 100
     MagicDefense: 100
+    Agi: 14
+    Vit: 14
+    Dex: 40
+    Luk: 2
     AttackRange: 7
     SkillRange: 10
     ChaseRange: 12
@@ -41108,11 +41117,11 @@ Body:
     AegisName: G_PIRANHA
     Name: Piranha
     Level: 75
-    Hp: 4522
-    Attack: 182
-    Attack2: 223
-    Defense: 2
-    MagicDefense: 10
+    Hp: 15882
+    Attack: 549
+    Attack2: 590
+    Defense: 7
+    MagicDefense: 12
     Str: 69
     Agi: 45
     Vit: 30
@@ -41122,14 +41131,14 @@ Body:
     AttackRange: 1
     SkillRange: 10
     ChaseRange: 12
-    Size: Medium
+    Size: Large
     Race: Fish
     Element: Water
     ElementLevel: 3
     WalkSpeed: 200
     AttackDelay: 768
-    AttackMotion: 768
-    DamageMotion: 384
+    AttackMotion: 480
+    DamageMotion: 864
     Ai: 20
   - Id: 2158
     AegisName: S_HORNET

db/pre-re/mob_skill_db.txt

@@ -44,6 +44,7 @@
 //	afterskill		After mob casts the specified skill.
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
+//	mobnearbygt		When monsters in range become greater than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
@@ -5418,7 +5419,7 @@
 1991,Tendrilion@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
 1991,Tendrilion@NPC_DRAGONFEAR,attack,659,2,500,0,10000,yes,self,always,0,,,,,,,
 1991,Tendrilion@NPC_GROUNDATTACK,attack,185,4,1000,0,5000,yes,target,always,0,,,,,,21,
-1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x39A5,,,,7,
+1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x3885,,,,7,
 1991,Tendrilion@NPC_ALLHEAL,idle,687,1,10000,30000,30000,yes,self,myhpltmaxrate,80,,,,,,,
 1992,Cornus@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1992,Cornus@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,

db/pre-re/quest_db.yml

@@ -22,40 +22,32 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################
 
 Header:
   Type: QUEST_DB
-  Version: 2
+  Version: 3
 
 Body:
   - Id: 1000

db/pre-re/skill_db.yml

@@ -796,8 +796,8 @@ Body:
     Element: Earth
     CastCancel: true
     CastTime: 1000
-    Duration1: 20000
-    Duration2: 5000
+    Duration1: 5000
+    Duration2: 20000
     Requires:
       SpCost:
         - Level: 1
@@ -5332,7 +5332,7 @@ Body:
       IgnoreDefense: true
     Flags:
       IsNpc: true
-    Range: 3
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5346,7 +5346,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: -1
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5358,7 +5358,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -7
     Hit: Single
     HitCount: 1
   - Id: 161
@@ -5496,7 +5496,7 @@ Body:
       IgnoreDefense: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5508,7 +5508,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Multi_Hit
     HitCount:
       - Level: 1
@@ -5542,7 +5542,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5560,7 +5560,6 @@ Body:
     Flags:
       IsNpc: true
       TargetTrap: true
-    Range: 5
     Hit: Single
     HitCount: 1
     Element: Fire
@@ -5603,7 +5602,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5617,7 +5616,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5631,7 +5630,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5645,7 +5644,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5659,12 +5658,12 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
-    Duration1: 20000
-    Duration2: 100
+    Duration1: 100
+    Duration2: 20000
     Status: StoneWait
   - Id: 181
     Name: NPC_CURSEATTACK
@@ -5674,7 +5673,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -5688,7 +5687,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5702,7 +5701,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Random
@@ -5714,7 +5713,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Water
@@ -5727,7 +5726,7 @@ Body:
     Flags:
       IsNpc: true
       TargetHidden: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Earth
@@ -5739,7 +5738,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Fire
@@ -5751,7 +5750,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Wind
@@ -5763,7 +5762,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Poison
@@ -5776,7 +5775,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Holy
@@ -5788,7 +5787,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -5800,7 +5799,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Ghost
@@ -5812,7 +5811,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5894,7 +5893,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -6734,7 +6733,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Range: 9
     Hit: Single
     SplashArea: 1
     CastTime: 2000
@@ -9193,7 +9191,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -1
+    Range: -2
     Hit: Multi_Hit
     HitCount: -2
     Element: Dark
@@ -9211,12 +9209,12 @@ Body:
     Flags:
       IsNpc: true
       TargetSelf: true
-    Range: 5
     Hit: Single
     HitCount: 1
     Element: Dark
     AfterCastWalkDelay: 1000
-    Duration1: 30000
+    Duration1: 950
+    Duration2: 30000
     Unit:
       Id: Dummyskill
       Layout: -1
@@ -9319,7 +9317,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     Duration1: 15000
     Status: Stop
@@ -9344,7 +9342,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9357,7 +9355,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9369,7 +9367,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9381,7 +9379,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Undead
@@ -9389,16 +9387,15 @@ Body:
     Name: NPC_CHANGEUNDEAD
     Description: Undead Attribute Change
     MaxLevel: 5
-    Type: Magic
+    Type: Weapon
     TargetType: Attack
-    DamageFlags:
-      NoDamage: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
+    Hit: Single
     HitCount: 1
     Element: Undead
-    Duration1: 30000
+    Duration2: 60000
     Status: ChangeUndead
   - Id: 349
     Name: NPC_POWERUP
@@ -9462,7 +9459,6 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 2
   - Id: 353
     Name: NPC_INVISIBLE
     Description: Invisible
@@ -9483,7 +9479,6 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 2
     Hit: Single
     AfterCastActDelay:
       - Level: 2
@@ -15912,8 +15907,8 @@ Body:
         Area: 11
       - Level: 5
         Area: 14
-    Duration1: 20000
-    Duration2: 100
+    Duration1: 100
+    Duration2: 20000
     Status: StoneWait
   - Id: 667
     Name: NPC_WIDECONFUSE
@@ -16121,7 +16116,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -16136,7 +16131,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -16353,7 +16348,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     HitCount: 1
     Duration2: 180000
     Status: HellPower
@@ -29648,7 +29643,8 @@ Body:
     HitCount: 1
     CastCancel: true
     AfterCastActDelay: 1000
-    Duration1: 10000
+    Duration1: 100
+    Duration2: 10000
     Requires:
       SpCost: 30
     Unit:
@@ -30959,7 +30955,7 @@ Body:
     MaxLevel: 5
     Type: Weapon
     TargetType: Attack
-    Range: 1
+    Range: 15
     Hit: Multi_Hit
     HitCount:
       - Level: 1
@@ -31079,7 +31075,7 @@ Body:
     MaxLevel: 3
     Type: Weapon
     TargetType: Attack
-    Range: 1
+    Range: 15
     Hit: Single
     HitCount: 1
     AfterCastActDelay: 1000
@@ -31091,7 +31087,7 @@ Body:
     MaxLevel: 5
     Type: Magic
     TargetType: Attack
-    Range: 9
+    Range: 15
     Hit: Single
     HitCount:
       - Level: 1
@@ -31156,7 +31152,6 @@ Body:
       IgnoreElement: true
       IgnoreFlee: true
       IgnoreDefCard: true
-    Range: 4
     Hit: Single
     HitCount: 1
     Element: Weapon

db/pre-re/status.yml

@@ -70,7 +70,6 @@ Body:
       Stun: true
       Sleep: true
       Burning: true
-      #Undead: true
     End:
       Aeterna: true
     EndReturn:
@@ -83,13 +82,13 @@ Body:
     Opt1: StoneWait
     Flags:
       SendOption: true
+      BossResist: true
       StopAttacking: true
     Fail:
       Freeze: true
       Stun: true
       Sleep: true
       Burning: true
-      #Undead: true
     EndReturn:
       StoneWait: true
       Stone: true
@@ -115,8 +114,13 @@ Body:
       Inspiration: true
       Warmer: true
       Gvg_Freez: true
+      Stone: true
+      StoneWait: true
+      Freeze: true
+      Stun: true
+      Sleep: true
+      Burning: true
     End:
-      Dancing: true
       Aeterna: true
   - Status: Stun
     DurationLookup: NPC_STUNATTACK
@@ -130,13 +134,11 @@ Body:
       BossResist: true
       StopAttacking: true
       StopCasting: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Stun: true
-    End:
-      Dancing: true
+      Stun: true
   - Status: Sleep
     DurationLookup: NPC_SLEEPATTACK
     States:
@@ -150,13 +152,11 @@ Body:
       StopAttacking: true
       StopCasting: true
       RemoveOnDamaged: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Sleep: true
-    End:
-      Dancing: true
+      Sleep: true
   - Status: Poison
     DurationLookup: NPC_POISON
     CalcFlags:
@@ -168,10 +168,11 @@ Body:
       SendOption: true
       BossResist: true
       StopAttacking: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
+      Poison: true
+      Dpoison: true
   - Status: Curse
     DurationLookup: NPC_CURSEATTACK
     CalcFlags:
@@ -184,11 +185,11 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Curse: true
+      Curse: true
   - Status: Silence
     DurationLookup: NPC_SILENCEATTACK
     States:
@@ -199,21 +200,20 @@ Body:
       SendOption: true
       BossResist: true
       StopCasting: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Silence: true
+      Silence: true
   - Status: Confusion
     DurationLookup: NPC_WIDECONFUSE
     Flags:
       BossResist: true
       StopWalking: true
-      RemoveOnDamaged: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
+    EndReturn:
       Confusion: true
   - Status: Blind
     DurationLookup: NPC_BLINDATTACK
@@ -225,12 +225,12 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Fear: true
       Gvg_Blind: true
+      Blind: true
   - Status: Bleeding
     Icon: EFST_BLOODING
     DurationLookup: NPC_BLEEDING
@@ -243,7 +243,6 @@ Body:
       BossResist: true
       NoSave: true
       NoClearance: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -257,7 +256,6 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -1084,9 +1082,10 @@ Body:
       NoClearbuff: true
       NoDispell: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoClearance: true
       NoForcedEnd: true
+    Fail:
+      Nochat: true
   - Status: Protectexp
     Icon: EFST_PROTECTEXP
     DurationLookup: WE_BABY
@@ -1298,7 +1297,8 @@ Body:
       Marionette: true
     Flags:
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Marionette: true
   - Status: Marionette2
     Icon: EFST_MARIONETTE
     DurationLookup: CG_MARIONETTE
@@ -1313,7 +1313,8 @@ Body:
       Marionette: true
     Flags:
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Marionette2: true
   - Status: Changeundead
     Icon: EFST_PROPERTYUNDEAD
     DurationLookup: NPC_CHANGEUNDEAD
@@ -1398,16 +1399,17 @@ Body:
       Mdef: true
       Aspd: true
       Speed: true
+    Flags:
+      NoSave: true
     Opt3:
       SteelBody: true
   - Status: Orcish
     DurationLookup: SA_REVERSEORCISH
     Flags:
       Debuff: true
+      SendOption: true
     Options:
       Orcish: true
-    Flags:
-      SendOption: true
   - Status: Readystorm
     Icon: EFST_STORMKICK_ON
     DurationLookup: TK_READYSTORM
@@ -1654,7 +1656,8 @@ Body:
       NoSave: true
       NoRemoveOnDead: true
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Closeconfine2: true
   - Status: Dancing
     Icon: EFST_BDPLAYING
     DurationLookup: BD_ENCORE
@@ -2497,7 +2500,8 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Bossmapinfo: true
   - Status: Lifeinsurance
     Icon: EFST_CASH_DEATHPENALTY
     States:
@@ -2666,16 +2670,18 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoRemoveOnDead: true
+    Fail:
+      S_Lifepotion: true
   - Status: L_Lifepotion
     Icon: EFST_L_LIFEPOTION
     Flags:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoRemoveOnDead: true
+    Fail:
+      L_Lifepotion: true
   - Status: Jexpboost
     Icon: EFST_CASH_PLUSONLYJOBEXP
     Flags:
@@ -2840,7 +2846,6 @@ Body:
     Flags:
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
     Fail:
       Inspiration: true
@@ -2849,6 +2854,8 @@ Body:
   - Status: Burning
     Icon: EFST_BURNT
     DurationLookup: RK_DRAGONBREATH
+    CalcFlags:
+      Mdef: true
     Opt1: Burning
     Flags:
       SendOption: true
@@ -2856,13 +2863,10 @@ Body:
       RemoveOnLuxAnima: true
       BossResist: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 10000
     Fail:
       Refresh: true
       Inspiration: true
-    CalcFlags:
-      Mdef: true
   - Status: Freezing
     Icon: EFST_FROSTMISTY
     DurationLookup: WL_FROSTMISTY
@@ -2879,7 +2883,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 6000
     Fail:
       Refresh: true
@@ -2930,7 +2933,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Giantgrowth
     Icon: EFST_GIANTGROWTH
@@ -2991,7 +2993,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
   - Status: Adoramus
     Icon: EFST_ADORAMUS
     DurationLookup: AB_ADORAMUS
@@ -3076,13 +3077,8 @@ Body:
       SetStand: true
       StopWalking: true
       StopAttacking: true
-      OverlapFail: true
     End:
-      Dancing: true
-      Burning: true
       Freezing: true
-      Freeze: true
-      Stone: true
   - Status: Marshofabyss
     Icon: EFST_MARSHOFABYSS
     DurationLookup: WL_MARSHOFABYSS
@@ -3174,7 +3170,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoSave: true
-      OverlapFail: true
       NoClearance: true
   - Status: Wugdash
     Icon: EFST_WUGDASH
@@ -3425,7 +3420,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
   - Status: Paralyse
     Icon: EFST_PARALYSE
     CalcFlags:
@@ -3439,7 +3433,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3462,7 +3455,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3485,7 +3477,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3508,7 +3499,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3531,7 +3521,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3557,7 +3546,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3578,7 +3566,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3650,7 +3637,6 @@ Body:
       Regen: true
     Flags:
       DisplayPc: true
-      OverlapFail: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -3662,7 +3648,6 @@ Body:
       Speed: true
     Flags:
       BossResist: true
-      OverlapFail: true
   - Status: Earthdrive
     Icon: EFST_EARTHDRIVE
     DurationLookup: LG_EARTHDRIVE
@@ -3711,7 +3696,6 @@ Body:
       BossResist: true
       StopWalking: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -3892,7 +3876,6 @@ Body:
       RemoveOnDamaged: true
       NoSave: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 5000
     Fail:
       Refresh: true
@@ -4109,7 +4092,6 @@ Body:
       DisplayPc: true
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
   - Status: Crescentelbow
     Icon: EFST_CRESCENTELBOW
@@ -4151,7 +4133,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
   - Status: Lightningwalk
     Icon: EFST_LIGHTNINGWALK
     DurationLookup: SR_LIGHTNINGWALK
@@ -4270,7 +4251,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -4520,7 +4500,6 @@ Body:
       Batk: true
       Watk: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4533,7 +4512,6 @@ Body:
       Aspd: true
       Hit: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4545,7 +4523,6 @@ Body:
     States:
       NoCast: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4558,7 +4535,6 @@ Body:
       Flee: true
       Speed: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4571,7 +4547,6 @@ Body:
       Cri: true
       Flee2: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -4583,7 +4558,6 @@ Body:
     CalcFlags:
       MaxHp: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
@@ -5069,6 +5043,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
+      SendVal1: true
       OverlapIgnoreLevel: true
       NoForcedEnd: true
   - Status: Spellbook1
@@ -5222,7 +5197,6 @@ Body:
       StopWalking: true
       NoSave: true
       RemoveOnChangeMap: true
-      OverlapFail: true
   - Status: Cbc
     Icon: EFST_CBC
     DurationLookup: MH_CBC
@@ -5351,14 +5325,10 @@ Body:
     Icon: EFST_SET_NUM_DEF
     CalcFlags:
       Def: true
-    Flags:
-      OverlapFail: true
   - Status: Mdefset
     Icon: EFST_SET_NUM_MDEF
     CalcFlags:
       Mdef: true
-    Flags:
-      OverlapFail: true
   - Status: Darkcrow
     Icon: EFST_DARKCROW
     DurationLookup: GC_DARKCROW
@@ -5908,7 +5878,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_B
     Icon: EFST_REUSE_LIMIT_B
@@ -5918,7 +5887,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_C
     Icon: EFST_REUSE_LIMIT_C
@@ -5928,7 +5896,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_D
     Icon: EFST_REUSE_LIMIT_D
@@ -5938,7 +5905,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_E
     Icon: EFST_REUSE_LIMIT_E
@@ -5948,7 +5914,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_F
     Icon: EFST_REUSE_LIMIT_F
@@ -5958,7 +5923,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_G
     Icon: EFST_REUSE_LIMIT_G
@@ -5968,7 +5932,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_H
     Icon: EFST_REUSE_LIMIT_H
@@ -5978,7 +5941,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Mtf
     Icon: EFST_REUSE_LIMIT_MTF
@@ -5988,7 +5950,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Aspd_Potion
     Icon: EFST_REUSE_LIMIT_ASPD_POTION
@@ -5998,7 +5959,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Millenniumshield
     Icon: EFST_REUSE_MILLENNIUMSHIELD
@@ -6008,7 +5968,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Crushstrike
     Icon: EFST_REUSE_CRUSHSTRIKE
@@ -6018,7 +5977,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Stormblast
     Icon: EFST_REUSE_STORMBLAST
@@ -6028,7 +5986,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: All_Riding_Reuse_Limit
     Icon: EFST_ALL_RIDING_REUSE_LIMIT
@@ -6038,7 +5995,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Ecl
     Icon: EFST_REUSE_LIMIT_ECL
@@ -6048,7 +6004,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Reuse_Limit_Recall
     Icon: EFST_REUSE_LIMIT_RECALL
@@ -6058,7 +6013,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
   - Status: Promote_Health_Reserch
     Icon: EFST_PROMOTE_HEALTH_RESERCH
@@ -6070,8 +6024,6 @@ Body:
       MaxSp: true
   - Status: Norecover_State
     Icon: EFST_HANDICAPSTATE_NORECOVER
-    Flags:
-      OverlapFail: true
   - Status: Suhide
     Icon: EFST_SUHIDE
     DurationLookup: SU_HIDE
@@ -6429,7 +6381,6 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
   - Status: Doram_Buf_02
@@ -6440,7 +6391,6 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
   - Status: Hiss
@@ -6928,7 +6878,6 @@ Body:
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
-      OverlapFail: true
       NoRemoveOnDead: true
       NoClearbuff: true
   - Status: Ensemblefatigue

db/quest_db.yml

@@ -22,40 +22,32 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################
 
 Header:
   Type: QUEST_DB
-  Version: 2
+  Version: 3
 
 Footer:
   Imports:

db/re/castle_db.yml

@@ -33,168 +33,6 @@ Header:
   Version: 1
 
 Body:
-# WOE FE castle
-  - Id: 0
-    Map: aldeg_cas01
-    Name: Neuschwanstein
-    #Name: Noisyubantian
-    Npc: Agit#aldeg_cas01
-  - Id: 1
-    Map: aldeg_cas02
-    Name: Hohenschwangau
-    #Name: Hohensyubangawoo
-    Npc: Agit#aldeg_cas02
-  - Id: 2
-    Map: aldeg_cas03
-    Name: Nuernberg
-    #Name: Nyirenverk
-    Npc: Agit#aldeg_cas03
-  - Id: 3
-    Map: aldeg_cas04
-    Name: Wuerzburg
-    #Name: Byirtsburi
-    Npc: Agit#aldeg_cas04
-  - Id: 4
-    Map: aldeg_cas05
-    Name: Rothenburg
-    #Name: Rotenburk
-    Npc: Agit#aldeg_cas05
-  - Id: 5
-    Map: gefg_cas01
-    Name: Repherion
-    #Name: Reprion
-    Npc: Agit#gefg_cas01
-  - Id: 6
-    Map: gefg_cas02
-    Name: Eeyolbriggar
-    #Name: Yolbriger
-    Npc: Agit#gefg_cas02
-  - Id: 7
-    Map: gefg_cas03
-    Name: Yesnelph
-    #Name: Isinlife
-    Npc: Agit#gefg_cas03
-  - Id: 8
-    Map: gefg_cas04
-    Name: Bergel
-    #Name: Berigel
-    Npc: Agit#gefg_cas04
-  - Id: 9
-    Map: gefg_cas05
-    Name: Mersetzdeitz
-    #Name: Melsedetsu
-    Npc: Agit#gefg_cas05
-  - Id: 10
-    Map: payg_cas01
-    Name: Bright Arbor
-    #Name: Mingting
-    Npc: Agit#payg_cas01
-  - Id: 11
-    Map: payg_cas02
-    Name: Scarlet Palace
-    #Name: Tiantan
-    Npc: Agit#payg_cas02
-  - Id: 12
-    Map: payg_cas03
-    Name: Holy Shadow
-    #Name: Fuying
-    Npc: Agit#payg_cas03
-  - Id: 13
-    Map: payg_cas04
-    Name: Sacred Altar
-    #Name: Honglou
-    Npc: Agit#payg_cas04
-  - Id: 14
-    Map: payg_cas05
-    Name: Bamboo Grove Hill
-    #Name: Zhulinxian
-    Npc: Agit#payg_cas05
-  - Id: 15
-    Map: prtg_cas01
-    Name: Kriemhild
-    #Name: Creamhilt
-    Npc: Agit#prtg_cas01
-  - Id: 16
-    Map: prtg_cas02
-    Name: Swanhild
-    #Name: Sbanhealt
-    Npc: Agit#prtg_cas02
-  - Id: 17
-    Map: prtg_cas03
-    Name: Fadhgridh
-    #Name: Lazrigees
-    Npc: Agit#prtg_cas03
-  - Id: 18
-    Map: prtg_cas04
-    Name: Skoegul
-    #Name: Squagul
-    Npc: Agit#prtg_cas04
-  - Id: 19
-    Map: prtg_cas05
-    Name: Gondul
-    #Name: Guindull
-    Npc: Agit#prtg_cas05
-
-# WOE NGuild castle
-  - Id: 20
-    Map: nguild_alde
-    Name: Earth
-    Npc: Agit_N01
-  - Id: 21
-    Map: nguild_gef
-    Name: Air
-    Npc: Agit_N02
-  - Id: 22
-    Map: nguild_pay
-    Name: Water
-    Npc: Agit_N03
-  - Id: 23
-    Map: nguild_prt
-    Name: Fire
-    Npc: Agit_N04
-
-# WOE SE castle
-  - Id: 24
-    Map: schg_cas01
-    Name: Himinn
-    Npc: Manager#schg_cas01
-  - Id: 25
-    Map: schg_cas02
-    Name: Andlangr
-    Npc: Manager#schg_cas02
-  - Id: 26
-    Map: schg_cas03
-    Name: Viblainn
-    Npc: Manager#schg_cas03
-  - Id: 27
-    Map: schg_cas04
-    Name: Hljod
-    Npc: Manager#schg_cas04
-  - Id: 28
-    Map: schg_cas05
-    Name: Skidbladnir
-    Npc: Manager#schg_cas05
-  - Id: 29
-    Map: arug_cas01
-    Name: Mardol
-    Npc: Manager#arug_cas01
-  - Id: 30
-    Map: arug_cas02
-    Name: Cyr
-    Npc: Manager#arug_cas02
-  - Id: 31
-    Map: arug_cas03
-    Name: Horn
-    Npc: Manager#arug_cas03
-  - Id: 32
-    Map: arug_cas04
-    Name: Gefn
-    Npc: Manager#arug_cas04
-  - Id: 33
-    Map: arug_cas05
-    Name: Bandis
-    Npc: Manager#arug_cas05
-
 # WOE TE castle
   - Id: 34
     Map: te_aldecas1

db/re/enchantgrade.yml

@@ -0,0 +1,214 @@
+# This file is a part of rAthena.
+#   Copyright(C) 2022 rAthena Development Team
+#   https://rathena.org - https://github.com/rathena
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+###########################################################################
+# Enchantgrade Database
+###########################################################################
+#
+# Enchantgrade Settings
+#
+###########################################################################
+# - Type                                Item type.
+#   Levels:                             Enchantgrade settings per item level.
+#     - Level                           Item level.
+#       Grades:                         Enchantgrade settings per grade level.
+#         - Grade                       Enchantgrade level.
+#           Refine                      Required refine level.
+#           Chance                      Base chance of success out of 0~10000.
+#           Bonus                       Enchantgrade bonus. (Default: 0)
+#           Announce                    Announce if someone tries to increase the enchantgrade. (Default: true)
+#           Catalyst:                   Catalyst item to increase chance of success.
+#             Item                      The item that can be used.
+#             AmountPerStep             Amount of Item needed.
+#                                       Set to 0 to disable the catalyst.
+#             MaximumSteps              Maximum amount of times Item can be used.
+#             ChanceIncrease            Amount at which the chance increases for each Item used.
+#           Options:                    Success chance based on cost type.
+#             - Option                  Index of the client option.
+#               Item                    Required item.
+#               Amount                  Amount of required item. (Default: 1)
+#                                       Set to 0 to remove an option.
+#               Price                   Amount of zeny required. (Default: 0)
+#               BreakingRate            Chance of item breaking out of 0~10000. (Default: 0)
+#               DowngradeAmount         Number of refine levels reduced on failure. (Default: 0)
+###########################################################################
+
+Header:
+  Type: ENCHANTGRADE_DB
+  Version: 1
+
+Body:
+  - Type: Armor
+    Levels:
+      - Level: 2
+        Grades:
+          - Grade: None
+            Refine: 11
+            Chance: 7000
+            Bonus: 10
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 1
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Skyblue_Jewel
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Skyblue_Jewel
+                Amount: 5
+                Zeny: 875000
+          - Grade: D
+            Refine: 11
+            Chance: 6000
+            Bonus: 30
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 3
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Topaz
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Topaz
+                Amount: 5
+                Zeny: 875000
+          - Grade: C
+            Refine: 11
+            Chance: 5000
+            Bonus: 50
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 5
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Violet_Jewel
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Violet_Jewel
+                Amount: 5
+                Zeny: 875000
+          - Grade: B
+            Refine: 11
+            Chance: 4000
+            Bonus: 100
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 7
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Amber
+                Amount: 2
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Amber
+                Amount: 10
+                Zeny: 875000
+  - Type: Weapon
+    Levels:
+      - Level: 5
+        Grades:
+          - Grade: None
+            Refine: 11
+            Chance: 7000
+            Bonus: 10
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 1
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Skyblue_Jewel
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Skyblue_Jewel
+                Amount: 5
+                Zeny: 875000
+          - Grade: D
+            Refine: 11
+            Chance: 6000
+            Bonus: 30
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 3
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Topaz
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Topaz
+                Amount: 5
+                Zeny: 875000
+          - Grade: C
+            Refine: 11
+            Chance: 5000
+            Bonus: 50
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 5
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Violet_Jewel
+                Amount: 1
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Violet_Jewel
+                Amount: 5
+                Zeny: 875000
+          - Grade: B
+            Refine: 11
+            Chance: 4000
+            Bonus: 100
+            Catalyst:
+                Item: Blessed_Etel_Dust
+                AmountPerStep: 7
+                MaximumSteps: 10
+                ChanceIncrease: 100
+            Options:
+              - Option: 0
+                Item: Etel_Amber
+                Amount: 2
+                Zeny: 175000
+                BreakingRate: 10000
+              - Option: 1
+                Item: Etel_Amber
+                Amount: 10
+                Zeny: 875000

db/re/instance_db.yml

@@ -310,3 +310,38 @@ Body:
       Map: 1@infi
       X: 30
       Y: 10
+  - Id: 39
+    Name: Regenschirm
+    TimeLimit: 7200
+    Enter:
+      Map: 1@rgsr
+      X: 127
+      Y: 38
+  - Id: 40
+    Name: Sealed OS
+    TimeLimit: 7200
+    Enter:
+      Map: 1@os_b
+      X: 188
+      Y: 41
+  - Id: 41
+    Name: OS Occupation
+    TimeLimit: 7200
+    Enter:
+      Map: 1@os_a
+      X: 30
+      Y: 352
+  - Id: 42
+    Name: 2nd OS Search
+    TimeLimit: 7200
+    Enter:
+      Map: 1@os_a
+      X: 335
+      Y: 34
+  - Id: 43
+    Name: Cor Memorial
+    TimeLimit: 7200
+    Enter:
+      Map: 1@cor
+      X: 176
+      Y: 169

db/re/item_randomopt_db.yml

@@ -83,7 +83,7 @@ Body:
   - Id: 13
     Option: VAR_ATKPERCENT
     Script: |
-      bonus2 bAddClass,Class_All,getrandomoptinfo(ROA_VALUE);
+      bonus bAtkRate,getrandomoptinfo(ROA_VALUE);
   - Id: 14
     Option: VAR_MAGICATKPERCENT
     Script: |

db/re/item_randomopt_group.yml

@@ -4848,32 +4848,18 @@ Body:
             MaxValue: 20
             Chance: 1000
           - Option: WEAPON_ATTR_WATER
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_WIND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 0
-            MaxValue: 0
             Chance: 50
       - Slot: 2
         Options:
@@ -5007,32 +4993,18 @@ Body:
             MaxValue: 20
             Chance: 1000
           - Option: WEAPON_ATTR_WATER
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_WIND
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 0
-            MaxValue: 0
             Chance: 500
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 0
-            MaxValue: 0
             Chance: 50
       - Slot: 2
         Options:
@@ -7456,7 +7428,7 @@ Body:
         Chance: 625
   # TODO: Confirm official rates
   - Id: 100
-    Group: DROOPING_GUNSLINGER_SCROLL
+    Group: GUNSLINGER_ENCHANT
     Slots:
       - Slot: 1
         Options:
@@ -7560,7 +7532,7 @@ Body:
             Chance: 1250
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999572
   - Id: 101
-    Group: FAN_MODIFICATION_KIT
+    Group: FAN_UPGRADE_KIT
     Slots:
       - Slot: 1
         Options:
@@ -7672,7 +7644,7 @@ Body:
             Chance: 769
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964871
   - Id: 102
-    Group: UNIFORM_REPAIR_KIT
+    Group: SUIT_UPGRADE_KIT
     Slots:
       - Slot: 1
         Options:
@@ -7810,7 +7782,7 @@ Body:
             Chance: 5000
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999577
   - Id: 109
-    Group: CANDY_POUCH_BLESSING_SCROLL_MELEE
+    Group: CANDY_BAG_SCROLL_MELEE
     Slots:
       - Slot: 1
         Options:
@@ -7934,7 +7906,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999578
   - Id: 110
-    Group: CANDY_POUCH_BLESSING_SCROLL_RANGE
+    Group: CANDY_BAG_SCROLL_RANGE
     Slots:
       - Slot: 1
         Options:
@@ -8058,7 +8030,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3999579
   - Id: 111
-    Group: CANDY_POUCH_BLESSING_SCROLL_MAGIC
+    Group: CANDY_BAG_SCROLL_MAGIC
     Slots:
       - Slot: 1
         Options:
@@ -8182,7 +8154,7 @@ Body:
             Chance: 454
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964872
   - Id: 112
-    Group: MAGICAL_BOOSTER_AMPLIFIER
+    Group: BOOSTER_AMPLIFIER
     Slots:
       - Slot: 1
         Options:
@@ -8310,7 +8282,7 @@ Body:
             Chance: 714
   # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3964879
   - Id: 113
-    Group: MAGIC_CAT_HAND_SCROLL
+    Group: MAGICAL_CAT_HAND
     Slots:
       - Slot: 1
         Options:
@@ -8557,8 +8529,6 @@ Body:
             MaxValue: 20
             Chance: 357
           - Option: BODY_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 357
           - Option: BODY_ATTR_WATER
             MinValue: 3
@@ -9435,8 +9405,6 @@ Body:
             MaxValue: 5
             Chance: 212
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 212
           - Option: CLASS_IGNORE_MDEF_PERCENT_NORMAL
             MinValue: 30
@@ -9530,28 +9498,16 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: BODY_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: BODY_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 119
     Group: GRAY_CHARCOAL_MELEE
@@ -9599,8 +9555,6 @@ Body:
             MaxValue: 20
             Chance: 526
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 526
           - Option: VAR_PLUSASPD
             MinValue: 1
@@ -9610,29 +9564,17 @@ Body:
             MinValue: 5
             MaxValue: 10
             Chance: 526
-          - Option: DAMAGE_PROPERTY_WATER_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_WATER
             Chance: 526
-          - Option: DAMAGE_PROPERTY_GROUND_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_GROUND
             Chance: 526
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_FIRE
             Chance: 526
-          - Option: DAMAGE_PROPERTY_WIND_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_WIND
             Chance: 526
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_SAINT
             Chance: 526
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 1
-            MaxValue: 1
+          - Option: WEAPON_ATTR_DARKNESS
             Chance: 526
       - Slot: 2
         Options:
@@ -9693,8 +9635,6 @@ Body:
             MaxValue: 20
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 120
     Group: GRAY_CHARCOAL_MAGIC
@@ -9861,8 +9801,6 @@ Body:
             MaxValue: 20
             Chance: 666
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
           - Option: VAR_PLUSASPD
             MinValue: 1
@@ -9877,8 +9815,6 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
       - Slot: 2
         Options:
@@ -10131,32 +10067,18 @@ Body:
             MaxValue: 20
             Chance: 384
           - Option: WEAPON_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
   - Id: 124
     Group: CHARLESTON_PARTS_R
@@ -10236,32 +10158,18 @@ Body:
             MaxValue: 20
             Chance: 384
           - Option: WEAPON_ATTR_WATER
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_GROUND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_FIRE
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_WIND
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_SAINT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: WEAPON_ATTR_DARKNESS
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
           - Option: DAMAGE_SIZE_PERFECT
-            MinValue: 1
-            MaxValue: 1
             Chance: 384
   - Id: 125
     Group: SHADOW_RANDOM_MIX
@@ -10762,8 +10670,6 @@ Body:
             MaxValue: 10
             Chance: 500
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 500
   - Id: 129
     Group: EP17_1_SPC08
@@ -11143,8 +11049,6 @@ Body:
             MaxValue: 10
             Chance: 555
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 555
   - Id: 132
     Group: MAGMA_ESSENCE
@@ -11713,8 +11617,6 @@ Body:
             MaxValue: 10
             Chance: 666
           - Option: WEAPON_INDESTRUCTIBLE
-            MinValue: 1
-            MaxValue: 1
             Chance: 666
   - Id: 136
     Group: ANCIENT_HERO_WISDOM
@@ -12004,7 +11906,7 @@ Body:
             MaxValue: 5
             Chance: 1000
   - Id: 141
-    Group: GRACE_P_MO_GARMENT
+    Group: GRACE_CONVERT1
     Slots:
       - Slot: 1
         Options:
@@ -12103,7 +12005,7 @@ Body:
             MaxValue: 5
             Chance: 769
   - Id: 142
-    Group: GRACE_M_MO_GARMENT
+    Group: GRACE_CONVERT2
     Slots:
       - Slot: 1
         Options:
@@ -12202,7 +12104,7 @@ Body:
             MaxValue: 5
             Chance: 769
   - Id: 143
-    Group: GRACE_P_MO_ARMOR
+    Group: GRACE_CONVERT3
     Slots:
       - Slot: 1
         Options:
@@ -12293,7 +12195,7 @@ Body:
             MaxValue: 5
             Chance: 769
   - Id: 144
-    Group: GRACE_M_MO_ARMOR
+    Group: GRACE_CONVERT4
     Slots:
       - Slot: 1
         Options:

db/re/job_basepoints.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Body:
   - Jobs:

db/re/job_exp.yml

@@ -25,9 +25,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.
@@ -78,7 +78,7 @@
 
 Header:
   Type: JOB_STATS
-  Version: 1
+  Version: 2
 
 Body:
   - Jobs:
@@ -3845,6 +3845,13 @@ Body:
       Meister2: true
       Dragon_Knight2: true
       Imperial_Guard2: true
+      Sky_Emperor: true
+      Soul_Ascetic: true
+      Shinkiro: true
+      Shiranui: true
+      Night_Watch: true
+      Hyper_Novice: true
+      Spirit_Handler: true
     MaxJobLevel: 50
     JobExp:
       - Level: 1

db/re/mob_skill_db.txt

@@ -44,6 +44,7 @@
 //	afterskill		After mob casts the specified skill.
 //	casttargeted		When a target is in cast range (no condition value).
 //	rudeattacked		When mob is rude attacked (no condition value).
+//	mobnearbygt		When monsters in range become greater than specified number.
 //
 //	Status abnormalities specified through the statuson/statusoff system:
 //	    anybad (any type of state change) / stone / freeze / stun / sleep /
@@ -5419,7 +5420,7 @@
 1991,Tendrilion@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
 1991,Tendrilion@NPC_DRAGONFEAR,attack,659,2,500,0,10000,yes,self,always,0,,,,,,,
 1991,Tendrilion@NPC_GROUNDATTACK,attack,185,4,1000,0,5000,yes,target,always,0,,,,,,21,
-1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x38A5,,,,7,
+1991,Tendrilion@PF_SPIDERWEB,attack,405,1,3000,0,10000,yes,target,always,0,,0x3885,,,,7,
 1991,Tendrilion@NPC_ALLHEAL,idle,687,1,10000,30000,30000,yes,self,myhpltmaxrate,80,,,,,,,
 1992,Cornus@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1992,Cornus@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -11844,15 +11845,18 @@
 3239,V_G_TRENTINI@NPC_WIDEFREEZE,attack,664,5,100,1000,20000,no,self,always,,,,,,,,
 3239,V_G_TRENTINI@NPC_WIDECURSE,attack,677,5,100,1000,20000,no,self,always,,,,,,,,
 3240,V_B_RANDEL@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+// 3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,,
 3240,V_B_RANDEL@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3240,V_B_RANDEL@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3240,V_B_RANDEL@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3240,V_B_RANDEL@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
-3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,3239,
+// 3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3234,3235,3236,3237,3238,,
+// 3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,3239,
+3240,V_B_RANDEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3234,3235,3236,3237,3238,,
 3240,V_B_RANDEL@PA_PRESSURE,attack,367,5,200,0,10000,no,target,always,,,,,,,,
 3240,V_B_RANDEL@CR_REFLECTSHIELD,attack,252,5,10,0,200000,yes,self,always,,,,,,,32,
 3240,V_B_RANDEL@CR_REFLECTSHIELD,attack,252,5,1000,0,200000,yes,self,casttargeted,,,,,,,32,
@@ -11866,16 +11870,19 @@
 3240,V_B_RANDEL@NPC_WIDESLEEP,attack,668,5,100,1000,10000,no,self,always,,,,,,,,
 3241,V_B_FLAMEL@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3241,V_B_FLAMEL@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3241,V_B_FLAMEL@AM_DEMONSTRATION,chase,229,5,200,0,10000,yes,target,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3241,V_B_FLAMEL@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@NPC_MAXPAIN,attack,716,10,100,1000,30000,no,self,always,,,,,,,,
-3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,3239,
+// 3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,3239,
+3241,V_B_FLAMEL@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3235,3236,3237,3238,,
 3241,V_B_FLAMEL@CR_ACIDDEMONSTRATION,attack,490,5,100,1000,5000,no,target,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_PULSESTRIKE,attack,661,5,100,0,5000,yes,self,always,,,,,,,,
 3241,V_B_FLAMEL@NPC_AGIUP,attack,350,5,200,0,100000,yes,self,always,,,,,,,,
@@ -11886,7 +11893,8 @@
 3241,V_B_FLAMEL@NPC_WIDESTUN,attack,678,5,300,1000,10000,no,self,always,,,,,,,,
 3242,V_B_CELIA@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3242,V_B_CELIA@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+// 3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,,
 3242,V_B_CELIA@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3242,V_B_CELIA@NPC_MENTALBREAKER,chase,159,5,100,0,10000,yes,target,always,,,,,,,7,
 3242,V_B_CELIA@SA_DISPELL,chase,289,5,500,0,30000,yes,target,always,,,,,,,,
@@ -11896,8 +11904,10 @@
 3242,V_B_CELIA@MG_LIGHTNINGBOLT,chase,20,10,300,0,5000,yes,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_WIDESTONE,chase,666,5,300,1000,10000,no,self,always,,,,,,,,
 3242,V_B_CELIA@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
-3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,3239,
+// 3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3236,3237,3238,,
+// 3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,3239,
+3242,V_B_CELIA@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3236,3237,3238,,
 3242,V_B_CELIA@SA_LANDPROTECTOR,attack,288,5,300,0,20000,yes,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_MENTALBREAKER,attack,159,5,50,0,10000,yes,target,always,,,,,,,7,
 3242,V_B_CELIA@SA_DISPELL,attack,289,5,1000,0,30000,yes,target,always,,,,,,,,
@@ -11909,13 +11919,16 @@
 3242,V_B_CELIA@NPC_PSYCHIC_WAVE,attack,736,7,500,500,5000,no,target,always,,,,,,,,
 3242,V_B_CELIA@NPC_PSYCHIC_WAVE,attack,736,10,300,3000,10000,no,target,always,,,,,,,9,
 3243,V_B_CHEN@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+// 3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,,
 3243,V_B_CHEN@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3243,V_B_CHEN@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
-3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,3239,
+// 3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3237,3238,,
+// 3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,3239,
+3243,V_B_CHEN@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3237,3238,,
 3243,V_B_CHEN@MO_EXTREMITYFIST,attack,271,5,300,1000,7000,no,target,always,,,,,,,,
 3243,V_B_CHEN@MO_EXTREMITYFIST,attack,271,5,100,1000,3000,no,target,myhpltmaxrate,10,,,,,,,
 3243,V_B_CHEN@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
@@ -11928,15 +11941,18 @@
 3243,V_B_CHEN@NPC_WIDEBLEEDING,attack,665,5,100,1000,10000,no,self,always,,,,,,,,
 3243,V_B_CHEN@NPC_WIDESILENCE,attack,663,5,100,1000,10000,no,self,always,,,,,,,,
 3244,V_B_GERTIE@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+// 3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,,
 3244,V_B_GERTIE@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3244,V_B_GERTIE@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3244,V_B_GERTIE@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3244,V_B_GERTIE@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
-3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,3239,
+// 3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3238,,
+// 3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,3239,
+3244,V_B_GERTIE@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3238,,
 3244,V_B_GERTIE@NPC_AGIUP,attack,350,5,200,0,100000,yes,self,always,,,,,,,,
 3244,V_B_GERTIE@NPC_AGIUP,attack,350,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 3244,V_B_GERTIE@RG_STRIPSHIELD,attack,216,5,50,0,2000,yes,target,myhpltmaxrate,90,,,,,,,
@@ -11950,15 +11966,18 @@
 3244,V_B_GERTIE@NPC_WIDESLEEP,attack,668,10,100,1000,30000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
 3245,V_B_ALPHOCCIO@NPC_SLOWCAST,chase,672,5,200,300,10000,no,self,always,,,,,,,36,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3245,V_B_ALPHOCCIO@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
-3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3239,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
+// 3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3239,
+3245,V_B_ALPHOCCIO@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,,
 // 3245,V_B_ALPHOCCIO@NPC_ASSASSINCROSS,attack,2539,10,100,1000,150000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_POWERUP,attack,349,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
@@ -11968,15 +11987,18 @@
 3245,V_B_ALPHOCCIO@NPC_PULSESTRIKE,attack,661,5,100,1000,10000,no,self,always,,,,,,,,
 3245,V_B_ALPHOCCIO@NPC_WIDESOULDRAIN,attack,680,10,100,1000,60000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+// 3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONSLAVE,idle,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
 3246,V_B_TRENTINI@NPC_CALLSLAVE,idle,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,idle,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,chase,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3246,V_B_TRENTINI@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
-3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
-3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3238,
+// 3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3233,3234,3235,3236,3237,,
+// 3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,3238,
+3246,V_B_TRENTINI@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,no,self,myhpltmaxrate,30,3233,3234,3235,3236,3237,,
 // 3246,V_B_TRENTINI@NPC_UGLYDANCE,attack,2541,5,100,1000,70000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_MAXPAIN,attack,716,9,300,1000,20000,no,self,always,,,,,,,47,
 3246,V_B_TRENTINI@NPC_PULSESTRIKE,attack,661,3,100,0,10000,yes,self,always,,,,,,,,
@@ -12438,6 +12460,72 @@
 3633,EP16_2_VENOM_KIMERA@NPC_ACIDBREATH,attack,657,6,10000,3000,25000,no,target,always,0,,,,,,,
 3633,EP16_2_VENOM_KIMERA@RG_STRIPARMOR,attack,217,5,500,1000,5000,no,target,always,0,,,,,,,
 
+// Illusion of Vampire
+3750,Matt Drainliar@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
+3750,Matt Drainliar@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+3750,Matt Drainliar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
+3750,Matt Drainliar@AL_TELEPORT,idle,26,1,1000,1000,10000,no,self,always,0,,,,,,,
+3750,Matt Drainliar@AL_TELEPORT,chase,26,1,1000,1000,10000,no,self,always,0,,,,,,,
+3750,Matt Drainliar@AL_TELEPORT,attack,26,1,1000,1000,10000,no,self,always,0,,,,,,,
+3750,Matt Drainliar@AL_HEAL,idle,28,9,10000,1000,10000,yes,self,always,0,,,,,,,
+3750,Matt Drainliar@AL_HEAL,chase,28,9,10000,1000,10000,yes,self,always,0,,,,,,,
+3750,Matt Drainliar@AL_HEAL,attack,28,9,10000,1000,10000,yes,self,always,0,,,,,,,
+3751,Living Dead@NPC_UNDEADATTACK,chase,347,5,2000,800,25000,yes,target,always,0,,,,,,,
+3751,Living Dead@NPC_BLEEDING,attack,660,1,1000,800,65000,yes,target,always,0,,,,,,,
+3751,Living Dead@NPC_STOP,attack,342,1,2000,0,35000,yes,target,always,0,,,,,,,
+3751,Living Dead@NPC_COMBOATTACK,attack,171,1,3500,500,8000,yes,target,always,0,,,,,,,
+3752,Starving Living Dead@NPC_POISON,attack,176,1,500,800,5000,no,target,always,0,,,,,,,
+3752,Starving Living Dead@NPC_POISON,angry,176,1,500,800,5000,no,target,always,0,,,,,,,
+3752,Starving Living Dead@NPC_UNDEADATTACK,angry,347,1,2000,0,5000,yes,target,always,0,,,,,,,
+3752,Starving Living Dead@NPC_UNDEADATTACK,attack,347,1,2000,0,5000,yes,target,always,0,,,,,,,
+3752,Starving Living Dead@NPC_AGIUP,chase,350,1,10000,0,35000,yes,self,always,0,,,,,,,
+3753,Living Dead@NPC_POISON,attack,176,3,500,800,5000,yes,target,always,0,,,,,,,
+3753,Living Dead@NPC_BLOODDRAIN,attack,176,3,2000,500,15000,yes,target,always,0,,,,,,,
+3753,Living Dead@NPC_UNDEADATTACK,chase,347,3,1000,500,5000,yes,target,always,0,,,,,,,
+3754,Sweet Nightmare@NPC_BLINDATTACK,attack,177,3,1000,0,7000,yes,target,always,0,,,,,,,
+3754,Sweet Nightmare@NPC_CURSEATTACK,attack,181,3,1000,800,8000,no,target,always,0,,,,,,,
+3754,Sweet Nightmare@NPC_MENTALBREAKER,attack,159,1,1000,800,9000,no,target,always,0,,,,,,,
+3754,Sweet Nightmare@NPC_TELEKINESISATTACK,attack,191,5,1000,0,16000,yes,target,always,0,,,,,,,
+3755,Black Mushroom@NPC_SELFDESTRUCTION,idle,173,1,500,2000,5000,no,self,myhpltmaxrate,85,,,,,,,
+3755,Black Mushroom@NPC_SELFDESTRUCTION,idle,173,1,10000,2000,5000,no,self,skillused,173,,,,,,,
+3755,Black Mushroom@NPC_SELFDESTRUCTION,idle,173,1,10000,0,0,yes,self,alchemist,,,,,,,,
+3756,Bomi@MG_FIREWALL,chase,18,5,500,500,35000,yes,target,always,0,,,,,,,
+3756,Bomi@MG_FROSTDIVER,chase,15,9,10000,500,40000,yes,target,always,0,,,,,,,
+3756,Bomi@MG_LIGHTNINGBOLT,chase,20,7,10000,1000,40000,yes,target,always,0,,,,,,,
+3756,Bomi@NPC_DARKSTRIKE,attack,340,5,2500,700,15000,no,target,always,0,,,,,,,
+3756,Bomi@MG_THUNDERSTORM,attack,21,5,2000,1000,15000,no,target,always,0,,,,,,,
+3756,Bomi@MG_LIGHTNINGBOLT,attack,20,7,10000,1000,40000,no,target,always,0,,,,,,,
+3756,Bomi@MG_SOULSTRIKE,attack,13,9,1000,500,10000,yes,target,always,0,,,,,,,
+3756,Bomi@MG_SAFETYWALL,attack,12,10,3000,0,35000,yes,self,always,0,,,,,,,
+3756,Bomi@NPC_SUMMONSLAVE,attack,196,1,10000,200,10000,no,self,slavele,2,3750,,,,,,
+3756,Bomi@NPC_SUMMONSLAVE,idle,196,1,10000,200,10000,no,self,slavele,2,3751,,,,,,
+3756,Bomi@NPC_WIDESUCK,idle,722,1,10000,500,30000,no,self,always,0,,,,,,,
+3757,Dracula of Rage@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+3757,Dracula of Rage@AL_DECAGI,chase,30,10,2000,0,5000,no,target,always,0,,,,,,,
+3757,Dracula of Rage@AS_GRIMTOOTH,chase,137,5,2000,0,5000,yes,target,always,0,,,,,,,
+3757,Dracula of Rage@NPC_CRITICALWOUND,chase,673,5,2000,500,12000,no,target,myhpltmaxrate,50,,,,,,,
+3757,Dracula of Rage@NPC_HELLJUDGEMENT,attack,662,10,10000,500,20000,no,self,myhpltmaxrate,80,,,,,,36,
+3757,Dracula of Rage@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
+3757,Dracula of Rage@NPC_BLOODDRAIN,attack,199,1,3000,0,10000,yes,target,always,0,,,,,,,
+3757,Dracula of Rage@NPC_ENERGYDRAIN,chase,200,1,3000,0,10000,yes,target,always,0,,,,,,,
+3757,Dracula of Rage@MO_BODYRELOCATION,chase,264,1,2000,200,5000,yes,target,always,0,,,,,,,
+3757,Dracula of Rage@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_CHANGEUNDEAD,attack,348,1,2000,0,25000,no,target,always,0,,,,,,9,
+3757,Dracula of Rage@NPC_INVISIBLE,idle,353,1,1000,200,50000,yes,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_INVISIBLE,chase,353,1,1000,200,50000,yes,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_INVISIBLE,attack,353,1,1000,200,15000,yes,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_WIDESILENCE,attack,663,5,2000,100,15000,no,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_SUMMONSLAVE,attack,196,1,10000,700,9000,no,self,slavele,5,3750,,,,,,
+3757,Dracula of Rage@NPC_SUMMONSLAVE,idle,196,2,10000,700,9000,no,self,slavele,5,3750,,,,,,
+3757,Dracula of Rage@NPC_DARKSTRIKE,attack,340,1,3000,0,0,yes,target,skillused,2008,,,,,,,
+3757,Dracula of Rage@NPC_DARKSTRIKE,attack,340,1,3000,0,0,yes,target,skillused,490,,,,,,,
+3757,Dracula of Rage@NPC_DARKSTRIKE,attack,340,1,3000,0,0,yes,target,skillused,271,,,,,,,
+3757,Dracula of Rage@NPC_DARKBREATH,attack,202,5,900,800,900,yes,target,always,0,,,,,,,
+3757,Dracula of Rage@NPC_DARKCROSS,attack,338,10,900,400,800,yes,target,always,0,,,,,,9,
+3757,Dracula of Rage@NPC_GRANDDARKNESS,attack,339,10,900,1000,1200,no,self,always,0,,,,,,,
+3757,Dracula of Rage@NPC_DARKTHUNDER,attack,341,10,900,1000,1200,no,target,always,0,,,,,,,
+
 // Illusion of Moonlight
 3758,Angry Moonlight Flower@AL_HEAL,attack,28,11,10000,0,5000,no,friend,friendhpltmaxrate,60,,,,,,21,
 3758,Angry Moonlight Flower@AL_HEAL,attack,28,11,10000,0,5000,no,self,myhpltmaxrate,30,,,,,,21,
@@ -12517,6 +12605,145 @@
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,35000,yes,self,always,0,,,,,,,53
 3765,Deranged Adventurer@NPC_TALK,idle,682,10,2500,0,30000,yes,self,always,0,,,,,,,54
 
+// Episode 17.1 - Illusion (custom) #!todo
+20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
+20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
+20340,EL-A17T@NPC_CRITICALSLASH,attack,170,1,2000,500,5000,no,target,always,0,,,,,,,
+20340,EL-A17T@AS_SONICBLOW,attack,136,10,1000,0,10000,yes,target,always,0,,,,,,2,
+20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
+20341,E-EA1L@AL_DECAGI,attack,30,1,500,1000,5000,no,target,always,0,,,,,,29,
+20341,E-EA1L@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,9,
+20341,E-EA1L@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,9,
+20341,E-EA1L@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
+20342,E-EA2S@AL_PNEUMA,attack,25,1,2000,0,5000,yes,self,longrangeattacked,0,,,,,,,
+20342,E-EA2S@NPC_CRITICALSLASH,attack,170,1,2000,0,2000,no,target,always,0,,,,,,,
+20342,E-EA2S@NPC_GUIDEDATTACK,attack,172,5,1000,0,5000,no,target,always,0,,,,,,,
+20342,E-EA2S@KN_TWOHANDQUICKEN,attack,60,30,10000,0,120000,yes,target,myhpltmaxrate,40,,,,,,,
+20342,E-EA2S@NPC_STUNATTACK,attack,179,5,500,1000,5000,no,target,always,0,,,,,,,
+20342,E-EA2S@AL_PNEUMA,chase,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
+20343,E-13EN0@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,,,,,,,,
+20343,E-13EN0@NPC_RANGEATTACK,chase,160,1,500,0,5000,yes,target,always,,,,,,,,
+20343,E-13EN0@NPC_WATERATTACK,attack,184,3,500,500,5000,no,target,always,,,,,,,6,
+20344,Chemical Bug@NPC_METAMORPHOSIS,any,193,1,10000,5000,0,no,self,onspawn,0,2536,,,,,,
+20345,Chemical Bomb@NPC_SELFDESTRUCTION,any,173,1,10000,5000,0,no,self,onspawn,0,,,,,,,
+20346,Miguel@RK_IGNITIONBREAK,attack,2006,5,2000,2000,10000,no,target,always,0,,,,,,,
+20346,Miguel@AM_DEMONSTRATION,chase,229,5,5000,0,2000,yes,target,always,0,,,,,,6,
+20346,Miguel@NPC_WINDATTACK,attack,187,5,1000,0,5000,yes,target,always,0,,,,,,,
+20346,Miguel@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
+20346,Miguel@SM_ENDURE,chase,8,10,5000,0,5000,yes,self,always,0,,,,,,,
+20346,Miguel@SM_ENDURE,attack,8,10,2000,0,5000,yes,self,always,0,,,,,,,
+20347,Miguel@AM_DEMONSTRATION,chase,229,5,5000,0,2000,yes,target,always,0,,,,,,6,
+20347,Miguel@RK_IGNITIONBREAK,attack,2006,5,2000,2000,10000,no,target,always,0,,,,,,,
+20347,Miguel@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
+20347,Miguel@NPC_WINDATTACK,attack,187,5,1000,0,5000,yes,target,always,0,,,,,,,
+20347,Miguel@SM_ENDURE,chase,8,10,5000,0,5000,yes,self,always,0,,,,,,,
+20347,Miguel@SM_ENDURE,attack,8,10,2000,0,5000,yes,self,always,0,,,,,,,
+20348,Twin Caput@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,no,target,always,0,,,,,,6,
+20348,Twin Caput@NPC_POISON,attack,176,2,500,800,5000,no,target,always,0,,,,,,,
+20348,Twin Caput@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,29,
+20349,Dolor@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
+20349,Dolor@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
+20349,Dolor@SM_BASH,attack,5,10,2000,1000,30000,no,target,always,0,,,,,,52,
+20349,Dolor@NPC_POISONATTACK,attack,188,3,500,500,5000,no,target,always,0,,,,,,9,
+20350,Bellare@HT_BLASTMINE,idle,122,5,2000,0,60000,yes,around3,always,0,,,,,,5,
+20350,Bellare@HT_BLASTMINE,attack,122,5,500,0,5000,yes,around3,always,0,,,,,,5,
+20350,Bellare@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
+20350,Bellare@BS_MAXIMIZE,attack,114,1,1000,0,60000,yes,self,always,0,,,,,,,
+20352,PomPom@NPC_POISON,attack,176,3,1000,800,5000,no,target,always,0,,,,,,,
+20352,PomPom@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,6,
+20352,PomPom@NPC_BLINDATTACK,chase,177,3,500,0,5000,yes,target,always,0,,,,,,6,
+20355,Bellare@HT_BLASTMINE,idle,122,5,2000,0,60000,yes,around3,always,0,,,,,,5,
+20355,Bellare@HT_BLASTMINE,attack,122,5,500,0,5000,yes,around3,always,0,,,,,,5,
+20355,Bellare@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
+20355,Bellare@BS_MAXIMIZE,attack,114,1,1000,0,60000,yes,self,always,0,,,,,,,
+20356,Greater Bellare@HT_BLASTMINE,idle,122,5,2000,0,60000,yes,around3,always,0,,,,,,5,
+20356,Greater Bellare@HT_BLASTMINE,attack,122,5,500,0,5000,yes,around3,always,0,,,,,,5,
+20356,Greater Bellare@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,,
+20356,Greater Bellare@BS_MAXIMIZE,attack,114,1,1000,0,60000,yes,self,always,0,,,,,,,
+20356,Greater Bellare@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
+20356,Greater Bellare@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20357,Sanare@NPC_HOLYATTACK,attack,189,2,500,0,5000,no,target,always,0,,,,,,18,
+20357,Sanare@NPC_HOLYATTACK,chase,189,2,500,0,5000,no,target,always,0,,,,,,18,
+20357,Sanare@PR_LEXAETERNA,attack,78,1,500,0,5000,yes,target,always,0,,,,,,6,
+20357,Sanare@PR_LEXAETERNA,chase,78,1,500,0,5000,yes,target,always,0,,,,,,6,
+20357,Sanare@PR_LEXDIVINA,chase,76,10,500,0,5000,yes,target,always,0,,,,,,2,
+20357,Sanare@PR_LEXDIVINA,attack,76,10,500,0,5000,yes,target,always,0,,,,,,2,
+20357,Sanare@MG_NAPALMBEAT,attack,11,5,1000,0,5000,yes,target,always,0,,,,,,,
+20357,Sanare@MG_NAPALMBEAT,chase,11,5,1000,0,1000,yes,target,always,0,,,,,,,
+20358,Greater Sanare@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20358,Greater Sanare@NPC_HOLYATTACK,attack,189,2,500,0,5000,no,target,always,0,,,,,,18,
+20358,Greater Sanare@NPC_HOLYATTACK,chase,189,2,500,0,5000,no,target,always,0,,,,,,18,
+20358,Greater Sanare@PR_LEXAETERNA,attack,78,1,500,0,5000,yes,target,always,0,,,,,,6,
+20358,Greater Sanare@PR_LEXAETERNA,chase,78,1,500,0,5000,yes,target,always,0,,,,,,6,
+20358,Greater Sanare@PR_LEXDIVINA,chase,76,10,500,0,5000,yes,target,always,0,,,,,,2,
+20358,Greater Sanare@PR_LEXDIVINA,attack,76,10,500,0,5000,yes,target,always,0,,,,,,2,
+20358,Greater Sanare@MG_NAPALMBEAT,attack,11,5,1000,0,5000,yes,target,always,0,,,,,,,
+20358,Greater Sanare@MG_NAPALMBEAT,chase,11,5,1000,0,1000,yes,target,always,0,,,,,,,
+20359,Plaga@MG_FIREBALL,follow,17,44,500,0,5000,yes,target,always,0,,,,,,,
+20359,Plaga@NPC_FIREATTACK,angry,186,5,500,500,5000,no,target,always,0,,,,,,,
+20359,Plaga@SM_MAGNUM,angry,7,25,500,500,5000,no,self,always,0,,,,,,,
+20359,Plaga@MG_FIREBALL,chase,17,44,500,0,5000,yes,target,always,0,,,,,,,
+20359,Plaga@NPC_FIREATTACK,attack,186,5,500,500,5000,no,target,always,0,,,,,,,
+20359,Plaga@SM_MAGNUM,attack,7,25,500,500,5000,no,self,always,0,,,,,,,
+20359,Plaga@MG_FIREBALL,follow,17,44,500,0,5000,yes,target,always,0,,,,,,,
+20359,Plaga@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+20359,Plaga@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
+20359,Plaga@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,,
+20360,Greater Plaga@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20360,Greater Plaga@NPC_FIREATTACK,angry,186,5,500,500,5000,no,target,always,0,,,,,,,
+20360,Greater Plaga@SM_MAGNUM,angry,7,25,500,500,5000,no,self,always,0,,,,,,,
+20360,Greater Plaga@MG_FIREBALL,chase,17,44,500,0,5000,yes,target,always,0,,,,,,,
+20360,Greater Plaga@NPC_FIREATTACK,attack,186,5,500,500,5000,no,target,always,0,,,,,,,
+20360,Greater Plaga@SM_MAGNUM,attack,7,25,500,500,5000,no,self,always,0,,,,,,,
+20360,Greater Plaga@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+20360,Greater Plaga@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
+20360,Greater Plaga@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,,
+20361,Dolor@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
+20361,Dolor@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
+20361,Dolor@SM_BASH,attack,5,10,2000,1000,30000,no,target,always,0,,,,,,52,
+20361,Dolor@NPC_POISONATTACK,attack,188,3,500,500,5000,no,target,always,0,,,,,,9,
+20362,Greater Dolor@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20362,Greater Dolor@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
+20362,Greater Dolor@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
+20362,Greater Dolor@SM_BASH,attack,5,10,2000,1000,30000,no,target,always,0,,,,,,52,
+20362,Greater Dolor@NPC_POISONATTACK,attack,188,3,500,500,5000,no,target,always,0,,,,,,9,
+20363,Venenum@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,,,,,,,,
+20363,Venenum@NPC_RANGEATTACK,chase,160,1,500,0,5000,yes,target,always,,,,,,,,
+20363,Venenum@NPC_POISONATTACK,attack,188,3,500,500,5000,no,target,always,0,,,,,,9,
+20363,Venenum@AS_VENOMDUST,attack,140,1,500,1500,5000,no,target,always,0,,,,,,,
+20364,Greater Venenum@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,,,,,,,,
+20364,Greater Venenum@NPC_RANGEATTACK,chase,160,1,500,0,5000,yes,target,always,,,,,,,,
+20364,Greater Venenum@NPC_POISONATTACK,attack,188,3,500,500,5000,no,target,always,0,,,,,,9,
+20364,Greater Venenum@AS_VENOMDUST,attack,140,1,500,1500,5000,no,target,always,0,,,,,,,
+20364,Greater Venenum@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20365,Twin Caput@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,no,target,always,0,,,,,,6,
+20365,Twin Caput@NPC_POISON,attack,176,2,500,800,5000,no,target,always,0,,,,,,,
+20365,Twin Caput@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,29,
+20366,Greater Twin Caput@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,no,target,always,0,,,,,,6,
+20366,Greater Twin Caput@NPC_POISON,attack,176,2,500,800,5000,no,target,always,0,,,,,,,
+20366,Greater Twin Caput@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,29,
+20366,Greater Twin Caput@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20381,R48-85-BESTIA@NPC_DARKSTRIKE,idle,340,10,10000,0,0,no,target,rudeattacked,,,,,,,,
+20381,R48-85-BESTIA@NPC_DARKSTRIKE,chase,340,5,5000,0,1000,no,target,always,0,,,,,,,
+20381,R48-85-BESTIA@NPC_HELLJUDGEMENT,chase,662,5,5000,4000,5000,yes,self,myhpltmaxrate,50,,,,,,7,
+20381,R48-85-BESTIA@NPC_HELLJUDGEMENT,attack,662,5,10000,4000,5000,yes,self,myhpltmaxrate,50,,,,,,7,
+20381,R48-85-BESTIA@NPC_DRAGONFEAR,chase,659,5,10000,0,0,no,self,always,0,,,,,,,
+20381,R48-85-BESTIA@NPC_DRAGONFEAR,attack,659,5,2000,1000,20000,yes,self,always,0,,,,,,,
+20381,R48-85-BESTIA@NPC_POWERUP,attack,349,5,10000,0,50000,no,self,myhpltmaxrate,30,,,,,,6,
+20381,R48-85-BESTIA@NPC_VAMPIRE_GIFT,attack,679,5,10000,0,0,no,self,skillused,490,,,,,,42,
+20381,R48-85-BESTIA@NPC_CRITICALWOUND,attack,673,4,500,500,5000,yes,target,always,0,,,,,,,
+20381,R48-85-BESTIA@WZ_QUAGMIRE,chase,92,5,3000,0,10000,yes,target,always,0,,,,,,,
+20381,R48-85-BESTIA@WZ_QUAGMIRE,attack,92,5,3000,0,10000,yes,target,always,0,,,,,,,
+20381,R48-85-BESTIA@AL_INCAGI,attack,29,1,2000,0,240000,yes,self,always,0,,,,,,2,
+20381,R48-85-BESTIA@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
+20381,R48-85-BESTIA@NPC_CALLSLAVE,attack,352,1,10000,0,60000,yes,self,always,0,,,,,,,
+20381,R48-85-BESTIA@NPC_CALLSLAVE,idle,352,1,10000,0,60000,yes,self,always,0,,,,,,,
+20381,R48-85-BESTIA@NPC_SUMMONSLAVE,attack,196,6,10000,700,30000,no,self,slavele,0,20382,20382,20382,,,,
+20381,R48-85-BESTIA@NPC_SUMMONSLAVE,idle,196,6,10000,700,30000,no,self,slavele,0,20382,20382,20382,,,,
+20382,G Twin Caput@NPC_DARKNESSATTACK,attack,190,3,500,500,5000,no,target,always,0,,,,,,6,
+20382,G Twin Caput@NPC_POISON,attack,176,2,500,800,5000,no,target,always,0,,,,,,,
+20382,G Twin Caput@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,29,
+
 // Meister ABR's (Automated Battle Robot)
 20834,ABR_BATTLE_WARIOR@ABR_BATTLE_BUSTER,chase,8601,1,10000,500,5000,yes,target,always,0,,,,,,,
 20834,ABR_BATTLE_WARIOR@ABR_BATTLE_BUSTER,attack,8601,1,10000,500,5000,yes,target,always,0,,,,,,,

db/re/pet_db.yml

@@ -626,11 +626,11 @@ Body:
       if (.@i >= PET_INTIMATE_LOYAL) {
         bonus bDef,2;
         bonus bMdef,2;
-        bonus2 bResEff,Eff_Stun,200;
+        bonus2 bResEff,Eff_Stun,-200;
       } else if (.@i >= PET_INTIMATE_CORDIAL) {
         bonus bDef,1;
         bonus bMdef,1;
-        bonus2 bResEff,Eff_Stun,100;
+        bonus2 bResEff,Eff_Stun,-100;
       }
   - Mob: BON_GUN
     TameItem: Heart_Of_Her
@@ -1574,7 +1574,7 @@ Body:
 #    Evolution:
 #      - Target: ORK_HERO2
 #        ItemRequirements:
-#          - Item: Powerful_Soul_Essence
+#          - Item: Mightysoul_Essence
 #            Amount: 30
 #          - Item: Orc_Warrior_Card
 #            Amount: 10
@@ -1682,7 +1682,7 @@ Body:
     Evolution:
       - Target: MOONLIGHT
         ItemRequirements:
-          - Item: Powerful_Soul_Essence
+          - Item: Mightysoul_Essence
             Amount: 30
           - Item: Nine_Tail_Card
             Amount: 10

db/re/quest_db.yml

@@ -22,40 +22,32 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################
 
 Header:
   Type: QUEST_DB
-  Version: 2
+  Version: 3
 
 Body:
   - Id: 1000
@@ -2781,9 +2773,39 @@ Body:
   - Id: 5855
     Title: "[Wait] Utan Fighting Operation"
     TimeLimit: 4h
+  - Id: 5856
+    Title: My Name is Morning
+  - Id: 5857
+    Title: Friends of Morning
+  - Id: 5858
+    Title: Friends of Morning
+  - Id: 5859
+    Title: Friends of Morning
+  - Id: 5860
+    Title: Friends of Morning
   - Id: 5861
     Title: "[Waiting] Take care of the morning"
     TimeLimit: 4h
+  - Id: 5862
+    Title: Morning's Menu Selection
+  - Id: 5863
+    Title: Morning's Menu Selection
+  - Id: 5864
+    Title: Morning's Menu Selection
+  - Id: 5865
+    Title: Morning's Menu Selection
+  - Id: 5866
+    Title: Morning's Menu Selection
+  - Id: 5867
+    Title: Morning's Menu Selection
+  - Id: 5868
+    Title: Morning's Menu Selection
+  - Id: 5869
+    Title: Morning's Menu Selection
+  - Id: 5870
+    Title: Morning's Menu Selection
+  - Id: 5871
+    Title: Morning's Menu Selection
   - Id: 5896
     Title: "[Waiting] Cleaning the sewage treatment plant."
     TimeLimit: 4h
@@ -2811,6 +2833,17 @@ Body:
   - Id: 5929
     Title: "[Standby] Subjugation-Turtle Island Dungeon"
     TimeLimit: 4h
+  - Id: 5930
+    Title: Subjugation-Yanggeochon
+    Targets:
+      - Id: 1
+        Count: 80
+        Location: tur_dun03
+        MapMobTargets:
+          ASSULTER: true
+          PERMETER: true
+          FREEZER: true
+          HEATER: true
   - Id: 5931
     Title: "[Standby] Subjugation-Yanggeochon"
     TimeLimit: 4h
@@ -4835,6 +4868,54 @@ Body:
   - Id: 7842
     Title: Today's Sweets Drops Avenger (Standby)
     TimeLimit: 4h
+  - Id: 7850
+    Title: Cat on Bullet
+  - Id: 7851
+    Title: New Operation
+  - Id: 7852
+    Title: Beyond the Barrier
+  - Id: 7853
+    Title: Barrier Investigation
+  - Id: 7854
+    Title: Wall on Barrier
+  - Id: 7855
+    Title: Watchtower
+  - Id: 7856
+    Title: Small Hole
+  - Id: 7857
+    Title: Report to Lucky
+  - Id: 7858
+    Title: Investigate the Strange Sounds
+    Targets:
+      - Mob: EP17_1_DOLOR1
+        Count: 10
+      - Mob: EP17_1_VENENUM1
+        Count: 10
+      - Mob: EP17_1_TWIN_CAPUT1
+        Count: 10
+  - Id: 7859
+    Title: Report to Tes
+  - Id: 7860
+    Title: Unexpected Guest
+  - Id: 7861
+    Title: Enterprise Crisis
+  - Id: 7862
+    Title: Reclaim Regenschirm
+  - Id: 7863
+    Title: Laboratory Data
+  - Id: 7864
+    Title: Ventilation
+  - Id: 7865
+    Title: Second Operation
+  - Id: 7866
+    Title: Along with Cat on Bullet
+  - Id: 7867
+    Title: Mercenary vs Mercenary
+    Targets:
+      - Mob: EP17_1_BELLARE1
+        Count: 15
+      - Mob: EP17_1_SANARE1
+        Count: 15
   - Id: 7868
     Title: Mercenary vs Mercenary - Waiting
     TimeLimit: 4h
@@ -7158,6 +7239,22 @@ Body:
   - Id: 11571
     Title: Let the light consume the darkness - Wait
     TimeLimit: 4h
+  - Id: 11596
+    Title: Old Memories
+  - Id: 11597
+    Title: Old Memories
+  - Id: 11598
+    Title: Old Memories
+  - Id: 11599
+    Title: Old Memories
+  - Id: 11600
+    Title: Old Memories
+  - Id: 11601
+    Title: Old Memories
+  - Id: 11602
+    Title: Old Memories
+  - Id: 11603
+    Title: Old Memories
   - Id: 11606
     Title: Jack The Giant Pumpkin (Standby)
     TimeLimit: 4h
@@ -8160,9 +8257,16 @@ Body:
   - Id: 12421
     Title: Aftereffects that saved the world
     TimeLimit: 4h
+  - Id: 12452
+    Title: OS Occupation
   - Id: 12453
     Title: Operation Waiting
     TimeLimit: 4h
+  - Id: 12454
+    Title: More Search Operations
+    Targets:
+      - Mob: MD_MIGUEL
+        Count: 1
   - Id: 12455
     Title: Operation Waiting
     TimeLimit: 4h
@@ -9325,7 +9429,7 @@ Body:
     Title: Time for repair
     TimeLimit: 4h
   - Id: 14613
-    Title: Erst on second floor
+    Title: Est on second floor
   - Id: 14614
     Title: Convince the leaders
   - Id: 14615
@@ -9351,12 +9455,84 @@ Body:
   - Id: 14650
     Title: Currently in production
     TimeLimit: 4h
+  - Id: 14651
+    Title: Decision on divorce should be made cautiously
+    TimeLimit: +4d
+  - Id: 14652
+    Title: Detailed Account 01
+  - Id: 14653
+    Title: Detailed Account 02
+  - Id: 14654
+    Title: Detailed Account 03
+  - Id: 14655
+    Title: I'm Ready
+  - Id: 14656
+    Title: Finding Father Grimm's Colleagues
+  - Id: 14657
+    Title: Jojo Is the Mage's Name
+  - Id: 14658
+    Title: Jubilee Is the Priest's Name
+  - Id: 14659
+    Title: Lost in Thought
+  - Id: 14660
+    Title: Ingredients for Fake Blood
+    Drops:
+      - Mob: ILL_DRAINLIAR
+        Item: Sticky_Blood
+        Rate: 7000
+      - Mob: ILL_BLACK_MUSHROOM
+        Item: Mushroom_Sap
+        Rate: 7000
+  - Id: 14661
+    Title: Jojo Is the Mage's Name 02
+  - Id: 14662
+    Title: You're Scaring Me
+  - Id: 14663
+    Title: Bloody Fight
+  - Id: 14664
+    Title: Deep Misunderstanding
+  - Id: 14665
+    Title: Is the Fight Over?
+  - Id: 14666
+    Title: Warden's Role
+  - Id: 14667
+    Title: Send the Dead Back to Earth
+    Targets:
+      - Mob: ILL_ZOMBIE_C
+        Count: 10
+      - Mob: ILL_ZOMBIE
+        Count: 10
+      - Mob: ILL_GHOUL
+        Count: 10
   - Id: 14668
     Title: Get Some Rest
     TimeLimit: 4h
+  - Id: 14669
+    Title: Sweet Dreams
+    Targets:
+      - Mob: ILL_NIGHTMARE
+        Count: 10
+    Drops:
+      - Mob: ILL_NIGHTMARE
+        Item: Swaying_Mane
+        Rate: 7000
   - Id: 14670
     Title: Time for Dreaming
     TimeLimit: 4h
+  - Id: 14671
+    Title: Unreliable Fake Blood
+    Targets:
+      - Mob: ILL_DRAINLIAR
+        Count: 5
+      - Mob: ILL_BLACK_MUSHROOM
+        Count: 5
+    Drops:
+      - Mob: ILL_DRAINLIAR
+        Item: Sticky_Blood
+        Rate: 7000
+      - Mob: ILL_BLACK_MUSHROOM
+        Item: Mushroom_Sap
+        Rate: 7000
   - Id: 14672
     Title: Preparing for the Firework Festival
     Targets:
@@ -9368,12 +9544,26 @@ Body:
   - Id: 14674
     Title: Time to Digest
     TimeLimit: 4h
+  - Id: 14675
+    Title: Noisy Neighbors
+    Targets:
+      - Mob: ILL_DRAINLIAR
+        Count: 10
   - Id: 14676
     Title: Break Time
     TimeLimit: 4h
+  - Id: 14677
+    Title: Studying in Dim Light
   - Id: 14678
     Title: Time to Study
     TimeLimit: 4h
+  - Id: 14679
+    Title: Curious by Nature
+    Targets:
+      - Mob: ILL_ZOMBIE_C
+        Count: 5
+      - Mob: ILL_ZOMBIE
+        Count: 5
   - Id: 14680
     Title: Time to Research
     TimeLimit: 4h
@@ -9913,12 +10103,61 @@ Body:
   - Id: 16344
     Title: Healthy Herb of June (Standby)
     TimeLimit: 4h
+  - Id: 16352
+    Title: Call from Elena Volkova
+  - Id: 16353
+    Title: Golden Troublemaker
+  - Id: 16354
+    Title: Operation of Elyumina
+  - Id: 16355
+    Title: Suspicious Box
+  - Id: 16356
+    Title: Suspicious Box
+  - Id: 16357
+    Title: Elyumina Secured
+  - Id: 16358
+    Title: Pure Wicked
+  - Id: 16359
+    Title: Pure Violence
+  - Id: 16360
+    Title: Pure Facts
+  - Id: 16361
+    Title: Pure Backward
   - Id: 16362
     Title: Pure Backstab (Standby)
     TimeLimit: 4h
+  - Id: 16363
+    Title: Process EL1_A17T
+    Targets:
+      - Mob: MD_E_EA1L
+        Count: 1
+  - Id: 16364
+    Title: Helping Farm Worker
   - Id: 16365
-    Title: Standby
+    Title: Helping Farm Worker - Standby
     TimeLimit: 4h
+  - Id: 16366
+    Title: Helping Farm Worker
+  - Id: 16367
+    Title: Growing Grapes
+  - Id: 16368
+    Title: Growing Grapes
+  - Id: 16369
+    Title: Growing Grapes
+  - Id: 16370
+    Title: Growing Bean Plants
+  - Id: 16371
+    Title: Growing Bean Plants
+  - Id: 16372
+    Title: Growing Bean Plants
+  - Id: 16373
+    Title: Growing Pumpkins
+  - Id: 16374
+    Title: Growing Pumpkins
+  - Id: 16375
+    Title: Growing Pumpkins
+  - Id: 16376
+    Title: Overpower EL1_A17T
   - Id: 16377
     Title: EL1_A17T Overpower (Standby)
     TimeLimit: +10mn
@@ -9988,6 +10227,8 @@ Body:
   - Id: 16538
     Title: Natural change - Waiting
     TimeLimit: 4h
+  - Id: 16546
+    Title: Farm Worker
   - Id: 17000
     Title: Meet with Father Bamph
   - Id: 17001
@@ -10024,8 +10265,49 @@ Body:
     Title: Regicide
   - Id: 17017
     Title: Reporting the King's Death
+  - Id: 17018
+    Title: Status of patients
+  - Id: 17019
+    Title: Urgent situation
+  - Id: 17020
+    Title: Resume investigation
+  - Id: 17021
+    Title: Finding Patrick
+  - Id: 17022
+    Title: Finding Patrick
+  - Id: 17023
+    Title: Finding Patrick
+  - Id: 17024
+    Title: Finding Patrick
+  - Id: 17025
+    Title: Finding Patrick
+  - Id: 17026
+    Title: Finding Patrick
+  - Id: 17027
+    Title: Finding Patrick
+  - Id: 17028
+    Title: Finding Patrick
+  - Id: 17029
+    Title: Finding Patrick
+  - Id: 17030
+    Title: Finding Patrick
+  - Id: 17031
+    Title: Finding Patrick
+  - Id: 17032
+    Title: Finding Patrick
+  - Id: 17033
+    Title: For all future work
+  - Id: 17034
+    Title: Rudus
+    Targets:
+      - Mob: EP17_1_DOLOR1
+        Count: 20
+    Drops:
+      - Mob: EP17_1_DOLOR1
+        Item: Id_Card
+        Rate: 5000
   - Id: 17035
-    Title: "Waiting: Ludusro"
+    Title: "Waiting: Rudus"
     TimeLimit: 4h
   - Id: 17037
     Title: "Wait: Replace attribute"
@@ -10105,6 +10387,8 @@ Body:
   - Id: 17566
     Title: (Standby) Code name! Is it a star button?
     TimeLimit: 4h
+  - Id: 18000
+    Title: Ready to enter
   - Id: 18001
     Title: Delivery for Rooney
   - Id: 18002
@@ -10158,64 +10442,6 @@ Body:
   - Id: 18028
     Title: The Memory of Thanatos the Magistrate - Waiting
     TimeLimit: 4h
-  - Id: 18030
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18031
-    Title: Geoborg Family Curse
-  - Id: 18032
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18033
-    Title: Geoborg Family Curse
-  - Id: 18034
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18035
-    Title: Geoborg Family Curse
-  - Id: 18036
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18037
-    Title: Geoborg Family Curse
-  - Id: 18038
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18039
-    Title: Geoborg Family Curse
-  - Id: 18040
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18041
-    Title: Geoborg Family Curse
-  - Id: 18042
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18043
-    Title: Geoborg Family Curse
-  - Id: 18044
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18045
-    Title: Geoborg Family Curse
-  - Id: 18046
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18047
-    Title: Geoborg Family Curse
-  - Id: 18048
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18049
-    Title: Geoborg Family Curse
-  - Id: 18050
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
-  - Id: 18051
-    Title: Geoborg Family Curse
-  - Id: 18052
-    Title: Geoborg Family Curse
-    TimeLimit: 4h
   - Id: 18054
     Title: Nightmare on the clock tower - Standby
     TimeLimit: 4h

db/re/skill_db.yml

@@ -780,8 +780,8 @@ Body:
     Element: Earth
     CastCancel: true
     CastTime: 800
-    Duration1: 17000
-    Duration2: 5000
+    Duration1: 5000
+    Duration2: 17000
     FixedCastTime: 200
     Requires:
       SpCost:
@@ -5601,7 +5601,7 @@ Body:
       IgnoreDefense: true
     Flags:
       IsNpc: true
-    Range: 3
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5615,7 +5615,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: -1
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5627,7 +5627,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -7
     Hit: Single
     HitCount: 1
   - Id: 161
@@ -5766,7 +5766,7 @@ Body:
       Critical: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5778,7 +5778,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Multi_Hit
     HitCount:
       - Level: 1
@@ -5812,7 +5812,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5830,7 +5830,6 @@ Body:
     Flags:
       IsNpc: true
       TargetTrap: true
-    Range: 5
     Hit: Single
     HitCount: 1
     Element: Fire
@@ -5873,7 +5872,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5887,7 +5886,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5901,7 +5900,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5915,7 +5914,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5929,12 +5928,12 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
-    Duration1: 17000
-    Duration2: 100
+    Duration1: 100
+    Duration2: 17000
     Status: StoneWait
   - Id: 181
     Name: NPC_CURSEATTACK
@@ -5944,7 +5943,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -5958,7 +5957,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -5972,7 +5971,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Random
@@ -5984,7 +5983,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Water
@@ -5997,7 +5996,7 @@ Body:
     Flags:
       IsNpc: true
       TargetHidden: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Earth
@@ -6009,7 +6008,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Fire
@@ -6021,7 +6020,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Wind
@@ -6033,7 +6032,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Poison
@@ -6046,7 +6045,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Holy
@@ -6058,7 +6057,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -6070,7 +6069,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Ghost
@@ -6082,7 +6081,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -6164,7 +6163,7 @@ Body:
       IgnoreFlee: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Dark
@@ -7101,7 +7100,6 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    Range: 9
     Hit: Single
     SplashArea: 1
     CastTime: 2000
@@ -7599,17 +7597,7 @@ Body:
       TargetTrap: true
     Range: 9
     Hit: Multi_Hit
-    HitCount:
-      - Level: 1
-        Count: 1
-      - Level: 2
-        Count: 2
-      - Level: 3
-        Count: 3
-      - Level: 4
-        Count: 4
-      - Level: 5
-        Count: 5
+    HitCount: 5
     Element: Weapon
     CopyFlags:
       Skill:
@@ -9513,7 +9501,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -1
+    Range: -2
     Hit: Multi_Hit
     HitCount: -2
     Element: Dark
@@ -9531,12 +9519,12 @@ Body:
     Flags:
       IsNpc: true
       TargetSelf: true
-    Range: 5
     Hit: Single
     HitCount: 1
     Element: Dark
     AfterCastWalkDelay: 1000
-    Duration1: 18000
+    Duration1: 950
+    Duration2: 18000
     Unit:
       Id: Dummyskill
       Layout: -1
@@ -9639,7 +9627,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     Duration1: 15000
     Status: Stop
@@ -9664,7 +9652,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9677,7 +9665,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9689,7 +9677,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -9701,7 +9689,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Undead
@@ -9709,16 +9697,15 @@ Body:
     Name: NPC_CHANGEUNDEAD
     Description: Undead Attribute Change
     MaxLevel: 5
-    Type: Magic
+    Type: Weapon
     TargetType: Attack
-    DamageFlags:
-      NoDamage: true
     Flags:
       IsNpc: true
-    Range: 9
+    Range: -2
+    Hit: Single
     HitCount: 1
     Element: Undead
-    Duration1: 30000
+    Duration2: 60000
     Status: ChangeUndead
   - Id: 349
     Name: NPC_POWERUP
@@ -9782,7 +9769,6 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 2
   - Id: 353
     Name: NPC_INVISIBLE
     Description: Invisible
@@ -9803,7 +9789,6 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: 2
     Hit: Single
   - Id: 355
     Name: LK_AURABLADE
@@ -16311,8 +16296,8 @@ Body:
         Area: 11
       - Level: 5
         Area: 14
-    Duration1: 17000
-    Duration2: 100
+    Duration1: 100
+    Duration2: 17000
     Status: StoneWait
   - Id: 667
     Name: NPC_WIDECONFUSE
@@ -16520,7 +16505,7 @@ Body:
     TargetType: Attack
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -16535,7 +16520,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -16752,7 +16737,7 @@ Body:
       NoDamage: true
     Flags:
       IsNpc: true
-    Range: -9
+    Range: -7
     HitCount: 1
     Duration2: 180000
     Status: HellPower
@@ -19232,7 +19217,8 @@ Body:
     CastCancel: true
     CastTime: 2000
     AfterCastActDelay: 2000
-    Duration1:
+    Duration1: 100
+    Duration2:
       - Level: 1
         Time: 7000
       - Level: 2
@@ -19243,7 +19229,6 @@ Body:
         Time: 13000
       - Level: 5
         Time: 15000
-    Duration2: 100
     Requires:
       SpCost:
         - Level: 1
@@ -20178,7 +20163,11 @@ Body:
         Time: 240000
       - Level: 5
         Time: 300000
-    Duration2: 300000
+    Duration2:
+      - Level: 1
+        Time: 15000
+      - Level: 2
+        Time: 300000
     Requires:
       SpCost:
         - Level: 1
@@ -20357,7 +20346,7 @@ Body:
     Unit:
       Id: Poisonsmoke
       Layout: 2
-      Interval: 1000
+      Interval: 2000
       Target: Enemy
       Flag:
         NoOverlap: true
@@ -22659,14 +22648,19 @@ Body:
       ItemCost:
         - Item: RepairA
           Amount: 1
+          Level: 1
         - Item: RepairA
           Amount: 1
+          Level: 2
         - Item: RepairB
           Amount: 1
+          Level: 3
         - Item: RepairB
           Amount: 1
+          Level: 4
         - Item: RepairC
           Amount: 1
+          Level: 5
         - Item: Repair_Kit
           Amount: 0
   - Id: 2276
@@ -25640,15 +25634,15 @@ Body:
     Requires:
       SpCost:
         - Level: 1
-          Amount: 40
+          Amount: 25
         - Level: 2
-          Amount: 50
+          Amount: 30
         - Level: 3
-          Amount: 60
+          Amount: 35
         - Level: 4
-          Amount: 70
+          Amount: 40
         - Level: 5
-          Amount: 80
+          Amount: 45
       SpiritSphereCost: 2
   - Id: 2350
     Name: WA_SWING_DANCE
@@ -32012,8 +32006,8 @@ Body:
     HitCount: 1
     CastCancel: true
     AfterCastActDelay: 1000
-    Duration1: 10000
-    Duration2: 5000
+    Duration1: 100
+    Duration2: 10000
     Requires:
       SpCost: 30
     Unit:
@@ -33239,19 +33233,9 @@ Body:
     Range: 9
     Hit: Multi_Hit
     HitCount: -5
-    SplashArea:
-      - Level: 1
-        Area: 1
-      - Level: 2
-        Area: 1
-      - Level: 3
-        Area: 2
-      - Level: 4
-        Area: 2
-      - Level: 5
-        Area: 3
+    SplashArea: 3
     CastCancel: true
-    CastTime: 3000
+    CastTime: 2000
     AfterCastActDelay: 1000
     Duration1:
       - Level: 1
@@ -33266,7 +33250,7 @@ Body:
         Time: 3500
     Duration2: 18000
     Cooldown: 5000
-    FixedCastTime: 3000
+    FixedCastTime: 1500
     Requires:
       SpCost:
         - Level: 1
@@ -33656,17 +33640,7 @@ Body:
     Range: 9
     Hit: Multi_Hit
     HitCount: -5
-    SplashArea:
-      - Level: 1
-        Area: 1
-      - Level: 2
-        Area: 1
-      - Level: 3
-        Area: 2
-      - Level: 4
-        Area: 2
-      - Level: 5
-        Area: 3
+    SplashArea: 3
     CastCancel: true
     Duration1:
       - Level: 1
@@ -40737,7 +40711,7 @@ Body:
     MaxLevel: 5
     Type: Weapon
     TargetType: Attack
-    Range: 1
+    Range: 15
     Hit: Multi_Hit
     HitCount:
       - Level: 1
@@ -40857,7 +40831,7 @@ Body:
     MaxLevel: 3
     Type: Weapon
     TargetType: Attack
-    Range: 1
+    Range: 15
     Hit: Single
     HitCount: 1
     AfterCastActDelay: 1000
@@ -40869,7 +40843,7 @@ Body:
     MaxLevel: 5
     Type: Magic
     TargetType: Attack
-    Range: 9
+    Range: 15
     Hit: Single
     HitCount:
       - Level: 1
@@ -40934,7 +40908,6 @@ Body:
       IgnoreElement: true
       IgnoreFlee: true
       IgnoreDefCard: true
-    Range: 4
     Hit: Single
     HitCount: 1
     Element: Weapon
@@ -42495,7 +42468,7 @@ Body:
         - Level: 10
           Amount: 16
       SpCost: 30
-    Status: Watk_Element
+    Status: Sub_Weaponproperty
   - Id: 8203
     Name: MS_BOWLINGBASH
     Description: Bowling_Bash

db/re/status.yml

@@ -71,7 +71,6 @@ Body:
       Stun: true
       Sleep: true
       Burning: true
-      #Undead: true
     End:
       Aeterna: true
     EndReturn:
@@ -84,6 +83,7 @@ Body:
     Opt1: StoneWait
     Flags:
       SendOption: true
+      BossResist: true      
       StopAttacking: true
     Fail:
       Whiteimprison: true
@@ -91,7 +91,6 @@ Body:
       Stun: true
       Sleep: true
       Burning: true
-      #Undead: true
     EndReturn:
       StoneWait: true
       Stone: true
@@ -117,8 +116,14 @@ Body:
       Inspiration: true
       Warmer: true
       Gvg_Freez: true
+      Whiteimprison: true
+      Stone: true
+      StoneWait: true
+      Freeze: true
+      Stun: true
+      Sleep: true
+      Burning: true
     End:
-      Dancing: true
       Aeterna: true
   - Status: Stun
     DurationLookup: NPC_STUNATTACK
@@ -132,13 +137,11 @@ Body:
       BossResist: true
       StopAttacking: true
       StopCasting: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Stun: true
-    End:
-      Dancing: true
+      Stun: true
   - Status: Sleep
     DurationLookup: NPC_SLEEPATTACK
     States:
@@ -152,13 +155,11 @@ Body:
       StopAttacking: true
       StopCasting: true
       RemoveOnDamaged: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Sleep: true
-    End:
-      Dancing: true
+      Sleep: true
   - Status: Poison
     DurationLookup: NPC_POISON
     CalcFlags:
@@ -170,11 +171,12 @@ Body:
       SendOption: true
       BossResist: true
       StopAttacking: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
       Inspiration: true
+      Poison: true
+      Dpoison: true
   - Status: Curse
     DurationLookup: NPC_WIDECURSE
     CalcFlags:
@@ -187,12 +189,12 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Curse: true
+      Curse: true
   - Status: Silence
     DurationLookup: NPC_SILENCEATTACK
     States:
@@ -203,23 +205,22 @@ Body:
       SendOption: true
       BossResist: true
       StopCasting: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
       Inspiration: true
       Gvg_Silence: true
+      Silence: true
   - Status: Confusion
     DurationLookup: NPC_WIDECONFUSE
     Flags:
       BossResist: true
       StopWalking: true
-      RemoveOnDamaged: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
       Inspiration: true
+    EndReturn:
       Confusion: true
   - Status: Blind
     DurationLookup: NPC_BLINDATTACK
@@ -231,13 +232,13 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
       Inspiration: true
       Fear: true
       Gvg_Blind: true
+      Blind: true
   - Status: Bleeding
     Icon: EFST_BLOODING
     DurationLookup: NPC_BLEEDING
@@ -250,7 +251,6 @@ Body:
       BossResist: true
       NoSave: true
       NoClearance: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -265,7 +265,6 @@ Body:
     Flags:
       SendOption: true
       BossResist: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
@@ -1100,9 +1099,10 @@ Body:
       NoClearbuff: true
       NoDispell: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoClearance: true
       NoForcedEnd: true
+    Fail:
+      Nochat: true
   - Status: Protectexp
     Icon: EFST_PROTECTEXP
     DurationLookup: WE_BABY
@@ -1182,7 +1182,7 @@ Body:
     Flags:
       NoSave: true
   - Status: Assumptio
-    Icon: EFST_ASSUMPTIO_BUFF
+    Icon: EFST_ASSUMPTIO2
     DurationLookup: HP_ASSUMPTIO
     CalcFlags:
       Def: true
@@ -1313,7 +1313,8 @@ Body:
       Marionette: true
     Flags:
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Marionette: true
   - Status: Marionette2
     Icon: EFST_MARIONETTE
     DurationLookup: CG_MARIONETTE
@@ -1328,7 +1329,8 @@ Body:
       Marionette: true
     Flags:
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Marionette2: true
   - Status: Changeundead
     Icon: EFST_PROPERTYUNDEAD
     DurationLookup: NPC_CHANGEUNDEAD
@@ -1413,16 +1415,17 @@ Body:
       Mdef: true
       Aspd: true
       Speed: true
+    Flags:
+      NoSave: true
     Opt3:
       SteelBody: true
   - Status: Orcish
     DurationLookup: SA_REVERSEORCISH
     Flags:
       Debuff: true
+      SendOption: true
     Options:
       Orcish: true
-    Flags:
-      SendOption: true
   - Status: Readystorm
     Icon: EFST_STORMKICK_ON
     DurationLookup: TK_READYSTORM
@@ -1650,7 +1653,8 @@ Body:
       NoSave: true
       NoRemoveOnDead: true
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Closeconfine2: true
   - Status: Dancing
     Icon: EFST_BDPLAYING
     DurationLookup: BD_ENCORE
@@ -2608,7 +2612,8 @@ Body:
       NoBanishingBuster: true
       NoClearance: true
       RemoveOnMapWarp: true
-      OverlapFail: true
+    Fail:
+      Bossmapinfo: true
   - Status: Lifeinsurance
     Icon: EFST_CASH_DEATHPENALTY
     States:
@@ -2777,16 +2782,22 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
-      NoRemoveOnDead: true
+    End:
+      L_Lifepotion: true
+      M_Lifepotion: true
+    Fail:
+      S_Lifepotion: true
   - Status: L_Lifepotion
     Icon: EFST_L_LIFEPOTION
     Flags:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
-      NoRemoveOnDead: true
+    End:
+      S_Lifepotion: true
+      M_Lifepotion: true
+    Fail:
+      L_Lifepotion: true
   - Status: Jexpboost
     Icon: EFST_CASH_PLUSONLYJOBEXP
     Flags:
@@ -2951,7 +2962,6 @@ Body:
     Flags:
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
     Fail:
       Inspiration: true
@@ -2969,7 +2979,6 @@ Body:
       RemoveOnLuxAnima: true
       BossResist: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     MinDuration: 10000
     Fail:
@@ -2992,13 +3001,13 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     MinDuration: 10000
     Fail:
       Refresh: true
       Inspiration: true
       Warmer: true
+      Freezing: true
   - Status: Enchantblade
     Icon: EFST_ENCHANTBLADE
     DurationLookup: RK_ENCHANTBLADE
@@ -3042,8 +3051,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Refresh: true
   - Status: Giantgrowth
     Icon: EFST_GIANTGROWTH
     DurationLookup: RK_GIANTGROWTH
@@ -3102,7 +3112,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
+    Fail:
+      Abundance: true
   - Status: Adoramus
     Icon: EFST_ADORAMUS
     DurationLookup: AB_ADORAMUS
@@ -3188,12 +3199,8 @@ Body:
       StopWalking: true
       StopAttacking: true
       StopCasting: true
-      OverlapFail: true
     End:
-      Burning: true
       Freezing: true
-      Freeze: true
-      Stone: true
   - Status: Marshofabyss
     Icon: EFST_MARSHOFABYSS
     DurationLookup: WL_MARSHOFABYSS
@@ -3286,8 +3293,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoSave: true
-      OverlapFail: true
       NoClearance: true
+    Fail:
+      Electricshocker: true
   - Status: Wugdash
     Icon: EFST_WUGDASH
     DurationLookup: RA_WUGDASH
@@ -3552,8 +3560,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
+    Fail:
+      Toxin: true
   - Status: Paralyse
     Icon: EFST_PARALYSE
     CalcFlags:
@@ -3567,7 +3576,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3591,7 +3599,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3615,7 +3622,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3639,7 +3645,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3663,7 +3668,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3690,7 +3694,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3712,7 +3715,6 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
       SpreadEffect: true
     Fail:
       Refresh: true
@@ -3732,6 +3734,7 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       RequireShield: true
+      NoSave: true
     End:
       Reflectshield: true
   - Status: Forceofvanguard
@@ -3787,18 +3790,20 @@ Body:
       Def: true
     Flags:
       DisplayPc: true
-      OverlapFail: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal1: true
+    Fail:
+      Banding: true
     End:
       Prestige: true
   - Status: Banding_Defence
     Icon: EFST_BANDING_DEFENCE
     Flags:
       BossResist: true
-      OverlapFail: true
+    Fail:
+      Banding_Defence: true
   - Status: Earthdrive
     Icon: EFST_EARTHDRIVE
     DurationLookup: LG_EARTHDRIVE
@@ -3850,11 +3855,11 @@ Body:
       StopCasting: true
       SetStand: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
       Warmer: true
+      Crystalize: true
   - Status: Striking
     Icon: EFST_STRIKING
     DurationLookup: SO_STRIKING
@@ -4036,11 +4041,11 @@ Body:
       RemoveOnDamaged: true
       NoSave: true
       Debuff: true
-      OverlapFail: true
     MinDuration: 5000
     Fail:
       Refresh: true
       Inspiration: true
+      Deepsleep: true
     End:
       Dancing: true
       Voiceofsiren: true
@@ -4253,8 +4258,9 @@ Body:
       DisplayPc: true
       BossResist: true
       StopWalking: true
-      OverlapFail: true
       Debuff: true
+    Fail:
+      Netherworld: true
   - Status: Crescentelbow
     Icon: EFST_CRESCENTELBOW
     DurationLookup: SR_CRESCENTELBOW
@@ -4297,7 +4303,8 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
+    Fail:
+      Cursedcircle_Target: true
   - Status: Lightningwalk
     Icon: EFST_LIGHTNINGWALK
     DurationLookup: SR_LIGHTNINGWALK
@@ -4414,10 +4421,10 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       Debuff: true
-      OverlapFail: true
     Fail:
       Refresh: true
       Inspiration: true
+      Mandragora: true
   - Status: Stomachache
     Icon: EFST_STOMACHACHE
     CalcFlags:
@@ -4669,13 +4676,13 @@ Body:
       Batk: true
       Watk: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal2: true
     Fail:
       Inspiration: true
+      _Enervation: true
   - Status: _Groomy
     Icon: EFST_GROOMY
     DurationLookup: SC_GROOMY
@@ -4683,25 +4690,25 @@ Body:
       Aspd: true
       Hit: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal3: true
     Fail:
       Inspiration: true
+      _Groomy: true
   - Status: _Ignorance
     Icon: EFST_IGNORANCE
     DurationLookup: SC_IGNORANCE
     States:
       NoCast: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
     Fail:
       Inspiration: true
+      _Ignorance: true
   - Status: _Laziness
     Icon: EFST_LAZINESS
     DurationLookup: SC_LAZINESS
@@ -4709,13 +4716,13 @@ Body:
       Flee: true
       Speed: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal3: true
     Fail:
       Inspiration: true
+      _Laziness: true
   - Status: _Unlucky
     Icon: EFST_UNLUCKY
     DurationLookup: SC_UNLUCKY
@@ -4723,26 +4730,26 @@ Body:
       Cri: true
       Flee2: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal3: true
     Fail:
       Inspiration: true
+      _Unlucky: true
   - Status: _Weakness
     Icon: EFST_WEAKNESS
     DurationLookup: SC_WEAKNESS
     CalcFlags:
       MaxHp: true
     Flags:
-      OverlapFail: true
       BossResist: true
       NoBanishingBuster: true
       NoClearance: true
       SendVal2: true
     Fail:
       Inspiration: true
+      _Weakness: true
   - Status: _Stripaccessory
     Icon: EFST_STRIPACCESSARY
     DurationLookup: SC_STRIPACCESSARY
@@ -5456,7 +5463,8 @@ Body:
     Flags:
       NoSave: true
       RemoveOnChangeMap: true
-      OverlapFail: true
+    Fail:
+      Tinder_Breaker2: true
   - Status: Cbc
     Icon: EFST_CBC
     DurationLookup: MH_CBC
@@ -5581,14 +5589,14 @@ Body:
     Icon: EFST_SET_NUM_DEF
     CalcFlags:
       Def: true
-    Flags:
-      OverlapFail: true
+    Fail:
+      Defset: true
   - Status: Mdefset
     Icon: EFST_SET_NUM_MDEF
     CalcFlags:
       Mdef: true
-    Flags:
-      OverlapFail: true
+    Fail:
+      Mdefset: true
   - Status: Darkcrow
     Icon: EFST_DARKCROW
     DurationLookup: GC_DARKCROW
@@ -6152,8 +6160,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_A: true
   - Status: Reuse_Limit_B
     Icon: EFST_REUSE_LIMIT_B
     Flags:
@@ -6162,8 +6171,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_B: true
   - Status: Reuse_Limit_C
     Icon: EFST_REUSE_LIMIT_C
     Flags:
@@ -6172,8 +6182,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_C: true
   - Status: Reuse_Limit_D
     Icon: EFST_REUSE_LIMIT_D
     Flags:
@@ -6182,8 +6193,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_D: true
   - Status: Reuse_Limit_E
     Icon: EFST_REUSE_LIMIT_E
     Flags:
@@ -6192,8 +6204,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_E: true
   - Status: Reuse_Limit_F
     Icon: EFST_REUSE_LIMIT_F
     Flags:
@@ -6202,8 +6215,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_F: true
   - Status: Reuse_Limit_G
     Icon: EFST_REUSE_LIMIT_G
     Flags:
@@ -6212,8 +6226,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_G: true
   - Status: Reuse_Limit_H
     Icon: EFST_REUSE_LIMIT_H
     Flags:
@@ -6222,8 +6237,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_H: true
   - Status: Reuse_Limit_Mtf
     Icon: EFST_REUSE_LIMIT_MTF
     Flags:
@@ -6232,8 +6248,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_Mtf: true
   - Status: Reuse_Limit_Aspd_Potion
     Icon: EFST_REUSE_LIMIT_ASPD_POTION
     Flags:
@@ -6242,8 +6259,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_Aspd_Potion: true
   - Status: Reuse_Millenniumshield
     Icon: EFST_REUSE_MILLENNIUMSHIELD
     Flags:
@@ -6252,8 +6270,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Millenniumshield: true
   - Status: Reuse_Crushstrike
     Icon: EFST_REUSE_CRUSHSTRIKE
     Flags:
@@ -6262,8 +6281,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Crushstrike: true
   - Status: Reuse_Stormblast
     Icon: EFST_REUSE_STORMBLAST
     Flags:
@@ -6272,8 +6292,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Stormblast: true
   - Status: All_Riding_Reuse_Limit
     Icon: EFST_ALL_RIDING_REUSE_LIMIT
     Flags:
@@ -6282,8 +6303,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      All_Riding_Reuse_Limit: true
   - Status: Reuse_Limit_Ecl
     Icon: EFST_REUSE_LIMIT_ECL
     Flags:
@@ -6292,8 +6314,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_Ecl: true
   - Status: Reuse_Limit_Recall
     Icon: EFST_REUSE_LIMIT_RECALL
     Flags:
@@ -6302,8 +6325,9 @@ Body:
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
-      OverlapFail: true
       NoForcedEnd: true
+    Fail:
+      Reuse_Limit_Recall: true
   - Status: Promote_Health_Reserch
     Icon: EFST_PROMOTE_HEALTH_RESERCH
     CalcFlags:
@@ -6314,8 +6338,8 @@ Body:
       MaxSp: true
   - Status: Norecover_State
     Icon: EFST_HANDICAPSTATE_NORECOVER
-    Flags:
-      OverlapFail: true
+    Fail:
+      Norecover_State: true
   - Status: Suhide
     Icon: EFST_SUHIDE
     DurationLookup: SU_HIDE
@@ -6685,9 +6709,10 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
+    Fail:
+      Doram_Buf_01: true
   - Status: Doram_Buf_02
     Icon: EFST_DORAM_BUF_02
     CalcFlags:
@@ -6696,9 +6721,10 @@ Body:
       NoRemoveOnDead: true
       NoClearbuff: true
       NoBanishingBuster: true
-      OverlapFail: true
       NoDispell: true
       NoClearance: true
+    Fail:
+      Doram_Buf_02: true
   - Status: Hiss
     Icon: EFST_HISS
     DurationLookup: SU_HISS
@@ -7212,9 +7238,10 @@ Body:
       NoBanishingBuster: true
       NoDispell: true
       NoClearance: true
-      OverlapFail: true
       NoRemoveOnDead: true
       NoClearbuff: true
+    Fail:
+      Reuse_Limit_Luxanima: true
   - Status: Ensemblefatigue
     Icon: EFST_ENSEMBLEFATIGUE
     States:
@@ -7572,6 +7599,7 @@ Body:
   - Status: Chargingpierce_Count
     Icon: EFST_CHARGINGPIERCE_COUNT
     Flags:
+      SendVal1: true
       DisplayPc: true
   - Status: Dragonic_Aura
     Icon: EFST_DRAGONIC_AURA
@@ -7861,6 +7889,7 @@ Body:
     DurationLookup: TR_JAWAII_SERENADE
     CalcFlags:
       Smatk: true
+      Speed: true
   - Status: Pron_March
     Icon: EFST_PRON_MARCH
     DurationLookup: TR_PRON_MARCH
@@ -8109,3 +8138,31 @@ Body:
       All: true
     Flags:
       RemoveElementalOption: true
+  - Status: M_Lifepotion
+    Icon: EFST_M_LIFEPOTION
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    End:
+      S_Lifepotion: true
+      L_Lifepotion: true
+    Fail:
+      M_Lifepotion: true
+  - Status: S_Manapotion
+    Icon: EFST_S_MANAPOTION
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    Fail:
+      S_Manapotion: true
+  - Status: Sub_Weaponproperty
+    Flags:
+      NoBanishingBuster: true
+      NoDispell: true
+      NoClearance: true
+      NoRemoveOnDead: true
+      NoClearbuff: true
+    End:
+      Sub_Weaponproperty: true

doc/atcommands.txt

@@ -1178,6 +1178,12 @@ If args are given, sets camera position.
 
 ---------------------------------------
 
+@enchantgradeui
+
+Opens the enchantgrade UI.
+
+---------------------------------------
+
 ==============================
 | 5. Administrative Commands |
 ==============================

doc/item_bonus.txt

@@ -125,7 +125,7 @@ Atk/Def
 bonus bBaseAtk,n;  			Basic attack power + n
 bonus bAtk,n;      			ATK + n (unofficial)
 bonus bAtk2,n;     			ATK2 + n
-bonus bAtkRate,n;  			Attack power + n% (unofficial)
+bonus bAtkRate,n;  			ATK + n% that won't interfere with Damage modifier and SC_EDP (renewal mode only)
 bonus bWeaponAtkRate,n; 	Weapon ATK + n%
 bonus bMatk,n;     			Magical attack power + n
 bonus bMatkRate,n; 			Magical attack power + n%

doc/mapflags.txt

@@ -165,7 +165,6 @@ Disables shop creation on a map from the ALL_BUYING_STORE skill.
 *nousecart
 
 Disables cart usage on a map.
-[Not fully implemented.]
 
 ---------------------------------------
 
@@ -226,10 +225,9 @@ Disables Star Gladiator's "Solar, Lunar, and Stellar Miracle" from occurring on
 
 ---------------------------------------
 
-*nomineeffect
+*forcemineffect
 
-Disables mine effects on a map.
-[More information needed.]
+Forces simpler skill effects, just like the command /mineffect.
 
 ---------------------------------------
 

doc/mob_skill_db.txt

@@ -0,0 +1,172 @@
+//===== rAthena Documentation ================================
+//= rAthena Monster Skill Database Reference
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20210601
+//===== Description: =========================================
+//= Reference for monster skills Database.
+//============================================================
+
+---------------------------------------
+
+Mob: The Aegis name of the monster (SpriteName).
+
+Note: If one of the following names is provided, the skills will be treated as 'global':
+ALL_BOSS		Added for all boss types.
+ALL_NORMAL		Added for all normal types.
+ALL				Added for all mobs.
+
+---------------------------------------
+
+Skills: List of Skills casted by the monster. The max number of skills a monster can hold is limited by MAX_MOBSKILL (50 by default).
+(starting here the definitions below are the one defined in Skills).
+
+---------------------------------------
+
+Index: Unique Index in the list to edit the skill on import. Range 0-65535.
+
+---------------------------------------
+
+Name: Skill Aegis name the monster will cast.
+
+---------------------------------------
+
+Level: The monster will cast the skill at the given Level.
+
+---------------------------------------
+
+State: State of the monster to cast the skill.
+
+Valid options:
+
+ANY (except dead)
+IDLE (in standby)
+WALK (in movement)
+DEAD (on killed)
+LOOT
+ATTACK
+ANGRY (like ATTACK, except player has not attacked mob yet)
+CHASE (following target, after being attacked)
+FOLLOW (following target, without being attacked)
+ANYTARGET (ATTACK+ANGRY+CHASE+FOLLOW)
+
+---------------------------------------
+
+CastRate: The chance of the skill being casted when the condition is fulfilled (from 1-10000, 10000 = 100%). 
+
+---------------------------------------
+
+CastTime: Time in millisecond to cast the skill.
+
+---------------------------------------
+
+CastDelay: The time (in milliseconds) before attempting to recast the same skill.
+
+---------------------------------------
+
+CastCancel: Whether the skill can be canceled when the monster is hit. (true/false)
+
+---------------------------------------
+
+Target: Target of the skill.
+
+Valid options:
+
+TARGET			(current target)
+SELF
+FRIEND
+MASTER
+RANDOMTARGET	(any enemy within skill's range)
+
+(The following are for ground-skills, a random target tile is selected from the specified area)
+AROUND1			(3x3 area around self)
+AROUND2			(5x5 area around self)
+AROUND3			(7x7 area around self)
+AROUND4			(9x9 area around self)
+AROUND5			(3x3 area around target)
+AROUND6			(5x5 area around target)
+AROUND7			(7x7 area around target)
+AROUND8			(9x9 area around target)
+AROUND			= AROUND4
+
+---------------------------------------
+
+Condition: Type of condition.
+
+Valid options:
+
+ALWAYS				(no condition value)			Unconditional.
+ONSPAWN				(no condition value)			When mob spawns/respawns.
+SPAWN = ONSPAWN
+MYHPLTMAXRATE		(ConditionValue1)				When mob's HP drops to the specified %.
+MYHPINRATE			(ConditionValue1 = lower bound
+					ConditionValue2 = upper bound)	When mob's HP is in a certain % range (ConditionValue1 = lower bound, ConditionValue2 = upper bound).
+MYSTATUSON			(ConditionValue1)				If mob has the specified abnormality in status.
+MYSTATUSOFF			(ConditionValue1)				If mob has ended the specified abnormality in status.
+FRIENDHPLTMAXRATE	(ConditionValue1)				When mob's friend's HP drops to the specified %.
+FRIENDHPINRATE		(ConditionValue1 = lower bound
+					ConditionValue2 = upper bound)	When mob's friend's HP is in a certain % range (ConditionValue1 = lower bound, ConditionValue2 = upper bound).
+FRIENDSTATUSON		(ConditionValue1)				If friend has the specified abnormality in status.
+FRIENDSTATUSOFF		(ConditionValue1)				If friend has ended the specified abnormality in status.
+ATTACKPCGT			(ConditionValue1)				When attack PCs become greater than specified number.
+ATTACKPCGE			(ConditionValue1)				When attack PCs become greater than or equal to the specified number.
+SLAVELT				(ConditionValue1)				When number of slaves is less than the original specified number.
+SLAVELE				(ConditionValue1)				When number of slaves is less than or equal to the original specified number.
+CLOSEDATTACKED		(no condition value)			When close range melee attacked.
+LONGRANGEATTACKED	(no condition value)			When long range attacked, ex. bows, guns, ranged skills.
+SKILLUSED			(ConditionValue1)				When the specified skill is used on the mob.
+AFTERSKILL			(ConditionValue1)				After mob casts the specified skill.
+CASTTARGETED		(no condition value)			When a target is in cast range.
+RUDEATTACKED		(no condition value)			When mob is rude attacked.
+
+---------------------------------------
+
+ConditionValue1: Value required at certain conditions.
+
+Status abnormalities accepted through MYSTATUSON / MYSTATUSOFF / FRIENDSTATUSON / FRIENDSTATUSOFF for ConditionValue1:
+SC_ANYBAD (any type of state change)
+SC_STONE
+SC_FREEZE
+SC_STUN
+SC_SLEEP
+SC_POISON
+SC_CURSE
+SC_SILENCE
+SC_CONFUSION
+SC_BLIND
+SC_HIDING
+SC_SIGHT (unhidden)
+
+When the Condition is SKILLUSED or AFTERSKILL, ConditionValue1 requires an Aegis skill name.
+ConditionValue1 requires a number for all other conditions.
+
+---------------------------------------
+
+ConditionValue2: Number required for MYHPINRATE and FRIENDHPINRATE conditions.
+
+---------------------------------------
+
+Ai: Change the monster mode using the given Aegis monster type AI.
+    Note: When used with NPC_EMOTION_ON the Ai is added to the current AI. The others skills replace the monster AI by Ai.
+
+---------------------------------------
+
+Summon: List of monsters to summon. Required for NPC_METAMORPHOSIS, NPC_SUMMONSLAVE, NPC_SUMMONMONSTER, and NPC_DEATHSUMMON skills.
+    - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+      Mob              Monster AegisName.
+      Clear            True to remove the given monster at this index. (Optional)
+
+---------------------------------------
+
+Emotion: Emotion displayed on the monster after the cast. See the constants starting to "ET_" in script_constant.hpp
+
+---------------------------------------
+
+Chat: Chat ID to display the associated sentence defined in mob_chat_db.yml
+
+---------------------------------------
+
+Clear: True to remove the skill.
+
+---------------------------------------

doc/quest_db.txt

@@ -0,0 +1,57 @@
+//===== rAthena Documentation ================================
+//= Quest Database Structure
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Last Updated: ========================================
+//= 20220629
+//===== Description: =========================================
+//= Explanation of the quest_db.yml file and structure.
+//============================================================
+
+---------------------------------------
+
+Id: Quest ID.
+
+---------------------------------------
+
+Title: Quest title.
+
+---------------------------------------
+
+TimeLimit: Amount of time before the quest expires.
+
+Use a number followed by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
+Specifying with "+" will mark how long until the quest expires.
+Specifying without "+" will mark the exact time the quest expires. Format: "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional).
+
+Please note the number before "d" only shifts the exact timer to the given day(s).
+
+---------------------------------------
+
+Targets: Quest objective target.
+
+The target can be a combination of Mob/Count or of Id/Count and other fields.
+If Mob is supplied, Count is required and the other fields are ignored.
+If Id is supplied, Count is required for each new entry.
+
+  - Mob                Name of monster to kill (aegis monster name).
+    Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+    Id                 Unique target index for the quest Id. Requires a positive number.
+    Race               Monster race target. (Default: All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
+    Size               Monster size target. (Default: All). Valid sizes are Small, Medium, Large, All.
+    Element            Monster element target. (Default: All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
+    MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import.
+    MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import.
+    Location           Map name where kills are counted.
+    MapName            Displayed map name in quest UI.
+    MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used.
+      <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+
+---------------------------------------
+
+Drops: Quest item drop targets.
+
+  - Mob              Monster to kill. 0 will apply to all monsters.
+    Item             Item to drop (aegis item name).
+    Count            Amount of items that will drop. Non-stackable items default to 1.
+    Rate             Item drop rate. (10000 = 100%)

doc/script_commands.txt

@@ -3,7 +3,7 @@
 //===== By:==================================================
 //= rAthena Dev Team
 //===== Last Updated:========================================
-//= 20201115
+//= 20220308
 //===== Description:=========================================
 //= A reference manual for the rAthena scripting language.
 //= Commands are sorted depending on their functionality.
@@ -4579,6 +4579,22 @@ Unlike 'getexp', this command ignores the adjustment factors!
 
 ---------------------------------------
 
+*getbaseexp_ratio(<percent>{,<base_level>{,char_id});
+
+Returns the amount of base experience representing the given <percent> of the
+required base experience at <base_level>. If no base level is specified the base
+level of the attached character will be used.
+
+---------------------------------------
+
+*getjobexp_ratio(<percent>{,<job_level>{,char_id});
+
+Returns the amount of job experience representing the given <percent> of the
+required job experience at <job_level>. If no job level is specified the job
+level of the attached character will be used.
+
+---------------------------------------
+
 *setlook <look type>,<look value>{,<char_id>};
 *changelook <look type>,<look value>{,<char_id>};
 
@@ -6777,6 +6793,13 @@ If no <character ID> is specified it will display to the area.
 
 ---------------------------------------
 
+*cloakonnpcself {"<NPC object name>"};
+*cloakoffnpcself {"<NPC object name>"};
+
+Same command as above, but an attached player is required. The NPC will only display to the attached player.
+
+---------------------------------------
+
 *isnpccloaked {"<NPC object name>"{,<character ID>}};
 
 Returns true if the NPC has been cloaked to the attached player or given
@@ -7854,6 +7877,42 @@ memory of where the points are set whatsoever.
 
 ---------------------------------------
 
+*viewpointmap "<map name>",<action>,<x>,<y>,<point number>,<color>;
+
+This command will mark places on the mini map in the client for all players currently
+on the defined map. It uses the normal X and Y coordinates from the main map.
+The colors of the marks are defined using a hexadecimal number, same as the ones
+used to color text in 'mes' output, but are written as hexadecimal numbers in C.
+(They look like 0x<six numbers>.)
+
+Action is what you want to do with a point, 1 will set it, while 2 will clear
+it. 0 will also set it, but automatically removes the point after 15 seconds.
+Point number is the number of the point - you can have several. If more than
+one point is drawn at the same coordinates, they will cycle, which can be used
+to create flashing marks.
+
+	// This command will show a mark at coordinates X 30 Y 40, is mark number 1,
+	// and will be red for all players currently on the map Prontera.
+
+	viewpointmap "prontera",1,30,40,1,0xFF0000;
+
+This will create three points:
+	.@map$ = "prontera";
+	viewpointmap .@map$,1,30,40,1,0xFF0000;
+	viewpointmap .@map$,1,35,45,2,0xFF0000;
+	viewpointmap .@map$,1,40,50,3,0xFF0000;
+
+And this is how you remove them:
+	.@map$ = "prontera";
+	viewpointmap .@map$,2,30,40,1,0xFF0000;
+	viewpointmap .@map$,2,35,45,2,0xFF0000;
+	viewpointmap .@map$,2,40,50,3,0xFF0000;
+
+The client determines what it does with the points entirely, the server keeps no
+memory of where the points are set whatsoever.
+
+---------------------------------------
+
 *cutin "<filename>",<position>;
 
 This command will display a picture, usually an NPC illustration, also called
@@ -8105,7 +8164,15 @@ This function is intended for use in item scripts.
 
 Opens the Bank UI for the attached player or the given character ID.
 
-This command requires packet version 2015-01-28 or newer.
+This command requires packet version 2015-12-02 or newer.
+
+---------------------------------------
+
+*enchantgradeui {<char id>};
+
+Opens the enchantgrade UI for the attached character or the player given by the char ID parameter.
+
+This command requires packet version 2020-07-24 or newer.
 
 ---------------------------------------
 \\
@@ -8203,6 +8270,8 @@ values (can be combined using the pipe operator):
 	USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
 	USW_FORCE_STOP = Force stop moving.
 
+This command will also remove the state tracking used for 'unitwalk' and 'unitwalkto'.
+
 ---------------------------------------
 
 *unittalk <GID>,"<text>"{,flag};
@@ -9570,7 +9639,7 @@ Examples:
 *questinfo <Icon>{,<Map Mark Color>{,"<condition>"}};
 
 This command should only be used in OnInit/OnInstanceInit labels.
-Show an emotion on top of a NPC, and optionally, a colored mark in the mini-map like "viewpoint".
+Show an emotion on top of a NPC, and optionally, a colored mark in the mini-map like "viewpoint" or "viewpointmap".
 When a user is doing some action, each NPC is checked for questinfo that has been set on the map.
 If questinfo is present, it will check if the player fulfill the condition.
 If he/she does or no condition has been set, the bubble will appear.
@@ -9696,7 +9765,7 @@ Return the state of the quest:
 *showevent <icon>{,<mark color>{,<char_id>}}
 
 Show an emotion on top of a NPC, and optionally,
-a colored mark in the mini-map like "viewpoint".
+a colored mark in the mini-map like "viewpoint" or "viewpointmap".
 This is used to indicate that a NPC has a quest or an event to
 a certain player.
 
@@ -9725,6 +9794,8 @@ QMARK_PURPLE - Purple Marker
 Opens the quest UI for the attached player or the given character ID.
 Use 0 as the quest ID to open the main quest UI. If the quest ID is not 0 then the quest UI is opened to the given quest. If the quest data is not populated in the client LUB then a message will be displayed saying the quest doesn't exist.
 
+This command requires packet version 2015-12-02 or newer.
+
 ---------------------------------------
 
 ============================

doc/status.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20220406
+//= 20220421
 //===== Description: =========================================
 //= Explanation of the status.yml file and structure.
 //============================================================
@@ -113,6 +113,7 @@ Opt1: Special effect when status is active (Aegis: BODYSTATE_*). This option is
 
 	None         - No effect (Default)
 	Stone        - Stone curse effect
+	StoneWait    - Stone curse incubation effect
 	Freeze       - Freeze effect
 	Stun         - Stun effect
 	Sleep        - Sleep effect
@@ -200,7 +201,6 @@ Flags: Various status flags for specific status change events.
 	DislpayNpc            - Displays status effect on a NPC.
 	Debuff                - Status is considered a debuff. Used in combination with 'battle_config.debuff_on_logout'.
 	SetStand              - Sets player to standing state.
-	OverlapFail           - The status will fail to activate if the status is already active.
 	OverlapIgnoreLevel    - The status will successfully activate for any level if the status is already active.
 	FailedMado            - Cannot be applied if Madogear is active.
 	MadoCancel            - Cancels the status when mounting Madogear.

doc/yaml/db/job_basepoints.yml

@@ -8,9 +8,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.

doc/yaml/db/job_exp.yml

@@ -8,9 +8,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.

doc/yaml/db/job_stats.yml

@@ -8,9 +8,9 @@
 # - Jobs:                    List of jobs associated to group.
 #     Job                    Job name.
 #   MaxWeight                Base maximum weight. (Default: 20000)
-#   HPFactor                 HP increase per base level. Floor(HPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 20000)
-#   HPMultiplicator          Base HP value. 35 + BaseLv * (HPMultiplicator / 100). Used when macro HP_SP_TABLES is disabled. (Default: 500)
-#   SPFactor                 SP increase per job level. Floor(SPFactor / 100) * BaseLv. Used when macro HP_SP_TABLES is disabled. (Default: 100)
+#   HpFactor                 Exponential HP increase. Per base level: [HpFactor * BaseLv / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 0)
+#   HpIncrease               Linear HP increase. Per base level: [HpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 500)
+#   SpIncrease               Linear SP increase. Per base level: [SpIncrease / 100]. Used when macro HP_SP_TABLES is disabled. (Default: 100)
 #   BaseASPD:                Base ASPD for each weapon type. (Default: 2000)
 #     Weapon                 Weapon type with associated ASPD.
 #   BonusStats:              Job level bonus stats/traits.

doc/yaml/db/license.yml

@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2021 rAthena Development Team
+#   Copyright(C) 2022 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify

doc/yaml/db/mob_avail.yml

@@ -16,6 +16,7 @@
 #   HeadTop                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadMid                 Item name of headgear (if Sprite is a player). (Default: 0)
 #   HeadLow                 Item name of headgear (if Sprite is a player). (Default: 0)
+#   Robe                    Item name of robe (if Sprite is a player). (Default: 0)
 #   PetEquip                Item name of pet equipment (if Mob is a valid pet). (Default: 0)
 #   Options:                Set an option for an object. (Optional)
 #     <Option>: bool

doc/yaml/db/mob_skill_db.yml

@@ -0,0 +1,30 @@
+###########################################################################
+# Monster Skill Database
+###########################################################################
+#
+# Monster Skill Settings
+#
+###########################################################################
+# - Mob                     Monster AegisName.
+#   Skills:                 List of Skills casted by the monster.
+#    - Index                Unique Index in the list to edit the skill on import.
+#      Name                 Skill AegisName.
+#      Level                Skill Level.
+#      State                State of the monster to cast the skill. (Default: ATTACK)
+#      CastRate             Rate to cast the skill (from 1-10000). (Default: 10000)
+#      CastTime             Time in millisecond to cast the skill. (Default: 0)
+#      CastDelay            Delay in millisecond to recast the skill. (Default: 5000)
+#      CastCancel           Whether the skill is cancelable or not. (Default: true)
+#      Target               Target of the skill. (Default: TARGET)
+#      Condition            Type of condition. (Default: ALWAYS)
+#      ConditionValue1      Value given at certain conditions.
+#      ConditionValue2      Value given at certain conditions.
+#      Ai                   Change the monster mode using the given Aegis monster type AI. (Default: 00)
+#      Summon:              List of monsters to summon, required for certain skills. (Default: null) 
+#        - Index            Unique Index in the list to edit the monster on import. Range of 0-5.
+#          Mob              Monster AegisName.
+#          Clear            True to remove the given monster at this index. (Optional)
+#      Emotion              Emotion displayed on the monster after the cast. (Default: ET_NONE)
+#      Chat                 Chat ID to display the associated sentence defined in mob_chat_db.yml. (Default: 0)
+#      Clear                True to remove the skill. (Optional)
+###########################################################################

doc/yaml/db/quest_db.yml

@@ -5,33 +5,25 @@
 # Quest Settings
 #
 ###########################################################################
-# - Id              Quest ID.
-#   Title           Quest title.
-#   TimeLimit       Amount of time before the quest expires. (Default: 0)
-#                   Use a number following by "d" for day(s), "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-#                   Specify with "+" for how long until the quest expires.
-#                   Specify without "+" for the exact time the quest expires using "d" (optional), [0-23]"h" (required), [0-59]"mn" (optional), [0-59]"s" (optional) format.
-#                   Please note the number before "d" only shift the exact timer to the given day(s).
-#   Targets:        Quest objective target. (Default: null)
-#                   The target can be a couple of node Mob/Count or of Id/Race/Size/Element/MinLevel/MaxLevel.
-#                   If Mob is supplied, Count is required and the other fields are ignored.
-#                   If Id is supplied, at least one other field of Race/Size/Element/MinLevel/MaxLevel is required.
-#                   If Id is supplied, Count is required for each new entry.
-#     - Mob         Monster to kill (aegis monster name).
-#       Count       Amount of monsters to kill. Set to 0 to skip the target on import.
-#       Id          Unique target index for the quest Id. Requires a positive number.
-#       Race        Monster race target (default All). Valid races are Angel, Brute, DemiHuman, Demon, Dragon, Fish, Formless, Insect, Plant, Undead, All.
-#       Size        Monster size target (default All). Valid sizes are Small, Medium, Large, All.
-#       Element     Monster element target (default All). Valid elements are Dark, Earth, Fire, Ghost, Holy, Neutral, Poison, Undead, Water, Wind, All.
-#       MinLevel    Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
-#       MaxLevel    Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
-#       Location    Map name where kills are counted. (Default any location)
-#                   On normal maps only kills of permanently spawned monsters increase the counter.
-#                   On instance maps all monster kills increase the counter.
-#       MapName     Displayed map name in quest UI. (Default: empty string)
-#   Drops:          Quest item drop targets. (Default: null)
-#     - Mob         Monster to kill. 0 will apply to all monsters. (Default: 0)
-#       Item        Item to drop.
-#       Count       Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
-#       Rate        Item drop rate. (10000 = 100%)
+# - Id                     Quest ID.
+#   Title                  Quest title.
+#   TimeLimit              Amount of time before the quest expires. (Default: 0)
+#   Targets:               Quest objective target. (Default: null)
+#     - Mob                Name of monster to kill.
+#       Count              Amount of monsters to kill. Set to 0 to skip the target on import.
+#       Id                 Unique target index for the quest Id. Requires a positive number.
+#       Race               Monster race target. (Default: All)
+#       Size               Monster size target. (Default: All)
+#       Element            Monster element target. (Default: All)
+#       MinLevel           Minimum monster level target. If not supplied but MaxLevel defined, MinLevel is 1. Set to 0 to ignore MinLevel on import. (Default: 0)
+#       MaxLevel           Maximum monster level target. Set to 0 to ignore MaxLevel on import. (Default: 0)
+#       Location           Map name where kills are counted. (Default: All)
+#       MapName            Displayed map name in quest UI. (Default: empty string)
+#       MapMobTargets      List of monster names. Only names in the list will increase the kill counter. Only active when Id is used. (Default: all monsters)
+#         <name>: <bool>   Monster name and whether the monster is added or removed from the list.
+#   Drops:                 Quest item drop targets. (Default: null)
+#     - Mob                Monster to kill. 0 will apply to all monsters. (Default: 0)
+#       Item               Item to drop.
+#       Count              Amount of items that will drop. Non-stackable items default to 1. (Default: 1)
+#       Rate               Item drop rate. (10000 = 100%)
 ###########################################################################

doc/yaml/sql/mob_skill_db.sql

@@ -0,0 +1,29 @@
+#
+# Table structure for table `mob_skill_db`
+#
+
+DROP TABLE IF EXISTS `mob_skill_db`;
+CREATE TABLE IF NOT EXISTS `mob_skill_db` (
+  `MOB_AEGIS_NAME` varchar(24) NOT NULL,
+  `INDEX` int(11) unsigned NOT NULL,
+  `SKILL_NAME` varchar(24) NOT NULL,
+  `SKILL_LV` tinyint(4) unsigned DEFAULT NULL,
+  `STATE` varchar(50) DEFAULT NULL,
+  `RATE` smallint(4) DEFAULT NULL,
+  `CASTTIME` mediumint(9) DEFAULT NULL,
+  `DELAY` int(9) DEFAULT NULL,
+  `CANCELABLE` tinyint(1) unsigned DEFAULT NULL,
+  `TARGET` varchar(50) DEFAULT NULL,
+  `CONDITION` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE1` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE2` tinyint(4) DEFAULT NULL,
+  `AI` varchar(2) DEFAULT NULL,
+  `SUMMON1` varchar(24) DEFAULT NULL,
+  `SUMMON2` varchar(24) DEFAULT NULL,
+  `SUMMON3` varchar(24) DEFAULT NULL,
+  `SUMMON4` varchar(24) DEFAULT NULL,
+  `SUMMON5` varchar(24) DEFAULT NULL,
+  `SUMMON6` varchar(24) DEFAULT NULL,
+  `EMOTION` varchar(50) DEFAULT NULL,
+  `CHAT` smallint(4) unsigned DEFAULT NULL
+) ENGINE=MyISAM;

doc/yaml/sql/mob_skill_db2.sql

@@ -0,0 +1,29 @@
+#
+# Table structure for table `mob_skill_db2`
+#
+
+DROP TABLE IF EXISTS `mob_skill_db2`;
+CREATE TABLE IF NOT EXISTS `mob_skill_db2` (
+  `MOB_AEGIS_NAME` varchar(24) NOT NULL,
+  `INDEX` int(11) unsigned NOT NULL,
+  `SKILL_NAME` varchar(24) NOT NULL,
+  `SKILL_LV` tinyint(4) unsigned DEFAULT NULL,
+  `STATE` varchar(50) DEFAULT NULL,
+  `RATE` smallint(4) DEFAULT NULL,
+  `CASTTIME` mediumint(9) DEFAULT NULL,
+  `DELAY` int(9) DEFAULT NULL,
+  `CANCELABLE` tinyint(1) unsigned DEFAULT NULL,
+  `TARGET` varchar(50) DEFAULT NULL,
+  `CONDITION` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE1` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE2` tinyint(4) DEFAULT NULL,
+  `AI` varchar(2) DEFAULT NULL,
+  `SUMMON1` varchar(24) DEFAULT NULL,
+  `SUMMON2` varchar(24) DEFAULT NULL,
+  `SUMMON3` varchar(24) DEFAULT NULL,
+  `SUMMON4` varchar(24) DEFAULT NULL,
+  `SUMMON5` varchar(24) DEFAULT NULL,
+  `SUMMON6` varchar(24) DEFAULT NULL,
+  `EMOTION` varchar(50) DEFAULT NULL,
+  `CHAT` smallint(4) unsigned DEFAULT NULL
+) ENGINE=MyISAM;

doc/yaml/sql/mob_skill_db2_re.sql

@@ -0,0 +1,29 @@
+#
+# Table structure for table `mob_skill_db2_re`
+#
+
+DROP TABLE IF EXISTS `mob_skill_db2_re`;
+CREATE TABLE IF NOT EXISTS `mob_skill_db2_re` (
+  `MOB_AEGIS_NAME` varchar(24) NOT NULL,
+  `INDEX` int(11) unsigned NOT NULL,
+  `SKILL_NAME` varchar(24) NOT NULL,
+  `SKILL_LV` tinyint(4) unsigned DEFAULT NULL,
+  `STATE` varchar(50) DEFAULT NULL,
+  `RATE` smallint(4) DEFAULT NULL,
+  `CASTTIME` mediumint(9) DEFAULT NULL,
+  `DELAY` int(9) DEFAULT NULL,
+  `CANCELABLE` tinyint(1) unsigned DEFAULT NULL,
+  `TARGET` varchar(50) DEFAULT NULL,
+  `CONDITION` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE1` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE2` tinyint(4) DEFAULT NULL,
+  `AI` varchar(2) DEFAULT NULL,
+  `SUMMON1` varchar(24) DEFAULT NULL,
+  `SUMMON2` varchar(24) DEFAULT NULL,
+  `SUMMON3` varchar(24) DEFAULT NULL,
+  `SUMMON4` varchar(24) DEFAULT NULL,
+  `SUMMON5` varchar(24) DEFAULT NULL,
+  `SUMMON6` varchar(24) DEFAULT NULL,
+  `EMOTION` varchar(50) DEFAULT NULL,
+  `CHAT` smallint(4) unsigned DEFAULT NULL
+) ENGINE=MyISAM;

doc/yaml/sql/mob_skill_db_re.sql

@@ -0,0 +1,29 @@
+#
+# Table structure for table `mob_skill_db_re`
+#
+
+DROP TABLE IF EXISTS `mob_skill_db_re`;
+CREATE TABLE IF NOT EXISTS `mob_skill_db_re` (
+  `MOB_AEGIS_NAME` varchar(24) NOT NULL,
+  `INDEX` int(11) unsigned NOT NULL,
+  `SKILL_NAME` varchar(24) NOT NULL,
+  `SKILL_LV` tinyint(4) unsigned DEFAULT NULL,
+  `STATE` varchar(50) DEFAULT NULL,
+  `RATE` smallint(4) DEFAULT NULL,
+  `CASTTIME` mediumint(9) DEFAULT NULL,
+  `DELAY` int(9) DEFAULT NULL,
+  `CANCELABLE` tinyint(1) unsigned DEFAULT NULL,
+  `TARGET` varchar(50) DEFAULT NULL,
+  `CONDITION` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE1` varchar(50) DEFAULT NULL,
+  `CONDITION_VALUE2` tinyint(4) DEFAULT NULL,
+  `AI` varchar(2) DEFAULT NULL,
+  `SUMMON1` varchar(24) DEFAULT NULL,
+  `SUMMON2` varchar(24) DEFAULT NULL,
+  `SUMMON3` varchar(24) DEFAULT NULL,
+  `SUMMON4` varchar(24) DEFAULT NULL,
+  `SUMMON5` varchar(24) DEFAULT NULL,
+  `SUMMON6` varchar(24) DEFAULT NULL,
+  `EMOTION` varchar(50) DEFAULT NULL,
+  `CHAT` smallint(4) unsigned DEFAULT NULL
+) ENGINE=MyISAM;

npc/battleground/flavius/flavius01.txt

@@ -77,6 +77,8 @@ OnTimer1000:
 //============================================================
 bat_b01,15,15,3	script	start#bat_b01	844,{
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_b01";
 	mapwarp "bat_b01","bat_room",154,150;
 	end;
 

npc/battleground/flavius/flavius02.txt

@@ -79,6 +79,8 @@ OnTimer1000:
 //============================================================
 bat_b02,15,15,3	script	start#bat_b02	844,{
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_b02";
 	mapwarp "bat_b02","bat_room",154,150;
 	end;
 

npc/battleground/kvm/kvm01.txt

@@ -111,6 +111,9 @@ OnTouch:
 	end;
 
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_c01";
+	mapwarp "bat_c01","bat_room",154,150;
 	setwall "bat_c01",54,122,6,7,0,"batc01wall_a";
 	setwall "bat_c01",55,122,5,7,0,"batc01wall_b";
 	setwall "bat_c01",140,56,6,7,0,"batc01wall_c";

npc/battleground/kvm/kvm02.txt

@@ -111,6 +111,9 @@ OnTouch:
 	end;
 
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_c02";
+	mapwarp "bat_c02","bat_room",154,150;
 	setwall "bat_c02",54,122,6,7,0,"batc02wall_a";
 	setwall "bat_c02",55,122,5,7,0,"batc02wall_b";
 	setwall "bat_c02",140,56,6,7,0,"batc02wall_c";

npc/battleground/kvm/kvm03.txt

@@ -111,6 +111,9 @@ OnTouch:
 	end;
 
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_c03";
+	mapwarp "bat_c03","bat_room",154,150;
 	setwall "bat_c03",54,122,6,7,0,"batc03wall_a";
 	setwall "bat_c03",55,122,5,7,0,"batc03wall_b";
 	setwall "bat_c03",140,56,6,7,0,"batc03wall_c";

npc/battleground/tierra/tierra01.txt

@@ -98,6 +98,8 @@ bat_room,57,211,0	warp	back_bgrooma01b	1,1,bat_room,154,150
 //============================================================
 bat_a01,15,15,3	script	start#bat_a01	844,{
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_a01";
 	mapwarp "bat_a01","bat_room",154,150;
 	end;
 

npc/battleground/tierra/tierra02.txt

@@ -98,6 +98,8 @@ bat_room,113,211,0	warp	back_bgrooma02b	1,1,bat_room,154,150
 //============================================================
 bat_a02,15,15,3	script	start#bat_a02	844,{
 OnInit:
+	if (getbattleflag("feature.bgqueue"))
+		bg_unbook "bat_a02";
 	mapwarp "bat_a02","bat_room",154,150;
 	end;
 

npc/custom/quests/thq/THQS_Quests.txt

@@ -288,7 +288,7 @@ prt_sewb1,120,245,6	script	Sewer Management Knight	705,{
 	if (three_qset == 3) goto N_QuestStart;
 	if (seven_qset == 3) goto N_QuestStart2;
 	mes "[Sewer Management]";
-	mes "Live dosent get any worse for me,working in the bug filled Culvert every day...";
+	mes "Live doesn't get any worse for me, working in this bug filled Culvert every day...";
 	close;
 N_QuestComp:
 	mes "[Sewer Management]";

npc/quests/first_class/tu_archer.txt

@@ -263,6 +263,7 @@ payon_in02,54,13,3	script	Master Kavaruk	1_M_JOBTESTER,{
 				mes "[Master Kavaruk]";
 				mes "If you're interested, it would probably be best to speak to the Alchemist Guild member who is waiting to hear from us at the ^3131FFshop next to the road south of Icarus^000000.";
 				tu_archer02 = 1;
+				close;
 			} else if(tu_archer02 == 1){
 				mes "Hmmm...";
 				mes "..........";
@@ -287,11 +288,13 @@ payon_in02,54,13,3	script	Master Kavaruk	1_M_JOBTESTER,{
 				mes "Please find out if he is all right and help him with whatever he";
 				mes "may need. In the meantime, I will be waiting to hear from you. Thank you very much.";
 				tu_archer02 = 2;
+				close;
 			} else if(tu_archer02 == 2){
 				mes "Find Arthail";
 				mes "of the Wind for me.";
 				mes "He must be somewhere";
 				mes "in Prontera...";
+				close;
 			} else if(tu_archer02 == 9){
 				mes "Hmmm, I see. Thank you";
 				mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
@@ -301,8 +304,8 @@ payon_in02,54,13,3	script	Master Kavaruk	1_M_JOBTESTER,{
 					getexp 1000,1000;
 				else
 					getexp 2000,1000;
+				close;
 			}
-			close;
 		}
 		mes "I don't know...";
 		mes "Recently, I haven't heard any noteworthy news. For now, the warmth of the sun seems to be protecting the peace here.";

npc/quests/quests_gonryun.txt

@@ -3713,6 +3713,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 		next;
 		if (BaseLevel >= 20) {
 			set nakha,1;
+			setquest 10034;
 			mes "[Han Ran Jiao]";
 			mes "I need to go down to get it";
 			mes "but...the monsters...";
@@ -3759,6 +3760,7 @@ gonryun,237,226,3	script	Han Ran Jiao#gon	776,{
 		next;
 		if (select("Return the knife.:Refuse.") == 1) {
 			set nakha,3;
+			completequest 10035;
 			delitem 1201,1; //Knife
 			mes "[Han Ran Jiao]";
 			mes "Thank you! Thank you so much!";
@@ -3803,6 +3805,7 @@ gon_fild01,245,257,0	script	#gonknife	111,3,3,{
 OnTouch_:
 	if (nakha == 1) {
 		set nakha,2;
+		changequest 10034,10035;
 		mes "^3355FFHm? What's this?";
 		mes " ";
 		mes "Something was hidden beneath the leaves...^000000";

npc/quests/quests_juperos.txt

@@ -206,7 +206,7 @@ function Func_JupHist;
 		mes "[Fayruz]";
 		mes "Well, you look";
 		mes "quite pleased.";
-		mes "May I asked what";
+		mes "May I ask what";
 		mes "happened to put that";
 		mes "expression on your face?";
 		next;

npc/quests/quests_lighthalzen.txt

@@ -11164,7 +11164,7 @@ airplane_01,96,48,3	script	Man#Lyozien	4_M_LGTMAN,{
 		mes "Oh good, you're back.";
 		mes "Mr. Ahman just left and";
 		mes "picked up his goods. We're";
-		mes "done here, so you have to";
+		mes "done here, so all you have to";
 		mes "do now is report to my";
 		mes "brother in Lighthalzen.";
 		next;

npc/quests/quests_louyang.txt

@@ -2464,7 +2464,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 			case 1:
 				mes "[Nagash Arses]";
 				mes "Ah, have you";
-				mes "head of this poem?";
+				mes "heard of this poem?";
 				mes "As I grow older, my";
 				mes "memory also grows worse,";
 				mes "but I really like this poem";
@@ -2478,12 +2478,12 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 				set .@question_poet,rand(1,4);
 				if (.@question_poet == 1) {
 					mes "[Nagash Arses]";
-					mes "'^3355FFAs I lay^000000 ^3355FFlooking up at the moonlight^000000.' In this first line, what word should be in [ ]?";
+					mes "'^3355FFAs I lay^000000 [ ] ^3355FFlooking up at the moonlight^000000.' In this first line, what word should be in [ ]?";
 					next;
 					if (select("on the ground:with you:in bed:in the stars") == 3)
 						set .@answer_poet,.@answer_poet + 10;
 					mes "[Nagash Arses]";
-					mes "'^3355FFIt looks like the^000000 ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
+					mes "'^3355FFIt looks like the^000000 [ ] ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
 					next;
 					if (select("frost:dew:pebbles:snow") == 1)
 						set .@answer_poet,.@answer_poet + 10;
@@ -2523,7 +2523,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 				}
 				else if (.@question_poet == 2) {
 					mes "[Nagash Arses]";
-					mes "'^3355FFIt looks like the^000000 ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
+					mes "'^3355FFIt looks like the^000000 [ ] ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
 					next;
 					if (select("frost:dew:pebbles:snow") == 1)
 						set .@answer_poet,.@answer_poet + 10;
@@ -2571,7 +2571,7 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 				}
 				else if (.@question_poet == 3) {
 					mes "[Nagash Arses]";
-					mes "'^3355FFIt looks like the^000000 ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
+					mes "'^3355FFIt looks like the^000000 [ ] ^3355FFon the ground^000000.' In the second line, which word should be in [ ]?";
 					next;
 					if (select("frost:dew:pebbles:snow") == 1)
 						set .@answer_poet,.@answer_poet + 10;
@@ -2617,14 +2617,14 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 				}
 				else {
 					mes "[Nagash Arses]";
-					mes "'^3355FFIt looks like the^000000 ^3355FFon the ground^000000.' In the second line,";
+					mes "'^3355FFIt looks like the^000000 [ ] ^3355FFon the ground^000000.' In the second line,";
 					mes "which word should be in [ ]?";
 					next;
 					if (select("frost:dew:pebbles:snow") == 1)
 						set .@answer_poet,.@answer_poet + 10;
 					next;
 					mes "[Nagash Arses]";
-					mes "'^3355FFI lift my^000000 ^3355FFto look at the bright moon^000000.' In the third line, which word should be in [ ]?";
+					mes "'^3355FFI lift my^000000 [ ] ^3355FFto look at the bright moon^000000.' In the third line, which word should be in [ ]?";
 					next;
 					if (select("eyes:head:gaze:sights") == 2)
 						set .@answer_poet,.@answer_poet + 10;
@@ -3315,8 +3315,8 @@ lou_in02,123,39,4	script	Poison King#lou	824,{
 		mes "This is a journal that I have been writing for 15 years about my feelings of guilt, and what really happened in the past. I hope you can deliver this to the lord for me.";
 		next;
 		mes "^3355FFYou obtained";
-		mes "^0000FFPoison King,";
-		mes "Nagash Arses' Jounal^000000.";
+		mes "^0000FFPoison King";
+		mes "Nagash Arses' Journal^000000.";
 		set ch_poison,18;
 		changequest 11080,11081;
 		close;

npc/quests/quests_moscovia.txt

@@ -8356,7 +8356,7 @@ moscovia,166,145,1	script	Worried Mother#rus19	4_F_RUSWOMAN3,{
 			mes "You must have something to protect yourself from Lusalka. '^0000ffHoly Water^000000' will protect you from Lusalka'a gaze.";
 			next;
 			mes "[Worried Mother]";
-			mes "And Lusalka is noctournal. You should be able to find here from ^ff00005 pm to 6 am PST^000000.";
+			mes "And Lusalka is nocturnal. You should be able to find her from ^ff00005 pm to 6 am PST^000000.";
 			next;
 			mes "[Worried Mother]";
 			mes "Don't forget. You have to bring '^0000ffHoly Water^000000' with you, and find her from ^ff00005 pm to 6 am PST^000000.";
@@ -8374,7 +8374,7 @@ moscovia,166,145,1	script	Worried Mother#rus19	4_F_RUSWOMAN3,{
 			mes "You must have something to protect yourself from Lusalka. '^0000ffHoly Water^000000' will protect you from Lusalka'a gaze.";
 			next;
 			mes "[Worried Mother]";
-			mes "And Lusalka is noctournal. You should be able to find here from ^ff00005 pm to 6 am PST^000000.";
+			mes "And Lusalka is nocturnal. You should be able to find her from ^ff00005 pm to 6 am PST^000000.";
 			next;
 			mes "[Worried Mother]";
 			mes "Don't forget. You have to bring '^0000ffHoly Water^000000' with you, and find her from ^ff00005 pm to 6 am PST^000000.";

npc/quests/quests_nameless.txt

@@ -1,12 +1,6 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Nameless Island Quests
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 2.4
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Collection of Nameless Island Quests
 //= Nameless Island:
@@ -34,7 +28,7 @@
 //= Rogue Guild Investigation Assistance:
 //- - Assist the Rogue Guild with their investigations.
 //= - Variable in use: rumour_nd (Max: 22)
-//===== Additional Comments: ================================= 
+//===== Changelog: ===========================================
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Made quest accessable to "Failed" Geoborg quest. [L0ne_W0lf]
 //= 1.1a Touch up to other Geoborg fail-points. [L0ne_W0lf]
@@ -63,7 +57,8 @@
 //= 2.3 Updated RE/Pre-RE EXP. [Euphy]
 //= 2.4 Moved Dorian to pre-re/re paths. [Euphy]
 //= 2.5 Updated Nameless Island quests and added questlog support. [Euphy]
-//============================================================ 
+//= 2.6 Commented custom quest log support for the Nameless Island Quest [Everade]
+//============================================================
 
 // Nameless Island and Cursed Monestary Access Quest :: aru_monas
 //============================================================
@@ -81,7 +76,7 @@ OnTouch:
 		mes "Church^000000. Please visit him";
 		mes "as soon as you can.";
 		set aru_monas,1;
-		setquest 17000;
+		//setquest 17000;
 		close2;
 		hideonnpc "Agent#pc1";
 	}
@@ -196,7 +191,7 @@ cmd_in02,111,52,3	script	Ordinary Man#pc2	97,{
 		mes "Arunafeltz so I wasn't able";
 		mes "to investigate any further.";
 		set aru_monas,4;
-		changequest 17001,17002;
+		//changequest 17001,17002;
 		close;
 	}
 	else {
@@ -437,7 +432,7 @@ OnTouch:
 		mes "like it! It's almost like";
 		mes "a dessert. God, it's good!";
 		set aru_monas,8;
-		changequest 17003,17004;
+		//changequest 17003,17004;
 		if (Zeny > 3000) {
 			set Zeny, Zeny-3000;
 			getitem 12052,4; //Vit_Dish02
@@ -474,7 +469,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "comfortable talking to complete";
 		mes "strangers about my problems.";
 		set aru_monas,9;
-		changequest 17004,17005;
+		//changequest 17004,17005;
 		close;
 	}
 	else if (aru_monas == 9) {
@@ -518,7 +513,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "Oh, and you're prohibited";
 		mes "asking anyone else, so behave.";
 		set aru_monas,11;
-		changequest 17006,17007;
+		//changequest 17006,17007;
 		close;
 	}
 	else if (aru_monas < 13) {
@@ -614,7 +609,7 @@ ve_in,78,314,5	script	Magistrate#Aru	945,{
 		mes "smugglers again? I don't";
 		mes "know what's going on...";
 		set aru_monas,14;
-		changequest 17009,17010;
+		//changequest 17009,17010;
 		next;
 		mes "[Al Hamad]";
 		mes "Even if I could make headway";
@@ -684,7 +679,7 @@ ve_in,81,296,3	script	Soldier#Aru	946,{
 		mes "interrogating the smugglers.";
 		mes "I'm not sure if he did since the smugglers were taken away.";
 		set aru_monas,10;
-		changequest 17005,17006;
+		//changequest 17005,17006;
 		close;
 	}
 	else if (aru_monas == 10) {
@@ -726,7 +721,7 @@ ve_in,239,115,0	script	Drunkard#Aru	943,{
 			mes "He thought he saw a ^DBDB70ghost^000000!";
 			mes "Bwah hah hah! Oooog... Hey...";
 			set aru_monas,15;
-			changequest 17010,17011;
+			//changequest 17010,17011;
 			next;
 			mes "["+strcharinfo(0)+"]";
 			mes "That's right!";
@@ -837,7 +832,7 @@ ve_fild07,125,128,0	script	Boat#Aru	111,{
 			mes "this will probably be";
 			mes "a pretty rocky ride...";
 			set aru_monas,17;
-			changequest 17012,17013;
+			//changequest 17012,17013;
 			close2;
 			hideonnpc "Secret Agent#Aru";
 			warp "nameless_i",257,217;
@@ -905,7 +900,7 @@ ve_fild07,128,130,1	script	Secret Agent#Aru	97,{
 			mes "this will probably be";
 			mes "a pretty rocky ride...";
 			set aru_monas,17;
-			changequest 17012,17013;
+			//changequest 17012,17013;
 			close2;
 			hideonnpc "Secret Agent#Aru";
 			warp "nameless_i",257,217;
@@ -1184,7 +1179,7 @@ OnTouch:
 		mes "for you in the boat. Learn";
 		mes "what you need to learn, and then come back safe, "+strcharinfo(0)+".";
 		set aru_monas,21;
-		changequest 17013,17014;
+		//changequest 17013,17014;
 		close2;
 		hideonnpc "Larjes#Monastery2";
 	}
@@ -1297,7 +1292,7 @@ nameless_n,259,218,3	script	Larjes#Boat1	97,{
 			mes "going... This is huge!";
 			delitem 7726,1; //Token_Of_King
 			set aru_monas,25;
-			changequest 17016,17017;
+			//changequest 17016,17017;
 			getexp (checkre(3))?100000:1000000,0;
 			close;
 		}
@@ -1344,7 +1339,7 @@ abbey02,224,70,0	script	Books#Mona1	111,{
 		next;
 		if(select("Examine Book:Ignore")==1) {
 			set aru_monas,22;
-			changequest 17014,17015;
+			//changequest 17014,17015;
 			getitem 7755,1; // Reasearch_Note
 			readbook 7755,1;
 			close;
@@ -1443,7 +1438,7 @@ abbey03,232,232,4	script	Dead Man#King	956,{
 		mes "this man is...!";
 		set aru_monas,24;
 		getitem 7726,1; //Token_of_King
-		changequest 17015,17016;
+		//changequest 17015,17016;
 		hideonnpc "Dead Man#King";
 		hideoffnpc "Man#King";
 		stopnpctimer;
@@ -1602,7 +1597,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "were too preoccupied";
 			mes "with other matters. In fact,";
 			mes "I haven't gotten the chance";
-			mes "to think of what do with him...";
+			mes "to think of what to do with him...";
 			next;
 			mes "[Niren]";
 			mes "I want to ask you to";
@@ -1644,7 +1639,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 			mes "come back and tell me if";
 			mes "you learn anything there.";
 			set aru_monas,13;
-			changequest 17008,17009;
+			//changequest 17008,17009;
 			next;
 			mes "[Niren]";
 			mes "I'll send a message to the";
@@ -1712,7 +1707,7 @@ ra_temple,165,57,5	script	Niren#ss	915,{
 				mes "comes from that place.";
 				delitem 7755,1; //Research_Note
 				set aru_monas,26;
-				completequest 17017;
+				//completequest 17017;
 				getexp (checkre(3))?50000:500000,0;
 				close2;
 			}
@@ -3213,7 +3208,7 @@ OnTimer53000:
 que_temsky,99,7,0	warp	quetemskyout	1,1,ra_temin,276,231
 
 // Muff's Loan :: zdan_total_edq
-//============================================================ 
+//============================================================
 comodo,224,187,3	script	Muff	86,{
 	if (checkweight(907,200) == 0) {
 		mes "[Muff]";
@@ -4658,7 +4653,7 @@ OnTouch:
 }
 
 // Broken Diamond
-//============================================================ 
+//============================================================
 moc_ruins,152,147,5	script	Ibrahim	732,3,3,{
 	if (checkweight(907,200) == 0) {
 		mes "[Ibrahim]";
@@ -6387,7 +6382,7 @@ OnInit:
 }
 
 // Z-Gang Quest
-//============================================================ 
+//============================================================
 prontera,150,326,0	script	Wanted Notice#edq	111,{
 	if (zdan_edq == 0) {
 		mes "====National Wanted Notice====";
@@ -9020,7 +9015,7 @@ OnInit:
 }
 
 // Unlucky Emerald
-//============================================================ 
+//============================================================
 morocc,143,63,3	script	Ragged Man#nd	929,{
 	if (treasure_nd == 0) {
 		mes "[Ragged Man]";
@@ -11410,7 +11405,7 @@ OnTouch:
 }
 
 // Rogue Guild Investigation
-//============================================================ 
+//============================================================
 prontera,163,204,3	script	Man from Morocc	99,{
 	if (rumour_nd == 0) {
 		mes "[Morocc Traveler]";