Updated format

Updated ResultRefine
* Converted ResultRefine to a ResultRefine array * Converted the values between ResultRefineMinimum and ResultRefineMaximum to a ResultRefine array
2024-01-26 15:39:45 +01:00 · 2024-01-16 15:12:24 +01:00 · 2024-01-14 20:57:35 +01:00 · 2022-09-07 14:21:30 +02:00
268 changed files with 47453 additions and 159570 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,9 +0,0 @@
-# Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
-# https://github.com/rathena/rathena/commit/637ae9a4dcde0d5885a18841d2f3875e06893c30
-637ae9a4dcde0d5885a18841d2f3875e06893c30
-# Applied AStyle code formating as discussed on tid:74602.
-# https://github.com/rathena/rathena/commit/a7c32653f70bd420bdf5a621acdf3aea5c6e6002
-a7c32653f70bd420bdf5a621acdf3aea5c6e6002
-# Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
-# https://github.com/rathena/rathena/commit/a2bdc47dafb32f6d18ed350d8bbe79b8f679a049
-a2bdc47dafb32f6d18ed350d8bbe79b8f679a049
--- a/.github/workflows/analysis_codeql.yml
+++ b/.github/workflows/analysis_codeql.yml
@@ -38,11 +38,11 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
        with:
           # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
           # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
@@ -74,7 +74,7 @@ jobs:
      #- name: Autobuild
      #  uses: github/codeql-action/autobuild@v2

-      # ?? If the Autobuild fails above, remove it and uncomment the following
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following
      #    three lines and modify them (or add more) to build your code if your
      #    project uses a compiled language
      - name: Command - configure
@@ -89,4 +89,4 @@ jobs:
        run: make server

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2
--- a/.github/workflows/build_servers_clang.yml
+++ b/.github/workflows/build_servers_clang.yml
@@ -34,7 +34,7 @@ jobs:
          clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Set up Clang
        uses: egor-tensin/setup-clang@v1
--- a/.github/workflows/build_servers_cmake.yml
+++ b/.github/workflows/build_servers_cmake.yml
@@ -34,7 +34,7 @@ jobs:
          os: [ubuntu-latest]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # Install latest CMake.
      - uses: lukka/get-cmake@latest
--- a/.github/workflows/build_servers_gcc.yml
+++ b/.github/workflows/build_servers_gcc.yml
@@ -31,14 +31,10 @@ jobs:
          # Available: ubuntu-22.04, ubuntu-20.04
          os: [ubuntu-latest]
          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['9', '10', '11', '12']
-          # GCC 13 was removed from 22.04, include it as a separate job
-          include:
-            - os: ubuntu-24.04
-              gcc: 13
+          gcc: ['9', '10', '11']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Update & Install packages
        # Ubuntu runners already have most of the packages rAthena requires to build.
@@ -49,10 +45,8 @@ jobs:

      - name: Command - configure
        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }}'
-        # -Werror: to treat all warnings as errors
-        # -Wno-error=builtin-declaration-mismatch: otherwise ./configure checks fail
-        run: ./configure $CONFIGURE_FLAGS --enable-buildbot=yes CXXFLAGS='-Werror -Wno-error=builtin-declaration-mismatch'
+            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-buildbot=yes'
+        run: ./configure $CONFIGURE_FLAGS
      
      - name: Command - make clean
        run: make clean
--- a/.github/workflows/build_servers_modes.yml
+++ b/.github/workflows/build_servers_modes.yml
@@ -36,7 +36,7 @@ jobs:
          mode: ['PRE','RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/build_servers_msbuild.yml
+++ b/.github/workflows/build_servers_msbuild.yml
@@ -34,15 +34,15 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1

      - name: Build solution in Debug
        if: ${{ matrix.mode == 'PRE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE" /warnaserror
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE"

      - name: Build solution in Debug
        if: ${{ matrix.mode == 'RE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT" /warnaserror
+        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT"
--- a/.github/workflows/build_servers_packetversions.yml
+++ b/.github/workflows/build_servers_packetversions.yml
@@ -38,7 +38,7 @@ jobs:
          packetver: ['20211103', '20200902', '20200401', '20180620', '20151104']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/build_servers_vip.yml
+++ b/.github/workflows/build_servers_vip.yml
@@ -36,7 +36,7 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/.github/workflows/npc_db_validation.yml
+++ b/.github/workflows/npc_db_validation.yml
@@ -39,7 +39,7 @@ jobs:
          mode: ['PRE', 'RE']

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      
      # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
      - name: Variable Parsing - PRE
--- a/3rdparty/libconfig/scanner.c
+++ b/3rdparty/libconfig/scanner.c
@@ -2,11 +2,6 @@

 #line 4 "scanner.c"

-#ifdef _MSC_VER
-	#pragma warning( push )
-	#pragma warning( disable : 4267 )
-#endif
-
 #define  YY_INT_ALIGNED short int

 /* A lexical scanner generated by flex */
@@ -2370,7 +2365,3 @@ void libconfig_yyfree (void * ptr , yyscan_t yyscanner)
 #define YYTABLES_NAME "yytables"

 #line 192 "scanner.l"
-
-#ifdef _MSC_VER
-	#pragma warning( pop )
-#endif
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,7 @@ option( ENABLE_WEB_SERVER "Build web-server (default=ON)" ON )
 #
 TEST_BIG_ENDIAN( BIG_ENDIAN )
 if( NOT DEFINED BIG_ENDIAN )
-	message( WARNING "unable to determine endianness, only LITTLE ENDIAN is supported" )
+	message( WARNING "unable to determine endianess, only LITTLE ENDIAN is supported" )
 elseif( BIG_ENDIAN )
 	message( FATAL_ERROR "bigendian is not supported" )
 endif()
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@@ -918,11 +918,6 @@ Body:
  - Command: reloadbattleconf
    Help: |
      Reload battle settings.
-  - Command: reloadcashdb
-    Aliases:
-      - reloadcashshop
-    Help: |
-      Reload cash shop database.
  - Command: reloadinstancedb
    Help: |
      Reload instance database.
@@ -961,7 +956,6 @@ Body:
      atcommand       battleconf     statusdb
      pcdb                    motd             script
      questdb              msgconf       packetdb
-      cashdb
  - Command: langtype
    Help: |
      Params: <language>
--- a/conf/battle/battle.conf
+++ b/conf/battle/battle.conf
@@ -130,19 +130,10 @@ equip_self_break_rate: 100
 // This affects the behaviour of skills like acid terror and meltdown
 equip_skill_break_rate: 100

-// Should damage have a delay before it is applied? (Note 1)
-// Some skills might not have a delay by default regardless of this setting.
-// The official setting is yes, even thought it degrades performance a bit.
+// Do weapon attacks have a attack speed delay before actual damage is applied? (Note 1)
+// NOTE: The official setting is yes, even thought it degrades performance a bit.
 delay_battle_damage: yes

-// Should the damage timing be synchronized between the client and server? (Note 1)
-// This is not official behavior, but it should remove the position lag after being hit by a monster.
-// This setting only affects normal monster attacks and takes priority over "delay_battle_damage".
-// Many skills show their damage immediately, so setting "delay_battle_damage" to "no" at the same
-// time might improve the experience further, but will not work for all skills.
-// Tired of Dark Illusion hitting you 5 seconds too late? Then turn this on.
-synchronize_damage: no
-
 // Are arrows/ammo consumed when used on a bow/gun?
 // 0 = No
 // 1 = Yes
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -33,7 +33,8 @@ max_exp_gain_rate: 0
 // Method of calculating earned experience when defeating a monster:
 // 0 = uses damage given / total damage as damage ratio
 // 1 = uses damage given / max_hp as damage ratio
-// 2 = 0 + first attacker counts twice
+// NOTE: Using type 1 disables the bonus where the first attacker gets 
+//       his share of the exp doubled when multiple people attack the mob.
 exp_calc_type: 0

 // Experience increase per attacker. That is, every additional attacker to the
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -134,9 +134,3 @@ min_shop_buy: 1
 // Minimum sell price of items at a normal shop
 // Officially items can be sold for 0 Zeny
 min_shop_sell: 0
-
-// Should items that reduce damage from element/race count all monster damage as physical? (Note 1)
-// Officially "Asprika" (god item) reduces all monsters damage rather than just physical damage
-// Shaman Hat on the other hand doesn't reduce monster damage at all (reduces magical damage in PVP)
-// This only affects items with bonus3 bSubEle and bonus3 bSubRace.
-cardfix_monster_physical: yes
--- a/conf/battle/misc.conf
+++ b/conf/battle/misc.conf
@@ -183,17 +183,3 @@ mail_delay: 1000

 // Hides items from the player's favorite tab from being sold to a NPC. (Note 1)
 hide_fav_sell: no
-
-// When searching for a random position on the map, how much of the border of the map shall not be considered?
-// Officially the 15 tiles from the edge of the map on each side are not considered as target cells.
-// On some maps like in Pyramids this causes there to be very few monsters in the outer areas. This also
-// affects teleportation. Set this to 1 if you want it to be closer to the old emulator behavior.
-// Valid values: 1-40
-map_edge_size: 15
-
-// When a player drops items, can they stack on the same cell? (Note 1)
-// Officially there's no limit on how many items you can drop on the same cell.
-// If you set this to "no", when you drop an item, it will only drop on a cell that has no item on it yet.
-// A free cell will be searched for in eight directions. If no free cell could be found in those eight tries,
-// then dropping the item will fail (the item stays in the player's inventory).
-item_stacking: yes
--- a/conf/battle/monster.conf
+++ b/conf/battle/monster.conf
@@ -79,10 +79,10 @@ monster_chase_refresh: 30
 // 8: Enable mob-warping when standing on Dimensional Door
 mob_warp: 0

-// Defines the time (in ms) during which monsters will have their AI active
-// after all players have left their vicinity.
-mob_active_time: 5000
-boss_active_time: 5000
+// If these are set above 0, they define the time (in ms) during which monsters
+// will have their 'AI' active after all players have left their vicinity.
+mob_active_time: 0
+boss_active_time: 0

 // Mobs and Pets view-range adjustment (range2 column in the mob_db) (Note 2)
 view_range_rate: 100
@@ -163,15 +163,6 @@ no_spawn_on_player: 0
 // map regardless of what the mob-spawn file says.
 force_random_spawn: no

-// Should each monster's center cell be randomized? (Note 1)
-// Officially, at server start, each monster's center cell is set to a random cell in the spawn area.
-// Each time the monster spawns it will spawn in an area around its center cell rather than the
-// original center of the spawn definition. This results in a much larger total spawn area and a
-// different experience each server start.
-// Set this to "no" if you want all monsters of a spawn to spawn around the original center of the
-// spawn definition, making the total spawn area much smaller (old eAthena behavior).
-randomize_center_cell: yes
-
 // Do summon slaves inherit the passive/aggressive traits of their master?
 // 0: No, retain original mode.
 // 1: Slaves are always aggressive.
@@ -311,8 +302,3 @@ slave_stick_with_master: no
 // Also used in delaying the spawning of guardians when a guild is not loaded.
 // Default (Official): 1000
 mob_respawn_time: 1000
-
-// Defines the time (in ms) after which a monster unlocks its target when trapped.
-// During this time monsters will still be in idle mode and use idle skills on random
-// targets, but they continue chasing their original target when no longer trapped.
-mob_unlock_time: 2000
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -26,8 +26,8 @@ min_skill_delay_limit: 100

 // This delay is the min 'can't walk delay' of all skills.
 // NOTE: Do not set this too low, if a character starts moving too soon after 
-// doing a skill, the client will not update this, and the player will appear
-// to "teleport" afterwards. Monsters use AttackMotion instead.
+// doing a skill, the client will not update this, and the player/mob will 
+// appear to "teleport" afterwards.
 default_walk_delay: 300

 // Completely disable skill delay of the following types (Note 3)
--- a/conf/groups.yml
+++ b/conf/groups.yml
@@ -240,7 +240,6 @@ Body:
      bypass_stat_onclone: true
      bypass_max_stat: true
      macro_register: true
-      trade_unconditional: true
      #all_permission: true

 Footer:
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@@ -1610,29 +1610,5 @@ map: 3@vrpop
 // Depth biosphere 2nd floor
 map: bl_depth2

-// Fantasy Series Sonic Collaboration - Dr. Eggman's Secret Base
-map: 1@vrsn
-
-// Episode 21
-map: 1@ep21a
-map: 1@ep21b
-map: 1@mdtem
-map: 1@twbs2
-map: 1@wtgs
-map: 2@mdtem
-map: jalbe_in
-map: jor_albe
-map: jor_base
-map: jor_crk
-map: jor_crk_p
-map: jor_mbase
-map: jor_raise1
-map: jor_raise2
-map: jor_tmple1
-map: jor_tmple2
-map: luna_sf1
-map: luna_sf2
-map: mbase_in
-
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -933,10 +933,7 @@
 // NoBank Mapflag
 831: You cannot use the Bank on this map.

-// @reloadcashdb
-832: Cash shop database has been reloaded.
-
-//833-899 free
+//832-899 free

 //------------------------------------
 // More atcommands message
--- a/4
+++ b/4
@@ -4761,8 +4761,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h

     ;; #(
   *)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to determine endianness, only little endian is supported" >&5
-$as_echo "$as_me: WARNING: unable to determine endianness, only little endian is supported" >&2;}
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to determine endianess, only little endian is supported" >&5
+$as_echo "$as_me: WARNING: unable to determine endianess, only little endian is supported" >&2;}
 ;;
 esac

--- a/configure.ac
+++ b/configure.ac
@@ -490,7 +490,7 @@ CXXFLAG_CLEARS="-std=c++17"
 AC_C_BIGENDIAN(
 	[AC_MSG_ERROR([[bigendian is not supported... stopping]])],
 	,
-	[AC_MSG_WARN([[unable to determine endianness, only little endian is supported]])]
+	[AC_MSG_WARN([[unable to determine endianess, only little endian is supported]])]
 )


--- a/db/const.yml
+++ b/db/const.yml
@@ -45,8 +45,6 @@ Body:
    Value: 4
  - Name: JUMPINGCLAN
    Value: 5
-  - Name: REPUTATION_EP18
-    Value: 3

 Footer:
  Imports:
--- a/db/import-tmpl/laphine_upgrade.yml
+++ b/db/import-tmpl/laphine_upgrade.yml
@@ -24,9 +24,9 @@
 ###########################################################################
 # - Item                       Item that triggers Laphine Upgrade.
 #   RandomOptionGroup          Name of the random option group that will be applied. (Default: none)
-#   ResultRefine               Absolute refine level after the upgrade. (Default: none)
-#   ResultRefineMinimum        Minimum refine level after the upgrade. (Default: none)
-#   ResultRefineMaximum        Maximum refine level after the upgrade. (Default: none)
+#   ResultRefine:              Refine level after the upgrade. (Default: none)
+#     - Level                  Refine level.
+#       Rate                   Rate per level. The total rate is the sum of the rates. (Default: 1)
 #   MinimumRefine              Minimum refine level of the required items. (Default: 0)
 #   MaximumRefine              Maximum refine level of the required items. (Default: MAX_REFINE)
 #   RequiredRandomOptions      How many random options have to be in the item? (Default: 0)
@@ -37,4 +37,4 @@

 Header:
  Type: LAPHINE_UPGRADE_DB
-  Version: 1
+  Version: 2
--- a/db/import-tmpl/mob_db.yml
+++ b/db/import-tmpl/mob_db.yml
@@ -56,7 +56,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
@@ -78,7 +77,7 @@

 Header:
  Type: MOB_DB
-  Version: 4
+  Version: 3

 #Body:
 # eAthena Dev Team
--- a/db/laphine_upgrade.yml
+++ b/db/laphine_upgrade.yml
@@ -24,9 +24,9 @@
 ###########################################################################
 # - Item                       Item that triggers Laphine Upgrade.
 #   RandomOptionGroup          Name of the random option group that will be applied. (Default: none)
-#   ResultRefine               Absolute refine level after the upgrade. (Default: none)
-#   ResultRefineMinimum        Minimum refine level after the upgrade. (Default: none)
-#   ResultRefineMaximum        Maximum refine level after the upgrade. (Default: none)
+#   ResultRefine:              Refine level after the upgrade. (Default: none)
+#     - Level                  Refine level.
+#       Rate                   Rate per level. The total rate is the sum of the rates. (Default: 1)
 #   MinimumRefine              Minimum refine level of the required items. (Default: 0)
 #   MaximumRefine              Maximum refine level of the required items. (Default: MAX_REFINE)
 #   RequiredRandomOptions      How many random options have to be in the item? (Default: 0)
@@ -37,7 +37,7 @@

 Header:
  Type: LAPHINE_UPGRADE_DB
-  Version: 1
+  Version: 2

 Footer:
  Imports:
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1240,26 +1240,6 @@ t_garden
 2@vrpop
 3@vrpop
 bl_depth2
-1@vrsn
-1@ep21a
-1@ep21b
-1@mdtem
-1@twbs2
-1@wtgs
-2@mdtem
-jalbe_in
-jor_albe
-jor_base
-jor_crk
-jor_crk_p
-jor_mbase
-jor_raise1
-jor_raise2
-jor_tmple1
-jor_tmple2
-luna_sf1
-luna_sf2
-mbase_in

 //======================================================================================
 // - Other/Extra maps -
--- a/db/mob_db.yml
+++ b/db/mob_db.yml
@@ -56,7 +56,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
@@ -78,7 +77,7 @@

 Header:
  Type: MOB_DB
-  Version: 4
+  Version: 3

 Footer:
  Imports:
--- a/db/pre-re/item_db_equip.yml
+++ b/db/pre-re/item_db_equip.yml
@@ -20587,7 +20587,16 @@ Body:
    EquipLevelMin: 94
    Script: |
      bonus bMdef,5;
-      bonus3 bSubEle,Ele_All,30,BF_WEAPON;
+      bonus3 bSubEle,Ele_Neutral,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Water,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Earth,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Fire,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Wind,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Poison,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Holy,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Dark,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Ghost,30,BF_SHORT;
+      bonus3 bSubEle,Ele_Undead,30,BF_SHORT;
      bonus bFlee,30;
      skill "AL_TELEPORT",1;
      bonus bUnbreakableGarment;
--- a/db/pre-re/mob_db.yml
+++ b/db/pre-re/mob_db.yml
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -102,7 +102,7 @@
 1019,Peco Peco@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,6,,,,,,
 1019,Peco Peco@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1019,Peco Peco@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,,,,,,,
 1023,Orc Warrior@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -349,7 +349,7 @@
 1067,Cornutus@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
 1067,Cornutus@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1067,Cornutus@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1069,Swordfish@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,attack,86,3,500,1500,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,chase,86,3,500,1500,5000,yes,target,always,0,,,,,,,
@@ -601,9 +601,9 @@
 1117,Evil Druid@NPC_UNDEADATTACK,chase,347,3,500,500,5000,no,target,always,0,,,,,,9,
 1117,Evil Druid@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,0,,,,,,,
 1117,Evil Druid@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,0,,,,,,,
-1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1118,Flora@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
-1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,,
@@ -1297,7 +1297,7 @@
 1276,Raydric Archer@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
-1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
 1278,Stalactite Golem@NPC_STUNATTACK,attack,179,4,500,1500,5000,no,target,always,0,,,,,,6,
@@ -1580,7 +1580,7 @@
 1367,Blazer@WZ_SIGHTRASHER,attack,81,5,500,1000,5000,no,target,always,0,,,,,,6,
 1368,Geographer@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
 1368,Geographer@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
-1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1369,Grand Peco@AS_SONICBLOW,attack,136,5,500,800,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -2563,8 +2563,8 @@
 1510,Hylozoist@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
@@ -2583,11 +2583,11 @@
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1511,Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -3398,18 +3398,18 @@
 1663,Laurell Weinder@NPC_EMOTION,idle,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,attack,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,chase,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,target,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1668,Archdam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
 1668,Archdam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
 1668,Archdam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
@@ -3446,9 +3446,9 @@
 1673,Dimik@NPC_COMBOATTACK,attack,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_COMBOATTACK,chase,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_FIREATTACK,attack,186,3,500,0,5000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1675,Venatu@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
 1675,Venatu@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
 1675,Venatu@NPC_STUNATTACK,attack,179,2,500,1500,5000,no,target,always,0,,,,,,11,
@@ -3524,11 +3524,11 @@
 1688,Lady Tany@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@AL_TELEPORT,attack,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,target,myhpltmaxrate,60,,,,,,,
-1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,target,always,0,,,,,,,
+1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,randomtarget,always,0,,,,,,,
 1688,Lady Tany@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29,
 1688,Lady Tany@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1688,Lady Tany@NPC_SUMMONSLAVE,attack,196,5,10000,2000,5000,no,self,slavele,2,1691,,,,,,
@@ -4055,7 +4055,7 @@
 1764,Skeggiold@NPC_HOLYATTACK,chase,189,2,500,500,5000,no,target,always,0,,,,,,18,
 1764,Skeggiold@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1764,Skeggiold@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1765,Valkyrie@AL_HEAL,idle,28,11,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_HEAL,attack,28,11,10000,500,10000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1765,Valkyrie@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
@@ -4220,18 +4220,18 @@
 1779,Ktullanux@NPC_AGIUP,attack,350,5,2000,0,100000,yes,self,always,0,,,,,,,
 1779,Ktullanux@NPC_AGIUP,attack,350,5,10000,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 1779,Ktullanux@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,6,
-1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,randomtarget,always,0,,,,,,6,
+1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1780,Muscipular@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
 1780,Muscipular@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,0,,,,,,,
-1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1781,Drosera@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,randomtarget,always,0,,,,,,6,
+1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1782,Roween@NPC_WINDATTACK,attack,187,2,500,500,5000,no,target,always,0,,,,,,,
 1782,Roween@NPC_COMBOATTACK,attack,171,4,500,500,5000,no,target,always,0,,,,,,6,
 1782,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,22,0x308D,,,,,
@@ -5594,7 +5594,7 @@
 2017,Rata@NPC_ARMORBRAKE,attack,344,3,2000,0,5000,yes,target,myhpltmaxrate,60,,,,,,,
 2017,Rata@WZ_EARTHSPIKE,attack,90,5,3000,1000,5000,no,target,always,0,,,,,,6,
 2017,Rata@NPC_PIERCINGATT,attack,158,3,500,0,5000,yes,target,always,0,,,,,,,
-2017,Rata@SM_MAGNUM,attack,7,25,500,500,5000,no,self,always,0,,,,,,,
+2017,Rata@SM_MAGNUM,attack,7,10,500,500,5000,no,self,always,0,,,,,,,
 2017,Rata@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,,
 2017,Rata@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,,
 2017,Rata@NPC_POISONATTACK,attack,188,1,2000,0,5000,yes,target,always,0,,,,,,,
@@ -5694,14 +5694,6 @@
 2027,Dark Shadow@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,,
 2027,Dark Shadow@NPC_DARKNESSBREATH,attack,658,1,500,1000,5000,no,target,always,0,,,,,,,

-//****
-// NC Mechanic Summons
-2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,masterattacked,0,,,,,,,
-2043,Magic Decoy Fire@MG_FIREBOLT,idle,19,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2044,Magic Decoy Water@MG_COLDBOLT,idle,14,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2045,Magic Decoy Earth@WZ_EARTHSPIKE,idle,90,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,idle,20,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-
 // Brasilis
 2068,Boitata@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
 2068,Boitata@MG_FIREBALL,idle,17,5,10000,0,5000,yes,randomtarget,always,0,,,,,,,
@@ -5779,3 +5771,28 @@
 2082,Piranha@MG_COLDBOLT,chase,14,3,500,1000,5000,yes,target,always,0,,,,,,,
 2082,Piranha@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6,
 2082,Piranha@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+//****
+// NC Mechanic Summons
+2042,Silver Sniper@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,attack,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,chase,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,attack,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,chase,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,attack,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,chase,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,attack,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,chase,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
--- a/db/pre-re/skill_db.yml
+++ b/db/pre-re/skill_db.yml
@@ -4153,6 +4153,7 @@ Body:
        Time: 120000
      - Level: 5
        Time: 60000
+    Duration2: 3000
    Requires:
      SpCost: 10
      ItemCost:
@@ -4407,7 +4408,7 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -4998,7 +4999,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-      IgnoreAtkCard: true
+      IgnoreElement: true
      IgnoreFlee: true
    Range: 1
    Hit: Single
@@ -5013,47 +5014,26 @@ Body:
    CastTime: 1000
    Duration1:
      - Level: 1
-        Time: 11000
+        Time: 5000
      - Level: 2
-        Time: 10000
+        Time: 5500
      - Level: 3
-        Time: 9000
+        Time: 6000
      - Level: 4
-        Time: 8000
+        Time: 6500
      - Level: 5
        Time: 7000
      - Level: 6
-        Time: 6000
-      - Level: 7
-        Time: 5000
-      - Level: 8
-        Time: 4000
-      - Level: 9
-        Time: 3000
-      - Level: 10
-        Time: 2000
-    Duration2: 60000
-    Cooldown:
-      - Level: 1
        Time: 7500
-      - Level: 2
-        Time: 8000
-      - Level: 3
-        Time: 8500
-      - Level: 4
-        Time: 9000
-      - Level: 5
-        Time: 9500
-      - Level: 6
-        Time: 10000
      - Level: 7
-        Time: 10500
+        Time: 8000
      - Level: 8
-        Time: 11000
+        Time: 8500
      - Level: 9
-        Time: 11500
+        Time: 9000
      - Level: 10
-        Time: 12000
+        Time: 9500
+    Duration2: 60000
    Requires:
      SpCost:
        - Level: 1
@@ -5184,8 +5164,6 @@ Body:
    MaxLevel: 1
    Type: Weapon
    TargetType: Attack
-    DamageFlags:
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: 1
@@ -5828,8 +5806,8 @@ Body:
  - Id: 192
    Name: NPC_MAGICALATTACK
    Description: Demon Shock Attack
-    MaxLevel: 1
-    Type: Magic
+    MaxLevel: 10
+    Type: Weapon
    TargetType: Attack
    Flags:
      IsNpc: true
@@ -5935,13 +5913,34 @@ Body:
    Name: NPC_KEEPING
    Description: Keeping
    MaxLevel: 1
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 30000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Keeping
  - Id: 202
    Name: NPC_DARKBREATH
@@ -5981,19 +5980,60 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 15000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Barrier
  - Id: 205
    Name: NPC_DEFENDER
    Description: Defender
    MaxLevel: 1
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 15000
+    Duration1:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 100000
+      - Level: 6
+        Time: 110000
+      - Level: 7
+        Time: 120000
+      - Level: 8
+        Time: 130000
+      - Level: 9
+        Time: 140000
+      - Level: 10
+        Time: 150000
    Status: Armor
  - Id: 206
    Name: NPC_LICK
@@ -6421,7 +6461,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreAtkCard: true
-      IgnoreDefense: true
      IgnoreFlee: true
    Flags:
      IgnoreAutoGuard: true
@@ -6887,9 +6926,12 @@ Body:
    MaxLevel: 10
    Type: Magic
    TargetType: Self
+    DamageFlags:
+      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      TargetSelf: true
-    Range: 9
+    Range: 5
    Hit: Single
    HitCount: 1
    Element: Holy
@@ -9356,7 +9398,8 @@ Body:
  - Id: 349
    Name: NPC_POWERUP
    Description: Power Up
-    MaxLevel: 5
+    MaxLevel: 10
+    Type: Weapon
    TargetType: Self
    DamageFlags:
      NoDamage: true
@@ -9365,19 +9408,19 @@ Body:
    Hit: Single
    Duration1:
      - Level: 1
-        Time: 5000
-      - Level: 2
        Time: 10000
-      - Level: 3
+      - Level: 2
        Time: 15000
-      - Level: 4
+      - Level: 3
        Time: 20000
-      - Level: 5
+      - Level: 4
        Time: 25000
-    Status: Powerup
+      - Level: 5
+        Time: 30000
+    Status: IncHitRate
  - Id: 350
    Name: NPC_AGIUP
-    Description: Agility Up
+    Description: Agility UP
    MaxLevel: 10
    TargetType: Self
    DamageFlags:
@@ -9389,24 +9432,14 @@ Body:
      - Level: 1
        Time: 10000
      - Level: 2
-        Time: 20000
+        Time: 15000
      - Level: 3
-        Time: 30000
+        Time: 20000
      - Level: 4
-        Time: 40000
+        Time: 25000
      - Level: 5
-        Time: 50000
-      - Level: 6
-        Time: 60000
-      - Level: 7
-        Time: 70000
-      - Level: 8
-        Time: 80000
-      - Level: 9
-        Time: 90000
-      - Level: 10
-        Time: 100000
-    Status: Agiup
+        Time: 30000
+    Status: IncFleeRate
  - Id: 351
    Name: NPC_SIEGEMODE
    Description: Siege Mode
@@ -9608,7 +9641,7 @@ Body:
    Hit: Single
    HitCount: 1
    Duration1: 300000
-    Duration2: 10000
+    Duration2: 15000
    Requires:
      SpCost: 200
    Status: Berserk
@@ -9998,15 +10031,15 @@ Body:
    Element: Weapon
    Duration1:
      - Level: 1
-        Time: 2000
-      - Level: 2
        Time: 4000
-      - Level: 3
-        Time: 6000
-      - Level: 4
+      - Level: 2
        Time: 8000
+      - Level: 3
+        Time: 12000
+      - Level: 4
+        Time: 16000
      - Level: 5
-        Time: 10000
+        Time: 24000
    CastDelayFlags:
      IgnoreStatus: true
    Requires:
@@ -10022,7 +10055,7 @@ Body:
        - Level: 5
          Amount: 12
      SpiritSphereCost: 1
-    Status: Ankle
+    Status: Stop
  - Id: 372
    Name: CH_CHAINCRUSH
    Description: Chain Crush Combo
@@ -10200,7 +10233,17 @@ Body:
        Time: 55000
      - Level: 5
        Time: 60000
-    Duration2: 60000
+    Duration2:
+      - Level: 1
+        Time: 20000
+      - Level: 2
+        Time: 30000
+      - Level: 3
+        Time: 40000
+      - Level: 4
+        Time: 50000
+      - Level: 5
+        Time: 60000
    Requires:
      SpCost:
        - Level: 1
@@ -10801,7 +10844,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -10843,7 +10886,7 @@ Body:
      Weapon:
        1hSpear: true
        2hSpear: true
-    Status: Ankle
+    Status: Stop
  - Id: 398
    Name: LK_HEADCRUSH
    Description: Traumatic Blow
@@ -11062,7 +11105,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      NoDamage: true
-    Range: 9
+    Range: 7
    Hit: Single
    HitCount: 1
    ActiveInstance: 3
@@ -13823,6 +13866,8 @@ Body:
    Description: Chain Action
    MaxLevel: 10
    Type: Weapon
+    DamageFlags:
+      Critical: true
    Range: -9
    Hit: Multi_Hit
    HitCount: 2
@@ -14294,7 +14339,6 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
      IgnoreFlee: true
    Flags:
      AlterRangeSnakeEye: true
@@ -14380,7 +14424,7 @@ Body:
    Type: Weapon
    TargetType: Attack
    DamageFlags:
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Single
    HitCount: 1
@@ -14398,6 +14442,7 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreAtkCard: true
+      IgnoreFlee: true
    Range: 9
    Hit: Multi_Hit
    HitCount: 3
@@ -14473,7 +14518,7 @@ Body:
    Flags:
      IgnoreBgReduction: true
      IgnoreGvgReduction: true
-    Range: 7
+    Range: 9
    Hit: Single
    HitCount: 1
    CopyFlags:
@@ -14510,8 +14555,6 @@ Body:
    MaxLevel: 5
    Type: Weapon
    TargetType: Self
-    DamageFlags:
-      IgnoreAtkCard: true
    Hit: Single
    HitCount: 1
    Element: Weapon
@@ -16332,7 +16375,7 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
-    Duration1: 300000
+    Duration1: -1
    Status: Invincible
  - Id: 686
    Name: NPC_INVINCIBLEOFF
@@ -16344,6 +16387,8 @@ Body:
    Flags:
      IsNpc: true
    HitCount: 1
+    Duration1: 60000
+    Status: InvincibleOff
  - Id: 687
    Name: NPC_ALLHEAL
    Description: Full Heal
@@ -16962,13 +17007,32 @@ Body:
      Skill:
        Plagiarism: true
        Reproduce: true
-    Duration2: 60000
+    Duration2:
+      - Level: 1
+        Time: 15000
+      - Level: 2
+        Time: 20000
+      - Level: 3
+        Time: 25000
+      - Level: 4
+        Time: 30000
+      - Level: 5
+        Time: 35000
+      - Level: 6
+        Time: 40000
+      - Level: 7
+        Time: 45000
+      - Level: 8
+        Time: 50000
+      - Level: 9
+        Time: 55000
+      - Level: 10
+        Time: 60000
    Requires:
      SpCost: 15
      Ammo:
        Dagger: true
      AmmoAmount: 1
-    Status: Poison
  - Id: 1005
    Name: RG_CLOSECONFINE
    Description: Close Confine
@@ -17180,7 +17244,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
    Flags:
      IsQuest: true
    Range: -1
@@ -32404,9 +32467,9 @@ Body:
    Hit: Single
    HitCount: 1
    Duration1: 300000
-    Duration2: 10000
+    Duration2: 15000
    Requires:
-      SpCost: 200
+      SpCost: 100
    Status: Berserk
  - Id: 8207
    Name: MA_DOUBLE
@@ -32585,7 +32648,7 @@ Body:
    TargetType: Ground
    DamageFlags:
      Splash: true
-      IgnoreAtkCard: true
+      IgnoreFlee: true
    Flags:
      IsTrap: true
      AlterRangeResearchTrap: true
@@ -32752,7 +32815,7 @@ Body:
      IgnoreDefense: true
    Flags:
      TargetTrap: true
-    Range: 4
+    Range: 5
    Hit: Multi_Hit
    HitCount: 5
    Element: Weapon
@@ -32795,7 +32858,7 @@ Body:
          Amount: 27
        - Level: 5
          Amount: 30
-    Status: Ankle
+    Status: Stop
  - Id: 8219
    Name: ML_DEFENDER
    Description: Defending_Aura
@@ -33005,10 +33068,9 @@ Body:
    Type: Weapon
    TargetType: Attack
    Range: 1
-    Hit: Single
-    HitCount: 1
+    Hit: Multi_Hit
+    HitCount: 3
    Element: Weapon
-    CastCancel: true
    CastTime: 1000
    AfterCastActDelay: 2000
    Duration2: 5000
--- a/db/pre-re/statpoint.yml
+++ b/db/pre-re/statpoint.yml
@@ -532,23 +532,3 @@ Body:
    Points: 4545
  - Level: 250
    Points: 4545
-  - Level: 251
-    Points: 4545
-  - Level: 252
-    Points: 4545
-  - Level: 253
-    Points: 4545
-  - Level: 254
-    Points: 4545
-  - Level: 255
-    Points: 4545
-  - Level: 256
-    Points: 4545
-  - Level: 257
-    Points: 4545
-  - Level: 258
-    Points: 4545
-  - Level: 259
-    Points: 4545
-  - Level: 260
-    Points: 4545
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@@ -162,7 +162,6 @@ Body:
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -253,7 +252,6 @@ Body:
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -769,6 +767,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -1099,7 +1098,6 @@ Body:
    Icon: EFST_GROUNDMAGIC
    DurationLookup: SA_VOLCANO
    CalcFlags:
-      Batk: true
      Watk: true
    Flags:
      NoSave: true
@@ -1123,14 +1121,8 @@ Body:
      NoClearance: true
  - Status: Watk_Element
    DurationLookup: MS_MAGNUM
-    Flags:
-      NoSave: true
-    EndOnStart:
-      Watk_Element: true
  - Status: Armor
    DurationLookup: NPC_DEFENDER
-    CalcFlags:
-      Speed: true
  - Status: Armor_Element_Water
    Icon: EFST_RESIST_PROPERTY_WATER
    CalcFlags:
@@ -2058,6 +2050,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Inchitrate
+    DurationLookup: NPC_POWERUP
    CalcFlags:
      Hit: true
    Flags:
@@ -2076,6 +2069,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Incfleerate
+    DurationLookup: NPC_AGIUP
    CalcFlags:
      Flee: true
    Flags:
@@ -2718,7 +2712,6 @@ Body:
    CalcFlags:
      Flee: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2727,7 +2720,6 @@ Body:
    CalcFlags:
      Watk: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2736,7 +2728,6 @@ Body:
    CalcFlags:
      MaxHp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2745,7 +2736,6 @@ Body:
    CalcFlags:
      MaxSp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2754,7 +2744,6 @@ Body:
    CalcFlags:
      Hit: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2823,12 +2812,23 @@ Body:
    Icon: EFST_INVINCIBLE
    DurationLookup: NPC_INVINCIBLE
    CalcFlags:
-      Aspd: true
      Speed: true
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
+    EndOnStart:
+      Invincibleoff: true
+  - Status: Invincibleoff
+    DurationLookup: NPC_INVINCIBLEOFF
+    CalcFlags:
+      Speed: true
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    EndOnStart:
+      Invincible: true
  - Status: Manu_Atk
    Icon: EFST_MANU_ATK
    Flags:
@@ -7048,25 +7048,3 @@ Body:
      NoClearbuff: true
  - Status: WeaponBreaker
    DurationLookup: NPC_WEAPONBRAKER
-  - Status: Powerup
-    Icon: EFST_POWERUP
-    DurationLookup: NPC_POWERUP
-    CalcFlags:
-      Hit: true
-    Flags:
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-  - Status: Agiup
-    Icon: EFST_AGIUP
-    DurationLookup: NPC_AGIUP
-    CalcFlags:
-      Speed: true
-      Flee: true
-    Flags:
-      NoClearbuff: true
-      NoBanishingBuster: true
-      NoClearance: true
-    EndOnStart:
-      Decreaseagi: true
--- a/db/re/achievement_db.yml
+++ b/db/re/achievement_db.yml
@@ -2049,21 +2049,21 @@ Body:
  - Id: 200032
    Group: Goal_Level
    Name: The start of another adventure!
-    Condition: " BaseLevel >= 100 "
+    Condition: " BaseLevel == 100 "
    Rewards:
      Item: Rebeginer_Box_100
    Score: 10
  - Id: 200033
    Group: Goal_Level
    Name: With a new mind!(1)
-    Condition: " BaseLevel >= 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
+    Condition: " BaseLevel == 170 && (Class >= JOB_RUNE_KNIGHT && Class <= JOB_GUILLOTINE_CROSS_T) "
    Rewards:
      Item: Costume_Ticket
    Score: 50
  - Id: 200034
    Group: Goal_Level
    Name: With a new mind!(2)
-    Condition: " BaseLevel >= 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
+    Condition: " BaseLevel == 170 && (Class >= JOB_ROYAL_GUARD && Class <= JOB_SHADOW_CHASER_T) "
    Rewards:
      Item: Costume_Ticket
    Score: 50
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
--- a/db/re/item_enchant.yml
+++ b/db/re/item_enchant.yml
--- a/db/re/item_group_db.yml
+++ b/db/re/item_group_db.yml
--- a/db/re/item_packages.yml
+++ b/db/re/item_packages.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2024 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
@@ -159,153 +159,77 @@ Body:
            RentalHours: 1
      - Group: 9
        Items:
+          - Item: Red_Potion
+            Amount: 10
+          - Item: Red_Potion
+            Amount: 5
+          - Item: Red_Potion
          - Item: Red_Potion
            Amount: 3
            RentalHours: 1
      - Group: 10
        Items:
          - Item: Guard_
+          - Item: Guard_
+          - Item: Guard_
      - Group: 11
        Items:
          - Item: Orange_Potion
            Amount: 800
-  - Item: Minus_Status_Box_
+  - Item: Boost_Armor_Box
    Groups:
      - Group: 0
        Items:
-          - Item: Minus_Str
-            Amount: 6
+          - Item: Atker_Plate
+          - Item: Atker_Manteau
+          - Item: Atker_Greave
+          - Item: Atker_Ring
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 1
        Items:
-          - Item: Minus_Agi
-            Amount: 6
+          - Item: Ran_Suits
+          - Item: Ran_Manteau
+          - Item: Ran_Boots
+          - Item: Ran_Brooch
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 2
        Items:
-          - Item: Minus_Vit
-            Amount: 6
+          - Item: Ele_Robe
+          - Item: Ele_Muffler
+          - Item: Ele_Shoes
+          - Item: Ele_Earing
+          - Item: Boost_Up_1
+            Amount: 3
      - Group: 3
        Items:
-          - Item: Minus_Int
-            Amount: 6
-      - Group: 4
-        Items:
-          - Item: Minus_Dex
-            Amount: 6
-      - Group: 5
-        Items:
-          - Item: Minus_Luk
-            Amount: 6
-      - Group: 6
-        Items:
-          - Item: Minus_Str
-          - Item: Minus_Agi
-          - Item: Minus_Vit
-          - Item: Minus_Int
-          - Item: Minus_Dex
-          - Item: Minus_Luk
-  - Item: Alchemist_Box_
+          - Item: Defn_Robe
+          - Item: Defn_Muffler
+          - Item: Defn_Shoes
+          - Item: Defn_Earing
+          - Item: Boost_Up_1
+            Amount: 3
+  - Item: Special_Coin_Pack
    Groups:
      - Group: 0
        Items:
-          - Item: Fire_Bottle
-            Amount: 50
+          - Item: EP17_1_EVT39
+            Amount: 3
+          - Item: EP17_1_EVT02
+            Amount: 18
      - Group: 1
        Items:
-          - Item: Acid_Bottle
-            Amount: 50
+          - Item: BarMealTicket
+            Amount: 20
      - Group: 2
        Items:
-          - Item: MenEater_Plant_Bottle
-            Amount: 50
+          - Item: Ep18_Amethyst_Fragment
+            Amount: 20
      - Group: 3
        Items:
-          - Item: Coating_Bottle
-            Amount: 50
-      - Group: 4
-        Items:
-          - Item: Mini_Bottle
-            Amount: 50
-  - Item: FullPene_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: FullPene_Earring_Box
-      - Group: 1
-        Items:
-          - Item: FullPene_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: FullPene_Armor_Box
-      - Group: 3
-        Items:
-          - Item: FullPene_Shoes_Box
-  - Item: FullTemp_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: FullTemp_Earring_Box
-      - Group: 1
-        Items:
-          - Item: FullTemp_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: FullTemp_Armor_Box
-      - Group: 3
-        Items:
-          - Item: FullTemp_Shoes_Box
-  - Item: Durable_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Durable_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Durable_Shield_Box
-  - Item: Clever_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Clever_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Clever_Shield_Box
-  - Item: OS_Helm_Box_
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Ignis_CapK
-      - Group: 1
-        Items:
-          - Item: Phantom_Cap
-      - Group: 2
-        Items:
-          - Item: Stripe_Hat
-      - Group: 3
-        Items:
-          - Item: Clock_Casket_RD
-      - Group: 4
-        Items:
-          - Item: Large_Sorcerer_Crown
-      - Group: 5
-        Items:
-          - Item: Scorpio_Diadem_K
-      - Group: 6
-        Items:
-          - Item: Sagittarius_DiademK
-  - Item: Shadow_R_M_Box_
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Class_Sha_R_M_Melee
-      - Group: 1
-        Items:
-          - Item: Class_Sha_R_M_Magic
-      - Group: 2
-        Items:
-          - Item: Skill_Sha_R_M_Melee
-      - Group: 3
-        Items:
-          - Item: Skill_Sha_R_M_Magic
+          - Item: Ep19_Snow_Flower
+            Amount: 20
  - Item: Metal_W_Box
    Groups:
      - Group: 0
@@ -402,581 +326,206 @@ Body:
      - Group: 3
        Items:
          - Item: C_School_Bag_PU
-  - Item: Special_Coin_Pack
+  - Item: aegis_101470
    Groups:
      - Group: 0
        Items:
-          - Item: EP17_1_EVT39
-            Amount: 3
-          - Item: EP17_1_EVT02
-            Amount: 18
+          - Item: Minus_Str
+            Amount: 6
      - Group: 1
        Items:
-          - Item: BarMealTicket
-            Amount: 20
+          - Item: Minus_Agi
+            Amount: 6
      - Group: 2
        Items:
-          - Item: Ep18_Amethyst_Fragment
-            Amount: 20
+          - Item: Minus_Vit
+            Amount: 6
      - Group: 3
        Items:
-          - Item: Ep19_Snow_Flower
-            Amount: 20
-  - Item: Boost_Armor_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Atker_Plate
-          - Item: Atker_Manteau
-          - Item: Atker_Greave
-          - Item: Atker_Ring
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 1
-        Items:
-          - Item: Ran_Suits
-          - Item: Ran_Manteau
-          - Item: Ran_Boots
-          - Item: Ran_Brooch
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 2
-        Items:
-          - Item: Ele_Robe
-          - Item: Ele_Muffler
-          - Item: Ele_Shoes
-          - Item: Ele_Earing
-          - Item: Boost_Up_1
-            Amount: 3
-      - Group: 3
-        Items:
-          - Item: Defn_Robe
-          - Item: Defn_Muffler
-          - Item: Defn_Shoes
-          - Item: Defn_Earing
-          - Item: Boost_Up_1
-            Amount: 3
-  - Item: AllMighty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: AllMighty_Earring_Box
-      - Group: 1
-        Items:
-          - Item: AllMighty_Pendant_Box
-  - Item: TrueGem_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: TrueGem_Earring_Box
-      - Group: 1
-        Items:
-          - Item: TrueGem_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: TrueGem_Shoes_Box
-      - Group: 3
-        Items:
-          - Item: TrueGem_Armor_Box
-  - Item: PerfectSize_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: PerfectSize_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: PerfectSize_Armor_Box
-  - Item: Mammoth_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Mammoth_Earring_Box
-      - Group: 1
-        Items:
-          - Item: Mammoth_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: Mammoth_Armor_Box
-      - Group: 3
-        Items:
-          - Item: Mammoth_Shoes_Box
-  - Item: SpellCaster_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: SpellCaster_Earring_Box
-      - Group: 1
-        Items:
-          - Item: SpellCaster_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: SpellCaster_Armor_Box
-      - Group: 3
-        Items:
-          - Item: SpellCaster_Shoes_Box
-  - Item: Absorb_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Absorb_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Absorb_Shield_Box
-  - Item: R_Bearers_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: R_Bearers_Earring_Box
-      - Group: 1
-        Items:
-          - Item: R_Bearers_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: R_Bearers_Armor_Box
-      - Group: 3
-        Items:
-          - Item: R_Bearers_Shoes_Box
-  - Item: Hasty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Hasty_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Hasty_Shield_Box
-  - Item: MAutoSpell_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: MAutoSpell_Earring_Box
-      - Group: 1
-        Items:
-          - Item: MAutoSpell_Pendant_Box
-      - Group: 2
-        Items:
-          - Item: MAutoSpell_Armor_Box
-      - Group: 3
-        Items:
-          - Item: MAutoSpell_Shoes_Box
-  - Item: Infinity_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Infinity_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: Infinity_Shield_Box
-  - Item: EXP_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: EXP_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: EXP_Shield_Box
-  - Item: M_Blitz_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: M_Blitz_Weapon_Box
-      - Group: 1
-        Items:
-          - Item: M_Blitz_Shield_Box
-  - Item: GoodnEvil_Circlet_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: GoodnEvil_Circlet_NW
-      - Group: 1
-        Items:
-          - Item: GoodnEvil_Circlet_NW2
-      - Group: 2
-        Items:
-          - Item: GoodnEvil_Circlet_NW3
-      - Group: 3
-        Items:
-          - Item: GoodnEvil_Circlet_NW4
+          - Item: Minus_Int
+            Amount: 6
      - Group: 4
        Items:
-          - Item: GoodnEvil_Circlet_NW5
-  - Item: Hero_Weapon_Up_S_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Hero_Weapon_Up_Box_1
-      - Group: 1
-        Items:
-          - Item: Hero_Weapon_Up_Box_2
-      - Group: 2
-        Items:
-          - Item: Hero_Weapon_Up_Box_3
-      - Group: 3
-        Items:
-          - Item: Hero_Weapon_Up_Box_4
-      - Group: 4
-        Items:
-          - Item: Hero_Weapon_Up_Box_5
+          - Item: Minus_Dex
+            Amount: 6
      - Group: 5
        Items:
-          - Item: Hero_Weapon_Up_Box_6
-  - Item: Hero_Weapon_Hammer_S
+          - Item: Minus_Luk
+            Amount: 6
+      - Group: 6
+        Items:
+          - Item: Minus_Str
+          - Item: Minus_Agi
+          - Item: Minus_Vit
+          - Item: Minus_Int
+          - Item: Minus_Dex
+          - Item: Minus_Luk
+  - Item: aegis_101471
    Groups:
      - Group: 0
        Items:
-          - Item: Hero_Weapon_Hammer_1
+          - Item: Fire_Bottle
+            Amount: 50
      - Group: 1
        Items:
-          - Item: Hero_Weapon_Hammer_2
+          - Item: Acid_Bottle
+            Amount: 50
      - Group: 2
        Items:
-          - Item: Hero_Weapon_Hammer_3
+          - Item: MenEater_Plant_Bottle
+            Amount: 50
      - Group: 3
        Items:
-          - Item: Hero_Weapon_Hammer_4
+          - Item: Coating_Bottle
+            Amount: 50
      - Group: 4
        Items:
-          - Item: Hero_Weapon_Hammer_5
+          - Item: Mini_Bottle
+            Amount: 50
+  - Item: aegis_101542
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101543
+      - Group: 1
+        Items:
+          - Item: aegis_101544
+      - Group: 2
+        Items:
+          - Item: aegis_101545
+      - Group: 3
+        Items:
+          - Item: aegis_101546
+  - Item: aegis_101547
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101548
+      - Group: 1
+        Items:
+          - Item: aegis_101549
+      - Group: 2
+        Items:
+          - Item: aegis_101550
+      - Group: 3
+        Items:
+          - Item: aegis_101551
+  - Item: aegis_101552
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101553
+      - Group: 1
+        Items:
+          - Item: aegis_101554
+  - Item: aegis_101555
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101556
+      - Group: 1
+        Items:
+          - Item: aegis_101557
+  - Item: aegis_101563
+    Groups:
+      - Group: 0
+        Items:
+          - Item: Ignis_CapK
+      - Group: 1
+        Items:
+          - Item: Phantom_Cap
+      - Group: 2
+        Items:
+          - Item: Stripe_Hat
+      - Group: 3
+        Items:
+          - Item: Clock_Casket_RD
+      - Group: 4
+        Items:
+          - Item: Large_Sorcerer_Crown
      - Group: 5
        Items:
-          - Item: Hero_Weapon_Hammer_6
-  - Item: aegis_102215
+          - Item: Scorpio_Diadem_K
+      - Group: 6
+        Items:
+          - Item: Sagittarius_DiademK
+  - Item: aegis_101565
    Groups:
      - Group: 0
        Items:
-          - Item: Bio_Weapon_Refine_Cube
+          - Item: Class_Sha_R_M_Melee
      - Group: 1
        Items:
-          - Item: Old_Refine_Cube
+          - Item: Class_Sha_R_M_Magic
      - Group: 2
        Items:
-          - Item: Geffen_Refine_Cube
-  - Item: aegis_102216
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Bio_Helm_Refine_Cube
-      - Group: 1
-        Items:
-          - Item: Circlet_Refine_Cube
-      - Group: 2
-        Items:
-          - Item: Auto_Armor_Refine_Cube
+          - Item: Skill_Sha_R_M_Melee
      - Group: 3
        Items:
-          - Item: Racecap_Refine_Cube
-      - Group: 4
-        Items:
-          - Item: OS_Weapon_Refine_Cube
-      - Group: 5
-        Items:
-          - Item: Temporal_Refine_Cube
-  - Item: Hero_Weapon_S_Box_1
+          - Item: Skill_Sha_R_M_Magic
+  - Item: aegis_101654
    Groups:
      - Group: 0
        Items:
-          - Item: Royal_Bow_K
-            Refine: 11
+          - Item: aegis_101655
      - Group: 1
        Items:
-          - Item: Shadow_Staff_K
-            Refine: 11
+          - Item: aegis_101656
+  - Item: aegis_101657
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101658
+      - Group: 1
+        Items:
+          - Item: aegis_101659
      - Group: 2
        Items:
-          - Item: Iron_Nail_K
-            Refine: 11
+          - Item: aegis_101660
      - Group: 3
        Items:
-          - Item: Blue_Crystal_Staff
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Freezing_Rod
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Ancient_Hero_Boots
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_2
+          - Item: aegis_101661
+  - Item: aegis_101662
    Groups:
      - Group: 0
        Items:
-          - Item: Sword_Of_Bluefire
-            Refine: 11
+          - Item: aegis_101663
      - Group: 1
        Items:
-          - Item: Iron_Staff
-            Refine: 11
+          - Item: aegis_101664
+  - Item: aegis_101727
+    Groups:
+      - Group: 0
+        Items:
+          - Item: aegis_101717
+      - Group: 1
+        Items:
+          - Item: aegis_101718
      - Group: 2
        Items:
-          - Item: Oriental_Sword
-            Refine: 11
+          - Item: aegis_101719
      - Group: 3
        Items:
-          - Item: Fog_Dew_Sword
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Sharp_Wind_Sword
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Humma_Clear
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_3
+          - Item: aegis_101720
+  - Item: aegis_101728
    Groups:
      - Group: 0
        Items:
-          - Item: Narcis_Bow
-            Refine: 11
+          - Item: aegis_101721
      - Group: 1
        Items:
-          - Item: Magic_Sword
-            Refine: 11
+          - Item: aegis_101722
      - Group: 2
        Items:
-          - Item: Avenger
-            Refine: 11
+          - Item: aegis_101723
      - Group: 3
        Items:
-          - Item: Undine_Spear_K
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Demon_Hunting_Bible_K
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Shiver_Katar_K
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_4
+          - Item: aegis_101724
+  - Item: aegis_101729
    Groups:
      - Group: 0
        Items:
-          - Item: OneSkyOneSun
-            Refine: 11
+          - Item: aegis_101725
      - Group: 1
        Items:
-          - Item: SoulWeight
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: MeawFoxtail
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Freedom_Stick
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Blessed_Knife
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_5
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Dragonic_Slayer
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Light_Blade
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Slate_Sword
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Trumpet_Shell_K
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Barb_Wire_K
-            Refine: 11
-      - Group: 5
-        Items:
-          - Item: Meteor_Striker
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_6
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Saint_Hall
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Ray_Knuckle
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Blade_Katar
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Fatalist
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: Scalet_Dragon_L_Bow
-            Refine: 11
-  - Item: Hero_Weapon_S_Box_7
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Crimson_Rose
-            Refine: 11
-      - Group: 1
-        Items:
-          - Item: Master_Soul_Rifle
-            Refine: 11
-      - Group: 2
-        Items:
-          - Item: Demon_S_Shot
-            Refine: 11
-      - Group: 3
-        Items:
-          - Item: Golden_L_Launcher
-            Refine: 11
-      - Group: 4
-        Items:
-          - Item: The_Black_Gatling
-            Refine: 11
-  - Item: 2023_Spring_Select
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Lop_Bunny_Cloak
-      - Group: 1
-        Items:
-          - Item: C_Heart_Chiffon_Rabbit
-      - Group: 2
-        Items:
-          - Item: C_Teaparty_Wonderland
-      - Group: 3
-        Items:
-          - Item: C_Chocolat_Rabbit_Hair
-  - Item: RO_Concert_Scroll2
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Headset_OST
-      - Group: 1
-        Items:
-          - Item: C_Music_Decoration
-      - Group: 2
-        Items:
-          - Item: C_Whistle
-  - Item: 21th_Costume_Select
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Ocean_Color_Long
-      - Group: 1
-        Items:
-          - Item: C_Aqua_Fin_Decoration
-      - Group: 2
-        Items:
-          - Item: C_Sailor_Cap
-  - Item: Cinnamon_Costume_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Cinnamon2
-      - Group: 1
-        Items:
-          - Item: C_Cinnamon
-      - Group: 2
-        Items:
-          - Item: C_JP_EV16
-      - Group: 3
-        Items:
-          - Item: C_JP_EV17
-  - Item: IsgardCrown_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Glacier_Helm_1
-      - Group: 1
-        Items:
-          - Item: Glacier_Helm_2
-      - Group: 2
-        Items:
-          - Item: Glacier_Helm_3
-  - Item: AceCard_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Heart_Ace_Melee
-      - Group: 1
-        Items:
-          - Item: Spade_Ace_Melee
-      - Group: 2
-        Items:
-          - Item: Diamond_Ace_Range
-      - Group: 3
-        Items:
-          - Item: Clover_Ace_Defense
-  - Item: Loki_Coin_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Loki_Coin
-            Amount: 10
-      - Group: 1
-        Items:
-          - Item: Loki_Coin_2
-            Amount: 10
-      - Group: 2
-        Items:
-          - Item: Loki_Coin_3
-            Amount: 10
-      - Group: 3
-        Items:
-          - Item: Loki_Coin_4
-            Amount: 10
-  - Item: Loki_Advice_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: Loki_Advice
-            Amount: 10
-      - Group: 1
-        Items:
-          - Item: Loki_Advice_2
-            Amount: 10
-      - Group: 2
-        Items:
-          - Item: Loki_Advice_3
-            Amount: 10
-      - Group: 3
-        Items:
-          - Item: Loki_Advice_4
-            Amount: 10
-  - Item: 2023_Xmas_Costume
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_SnowmanHat
-      - Group: 1
-        Items:
-          - Item: C_WinterNightBells
-      - Group: 2
-        Items:
-          - Item: C_SantaTeddyBear
-  - Item: 10AllMighty_Select_Box
-    Groups:
-      - Group: 0
-        Items:
-          - Item: S_AllMighty_Earring
-            Refine: 10
-      - Group: 1
-        Items:
-          - Item: S_AllMighty_Pendant
-            Refine: 10
-  - Item: Sonic_Costume_Pack
-    Groups:
-      - Group: 0
-        Items:
-          - Item: C_Super_Sonic_Mini
-      - Group: 1
-        Items:
-          - Item: C_Chaos_Emerald
+          - Item: aegis_101726
--- a/db/re/item_randomopt_group.yml
+++ b/db/re/item_randomopt_group.yml
@@ -15318,663 +15318,3 @@ Body:
            MinValue: 1
            MaxValue: 7
            Chance: 400
-  - Id: 168
-    Group: PONTIFEX_COURAGE
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 200
-            MaxValue: 1000
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 50
-            MaxValue: 250
-            Chance: 10000
-          - Option: VAR_ATKPERCENT
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-          - Option: VAR_ATTPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: VAR_HITSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: RACE_DAMAGE_HUMAN
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANIMAL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_DEVIL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_DRAGON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_PLANT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANGEL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_UNDEAD
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_INSECT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_DAMAGE_FISHS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_SMALL_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_SIZE_LARGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-  - Id: 169
-    Group: PONTIFEX_WISDOM
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 200
-            MaxValue: 1000
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 50
-            MaxValue: 250
-            Chance: 10000
-          - Option: VAR_MAGICATKPERCENT
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-          - Option: VAR_ATTMPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 10
-            MaxValue: 50
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 5
-            MaxValue: 25
-            Chance: 10000
-          - Option: DEC_SPELL_CAST_TIME
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: RACE_MDAMAGE_HUMAN
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANIMAL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DEVIL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DRAGON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_PLANT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANGEL
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_UNDEAD
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_INSECT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_FISHS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: MDAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_SMALL_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_LARGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 3
-            Chance: 10000
-  - Id: 170
-    Group: PONTIFEX_TENACITY
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 250
-            MaxValue: 1250
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 75
-            MaxValue: 375
-            Chance: 10000
-          - Option: VAR_ATKPERCENT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: VAR_ATTPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: VAR_HITSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: RACE_DAMAGE_HUMAN
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANIMAL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_DEVIL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_DRAGON
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_PLANT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_NOTHING
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_ANGEL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_UNDEAD
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_INSECT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_DAMAGE_FISHS
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: DAMAGE_PROPERTY_WATER_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_WIND_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_GROUND_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_FIRE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_SAINT_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_DARKNESS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RANGE_ATTACK_DAMAGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MELEE_ATTACK_DAMAGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_CRI_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_SMALL_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DAMAGE_SIZE_LARGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-  - Id: 171
-    Group: PONTIFEX_BELIEF
-    Slots:
-      - Slot: 1
-        Options:
-          - Option: VAR_MAXHPAMOUNT
-            MinValue: 250
-            MaxValue: 1250
-            Chance: 10000
-          - Option: VAR_MAXSPAMOUNT
-            MinValue: 75
-            MaxValue: 375
-            Chance: 10000
-          - Option: VAR_MAGICATKPERCENT
-            MinValue: 2
-            MaxValue: 10
-            Chance: 10000
-          - Option: VAR_ATTMPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_ITEMDEFPOWER
-            MinValue: 12
-            MaxValue: 60
-            Chance: 10000
-          - Option: VAR_AVOIDSUCCESSVALUE
-            MinValue: 6
-            MaxValue: 30
-            Chance: 10000
-          - Option: DEC_SPELL_CAST_TIME
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: RACE_MDAMAGE_HUMAN
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANIMAL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DEVIL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_DRAGON
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_PLANT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_NOTHING
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_ANGEL
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_UNDEAD
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_INSECT
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: RACE_MDAMAGE_FISHS
-            MinValue: 4
-            MaxValue: 20
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
-      - Slot: 2
-        Options:
-          - Option: MDAMAGE_PROPERTY_POISON_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_NOTHING_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_TELEKINESIS_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_PROPERTY_UNDEAD_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WATER
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_WIND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_GROUND
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_FIRE
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_SAINT
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_DARKNESS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_POISON
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_NOTHING
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: ADDSKILLMDAMAGE_TELEKINESIS
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_SMALL_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_MIDIUM_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: MDAMAGE_SIZE_LARGE_TARGET
-            MinValue: 3
-            MaxValue: 15
-            Chance: 10000
-          - Option: DEC_SPELL_DELAY_TIME
-            MinValue: 1
-            MaxValue: 5
-            Chance: 10000
--- a/db/re/item_reform.yml
+++ b/db/re/item_reform.yml
--- a/db/re/job_basepoints.yml
+++ b/db/re/job_basepoints.yml
--- a/db/re/job_exp.yml
+++ b/db/re/job_exp.yml
--- a/db/re/job_stats.yml
+++ b/db/re/job_stats.yml
@@ -8884,15 +8884,6 @@ Body:
      - Level: 50
        Vit: 1
        Pow: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Pow: 1
-      - Level: 54
-        Pow: 1
-        Crt: 1
-      - Level: 55
-        Sta: 1
  - Jobs:
      Meister: true
      Meister2: true
@@ -9026,15 +9017,6 @@ Body:
      - Level: 50
        Pow: 1
        Wis: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Sta: 1
-        Wis: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Shadow_Cross: true
    MaxWeight: 32000
@@ -9167,15 +9149,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Pow: 1
-      - Level: 53
-        Con: 1
-      - Level: 54
-        Sta: 1
-        Crt: 1
-      - Level: 55
-        Crt: 1
  - Jobs:
      Arch_Mage: true
    MaxWeight: 30000
@@ -9213,7 +9186,7 @@ Body:
        Vit: 1
        Int: 1
      - Level: 13
-        Dex: 1
+        Agi: 1
        Spl: 1
      - Level: 14
        Sta: 1
@@ -9229,7 +9202,7 @@ Body:
        Int: 1
        Dex: 1
      - Level: 19
-        Int: 1
+        Dex: 1
      - Level: 20
        Vit: 1
        Int: 1
@@ -9308,15 +9281,6 @@ Body:
      - Level: 50
        Sta: 1
        Wis: 1
-      - Level: 52
-        Spl: 1
-      - Level: 53
-        Con: 1
-      - Level: 54
-        Sta: 1
-        Wis: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Cardinal: true
    MaxWeight: 30000
@@ -9449,16 +9413,6 @@ Body:
      - Level: 50
        Spl: 1
        Crt: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Pow: 1
-      - Level: 53
-        Sta: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Crt: 1
  - Jobs:
      Windhawk: true
      Windhawk2: true
@@ -9592,15 +9546,6 @@ Body:
      - Level: 50
        Dex: 1
        Con: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Imperial_Guard: true
      Imperial_Guard2: true
@@ -9735,15 +9680,6 @@ Body:
      - Level: 50
        Pow: 1
        Sta: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Wis: 1
-        Con: 1
  - Jobs:
      Biolo: true
    MaxWeight: 32000
@@ -9876,15 +9812,6 @@ Body:
      - Level: 50
        Str: 1
        Crt: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Pow: 1
-        Crt: 1
-      - Level: 55
-        Con: 1
  - Jobs:
      Abyss_Chaser: true
    MaxWeight: 28000
@@ -10017,15 +9944,6 @@ Body:
      - Level: 50
        Pow: 1
        Spl: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Crt: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Sta: 1
-        Con: 1
  - Jobs:
      Elemental_Master: true
    MaxWeight: 30000
@@ -10158,16 +10076,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Inquisitor: true
    MaxWeight: 30000
@@ -10300,15 +10208,6 @@ Body:
      - Level: 50
        Pow: 1
        Wis: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Wis: 1
  - Jobs:
      Troubadour: true
    MaxWeight: 32000
@@ -10441,15 +10340,6 @@ Body:
        Con: 1
      - Level: 50
        Dex: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Spl: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Trouvere: true
    MaxWeight: 32000
@@ -10583,15 +10473,6 @@ Body:
        Con: 1
      - Level: 50
        Agi: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Sta: 1
-      - Level: 53
-        Spl: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Sky_Emperor: true
    MaxWeight: 42000
@@ -10726,14 +10607,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Sta: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Pow: 1
-        Con: 1
  - Jobs:
      Soul_Ascetic: true
    MaxWeight: 42000
@@ -10857,16 +10730,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Spl: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Wis: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Shinkiro: true
    MaxWeight: 45000
@@ -11000,16 +10863,6 @@ Body:
      - Level: 50
        Pow: 1
        Crt: 1
-      - Level: 51
-        Crt: 1
-      - Level: 52
-        Con: 1
-      - Level: 53
-        Wis: 1
-      - Level: 54
-        Sta: 1
-      - Level: 55
-        Sta: 1
  - Jobs:
      Shiranui: true
    MaxWeight: 45000
@@ -11132,15 +10985,6 @@ Body:
      - Level: 50
        Wis: 1
        Spl: 1
-      - Level: 51
-        Pow: 1
-      - Level: 52
-        Spl: 1
-      - Level: 54
-        Spl: 1
-      - Level: 55
-        Spl: 1
-        Con: 1
  - Jobs:
      Night_Watch: true
    MaxWeight: 48000
@@ -11154,6 +10998,7 @@ Body:
      - Level: 2
        Str: 1
        Agi: 1
+        Sta: 1
      - Level: 3
        Vit: 1
        Luk: 1
@@ -11189,7 +11034,6 @@ Body:
        Dex: 1
      - Level: 15
        Luk: 1
-        Sta: 1
      - Level: 16
        Vit: 1
        Int: 1
@@ -11230,13 +11074,13 @@ Body:
      - Level: 30
        Str: 1
        Int: 1
+        Sta: 1
      - Level: 31
        Dex: 1
        Con: 1
      - Level: 32
        Pow: 1
      - Level: 33
-        Sta: 1
        Crt: 1
      - Level: 34
        Crt: 1
@@ -11251,10 +11095,7 @@ Body:
      - Level: 40
        Pow: 1
      - Level: 41
-        Sta: 1
        Con: 1
-      - Level: 42
-        Sta: 1
      - Level: 43
        Crt: 1
      - Level: 44
@@ -11263,7 +11104,6 @@ Body:
        Con: 1
      - Level: 46
        Pow: 1
-        Sta: 1
      - Level: 47
        Con: 1
      - Level: 48
@@ -11272,15 +11112,6 @@ Body:
        Con: 1
      - Level: 50
        Pow: 1
-      - Level: 51
-        Con: 1
-      - Level: 53
-        Pow: 1
-        Con: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Pow: 1
  - Jobs:
      Hyper_Novice: true
    MaxWeight: 40000
@@ -11417,15 +11248,6 @@ Body:
      - Level: 50
        Agi: 1
        Dex: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-        Con: 1
-      - Level: 53
-        Sta: 1
-      - Level: 55
-        Spl: 1
  - Jobs:
      Spirit_Handler: true
    MaxWeight: 42000
@@ -11557,13 +11379,3 @@ Body:
        Crt: 1
      - Level: 50
        Pow: 1
-      - Level: 51
-        Con: 1
-      - Level: 52
-        Pow: 1
-      - Level: 53
-        Spl: 1
-      - Level: 54
-        Wis: 1
-      - Level: 55
-        Sta: 1
--- a/db/re/laphine_upgrade.yml
+++ b/db/re/laphine_upgrade.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2022 rAthena Development Team
+#   Copyright(C) 2024 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
@@ -24,9 +24,9 @@
 ###########################################################################
 # - Item                       Item that triggers Laphine Upgrade.
 #   RandomOptionGroup          Name of the random option group that will be applied. (Default: none)
-#   ResultRefine               Absolute refine level after the upgrade. (Default: none)
-#   ResultRefineMinimum        Minimum refine level after the upgrade. (Default: none)
-#   ResultRefineMaximum        Maximum refine level after the upgrade. (Default: none)
+#   ResultRefine:              Refine level after the upgrade. (Default: none)
+#     - Level                  Refine level.
+#       Rate                   Rate per level. The total rate is the sum of the rates. (Default: 1)
 #   MinimumRefine              Minimum refine level of the required items. (Default: 0)
 #   MaximumRefine              Maximum refine level of the required items. (Default: MAX_REFINE)
 #   RequiredRandomOptions      How many random options have to be in the item? (Default: 0)
@@ -37,7 +37,7 @@

 Header:
  Type: LAPHINE_UPGRADE_DB
-  Version: 1
+  Version: 2

 Body:
  - Item: Ein_Ddbox
@@ -62,7 +62,8 @@ Body:
      - Item: Ein_1HGUN
      - Item: Ein_1H_Foxtail
  - Item: Metal_Rifine_Ticket
-    ResultRefine: 7
+    ResultRefine:
+      - Level: 7
    CardsAllowed: true
    TargetItems:
      - Item: Metal_Katar
@@ -117,8 +118,11 @@ Body:
      - Item: Temporal_M_Dex
      - Item: Temporal_M_Luk
  - Item: Frozen_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -129,7 +133,8 @@ Body:
      - Item: Clack_Of_Servival_IL
      - Item: Herald_Of_GOD_IL
  - Item: True_Hunting_9Refine
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -152,8 +157,27 @@ Body:
 #      - Item: True_Hunting_Ring2
  # Source: https://ro.gnjoy.com/news/probability/View.asp?seq=3954806
  - Item: Shadow_Refine_Hammer
-    ResultRefineMinimum: 1
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 1
+        Rate: 440
+      - Level: 2
+        Rate: 879
+      - Level: 3
+        Rate: 1703
+      - Level: 4
+        Rate: 3516
+      - Level: 5
+        Rate: 1758
+      - Level: 6
+        Rate: 879
+      - Level: 7
+        Rate: 440
+      - Level: 8
+        Rate: 220
+      - Level: 9
+        Rate: 110
+      - Level: 10
+        Rate: 55
    MaximumRefine: 9
    CardsAllowed: true
    TargetItems:
@@ -1695,7 +1719,8 @@ Body:
      - Item: Lava_Leather_Suits
      - Item: Lava_Leather_Robe
  - Item: Shadow_9_Refine_Hammer
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -2683,7 +2708,8 @@ Body:
      - Item: Comp_Light_Blade
      - Item: Comp_Scalet_DragonL_Bow
  - Item: Boost_Up_1
-    ResultRefine: 10
+    ResultRefine:
+      - Level: 10
    MaximumRefine: 9
    CardsAllowed: true
    TargetItems:
@@ -2700,7 +2726,8 @@ Body:
      - Item: Defn_Muffler
      - Item: Defn_Shoes
  - Item: Boost_Up_2
-    ResultRefine: 10
+    ResultRefine:
+      - Level: 10
    CardsAllowed: true
    TargetItems:
      - Item: Boost_TH_Sword
@@ -2722,7 +2749,8 @@ Body:
      - Item: Boost_Soul_Rod
      - Item: Boost_Foxtail
  - Item: Metal_7_Ticket
-    ResultRefine: 7
+    ResultRefine:
+      - Level: 7
    MaximumRefine: 6
    CardsAllowed: true
    TargetItems:
@@ -2739,7 +2767,8 @@ Body:
      - Item: Metal_Revolver
      - Item: Metal_Huuma_Shuriken
  - Item: Noblesse_Rifine_Ticket
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    CardsAllowed: true
    TargetItems:
      - Item: Noblesse_Breath_Armor
@@ -2783,7 +2812,8 @@ Body:
      - Item: Noblesse_Attack_Manteau
      - Item: Noblesse_Magic_Manteau
  - Item: Imperial_Rifine_Ticket
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    CardsAllowed: true
    TargetItems:
      - Item: Imperial_Breath_Armor
@@ -2827,7 +2857,8 @@ Body:
      - Item: Imperial_Attack_Manteau
      - Item: Imperial_Magic_Manteau
  - Item: Grace_Rifine_Ticket
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    CardsAllowed: true
    TargetItems:
      - Item: Grace_Breath_Armor
@@ -3831,7 +3862,8 @@ Body:
 #      - Item: S_Evilcurse_Pendant
 #      - Item: S_Evilcurse_Shoes
  - Item: Illu_Enhance_Cube
-    ResultRefine: 7
+    ResultRefine:
+      - Level: 7
    MinimumRefine: 4
    MaximumRefine: 6
    CardsAllowed: true
@@ -3843,7 +3875,8 @@ Body:
      - Item: Illusion_Leg_A
      - Item: Illusion_Leg_B
  - Item: Auto_Enhance_Cube
-    ResultRefine: 7
+    ResultRefine:
+      - Level: 7
    MinimumRefine: 4
    MaximumRefine: 6
    CardsAllowed: true
@@ -3855,7 +3888,8 @@ Body:
      - Item: Auto_Leg_A
      - Item: Auto_Leg_B
  - Item: Temporal_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -3896,7 +3930,8 @@ Body:
      - Item: Modify_Dex_Boots_
      - Item: Modify_Luk_Boots_
  - Item: Geffen_Refine_Cube
-    ResultRefine: 12
+    ResultRefine:
+      - Level: 12
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
@@ -3905,7 +3940,8 @@ Body:
      - Item: Geffen_Magic_Muffler
      - Item: Anti_Magic_Manteau
  - Item: Old_Refine_Cube
-    ResultRefine: 12
+    ResultRefine:
+      - Level: 12
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
@@ -3924,7 +3960,8 @@ Body:
      - Item: Old_Protect_Of_Crown
      - Item: Old_Camo_RabbitHood
  - Item: Refine_Hero_Weapon
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -3965,13 +4002,15 @@ Body:
      - Item: Blue_Crystal_Staff
      - Item: Freezing_Rod
  - Item: Refine_Hero_Boots
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
      - Item: Ancient_Hero_Boots
  - Item: OS_Weapon_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -3992,7 +4031,8 @@ Body:
      - Item: Kuroiro_OS
      - Item: Boost_Lance_OS
  - Item: Racecap_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -4016,7 +4056,8 @@ Body:
      - Item: Racing_C_Star
      - Item: Racing_C_Soul
  - Item: Booster_W_Up_1
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -4046,7 +4087,8 @@ Body:
      - Item: MV_B_Violin
      - Item: MV_B_Whip
  - Item: Booster_W_Up_2
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -4076,7 +4118,8 @@ Body:
      - Item: MV_B_Violin
      - Item: MV_B_Whip
  - Item: Booster_W_Up_3
-    ResultRefine: 13
+    ResultRefine:
+      - Level: 13
    MaximumRefine: 12
    CardsAllowed: true
    TargetItems:
@@ -4119,7 +4162,8 @@ Body:
      - Item: SP_B_Saber
      - Item: SI_B_Saber
  - Item: E_ILL_Up
-    ResultRefine: 10
+    ResultRefine:
+      - Level: 10
    MaximumRefine: 9
    CardsAllowed: true
    TargetItems:
@@ -4130,7 +4174,8 @@ Body:
      - Item: E_Illusion_Leg_A
      - Item: E_Illusion_Leg_B
  - Item: Auto_Armor_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -4141,7 +4186,8 @@ Body:
      - Item: Auto_Leg_A
      - Item: Auto_Leg_B
  - Item: Bio_Weapon_Refine_Cube
-    ResultRefine: 12
+    ResultRefine:
+      - Level: 12
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
@@ -4207,8 +4253,11 @@ Body:
 #      - Item: MD_Geffen_Shield
 #      - Item: MD_Geffen_Shield2
  - Item: Moonlight_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4223,8 +4272,11 @@ Body:
      - Item: Puente_Robe_IL
      - Item: Apple_Of_Archer_IL
  - Item: S_Moonlight_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4315,8 +4367,11 @@ Body:
      - Item: Up_OneSkyOneSun
      - Item: Up_SoulWeight
  - Item: Vampire_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4328,8 +4383,11 @@ Body:
      - Item: Ghoul_Leg_IL
      - Item: Cape_Of_Ancient_Lord_IL
  - Item: S_Vampire_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4341,8 +4399,11 @@ Body:
      - Item: Ghoul_Leg_IL
      - Item: Cape_Of_Ancient_Lord_IL
  - Item: S_Frozen_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4353,8 +4414,11 @@ Body:
      - Item: Clack_Of_Servival_IL
      - Item: Herald_Of_GOD_IL
  - Item: Turtle_Is_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4366,8 +4430,11 @@ Body:
      - Item: Pole_Axe_IL
      - Item: Fancy_Flower_IL
  - Item: S_Turtle_Is_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4379,8 +4446,11 @@ Body:
      - Item: Pole_Axe_IL
      - Item: Fancy_Flower_IL
  - Item: Teddy_Bear_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4391,8 +4461,11 @@ Body:
      - Item: Headband_Of_Power_IL
      - Item: Boots_IL
  - Item: S_Teddy_Bear_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4403,8 +4476,11 @@ Body:
      - Item: Headband_Of_Power_IL
      - Item: Boots_IL
  - Item: Luanda_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4416,8 +4492,11 @@ Body:
      - Item: Goibne_Shoulder_IL
      - Item: Goibne_Boots_IL
  - Item: S_Luanda_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4429,8 +4508,11 @@ Body:
      - Item: Goibne_Shoulder_IL
      - Item: Goibne_Boots_IL
  - Item: Labyrinth_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4442,8 +4524,11 @@ Body:
      - Item: Morpheus_Hood_IL
      - Item: Morpheus_Shawl_IL
  - Item: S_Teddy_Labyrinth_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4455,8 +4540,11 @@ Body:
      - Item: Morpheus_Hood_IL
      - Item: Morpheus_Shawl_IL
  - Item: Underwater_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4473,8 +4561,11 @@ Body:
      - Item: Morrigane_Helm_IL
      - Item: Morrigane_Manyeau_IL
  - Item: S_Underwater_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -4491,7 +4582,8 @@ Body:
      - Item: Morrigane_Helm_IL
      - Item: Morrigane_Manyeau_IL
  - Item: Circlet_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -4706,7 +4798,8 @@ Body:
 #      - Item: Blue_Mental_Pendant
 #      - Item: Red_Force_Pendant
  - Item: GrayWolf_7_Ticket
-    ResultRefine: 7
+    ResultRefine:
+      - Level: 7
    MaximumRefine: 6
    CardsAllowed: true
    TargetItems:
@@ -4717,7 +4810,8 @@ Body:
      - Item: Gray_W_Boots
      - Item: Gray_W_Shoes
  - Item: GrayWolf_9_Ticket
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -4727,176 +4821,173 @@ Body:
      - Item: Gray_W_Muffler
      - Item: Gray_W_Boots
      - Item: Gray_W_Shoes
-  - Item: Pontifex_Courage
-    RandomOptionGroup: PONTIFEX_COURAGE
-    TargetItems:
-      - Item: Adulter_F_T_Sword
-      - Item: Adulter_F_Cakram
-      - Item: Adulter_F_Katar
-      - Item: Adulter_F_Lance
-      - Item: Adulter_F_T_Staff
-      - Item: Adulter_F_Rod
-      - Item: Adulter_F_Humma
-      - Item: Adulter_F_C_Humma
-      - Item: Adulter_F_C_Bow
-      - Item: Adulter_F_Ballista
-      - Item: Adulter_F_A_Bow
-      - Item: Adulter_F_Revolver
-      - Item: Adulter_F_Rifle
-      - Item: Adulter_F_Shotgun
-      - Item: Adulter_F_Gatling
-      - Item: Adulter_F_Launcher
-      - Item: Adulter_F_G_Sword
-      - Item: Adulter_F_Lapier
-      - Item: Adulter_F_Dagger
-      - Item: Adulter_F_Axe
-      - Item: Adulter_F_G_Spear
-      - Item: Adulter_F_M_Book
-      - Item: Adulter_F_P_Book
-      - Item: Adulter_F_Bible
-      - Item: Adulter_F_Moon_B
-      - Item: Adulter_F_Star_B
-      - Item: Adulter_F_Wand
-      - Item: Adulter_F_S_Stick
-      - Item: Adulter_F_D_Wand
-      - Item: Adulter_F_F_Wand
-      - Item: Adulter_F_F_model
-      - Item: Adulter_F_Knuckle
-      - Item: Adulter_F_Claw
-      - Item: Adulter_F_Violin
-      - Item: Adulter_F_Harp
-      - Item: Adulter_F_C_Rope
-      - Item: Adulter_F_Ribbon
-      - Item: Adulter_F_Mace
-      - Item: Adulter_F_Hall
-  - Item: Pontifex_Wisdom
-    RandomOptionGroup: PONTIFEX_WISDOM
-    TargetItems:
-      - Item: Adulter_F_T_Sword
-      - Item: Adulter_F_Cakram
-      - Item: Adulter_F_Katar
-      - Item: Adulter_F_Lance
-      - Item: Adulter_F_T_Staff
-      - Item: Adulter_F_Rod
-      - Item: Adulter_F_Humma
-      - Item: Adulter_F_C_Humma
-      - Item: Adulter_F_C_Bow
-      - Item: Adulter_F_Ballista
-      - Item: Adulter_F_A_Bow
-      - Item: Adulter_F_Revolver
-      - Item: Adulter_F_Rifle
-      - Item: Adulter_F_Shotgun
-      - Item: Adulter_F_Gatling
-      - Item: Adulter_F_Launcher
-      - Item: Adulter_F_G_Sword
-      - Item: Adulter_F_Lapier
-      - Item: Adulter_F_Dagger
-      - Item: Adulter_F_Axe
-      - Item: Adulter_F_G_Spear
-      - Item: Adulter_F_M_Book
-      - Item: Adulter_F_P_Book
-      - Item: Adulter_F_Bible
-      - Item: Adulter_F_Moon_B
-      - Item: Adulter_F_Star_B
-      - Item: Adulter_F_Wand
-      - Item: Adulter_F_S_Stick
-      - Item: Adulter_F_D_Wand
-      - Item: Adulter_F_F_Wand
-      - Item: Adulter_F_F_model
-      - Item: Adulter_F_Knuckle
-      - Item: Adulter_F_Claw
-      - Item: Adulter_F_Violin
-      - Item: Adulter_F_Harp
-      - Item: Adulter_F_C_Rope
-      - Item: Adulter_F_Ribbon
-      - Item: Adulter_F_Mace
-      - Item: Adulter_F_Hall
-  - Item: Pontifex_Tenacity
-    RandomOptionGroup: PONTIFEX_TENACITY
-    TargetItems:
-      - Item: Vivatus_F_T_Sword
-      - Item: Vivatus_F_Cakram
-      - Item: Vivatus_F_Katar
-      - Item: Vivatus_F_Lance
-      - Item: Vivatus_F_T_Staff
-      - Item: Vivatus_F_Rod
-      - Item: Vivatus_F_C_Bow
-      - Item: Vivatus_F_Ballista
-      - Item: Vivatus_F_A_Bow
-      - Item: Vivatus_F_G_Sword
-      - Item: Vivatus_F_Lapier
-      - Item: Vivatus_F_Dagger
-      - Item: Vivatus_F_Axe
-      - Item: Vivatus_F_G_Spear
-      - Item: Vivatus_F_M_Book
-      - Item: Vivatus_F_P_Book
-      - Item: Vivatus_F_Bible
-      - Item: Vivatus_F_Wand
-      - Item: Vivatus_F_Knuckle
-      - Item: Vivatus_F_Claw
-      - Item: Vivatus_F_Violin
-      - Item: Vivatus_F_Harp
-      - Item: Vivatus_F_C_Rope
-      - Item: Vivatus_F_Ribbon
-      - Item: Vivatus_F_Mace
-      - Item: Vivatus_F_Hall
-      - Item: Vivatus_F_D_Wand
-      - Item: Vivatus_F_S_Stick
-      - Item: Vivatus_F_F_Wand
-      - Item: Vivatus_F_F_model
-      - Item: Vivatus_F_Star_B
-      - Item: Vivatus_F_Moon_B
-      - Item: Vivatus_F_Gatling
-      - Item: Vivatus_F_Launcher
-      - Item: Vivatus_F_Rifle
-      - Item: Vivatus_F_Shotgun
-      - Item: Vivatus_F_Revolver
-      - Item: Vivatus_F_C_Humma
-      - Item: Vivatus_F_Humma
-  - Item: Pontifex_Belief
-    RandomOptionGroup: PONTIFEX_BELIEF
-    TargetItems:
-      - Item: Vivatus_F_T_Sword
-      - Item: Vivatus_F_Cakram
-      - Item: Vivatus_F_Katar
-      - Item: Vivatus_F_Lance
-      - Item: Vivatus_F_T_Staff
-      - Item: Vivatus_F_Rod
-      - Item: Vivatus_F_C_Bow
-      - Item: Vivatus_F_Ballista
-      - Item: Vivatus_F_A_Bow
-      - Item: Vivatus_F_G_Sword
-      - Item: Vivatus_F_Lapier
-      - Item: Vivatus_F_Dagger
-      - Item: Vivatus_F_Axe
-      - Item: Vivatus_F_G_Spear
-      - Item: Vivatus_F_M_Book
-      - Item: Vivatus_F_P_Book
-      - Item: Vivatus_F_Bible
-      - Item: Vivatus_F_Wand
-      - Item: Vivatus_F_Knuckle
-      - Item: Vivatus_F_Claw
-      - Item: Vivatus_F_Violin
-      - Item: Vivatus_F_Harp
-      - Item: Vivatus_F_C_Rope
-      - Item: Vivatus_F_Ribbon
-      - Item: Vivatus_F_Mace
-      - Item: Vivatus_F_Hall
-      - Item: Vivatus_F_D_Wand
-      - Item: Vivatus_F_S_Stick
-      - Item: Vivatus_F_F_Wand
-      - Item: Vivatus_F_F_model
-      - Item: Vivatus_F_Star_B
-      - Item: Vivatus_F_Moon_B
-      - Item: Vivatus_F_Gatling
-      - Item: Vivatus_F_Launcher
-      - Item: Vivatus_F_Rifle
-      - Item: Vivatus_F_Shotgun
-      - Item: Vivatus_F_Revolver
-      - Item: Vivatus_F_C_Humma
-      - Item: Vivatus_F_Humma
+#  - Item: Pontifex_Courage
+#    TargetItems:
+#      - Item: Adulter_F_T_Sword
+#      - Item: Adulter_F_Cakram
+#      - Item: Adulter_F_Katar
+#      - Item: Adulter_F_Lance
+#      - Item: Adulter_F_T_Staff
+#      - Item: Adulter_F_Rod
+#      - Item: Adulter_F_Humma
+#      - Item: Adulter_F_C_Humma
+#      - Item: Adulter_F_C_Bow
+#      - Item: Adulter_F_Ballista
+#      - Item: Adulter_F_A_Bow
+#      - Item: Adulter_F_Revolver
+#      - Item: Adulter_F_Rifle
+#      - Item: Adulter_F_Shotgun
+#      - Item: Adulter_F_Gatling
+#      - Item: Adulter_F_Launcher
+#      - Item: Adulter_F_G_Sword
+#      - Item: Adulter_F_Lapier
+#      - Item: Adulter_F_Dagger
+#      - Item: Adulter_F_Axe
+#      - Item: Adulter_F_G_Spear
+#      - Item: Adulter_F_M_Book
+#      - Item: Adulter_F_P_Book
+#      - Item: Adulter_F_Bible
+#      - Item: Adulter_F_Moon_B
+#      - Item: Adulter_F_Star_B
+#      - Item: Adulter_F_Wand
+#      - Item: Adulter_F_S_Stick
+#      - Item: Adulter_F_D_Wand
+#      - Item: Adulter_F_F_Wand
+#      - Item: Adulter_F_F_model
+#      - Item: Adulter_F_Knuckle
+#      - Item: Adulter_F_Claw
+#      - Item: Adulter_F_Violin
+#      - Item: Adulter_F_Harp
+#      - Item: Adulter_F_C_Rope
+#      - Item: Adulter_F_Ribbon
+#      - Item: Adulter_F_Mace
+#      - Item: Adulter_F_Hall
+#  - Item: Pontifex_Wisdom
+#    TargetItems:
+#      - Item: Adulter_F_T_Sword
+#      - Item: Adulter_F_Cakram
+#      - Item: Adulter_F_Katar
+#      - Item: Adulter_F_Lance
+#      - Item: Adulter_F_T_Staff
+#      - Item: Adulter_F_Rod
+#      - Item: Adulter_F_Humma
+#      - Item: Adulter_F_C_Humma
+#      - Item: Adulter_F_C_Bow
+#      - Item: Adulter_F_Ballista
+#      - Item: Adulter_F_A_Bow
+#      - Item: Adulter_F_Revolver
+#      - Item: Adulter_F_Rifle
+#      - Item: Adulter_F_Shotgun
+#      - Item: Adulter_F_Gatling
+#      - Item: Adulter_F_Launcher
+#      - Item: Adulter_F_G_Sword
+#      - Item: Adulter_F_Lapier
+#      - Item: Adulter_F_Dagger
+#      - Item: Adulter_F_Axe
+#      - Item: Adulter_F_G_Spear
+#      - Item: Adulter_F_M_Book
+#      - Item: Adulter_F_P_Book
+#      - Item: Adulter_F_Bible
+#      - Item: Adulter_F_Moon_B
+#      - Item: Adulter_F_Star_B
+#      - Item: Adulter_F_Wand
+#      - Item: Adulter_F_S_Stick
+#      - Item: Adulter_F_D_Wand
+#      - Item: Adulter_F_F_Wand
+#      - Item: Adulter_F_F_model
+#      - Item: Adulter_F_Knuckle
+#      - Item: Adulter_F_Claw
+#      - Item: Adulter_F_Violin
+#      - Item: Adulter_F_Harp
+#      - Item: Adulter_F_C_Rope
+#      - Item: Adulter_F_Ribbon
+#      - Item: Adulter_F_Mace
+#      - Item: Adulter_F_Hall
+#  - Item: Pontifex_Tenacity
+#    TargetItems:
+#      - Item: Vivatus_F_T_Sword
+#      - Item: Vivatus_F_Cakram
+#      - Item: Vivatus_F_Katar
+#      - Item: Vivatus_F_Lance
+#      - Item: Vivatus_F_T_Staff
+#      - Item: Vivatus_F_Rod
+#      - Item: Vivatus_F_C_Bow
+#      - Item: Vivatus_F_Ballista
+#      - Item: Vivatus_F_A_Bow
+#      - Item: Vivatus_F_G_Sword
+#      - Item: Vivatus_F_Lapier
+#      - Item: Vivatus_F_Dagger
+#      - Item: Vivatus_F_Axe
+#      - Item: Vivatus_F_G_Spear
+#      - Item: Vivatus_F_M_Book
+#      - Item: Vivatus_F_P_Book
+#      - Item: Vivatus_F_Bible
+#      - Item: Vivatus_F_Wand
+#      - Item: Vivatus_F_Knuckle
+#      - Item: Vivatus_F_Claw
+#      - Item: Vivatus_F_Violin
+#      - Item: Vivatus_F_Harp
+#      - Item: Vivatus_F_C_Rope
+#      - Item: Vivatus_F_Ribbon
+#      - Item: Vivatus_F_Mace
+#      - Item: Vivatus_F_Hall
+#      - Item: Vivatus_F_D_Wand
+#      - Item: Vivatus_F_S_Stick
+#      - Item: Vivatus_F_F_Wand
+#      - Item: Vivatus_F_F_model
+#      - Item: Vivatus_F_Star_B
+#      - Item: Vivatus_F_Moon_B
+#      - Item: Vivatus_F_Gatling
+#      - Item: Vivatus_F_Launcher
+#      - Item: Vivatus_F_Rifle
+#      - Item: Vivatus_F_Shotgun
+#      - Item: Vivatus_F_Revolver
+#      - Item: Vivatus_F_C_Humma
+#      - Item: Vivatus_F_Humma
+#  - Item: Pontifex_Belief
+#    TargetItems:
+#      - Item: Vivatus_F_T_Sword
+#      - Item: Vivatus_F_Cakram
+#      - Item: Vivatus_F_Katar
+#      - Item: Vivatus_F_Lance
+#      - Item: Vivatus_F_T_Staff
+#      - Item: Vivatus_F_Rod
+#      - Item: Vivatus_F_C_Bow
+#      - Item: Vivatus_F_Ballista
+#      - Item: Vivatus_F_A_Bow
+#      - Item: Vivatus_F_G_Sword
+#      - Item: Vivatus_F_Lapier
+#      - Item: Vivatus_F_Dagger
+#      - Item: Vivatus_F_Axe
+#      - Item: Vivatus_F_G_Spear
+#      - Item: Vivatus_F_M_Book
+#      - Item: Vivatus_F_P_Book
+#      - Item: Vivatus_F_Bible
+#      - Item: Vivatus_F_Wand
+#      - Item: Vivatus_F_Knuckle
+#      - Item: Vivatus_F_Claw
+#      - Item: Vivatus_F_Violin
+#      - Item: Vivatus_F_Harp
+#      - Item: Vivatus_F_C_Rope
+#      - Item: Vivatus_F_Ribbon
+#      - Item: Vivatus_F_Mace
+#      - Item: Vivatus_F_Hall
+#      - Item: Vivatus_F_D_Wand
+#      - Item: Vivatus_F_S_Stick
+#      - Item: Vivatus_F_F_Wand
+#      - Item: Vivatus_F_F_model
+#      - Item: Vivatus_F_Star_B
+#      - Item: Vivatus_F_Moon_B
+#      - Item: Vivatus_F_Gatling
+#      - Item: Vivatus_F_Launcher
+#      - Item: Vivatus_F_Rifle
+#      - Item: Vivatus_F_Shotgun
+#      - Item: Vivatus_F_Revolver
+#      - Item: Vivatus_F_C_Humma
+#      - Item: Vivatus_F_Humma
  - Item: Bio_Helm_Refine_Cube
-    ResultRefine: 11
+    ResultRefine:
+      - Level: 11
    MaximumRefine: 10
    CardsAllowed: true
    TargetItems:
@@ -4913,8 +5004,11 @@ Body:
      - Item: BioWeapon_Helm_SC
      - Item: BioWeapon_Helm_GC
  - Item: Twins_Box_IL
-    ResultRefineMinimum: 7
-    ResultRefineMaximum: 10
+    ResultRefine:
+      - Level: 7
+      - Level: 8
+      - Level: 9
+      - Level: 10
    MinimumRefine: 4
    MaximumRefine: 9
    CardsAllowed: true
@@ -4931,8 +5025,11 @@ Body:
      - Item: Dea_Staff_IL
      - Item: Sprint_Mail_IL
  - Item: S_Twins_Box_IL
-    ResultRefineMinimum: 9
-    ResultRefineMaximum: 12
+    ResultRefine:
+      - Level: 9
+      - Level: 10
+      - Level: 11
+      - Level: 12
    MinimumRefine: 4
    MaximumRefine: 11
    CardsAllowed: true
@@ -5149,7 +5246,8 @@ Body:
 #      - Item: S_Creative_Weapon
 #      - Item: S_Creative_Shield
  - Item: Snow_F_Refine
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -5160,7 +5258,8 @@ Body:
      - Item: Snowflower_Boots
      - Item: Snowflower_Shoes
  - Item: Glacier_W_Refine
-    ResultRefine: 9
+    ResultRefine:
+      - Level: 9
    MaximumRefine: 8
    CardsAllowed: true
    TargetItems:
@@ -5215,7 +5314,8 @@ Body:
 #      - Item: S_M_Mammoth_Earring
 #      - Item: S_M_Mammoth_Pendant
  - Item: SubjectCape_Refine_Cube
-    ResultRefine: 12
+    ResultRefine:
+      - Level: 12
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
@@ -5223,7 +5323,8 @@ Body:
      - Item: Subject_CapeMagic_TH
      - Item: Subject_CapeMelee_TH
  - Item: GMT_Robe_Stone
-    ResultRefine: 12
+    ResultRefine:
+      - Level: 12
    MaximumRefine: 11
    CardsAllowed: true
    TargetItems:
--- a/db/re/mob_db.yml
+++ b/db/re/mob_db.yml
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -102,7 +102,7 @@
 1019,Peco Peco@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,6,,,,,,
 1019,Peco Peco@NPC_FIREATTACK,attack,186,1,2000,0,5000,yes,target,always,0,,,,,,,
 1019,Peco Peco@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1020,Mandragora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,,,,,,,
 1023,Orc Warrior@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
 1023,Orc Warrior@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -351,7 +351,7 @@
 1067,Cornutus@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,6,
 1067,Cornutus@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1067,Cornutus@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
-1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,target,always,0,,,,,,,
+1068,Hydra@NPC_WATERATTACK,attack,184,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1069,Swordfish@NPC_WATERATTACK,attack,184,1,2000,0,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,attack,86,3,500,1500,5000,yes,target,always,0,,,,,,,
 1069,Swordfish@WZ_WATERBALL,chase,86,3,500,1500,5000,yes,target,always,0,,,,,,,
@@ -603,9 +603,9 @@
 1117,Evil Druid@NPC_UNDEADATTACK,chase,347,3,500,500,5000,no,target,always,0,,,,,,9,
 1117,Evil Druid@WZ_HEAVENDRIVE,attack,91,5,500,1200,5000,yes,target,always,0,,,,,,,
 1117,Evil Druid@WZ_HEAVENDRIVE,chase,91,5,500,1200,5000,yes,target,always,0,,,,,,,
-1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1118,Flora@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
-1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,target,always,0,,,,,,,
+1118,Flora@NPC_GROUNDATTACK,attack,185,1,2000,0,5000,yes,randomtarget,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,attack,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,idle,135,1,2000,200,5000,yes,self,always,0,,,,,,,
 1119,Frilldora@AS_CLOAKING,chase,135,1,2000,200,5000,yes,self,always,0,,,,,,,
@@ -1301,7 +1301,7 @@
 1276,Raydric Archer@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@NPC_BLINDATTACK,idle,177,3,10000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
-1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,target,always,0,,,,,,,
+1277,Greatest General@NPC_FIREATTACK,attack,186,2,500,500,5000,no,randomtarget,always,0,,,,,,,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,longrangeattacked,,,,,,,6,
 1277,Greatest General@WZ_EARTHSPIKE,idle,90,3,5000,1500,5000,no,randomtarget,casttargeted,,,,,,,6,
 1278,Stalactite Golem@NPC_STUNATTACK,attack,179,4,500,1500,5000,no,target,always,0,,,,,,6,
@@ -1584,7 +1584,7 @@
 1367,Blazer@WZ_SIGHTRASHER,attack,81,5,500,1000,5000,no,target,always,0,,,,,,6,
 1368,Geographer@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
 1368,Geographer@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,,
-1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1368,Geographer@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1369,Grand Peco@AS_SONICBLOW,attack,136,5,500,800,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,6,
 1369,Grand Peco@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
@@ -2569,8 +2569,8 @@
 1510,Hylozoist@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9,
@@ -2589,11 +2589,11 @@
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+1511,Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 1511,Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 1511,Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1511,Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -3405,18 +3405,18 @@
 1663,Laurell Weinder@NPC_EMOTION,idle,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,attack,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
 1663,Laurell Weinder@NPC_EMOTION,chase,197,1,10000,0,5000,yes,self,skillused,28,15,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,target,always,0,,,,,,,
-1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,target,always,0,,,,,,,
-1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,target,always,0,,,,,,,
-1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,target,always,0,,,,,,,
-1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,target,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1664,Photon Cannon@NPC_WINDATTACK,attack,187,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1665,Photon Cannon@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1666,Photon Cannon@NPC_WATERATTACK,attack,184,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,5,1000,1000,10000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,3,2000,500,5000,yes,randomtarget,always,0,,,,,,,
+1667,Photon Cannon@NPC_GROUNDATTACK,attack,185,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1668,Archdam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
 1668,Archdam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
 1668,Archdam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
@@ -3453,9 +3453,9 @@
 1673,Dimik@NPC_COMBOATTACK,attack,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_COMBOATTACK,chase,171,4,500,700,5000,no,target,always,0,,,,,,,
 1673,Dimik@NPC_FIREATTACK,attack,186,3,500,0,5000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,target,always,0,,,,,,,
-1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,target,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,10,500,1000,30000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,3,1000,0,10000,yes,randomtarget,always,0,,,,,,,
+1674,Monemus@NPC_FIREATTACK,attack,186,1,10000,0,0,yes,randomtarget,always,0,,,,,,,
 1675,Venatu@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
 1675,Venatu@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
 1675,Venatu@NPC_STUNATTACK,attack,179,2,500,1500,5000,no,target,always,0,,,,,,11,
@@ -3531,11 +3531,11 @@
 1688,Lady Tany@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@AL_TELEPORT,attack,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 1688,Lady Tany@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,target,myhpltmaxrate,60,,,,,,,
-1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
-1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,target,always,0,,,,,,,
+1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_COMBOATTACK,attack,171,1,1000,0,5000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
+1688,Lady Tany@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,randomtarget,always,0,,,,,,,
+1688,Lady Tany@NPC_STUNATTACK,attack,179,5,500,0,5000,no,randomtarget,always,0,,,,,,,
 1688,Lady Tany@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29,
 1688,Lady Tany@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1688,Lady Tany@NPC_SUMMONSLAVE,attack,196,5,10000,2000,5000,no,self,slavele,2,1691,,,,,,
@@ -4063,7 +4063,7 @@
 1764,Skeggiold@NPC_HOLYATTACK,chase,189,2,500,500,5000,no,target,always,0,,,,,,18,
 1764,Skeggiold@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1764,Skeggiold@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-1765,Valkyrie@AL_HEAL,idle,28,11,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
+1765,Valkyrie@AL_HEAL,idle,28,10,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_HEAL,attack,28,11,10000,500,10000,yes,friend,friendhpltmaxrate,60,,,,,,3,
 1765,Valkyrie@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1765,Valkyrie@AS_SONICBLOW,attack,136,10,2000,0,5000,yes,target,always,0,,,,,,,
@@ -4228,18 +4228,18 @@
 1779,Ktullanux@NPC_AGIUP,attack,350,5,2000,0,100000,yes,self,always,0,,,,,,,
 1779,Ktullanux@NPC_AGIUP,attack,350,5,10000,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 1779,Ktullanux@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,6,
-1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1780,Muscipular@KN_SPEARSTAB,attack,58,5,500,800,5000,no,randomtarget,always,0,,,,,,6,
+1780,Muscipular@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1780,Muscipular@AL_HEAL,attack,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
 1780,Muscipular@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,target,always,0,,,,,,,
-1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,target,always,0,,,,,,,
-1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,target,always,0,,,,,,,
+1780,Muscipular@NPC_PETRIFYATTACK,attack,180,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
+1781,Drosera@KN_PIERCE,attack,56,5,500,700,5000,no,randomtarget,always,0,,,,,,,
+1781,Drosera@NPC_GROUNDATTACK,attack,185,1,1000,0,5000,yes,randomtarget,always,0,,,,,,,
 1781,Drosera@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,target,always,0,,,,,,6,
-1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,,
+1781,Drosera@NPC_GUIDEDATTACK,attack,172,3,500,1000,20000,no,randomtarget,always,0,,,,,,6,
+1781,Drosera@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,randomtarget,always,0,,,,,,,
 1782,Roween@NPC_WINDATTACK,attack,187,2,500,500,5000,no,target,always,0,,,,,,,
 1782,Roween@NPC_COMBOATTACK,attack,171,4,500,500,5000,no,target,always,0,,,,,,6,
 1782,Roween@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,22,0x308D,,,,,
@@ -5704,11 +5704,30 @@

 //****
 // NC Mechanic Summons
-2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,masterattacked,0,,,,,,,
-2043,Magic Decoy Fire@MG_FIREBOLT,idle,19,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2044,Magic Decoy Water@MG_COLDBOLT,idle,14,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2045,Magic Decoy Earth@WZ_EARTHSPIKE,idle,90,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
-2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,idle,20,10,10000,800,3500,no,randomtarget,always,0,,,,,,,
+2042,Silver Sniper@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2042,Silver Sniper@NPC_REVENGE,idle,333,1,10000,0,0,yes,self,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,attack,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@MG_FIREBOLT,chase,19,10,10000,800,3500,no,target,always,0,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2043,Magic Decoy Fire@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,attack,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@MG_COLDBOLT,chase,14,10,10000,800,3500,no,target,always,0,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2044,Magic Decoy Water@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,attack,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@WZ_EARTHSPIKE,chase,90,10,10000,800,3500,no,target,always,0,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2045,Magic Decoy Earth@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,attack,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@MG_LIGHTNINGBOLT,chase,20,10,10000,800,3500,no,target,always,0,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,chase,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,idle,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,
+2046,Magic Decoy Wind@AL_HEAL,attack,28,10,10000,0,1000,no,self,myhpltmaxrate,99,,,,,,,

 //2053,Dimik@NPC_ATTRICHANGE,idle,161,1,500,2000,50000,no,self,always,0,,,,,,10,
 //2053,Dimik@NPC_EMOTION_ON,idle,474,1,100,0,60000,yes,self,always,0,20,0x81,,,,,
@@ -7961,8 +7980,8 @@
 2311,Manananggal@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2311,Manananggal@AL_TELEPORT,idle,26,1,1000,0,30000,yes,self,always,0,,,,,,,
 2311,Manananggal@AL_TELEPORT,attack,26,1,100,0,30000,yes,self,always,0,,,,,,,
-2311,Manananggal@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
-2311,Manananggal@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
+2311,Manananggal@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+2311,Manananggal@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
 2311,Manananggal@NPC_COMBOATTACK,chase,171,5,1000,0,5000,yes,target,always,0,,,,,,7,
 2311,Manananggal@NPC_COMBOATTACK,attack,171,5,1000,0,5000,yes,target,always,0,,,,,,7,
 2312,Mangkukulam@AL_TELEPORT,idle,26,1,500,0,30000,yes,self,always,0,,,,,,,
@@ -7990,8 +8009,8 @@
 2315,Wakwak@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2315,Wakwak@AL_TELEPORT,idle,26,1,500,0,30000,yes,self,always,0,,,,,,,
 2315,Wakwak@AL_TELEPORT,attack,26,1,50,0,30000,yes,self,always,0,,,,,,,
-2315,Wakwak@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
-2315,Wakwak@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,myhpltmaxrate,50,,,,,,3,
+2315,Wakwak@NPC_BLOODDRAIN,chase,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
+2315,Wakwak@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,50,,,,,,3,
 2315,Wakwak@NPC_DARKTHUNDER,chase,341,3,1000,500,5000,yes,target,always,0,,,,,,29,
 2315,Wakwak@NPC_DARKTHUNDER,attack,341,3,1000,500,5000,yes,target,always,0,,,,,,29,
 2315,Wakwak@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,0,
@@ -8094,7 +8113,7 @@
 2331,Seaweed@AL_HEAL,idle,28,9,10000,500,5000,yes,friend,friendhpltmaxrate,100,,,,,,2,
 2337,Hidden Mob@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 2337,Hidden Mob@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-2337,Hidden Mob@WZ_METEOR,attack,83,5,10000,0,1000,yes,target,always,0,,,,,,,
+2337,Hidden Mob@WZ_METEOR,attack,83,5,10000,0,1000,yes,randomtarget,always,0,,,,,,,
 2338,Bangungot Manananggal@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,,
 2338,Bangungot Manananggal@NPC_BLOODDRAIN,attack,199,1,1000,0,5000,no,target,always,0,,,,,,3,
 2338,Bangungot Manananggal@NPC_COMBOATTACK,attack,171,5,500,700,5000,no,target,always,0,,,,,,1,
@@ -8110,11 +8129,11 @@
 2339,Bangungot Mangkukulam@NPC_DARKSTRIKE,chase,340,9,500,700,5000,no,target,always,0,,,,,,29,
 2339,Bangungot Mangkukulam@NPC_MENTALBREAKER,attack,159,3,500,800,5000,no,target,always,0,,,,,,14,
 2339,Bangungot Mangkukulam@NPC_MENTALBREAKER,chase,159,3,500,800,5000,no,target,always,0,,,,,,14,
-2340,Tiyanak@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,2,
+2340,Tiyanak@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,randomtarget,always,0,,,,,,2,
 2340,Tiyanak@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,29,,,,,,
 2340,Tiyanak@CR_AUTOGUARD,chase,249,2,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
 2340,Tiyanak@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,,
-2340,Tiyanak@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2340,Tiyanak@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6,
 2340,Tiyanak@NPC_REBIRTH,dead,208,3,2000,0,10000,yes,self,always,0,,,,,,,
 2341,RWC Boss@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
 2341,RWC Boss@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
@@ -8143,7 +8162,7 @@
 2341,RWC Boss@NPC_CRITICALWOUND,attack,673,4,2000,0,5000,yes,target,always,0,,,,,,,
 2343,Hidden Mob@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,0,,,,,,,
 2343,Hidden Mob@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,0,,,,,,,
-2343,Hidden Mob@WZ_STORMGUST,attack,89,5,10000,0,1000,yes,target,always,0,,,,,,,
+2343,Hidden Mob@WZ_STORMGUST,attack,89,5,10000,0,1000,yes,randomtarget,always,0,,,,,,,

 // Nightmare Pyramids
 2353,Nightmare Minorous@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
@@ -8179,8 +8198,8 @@
 2360,Nightmare Ancient Mummy@NPC_DARKBREATH,attack,202,4,500,800,5000,no,target,always,0,,,,,,7,
 2362,Nightmare Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 2362,Nightmare Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
-2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
-2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29,
+2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
+2362,Nightmare Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,randomtarget,always,0,,,,,,29,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,longrangeattacked,0,2357,2359,2361,,,9,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,idle,209,5,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9,
 2362,Nightmare Amon Ra@NPC_SUMMONMONSTER,attack,209,5,5000,0,10000,no,self,longrangeattacked,0,2357,2359,2361,,,9,
@@ -8199,11 +8218,11 @@
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,skillused,83,,,,,,9,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,longrangeattacked,,,,,,,9,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,randomtarget,casttargeted,,,,,,,9,
-2362,Nightmare Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,target,always,0,,,,,,9,
+2362,Nightmare Amon Ra@WZ_METEOR,attack,83,11,5000,0,3000,yes,randomtarget,always,0,,,,,,9,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,around2,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_FIREPILLAR,attack,80,10,5000,0,2000,yes,around2,always,0,,,,,,,
-2362,Nightmare Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,,
+2362,Nightmare Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,randomtarget,always,0,,,,,,,
 2362,Nightmare Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,randomtarget,always,0,,,,,,9,
 2362,Nightmare Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2362,Nightmare Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -8837,11 +8856,11 @@
 2481,Wraith Dead (Nightmare)@NPC_ENERGYDRAIN,attack,200,1,500,0,5000,yes,target,always,,,,,,,9,
 2483,Baphomet (Nightmare)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2483,Baphomet (Nightmare)@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-2483,Baphomet (Nightmare)@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
+2483,Baphomet (Nightmare)@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
 2483,Baphomet (Nightmare)@KN_BRANDISHSPEAR,attack,57,10,2000,500,5000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,21,2000,500,2000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,2000,500,2000,no,target,always,,,,,,,29,
-2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,21,5000,500,2000,no,target,skillused,18,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,attack,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,2000,500,2000,no,target,always,,,,,,,29,
+2483,Baphomet (Nightmare)@WZ_VERMILION,chase,85,10,5000,500,2000,no,target,skillused,18,,,,,,29,
 2483,Baphomet (Nightmare)@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,,,,,,,,
 2483,Baphomet (Nightmare)@NPC_DARKBREATH,attack,202,5,2000,800,5000,no,target,always,,,,,,,29,
 2483,Baphomet (Nightmare)@MO_BODYRELOCATION,chase,264,1,2000,200,1000,yes,target,always,,,,,,,,
@@ -8929,15 +8948,15 @@
 2534,Blue Faceworm Queen@WZ_STORMGUST,chase,89,10,2000,1000,5000,no,target,always,,,,,,,,
 2534,Blue Faceworm Queen@WZ_STORMGUST,attack,89,10,2000,1000,5000,no,target,always,,,,,,,,
 2534,Blue Faceworm Queen@NPC_WATERATTACK,attack,184,9,3000,500,5000,no,target,always,,,,,,,,
-2534,Blue Faceworm Queen@MG_FROSTDIVER,chase,15,40,10000,500,5000,yes,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@WZ_VERMILION,attack,85,21,2000,1000,10000,no,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@WZ_VERMILION,chase,85,21,5000,1000,10000,no,target,always,,,,,,,,
+2534,Blue Faceworm Queen@MG_FROSTDIVER,chase,15,10,10000,500,5000,yes,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@WZ_VERMILION,attack,85,10,2000,1000,10000,no,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@WZ_VERMILION,chase,85,10,5000,1000,10000,no,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@NPC_WIDEBLEEDING,chase,665,3,10000,2000,30000,no,self,always,,,,,,,36,
 2535,Yellow Faceworm Queen@NPC_WIDEBLEEDING,attack,665,3,10000,2000,30000,no,self,always,,,,,,,36,
 2535,Yellow Faceworm Queen@WZ_JUPITEL,attack,84,9,1000,500,5000,yes,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@WZ_JUPITEL,chase,84,9,1000,500,5000,yes,target,always,,,,,,,,
 2535,Yellow Faceworm Queen@NPC_WINDATTACK,attack,187,9,3000,500,5000,no,target,always,,,,,,,,
-2535,Yellow Faceworm Queen@MG_THUNDERSTORM,attack,21,20,2000,1000,5000,no,target,always,,,,,,,,
+2535,Yellow Faceworm Queen@MG_THUNDERSTORM,attack,21,10,2000,1000,5000,no,target,always,,,,,,,,
 2536,Monster 3@NPC_INVISIBLE,idle,353,1,10000,0,30000,yes,self,always,,,,,,,,
 2536,Monster 3@NPC_INVISIBLE,attack,353,1,10000,0,30000,yes,self,always,,,,,,,,
 2536,Monster 3@NPC_VENOMFOG,idle,706,1,10000,0,3000,yes,self,always,,,,,,,,
@@ -9821,7 +9840,7 @@
 2741,Muka Ringleader@NPC_PIERCINGATT,attack,158,2,500,0,5000,yes,target,always,,,,,,,6,
 2741,Muka Ringleader@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
 2741,Muka Ringleader@NPC_SUMMONSLAVE,idle,196,2,10000,700,30000,no,self,slavele,0,1055,,,,,,
-2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2742,Furious Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2742,Furious Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2742,Furious Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2742,Furious Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -9834,7 +9853,7 @@
 2742,Furious Incarnation of Morocc@NPC_WIDECURSE,chase,677,5,5000,800,5000,no,self,always,,,,,,,,
 2742,Furious Incarnation of Morocc@SA_DISPELL,attack,289,5,100,0,30000,yes,target,always,,,,,,,,
 2742,Furious Incarnation of Morocc@SA_DISPELL,chase,289,5,100,0,30000,yes,target,always,,,,,,,,
-2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2743,Elusive Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2743,Elusive Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -9850,7 +9869,7 @@
 2744,Swift Incarnation of Morocc@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@AL_TELEPORT,attack,26,1,500,0,5000,yes,self,myhpltmaxrate,50,,,,,,,
-2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
+2744,Swift Incarnation of Morocc@AL_HEAL,idle,28,10,10000,0,5000,yes,self,myhpltmaxrate,45,,,,,,,
 2744,Swift Incarnation of Morocc@AL_HEAL,attack,28,5,10000,500,5000,yes,self,myhpltmaxrate,50,,,,,,,
 2744,Swift Incarnation of Morocc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,,,,,,,,
 2744,Swift Incarnation of Morocc@NPC_GRANDDARKNESS,attack,339,5,10000,2000,30000,no,self,myhpltmaxrate,80,,,,,,6,
@@ -11368,7 +11387,7 @@
 3209,V_MAGALETA@AL_HEAL,idle,28,9,300,0,2000,yes,self,myhpltmaxrate,99,,,,,,3,
 3209,V_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,,
 3209,V_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,friend,friendhpltmaxrate,99,,,,,,,
-3209,V_MAGALETA@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3209,V_MAGALETA@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3209,V_MAGALETA@NPC_MAXPAIN,chase,716,5,1000,1000,60000,no,self,longrangeattacked,,,,,,,19,
 3209,V_MAGALETA@PR_LEXDIVINA,chase,76,10,500,0,10000,yes,target,casttargeted,,,,,,,18,
 3209,V_MAGALETA@PR_LEXAETERNA,chase,78,1,100,0,10000,yes,target,always,,,,,,,29,
@@ -11386,11 +11405,11 @@
 3209,V_MAGALETA@NPC_WIDESILENCE,attack,663,2,300,500,5000,no,self,always,,,,,,,,
 3210,V_KATRINN@MG_SIGHT,idle,10,1,200,0,10000,yes,self,always,,,,,,,,
 3210,V_KATRINN@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
-3210,V_KATRINN@WZ_JUPITEL,chase,84,28,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,chase,84,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WZ_WATERBALL,chase,86,5,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@NPC_DARKSTRIKE,chase,340,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@MG_FIREWALL,chase,18,10,300,0,10000,yes,target,always,,,,,,,,
-3210,V_KATRINN@MG_FROSTDIVER,chase,15,40,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@MG_FROSTDIVER,chase,15,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@HW_NAPALMVULCAN,chase,400,5,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WZ_FROSTNOVA,chase,88,10,300,0,10000,yes,target,longrangeattacked,,,,,,,,
 3210,V_KATRINN@WL_EARTHSTRAIN,chase,2216,5,300,0,10000,yes,target,always,,,,,,,,
@@ -11401,7 +11420,7 @@
 3210,V_KATRINN@NPC_WIDEFREEZE,attack,664,3,300,500,10000,no,self,always,,,,,,,,
 3210,V_KATRINN@NPC_DARKSTRIKE,attack,340,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WL_TETRAVORTEX,attack,2217,2,300,500,10000,no,target,always,,,,,,,,
-3210,V_KATRINN@WZ_JUPITEL,attack,84,28,300,0,10000,yes,target,always,,,,,,,,
+3210,V_KATRINN@WZ_JUPITEL,attack,84,10,300,0,10000,yes,target,always,,,,,,,,
 3210,V_KATRINN@WL_EARTHSTRAIN,attack,2216,3,300,500,10000,no,target,always,,,,,,,,
 3210,V_KATRINN@WZ_SIGHTRASHER,attack,81,10,300,0,10000,yes,self,always,,,,,,,,
 3210,V_KATRINN@NPC_SUMMONSLAVE,attack,196,1,50,0,600000,yes,self,slavele,0,1641,,,,,,
@@ -11470,11 +11489,11 @@
 3215,V_G_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,self,myhpltmaxrate,99,,,,,,,
 3215,V_G_MAGALETA@HP_ASSUMPTIO,chase,361,5,1000,1000,10000,no,friend,friendhpltmaxrate,99,,,,,,,
 3215,V_G_MAGALETA@AL_INCAGI,chase,29,10,200,0,240000,yes,self,always,,,,,,,2,
-3215,V_G_MAGALETA@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3215,V_G_MAGALETA@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3215,V_G_MAGALETA@NPC_WIDESILENCE,chase,663,2,500,0,10000,yes,target,casttargeted,,,,,,,18,
 3215,V_G_MAGALETA@AL_PNEUMA,chase,25,1,500,0,10000,yes,self,longrangeattacked,,,,,,,19,
-3215,V_G_MAGALETA@AL_HEAL,chase,28,11,300,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
-3215,V_G_MAGALETA@AL_HEAL,chase,28,11,300,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
+3215,V_G_MAGALETA@AL_HEAL,chase,28,10,300,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3,
+3215,V_G_MAGALETA@AL_HEAL,chase,28,10,300,0,1500,yes,self,myhpltmaxrate,99,,,,,,3,
 3215,V_G_MAGALETA@AL_INCAGI,attack,29,10,200,0,240000,yes,self,always,,,,,,,2,
 3215,V_G_MAGALETA@MG_SAFETYWALL,attack,12,10,100,0,10000,yes,self,always,,,,,,,,
 3215,V_G_MAGALETA@AL_PNEUMA,attack,25,1,500,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -11491,14 +11510,14 @@
 3216,V_G_KATRINN@NPC_WIDEFREEZE,chase,664,5,300,3000,10000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@HW_NAPALMVULCAN,chase,400,5,200,1000,2000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_STORMGUST2,chase,723,3,300,1000,10000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_VERMILION,chase,85,21,300,1000,10000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_METEOR,chase,83,11,300,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_VERMILION,chase,85,10,300,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_METEOR,chase,83,10,300,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_COMET,attack,708,5,300,1000,7000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@NPC_STORMGUST2,attack,723,3,200,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_WIDESTONE,attack,666,1,200,1000,10000,no,self,always,,,,,,,,
 3216,V_G_KATRINN@HW_GANBANTEIN,attack,483,1,300,500,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@WL_EARTHSTRAIN,attack,2216,5,300,1000,7000,no,target,always,,,,,,,,
-3216,V_G_KATRINN@WZ_JUPITEL,attack,84,28,200,1000,10000,no,target,always,,,,,,,,
+3216,V_G_KATRINN@WZ_JUPITEL,attack,84,10,200,1000,10000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@WL_TETRAVORTEX,attack,2217,5,300,1000,7000,no,target,always,,,,,,,,
 3216,V_G_KATRINN@NPC_WIDEFREEZE,attack,664,5,200,1000,10000,no,self,always,,,,,,,,
 3217,V_G_SHECIL@NPC_AGIUP,idle,350,1,1000,0,600000,yes,self,always,,,,,,,,
@@ -11515,7 +11534,7 @@
 3218,V_G_HARWORD@NPC_SELFDESTRUCTION,attack,173,1,200,2000,0,no,self,myhpltmaxrate,10,,,,,,,
 3218,V_G_HARWORD@BS_ADRENALINE,attack,111,10,200,0,150000,yes,self,always,,,,,,,,
 3218,V_G_HARWORD@BS_MAXIMIZE,attack,114,1,100,0,60000,yes,self,always,,,,,,,,
-3218,V_G_HARWORD@MC_MAMMONITE,attack,42,22,200,0,10000,yes,target,always,,,,,,,23,
+3218,V_G_HARWORD@MC_MAMMONITE,attack,42,10,200,0,10000,yes,target,always,,,,,,,23,
 3218,V_G_HARWORD@BS_HAMMERFALL,attack,110,10,200,0,30000,yes,target,always,,,,,,,,
 3218,V_G_HARWORD@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3218,V_G_HARWORD@NPC_SPLASHATTACK,attack,174,1,100,0,0,yes,target,attackpcge,2,,,,,,,
@@ -11529,7 +11548,7 @@
 3219,V_G_SEYREN@SM_PROVOKE,chase,6,10,100,0,10000,yes,target,always,,,,,,,29,
 3219,V_G_SEYREN@SM_ENDURE,chase,8,10,500,0,30000,yes,self,longrangeattacked,,,,,,,6,
 3219,V_G_SEYREN@NPC_DARKPIERCING,chase,715,1,100,0,10000,yes,target,always,,,,,,,,
-3219,V_G_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,1000,0,300000,yes,self,always,,,,,,,2,
+3219,V_G_SEYREN@KN_TWOHANDQUICKEN,attack,60,10,1000,0,300000,yes,self,always,,,,,,,2,
 3219,V_G_SEYREN@LK_SPIRALPIERCE,attack,397,5,200,0,10000,yes,target,always,,,,,,,,
 3219,V_G_SEYREN@NPC_POWERUP,attack,349,5,200,0,25000,yes,self,myhpltmaxrate,30,,,,,,,
 3219,V_G_SEYREN@NPC_DRAGONBREATH,attack,731,5,300,500,10000,no,target,always,,,,,,,,
@@ -11620,7 +11639,7 @@
 3223,V_B_HARWORD@NPC_SUMMONMONSTER,attack,209,1,1000,700,60000000,yes,self,myhpltmaxrate,30,3219,3214,3215,3216,3217,,
 3223,V_B_HARWORD@BS_ADRENALINE,attack,111,10,200,0,150000,yes,self,always,,,,,,,,
 3223,V_B_HARWORD@BS_MAXIMIZE,attack,114,1,100,0,60000,yes,self,always,,,,,,,,
-3223,V_B_HARWORD@MC_MAMMONITE,attack,42,22,200,0,10000,yes,target,always,,,,,,,23,
+3223,V_B_HARWORD@MC_MAMMONITE,attack,42,10,200,0,10000,yes,target,always,,,,,,,23,
 3223,V_B_HARWORD@BS_HAMMERFALL,attack,110,10,200,0,10000,yes,target,always,,,,,,,,
 3223,V_B_HARWORD@NPC_POWERUP,attack,349,5,200,0,100000,yes,self,always,,,,,,,,
 3223,V_B_HARWORD@NPC_MAXPAIN,attack,716,10,500,1000,10000,no,self,always,,,,,,,19,
@@ -11642,7 +11661,7 @@
 3224,V_B_KATRINN@NPC_WIDESTONE,attack,666,1,200,1000,10000,no,self,always,,,,,,,,
 3224,V_B_KATRINN@HW_GANBANTEIN,attack,483,1,300,500,10000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@WL_EARTHSTRAIN,attack,2216,5,300,1000,7000,no,target,always,,,,,,,,
-3224,V_B_KATRINN@WZ_JUPITEL,attack,84,28,200,1000,10000,no,target,always,,,,,,,,
+3224,V_B_KATRINN@WZ_JUPITEL,attack,84,10,200,1000,10000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@WL_TETRAVORTEX,attack,2217,5,300,1000,7000,no,target,always,,,,,,,,
 3224,V_B_KATRINN@NPC_WIDEFREEZE,attack,664,5,200,1000,10000,no,self,always,,,,,,,,
 3224,V_B_KATRINN@NPC_WIDESILENCE,attack,663,5,200,1000,10000,no,self,always,,,,,,,,
@@ -11656,7 +11675,7 @@
 3225,V_B_SEYREN@NPC_MAXPAIN,attack,716,5,1000,0,10000,yes,self,skillused,490,,,,,,8,
 3225,V_B_SEYREN@NPC_CALLSLAVE,attack,352,1,1000,0,10000,yes,self,always,,,,,,,,
 3225,V_B_SEYREN@NPC_SUMMONSLAVE,attack,196,1,1000,700,10000,no,self,slavele,3,3214,3218,3215,3216,3217,,
-3225,V_B_SEYREN@KN_TWOHANDQUICKEN,attack,60,30,1000,0,300000,yes,self,always,,,,,,,2,
+3225,V_B_SEYREN@KN_TWOHANDQUICKEN,attack,60,10,1000,0,300000,yes,self,always,,,,,,,2,
 3225,V_B_SEYREN@LK_SPIRALPIERCE,attack,397,5,200,0,10000,yes,target,always,,,,,,,,
 3225,V_B_SEYREN@NPC_DRAGONBREATH,attack,731,10,300,500,10000,no,target,always,,,,,,,,
 3225,V_B_SEYREN@NPC_DRAGONBREATH,attack,731,5,300,500,10000,no,target,always,,,,,,,,
@@ -11705,7 +11724,7 @@
 3228,V_CELIA@NPC_WIDEWEB,chase,721,1,500,1000,10000,no,self,always,,,,,,,,
 3228,V_CELIA@NPC_PSYCHIC_WAVE,chase,736,1,500,0,10000,no,target,always,,,,,,,,
 3228,V_CELIA@SA_DISPELL,chase,289,5,50,0,10000,yes,target,always,,,,,,,,
-3228,V_CELIA@MG_THUNDERSTORM,chase,21,20,300,500,10000,no,target,always,,,,,,,,
+3228,V_CELIA@MG_THUNDERSTORM,chase,21,10,300,500,10000,no,target,always,,,,,,,,
 3228,V_CELIA@NPC_WIDESOULDRAIN,chase,680,4,300,0,10000,no,self,always,,,,,,,,
 3228,V_CELIA@NPC_MENTALBREAKER,attack,159,3,50,800,10000,no,target,always,,,,,,,,
 3228,V_CELIA@SA_DISPELL,attack,289,5,300,0,10000,yes,target,always,,,,,,,,
@@ -11718,7 +11737,7 @@
 3229,V_CHEN@AL_TELEPORT,idle,26,1,1000,0,0,yes,self,rudeattacked,,,,,,,,
 3229,V_CHEN@AL_TELEPORT,walk,26,1,500,0,10000,yes,self,rudeattacked,,,,,,,,
 3229,V_CHEN@MO_BODYRELOCATION,chase,264,1,200,500,5000,no,target,always,,,,,,,28,
-3229,V_CHEN@AL_DECAGI,chase,30,48,200,0,10000,yes,target,always,,,,,,,,
+3229,V_CHEN@AL_DECAGI,chase,30,10,200,0,10000,yes,target,always,,,,,,,,
 3229,V_CHEN@MO_BALKYOUNG,attack,1016,1,10,0,10000,no,target,always,,,,,,,19,
 3229,V_CHEN@MO_EXTREMITYFIST,attack,271,1,500,1000,6000,no,target,always,,,,,,,,
 3229,V_CHEN@NPC_CRITICALSLASH,attack,170,1,100,0,10000,yes,target,always,,,,,,,,
@@ -12740,7 +12759,7 @@
 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,48,2000,0,5000,no,target,always,0,,,,,,,
+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,
@@ -12828,12 +12847,12 @@
 3763,Resentful Soldier@NPC_UNDEADATTACK,attack,347,5,500,500,5000,no,target,always,0,,,,,,,
 3763,Resentful Soldier@AC_CHARGEARROW,attack,148,1,500,0,15000,yes,target,always,0,,,,,,,
 3764,Wizard of Truth@NPC_TALK,idle,682,10,2500,0,60000,yes,self,always,0,,,,,,,55
-3764,Wizard of Truth@WZ_VERMILION,idle,85,21,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,idle,85,10,10000,1000,25000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 3764,Wizard of Truth@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-3764,Wizard of Truth@WZ_VERMILION,chase,85,21,10000,500,27000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,chase,85,10,10000,500,27000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@WZ_STORMGUST,attack,89,9,10000,1000,26000,no,target,always,0,,,,,,,
-3764,Wizard of Truth@WZ_VERMILION,attack,85,21,10000,1000,25000,no,target,always,0,,,,,,,
+3764,Wizard of Truth@WZ_VERMILION,attack,85,10,10000,1000,25000,no,target,always,0,,,,,,,
 3764,Wizard of Truth@MG_FIREWALL,attack,18,9,2000,200,19000,yes,target,always,0,,,,,,,
 3764,Wizard of Truth@WZ_METEOR,attack,83,9,10000,1000,29000,no,target,always,,,,,,,,
 3764,Wizard of Truth@WZ_HEAVENDRIVE,attack,91,5,2000,1000,22000,no,target,always,0,,,,,,,
@@ -14470,234 +14489,3 @@
 21395,ILL_MAYA@NPC_IMMUNE_PROPERTY,attack,754,1,1500,1500,60000,no,self,longrangeattacked,0,,,,,,,
 21395,ILL_MAYA@NPC_DAMAGE_HEAL,attack,753,1,500,1500,120000,no,target,myhpltmaxrate,50,,,,,,32,
 21395,ILL_MAYA@NPC_ALL_STAT_DOWN,attack,751,5,5000,1500,45000,no,target,always,0,,,,,,18,
-
-// Episode 18
-20846,MD_HIDDEN_GROUND01@NPC_GRADUAL_GRAVITY,idle,752,3,1000,0,5000,no,target,always,0,,,,,,,
-20846,MD_HIDDEN_GROUND01@NPC_GRADUAL_GRAVITY,attack,752,3,1000,0,5000,no,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_GUIDEDATTACK,chase,172,3,2000,0,5000,yes,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_POISONATTACK,attack,188,5,1000,0,5000,yes,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_BLINDATTACK,chase,177,5,1000,500,5000,no,target,always,0,,,,,,,
-21295,EP18_ASH_TOAD@NPC_BLINDATTACK,attack,177,3,1000,500,5000,no,target,always,0,,,,,,,
-21296,EP18_RAKEHAND@NPC_GUIDEDATTACK,attack,172,3,2000,0,5000,yes,target,always,0,,,,,,,
-21296,EP18_RAKEHAND@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,12,
-21296,EP18_RAKEHAND@NPC_STUNATTACK,attack,179,3,1000,500,5000,no,target,always,0,,,,,,11,
-21296,EP18_RAKEHAND@RG_CLOSECONFINE,attack,1005,1,1000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBOLT,chase,19,3,2000,300,5000,no,target,always,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBALL,chase,17,3,5000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@NPC_GUIDEDATTACK,attack,172,3,2000,0,30000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@MG_FIREBOLT,attack,19,3,1000,0,10000,yes,target,always,0,,,,,,,
-21297,EP18_SPARK@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21297,EP18_SPARK@NPC_SELFDESTRUCTION,attack,173,1,10000,1000,0,no,self,myhpltmaxrate,30,,,,,,,
-21297,EP18_SPARK@NPC_SELFDESTRUCTION,chase,173,1,2000,1000,0,no,self,myhpltmaxrate,30,,,,,,,
-21298,EP18_HOT_MOLAR@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_COMBOATTACK,chase,171,3,5000,0,30000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@SM_BASH,attack,5,4,2000,0,5000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_GUIDEDATTACK,chase,172,3,2000,0,300000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@NPC_BLEEDING2,attack,764,3,2000,0,5000,yes,target,always,0,,,,,,,
-21298,EP18_HOT_MOLAR@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21298,EP18_HOT_MOLAR@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21299,EP18_VOLCARING@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21299,EP18_VOLCARING@MG_FIREBOLT,chase,19,5,1000,500,30000,yes,target,always,0,,,,,,,
-21299,EP18_VOLCARING@NPC_FIREATTACK,attack,186,3,2000,0,5000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21300,EP18_LAVA_TOAD@MG_FIREBOLT,chase,19,3,2000,0,30000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@NPC_CRITICALSLASH,attack,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21300,EP18_LAVA_TOAD@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21300,EP18_LAVA_TOAD@RG_STRIPSHIELD,attack,216,3,3000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_COMBOATTACK,idle,171,4,5000,0,5000,yes,target,always,0,,,,,,7,
-21301,EP18_BURNING_FANG@NPC_GUIDEDATTACK,chase,172,5,5000,0,1000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MOVE_COORDINATE,chase,755,1,5000,0,30000,no,target,always,0,,,,,,39,
-21301,EP18_BURNING_FANG@NPC_CRITICALWOUND,attack,673,4,500,500,5000,no,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MENTALBREAKER,attack,159,4,500,1500,5000,yes,target,always,0,,,,,,42,
-21301,EP18_BURNING_FANG@NPC_CRITICALSLASH,attack,170,1,10000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_MOVE_COORDINATE,attack,755,1,5000,0,60000,no,target,longrangeattacked,0,,,,,,39,
-21301,EP18_BURNING_FANG@NPC_CURSEATTACK,attack,181,5,4000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_STUNATTACK,attack,179,5,2000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@HW_GANBANTEIN,attack,483,1,7000,0,60000,no,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_POWERUP,attack,349,3,3000,0,60000,yes,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@RG_STRIPHELM,attack,218,5,1000,0,30000,yes,target,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,3,,,,,,,
-21301,EP18_BURNING_FANG@NPC_CALLSLAVE,idle,352,1,10000,0,30000,no,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_CALLSLAVE,attack,352,1,10000,0,30000,no,self,always,0,,,,,,,
-21301,EP18_BURNING_FANG@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,,,,,,,
-21302,EP18_ASHHOPPER@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21302,EP18_ASHHOPPER@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x3885,,,,,44,
-21302,EP18_ASHHOPPER@NPC_GUIDEDATTACK,chase,172,3,3000,500,30000,yes,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_POISONATTACK,attack,188,5,1000,0,5000,yes,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_POISON_BUSTER,attack,742,1,2000,1500,30000,no,self,always,0,,,,,,,
-21302,EP18_ASHHOPPER@NPC_CLOUD_KILL,attack,739,3,2000,500,15000,no,target,always,0,,,,,,,
-21302,EP18_ASHHOPPER@MO_BODYRELOCATION,chase,264,1,2000,500,5000,yes,target,always,0,,,,,,28,
-21303,EP18_ASHRING@NPC_POISON,attack,176,3,500,800,5000,no,target,always,0,,,,,,,
-21303,EP18_ASHRING@NPC_POISONATTACK,attack,188,3,2000,0,5000,yes,target,always,0,,,,,,,
-21303,EP18_ASHRING@NPC_AGIUP,chase,350,1,1000,0,30000,yes,self,always,0,,,,,,,
-21303,EP18_ASHRING@WZ_QUAGMIRE,chase,92,2,500,0,30000,yes,target,always,0,,,,,,6,
-21304,EP18_GREY_WOLF@NPC_POISONATTACK,chase,188,3,2000,0,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_COMBOATTACK,attack,171,3,2000,200,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_COMBOATTACK,chase,171,3,2000,200,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_STUNATTACK,attack,179,3,2000,0,5000,yes,target,always,0,,,,,,,
-21304,EP18_GREY_WOLF@NPC_STUNATTACK,attack,179,3,2000,0,5000,yes,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@AL_TELEPORT,idle,26,3,7000,0,5000,yes,self,rudeattacked,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_CRITICALWOUND,attack,673,1,1000,300,5000,no,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_POISONATTACK,attack,188,2,2000,500,15000,no,target,always,0,,,,,,9,
-21305,EP18_TUMBLE_RING@NPC_CLOUD_KILL,attack,739,5,2000,0,15000,yes,target,always,0,,,,,,,
-21305,EP18_TUMBLE_RING@NPC_AGIUP,chase,350,10,2000,0,100000,yes,self,longrangeattacked,0,,,,,,,
-21306,EP18_FIREWIND_KITE@AL_TELEPORT,idle,26,3,7000,0,5000,yes,self,rudeattacked,0,,,,,,,
-21306,EP18_FIREWIND_KITE@MG_FIREBOLT,idle,19,5,5000,300,5000,no,target,always,0,,,,,,,
-21306,EP18_FIREWIND_KITE@NPC_WINDATTACK,chase,187,5,2000,300,5000,yes,target,always,0,,,,,,,
-21306,EP18_FIREWIND_KITE@NPC_FIREATTACK,chase,186,5,3000,300,5000,yes,target,always,0,,,,,,9,
-21306,EP18_FIREWIND_KITE@NPC_CRITICALSLASH,attack,170,4,2000,500,15000,no,target,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@NPC_GUIDEDATTACK,chase,172,2,5000,0,60000,yes,target,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@NPC_CRITICALSLASH,attack,170,1,500,300,30000,yes,target,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@AS_CLOAKING,idle,135,1,1000,300,30000,yes,self,always,0,,,,,,9,
-21307,EP18_PHANTOM_WOLF@AS_GRIMTOOTH,chase,137,5,5000,0,5000,yes,target,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@ASC_METEORASSAULT,attack,406,8,3000,0,10000,yes,self,always,0,,,,,,,
-21307,EP18_PHANTOM_WOLF@ASC_BREAKER,chase,379,10,2000,0,5000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@TF_SPRINKLESAND,attack,149,1,2000,300,30000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@NPC_CRITICALSLASH,chase,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21308,EP18_MD_HEARTHUNTER_A@RG_STRIPSHIELD,attack,216,3,3000,0,60000,yes,target,always,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21309,EP18_MD_THOR_GUARD@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21309,EP18_MD_THOR_GUARD@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21309,EP18_MD_THOR_GUARD@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21310,EP18_MD_GUARD_A@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21310,EP18_MD_GUARD_A@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21310,EP18_MD_GUARD_A@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21310,EP18_MD_GUARD_A@NPC_STUNATTACK,attack,179,1,500,500,5000,no,target,always,0,,,,,,9,
-21311,EP18_MD_GUARD_B@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21311,EP18_MD_GUARD_B@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21311,EP18_MD_GUARD_B@SM_PROVOKE,chase,6,10,2000,100,10000,yes,target,always,0,,,,,,3,
-21311,EP18_MD_GUARD_B@NPC_CURSEATTACK,attack,181,5,1000,300,5000,no,target,always,0,,,,,,,
-21311,EP18_MD_GUARD_B@CR_AUTOGUARD,attack,249,3,3000,0,300000,no,self,always,0,,,,,,,
-21311,EP18_MD_GUARD_B@NPC_STUNATTACK,attack,179,1,500,500,5000,no,target,always,0,,,,,,9,
-21312,EP18_MD_HEARTHUNTER_R@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@TF_SPRINKLESAND,attack,149,1,2000,300,30000,yes,target,always,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@NPC_CRITICALSLASH,chase,170,1,3000,0,10000,yes,target,always,0,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@SM_MAGNUM,attack,7,5,5000,0,5000,yes,self,attackpcge,2,,,,,,,
-21312,EP18_MD_HEARTHUNTER_R@RG_STRIPSHIELD,attack,216,3,3000,0,60000,yes,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21313,EP18_MD_HEARTHUNTER_F@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21313,EP18_MD_HEARTHUNTER_F@NPC_BLINDATTACK,chase,177,3,1000,0,5000,yes,target,always,0,,,,,,39,
-21313,EP18_MD_HEARTHUNTER_F@HT_BLASTMINE,idle,122,3,2000,500,180000,no,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@NPC_COMBOATTACK,attack,171,2,3000,500,15000,yes,target,always,0,,,,,,,
-21313,EP18_MD_HEARTHUNTER_F@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x2085,,,,,44,
-21313,EP18_MD_HEARTHUNTER_F@TF_SPRINKLESAND,attack,149,1,3000,0,30000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21314,EP18_MD_SCHULANG@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21314,EP18_MD_SCHULANG@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21315,EP18_MD_DEMI_FREYJA@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
-21315,EP18_MD_DEMI_FREYJA@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21316,EP18_MD_SCHULANG_R@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
-21317,EP18_MD_DEMI_FREYJA_R@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,12,
-21318,EP18_MD_SANARE_R@NPC_EMOTION,chase,197,1,500,0,30000,yes,self,always,0,0x0091,,,,,19,
-21318,EP18_MD_SANARE_R@AL_HEAL,idle,28,9,7000,500,5000,yes,friend,myhpltmaxrate,50,,,,,,3,
-21318,EP18_MD_SANARE_R@NPC_EMOTION,idle,197,1,2000,0,30000,yes,self,always,0,0x3885,,,,,14,
-21318,EP18_MD_SANARE_R@AL_HEAL,attack,28,9,7000,500,15000,yes,friend,always,0,,,,,,3,
-21318,EP18_MD_SANARE_R@NPC_DARKCROSS,attack,338,5,3000,500,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_HOLYLIGHT,chase,156,1,3000,300,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@NPC_HOLYATTACK,chase,189,3,4000,500,15000,yes,target,always,0,,,,,,,
-21318,EP18_MD_SANARE_R@AL_HEAL,idle,28,9,10000,700,3000,yes,friend,friendhpltmaxrate,50,,,,,,,
-21323,EP18_GREY_GOAT@BS_ADRENALINE,attack,111,10,500,1500,300000,no,self,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@BS_ADRENALINE,chase,111,10,500,1500,300000,no,self,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,0x1089,,,,,19,
-21323,EP18_GREY_GOAT@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
-21323,EP18_GREY_GOAT@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-21323,EP18_GREY_GOAT@NPC_CRITICALWOUND,attack,673,1,500,0,5000,yes,target,always,0,,,,,,,
-21323,EP18_GREY_GOAT@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,,
-21323,EP18_GREY_GOAT@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,12,
-21324,EP18_GREY_WOLF_BABY@NPC_PROVOCATION,chase,194,1,200,0,5000,yes,target,always,0,,,,,,19,
-21324,EP18_GREY_WOLF_BABY@NPC_STUNATTACK,attack,179,3,2000,500,5000,no,target,always,0,,,,,,19,
-21324,EP18_GREY_WOLF_BABY@NPC_CRITICALWOUND,attack,673,5,2000,300,10000,no,target,always,0,,,,,,,
-21324,EP18_GREY_WOLF_BABY@NPC_GUIDEDATTACK,attack,172,4,1500,300,10000,yes,target,always,0,,,,,,,
-21324,EP18_GREY_WOLF_BABY@AL_TELEPORT,chase,26,1,3000,0,300000,yes,self,mobnearbygt,23,,,,,,,
-21324,EP18_GREY_WOLF_BABY@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,12,
-21360,EP18_MD_SCHULANG_L@NPC_TELEKINESISATTACK,attack,191,2,3000,0,5000,yes,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,chase,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-// 21360,EP18_MD_SCHULANG_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
-21360,EP18_MD_SCHULANG_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_WIDESTONE2,attack,759,3,3000,500,30000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@MG_THUNDERSTORM,attack,21,5,7000,500,30000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@MG_LIGHTNINGBOLT,chase,20,6,3000,300,5000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_WIDECONFUSE2,attack,762,3,3000,500,30000,no,target,always,0,,,,,,,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGEWIND,attack,165,1,3000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGEHOLY,attack,167,1,5000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@NPC_CHANGETELEKINESIS,attack,169,1,1000,300,120000,yes,self,myhpltmaxrate,50,,,,,,47,
-21360,EP18_MD_SCHULANG_L@WZ_VERMILION,chase,85,3,5000,500,60000,no,target,myhpltmaxrate,70,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKNESSATTACK,attack,190,4,3000,0,5000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,attack,340,3,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_EARTHQUAKE,attack,653,4,2000,500,30000,yes,self,always,0,,,,,,6,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_POWERUP,attack,349,3,5000,0,30000,yes,self,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,chase,340,4,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_BLOODDRAIN,attack,199,1,2000,0,10000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_DARKSTRIKE,attack,340,6,3000,200,15000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDESTONE2,attack,759,5,3000,500,30000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDECONFUSE2,attack,762,5,3000,500,30000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_WIDECURSE2,attack,761,3,3000,500,60000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_HELLJUDGEMENT2,attack,768,5,1000,500,120000,yes,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEDARKNESS,attack,168,1,1000,0,120000,yes,self,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_CHANGEHOLY,attack,167,1,3000,0,120000,yes,self,always,0,,,,,,,
-// 21361,EP18_MD_DEMI_FREYJA_L@NPC_DEADLYCURSE2,attack,779,5,5000,1000,30000,no,self,always,0,,,,,,55,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,chase,780,3,8000,300,30000,no,target,always,0,,,,,,,
-21361,EP18_MD_DEMI_FREYJA_L@NPC_CANE_OF_EVIL_EYE,attack,780,5,7000,300,30000,yes,target,always,0,,,,,,,
--- a/db/re/pet_db.yml
+++ b/db/re/pet_db.yml
--- a/db/re/quest_db.yml
+++ b/db/re/quest_db.yml
@@ -1571,32 +1571,8 @@ Body:
  - Id: 3492
    Title: (Skilled) Dragon Monster Hunting - Standby
    TimeLimit: 4h
-  - Id: 3493
-    Title: Conversation with Jarad
-  - Id: 3494
-    Title: Conversation with Rohi
-  - Id: 3495
-    Title: Conversation with Jeojin
-  - Id: 3496
-    Title: Conversation with Squain
-  - Id: 3497
-    Title: Conversation with Senado
-  - Id: 3498
-    Title: Conversation with Japer
-  - Id: 3499
-    Title: Conversation with Shirouan
-  - Id: 3500
-    Title: Conversation with Ishira
-  - Id: 3501
-    Title: Conversation with Gina
-  - Id: 3502
-    Title: Conversation with Hari
-  - Id: 3503
-    Title: Examine the Sky
  - Id: 3504
    Title: Look at the Sky - Standby
-  - Id: 3505
-    Title: Report to Junok
    TimeLimit: 4h
  - Id: 3507
    Title: Illusion Investigation Team - Sheshin
@@ -3233,27 +3209,6 @@ Body:
  - Id: 5931
    Title: "[Standby] Subjugation-Yanggeochon"
    TimeLimit: 4h
-  - Id: 5932
-    Title: The Abused Child
-  - Id: 5933
-    Title: Business Plan Presentation
-  - Id: 5934
-    Title: Gathering Training (1)
-  - Id: 5935
-    Title: Gathering Training (2)
-  - Id: 5936
-    Title: Gathering Training (3)
-  - Id: 5937
-    Title: "[Standby] Flower Room's work"
-    TimeLimit: 4h
-  - Id: 5938
-    Title: Gathering Half Flower
-  - Id: 5939
-    Title: Gathering Half Flower
-  - Id: 5940
-    Title: Gathering Half Flower
-  - Id: 5941
-    Title: Gathering Half Flower
  - Id: 6000
    Title: Job Change to Taekwon
  - Id: 6001
@@ -6315,56 +6270,6 @@ Body:
          MAGMARING: true
          DROSERA: true
          MUSCIPULAR: true
-  - Id: 8681
-    Title: To Rachel (1)
-  - Id: 8682
-    Title: To Rachel (2)
-  - Id: 8683
-    Title: Please stop fighting
-  - Id: 8684
-    Title: It's over
-  - Id: 8685
-    Title: A suspicious movement detected in the temple
-  - Id: 8686
-    Title: The Intruder of the Temple
-  - Id: 8687
-    Title: Did you break it?
-  - Id: 8688
-    Title: Thanks for today's daily food
-  - Id: 8689
-    Title: Today's Daily food - Standby
-    TimeLimit: 4h
-  - Id: 8690
-    Title: Thanks for today's daily food
-  - Id: 8691
-    Title: Sacred Relics for Essence (1)
-  - Id: 8692
-    Title: Sacred Relics for Essence (2)
-  - Id: 8693
-    Title: Sacred Relics for Essence (3)
-  - Id: 8694
-    Title: Clean Water Procurement - Standby
-    TimeLimit: 4h
-  - Id: 8695
-    Title: Procurement of clean water (1)
-  - Id: 8696
-    Title: Procurement of clean water (2)
-  - Id: 8697
-    Title: Procurement of clean water (3)
-  - Id: 8698
-    Title: Late migration
-  - Id: 8699
-    Title: First Step Out of the City
-  - Id: 8700
-    Title: I couldn't even come halfway
-  - Id: 8701
-    Title: Scenery I've Seen for the First Time
-  - Id: 8702
-    Title: Smell of Volcanic Ash
-  - Id: 8703
-    Title: The easy way to go
-  - Id: 8718
-    Title: My friend's regards
  - Id: 8719
    Title: A new area somewhere in the anthill
  - Id: 8720
@@ -8135,106 +8040,6 @@ Body:
  - Id: 11667
    Title: Squirrels are rats, too? Standby
    TimeLimit: 4h
-  - Id: 11696
-    Title: Niren's Request
-  - Id: 11697
-    Title: Niren's Request
-  - Id: 11698
-    Title: Niren's Request
-  - Id: 11699
-    Title: Niren's Request
-  - Id: 11700
-    Title: Niren's Request
-  - Id: 11701
-    Title: Niren's Request
-  - Id: 11702
-    Title: Niren's Request
-  - Id: 11703
-    Title: Niren's Request
-  - Id: 11704
-    Title: Niren's Request
-  - Id: 11705
-    Title: Children of Grey
-  - Id: 11706
-    Title: Children of Grey
-  - Id: 11707
-    Title: Children of Grey
-  - Id: 11708
-    Title: Children of Grey
-  - Id: 11709
-    Title: Children of Grey
-  - Id: 11710
-    Title: Children of Grey
-  - Id: 11711
-    Title: Children of Grey
-  - Id: 11712
-    Title: Children of Grey
-  - Id: 11713
-    Title: Children of Grey
-  - Id: 11714
-    Title: Children of Grey
-  - Id: 11715
-    Title: Children of Grey
-  - Id: 11716
-    Title: Children of Grey
-  - Id: 11717
-    Title: Children of Grey
-  - Id: 11718
-    Title: Children of Grey
-  - Id: 11719
-    Title: Children of Grey
-  - Id: 11720
-    Title: Children of Grey
-  - Id: 11721
-    Title: Children of Grey
-  - Id: 11722
-    Title: Children of Grey
-  - Id: 11723
-    Title: Children of Grey
-  - Id: 11724
-    Title: Children of Grey
-  - Id: 11725
-    Title: Investigation of Oz Labyrinth
-  - Id: 11726
-    Title: Investigation of Oz Labyrinth
-  - Id: 11727
-    Title: Investigation of Oz Labyrinth
-  - Id: 11728
-    Title: Investigation of Oz Labyrinth
-  - Id: 11729
-    Title: Investigation of Oz Labyrinth
-  - Id: 11730
-    Title: Investigation of Oz Labyrinth
-    Targets:
-      - Id: 1
-        Location: oz_dun01
-        Count: 10
-  - Id: 11731
-    Title: Investigation of Oz Labyrinth
-  - Id: 11732
-    Title: Investigation of Oz Labyrinth
-  - Id: 11733
-    Title: Investigation of Oz Labyrinth
-  - Id: 11734
-    Title: Investigation of Oz Labyrinth
-  - Id: 11735
-    Title: Investigation of Oz Labyrinth
-  - Id: 11736
-    Title: Maze of Oz 1st Floor (170lv)
-    Targets:
-      - Mob: EP18_ASH_TOAD
-        Count: 20
-  - Id: 11737
-    Title: Maze of Oz Level 1 - Standby
-    TimeLimit: 4h
-  - Id: 11738
-    Title: Maze of Oz Level 2 (200lv)
-    Targets:
-      - Mob: EP18_HOT_MOLAR
-        Count: 20
-  - Id: 11739
-    Title: Maze of Oz Level 2 (200lv)
-    TimeLimit: 4h
  - Id: 12000
    Title: An old friend
  - Id: 12001
@@ -9274,31 +9079,6 @@ Body:
  - Id: 12506
    Title: Let's try again to seal the crack
    TimeLimit: 4h
-  - Id: 12520
-    Title: Villa of Deception
-  - Id: 12521
-    Title: Villa of Deception Hard
-  - Id: 12522
-    Title: Cooldown: Villa of Deception
-    TimeLimit: 4h
-  - Id: 12531
-    Title: Future General Candidate
-  - Id: 12532
-    Title: Trouble at the Top
-  - Id: 12533
-    Title: The Hidden Helper
-  - Id: 12534
-    Title: The Missing Camille
-  - Id: 12535
-    Title: The Governor's Decision
-  - Id: 12536
-    Title: The Scattered Luggage (North)
-  - Id: 12537
-    Title: Scattered Luggage (West)
-  - Id: 12538
-    Title: The Scattered Luggage (East)
-  - Id: 12539
-    Title: Scattered Luggage (South)
  - Id: 13000
    Title: RWC2011Card Gathering
  - Id: 13001
@@ -11446,90 +11226,6 @@ Body:
    Title: Farm Worker
  - Id: 16547
    Title: Juno Monster Society
-  - Id: 16548
-    Title: I can't sleep
-    Targets:
-      - Mob: EP18_FIREWIND_KITE
-        Count: 30
-  - Id: 16549
-    Title: I can't sleep
-    Targets:
-      - Mob: EP18_FIREWIND_KITE
-        Count: 30
-  - Id: 16550
-    Title: I Can't Sleep - Wait
-    TimeLimit: 4h
-  - Id: 16551
-    Title: The Story of Dinar
-  - Id: 16552
-    Title: Amira's Story
-  - Id: 16553
-    Title: Shanina's Grandma's Story
-  - Id: 16554
-    Title: Please collect the stories
-  - Id: 16555
-    Title: The Story of Dinar
-  - Id: 16556
-    Title: Amira's Story
-  - Id: 16557
-    Title: Shanina's Grandma's Story
-  - Id: 16558
-    Title: Please collect the stories
-  - Id: 16559
-    Title: Please collect the stories - Standby
-    TimeLimit: 4h
-  - Id: 16560
-    Title: This is not the place
-  - Id: 16561
-    Title: This is not the place
-  - Id: 16562
-    Title: This is not the place
-  - Id: 16563
-    Title: This is not the place
-  - Id: 16564
-    Title: This is not the place
-  - Id: 16565
-    Title: This is not the place
-  - Id: 16566
-    Title: This is not the place
-  - Id: 16567
-    Title: The Contest of the Grey Wolf Forest
-  - Id: 16568
-    Title: Everyone's Opinion
-  - Id: 16569
-    Title: Everyone's Opinion
-  - Id: 16570
-    Title: Everyone's Opinion
-  - Id: 16571
-    Title: Everyone's Opinion
-  - Id: 16572
-    Title: The Contest of the Grey Wolf Forest
-  - Id: 16573
-    Title: Source of Weapon
-  - Id: 16574
-    Title: Source of Weapon
-  - Id: 16575
-    Title: Source of Weapon
-  - Id: 16576
-    Title: Source of Weapon
-  - Id: 16577
-    Title: Source of Weapon
-  - Id: 16578
-    Title: Source of Weapon
-  - Id: 16579
-    Title: Source of Weapon
-  - Id: 16580
-    Title: Source of Weapon
-  - Id: 16581
-    Title: Children Know It
-  - Id: 16582
-    Title: Children Know It
-  - Id: 16583
-    Title: Children Know It
-  - Id: 16584
-    Title: The Price of Labor
-  - Id: 16585
-    Title: The Price of Labor
  - Id: 17000
    Title: Meet with Father Bamph
  - Id: 17001
@@ -11791,61 +11487,12 @@ Body:
  - Id: 17425
    Title: (Standby) Thanatos Tower, 12th floor
    TimeLimit: 4h
-  - Id: 17504
-    Title: Where's My Home
-  - Id: 17505
-    Title: Where's My Home
-  - Id: 17506
-    Title: Where's My Home
-  - Id: 17507
-    Title: Where's My Home
-  - Id: 17508
-    Title: Lack of Supplies
-    Drops:
-      - Mob: EP18_GREY_WOLF
-        Item: Ep18_Very_Ddan_Crystal
-        Rate: 5000
  - Id: 17509
    Title: (Standby) Lack of supplies
    TimeLimit: 4h
-  - Id: 17510
-    Title: There are no bad beasts in the world
-  - Id: 17511
-    Title: There are no bad beasts in the world
-  - Id: 17512
-    Title: There are no bad beasts in the world
-  - Id: 17513
-    Title: The Unexpected Shepherd
-  - Id: 17514
-    Title: The Unexpected Shepherd
-    Targets:
-      - Mob: EP18_ASHRING
-        Count: 20
-  - Id: 17515
-    Title: The Unexpected Shepherd
  - Id: 17516
    Title: (Standby) Unexpected shepherd
    TimeLimit: 4h
-  - Id: 17517
-    Title: The Rebels
-  - Id: 17518
-    Title: The Rebels
-  - Id: 17519
-    Title: The Rebels
-  - Id: 17520
-    Title: Wolf in the Sheep
-  - Id: 17521
-    Title: When you need a conversation
-  - Id: 17522
-    Title: Cleaning the Traitors
-  - Id: 17523
-    Title: Purification of the Sanctuary
-  - Id: 17524
-    Title: Cleaning the Traitors
-  - Id: 17525
-    Title: When you need a conversation
-  - Id: 17526
-    Title: Purification of the Sanctuary
  - Id: 17527
    Title: (Standby) Cleaning strategy
    TimeLimit: 4h
@@ -11974,23 +11621,6 @@ Body:
  - Id: 18080
    Title: Goseong dungeon 1st floor attack
    TimeLimit: 4h
-  - Id: 18082
-    Title: Eligibility to Participate in the Competition
-  - Id: 18083
-    Title: Investigation of Daishinkan's Villa
-  - Id: 18084
-    Title: Fact Investigation
-  - Id: 18085
-    Title: The Direction of Prayer
-  - Id: 18086
-    Title: Make the Grey Wolf Forest Safer
-    Targets:
-      - Id: 1
-        Location: gw_fild01
-        Count: 30
-  - Id: 18087
-    Title: Safer in the Gray Wolf Forest - Standby
-    TimeLimit: 4h
  - Id: 18100
    Title: Legends from Moscovia
  - Id: 18101
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
--- a/db/re/skill_tree.yml
+++ b/db/re/skill_tree.yml
@@ -7864,178 +7864,3 @@ Body:
      Royal_Guard: true
      Royal_Guard_T: true
      Imperial_Guard: true
-  - Job: Night_Watch
-    Inherit:
-      Novice: true
-      Gunslinger: true
-      Rebellion: true
-    Tree:
-      - Name: NW_P_F_I
-        MaxLevel: 10
-      - Name: NW_GRENADE_MASTERY
-        MaxLevel: 10
-      - Name: NW_INTENSIVE_AIM
-        MaxLevel: 1
-        Requires:
-          - Name: NW_P_F_I
-            Level: 1
-      - Name: NW_HIDDEN_CARD
-        MaxLevel: 10
-        Requires:
-          - Name: NW_P_F_I
-            Level: 5
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_BASIC_GRENADE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 3
-      - Name: NW_GRENADE_FRAGMENT
-        MaxLevel: 7
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 1
-      - Name: NW_THE_VIGILANTE_AT_NIGHT
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_ONLY_ONE_BULLET
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_SPIRAL_SHOOTING
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_MAGAZINE_FOR_ONE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_WILD_FIRE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_P_F_I
-            Level: 3
-          - Name: NW_INTENSIVE_AIM
-            Level: 1
-      - Name: NW_HASTY_FIRE_IN_THE_HOLE
-        MaxLevel: 5
-        Requires:
-          - Name: NW_BASIC_GRENADE
-            Level: 3
-      - Name: NW_GRENADES_DROPPING
-        MaxLevel: 5
-        Requires:
-          - Name: NW_HASTY_FIRE_IN_THE_HOLE
-            Level: 3
-      - Name: NW_AUTO_FIRING_LAUNCHER
-        MaxLevel: 5
-        Requires:
-          - Name: NW_GRENADES_DROPPING
-            Level: 3
-      - Name: NW_MISSION_BOMBARD
-        MaxLevel: 10
-        Requires:
-          - Name: NW_GRENADE_MASTERY
-            Level: 5
-          - Name: NW_GRENADES_DROPPING
-            Level: 3
-  - Job: Hyper_Novice
-    Inherit:
-      Novice: true
-      Supernovice: true
-      Super_Novice_E: true
-    Tree:
-      - Name: HN_SELFSTUDY_TATICS
-        MaxLevel: 10
-      - Name: HN_SELFSTUDY_SOCERY
-        MaxLevel: 10
-      - Name: HN_DOUBLEBOWLINGBASH
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_TATICS
-            Level: 5
-      - Name: HN_SHIELD_CHAIN_RUSH
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_TATICS
-            Level: 5
-      - Name: HN_METEOR_STORM_BUSTER
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_JUPITEL_THUNDER_STORM
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_JACK_FROST_NOVA
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_HELLS_DRIVE
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_MEGA_SONIC_BLOW
-        MaxLevel: 10
-        Requires:
-          - Name: HN_DOUBLEBOWLINGBASH
-            Level: 7
-      - Name: HN_SPIRAL_PIERCE_MAX
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SHIELD_CHAIN_RUSH
-            Level: 7
-      - Name: HN_GROUND_GRAVITATION
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_NAPALM_VULCAN_STRIKE
-        MaxLevel: 10
-        Requires:
-          - Name: HN_SELFSTUDY_SOCERY
-            Level: 5
-      - Name: HN_BREAKINGLIMIT
-        MaxLevel: 1
-        Requires:
-          - Name: HN_DOUBLEBOWLINGBASH
-            Level: 7
-          - Name: HN_MEGA_SONIC_BLOW
-            Level: 7
-          - Name: HN_SHIELD_CHAIN_RUSH
-            Level: 7
-          - Name: HN_SPIRAL_PIERCE_MAX
-            Level: 7
-      - Name: HN_RULEBREAK
-        MaxLevel: 1
-        Requires:
-          - Name: HN_METEOR_STORM_BUSTER
-            Level: 5
-          - Name: HN_JUPITEL_THUNDER_STORM
-            Level: 5
-          - Name: HN_JACK_FROST_NOVA
-            Level: 5
-          - Name: HN_HELLS_DRIVE
-            Level: 5
-          - Name: HN_GROUND_GRAVITATION
-            Level: 5
-          - Name: HN_NAPALM_VULCAN_STRIKE
-            Level: 5
--- a/db/re/statpoint.yml
+++ b/db/re/statpoint.yml
@@ -582,33 +582,3 @@ Body:
  - Level: 250
    Points: 4099
    TraitPoints: 190
-  - Level: 251
-    Points: 4099
-    TraitPoints: 193
-  - Level: 252
-    Points: 4099
-    TraitPoints: 196
-  - Level: 253
-    Points: 4099
-    TraitPoints: 199
-  - Level: 254
-    Points: 4099
-    TraitPoints: 202
-  - Level: 255
-    Points: 4099
-    TraitPoints: 209
-  - Level: 256
-    Points: 4099
-    TraitPoints: 212
-  - Level: 257
-    Points: 4099
-    TraitPoints: 215
-  - Level: 258
-    Points: 4099
-    TraitPoints: 218
-  - Level: 259
-    Points: 4099
-    TraitPoints: 221
-  - Level: 260
-    Points: 4099
-    TraitPoints: 228
--- a/db/re/status.yml
+++ b/db/re/status.yml
@@ -165,7 +165,6 @@ Body:
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -262,7 +261,6 @@ Body:
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
-      Def: true
      Def2: true
      Regen: true
    Opt2:
@@ -786,6 +784,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      RemoveOnChangeMap: true
+    MinDuration: 5000
  - Status: Keeping
    DurationLookup: NPC_KEEPING
    CalcFlags:
@@ -1116,7 +1115,6 @@ Body:
    Icon: EFST_GROUNDMAGIC
    DurationLookup: SA_VOLCANO
    CalcFlags:
-      Batk: true
      Watk: true
      Matk: true
    Flags:
@@ -1141,14 +1139,8 @@ Body:
      NoClearance: true
  - Status: Watk_Element
    DurationLookup: MS_MAGNUM
-    Flags:
-      NoSave: true
-    EndOnStart:
-      Watk_Element: true
  - Status: Armor
    DurationLookup: NPC_DEFENDER
-    CalcFlags:
-      Speed: true
  - Status: Armor_Element_Water
    Icon: EFST_RESIST_PROPERTY_WATER
    CalcFlags:
@@ -2171,6 +2163,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Inchitrate
+    DurationLookup: NPC_POWERUP
    CalcFlags:
      Hit: true
    Flags:
@@ -2189,6 +2182,7 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
  - Status: Incfleerate
+    DurationLookup: NPC_AGIUP
    CalcFlags:
      Flee: true
    Flags:
@@ -2828,7 +2822,6 @@ Body:
    CalcFlags:
      Flee: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2837,7 +2830,6 @@ Body:
    CalcFlags:
      Watk: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2846,7 +2838,6 @@ Body:
    CalcFlags:
      MaxHp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2855,7 +2846,6 @@ Body:
    CalcFlags:
      MaxSp: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2864,7 +2854,6 @@ Body:
    CalcFlags:
      Hit: true
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@@ -2927,12 +2916,23 @@ Body:
    Icon: EFST_INVINCIBLE
    DurationLookup: NPC_INVINCIBLE
    CalcFlags:
-      Aspd: true
      Speed: true
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
+    EndOnStart:
+      Invincibleoff: true
+  - Status: Invincibleoff
+    DurationLookup: NPC_INVINCIBLEOFF
+    CalcFlags:
+      Speed: true
+    Flags:
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
+    EndOnStart:
+      Invincible: true
  - Status: Manu_Atk
    Icon: EFST_MANU_ATK
    Flags:
@@ -6076,7 +6076,6 @@ Body:
      NoBanishingBuster: true
      NoClearance: true
      NoForcedEnd: true
-      SendVal1: true
    EndReturn:
      All_Riding: true
  - Status: Teargas_Sob
@@ -7891,8 +7890,6 @@ Body:
      BlEffect: true
      DisplayPc: true
      SendVal1: true
-      NoDispell: true
-      NoClearance: true
  - Status: Shadow_Weapon
    Icon: EFST_SHADOW_WEAPON
    DurationLookup: SHC_ENCHANTING_SHADOW
@@ -7938,9 +7935,6 @@ Body:
    Flags:
      BlEffect: true
      DisplayPc: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
  - Status: Ultimate_S
    Icon: EFST_ULTIMATE_S
    DurationLookup: IG_ULTIMATE_SACRIFICE
@@ -8753,174 +8747,9 @@ Body:
    DurationLookup: MT_RUSH_QUAKE
    CalcFlags:
      All: true
-    Flags:
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
  - Status: G_LIFEPOTION
    Icon: EFST_G_LIFEPOTION
    Flags:
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
-  - Status: Hnnoweapon
-    Icon: EFST_NOEQUIPWEAPON
-    DurationLookup: HN_DOUBLEBOWLINGBASH
-  - Status: Shieldchainrush
-    Icon: EFST_SHIELDCHAINRUSH
-    DurationLookup: HN_SHIELD_CHAIN_RUSH
-    CalcFlags:
-      Speed: true
-    Flags:
-      BossResist: true
-  - Status: Mistyfrost
-    Icon: EFST_MISTYFROST
-    DurationLookup: HN_JACK_FROST_NOVA
-    Flags:
-      BossResist: true
-  - Status: Groundgravity
-    Icon: EFST_GROUNDGRAVITY
-    DurationLookup: HN_GROUND_GRAVITATION
-    CalcFlags:
-      Speed: true
-    Flags:
-      BossResist: true
-  - Status: Breakinglimit
-    Icon: EFST_BREAKINGLIMIT
-    DurationLookup: HN_BREAKINGLIMIT
-  - Status: Rulebreak
-    Icon: EFST_RULEBREAK
-    DurationLookup: HN_RULEBREAK
-  - Status: Intensive_Aim
-    Icon: EFST_INTENSIVE_AIM
-    States:
-      NoMove: true
-    CalcFlags:
-      Batk: true
-      Hit: true
-      Cri: true
-    Flags:
-      BlEffect: true
-      DisplayPc: true
-      SendVal1: true
-      NoSave: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Intensive_Aim_Count
-    Icon: EFST_INTENSIVE_AIM_COUNT
-    Flags:
-      DisplayPc: true
-      SendVal1: true
-      NoSave: true
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Grenade_Fragment_1
-    Icon: EFST_GRENADE_FRAGMENT_1
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_2
-    Icon: EFST_GRENADE_FRAGMENT_2
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_3
-    Icon: EFST_GRENADE_FRAGMENT_3
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_4
-    Icon: EFST_GRENADE_FRAGMENT_4
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_5: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_5
-    Icon: EFST_GRENADE_FRAGMENT_5
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_6: true
-  - Status: Grenade_Fragment_6
-    Icon: EFST_GRENADE_FRAGMENT_6
-    DurationLookup: NW_GRENADE_FRAGMENT
-    EndOnStart:
-      Grenade_Fragment_1: true
-      Grenade_Fragment_2: true
-      Grenade_Fragment_3: true
-      Grenade_Fragment_4: true
-      Grenade_Fragment_5: true
-  - Status: Auto_Firing_Launcher
-    Icon: EFST_AUTO_FIRING_LAUNCHEREFST
-    DurationLookup: NW_AUTO_FIRING_LAUNCHER
-    Flags:
-      SendVal1: true
-  - Status: Hidden_Card
-    Icon: EFST_HIDDEN_CARD
-    DurationLookup: NW_HIDDEN_CARD
-    CalcFlags:
-      All: true
-    Flags:
-      NoBanishingBuster: true
-      NoDispell: true
-      NoClearance: true
-  - Status: Period_Receiveitem_2nd
-    Icon: EFST_PERIOD_RECEIVEITEM_2ND
-    Flags:
-      NoRemoveOnDead: true
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-      SendVal1: true
-  - Status: Period_Plusexp_2nd
-    Icon: EFST_PERIOD_PLUSEXP_2ND
-    Flags:
-      NoRemoveOnDead: true
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-      SendVal1: true
-  - Status: Powerup
-    Icon: EFST_POWERUP
-    DurationLookup: NPC_POWERUP
-    CalcFlags:
-      Hit: true
-    Flags:
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-  - Status: Agiup
-    Icon: EFST_AGIUP
-    DurationLookup: NPC_AGIUP
-    CalcFlags:
-      Speed: true
-      Flee: true
-    Flags:
-      NoClearbuff: true
-      NoBanishingBuster: true
-      NoClearance: true
-    EndOnStart:
-      Decreaseagi: true
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -31,7 +31,7 @@ This list contains all available constants referenced in the 'bonus' commands.
 	RC2_Bio5_Swordman_Thief, RC2_Bio5_Acolyte_Merchant, RC2_Bio5_Mage_Archer, RC2_Bio5_MVP,
 	RC2_Clocktower, RC2_Thanatos, RC2_Faceworm, RC2_Hearthunter, RC2_Rockridge, RC2_Werner_Lab,
 	RC2_Temple_Demon, RC2_Illusion_Vampire, RC2_Malangdo, RC2_EP172ALPHA, RC2_EP172BETA, RC2_EP172BATH,
-	RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda, RC2_Illusion_Frozen, RC2_Illusion_Moonlight
+	RC2_Illusion_Turtle, RC2_Rachel_Sanctuary, RC2_Illusion_Luanda

 * Class (c)
 	Class_Normal, Class_Boss, Class_Guardian, Class_All
--- a/doc/mob_db.txt
+++ b/doc/mob_db.txt
@@ -204,18 +204,6 @@ AttackMotion: Attack animation motion. Low value means monster's attack will be

 ---------------------------------------

-ClientAttackMotion: The time from the start of a normal attack until the damage frame shows on client. At the same time you also get stopped on the client.
-This value is only needed if you use the "synchronize_damage" feature (battle/battle.conf).
-
-If you created a custom sprite, you want to set this value to the timing of the damage frame in your *.act file.
-In Act Editor you can set the damage frame by setting the frame sound to "atk". If you don't define a damage frame, it will default to the second to last
-frame. Also keep in mind that the Act Editor displays slightly inaccurate speed. Every 25ms in Act Editor is 24ms in reality.
-
-Example: Drops has a animation speed of 24ms per frame and the 13th frame (frame #12) is the damage frame. This means the damage shows after 12 frames.
-That's why Drops has a ClientAttackMotion of 24*12 = 288.
-
---------------------------------------
-
 DamageMotion: Damage animation motion, same as aMotion but used to display the "I am hit" animation. Coincidentally, this same value is used to determine how long it is before the monster/player can move again. Endure is dMotion = 0, obviously.

 ---------------------------------------
--- a/doc/mob_skill_db_powerskill.txt
+++ b/doc/mob_skill_db_powerskill.txt
@@ -10,8 +10,8 @@

 When a monster uses a level 10 skill on Aegis, it will be much stronger than the 
 normal player version. On rAthena we reflect this by giving the monster a skill
-level above the maximum player skill level.
-The following list explains the skill specialities and the corresponding level
+level above the maximum player level.
+The following lists explains the skill specialities and the corresponding level
 which needs to be put for these skills in the mob_skill_db.

 Note: The "SkillDatabase::parseNode" template has a linear determination feature
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20240414
+//= 20130613
 //===== Description: =========================================
 //= List of available permissions and their functions.
 //============================================================
@@ -125,12 +125,6 @@ item delay, etc).

 ---------------------------------------

-*trade_unconditional
-
-Allows player to ignore the trade conditions of items (drop, trade, sell, cart, storage/gstorage, mail and auction).
-
---------------------------------------
- 
 ======================
 | 3. Command-related |
 ======================
@@ -227,6 +221,6 @@ Allows player to use the client command /macro_detector.

 *macro_register

-Allows player to use the client commands /macro_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).
+Allows player to use the client commands /maco_register (used to add new captcha) and /macro_preview (used to preview captcha by ID).

 ---------------------------------------
--- a/doc/quest_db.txt
+++ b/doc/quest_db.txt
@@ -20,30 +20,11 @@ Title: Quest title.

 TimeLimit: Amount of time before the quest expires.

-Specifying with "+" will mark how long until 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).
-Format: "d" (optional), [0-23]"h" (optional), [0-59]"mn" (optional), [0-59]"s" (optional).
+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).

-Example:
-  - Id: 2069
-    Title: Tierra Gorge Battle
-    # The quest expires 5 minutes after being taken.
-    TimeLimit: +5mn
-
-Specifying without "+" will mark the exact time the quest expires.
-Use a number followed by "d" for day(s) to shift the exact timer to the given day(s) or use the days of the week to set the expiration day,
-and "h" for hour(s), "mn" for minute(s), and "s" for second(s).
-Format: [days of the week] or "d" (optionals), [0-23]"h" (optional), [0-59]"mn" (optional), [0-59]"s" (optional).
-
-Examples:
-  - Id: 9419
-    Title: Attack Sky Fortress Invading Prontera
-    # The quest expires 3 days after being taken at 4am.
-    TimeLimit: 3d 4h
-  - Id: 5965
-    Title: "[Standby] Devil's Special"
-    # The quest expires Monday at 4am.
-    TimeLimit: Monday 4h
+Please note the number before "d" only shifts the exact timer to the given day(s).

 ---------------------------------------

--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -1,4 +1,4 @@
-//===== rAthena Documentation================================
+//===== rAthena Documentation================================
 //= rAthena Script Commands
 //===== By:==================================================
 //= rAthena Dev Team
@@ -135,26 +135,11 @@ and 'doc/mapflags.txt'.
 <map name>{,<x>{,<y>{,<xs>{,<ys>}}}}%TAB%monster%TAB%<monster name>{,<monster level>}%TAB%<mob id>,<amount>{,<delay1>{,<delay2>{,<event>{,<mob size>{,<mob ai>}}}}}

 Map name is the name of the map the monsters will spawn on. x,y are the
-coordinates where the mob should spawn. Putting zeros instead of these
-coordinates will spawn the monsters randomly.
-
-If the coordinates are non-zero and xs and ys are above 1, each monster will
-spawn in a radius around x,y. At server start, each monster will get assigned
-its own center cell adding or substracting up to (xs-1),(ys-1) from the given
-x,y coordinates. Each time a monster respawns, it will spawn in a radius around
-its personal center cell by adding or substracting up to (xs-1),(ys-1) again.
-This results in a total possible spawn area over all monsters of the spawn line
-of (xs,ys)*4-3, but with a strong bias towards the center of that area:
-2,2 - 5x5
-3,3 - 9x9
-4,4 - 13x13
-5,5 - 17x17
-etc.
-
+coordinates where the mob should spawn. If xs and ys are non-zero, they
+specify the 'radius' of a spawn-rectangle area centered at x,y.
+Putting zeros instead of these coordinates will spawn the monsters randomly.
 Note this is only the initial spawn zone, as mobs random-walk, they are free
 to move away from their specified spawn region.
-You can disable the picking of a random center cell for each monster in the
-battle config. (See /conf/battle/monster.conf::randomize_center_cell.)

 Monster name is the name the monsters will have on screen, and has no relation
 whatsoever to their names anywhere else. It's the mob id that counts, which
@@ -203,8 +188,6 @@ Natural enemies for AI monsters are normal monsters.

 Alternately, a monster spawned using 'boss_monster' instead of 'monster' is able
 to be detected on the map with the SC_BOSSMAPINFO status (used by Convex Mirror).
-A boss monster spawn with fixed coordinates will always spawn at the given 
-coordinates, even if they are blocked (e.g. by Icewall).

 ** NPC names

@@ -6608,8 +6591,7 @@ Available <type>:
 	PCBLOCK_COMMANDS			Prevent the player from using atcommands/charcommands.
 	PCBLOCK_NPCCLICK			Prevent the player from clicking/touching any NPC/shop/warp.
 	PCBLOCK_EMOTION				Prevent the player from using emotions.
-	PCBLOCK_EQUIP				Prevent the player from replacing equipment.
-	PCBLOCK_NPC				Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK|PCBLOCK_EQUIP.
+	PCBLOCK_NPC				Simulate NPC interaction. Useful for NPC with no mes window. Sum of PCBLOCK_MOVE|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_NPCCLICK.
 	PCBLOCK_ALL				Sum of all the flags.

 Examples:
@@ -8984,9 +8966,8 @@ Get info of elemental of attached player or player by char_id.
 Other info can be obtained by 'getunitdata' command.

 Valid types are:
-   ELEMINFO_ID        Elemental ID (ID unique to elementals unit type)
-   ELEMINFO_GAMEID    Elemental Game ID
-   ELEMINFO_CLASS     Elemental Class (ID defined in elemental_db.yml)
+   0: Elemental ID
+   1: Elemental Game ID

 ---------------------------------------
 \\
@@ -11431,37 +11412,3 @@ Example:
    autoloot(10000); // 100.00%

 ---------------------------------------
-
-*setdialogalign(<align>);
-
-Set vertical or horizontal align in NPC dialog.
-Valid aligns:
- horizontal align:
-  DIALOG_ALIGN_LEFT
-  DIALOG_ALIGN_CENTER
-  DIALOG_ALIGN_RIGHT
-
- vertical align:
-  DIALOG_ALIGN_TOP
-  DIALOG_ALIGN_MIDDLE
-  DIALOG_ALIGN_BOTTOM
-
---------------------------------------
-
-*setdialogsize(<width>, <height>)
-
-Set size for NPC dialog in pixels.
-
---------------------------------------
-
-*setdialogpos(<x>, <y>)
-
-Set position for NPC dialog in pixels.
-
---------------------------------------
-
-*setdialogpospercent(<x>, <y>)
-
-Set position for NPC dialog in screen size percent.
-
---------------------------------------
--- a/doc/status.txt
+++ b/doc/status.txt
@@ -196,14 +196,9 @@ Options: Special option/client effect state when status is active.
 Flags: Various status flags for specific status change events.

 	None                  - No special flag. (Default)
-	BlEffect              - Flag to send a visual effect to clients around if the affected unit is BL_PC, BL_HOM, BL_MER, BL_MOB, BL_ELEM or BL_NPC when the status is given.
-	                        The status must have an EFST defined in Icon - other than EFST_BLANK.
-	                        When not defined (default) the status is displayed to clients around when the affected unit is BL_PC (player) only.
-	DisplayPc             - Whether the status is displayed (again) to client around when the affected unit (BL_PC) appears in the client's range.
-	DisplayNpc            - Whether the status is displayed (again) to client around when the affected unit (BL_NPC) appears in the client's range.
-	DisplayMob            - Whether the status is displayed (again) to client around when the affected unit (BL_MOB) appears in the client's range.
-	DisplayAll            - Whether the status is displayed (again) to client around when the affected unit (BL_PC, BL_HOM, BL_MER, BL_MOB, BL_ELEM, BL_NPC or BL_PET) appears in the client's range.
-	                        When defined, other display flags are ignored.
+	BlEffect              - Status should have BL_SCEFFECT as relevant effect, must have an EFST (displays on BL_PC, BL_HOM, BL_MER, BL_MOB, BL_ELEM). BL_PC is the default value.
+	DisplayPc             - Displays status effect when player logs in.
+	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.
 	OverlapIgnoreLevel    - The status will successfully activate for any level if the status is already active.
@@ -213,9 +208,9 @@ Flags: Various status flags for specific status change events.
 	MobLoseTarget         - When active on a monster it will lose the target.
 	RestartOnMapWarp      - Restarts the timer of a status when warping to another map.
 	SpreadEffect          - Passes the status onto a target when SC_DEADLYINFECT is active.
-	SendVal1              - Whether val1 shouldn't be ignored.
-	SendVal2              - Whether val2 shouldn't be ignored.
-	SendVal3              - Whether val3 shouldn't be ignored.
+	SendVal1              - Notifies the client of a status change (val1).
+	SendVal2              - Notifies the client of a status change (val2).
+	SendVal3              - Notifies the client of a status change (val3).

 	NoClearbuff           - Cannot be removed by 'status_change_clear_buffs()', 'sc_end SC_ALL', 'status_change_clear(3)', etc.
 	NoForcedEnd           - Cannot be removed by sc_end.
--- a/doc/status_change.txt
+++ b/doc/status_change.txt
@@ -2832,13 +2832,3 @@ SC_WEAPONBREAKER
 	desc: Bonus given when using NPC_WEAPONBRAKER skill
 	val1: Skill level
 	val2: val1 * 2 weapon break chance
-
-SC_POWERUP
-	desc: Increases ATKpercent and Hit.
-	val1: + ATKpercent
-	val2: +% Hit
-
-SC_AGIUP
-	desc: Increase Speed and Flee.
-	val1: +% Walkspeed
-	val2: +% Flee
--- a/doc/yaml/db/license.yml
+++ b/doc/yaml/db/license.yml
@@ -1,5 +1,5 @@
 # This file is a part of rAthena.
-#   Copyright(C) 2024 rAthena Development Team
+#   Copyright(C) 2023 rAthena Development Team
 #   https://rathena.org - https://github.com/rathena
 #
 # This program is free software: you can redistribute it and/or modify
--- a/doc/yaml/db/mob_db.yml
+++ b/doc/yaml/db/mob_db.yml
@@ -39,7 +39,6 @@
 #   WalkSpeed               Walk speed. (Default: DEFAULT_WALK_SPEED)
 #   AttackDelay             Attack speed. (Default: 0)
 #   AttackMotion            Attack animation speed. (Default: 0)
-#   ClientAttackMotion      Client attack speed. (Default: AttackMotion)
 #   DamageMotion            Damage animation speed. (Default: 0)
 #   DamageTaken             Rate at which the monster will receive incoming damage. (Default: 100)
 #   Ai                      Aegis monster type AI behavior. (Default: 06)
--- a/doc/yaml/sql/mob_db.sql
+++ b/doc/yaml/sql/mob_db.sql
@@ -60,9 +60,6 @@ CREATE TABLE `mob_db` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db2.sql
+++ b/doc/yaml/sql/mob_db2.sql
@@ -60,9 +60,6 @@ CREATE TABLE `mob_db2` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db2_re.sql
+++ b/doc/yaml/sql/mob_db2_re.sql
@@ -62,9 +62,6 @@ CREATE TABLE `mob_db2_re` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/doc/yaml/sql/mob_db_re.sql
+++ b/doc/yaml/sql/mob_db_re.sql
@@ -62,9 +62,6 @@ CREATE TABLE `mob_db_re` (
  `racegroup_ep172alpha` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172beta` tinyint(1) unsigned DEFAULT NULL,
  `racegroup_ep172bath` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_turtle` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_rachel_sanctuary` tinyint(1) unsigned DEFAULT NULL,
-  `racegroup_illusion_luanda` tinyint(1) unsigned DEFAULT NULL,
  `element` varchar(24) DEFAULT NULL,
  `element_level` tinyint(4) unsigned DEFAULT NULL,
  `walk_speed` smallint(6) unsigned DEFAULT NULL,
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -263,26 +263,6 @@ function	script	F_CashSiegeTele	{
 	return;
 }

-// Siege Teleport Scroll 2 (WoE 1.5)
-//============================================================ 
-// - Warp player to selected guild castle.
-// - No arguments.
-function	script	F_CashSiegeTele2	{
-	switch(select("Mardoll (arug_cas01):Cyr (arug_cas02):Horn (arug_cas03):Gefn (arug_cas04):Badanis (arug_cas05):Himinn (schg_cas01):Andlangr (schg_cas02):Vidblainn (schg_cas03):Hljod (schg_cas04):Schatirnil (schg_cas05)")) {
-	case 1: warp "aru_gld",159,272; end;
-	case 2: warp "aru_gld",86,50; end;
-	case 3: warp "aru_gld",63,157; end;
-	case 4: warp "aru_gld",307,354; end;
-	case 5: warp "aru_gld",298,110; end;
-	case 6: warp "sch_gld",300,100; end;
-	case 7: warp "sch_gld",284,249; end;
-	case 8: warp "sch_gld",102,196; end;
-	case 9: warp "sch_gld",140,83; end;
-	case 10: warp "sch_gld",70,320; end;
-	}
-	return;
-}
-
 // Curious Snowball
 //============================================================ 
 // - You can get an effect of Restore, Endure, or Wing of Butterfly.
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -191,7 +191,7 @@ dewata,114,243,6	script	Lazy Young Man#dew	536,1,1,{
 			mes "[Lazy Young Man]";
 			mes "Really? For me?? I'll give you this in return... Thanks... Hehe~";
 			delitem 11534,1; //Coco_Juice
-			getgroupitem(IG_GiftBox);
+			getrandgroupitem(IG_GiftBox),1;
 			close;
 		case 2:
 			mes "[Lazy Young Man]";
--- a/npc/re/instances/MazeofOz.txt
+++ b/npc/re/instances/MazeofOz.txt
@@ -1,615 +0,0 @@
-//===== rAthena	script	=======================================
-//= Instance: The Maze of Oz.
-//===== Description: =========================================
-//- [Walkthrough conversion]
-//- Part of the episode 18.1 main quest.
-//===== Changelogs: ==========================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-// Main Quest: Step 28.
-ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{ 
-	.@md_name$ = "The Maze of Oz";
-
-	if (ep18_1_main == 29) {
-		mes "[Miriam in disguise]";
-		mes "From now on <FONT SIZE = 14><B>^e5555e" + .@md_name$ + "^000000</FONT></B>";
-		mes "^e5555ePrepare yourself and talk to me again^000000";
-		cutin "ep18_merchant.png",2;
-		changequest 11717,11719;
-		ep18_1_main = 30;
-		close3;
-	}
-	if (ep18_1_main == 30) {
-		mes "[Miriam in disguise]";
-		mes "Then I'll start the ^e5555e" + .@md_name$ + "^000000";
-		next;
-		if (getcharid(1) == 0 || is_party_leader() == false) {
-			mes "[Miriam in disguise]";
-			mes "I think it would be a good idea to form a ^ff0000party before enter ^000000..";
-			close;
-		}
-		switch( select( "Open the door", "Enter", "Stop" ) ) {
-		case 1:
-			if (instance_create(.@md_name$) < 0) {
-				mes "Party: " + getpartyname(getcharid(1)) + "";
-				mes "Leader: " + strcharinfo(0) + "";
-				mes "^0000ff" + .@md_name$ + " ^000000- Unknown error";
-				close;
-			}
-			mes "[Miriam in disguise]";
-			mes "You'd better wait a little before you go in.";
-			close;
-		case 2:
-			switch( instance_enter(.@md_name$) ) {
-			case IE_OTHER:
-				mes "[Miriam in disguise]";
-				mes "^ff0000An unknown error occurred.^000000";
-				close;
-			case IE_NOINSTANCE:
-				mes "[Miriam in disguise]";
-				mes "^ff0000Your party leader has not yet created the dungeon.^000000";
-				close;
-			case IE_NOMEMBER:
-				mes "[Miriam in disguise]";
-				mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
-				close;
-			case IE_OK:
-				mapannounce "ra_fild10", "" + strcharinfo(0) + " of the party, " + getpartyname( getcharid(1) ) + ", is entering " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL ,12;
-				end;
-			}
-		case 3:
-			end;
-		}
-	}
-	cutin "ep18_merchant.png",2;
-	mes "[Vendor]";
-	mes "Someone must have been around here, but they just disappeared. Where did they go?";
-	close3; 
-
-OnInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11717) == 1" );
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
-	end;
-}
-
-// Step 1
-1@oz,284,164,3	script	Rope#outoz	4_ROPEPILE,{
-	mes "I think I can climb up with a rope.";
-	next;
-	if (select( "Use a rope to climb", "Do not use" ) == 2)
-		end;
-	warp "ra_fild10",180,174;
-	end;
-}
-
-1@oz,282,175,3	script	Miriam#ozmd1	4_EP18_MIRIAM,{
-	if ('event_oz != 0)
-		end;
-	'event_oz = 1;
-	.@miriam1$ = instance_npcname("Miriam#ozmd1");
-	.@maggi1$ = instance_npcname("Magi#ozmd1");
-	.@mark1$ = instance_npcname("Mark#ozmd1");
-	.@tamarin1$ = instance_npcname("Tamarin#ozmd1");
-	.@miriam2$ = instance_npcname("Miriam#ozmd2");
-
-	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: This is the entrance to the labyrinth of Oz.", .@miriam1$;
-	cutin "ep18_miriam_03.png",2;
-	sleep2 2000;
-	npctalk "Miriam: Everyone, please move carefully.", .@miriam1$;
-	sleep2 2000;
-	npctalk "Magi: Something hot and dusty...", .@maggi1$;
-	cutin "4job_maggi_02.PNG",2;
-	enablenpc .@maggi1$;
-	enablenpc .@mark1$;
-	enablenpc .@tamarin1$;
-	sleep2 2000;
-	npctalk "Mark: Are you okay?", .@mark1$;
-	cutin "ep18_mark_01.png",2;
-	sleep2 2000;
-	npctalk "Miriam: There is lava flowing right below it, always scattering ashes.", .@miriam1$;
-	cutin "ep18_miriam_03.png",2;
-	sleep2 2000;
-	npctalk "Miriam: Beware there may be embers in the lava ash.", .@miriam1$;
-	sleep2 2000;
-	npctalk "Miriam: If you inhale incorrectly, you will burn your lungs.", .@miriam1$;
-	sleep2 2000;
-	npctalk "Miriam: There don't seem to be any monsters around here, so it's better to move slowly and check the situation again.", .@miriam1$;
-	sleep2 2000;
-	npctalk "Miriam: Please follow the road to the north first.", .@miriam1$;
-	sleep2 2000;
-	cutin "",255;
-	setpcblock PCBLOCK_NPC, false;
-
-	disablenpc .@maggi1$;
-	disablenpc .@mark1$;
-	disablenpc .@tamarin1$;
-	disablenpc .@miriam1$;
-	enablenpc .@miriam2$;
-	end;
-}
-
-1@oz,279,175,5	duplicate(dummy_npc)	Magi#ozmd1	4_4JOB_MAGGI
-1@oz,280,175,3	duplicate(dummy_npc)	Mark#ozmd1	4_EP18_MARK
-1@oz,279,177,3	duplicate(dummy_npc)	Tamarin#ozmd1	4_EP18_TAMARIN
-
-
-// Step 2
-1@oz,271,272,3	script	Miriam#ozmd2	4_EP18_MIRIAM,{
-	if ('event_oz != 1)
-		end;
-	'event_oz = 2;
-	.@miriam2$ = instance_npcname("Miriam#ozmd2");
-	'miriam3$ = instance_npcname("Miriam#ozmd3");
-	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: If you cross the bridge in front of you, it's a real maze.", .@miriam2$;
-	sleep2 2000;
-	npctalk "Miriam: We must be very careful crossing the bridge, let's talk again after.", .@miriam2$;
-	sleep2 2000;
-	setpcblock PCBLOCK_NPC, false;
-	disablenpc .@miriam2$;
-	enablenpc 'miriam3$;
-	end;
-
-OnInstanceInit:
-	'miriam3_id = 0;
-	'event_oz = 0;
-
-	'map_name$ = instance_mapname("1@oz");
-	disablenpc instance_npcname("Miriam#ozmd2");
-	disablenpc instance_npcname("Miriam#ozmd3");
-	disablenpc instance_npcname("Miriam#ozmd4");
-	disablenpc instance_npcname("Maram#ozmd5");
-	disablenpc instance_npcname("Miriam#ozmd5");
-	disablenpc instance_npcname("Maram#ozmd7");
-	disablenpc instance_npcname("#oz_way");
-	disablenpc instance_npcname("Maram#ozmd6");
-	disablenpc instance_npcname("Magi#ozmd1");
-	disablenpc instance_npcname("Mark#ozmd1");
-	disablenpc instance_npcname("Tamarin#ozmd1");
-	disablenpc instance_npcname("Magi#ozmd3");
-	disablenpc instance_npcname("Mark#ozmd3");
-	disablenpc instance_npcname("Tamarin#ozmd3");
-	disablenpc instance_npcname("Maram#ozmd4");
-	disablenpc instance_npcname("Magi#ozmd5");
-	disablenpc instance_npcname("Mark#ozmd5");
-	disablenpc instance_npcname("Tamarin#ozmd5");
-	disablenpc instance_npcname("Maram#ozmd8");
-	disablenpc instance_npcname("Magi#ozmd6");
-	disablenpc instance_npcname("Mark#ozmd6");
-	disablenpc instance_npcname("Tamarin#ozmd6");
-	disablenpc instance_npcname("Miriam#ozmd7");
-	disablenpc instance_npcname("Imril#ozmd7");
-	end;
-}
-
-
-// Step 3
-1@oz,241,272,3	script	Miriam#ozmd3	EP18_NPC_MIRIAM,{
-	if ('event_oz != 2)
-		end;
-	'event_oz = 3;
-	'miriam3$ = instance_npcname("Miriam#ozmd3");
-	.@maggi3$ = instance_npcname("Magi#ozmd3");
-	.@mark3$ = instance_npcname("Mark#ozmd3");
-	.@tamarin3$ = instance_npcname("Tamarin#ozmd3");
-
-	setpcblock PCBLOCK_NPC, true;
-	npctalk "Miriam: This bridge is dangerous, so it's best to split your luggage and cross in turn.", 'miriam3$;
-	sleep2 2000;
-	npctalk "Miriam: Then I will cross first, so please follow slowly. It will help not to look under your feet.", 'miriam3$;
-	sleep2 2000;
-	npctalk "Tamarin: Wow I can't see the bottom.", .@tamarin3$;
-	enablenpc .@maggi3$;
-	enablenpc .@mark3$;
-	enablenpc .@tamarin3$;
-	sleep2 2000;
-	npctalk "Magi: Your legs look very old...", .@maggi3$;
-	sleep2 2000;
-	npctalk "Mark: Everyone be careful", .@mark3$;
-	sleep2 2000;
-	setpcblock PCBLOCK_NPC, false;
-	disablenpc .@maggi3$;
-	disablenpc .@mark3$;
-	disablenpc .@tamarin3$;
-	'miriam3_id = getnpcid(0);
-
-	unitwalk 'miriam3_id,231,272, 'miriam3$ + "::OnEvent1"; // several events are required to palliate to our too short value of MAX_WALKPATH (32) used to calculate the pathing
-	end;
-OnEvent1:
-	unitwalk 'miriam3_id,211,272, 'miriam3$ + "::OnEvent2";
-	end;
-OnEvent2:
-	unitwalk 'miriam3_id,191,272, 'miriam3$ + "::OnEvent3";
-	end;
-OnEvent3:
-	unitwalk 'miriam3_id,171,272, 'miriam3$ + "::OnEvent4";
-	end;
-OnEvent4:
-	unitwalk 'miriam3_id,157,272, 'miriam3$ + "::OnEvent5";
-	end;
-OnEvent5:
-	disablenpc 'miriam3$;
-	enablenpc instance_npcname("Miriam#ozmd4");
-	enablenpc instance_npcname("Ash Toad#ozmd1");
-	end;
-}
-
-1@oz,245,272,3	duplicate(dummy_npc)	Magi#ozmd3	4_4JOB_MAGGI
-1@oz,244,273,3	duplicate(dummy_npc)	Mark#ozmd3	4_EP18_MARK
-1@oz,244,270,3	duplicate(dummy_npc)	Tamarin#ozmd3	4_EP18_TAMARIN
-
-
-// Step 4 + 5
-1@oz,157,272,3	script	Miriam#ozmd4	4_EP18_MIRIAM,{
-	if ('event_oz != 3)
-		end;
-	'event_oz = 4;
-
-	.@miriam4$ = instance_npcname("Miriam#ozmd4");
-	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
-	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Magi#ozmd4");
-	.@mark4$ = instance_npcname("Mark#ozmd4");
-	.@ashtoad3$ = instance_npcname("Ash Toad#ozmd3");
-
-	setpcblock PCBLOCK_NPC, true;
-	mapannounce 'map_name$, "Miriam: Ah!! A monster!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 1500;
-	mapannounce 'map_name$, "Miriam: I'll take this rude bastard.", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 1500;
-	mapannounce 'map_name$, "Tamarin: Appeared in the back!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 2000;
-	enablenpc .@tamarin4$;
-	sleep2 500;
-	enablenpc .@ashtoad2$;
-	mapannounce 'map_name$, "Magi: Crazy!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 500;
-	enablenpc .@maggi4$;
-	enablenpc .@mark4$;
-	mapannounce 'map_name$, "Mark: Please support me in the front!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 1000;
-	'mob_count_oz = 0;
-	monster 'map_name$,145,274,"Ash Toad",21295,1, .@miriam4$ + "::OnMobDead"; // EP18_ASH_TOAD
-	enablenpc .@ashtoad3$;
-	monster 'map_name$,143,278,"Ash Toad",21295,1, .@miriam4$ + "::OnMobDead"; // EP18_ASH_TOAD
-	setpcblock PCBLOCK_NPC, false;
-	end;
-
-// Note: on official the event seems to start right after killing the 2 mobs. The character can't move.
-// There is no OnTouch area, a character outside the npc range can't see the dialog. Intended ?
-OnMobDead:
-	'mob_count_oz++;
-	if ('mob_count_oz < 2)
-		end;
-	if ('event_oz != 4)
-		end;
-	'event_oz = 5;
-
-	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
-	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Magi#ozmd4");
-	.@mark4$ = instance_npcname("Mark#ozmd4");
-	.@ashtoad3$ = instance_npcname("Ash Toad#ozmd3");
-	.@maram4$ = instance_npcname("Maram#ozmd4");
-	.@ashtoad1$ = instance_npcname("Ash Toad#ozmd1");
-	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
-	.@miriam4$ = instance_npcname("Miriam#ozmd4");
-
-	setpcblock PCBLOCK_NPC, true;
-	npctalk "Tamarin: I did it!!!", .@tamarin4$;
-	disablenpc .@ashtoad2$;
-	sleep2 2000;
-	npctalk "Magi: Me too!!", .@maggi4$;
-	disablenpc .@ashtoad3$;
-	sleep2 2000;
-	npctalk "Miriam: Huh It wasn't a great monster, but it would have been dangerous if they were ordinary merchants.", .@miriam4$;
-	disablenpc .@ashtoad1$;
-	sleep2 2000;
-	npctalk "Maram : " + strcharinfo(0) + " Are you okay?", .@maram4$;
-	enablenpc .@maram4$;
-	sleep2 2000;
-	npctalk "Miriam: You're late! Maram!!!", .@miriam4$;
-	sleep2 2000;
-	npctalk "Maram: I met a monster on the way, so I'm a little late.", .@maram4$;
-	sleep2 2000;
-	npctalk "Miriam: There were no monsters on the road we passed earlier.", .@miriam4$;
-	sleep2 2000;
-	npctalk "Maram: Yeah? Where the hell do monsters spring up like this...", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: It's a big deal because it's getting harder and harder to move goods because of these monsters.", .@maram4$;
-	sleep2 2000;
-	npctalk "Tamarin: If you go to the ground?", .@tamarin4$;
-	sleep2 2000;
-	npctalk "Tamarin: I heard there used to be a bridge to cross a canyon?", .@tamarin4$;
-	sleep2 2000;
-	npctalk "Tamarin: Because there are still remains...", .@tamarin4$;
-	sleep2 2000;
-	npctalk "Maram: It is said that the bridge above was destroyed when they saw the natives crossing to escape the hardliners' attacks.", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: The land across the bridge has become uninhabitable due to volcanic ash, so it must have been the intention to dry it to death.", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: It's not difficult to make a bridge again...", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: You can't advertise that you're hiding here by making a bridge because you're in hiding.", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: It's dangerous and inconvenient right now, but I have no choice but to use the maze of Oz.", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: In this state, it may not have been noticed until now.", .@maram4$;
-	sleep2 2000;
-	npctalk "Miriam: Without the Maze of Oz...", .@miriam4$;
-	sleep2 2000;
-	npctalk "Miriam: It must have been a lot harder than it is now.", .@miriam4$;
-	sleep2 2000;
-	npctalk "Maram: That's right", .@maram4$;
-	sleep2 2000;
-	npctalk "Maram: Now, shall we walk the lovely maze of Oz again?", .@maram4$;
-	sleep2 2000;
-	npctalk "Miriam: What do you mean", .@miriam4$;
-	sleep2 2000;
-	npctalk "Miriam : " + strcharinfo(0) + " From now on, go all the way down until you come to a fork.", .@miriam4$;
-	sleep2 2000;
-	npctalk "Miriam: It would be nice if the monsters didn't appear...", .@miriam4$;
-	sleep2 1000;
-	disablenpc .@maram4$;
-	setpcblock PCBLOCK_NPC, false;
-
-	disablenpc .@maggi4$;
-	disablenpc .@mark4$;
-	disablenpc .@tamarin4$;
-	disablenpc .@miriam4$;
-	enablenpc instance_npcname("Maram#ozmd5");
-	end;
-}
-
-1@oz,156,272,5	duplicate(dummy_disabled_npc)	Ash Toad#ozmd1	EP18_ASH_TOAD
-1@oz,164,272,3	duplicate(dummy_disabled_npc)	Ash Toad#ozmd2	EP18_ASH_TOAD
-1@oz,153,275,5	duplicate(dummy_disabled_npc)	Ash Toad#ozmd3	EP18_ASH_TOAD
-1@oz,155,275,3	duplicate(dummy_disabled_npc)	Magi#ozmd4	4_4JOB_MAGGI
-1@oz,156,274,3	duplicate(dummy_disabled_npc)	Mark#ozmd4	4_EP18_MARK
-1@oz,161,272,5	duplicate(dummy_disabled_npc)	Tamarin#ozmd4	4_EP18_TAMARIN
-
-1@oz,162,275,3	duplicate(dummy_npc)	Maram#ozmd4	4_EP18_MARAM
-
-
-// Step 6
-1@oz,98,172,3	script	Maram#ozmd5	EP18_NPC_MARAM,{
-	if ('event_oz != 5)
-		end;
-	'event_oz = 6;
-	.@miriam$ = instance_npcname("Miriam#ozmd5");
-	.@maram$ = instance_npcname("Maram#ozmd5");
-
-	enablenpc .@miriam$;
-	enablenpc instance_npcname("Magi#ozmd5");
-	enablenpc instance_npcname("Mark#ozmd5");
-	enablenpc instance_npcname("Tamarin#ozmd5");
-	npctalk "Maram: It wasn't like this before, but maybe it's the effect of Tor Volcano, as the ground below starts to melt, so more monsters are appearing.";
-	setpcblock PCBLOCK_NPC, true;
-	sleep2 2000;
-	npctalk "Maram: Especially in areas with a lot of molten ground, when trying to avoid monsters, the lava Because there are many people who are seriously injured or never come back...  ";
-	sleep2 2000;
-	npctalk "Maram: How long will the maze of Oz last...";
-	sleep2 3000;
-	mapannounce 'map_name$, "??? : ugh!!!!!!!!!!!!!!!!!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
-	sleep2 2000;
-	npctalk "Maram: This voice?!?!?!?!?";
-	sleep2 2000;
-	npctalk "Miriam: Imril!!!!", .@miriam$;
-	sleep2 2000;
-	setpcblock PCBLOCK_NPC, false;
-	npctalk "Maram: I think your friend is in trouble! I'll go first, so please follow me carefully!";
-	disablenpc instance_npcname("Magi#ozmd5");
-	disablenpc instance_npcname("Mark#ozmd5");
-	disablenpc instance_npcname("Tamarin#ozmd5");
-	unitwalk getnpcid(0),68,165, .@maram$ + "::OnMove";
-	donpcevent .@miriam$ + "::OnMove";
-	end;
-OnMove:
-	disablenpc instance_npcname("Maram#ozmd5");
-	enablenpc instance_npcname("Maram#ozmd7");
-	enablenpc instance_npcname("Imril#ozmd6");
-	end;
-}
-
-1@oz,97,167,3	script	Miriam#ozmd5	EP18_NPC_MIRIAM,{
-	end;
-OnMove:
-	npcwalkto 67,164;
-	end;
-}
-
-1@oz,92,170,3	duplicate(dummy_npc)	Magi#ozmd5	4_4JOB_MAGGI
-1@oz,91,169,3	duplicate(dummy_npc)	Mark#ozmd5	4_EP18_MARK
-1@oz,89,170,5	duplicate(dummy_npc)	Tamarin#ozmd5	4_EP18_TAMARIN
-
-
-
-// Step 7
-1@oz,68,165,3	script	Maram#ozmd7	4_EP18_MARAM,{
-	if ('event_oz != 6)
-		end;
-	'event_oz = 7;
-	npctalk "Maram: Are you okay, Imril?";
-	donpcevent instance_npcname("Imril#ozmd6") + "::OnStart";
-	disablenpc instance_npcname("Maram#ozmd7");
-	end;
-}
-
-
-// Step 8
-1@oz,61,163,5	script	Imril#ozmd6	4_EP18_IMRIL,{
-	end;
-
-OnStart:
-	'mob_count_oz = 0;
-	.@npc_name$ = instance_npcname("Imril#ozmd6");
-	monster 'map_name$,64,164,"Ash Toad",21295,1, .@npc_name$ + "::OnMobDead"; // EP18_ASH_TOAD
-	monster 'map_name$,62,161,"rake hand",21296,1, .@npc_name$ + "::OnMobDead"; // EP18_RAKEHAND
-	end;
-
-OnMobDead:
-	'mob_count_oz++;
-	if ('mob_count_oz < 2)
-		end;
-	if ('event_oz != 7)
-		end;
-	'event_oz = 8;
-
-	.@maram8$ = instance_npcname("Maram#ozmd8");
-	.@imril6$ = instance_npcname("Imril#ozmd6");
-	.@miriam5$ = instance_npcname("Miriam#ozmd5");
-	.@maggi6$ = instance_npcname("Magi#ozmd6");
-	.@mark6$ = instance_npcname("Mark#ozmd6");
-	.@tamarin6$ = instance_npcname("Tamarin#ozmd6");
-
-	setpcblock PCBLOCK_NPC, true;
-	enablenpc .@maram8$;
-	npctalk "Imril: Thanks! We almost died!", .@imril6$;
-	sleep2 2000;
-	npctalk "Imril: Don't go downstairs because the atmosphere isn't too bad.", .@imril6$;
-	sleep2 2000;
-	npctalk "Miriam: You seem to see monsters more often than last time.", .@miriam5$;
-	sleep2 2000;
-	npctalk "Imril: But what about those people?", .@imril6$;
-	enablenpc .@maggi6$;
-	enablenpc .@mark6$;
-	enablenpc .@tamarin6$;
-	sleep2 2000;
-	npctalk "Maram: They are adventurers who sometimes help with mother's work.", .@maram8$;
-	sleep2 2000;
-	npctalk "Maram: Trustworthy people, don't be so wary.", .@maram8$;
-	sleep2 2000;
-	npctalk "Imril: Because you trust people too easily.", .@imril6$;
-	sleep2 2000;
-	npctalk "Miriam: Yes.", .@miriam5$;
-	sleep2 2000;
-	npctalk "Maram: Anyway, let's escape before more monsters come out.", .@maram8$;
-	sleep2 2000;
-	npctalk "Maram: Not long left.", .@maram8$;
-	sleep2 2000;
-	npctalk "Maram: It's hard to see, but just follow the road up here!", .@maram8$;
-	sleep2 2000;
-	npctalk "Tamarin: I think this is the way!", .@tamarin6$;
-	disablenpc .@maggi6$;
-	disablenpc .@mark6$;
-	disablenpc .@tamarin6$;
-	disablenpc .@maram8$;
-	enablenpc instance_npcname("#oz_way");
-	setpcblock PCBLOCK_NPC, false;
-	end;
-}
-
-1@oz,68,165,3	duplicate(dummy_npc)	Maram#ozmd8	4_EP18_MARAM
-1@oz,61,168,3	duplicate(dummy_npc)	Magi#ozmd6	4_4JOB_MAGGI
-1@oz,65,167,3	duplicate(dummy_npc)	Mark#ozmd6	4_EP18_MARK
-1@oz,59,171,3	duplicate(dummy_npc)	Tamarin#ozmd6	4_EP18_TAMARIN
-
-
-
-// Step 9
-1@oz,58,256,5	script	#oz_way	1_SHADOW_NPC,3,3,{
-	end;
-OnTouch:
-	if ('event_oz != 8)
-		end;
-	'event_oz = 9;
-	enablenpc instance_npcname("Maram#ozmd6");
-	end;
-}
-
-// Step 10 (maybe not required ?)
-1@oz,44,255,5	script	Maram#ozmd6	4_EP18_MARAM,{
-	if ('event_oz != 9)
-		end;
-	'event_oz = 10;
-	npctalk "Maram: This way!!!";
-	initnpctimer;
-	end;
-OnTimer2000:
-	disablenpc instance_npcname("Maram#ozmd6");
-	enablenpc instance_npcname("Maram#ozmd9");
-	enablenpc instance_npcname("Rope#outoz2");
-	end;
-}
-
-// Step 11
-// (Step 29 on the main quest).
-1@oz,21,189,5	script	Maram#ozmd9	4_EP18_MARAM,{
-	if ('event_oz != 10)
-		end;
-	'event_oz = 11;
-
-	.@maram9$ = instance_npcname("Maram#ozmd9");
-	.@miriam7$ = instance_npcname("Miriam#ozmd7");
-	.@imril7$ = instance_npcname("Imril#ozmd7");
-
-	setpcblock PCBLOCK_NPC, true;
-	npctalk "Maram: Climb up the rope in front of this to get out.", .@maram9$;
-	enablenpc .@miriam7$;
-	enablenpc .@imril7$;
-	sleep2 2000;
-	npctalk "Imril: I'll go get some hidden stuff here, so go up first.", .@imril7$;
-	sleep2 2000;
-	npctalk "Miriam: Everyone is very tired. Let's go upstairs.", .@miriam7$;
-	if (ep18_1_main == 30) {
-		changequest 11719,11720;
-		ep18_1_main = 31;
-	}
-	disablenpc .@miriam7$;
-	disablenpc .@imril7$;
-	setpcblock PCBLOCK_NPC, false;
-	end;
-
-OnInstanceInit:
-	disablenpc instance_npcname("Maram#ozmd9");
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
-	end;
-}
-
-1@oz,22,187,5	duplicate(dummy_npc)	Miriam#ozmd7	4_EP18_MIRIAM
-1@oz,16,185,3	duplicate(dummy_npc)	Imril#ozmd7	4_EP18_IMRIL
-
-
-// Step 12
-1@oz,28,190,3	script(DISABLED)	Rope#outoz2	4_ROPEPILE,{
-	if ('event_oz < 11)
-		end;
-	mes "I think I can climb up with a rope.";
-	next;
-	switch( select( "Use a rope to climb", "Do not use" ) ) {
-	case 1:
-		close2;
-		warp "gw_fild01",275,337;
-		end;
-	case 2:
-		end;
-	}
-	end;
-
-OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11720) == 1" );
-	end;
-}
-
-
-// Spawn monsters
-1@oz,22,207,5	script	#oz01	1_SHADOW_NPC,4,4,{
-	end;
-OnTouch_:
-	getmapxy .@map$,.@x,.@y, BL_NPC;
-	monster 'map_name$,.@x-1,.@y,"Ash Toad",21295,1;	// EP18_ASH_TOAD
-	monster 'map_name$,.@x+1,.@y,"Rake Hand",21296,1;	// EP18_RAKEHAND
-	disablenpc instance_npcname( strnpcinfo(0) );
-	end;
-}
-
-1@oz,30,237,5	duplicate(#oz01)	#oz02	1_SHADOW_NPC,4,4
-1@oz,44,264,5	duplicate(#oz01)	#oz03	1_SHADOW_NPC,4,4
-1@oz,62,247,5	duplicate(#oz01)	#oz04	1_SHADOW_NPC,4,4
-1@oz,72,222,5	duplicate(#oz01)	#oz05	1_SHADOW_NPC,4,4
-1@oz,79,203,5	duplicate(#oz01)	#oz06	1_SHADOW_NPC,4,4
-1@oz,124,261,5	duplicate(#oz01)	#oz07	1_SHADOW_NPC,4,4
-1@oz,139,279,5	duplicate(#oz01)	#oz08	1_SHADOW_NPC,4,4
-
--- a/npc/re/instances/ThorGunsuBase.txt
+++ b/npc/re/instances/ThorGunsuBase.txt
@@ -1,462 +0,0 @@
-//===== rAthena Script =======================================
-//= Instance: Thor Gunsu Base.
-//===== Description: =========================================
-//- [Walkthrough conversion]
-//- Part of the episode 18.1 main quest.
-//===== Changelogs: ==========================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-// Main Quest: Step 47.
-que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
-	if (ep18_1_main != 45 && ep18_1_main != 46)
-		end;
-	if (ep18_1_main == 45) {
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "You have arrived, adventurer!";
-		mes "You did a great job getting here.";
-		next;
-		cutin "ep18_maram_03.png",2;
-		mes "[Maram]";
-		mes "After all, it looks like this next one is real. The guards are different from before...";
-		mes "Let's look inside, being careful not to be caught by the guards.";
-		next;
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "Make sure to move out of sight of the guards as much as possible.";
-		mes "If you make a mistake, you will be attacked, so if you don't break through, we'll meet again here.";
-		changequest 16577,16578;
-		ep18_1_main = 46;
-		next;
-	}
-	else if (ep18_1_main == 46) {
-		mes "[Maram]";
-		mes "Let's try to get in as far as possible from the guard tower.";
-		next;
-	}
-
-	.@md_name$ = "Thor Gunsu Base";
-	cutin "",255;
-	mes "^FF0000 Any arbitrary processing such as taming monsters in the dungeon is not considered normal. Please note.^000000";
-	next;
-	// player has party
-	if (is_party_leader()) {
-		// player is leader of the party
-		.@create$ = "Open " + .@md_name$;
-	}
-	switch( select( .@create$, .@md_name$ + " entry" ) ) {
-	case 1:
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "When the application is complete, talk to me again and select ^0000CD Thor military base entry^000000";
-		if (instance_create(.@md_name$) < 0) {
-			mes "Party: " + getpartyname(getcharid(1)) + "";
-			mes "Leader: " + strcharinfo(0) + "";
-			mes "^0000ff" + .@md_name$ + " ^000000- Unknown error";
-			close3;
-		}
-		close3;
-	case 2:
-		// Note: instance not forced solo
-		switch( instance_enter(.@md_name$) ) {
-		case IE_OTHER:
-			mes "[Maram]";
-			mes "^ff0000An unknown error occurred.^000000";
-			close;
-		case IE_NOINSTANCE:
-			cutin "ep18_maram_01.png",2;
-			mes "[Maram]";
-			mes "I don't think the dungeon has been created yet? Please check later.";
-			close3;
-		case IE_NOMEMBER:
-			mes "[Maram]";
-			mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
-			close;
-		case IE_OK:
-			mapannounce "que_thr", "" + strcharinfo(0) + " of the party, " + getpartyname( getcharid(1) ) + ", is entering " + .@md_name$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
-			// warp 1@tcamp,103,237;
-			end;
-		}
-	}
-	end;
-
-OnInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16577) == 1" );
-	end;
-}
-
-1@tcamp,106,237,3	script	Maram#base1	4_EP18_MARAM,{
-	cutin "ep18_maram_01.png",2;
-	mes "[Maram]";
-	mes "Be careful and explore the inside.";
-	mes "I heard from Mr. Dandelion earlier, there aren't many people, but there are Watch Towers here and there that monitor a fairly wide area.";
-	next;
-	mes "[Maram]";
-	mes "If you get caught by the Watch Tower, soldiers will appear, so be careful not to get caught.";
-	mes "Well, if you find something, please contact me!";
-	close3;
-
-OnInstanceInit:
-	'map_tcamp$ = instance_mapname("1@tcamp");
-
-	disablenpc instance_npcname("Document Pile#Site1");
-	disablenpc instance_npcname("Document Pile#Site2");
-	disablenpc instance_npcname("Document Pile#Site3");
-	disablenpc instance_npcname("Document Pile#Site4");
-	disablenpc instance_npcname("Document Pile#Site5");
-	disablenpc instance_npcname("Maram#Lock1");
-	disablenpc instance_npcname("Maram#Lock2");
-	disablenpc instance_npcname("Maram#Lock3");
-	disablenpc instance_npcname("Maram#Lock4");
-
-	setcell 'map_tcamp$,137,216,142,216,cell_walkable,0;
-	setcell 'map_tcamp$,135,145,144,145,cell_walkable,0;
-	setcell 'map_tcamp$,223,105,223,110,cell_walkable,0;
-	setcell 'map_tcamp$,80,94,80,100,cell_walkable,0;
-
-	// some monsters spawn randomly
-	monster 'map_tcamp$,0,0,"Base Soldier",21310,18;	// EP18_MD_GUARD_A
-	monster 'map_tcamp$,0,0,"Base Soldier",21309,18;	// EP18_MD_THOR_GUARD
-	end;
-}
-
-// unknown npc effect
-// 1@tcamp,244,152,3	duplicate(dummy_npc)	#Remote 1	CLEAR_NPC
-
-
-//-------------------------------------------------------------------
-// Traps
-//-------------------------------------------------------------------
-1@tcamp,120,228,3	script	Watch Tower#Watch1	4_SYSTEM_BOX,7,7,{
-	end;
-OnTouch:	// note: hidden player trigger the event
-	npctalk "Detect intruders. Exclude them.";
-	mapannounce 'map_tcamp$, "Intruder detected, intruder detected. We rule out immediately.", bc_map, 0xFF0000;
-	getmapxy .@map$,.@x,.@y, BL_NPC;
-
-	areamonster 'map_tcamp$,.@x-2,.@y-2,.@x+2,.@y+2,"Base Soldier",21309,3;	// EP18_MD_THOR_GUARD
-	areamonster 'map_tcamp$,.@x-2,.@y-2,.@x+2,.@y+2,"Base Soldier",21310,3;	// EP18_MD_GUARD_A
-	end;
-OnTimer2000:
-	specialeffect EF_WARP;
-	initnpctimer;
-	end;
-OnInstanceInit:
-	initnpctimer;
-	end;
-}
-
-1@tcamp,135,228,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch2	4_SYSTEM_BOX,7,7
-1@tcamp,152,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch3	4_SYSTEM_BOX,7,7
-1@tcamp,167,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch4	4_SYSTEM_BOX,7,7
-1@tcamp,182,133,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch5	4_SYSTEM_BOX,7,7
-1@tcamp,161,96,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch6	4_SYSTEM_BOX,7,7
-1@tcamp,146,96,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch7	4_SYSTEM_BOX,7,7
-1@tcamp,116,102,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch8	4_SYSTEM_BOX,7,7
-1@tcamp,88,92,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch9	4_SYSTEM_BOX,7,7
-1@tcamp,240,148,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch10	4_SYSTEM_BOX,7,7
-1@tcamp,156,71,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch11	4_SYSTEM_BOX,7,7
-1@tcamp,176,194,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch12	4_SYSTEM_BOX,7,7
-1@tcamp,192,194,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch13	4_SYSTEM_BOX,7,7
-1@tcamp,142,153,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch14	4_SYSTEM_BOX,7,7
-1@tcamp,142,168,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch15	4_SYSTEM_BOX,7,7
-1@tcamp,192,179,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch16	4_SYSTEM_BOX,7,7
-1@tcamp,237,90,3	duplicate(Watch Tower#Watch1)	Watch Tower#Watch17	4_SYSTEM_BOX,7,7
-
-
-//-------------------------------------------------------------------
-// Walls
-//-------------------------------------------------------------------
-1@tcamp,138,216,3	script	Lock#1-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock1");
-	enablenpc .@maram$;
-	npctalk "Maram: Wait a minute. I know how to open it.", .@maram$;
-	progressbar_npc "3131FF",10;
-	npctalk "Maram: Now we can pass!", .@maram$;
-	disablenpc instance_npcname("Lock#1-1");
-	disablenpc instance_npcname("Lock#1-2");
-	disablenpc .@maram$;
-	setcell 'map_tcamp$,137,216,142,216,cell_walkable,1;
-	end;
-}
-1@tcamp,141,216,3	duplicate(Lock#1-1)	Lock#1-2	4_ROPEPILE
-1@tcamp,140,218,3	duplicate(dummy_npc)	Maram#Lock1	4_EP18_MARAM
-
-1@tcamp,136,145,3	script	Lock#2-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock2");
-	enablenpc .@maram$;
-	progressbar_npc "3131FF",10;
-	npctalk "It would be better to proceed with caution.", .@maram$;
-	disablenpc instance_npcname("Lock#2-1");
-	disablenpc instance_npcname("Lock#2-2");
-	disablenpc instance_npcname("Lock#2-3");
-	disablenpc instance_npcname("Lock#2-4");
-	disablenpc .@maram$;
-	setcell 'map_tcamp$,135,145,144,145,cell_walkable,1;
-	end;
-}
-1@tcamp,138,145,3	duplicate(Lock#2-1)	Lock#2-2	4_ROPEPILE
-1@tcamp,141,145,3	duplicate(Lock#2-1)	Lock#2-3	4_ROPEPILE
-1@tcamp,143,145,3	duplicate(Lock#2-1)	Lock#2-4	4_ROPEPILE
-1@tcamp,142,147,3	duplicate(dummy_npc)	Maram#Lock2	4_EP18_MARAM
-
-1@tcamp,223,109,3	script	Lock#3-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock3");
-	enablenpc .@maram$;
-	npctalk "Maram: This building looks pretty suspicious, right? There must be a surveillance system in it as well.", .@maram$;
-	progressbar_npc "3131FF",10;
-	npctalk "Maram: Let's explore carefully, being careful not to get caught this time.", .@maram$;
-	disablenpc instance_npcname("Lock#3-1");
-	disablenpc instance_npcname("Lock#3-2");
-	disablenpc .@maram$;
-	setcell 'map_tcamp$,223,105,223,110,cell_walkable,1;
-	end;
-}
-1@tcamp,223,106,3	duplicate(Lock#3-1)	Lock#3-2	4_ROPEPILE
-1@tcamp,226,114,3	duplicate(dummy_npc)	Maram#Lock3	4_EP18_MARAM
-
-1@tcamp,80,99,3	script	Lock#4-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock4");
-	enablenpc .@maram$;
-	npctalk "Maram: I think you've gotten pretty deep. You should be able to find what you need safely.", .@maram$;
-	progressbar_npc "3131FF",10;
-	npctalk "Maram: Shall we wish you luck?", .@maram$;
-	disablenpc instance_npcname("Lock#4-1");
-	disablenpc instance_npcname("Lock#4-2");
-	disablenpc instance_npcname("Lock#4-3");
-	disablenpc .@maram$;
-	setcell 'map_tcamp$,80,94,80,100,cell_walkable,1;
-
-	enablenpc instance_npcname("Document Pile#Site1");
-	enablenpc instance_npcname("Document Pile#Site2");
-	enablenpc instance_npcname("Document Pile#Site3");
-	enablenpc instance_npcname("Document Pile#Site4");
-	enablenpc instance_npcname("Document Pile#Site5");
-	enablenpc instance_npcname("Miriam#base1");
-	enablenpc instance_npcname("Maram#base5");
-	end;
-}
-1@tcamp,80,97,3	duplicate(Lock#4-1)	Lock#4-2	4_ROPEPILE
-1@tcamp,80,95,3	duplicate(Lock#4-1)	Lock#4-3	4_ROPEPILE
-1@tcamp,82,100,3	duplicate(dummy_npc)	Maram#Lock4	4_EP18_MARAM
-
-
-//-------------------------------------------------------------------
-// Final
-//-------------------------------------------------------------------
-1@tcamp,32,100,3	script	Document Pile#Site1	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "I took out a few sheets from the middle These are the expiry date of the weapon and the sales statement.";
-	next;
-	mes "[Pile of Papers]";
-	mes "Even the date is very recent. There is a record of handing over a large number of weapons to Mr. Dandelion.";
-	mes "I think I found what I was looking for. I put the documents in my pocket.";
-	close2;
-	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site1") );
-	end;
-}
-
-1@tcamp,49,123,3	script	Document Pile#Site2	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "At the top of the page the final menu for luncheon dinner?";
-	next;
-	mes "[Pile of Papers]";
-	mes "It seems that the menu is fried fish with sauce.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
-	close2;
-	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site2") );
-	end;
-}
-
-1@tcamp,29,86,3	script	Document Pile#Site3	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "I took one out of the middle The layout of the military base guards?";
-	next;
-	mes "[Pile of Papers]";
-	mes "Looking at the date, it was a long time ago.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
-	close2;
-	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site3") );
-	end;
-}
-
-1@tcamp,60,122,3	script	Document Pile#Site4	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "The top one... 'If you feed the magmaring potatoes and hunt them after a while, will they drop the baked potatoes?'";
-	next;
-	mes "[Pile of Papers]";
-	mes "why is this here. But I'm curious about the result!";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
-	close2;
-	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site4") );
-	end;
-}
-
-1@tcamp,31,84,3	script	Document Pile#Site5	4_EP18_PAPERS,{
-	mes "[Pile of Papers]";
-	mes "All the papers are jumbled up.";
-	mes "Picking one out of the middle I found an illustration of the Pope drawn by icing the Pope's cookie icing with a pen.";
-	next;
-	mes "[Pile of Papers]";
-	mes "What kind of picture is it? Besides, you drew it very well.";
-	mes "You seem to have left unimportant documents. Let's take care of them first.";
-	close2;
-	getitem 1000409,1;	// Ep18_Docu_File
-	cloakonnpcself( instance_npcname("Document Pile#Site5") );
-	end;
-}
-
-
-1@tcamp,34,100,3	script	Miriam#base1	4_EP18_MIRIAM,3,3,{
-	disable_items;
-	if (countitem(1000409) < 5) {	// Ep18_Docu_File
-		cutin "ep18_miriam_02.png",2;
-		mes "[Miriam]";
-		mes "As expected, you are talented, adventurer. I used all sorts of connections to find the position.";
-		mes "It seems that Adventurer and Maram found it at once.";
-		next;
-		mes "[Miriam]";
-		mes "Read some of the documents here. We have what we were looking for.";
-		mes "I think it would be better to come and see it firsthand than to explain everything.";
-		close3;
-	}
-	if (getequipid(EQI_HEAD_TOP) != 400127) {	// Ep18_Mini_Elly
-		mes "[Mini Elly]";
-		mes "Get it out of the bag. Put it on your head.";
-		close;
-	}
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes ".";
-	next;
-	cutin "ep18_maram_01.png",2;
-	mes "[Maram]";
-	mes "No, Miriam! How are you here?";
-	mes "They said they would investigate separately!";
-	next;
-	cutin "ep18_miriam_01.png",2;
-	mes "[Miriam]";
-	mes "How did you and the adventurer dig this far?";
-	mes "You have good skills, too. It was a location that I found using all kinds of connections, but you found it at once.";
-	next;
-	cutin "ep18_maram_02.png",2;
-	mes "[Maram]";
-	mes "Let's do some, right, adventurer?";
-	mes "Anyway, what information did you get?";
-	next;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "Look at this document here.";
-	next;
-	cutin "",255;
-	mes "[Mini Elly]";
-	mes "This is a sales statement for arms. Show it to me as well.";
-	mes "The weapons and firearms these men have disposed of are all less than a year old.";
-	next;
-	cutin "ep18_miriam_03.png",2;
-	mes "[Miriam]";
-	mes "How dare you sell such weapons.";
-	mes "A weapon that is not properly maintained may not function properly.";
-	next;
-	cutin "ep18_maram_03.png",2;
-	mes "[Maram]";
-	mes "The weapons that come out of the back hole are all the same.";
-	mes "but, at least it's at this point.";
-	next;
-	mes "[Maram]";
-	mes "A year is not a long term, but it is not tight.";
-	mes "Why did we pour out at this moment in preparation for the protest?";
-	next;
-	mes "[Maram]";
-	mes "You wouldn't have to dispose of it right away.";
-	next;
-	npctalk "Maram: haha, this is so funny", instance_npcname("Maram#base5");
-	sleep2 300;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "This is one of the military bases managed by my stepfather.";
-	mes "Just by chance, it really came out at a time like this.";
-	next;
-	cutin "",255;
-	select( "If your stepfather is a priest, Youth Amal?", "The hard-line and pro-war stepfather?" );
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "That's right, adventurer. Looking at the ledger, it doesn't seem like the stepfather was involved.";
-	mes "I think it was a single corruption at the end, the weapon leak case.";
-	next;
-	mes "[Miriam]";
-	mes "I'll have to dig a little deeper, but that's my guess for now.";
-	mes "Oh, give me the documents. I'll take it as evidence.";
-	delitem 1000409,5;	// Ep18_Docu_File
-	if (isbegin_quest(16578) == 1) {
-		erasequest 16578;
-		setquest 16579;
-	}
-	close2;
-	cutin "",255;
-	npctalk "Maram: haha, this is so funny", instance_npcname("Maram#base5");
-	end;
-
-OnTouch:
-	npctalk "Miriam: Oh, adventurer? Maram you too!?";
-	end;
-
-OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16578) == 1 && countitem(1000409) > 4" );	// Ep18_Docu_File
-	disablenpc instance_npcname("Miriam#base1");
-	end;
-}
-
-1@tcamp,32,102,3	script	Maram#base5	4_EP18_MARAM,{
-	if (isbegin_quest(16579) == 0) {
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "I didn't know Miriam was here, right, adventurer?";
-		close3;
-	}
-	cutin "ep18_maram_02.png",2;
-	mes "[Maram]";
-	mes "We moved separately, but in the end we are in the same position.";
-	mes "Still, what I got in the process was different, so I guess it has its own meaning.";
-	next;
-	cutin "ep18_miriam_02.png",2;
-	mes "[Miriam]";
-	mes "Then I must be away for a while.";
-	mes "I'm going to pass on my findings to my stepfather.";
-	next;
-	mes "[Miriam]";
-	mes "Because there is a possibility that the adoptive father may not know yet if it is a single corruption.";
-	next;
-	cutin "ep18_maram_03.png",2;
-	mes "[Maram]";
-	mes "Is it really an independent corruption? That's probably what bothers me.";
-	mes "I have something to give to Rachel, Miriam, let's go together.";
-	next;
-	cutin "ep18_maram_01.png",2;
-	mes "[Maram]";
-	mes "I'll give you a shortcut, so can you please tell Suad what you found out here?";
-	mes "We will follow soon, so please go ahead and tell me.";
-	if (ep18_1_main == 46) {
-		ep18_1_main = 47;
-		erasequest 16579;
-		setquest 16580;
-		getitem "Ep18_Amethyst_Fragment",50;
-	}
-	close2;
-	warp "wolfvill",162,154;
-	end;
-
-OnInstanceInit:
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16579) == 1" );
-	disablenpc instance_npcname("Maram#base5");
-	end;
-}
--- a/npc/re/instances/VillaofDeception.txt
+++ b/npc/re/instances/VillaofDeception.txt
@@ -1,959 +0,0 @@
-//===== rAthena Script =======================================
-//= Instance Villa of Deception.
-//===== Description: =========================================
-//- [Walkthrough conversion]
-//- Require to complete the episode 18.1 main quest.
-//- The function to drop an item with random option is defined in re/other/glocal_npc2.txt
-// Notes:
-//   Some of the setting can be modified in 'Optional settings'.
-//   The monster inside the hard mode are using relieve level 10 (-99% damages).
-//   Change it if you think the player damage are too low, this level is a workaround but the damages
-//   on the mobs are lower in hard mode than in normal on official. The level is 9 on official.
-//===== Changelogs: ==========================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-wolfvill,79,260,0	script	#con_wp11	HIDDEN_WARP_NPC,4,4,{
-	end;
-OnTouch:
-	if (ep18_1_main < 57)
-		end;
-	cloakoffnpcself( "Aira#con" );
-	end;
-}
-
-wolfvill,79,260,4	script(CLOAKED)	Aira#con	4_M_BRZ_JACI,{
-	if (ep18_1_main < 57)
-		end;
-	switch( checkquest(12522,PLAYTIME) ) {
-	case -1:
-		break;
-	case 0:
-	case 1:
-		mes "[Aira]";
-		mes "Please wait the end of the quest delay.";
-		close;
-	case 2:
-		erasequest 12522;
-		mes "^0000ff All the aftereffects of access are gone.^000000";
-		close;
-	}
-	mes "[Aira]";
-	mes "" + strcharinfo(0) + "Thanks to Mr. I arrived safely in the village.";
-	mes "But it seems that something has been revived in the villa. I think I need to get help one more time.";
-	next;
-	.@md_name_normal$ = "Villa of Deception";
-	.@md_name_hard$ = "Villa of Deception Advanced";
-
-	if (is_party_leader() == true) {
-		.@create_normal$ = "^000044Create " + .@md_name_normal$ + "^000000";
-		if (countitem(1000471) > 0)
-			.@create_hard$ = "^000044Create " + .@md_name_hard$ + "^000000";
-	}
-	switch( select( "Entry", .@create_normal$, .@create_hard$ ) ) {
-	case 1:
-		if (select( .@md_name_normal$, .@md_name_hard$ ) == 1) {
-			if (BaseLevel < 170) {
-				mes "[Aira]";
-				mes "You must be at least BaseLevel 170 to enter.";
-				close;
-			}
-			.@enter_to$ = .@md_name_normal$;
-		}
-		else {
-			if (BaseLevel < 200) {
-				mes "[Aira]";
-				mes "You must be at least BaseLevel 200 to enter.";
-				close;
-			}
-			.@enter_to$ = .@md_name_hard$;
-		}
-
-		switch( instance_enter(.@enter_to$) ) {
-		case IE_OTHER:
-			mes "^ff0000An unknown error occurred.^000000";
-			close;
-		case IE_NOINSTANCE:
-			mes "^0000ff The dungeon has not been created or you are trying to enter a dungeon different from the party leader.^000000";
-			close;
-		case IE_NOMEMBER:
-			mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
-			close;
-		case IE_OK:
-			mapannounce "wolfvill", "" + strcharinfo(0) + " of the party, " + getpartyname( getcharid(1) ) + ", is entering " + .@enter_to$ + ".",bc_map,"0x00ff99",FW_NORMAL,12;
-			if (.@enter_to$ == .@md_name_normal$)
-				setquest 12520;
-			else
-				setquest 12521;
-			setquest 12522;
-			// warp "1@advs",111,19;
-			end;
-		}
-		end;
-	case 2:
-		if (BaseLevel < 170) {
-			mes "[Aira]";
-			mes "You must be at least BaseLevel 170 to create the instance.";
-			close;
-		}
-		if (instance_create(.@md_name_normal$) < 0) {
-			mes "Party: " + getpartyname(getcharid(1)) + "";
-			mes "Leader: " + strcharinfo(0) + "";
-			mes "^0000ff" + .@md_name_normal$ + " ^000000- Unknown error";
-			close;
-		}
-		end;
-	case 3:
-		if (BaseLevel < 200) {
-			mes "[Aira]";
-			mes "You must be at least BaseLevel 200 to create the instance.";
-			close;
-		}
-		if (countitem(1000471) < 1) {
-			mes "[Aira]";
-			mes "Where is the " + getitemname(1000471) + "?";
-			close;
-		}
-		if (instance_create(.@md_name_hard$) < 0) {
-			mes "Party: " + getpartyname(getcharid(1)) + "";
-			mes "Leader: " + strcharinfo(0) + "";
-			mes "^0000ff" + .@md_name_hard$ + " ^000000- Unknown error";
-			close;
-		}
-		delitem 1000471,1;
-		end;
-	}
-	end;
-}
-
-
-
-
-1@advs,1,1,0	script	advs_init	-1,{
-	end;
-OnInstanceInit:
-	//--------------------------------------------
-	// variables initialization
-	//--------------------------------------------
-
-	'advs_step = 0;
-	'map_advs$ = instance_mapname("1@advs");
-
-	// variables step 1
-	'sw_timer = 0;
-	deletearray 'sw[0], 2;
-
-	// variables step 3
-	deletearray 'x_reaper[0], 'size_reaper;
-	deletearray 'y_reaper[0], 'size_reaper;
-	'size_reaper = 0;
-
-	//--------------------------------------------
-	// Optional settings
-	//--------------------------------------------
-
-	// Number minimum of reaper spawn on step 3
-	'min_reaper = 3;
-
-	// Setting according to the mode
-	if (instance_live_info(ILI_NAME) == "Villa of Deception Advanced") {
-		'advs_difficult = 1;
-		'sanare_id = 21377;	// EP18_MD_SANARE_L
-		'hunter_id = 21378;	// EP18_MD_HEARTHUNTER_L
-		'monster_relieve = 10;	// need check but the damages are very low compared to normal mode
-
-		// Total of monster to kill in step 1, 2, 3
-		'total_monster_step_1 = 80;
-		'total_monster_step_2 = 70;
-		'total_monster_step_3 = 80;
-
-		// Number of monster spawn at the start of step 1, 2, 3
-		'init_monster_step_1 = 40;
-		'init_monster_step_2 = 30;
-		'init_monster_step_3 = 40;
-
-		'schulang_id = 21360;	// EP18_MD_SCHULANG_L
-		'freyja_id = 21361;	// EP18_MD_DEMI_FREYJA_L
-	
-		// Don't touch this unless you know what you're doing
-		.@interval = 5;	// distance between each reaper
-		.@max_reaper = 48;	// number max of reaper spawn
-	}
-	else {
-		'advs_difficult = 0;
-		'sanare_id = 21318;	// EP18_MD_SANARE_R
-		'hunter_id = 21319;	// EP18_MD_HEARTHUNTER_R2
-		'monster_relieve = 9;
-
-		// Total of monster to kill in step 1, 2, 3
-		'total_monster_step_1 = 35;
-		'total_monster_step_2 = 35;
-		'total_monster_step_3 = 35;
-
-		// Number of monster spawn at the start of step 1, 2, 3
-		'init_monster_step_1 = 35;
-		'init_monster_step_2 = 25;
-		'init_monster_step_3 = 24;
-
-		'schulang_id = 21316;	// EP18_MD_SCHULANG_R
-		'freyja_id = 21317;	// EP18_MD_DEMI_FREYJA_R
-
-		// Don't touch this unless you know what you're doing
-		.@interval = 10;
-		.@max_reaper = 16;
-	}
-
-	for ( .@i = 109; .@i <= 139; .@i += .@interval ) {
-		for ( .@j = 219; .@j <= 249; .@j += .@interval ) {
-			if (.@i == 124 && .@j == 234)
-				continue;
-			'x_reaper[ 'size_reaper ] = .@i;
-			'y_reaper[ 'size_reaper ] = .@j;
-			'size_reaper++;
-		}
-	}
-	'total_reaper = min(.@max_reaper, 'size_reaper);
-
-	// number total of food necessary to reduce the number of reaper to 'min_reaper
-	'max_food = ('total_reaper * 2) - ('min_reaper * 2);
-
-	// debug
-	'total_monster_step_1 = max('init_monster_step_1, 'total_monster_step_1);
-	'total_monster_step_2 = max('init_monster_step_2, 'total_monster_step_2);
-	'total_monster_step_3 = max('init_monster_step_3, 'total_monster_step_3);
-
-	//--------------------------------------------
-	// npcs management
-	//--------------------------------------------
-	disablenpc instance_npcname("#boss2");
-	disablenpc instance_npcname("#box_admin");
-
-	// warps
-	disablenpc instance_npcname("#wp1");
-	disablenpc instance_npcname("#wp2");
-	disablenpc instance_npcname("#wp3");
-	disablenpc instance_npcname("#wp4");
-
-	disablenpc instance_npcname("#food1");
-	disablenpc instance_npcname("#food2");
-	disablenpc instance_npcname("#food3");
-	disablenpc instance_npcname("#food4");
-
-	// circles step final
-	disablenpc instance_npcname("#b_tr1");
-	disablenpc instance_npcname("#b_tr2");
-	disablenpc instance_npcname("#b_tr3");
-	disablenpc instance_npcname("#b_tr4");
-
-	// stop circles from moving
-	disablenpc instance_npcname("#b_sw1");
-	disablenpc instance_npcname("#b_sw2");
-	disablenpc instance_npcname("#b_sw3");
-	disablenpc instance_npcname("#b_sw4");
-
-	disablenpc instance_npcname("#boss1");
-	disablenpc instance_npcname("#boss2_sw");
-
-	donpcevent instance_npcname("#advs_step_1") + "::OnStart";
-	end;
-}
-
-// Entrance
-// (npc probably used to enable the npcs according to the instance mode - normal or hard)
-// 1@advs,111,19,0	duplicate(dummy_npc)	#hidden_wp1	HIDDEN_WARP_NPC,2,2
-// 1@advs,134,19,0	duplicate(dummy_npc)	#hidden_wp2	HIDDEN_WARP_NPC,2,2
-
-
-//---------------------------------------------------------------
-// Warps
-//---------------------------------------------------------------
-1@advs,124,101,0	warp	#wp1	2,2,1@advs,124,115
-
-
-1@advs,124,205,0	script	#wp2	WARPNPC,2,2,{
-	end;
-OnTouch:
-	.@r = rand(3);
-	if (.@r == 0)
-		warp 'map_advs$,101,235;
-	else if (.@r == 1)
-		warp 'map_advs$,155,233;
-	else
-		warp 'map_advs$,124,211;
-	end;
-}
-
-1@advs,124,266,0	warp	#wp3	2,2,1@advs,124,277
-1@advs,124,307,0	warp	#wp4	2,2,1@advs,124,319
-// 1@advs,124,307,0	duplicate(dummy_npc)	#wp4	WARPNPC,10,10
-
-
-//---------------------------------------------------------------
-// Step 1
-//---------------------------------------------------------------
-1@advs,1,1,0	script	#advs_step_1	-1,{
-	end;
-OnStart:
-	'mob_to_respawn = 'total_monster_step_1 - 'init_monster_step_1;
-
-	// The coordinates may be inaccurates (maybe not random on official)
-	for ( .@i = 0; .@i < 'init_monster_step_1; ++.@i )
-		callsub( S_Spawn );
-	end;
-	
-OnMobDead:
-	if ('mob_to_respawn > 0)
-		'mob_to_respawn--;
-	initnpctimer;
-	sleep 2000;
-	if ('advs_step == 0 && 'mob_to_respawn > 0) {
-		if ('mob_to_respawn > 0)
-			callsub( S_Spawn );
-		if ('mob_to_respawn > 1)
-			callsub( S_Spawn );
-	}
-	end;
-OnTimer2000:
-	stopnpctimer;
-	.@alive = mobcount('map_advs$, instance_npcname("#advs_step_1") + "::OnMobDead");
-	mapannounce 'map_advs$, "Number of monsters left: " + .@alive, bc_map, 0xAAAAFF;
-	end;
-S_Spawn:
-	.@label$ = instance_npcname("#advs_step_1") + "::OnMobDead";
-	if (rand(2))
-		.@mob_id = 'hunter_id;
-	else
-		.@mob_id = 'sanare_id;
-	.@r = rand(3);
-	if (.@r == 0)
-		areamonster 'map_advs$,63,89,72,182,"--en--",.@mob_id,1, .@label$;
-	else if (.@r == 1)
-		areamonster 'map_advs$,63,89,184,101,"--en--",.@mob_id,1, .@label$;
-	else
-		areamonster 'map_advs$,184,89,174,182,"--en--",.@mob_id,1, .@label$;
-	unitskilluseid $@mobid[0], 771, 'monster_relieve;	// NPC_RELIEVE_ON
-	return;
-}
-
-1@advs,67,182,5	script	#sw_1	4_NFWISP,1,1,{
-	if ('advs_step != 0)
-		end;
-	mes "[Unidentified grudge]";
-	mes "Are you here to set me free?";
-	next;
-	if (select( "Stop", "Do it" ) == 1)
-		end;
-	if ('advs_step != 0)
-		end;
-	disablenpc instance_npcname("#sw_1");
-	'sw[0] = 1;
-	donpcevent instance_npcname("#sw_timer") + "::OnStart";
-	end;
-
-OnTouch_:
-	end;
-}
-
-1@advs,180,182,5	script	#sw_2	4_NFWISP,1,1,{
-	if ('advs_step != 0)
-		end;
-	mes "[Unidentified grudge]";
-	mes "Are you here to set me free?";
-	next;
-	if (select( "Stop", "Do it" ) == 1)
-		end;
-	if ('advs_step != 0)
-		end;
-	disablenpc instance_npcname("#sw_2");
-	'sw[1] = 1;
-	donpcevent instance_npcname("#sw_timer") + "::OnStart";
-	end;
-
-OnTouch_:
-	end;
-}
-
-1@advs,1,1,5	script	#sw_timer	-1,{
-	end;
-OnStart:
-	if ('sw_timer == 1)
-		end;
-	'sw_timer = 1;
-	initnpctimer;
-	end;
-
-OnTimer3000:
-	stopnpctimer;
-	if ('sw[0] != 1 || 'sw[1] != 1) {
-		'sw_timer = 0;
-		if ('sw[0] == 1)
-			enablenpc instance_npcname("#sw_1");
-		if ('sw[1] == 1)
-			enablenpc instance_npcname("#sw_2");
-		'sw[0] = 0;
-		'sw[1] = 0;
-		npctalk "Ah... my half soul beyond this hallway is still unfulfilled...", instance_npcname("#sw_1");
-		npctalk "Ah... my half soul beyond this hallway is still unfulfilled...", instance_npcname("#sw_2");
-		mapannounce 'map_advs$, "You must free both souls on the left and right of the hallway at the same time.", bc_map, 0xAAAAFF;
-		end;
-	}
-	if ('advs_step != 0)
-		end;
-	mapannounce 'map_advs$, "Two souls are simultaneously liberated, opening the door to the center.", bc_map, 0xAAAAFF;
-	donpcevent instance_npcname("#advs_step_2") + "::OnStart";
-	end;
-}
-
-1@advs,75,89,5	script	#trap_1	4_M_DEATH,1,1,{
-	end;
-OnTouch:
-	specialeffect2 EF_FIREHIT;
-	specialeffect2 EF_ACIDDEMON;
-	getmapxy( .@map$, .@x, .@y, BL_PC );
-	getmapxy( .@map$, .@x_npc, .@y_npc, BL_NPC );
-
-	if (.@x == .@x_npc) {
-		if (.@y < 89)
-			pushpc DIR_SOUTH, 1;
-		else if (.@y > 99)
-			pushpc DIR_NORTH, 1;
-		else
-			pushpc DIR_EAST, 1;	// default
-	}
-	else if (.@x < .@x_npc)
-		pushpc DIR_WEST, 1;
-	else
-		pushpc DIR_EAST, 1;
-
-	heal -((MaxHp*50)/100),0;	// note: heal command is used to (potentially) kill the target
-	end;
-
-OnMove1:
-	getmapxy( .@map$, .@x, .@y, BL_NPC );
-	unitwalk( getnpcid(0),.@x,99, instance_npcname( strnpcinfo(0) ) + "::OnMove2" );
-	end;
-OnMove2:
-	getmapxy( .@map$, .@x, .@y, BL_NPC );
-	unitwalk( getnpcid(0),.@x,89, instance_npcname( strnpcinfo(0) ) + "::OnMove1" );
-	end;
-
-OnInstanceInit:
-	npcspeed 150;
-	sleep rand(100,3000);
-	donpcevent instance_npcname( strnpcinfo(0) ) + "::OnMove1";
-	end;
-}
-// traps left
-1@advs,80,89,1	duplicate(#trap_1)	#trap_2	4_M_DEATH,1,1
-1@advs,85,89,1	duplicate(#trap_1)	#trap_3	4_M_DEATH,1,1
-1@advs,90,89,1	duplicate(#trap_1)	#trap_4	4_M_DEATH,1,1
-1@advs,95,89,1	duplicate(#trap_1)	#trap_5	4_M_DEATH,1,1
-1@advs,100,89,1	duplicate(#trap_1)	#trap_6	4_M_DEATH,1,1
-1@advs,105,89,1	duplicate(#trap_1)	#trap_7	4_M_DEATH,1,1
-1@advs,110,89,1	duplicate(#trap_1)	#trap_8	4_M_DEATH,1,1
-1@advs,115,89,1	duplicate(#trap_1)	#trap_9	4_M_DEATH,1,1
-// traps right
-1@advs,130,89,1	duplicate(#trap_1)	#trap_10	4_M_DEATH,1,1
-1@advs,135,89,1	duplicate(#trap_1)	#trap_11	4_M_DEATH,1,1
-1@advs,140,89,1	duplicate(#trap_1)	#trap_12	4_M_DEATH,1,1
-1@advs,145,89,1	duplicate(#trap_1)	#trap_13	4_M_DEATH,1,1
-1@advs,150,89,1	duplicate(#trap_1)	#trap_14	4_M_DEATH,1,1
-1@advs,155,89,1	duplicate(#trap_1)	#trap_15	4_M_DEATH,1,1
-1@advs,160,89,1	duplicate(#trap_1)	#trap_16	4_M_DEATH,1,1
-1@advs,165,89,1	duplicate(#trap_1)	#trap_17	4_M_DEATH,1,1
-1@advs,170,89,1	duplicate(#trap_1)	#trap_18	4_M_DEATH,1,1
-
-
-//---------------------------------------------------------------
-// Step 2
-//---------------------------------------------------------------
-1@advs,1,1,0	script	#advs_step_2	-1,{
-	end;
-OnStart:
-	if ('advs_step != 0)
-		end;
-	'advs_step = 1;
-	disablenpc instance_npcname("#advs_step_1");
-	enablenpc instance_npcname("#wp1");
-	enablenpc instance_npcname("#food1");
-	enablenpc instance_npcname("#food2");
-	enablenpc instance_npcname("#food3");
-	enablenpc instance_npcname("#food4");
-	killmonster 'map_advs$, instance_npcname("#advs_step_1") + "::OnMobDead";
-
-	'mob_to_respawn = 'total_monster_step_2 - 'init_monster_step_2;
-
-	for ( .@i = 0; .@i < 'init_monster_step_2; ++.@i )
-		callsub( S_Spawn );
-	end;
-OnMobDead:
-	if ('mob_to_respawn > 0)
-		'mob_to_respawn--;
-	initnpctimer;
-	sleep 2000;
-	if ('advs_step == 1 && 'mob_to_respawn > 0) {
-		if ('mob_to_respawn > 0)
-			callsub( S_Spawn );
-		if ('mob_to_respawn > 1)
-			callsub( S_Spawn );
-	}
-	end;
-OnTimer2000:
-	stopnpctimer;
-	.@alive = mobcount('map_advs$, instance_npcname("#advs_step_2") + "::OnMobDead");
-	mapannounce 'map_advs$, "Number of monsters left: " + .@alive, bc_map, 0xAAAAFF;
-	if ('advs_step == 1 && 'mob_to_respawn == 0 && .@alive == 0)
-		donpcevent instance_npcname("#advs_step_3_A") + "::OnStart";
-	end;
-S_Spawn:
-	.@label$ = instance_npcname("#advs_step_2") + "::OnMobDead";
-	if (rand(2))
-		.@mob_id = 'hunter_id;
-	else
-		.@mob_id = 'sanare_id;
-	.@r = rand(3);
-	if (.@r == 0)
-		areamonster 'map_advs$,76,145,171,139,"--en--",.@mob_id,1, .@label$;
-	else if (.@r == 1)
-		areamonster 'map_advs$,113,205,135,125,"--en--",.@mob_id,1, .@label$;
-	else
-		areamonster 'map_advs$,113,205,135,125,"--en--",.@mob_id,1, .@label$;
-	unitskilluseid $@mobid[0], 771, 'monster_relieve;	// NPC_RELIEVE_ON
-	return;
-}
-
-1@advs,101,159,5	script	#food1	4_EP16_FOOD,1,1,{
-	if ('max_food <= 0) {
-		mapannounce 'map_advs$, "??? : You really don't know how to cook well, you deserve a casual tour of my garden.", bc_map, 0xAAAAFF;
-		end;
-	}
-	progressbar "",4;
-	'max_food--;
-	
-	.@r = rand(5);
-	if (.@r == 0)
-		sc_start SC_CONFUSION,30000,0,100, SCSTART_NOAVOID|SCSTART_NOTICKDEF|SCSTART_NORATEDEF;
-	else if (.@r == 1)
-		sc_start SC_CURSE,30000,0,100, SCSTART_NOAVOID|SCSTART_NOTICKDEF|SCSTART_NORATEDEF;
-	else if (.@r == 2)
-		sc_start SC_BLIND,30000,0,100, SCSTART_NOAVOID|SCSTART_NOTICKDEF|SCSTART_NORATEDEF;
-	else if (.@r == 3)
-		sc_start SC_POISON,30000,0,100, SCSTART_NOAVOID|SCSTART_NOTICKDEF|SCSTART_NORATEDEF;
-	else
-		sc_start SC_SILENCE,30000,0,100, SCSTART_NOAVOID|SCSTART_NOTICKDEF|SCSTART_NORATEDEF;
-
-	if ('total_reaper > 'min_reaper && ('max_food % 2) == 0)
-		'total_reaper--;
-	end;
-}
-1@advs,101,125,5	duplicate(#food1)	#food2	4_EP16_FOOD,1,1
-1@advs,147,162,5	duplicate(#food1)	#food3	4_EP16_FOOD,1,1
-1@advs,147,122,5	duplicate(#food1)	#food4	4_EP16_FOOD,1,1
-
-
-//---------------------------------------------------------------
-// Step 3
-//---------------------------------------------------------------
-1@advs,1,1,5	script	#advs_step_3_A	-1,{
-	end;
-OnStart:
-	if ('advs_step != 1)
-		end;
-	'advs_step = 2;
-	enablenpc instance_npcname("#wp2");
-	disablenpc instance_npcname("#advs_step_2");
-	donpcevent instance_npcname("#advs_step_3_A") + "::OnEvent";
-	donpcevent instance_npcname("#advs_step_3_B") + "::OnEvent";
-	end;
-OnEvent:
-	.@label$ = instance_npcname("#advs_step_3_A") + "::OnMobDead";
-		
-	copyarray .@x[0], 'x_reaper[0], 'size_reaper;
-	copyarray .@y[0], 'y_reaper[0], 'size_reaper;
-	.@size = 'size_reaper;
-
-	for ( .@i = 0; .@i < 'total_reaper; ++.@i ) {
-		.@r = rand(.@size);
-		
-		monster 'map_advs$,.@x[.@r],.@y[.@r],"--en--",20846,1, .@label$;	// MD_HIDDEN_GROUND01
-		deletearray .@x[.@r],1;
-		deletearray .@y[.@r],1;
-		.@size--;
-	}
-	initnpctimer;
-	end;
-OnTimer10000:
-	killmonster 'map_advs$, instance_npcname("#advs_step_3_A") + "::OnMobDead";
-	donpcevent instance_npcname("#advs_step_3_A") + "::OnEvent";	// this event never stop
-	end;
-OnMobDead:
-	end;
-}
-
-1@advs,1,1,0	script	#advs_step_3_B	-1,{
-	end;
-OnEvent:
-	'mob_to_respawn = 'total_monster_step_3 - 'init_monster_step_3;
-
-	for ( .@i = 0; .@i < 'init_monster_step_3; ++.@i )
-		callsub( S_Spawn );
-	end;
-OnMobDead:
-	if ('mob_to_respawn > 0)
-		'mob_to_respawn--;
-	initnpctimer;
-	sleep 2000;
-	if ('advs_step == 2 && 'mob_to_respawn > 0) {
-		if ('mob_to_respawn > 0)
-			callsub( S_Spawn );
-		if ('mob_to_respawn > 1)
-			callsub( S_Spawn );
-	}
-	end;
-OnTimer2000:
-	stopnpctimer;
-	.@alive = mobcount('map_advs$, instance_npcname("#advs_step_3_B") + "::OnMobDead");
-	mapannounce 'map_advs$, "Number of monsters left: " + .@alive, bc_map, 0xAAAAFF;
-	if ('advs_step == 2 && 'mob_to_respawn == 0 && .@alive == 0)
-		donpcevent instance_npcname("#boss1_advs") + "::OnStart";
-	end;
-S_Spawn:
-	.@label$ = instance_npcname("#advs_step_3_B") + "::OnMobDead";
-	if (rand(2))
-		.@mob_id = 'hunter_id;
-	else
-		.@mob_id = 'sanare_id;
-	.@r = rand(4);
-	if (.@r == 0)
-		areamonster 'map_advs$,109,238,119,248,"--en--",.@mob_id,1, .@label$;
-	else if (.@r == 1)
-		areamonster 'map_advs$,109,219,119,229,"--en--",.@mob_id,1, .@label$;
-	else if (.@r == 2)
-		areamonster 'map_advs$,128,238,138,248,"--en--",.@mob_id,1, .@label$;
-	else
-		areamonster 'map_advs$,128,219,138,229,"--en--",.@mob_id,1, .@label$;
-	unitskilluseid $@mobid[0], 771, 'monster_relieve;	// NPC_RELIEVE_ON
-	return;
-}
-
-
-//---------------------------------------------------------------
-// Step 4
-//---------------------------------------------------------------
-1@advs,1,1,4	script	#boss1_advs	-1,{
-	end;
-OnStart:
-	if ('advs_step != 2)
-		end;
-	'advs_step = 3;
-	enablenpc instance_npcname("#wp3");
-	disablenpc instance_npcname("#advs_step_3_B");
-	enablenpc instance_npcname("#boss1");
-	end;
-OnMobDead:
-	if ('advs_step != 4)
-		end;
-	'advs_step = 5;
-	enablenpc instance_npcname("#wp4");
-	enablenpc instance_npcname("#boss2_sw");
-	donpcevent instance_npcname("#boss1_advs_skill_1") + "::OnStop";
-	end;
-}
-
-// 1@advs,124,295,4	script	#boss1	EP18_MD_SCHULANG_R,1,1,{
-1@advs,124,295,4	script	#boss1	EP18_MD_SCHULANG_R,{
-	if ('advs_step != 3)
-		end;
-	if (is_party_leader() == false)
-		end;
-	'advs_step = 4;
-	npctalk "That's all human.";
-	unitwalk getnpcid(0), 124,290, instance_npcname("#boss1") + "::OnMove";
-	end;
-
-OnMove:
-	disablenpc instance_npcname("#boss1");
-	monster 'map_advs$,124,290,"--en--",'schulang_id,1, instance_npcname("#boss1_advs") + "::OnMobDead";
-	'schulang_gid = $@mobid[0];
-	unitskilluseid $@mobid[0], 771, 1;	// NPC_RELIEVE_ON
-	unittalk 'schulang_gid, "I'm in a bit of trouble if I approach this more than that!!!";
-	monster 'map_advs$,123,285,"--en--",21319,1;	// EP18_MD_HEARTHUNTER_R2
-	unitskilluseid $@mobid[0], 771, 'monster_relieve;	// NPC_RELIEVE_ON
-	donpcevent instance_npcname("#boss1_advs_skill_1") + "::OnStart";
-	end;
-// OnTouch:	// effect ?
-	// end;
-}
-
-
-1@advs,1,1,0	script	#boss1_advs_skill_1	-1,{
-	end;
-OnStart:
-	initnpctimer;
-	getunitdata 'schulang_gid, .@data;
-	'x_sch_event = .@data[UMOB_X];
-	'y_sch_event = .@data[UMOB_Y];
-	'ignore_column = rand(5);	// one column is randomly free
-	end;
-OnTimer1000:
-	callsub( S_Skill,-8 );
-	end;
-OnTimer1500:
-	callsub( S_Skill,-4 );
-	end;
-OnTimer2000:
-	callsub( S_Skill,0 );
-	end;
-OnTimer2500:
-	callsub( S_Skill,4 );
-	end;
-OnTimer3000:
-	callsub( S_Skill,8 );
-	stopnpctimer;
-	donpcevent instance_npcname("#boss1_advs_skill_1") + "::OnStart";
-	end;
-S_Skill:
-	.@dxy = getarg(0);
-	if ('ignore_column != 0)
-		unitskillusepos 'schulang_gid,"MG_THUNDERSTORM",4, ('x_sch_event - 8), ('y_sch_event + .@dxy), -50;
-	if ('ignore_column != 1)
-		unitskillusepos 'schulang_gid,"MG_THUNDERSTORM",4, ('x_sch_event - 4), ('y_sch_event + .@dxy), -50;
-	if ('ignore_column != 2)
-		unitskillusepos 'schulang_gid,"MG_THUNDERSTORM",4, 'x_sch_event, ('y_sch_event + .@dxy), -50;
-	if ('ignore_column != 3)
-		unitskillusepos 'schulang_gid,"MG_THUNDERSTORM",4, ('x_sch_event + 4), ('y_sch_event + .@dxy), -50;
-	if ('ignore_column != 4)
-		unitskillusepos 'schulang_gid,"MG_THUNDERSTORM",4, ('x_sch_event + 8), ('y_sch_event + .@dxy), -50;
-	return;
-OnStop:
-	stopnpctimer;
-	end;
-}
-
-
-//---------------------------------------------------------------
-// Step 5 (final)
-//---------------------------------------------------------------
-// 1@advs,124,358,4	script	#boss2_sw	CLEAR_NPC,1,1,{
-1@advs,124,358,4	script	#boss2_sw	CLEAR_NPC,{
-	if ('advs_step != 5)
-		end;
-	if (is_party_leader() == false)
-		end;
-	'advs_step = 6;
-	cloakonnpc instance_npcname("#boss2_sw");	// cloakonnpc to display effect
-	specialeffect EF_CLOUD4;
-	specialeffect EF_DQ9_CHARGE3;
-	sleep 4000;
-	specialeffect EF_SCREEN_QUAKE;
-	setnpcdisplay( instance_npcname("#boss2"), 'freyja_id );
-	enablenpc instance_npcname("#boss2");
-	specialeffect EF_BEGINSPELL_YB;
-	sleep 2000;
-	npctalk "I... and... together... let's play...", instance_npcname("#boss2");
-	unitwalk getnpcid(0, instance_npcname("#boss2")), 124,346, instance_npcname("#boss2_sw") + "::OnMove";
-	end;
-OnMove:
-	setnpcdisplay( instance_npcname("#boss2"), CLEAR_NPC );
-	disablenpc instance_npcname("#boss2");
-	monster 'map_advs$,124,346,"--en--",'freyja_id,1, instance_npcname("#boss2_sw") + "::OnMobDead";
-	'freyja_gid = $@mobid[0];
-	donpcevent instance_npcname("#advs_boss_relieve") + "::OnStart";
-	sleep 3000;
-	mapannounce 'map_advs$, "Tip: Twisted God Freyja is weaken as it get closer to the chandelier.", bc_map, 0xFFCC;
-	if ('advs_difficult == 1)
-		sleep 8000;
-	else
-		sleep 30000;
-
-	// circles
-	if ('advs_difficult == 1) {
-		donpcevent instance_npcname("#b_tr1") + "::OnEnable";
-		donpcevent instance_npcname("#b_tr2") + "::OnEnable";
-	}
-	donpcevent instance_npcname("#b_tr3") + "::OnEnable";
-	donpcevent instance_npcname("#b_tr4") + "::OnEnable";
-
-	// stop the circles from moving
-	enablenpc instance_npcname("#b_sw1");
-	enablenpc instance_npcname("#b_sw2");
-	enablenpc instance_npcname("#b_sw3");
-	enablenpc instance_npcname("#b_sw4");
-	end;
-
-OnMobDead:
-	'freyja_gid = 0;
-	donpcevent instance_npcname("#advs_boss_relieve") + "::OnStop";
-	disablenpc instance_npcname("#boss2_sw");
-	enablenpc instance_npcname("#box_admin");
-	if ('advs_difficult == 1) {
-		donpcevent instance_npcname("#b_tr1") + "::OnStop";
-		donpcevent instance_npcname("#b_tr2") + "::OnStop";
-	}
-	donpcevent instance_npcname("#b_tr3") + "::OnStop";
-	donpcevent instance_npcname("#b_tr4") + "::OnStop";
-	end;
-// OnTouch:	// effect ?
-	// end;
-}
-1@advs,124,356,4	duplicate(dummy_npc)	#boss2	CLEAR_NPC,1,1
-
-1@advs,1,1,4	script	#advs_boss_relieve	-1,{
-	end;
-OnStart:
-	if (unitexists('freyja_gid) == false)
-		end;
-	getunitdata 'freyja_gid, .@data;
-	.@d = distance(124,356,.@data[UMOB_X],.@data[UMOB_Y]);
-	.@lv = (.@d / 2) + 1;	// level 6 on spawn
-	.@lv = min(10,.@lv);
-	.@lv = max(1,.@lv);
-	unitskilluseid 'freyja_gid, 772, 1;	// NPC_RELIEVE_OFF
-	unitskilluseid 'freyja_gid, 771, .@lv;	// NPC_RELIEVE_ON
-	initnpctimer;
-	end;
-OnTimer2000:
-	donpcevent instance_npcname("#advs_boss_relieve") + "::OnStart";
-	end;
-OnStop:
-	stopnpctimer;
-	end;
-}
-
-// circles
-1@advs,124,337,5	script	#b_tr1	MD_HIDDEN_GROUND02,2,2,{
-	end;
-OnTouch:	// note: warp dead player
-	if ('freyja_gid == 0)
-		end;
-	specialeffect2 EF_FIREHIT;
-	specialeffect2 EF_ACIDDEMON;
-	percentheal -10,0;	// deal some damage
-	if (rand(2))
-		warp 'map_advs$,67,182;
-	else
-		warp 'map_advs$,180,182;
-	end;
-
-OnEnable:
-	enablenpc instance_npcname( strnpcinfo(0) );
-OnStart:
-	'circle_move = 1;
-OnMove:
-	if ('freyja_gid == 0)
-		end;
-	if ('circle_move == 0)
-		end;
-	getmapxy( .@map$, .@x, .@y, BL_NPC );
-	do {
-		.@dx = rand(-2,2);
-		.@dy = rand(-2,2);
-		.@new_x = .@x + .@dx;
-		.@new_y = .@y + .@dy;
-	}
-	while ((.@dx == 0 && .@dy == 0) || .@new_x < 108 || .@new_x > 139 || .@new_y < 325 || .@new_y > 351);
-	unitwalk( getnpcid(0),.@new_x,.@new_y, instance_npcname( strnpcinfo(0) ) + "::OnMove" );
-	end;
-
-OnStop:
-	'circle_move = 0;	// double check just because
-	unitstopwalk getnpcid(0);
-	end;
-}
-1@advs,124,337,5	duplicate(#b_tr1)	#b_tr2	MD_HIDDEN_GROUND02,2,2
-1@advs,124,337,5	duplicate(#b_tr1)	#b_tr3	MD_HIDDEN_GROUND02,2,2
-1@advs,124,337,5	duplicate(#b_tr1)	#b_tr4	MD_HIDDEN_GROUND02,2,2
-
-
-// stop the circles from moving
-1@advs,108,358,4	script	#b_sw1	4_ENERGY_YELLOW,2,2,{
-	mes "Ddispel the circle ^ff0000requires your health and mana.^000000 During the process, you ^ff0000becomes immobile and defenseless.^000000 Are you sure you want to start dispelling?";
-	next;
-	if (select( "Cancel", "Proceed" ) == 1)
-		end;
-	if ('freyja_gid == 0)
-		end;
-	// this part need to be checked when more information are available
-	.@success = callsub( S_Venom );
-	mes "^0000ffThe magic stone that absorbed your stamina and magic resonates. The magic circle that has been wandering disappears.^000000";
-	specialeffect EF_BASH3D6;
-	if (.@success == true && 'circle_move == 1) {
-		disablenpc();
-		if ('advs_difficult == 1) {
-			donpcevent instance_npcname("#b_tr1") + "::OnStop";
-			donpcevent instance_npcname("#b_tr2") + "::OnStop";
-		}
-		donpcevent instance_npcname("#b_tr3") + "::OnStop";
-		donpcevent instance_npcname("#b_tr4") + "::OnStop";
-		initnpctimer;
-	}
-	close;
-
-S_Venom:
-	.@percent_hp = max(1, (MaxHp/100));	// deal random damage to the player
-	.@percent_sp = max(1, (MaxSp/100));
-	.@r = rand(2,20);
-
-	for ( .@i = 0; .@i < .@r; ++.@i ) {
-		specialeffect2 EF_INVENOM;
-		heal -.@percent_hp, -.@percent_sp;
-		if (Hp < 1)
-			return 0;
-		sleep2 500;
-	}
-	return (Hp > 0);
-
-OnTimer10000:	// seems to be around 10s to re-enable the circle, 20s the npc
-	if ('freyja_gid == 0)
-		end;
-	if ('advs_difficult == 1) {
-		donpcevent instance_npcname("#b_tr1") + "::OnStart";
-		donpcevent instance_npcname("#b_tr2") + "::OnStart";
-	}
-	donpcevent instance_npcname("#b_tr3") + "::OnStart";
-	donpcevent instance_npcname("#b_tr4") + "::OnStart";
-	end;
-
-OnTimer20000:
-	stopnpctimer;
-	enablenpc();
-	end;
-OnTouch:	// effect ?
-	end;
-}
-1@advs,101,351,4	duplicate(#b_sw1)	#b_sw2	4_ENERGY_YELLOW,2,2
-1@advs,139,358,4	duplicate(#b_sw1)	#b_sw3	4_ENERGY_YELLOW,2,2
-1@advs,145,351,4	duplicate(#b_sw1)	#b_sw4	4_ENERGY_YELLOW,2,2
-
-// exit
-1@advs,123,358,4	script	#box_admin	4_ENERGY_YELLOW,2,2,{
-	.@is_hard = (instance_live_info(ILI_NAME) == "Villa of Deception Advanced");
-	if (isbegin_quest(12520) == 1 && !.@is_hard || isbegin_quest(12521) == 1 && .@is_hard) {
-		if (checkweight(1000405,10, 1000471,1) == 0) {
-			mes "- Wait a minute !! -";
-			mes "- Currently you're carrying -";
-			mes "- too many items with you. -";
-			mes "- Please try again -";
-			mes "- after you loose some weight. -";
-			close;
-		}
-		mes "^0000ffFound something in a bright glowing halo.^000000";
-		if (get_reputation_points(3) >= 5000)
-			.@bonus = 2;
-		getitem 1000405,8+.@bonus;	// Ep18_Amethyst_Fragment
-		if (.@is_hard)
-			erasequest 12521;
-		else
-			erasequest 12520;
-		if (rand(100) < 10)
-			getitem 1000471,1;
-		close;
-	}
-	mes "^0000ffI think you can get out now.^000000";
-	next;
-	if (select( "Cancel", "Exit" ) == 1)
-		end;
-	warp "wolfvill",77,258;
-	end;
-}
-
--- a/npc/re/instances/VillaofHighPriest.txt
+++ b/npc/re/instances/VillaofHighPriest.txt
--- a/npc/re/instances/Wolves.txt
+++ b/npc/re/instances/Wolves.txt
--- a/npc/re/merchants/ammo_boxes.txt
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -167,8 +167,8 @@ S_Sphere_Exchange:
 				case 1:
 					mes "[Kenny]";
 					mes "All done.";
-					delitem .@old_id, .@new_count * 10;
-					getitem .@new_id, .@new_count;
+					delitem .@slug_id, .@new_count * 10;
+					getitem .@new_slug_id, .@old_count;
 					close;
 				case 2:
 					close;
@@ -214,8 +214,8 @@ S_Old_Sphere_Exchange:
 				case 1:
 					mes "[Kenny]";
 					mes "All done.";
-					delitem .@old_id, .@old_count;
-					getitem .@new_id, .@old_count;
+					delitem .@slug_id, .@old_count;
+					getitem .@new_slug_id, .@old_count;
 					close;
 				case 2:
 					close;
@@ -262,7 +262,7 @@ S_Slug_Exchange:
 				case 1:
 					mes "[Kenny]";
 					mes "All done.";
-					delitem .@slug_id, .@new_count * .@req_count;
+					delitem .@slug_id, .@new_count * 500;
 					getitem 25187, .@new_count;
 					close;
 				case 2:
--- a/npc/re/merchants/barters.yml
+++ b/npc/re/merchants/barters.yml
@@ -60,4 +60,3 @@ Footer:
  - Path: npc/re/merchants/barters/enchan_illusion_dungeons.yml
  - Path: npc/re/merchants/barters/quests_exp_175.yml
  - Path: npc/re/merchants/barters/mysterious_cookie_shop.yml
-  - Path: npc/re/merchants/barters/quests_18_1.yml
--- a/npc/re/merchants/barters/enchan_illusion_dungeons.yml
+++ b/npc/re/merchants/barters/enchan_illusion_dungeons.yml
@@ -412,20 +412,6 @@ Body:
          - Index: 3
            Item: IllusionStone
            Amount: 120
-  - Name: resonance_stone_barter
-    Items:
-      - Index: 0
-        Item: ILL_Piece_A
-        RequiredItems:
-          - Index: 0
-            Item: IllusionStone
-            Amount: 10
-      - Index: 1
-        Item: ILL_Piece_B
-        RequiredItems:
-          - Index: 0
-            Item: IllusionStone
-            Amount: 10
  - Name: barter_ill_moonlight
    Items:
      - Index: 0
--- a/npc/re/merchants/barters/quests_18_1.yml
+++ b/npc/re/merchants/barters/quests_18_1.yml
@@ -1,132 +0,0 @@
-# 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/>.
-#
-###########################################################################
-# Barter Database
-###########################################################################
-#
-# Barter Settings
-#
-###########################################################################
-#  - Name               NPC name.
-#    Map                Map name. (Default: not on a map)
-#    X                  Map x coordinate. (Default: 0)
-#    Y                  Map y coordinate. (Default: 0)
-#    Direction          Direction the NPC is looking. (Default: North)
-#    Sprite             Sprite name of the NPC. (Default: FakeNpc)
-#    Items:             List of sold items.
-#      - Index          Index of the item inside the shop. (0-...)
-#                       Maximum index depends on client.
-#        Item           Aegis name of the item.
-#        Stock          Amount of item in stock. 0 means unlimited. (Default: 0)
-#        Zeny           Cost of them item in Zeny. (Default: 0)
-#        RequiredItems: List of required items (Optional)
-#          - Index      Index of the required item. (0-4)
-#            Item       Aegis name of required item.
-#            Amount     Amount of required item. (Default: 1)
-#            Refine     Refine level of required item. (Default: 0)
-###########################################################################
-
-Header:
-  Type: BARTER_DB
-  Version: 1
-
-Body:
-  - Name: barter_ep18_1
-    Items:
-      - Index: 0
-        Item: Gray_W_Suits
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 1
-        Item: Gray_W_Robe
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 2
-        Item: Gray_W_Manteau
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 3
-        Item: Gray_W_Muffler
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 4
-        Item: Gray_W_Boots
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 5
-        Item: Gray_W_Shoes
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 6
-        Item: Gray_W_Pendant
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 7
-        Item: Gray_W_Robe
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 8
-        Item: Gray_W_Ring
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-      - Index: 9
-        Item: Gray_W_Earing
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 350
-  - Name: barter_ep18_2
-    Items:
-      - Index: 0
-        Item: GrayWolf_7_Ticket
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 1050
-  - Name: barter_ep18_3
-    Items:
-      - Index: 0
-        Item: GrayWolf_7_Ticket
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 1050
-      - Index: 1
-        Item: GrayWolf_9_Ticket
-        RequiredItems:
-          - Index: 0
-            Item: Ep18_Amethyst_Fragment
-            Amount: 2250
--- a/npc/re/merchants/enchan_illusion_dungeons.txt
+++ b/npc/re/merchants/enchan_illusion_dungeons.txt
@@ -14,7 +14,6 @@
 //= 1.5 Added Illusion of Luanda enchanter [Capuche]
 //= 1.6 Added Illusion of Underwater exchange [Capuche]
 //= 1.7 Added Illusion of Twins enchanter [Capuche]
-//= 1.8 Added Illusion Merchant [Haydrich]
 //============================================================

 //============================================================
@@ -847,40 +846,3 @@ OnInit:
 	setunitdata .@npc_id, UNPC_HAIRCOLOR, 6;
 	end;
 }
-
-//============================================================
-//= Illusion Merchant
-//============================================================
-	marketshop	market_resonance_stone	-1,100003:2000000:99999,100004:2000000:99999
-prontera,88,113,5	script	Illusion Merchant#0829	HIDDEN_NPC,{
-	mes "[Illusion Merchant]";
-	mes "I'm selling two random optional weapon grant scrolls that I made myself. You can choose the payment method you like.";
-	next;
-	switch( select( "Purchase with Zeny.", "Purchase with Illusion Stones" )) {
-		case 1:
-			mes "[Illusion Merchant]";
-			mes "I hope you like it.";
-			close2;
-			callshop "market_resonance_stone";
-			end;
-		case 2:
-			mes "[Illusion Merchant]";
-			mes "I hope you like it.";
-			close2;
-			callshop "resonance_stone_barter";
-			end;
-	}
-OnInit:
-	.@npc_id = getnpcid(0);
-	setunitdata .@npc_id,UNPC_CLASS, JOB_MAGE_HIGH;
-	setunitdata .@npc_id,UNPC_SEX,SEX_FEMALE;
-	setunitdata .@npc_id,UNPC_HEADTOP,142;
-	setunitdata .@npc_id,UNPC_HEADMIDDLE,92;
-	setunitdata .@npc_id,UNPC_HAIRSTYLE,2;
-	setunitdata .@npc_id,UNPC_HAIRCOLOR,2;
-
-	// Restock
-	npcshopupdate "market_resonance_stone",100003,2000000,99999;
-	npcshopupdate "market_resonance_stone",100004,2000000,99999;
-	end;
-}
--- a/npc/re/mobs/championmobs.txt
+++ b/npc/re/mobs/championmobs.txt
@@ -3,334 +3,329 @@
 //===== By: ==================================================
 //= nanakiwurtz
 //===== Current Version: =====================================
-//= 1.2
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Additional Comments: =================================
 //= 1.0 First version
 //= 1.1 Correct Spawn by Navigation's mob data. [attackjom]
-//= 1.2 Correct respawn times and prontera field spawns [Playtester]
 //============================================================

-abbey01,0,0	monster	Swift Banshee	2887,3,180000
-abbey02,0,0	monster	Swift Zombie Slaughter	2603,3,180000
-abbey03,0,0	monster	Necromancer Ringleader	2736,2,180000
-abyss_01,0,0	monster	Furious Ferus	2832,2,180000
-abyss_02,0,0	monster	Acidus Ringleader	2913,2,180000
-abyss_03,0,0	monster	Solid Acidus	2912,2,180000
-alde_dun01,0,0	monster	Arclouze Ringleader	2894,1,180000
-alde_dun02,0,0	monster	Solid High Orc	2805,2,180000
-alde_dun03,0,0	monster	Furious Penomena	2717,2,180000
-alde_dun04,0,0	monster	Furious Bathory	2885,1,180000
-ama_dun01,0,0	monster	Miyabi Doll Ringleader	2746,2,180000
-ama_dun02,0,0	monster	Swift Poison Toad	2704,1,180000
-ama_dun03,0,0	monster	Furious Shinobi	2664,2,180000
-ama_fild01,0,0	monster	Swift Karakasa	2789,2,180000
-anthell01,0,0	monster	Elusive Deniro	2857,3,180000
-anthell02,0,0	monster	Solid Andre	2902,2,180000
-arug_dun01,0,0	monster	Elusive Banshee Master	2886,2,180000
-ayo_dun01,0,0	monster	Leaf Cat Ringleader	2781,2,180000
-ayo_dun02,0,0	monster	Furious Tamruan	2639,2,180000
-ayo_fild01,0,0	monster	Furious Smokie	2654,2,180000
-ayo_fild02,0,0	monster	Solid Yoyo	2609,1,180000
-beach_dun,0,0	monster	Swift Medusa	2759,2,180000
-beach_dun2,0,0	monster	Furious Stalactic Golem	2644,2,180000
-beach_dun3,0,0	monster	Elusive Thara Frog	2635,2,180000
-bif_fild01,0,0	monster	Miming Ringleader	2751,2,180000
-bif_fild02,0,0	monster	Furious Little Fatum	2777,2,180000
-bra_dun01,0,0	monster	Swift Piranha	2709,2,180000
-bra_dun02,0,0	monster	Solid Iara	2795,3,180000
-bra_fild01,0,0	monster	Furious Toucan	2630,3,180000
-c_tower1,0,0	monster	Solid Rideword	2682,2,180000
-c_tower2,0,0	monster	Furious Clock	2871,1,180000
-c_tower3,0,0	monster	Elusive Alarm	2910,1,180000
-c_tower4,0,0	monster	Clock Ringleader	2870,2,180000
-cmd_fild01,0,0	monster	Elusive Grove	2808,2,180000
-cmd_fild02,0,0	monster	Swift Seal	2829,3,180000
-cmd_fild03,0,0	monster	Solid Alligator	2907,3,180000
-cmd_fild04,0,0	monster	Sea Otter Ringleader	2668,2,180000
-cmd_fild06,0,0	monster	Furious Golem	2812,2,180000
-cmd_fild07,0,0	monster	Elusive Raggler	2694,2,180000
-cmd_fild08,0,0	monster	Elusive Deniro	2857,2,180000
-cmd_fild09,0,0	monster	Swift Metaller	2754,2,180000
-dew_dun01,0,0	monster	Elusive Comodo	2867,2,180000
-dew_dun02,0,0	monster	Solid Banaspaty	2888,2,180000
-dew_fild01,0,0	monster	Swift Rafflesia Arnoldi	2906,2,180000
-dic_dun01,0,0	monster	Swift Uni-horn Scaraba	2799,2,180000
-dic_dun02,0,0	monster	Elusive Antler Scaraba	2896,2,180000
-dic_dun03,0,0	monster	Furious Rake Scaraba	2693,2,180000
-dic_fild01,0,0	monster	Swift Centipede	2873,2,180000
-dic_fild02,0,0	monster	Dolomedes Ringleader	2850,2,180000
-ecl_fild01,0,0	monster	Elusive Menblatt	2758,1,180000
-ecl_tdun01,0,0	monster	Solid Cenere	2874,1,180000
-ecl_tdun02,0,0	monster	Solid Antique Book	2898,1,180000
-ecl_tdun03,0,0	monster	Swift Antique Book	2897,1,180000
-ein_dun01,0,0	monster	Elusive Pitman	2708,2,180000
-ein_dun02,0,0	monster	Solid Mineral	2750,2,180000
-ein_fild02,0,0	monster	Ungoliant Ringleader	2629,2,180000
-ein_fild03,0,0	monster	Swift Teddy Bear	2636,2,180000
-ein_fild04,0,0	monster	Venomous Ringleader	2624,2,180000
-ein_fild05,0,0	monster	Furious Noxious	2727,2,180000
-ein_fild06,0,0	monster	Solid Holden	2745,2,180000
-ein_fild07,0,0	monster	Metaling Ringleader	2756,2,180000
-ein_fild08,0,0	monster	Solid Metaling	2755,2,180000
-ein_fild09,0,0	monster	Solid Porcellio	2700,2,180000
-gef_dun00,0,0	monster	Furious Hunter Fly	2797,1,180000
-gef_dun01,0,0	monster	Elusive Ghoul	2823,2,180000
-gef_dun02,0,0	monster	Solid Deviruchi	2854,2,180000
-gef_dun03,0,0	monster	Solid Wind Ghost	2614,1,180000
-gef_fild00,0,0	monster	Elusive Chonchon	2872,2,180000
-gef_fild01,0,0	monster	Furious Roda Frog	2679,2,180000
-gef_fild02,0,0	monster	Solid Coco	2869,3,180000
-gef_fild03,0,0	monster	Solid Orc Lady	2725,3,180000
-gef_fild04,0,0	monster	Solid Mandragora	2765,2,180000
-gef_fild05,0,0	monster	Swift Creamy	2863,2,180000
-gef_fild06,0,0	monster	Solid Petite	2715,2,180000
-gef_fild07,0,0	monster	Swift Poring	2699,2,180000
-gef_fild08,0,0	monster	Swift Petite	2714,2,180000
-gef_fild09,0,0	monster	Swift Coco	2868,2,180000
-gef_fild10,0,0	monster	Furious Orc Warrior	2722,2,180000
-gef_fild11,0,0	monster	Swift Goblin	2814,3,180000
-gefenia01,0,0	monster	Swift False Angel	2834,2,180000
-gefenia02,0,0	monster	Solid Violy	2623,2,180000
-gefenia03,0,0	monster	Swift Violy	2622,2,180000
-gefenia04,0,0	monster	Elusive Violy	2621,2,180000
-gl_cas01,0,0	monster	Elusive Carat	2877,2,180000
-gl_cas02_,0,0	monster	Furious Wanderer (Nightmare)	2734,2,180000,0
-gl_cas02,0,0	monster	Furious Wanderer	2620,2,180000
-gl_church,0,0	monster	Elusive Evil Druid	2838,2,180000
+abbey02,0,0	monster	Swift Zombie Slaughter	2603,3,300000
+gl_prison,0,0	monster	Solid Zombie Prisoner	2604,1,300000
+gld_dun04,0,0	monster	Zombie Master Ringleader	2605,2,300000
+pay_dun00,0,0	monster	Furious Zombie	2606,2,300000
+schg_dun01,0,0	monster	Elusive Zakudam	2607,2,300000
+prt_fild03,0,0	monster	Swift Yoyo	2608,2,300000
+ayo_fild02,0,0	monster	Solid Yoyo	2609,1,300000
+pay_fild06,0,0	monster	Wormtail Ringleader	2610,3,300000
+um_fild02,0,0	monster	Furious Wootan Fighter	2611,1,300000
+mosk_dun01,0,0	monster	Elusive Wood Goblin	2612,2,300000
+moc_fild03,0,0	monster	Swift Wolf	2613,2,300000
+gl_step,0,0	monster	Solid Wind Ghost	2614,2,300000
+gef_dun03,0,0	monster	Solid Wind Ghost	2614,1,300000
+pay_fild01,0,0	monster	Willow Ringleader	2615,2,300000
+um_fild04,0,0	monster	Furious Wild Rose	2616,1,300000
+gon_dun03,0,0	monster	Elusive Evil Nymph	2617,2,300000
+gl_sew01,0,0	monster	Solid Whisper	2618,1,300000
+treasure_n2,0,0	monster	Weak Skeleton Ringleader	2619,2,300000
+gl_cas02,0,0	monster	Furious Wanderer	2620,2,300000
+gefenia04,0,0	monster	Elusive Violy	2621,2,300000
+gefenia03,0,0	monster	Swift Violy	2622,2,300000
+gefenia02,0,0	monster	Solid Violy	2623,2,300000
+ein_fild04,0,0	monster	Venomous Ringleader	2624,2,300000
+juperos_01,0,0	monster	Furious Venatu	2625,3,300000
+mosk_dun03,0,0	monster	Elusive Vavayaga	2626,2,300000
+ra_san01,0,0	monster	Swift Vanberk	2627,2,300000
+iz_dun01,0,0	monster	Solid Vadon	2628,2,300000
+ein_fild02,0,0	monster	Ungoliant Ringleader	2629,2,300000
+bra_fild01,0,0	monster	Furious Toucan	2630,3,300000
+ma_fild01,0,0	monster	Elusive Tiyanak	2631,2,300000
+prt_sewb4,0,0	monster	Solid Thief Bug	2632,2,300000
+prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,3,300000
+prt_sewb2,0,0	monster	Furious Thief Bug	2634,2,300000
+beach_dun3,0,0	monster	Elusive Thara Frog	2635,2,300000
+ein_fild03,0,0	monster	Swift Teddy Bear	2636,2,300000
+man_fild03,0,0	monster	Solid Tatacho	2637,1,300000
+mjo_dun01,0,0	monster	Tarou Ringleader	2638,2,300000
+ayo_dun02,0,0	monster	Furious Tamruan	2639,2,300000
+gl_sew03,0,0	monster	Elusive Sting	2640,2,300000
+lhz_fild02,0,0	monster	Swift Stem Worm	2641,2,300000
+moc_fild13,0,0	monster	Solid Steel Chonchon	2642,3,300000
+ve_fild07,0,0	monster	Stapo Ringleader	2643,2,300000
+beach_dun2,0,0	monster	Furious Stalactic Golem	2644,2,300000
+prt_fild02,0,0	monster	Elusive Stainer	2645,3,300000
+treasure_n1,0,0	monster	Swift Spore	2646,2,300000
+tur_dun02,0,0	monster	Solid Solider	2647,2,300000
+pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,3,300000
+pay_dun01,0,0	monster	Furious Soldier Skeleton	2649,2,300000
+tha_t09,0,0	monster	Elusive Lady Solace	2650,2,300000	//--Remove after Thanatos Ravamped Patch
+pay_dun03,0,0	monster	Swift Sohee	2651,2,300000
+ice_dun02,0,0	monster	Solid Snowier	2652,2,300000
+pay_fild02,0,0	monster	Boa Ringleader	2653,3,300000
+ayo_fild01,0,0	monster	Furious Smokie	2654,2,300000
+yuno_fild06,0,0	monster	Elusive Sleeper	2655,1,300000
+yuno_fild02,0,0	monster	Swift Sleeper	2656,2,300000
+odin_tem02,0,0	monster	Solid Skogul	2657,1,300000
+gld2_pay,0,0	monster	Skeleton General Ringleader	2658,2,300000
+gld_dun01_2,0,0	monster	Furious Skeleton General	2659,2,300000
+mjo_dun03,0,0	monster	Elusive Skeleton Worker	2660,2,300000
+ice_dun01,0,0	monster	Swift Siroma	2661,1,300000
+mosk_fild02,0,0	monster	Solid Side Winder	2662,1,300000
+mjolnir_03,0,0	monster	Side Winder Ringleader	2663,2,300000
+ama_dun03,0,0	monster	Furious Shinobi	2664,2,300000
+tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,300000	//--Remove after Thanatos Ravamped Patch
+hu_fild06,0,0	monster	Swift Shellfish	2666,1,300000
+lhz_dun03,0,0	monster	Solid Cecil Damon	2667,3,300000
+cmd_fild04,0,0	monster	Sea Otter Ringleader	2668,2,300000
+iz_dun05,0,0	monster	Furious Lamp Rey	2669,2,300000
+moc_fild18,0,0	monster	Elusive Scorpion	2670,3,300000
+mjolnir_09,0,0	monster	Swift Savage Babe	2671,2,300000
+prt_maze01,0,0	monster	Solid Savage	2672,2,300000
+mjolnir_07,0,0	monster	Savage Ringleader	2673,3,300000
+moc_fild16,0,0	monster	Furious Sandman	2674,2,300000
+thor_v03,0,0	monster	Elusive Salamander	2675,2,300000
+treasure02,0,0	monster	Swift Sailor Skeleton	2676,1,300000
+ra_fild12,0,0	monster	Solid Roween	2677,2,300000
+prt_fild00,0,0	monster	Roda Frog Ringleader	2678,2,300000
+gef_fild01,0,0	monster	Furious Roda Frog	2679,2,300000
+prt_fild07,0,0	monster	Elusive Rocker	2680,2,300000
+tha_t01,0,0	monster	Swift Rideword	2681,2,300000
+//tha_t01,0,0	monster	Swift Rideword	2681,1,300000	//--Applied after Thanatos Revamped Patch.
+c_tower1,0,0	monster	Solid Rideword	2682,2,300000
+gon_fild01,0,0	monster	Dumpling Child Ringleader	2683,2,300000
+tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,300000	//--Remove after Thanatos Ravamped Patch
+tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,2,300000
+//tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,1,300000	//--Applied after Thanatos Revamped Patch.
+tha_t07,0,0	monster	Swift Baroness of Retribution	2686,2,300000
+//tha_t07,0,0	monster	Swift Baroness of Retribution	2686,1,300000	//--Applied after Thanatos Revamped Patch.
+in_sphinx2,0,0	monster	Solid Requiem	2687,2,300000
+lhz_dun01,0,0	monster	Remover Ringleader	2688,3,300000
+mal_dun01,0,0	monster	Elusive Red Eruma	2689,2,300000
+gl_knt02,0,0	monster	Swift Raydric	2690,2,300000
+gl_knt01,0,0	monster	Solid Raydric	2691,2,300000
+lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,3,300000
+dic_dun03,0,0	monster	Furious Rake Scaraba	2693,2,300000
+cmd_fild07,0,0	monster	Elusive Raggler	2694,2,300000
+lhz_fild01,0,0	monster	Swift Rafflesia	2695,3,300000
+lhz_fild01,0,0	monster	Poring Ringleader	2696,2,300000
+lhz_fild01,0,0	monster	Furious Poring	2697,2,300000
+lhz_fild01,0,0	monster	Elusive Poring	2698,2,300000
+gef_fild07,0,0	monster	Swift Poring	2699,2,300000
+ein_fild09,0,0	monster	Solid Porcellio	2700,2,300000
+prt_maze03,0,0	monster	Poporing Ringleader	2701,2,300000
+prt_maze02,0,0	monster	Furious Poporing	2702,2,300000
+pay_fild04,0,0	monster	Elusive Poporing	2703,2,300000
+ama_dun02,0,0	monster	Swift Poison Toad	2704,1,300000
+mjolnir_06,0,0	monster	Solid Poison Spore	2705,3,300000
+odin_tem03,0,0	monster	Plasma Ringleader	2706,2,300000
+iz_dun00,0,0	monster	Furious Plankton	2707,2,300000
+ein_dun01,0,0	monster	Elusive Pitman	2708,2,300000
+bra_dun01,0,0	monster	Swift Piranha	2709,2,300000
+spl_fild01,0,0	monster	Solid Dark Pinguicula	2710,2,300000
+spl_fild02,0,0	monster	Pinguicula Ringleader	2711,2,300000
+moc_fild12,0,0	monster	Furious Picky	2712,2,300000
+iz_dun03,0,0	monster	Elusive Phen	2713,2,300000
+gef_fild08,0,0	monster	Swift Petite	2714,2,300000
+gef_fild06,0,0	monster	Solid Petite	2715,2,300000
+treasure02,0,0	monster	Penomena Ringleader	2716,2,300000
+alde_dun03,0,0	monster	Furious Penomena	2717,2,300000
+moc_fild02,0,0	monster	Elusive Peco Peco	2718,2,300000
+in_sphinx5,0,0	monster	Swift Pasana	2719,2,300000
+um_fild03,0,0	monster	Solid Parasite	2720,1,300000
+tha_t05,0,0	monster	Owl Duke Ringleader	2721,2,300000
+//tha_t05,0,0	monster	Owl Duke Ringleader	2721,3,300000	//--Applied after Thanatos Revamped Patch.
+gef_fild10,0,0	monster	Furious Orc Warrior	2722,2,300000
+orcsdun01,0,0	monster	Elusive Orc Zombie	2723,2,300000
+orcsdun02,0,0	monster	Swift Orc Skeleton	2724,2,300000
+gef_fild03,0,0	monster	Solid Orc Lady	2725,3,300000
+tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,300000	//--Remove after Thanatos Ravamped Patch
+ein_fild05,0,0	monster	Furious Noxious	2727,2,300000
+hu_fild05,0,0	monster	Elusive Novus	2728,2,300000
+hu_fild04,0,0	monster	Swift Novus	2729,2,300000
+hu_fild02,0,0	monster	Solid Novus	2730,2,300000
+hu_fild01,0,0	monster	Novus Ringleader	2731,2,300000
+mag_dun02,0,0	monster	Furious Nightmare Terror	2732,2,300000
 gl_chyard_,0,0	monster	Elusive Wraith Dead (Nightmare)	2733,2,180000,0
-gl_chyard,0,0	monster	Furious Dark Priest	2861,2,180000
-gl_dun01,0,0	monster	Solid Arclouze	2893,1,180000
-gl_dun02,0,0	monster	Furious Majoruros	2767,1,180000
-gl_in01,0,0	monster	Marionette Ringleader	2761,1,180000
-gl_knt01,0,0	monster	Solid Raydric	2691,2,180000
-gl_knt02,0,0	monster	Swift Raydric	2690,2,180000
-gl_prison,0,0	monster	Solid Zombie Prisoner	2604,1,180000
-gl_prison1,0,0	monster	Furious Injustice	2792,2,180000
-gl_sew01,0,0	monster	Solid Whisper	2618,1,180000
-gl_sew02,0,0	monster	Furious Gargoyle	2827,1,180000
-gl_sew03,0,0	monster	Elusive Sting	2640,2,180000
-gl_sew04,0,0	monster	Furious Anolian	2899,2,180000
-gl_step,0,0	monster	Solid Wind Ghost	2614,2,180000
-glast_01,0,0	monster	Gargoyle Ringleader	2826,1,180000
-gld_dun01_2,0,0	monster	Furious Skeleton General	2659,2,180000
-gld_dun01,0,0	monster	Solid Leib Olmai	2780,2,180000
-gld_dun02_2,0,0	monster	Swift Angra Mantis	2901,2,180000
-gld_dun02,0,0	monster	Giant Hornet Ringleader	2821,2,180000
-gld_dun03_2,0,0	monster	Elusive Dark Hammer Kobold	2818,2,180000
-gld_dun03,0,0	monster	Furious Caterpillar	2876,2,180000
-gld_dun04_2,0,0	monster	Solid Dark Shadow	2820,2,180000
-gld_dun04,0,0	monster	Zombie Master Ringleader	2605,2,180000
-gld2_ald,0,0	monster	Elusive Angra Mantis	2900,2,180000
-gld2_gef,0,0	monster	Swift Dark Shadow	2819,2,180000
-gld2_pay,0,0	monster	Skeleton General Ringleader	2658,2,180000
-gld2_prt,0,0	monster	Furious Dark Hammer Kobold	2817,2,180000
-gon_dun01,0,0	monster	Swift Bloody Butterfly	2883,2,180000
-gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,1,180000
-gon_dun03,0,0	monster	Elusive Evil Nymph	2617,2,180000
-gon_fild01,0,0	monster	Dumpling Child Ringleader	2683,2,180000
-hu_fild01,0,0	monster	Novus Ringleader	2731,2,180000
-hu_fild02,0,0	monster	Solid Novus	2730,2,180000
-hu_fild04,0,0	monster	Swift Novus	2729,2,180000
-hu_fild05,0,0	monster	Elusive Novus	2728,2,180000
-hu_fild06,0,0	monster	Swift Shellfish	2666,1,180000
-ice_dun01,0,0	monster	Swift Siroma	2661,1,180000
-ice_dun02,0,0	monster	Solid Snowier	2652,2,180000
-ice_dun03,0,0	monster	Swift Ice Titan	2794,2,180000
-in_sphinx1,0,0	monster	Elusive Drainliar	2847,1,180000
-in_sphinx2,0,0	monster	Solid Requiem	2687,2,180000
-in_sphinx3,0,0	monster	Elusive Marduk	2763,1,180000
-in_sphinx4,0,0	monster	Swift Minorous	2749,1,180000
-in_sphinx5,0,0	monster	Swift Pasana	2719,2,180000
-iz_dun00,0,0	monster	Furious Plankton	2707,2,180000
-iz_dun01,0,0	monster	Solid Vadon	2628,2,180000
-iz_dun02,0,0	monster	Solid Cornutus	2864,2,180000
-iz_dun03,0,0	monster	Elusive Phen	2713,2,180000
-iz_dun04,0,0	monster	Furious Merman	2757,2,180000
-iz_dun05,0,0	monster	Furious Lamp Rey	2669,2,180000
-jupe_core,0,0	monster	Swift Dimik	2853,3,180000
-juperos_01,0,0	monster	Furious Venatu	2625,3,180000
-juperos_02,0,0	monster	Furious Apocalypse	2895,3,180000
-kh_dun01,0,0	monster	Aliza Ringleader	2908,1,180000
-kh_dun02,0,0	monster	Furious Alicel	2909,1,180000
-kh_kiehl01,0,0	monster	Furious Constant	2866,2,180000
-lhz_dun01,0,0	monster	Remover Ringleader	2688,3,180000
-lhz_dun02,0,0	monster	Laurell Weinder Ringleader	2692,3,180000
-lhz_dun03,0,0	monster	Solid Cecil Damon	2667,3,180000
-lhz_dun04,0,0	monster	Celia Ringleader	2875,3,180000
-lhz_fild01,0,0	monster	Swift Rafflesia	2695,3,180000
-lhz_fild01,0,0	monster	Poring Ringleader	2696,2,180000
-lhz_fild01,0,0	monster	Furious Poring	2697,2,180000
-lhz_fild01,0,0	monster	Elusive Poring	2698,2,180000
-lhz_fild02,0,0	monster	Swift Stem Worm	2641,2,180000
-lhz_fild03,0,0	monster	Furious Breeze	2881,3,180000
-lou_dun01,0,0	monster	Elusive Jing Guai	2778,2,180000
-lou_dun02,0,0	monster	Yao Jun Ringleader	2796,1,180000
-lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,1,180000
-lou_fild01,0,0	monster	Elusive Mi Gao	2793,1,180000
-ma_dun01,0,0	monster	Manananggal Ringleader	2766,2,180000
-ma_fild01,0,0	monster	Elusive Tiyanak	2631,2,180000
-ma_fild02,0,0	monster	Solid Bungisngis	2879,2,180000
-mag_dun01,0,0	monster	Furious Explosion	2837,1,180000
-mag_dun02,0,0	monster	Furious Nightmare Terror	2732,2,180000
-mal_dun01,0,0	monster	Elusive Red Eruma	2689,2,180000
-man_fild01,0,0	monster	Solid Nephentes	2735,2,180000
-man_fild02,0,0	monster	Elusive Bradium Golem	2882,2,180000
-man_fild03,0,0	monster	Solid Tatacho	2637,1,180000
-mjo_dun01,0,0	monster	Tarou Ringleader	2638,2,180000
-mjo_dun02,0,0	monster	Solid Martin	2760,2,180000
-mjo_dun03,0,0	monster	Elusive Skeleton Worker	2660,2,180000
-mjolnir_01,0,0	monster	Swift Caramel	2878,2,180000
-mjolnir_02,0,0	monster	Solid Elder Willow	2840,3,180000
-mjolnir_03,0,0	monster	Side Winder Ringleader	2663,2,180000
-mjolnir_04,0,0	monster	Furious Driller	2846,3,180000
-mjolnir_05,0,0	monster	Swift Argiope	2892,2,180000
-mjolnir_06,0,0	monster	Solid Poison Spore	2705,3,180000
-mjolnir_07,0,0	monster	Savage Ringleader	2673,3,180000
-mjolnir_08,0,0	monster	Furious Beetle King	2787,2,180000
-mjolnir_09,0,0	monster	Swift Savage Babe	2671,2,180000
-mjolnir_10,0,0	monster	Furious Argos	2890,2,180000
-mjolnir_11,0,0	monster	Elusive Argiope	2891,2,180000
-mjolnir_12,0,0	monster	Furious Dustiness	2842,2,180000
-moc_fild01,0,0	monster	Muka Ringleader	2741,3,180000
-moc_fild02,0,0	monster	Elusive Peco Peco	2718,2,180000
-moc_fild03,0,0	monster	Swift Wolf	2613,2,180000
-moc_fild07,0,0	monster	Drops Ringleader	2845,3,180000
-moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,3,180000
-moc_fild12,0,0	monster	Furious Picky	2712,2,180000
-moc_fild13,0,0	monster	Solid Steel Chonchon	2642,3,180000
-moc_fild16,0,0	monster	Furious Sandman	2674,2,180000
-moc_fild17,0,0	monster	Furious Hode	2802,2,180000
-moc_fild18,0,0	monster	Elusive Scorpion	2670,3,180000
-moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,1,180000
-moc_fild21,0,0	monster	Elusive Incarnation of Morocc	2743,2,180000
-moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,3,180000
-moc_pryd02,0,0	monster	Solid Mummy	2740,2,180000
-moc_pryd03,0,0	monster	Swift Mummy	2739,2,180000
-moc_pryd04,0,0	monster	Solid Isis	2790,2,180000
-moc_pryd05,0,0	monster	Elusive Minorous	2748,2,180000
-moc_pryd06,0,0	monster	Elusive Mimic	2753,2,180000
-moc_prydn1,0,0	monster	Furious Minorous	2747,2,180000
-moc_prydn2,0,0	monster	Furious Mimic	2752,2,180000
-mosk_dun01,0,0	monster	Elusive Wood Goblin	2612,2,180000
-mosk_dun02,0,0	monster	Swift Les	2779,1,180000
-mosk_dun03,0,0	monster	Elusive Vavayaga	2626,2,180000
-mosk_fild02,0,0	monster	Solid Side Winder	2662,1,180000
-nameless_n,0,0	monster	Furious Ghoul	2822,1,180000
-new_1-3,0,0	monster	Baby Poring Ringleader	2776,2,180000
-nif_fild01,0,0	monster	Elusive Disguise	2852,2,180000
-nif_fild02,0,0	monster	Swift Loli Ruri	2774,1,180000
-niflheim,0,0	monster	Furious Lude	2772,1,180000
-nyd_dun01,0,0	monster	Solid Draco	2849,2,180000
-odin_tem01,0,0	monster	Breeze Ringleader	2880,1,180000
-odin_tem02,0,0	monster	Solid Skogul	2657,1,180000
-odin_tem03,0,0	monster	Plasma Ringleader	2706,2,180000
-orcsdun01,0,0	monster	Elusive Orc Zombie	2723,2,180000
-orcsdun02,0,0	monster	Swift Orc Skeleton	2724,2,180000
-pay_dun00,0,0	monster	Furious Zombie	2606,2,180000
-pay_dun01,0,0	monster	Furious Soldier Skeleton	2649,2,180000
-pay_dun02,0,0	monster	Soldier Skeleton Ringleader	2648,3,180000
-pay_dun03,0,0	monster	Swift Sohee	2651,2,180000
-pay_dun04,0,0	monster	Furious Dokebi	2851,2,180000
-pay_fild01,0,0	monster	Willow Ringleader	2615,2,180000
-pay_fild02,0,0	monster	Boa Ringleader	2653,3,180000
-pay_fild03,0,0	monster	Fabre Ringleader	2836,3,180000
-pay_fild04,0,0	monster	Elusive Poporing	2703,2,180000
-pay_fild06,0,0	monster	Wormtail Ringleader	2610,3,180000
-pay_fild07,0,0	monster	Bigfoot Ringleader	2884,2,180000
-pay_fild09,0,0	monster	Solid Horn	2800,2,180000
-pay_fild10,0,0	monster	Swift Greatest General	2809,2,180000
-prt_fild00,0,0	monster	Roda Frog Ringleader	2678,2,180000
-prt_fild01,0,0	monster	Lunatic Ringleader	2771,2,180000
-prt_fild02,0,0	monster	Elusive Stainer	2645,3,180000
-prt_fild03,0,0	monster	Swift Yoyo	2608,2,180000
-prt_fild04,0,0	monster	Elusive Ambernite	2905,2,180000
-prt_fild05,0,0	monster	Elusive Hornet	2798,2,180000
-prt_fild06,0,0	monster	Solid Fabre	2835,2,180000
-prt_fild07,0,0	monster	Elusive Rocker	2680,3,180000
-prt_fild08,0,0	monster	Solid Lunatic	2770,1,180000
-prt_fild08,0,0	monster	Poring Ringleader	2696,1,180000
-prt_fild08,0,0	monster	Furious Poring	2697,1,180000
-prt_fild08,0,0	monster	Elusive Poring	2698,1,180000
-prt_fild08,0,0	monster	Swift Poring	2699,1,180000
-prt_fild09,0,0	monster	Elusive Magnolia	2768,2,180000
-prt_fild10,0,0	monster	Swift Elder Willow	2839,3,180000
-prt_fild11,0,0	monster	Elusive Goblin	2813,3,180000
-prt_maze01,0,0	monster	Solid Savage	2672,2,180000
-prt_maze02,0,0	monster	Furious Poporing	2702,2,180000
-prt_maze03,0,0	monster	Poporing Ringleader	2701,2,180000
-prt_maze03,0,0	monster	Swift Mantis	2764,2,180000
-prt_sewb1,0,0	monster	Elusive Familiar	2833,1,180000
-prt_sewb2,0,0	monster	Furious Thief Bug	2634,2,180000
-prt_sewb3,0,0	monster	Thief Bug Ringleader	2633,3,180000
-prt_sewb4,0,0	monster	Solid Thief Bug	2632,2,180000
-ra_fild01,0,0	monster	Baby Desert Wolf Ringleader	2855,2,180000
-ra_fild03,0,0	monster	Swift Hill Wind	2804,3,180000
-ra_fild04,0,0	monster	Elusive Hill Wind	2803,3,180000
-ra_fild05,0,0	monster	Solid Kobold	2785,3,180000
-ra_fild06,0,0	monster	Swift Kobold Archer	2784,3,180000
-ra_fild08,0,0	monster	Furious Anacondaq	2904,2,180000
-ra_fild12,0,0	monster	Solid Roween	2677,2,180000
-ra_san01,0,0	monster	Swift Vanberk	2627,2,180000
-ra_san02,0,0	monster	Isilla Ringleader	2791,2,180000
-ra_san03,0,0	monster	Hodremlin Ringleader	2801,2,180000
-ra_san04,0,0	monster	Echio Ringleader	2841,1,180000
-ra_san05,0,0	monster	Swift Agav	2911,2,180000
-schg_dun01,0,0	monster	Elusive Zakudam	2607,2,180000
-spl_fild01,0,0	monster	Solid Dark Pinguicula	2710,2,180000
-spl_fild02,0,0	monster	Pinguicula Ringleader	2711,2,180000
-spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,1,180000
-teg_dun01,0,0	monster	Elusive Eremes	2783,2,180000,0
-teg_dun02,0,0	monster	Furious Wickebine Tres	2782,2,180000,0
-tha_t01,0,0	monster	Swift Rideword	2681,2,180000
-//tha_t01,0,0	monster	Swift Rideword	2681,1,180000	//--Applied after Thanatos Revamped Patch.
-tha_t02,0,0	monster	Ancient Mimic Ringleader	2903,2,180000
-tha_t03,0,0	monster	Death Word Ringleader	2860,2,180000
-tha_t04,0,0	monster	Solid Death Word	2859,2,180000
-tha_t05,0,0	monster	Owl Duke Ringleader	2721,2,180000
-//tha_t05,0,0	monster	Owl Duke Ringleader	2721,3,180000	//--Applied after Thanatos Revamped Patch.
-tha_t06,0,0	monster	Swift Death Word	2858,2,180000
-//tha_t06,0,0	monster	Swift Death Word	2858,3,180000	//--Applied after Thanatos Revamped Patch.
-tha_t07,0,0	monster	Swift Baroness of Retribution	2686,2,180000
-//tha_t07,0,0	monster	Swift Baroness of Retribution	2686,1,180000	//--Applied after Thanatos Revamped Patch.
-tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,2,180000
-//tha_t08,0,0	monster	Elusive Baroness of Retribution	2685,1,180000	//--Applied after Thanatos Revamped Patch.
-tha_t09,0,0	monster	Elusive Lady Solace	2650,2,180000	//--Remove after Thanatos Ravamped Patch
-tha_t10,0,0	monster	Furious Baroness of Retribution	2684,2,180000	//--Remove after Thanatos Ravamped Patch
-tha_t11,0,0	monster	Elusive Mistress of Shelter	2665,2,180000	//--Remove after Thanatos Ravamped Patch
-tha_t12,0,0	monster	Dame of Sentinel Ringleader	2726,2,180000	//--Remove after Thanatos Ravamped Patch
-thor_v01,0,0	monster	Elusive Kasa	2788,2,180000
-thor_v02,0,0	monster	Knocker Ringleader	2786,1,180000
-thor_v03,0,0	monster	Elusive Salamander	2675,2,180000
-treasure_n1,0,0	monster	Swift Spore	2646,2,180000
-treasure_n2,0,0	monster	Weak Skeleton Ringleader	2619,2,180000
-treasure02,0,0	monster	Swift Sailor Skeleton	2676,1,180000
-treasure02,0,0	monster	Penomena Ringleader	2716,2,180000
-tur_dun01,0,0	monster	Swift Dragon Tail	2848,1,180000
-tur_dun02,0,0	monster	Solid Solider	2647,2,180000
-tur_dun03,0,0	monster	Freezer Ringleader	2831,1,180000
-tur_dun04,0,0	monster	Assaulter Ringleader	2889,1,180000
-tur_dun05,0,0	monster	Solid Freezer	2830,1,180000
-um_fild01,0,0	monster	Swift Dryad	2843,2,180000
-um_fild02,0,0	monster	Furious Wootan Fighter	2611,1,180000
-um_fild03,0,0	monster	Solid Parasite	2720,1,180000
-um_fild04,0,0	monster	Furious Wild Rose	2616,1,180000
-ve_fild01,0,0	monster	Elusive Galion	2828,1,180000
-ve_fild02,0,0	monster	Solid Drosera	2844,2,180000
-ve_fild03,0,0	monster	Swift Magmaring	2769,2,180000
-ve_fild04,0,0	monster	Elusive Muscipular	2738,2,180000
-ve_fild07,0,0	monster	Stapo Ringleader	2643,2,180000
-xmas_dun01,0,0	monster	Cookie Ringleader	2865,2,180000
-xmas_dun02,0,0	monster	Furious Myst Case	2737,2,180000
-xmas_fild01,0,0	monster	Furious Marin	2762,1,180000
-yuno_fild01,0,0	monster	Solid Geographer	2825,2,180000
-yuno_fild02,0,0	monster	Swift Sleeper	2656,2,180000
-yuno_fild03,0,0	monster	Furious Harpy	2807,3,180000
-yuno_fild04,0,0	monster	Harpy Ringleader	2806,3,180000
-yuno_fild06,0,0	monster	Elusive Sleeper	2655,1,180000
-yuno_fild07,0,0	monster	Goat Ringleader	2816,2,180000
-yuno_fild08,0,0	monster	Grand Peco Ringleader	2811,2,180000
-yuno_fild09,0,0	monster	Solid Grand Peco	2810,2,180000
-yuno_fild11,0,0	monster	Solid Goat	2815,2,180000
-yuno_fild12,0,0	monster	Swift Geographer	2824,1,180000
+gl_cas02_,0,0	monster	Furious Wanderer (Nightmare)	2734,2,180000,0
+man_fild01,0,0	monster	Solid Nephentes	2735,2,300000
+abbey03,0,0	monster	Necromancer Ringleader	2736,2,300000
+xmas_dun02,0,0	monster	Furious Myst Case	2737,2,300000
+ve_fild04,0,0	monster	Elusive Muscipular	2738,2,300000
+moc_pryd03,0,0	monster	Swift Mummy	2739,2,300000
+moc_pryd02,0,0	monster	Solid Mummy	2740,2,300000
+moc_fild01,0,0	monster	Muka Ringleader	2741,3,300000
+moc_fild22,0,0	monster	Furious Incarnation of Morocc	2742,3,300000
+moc_fild21,0,0	monster	Elusive Incarnation of Morocc	2743,2,300000
+moc_fild20,0,0	monster	Swift Incarnation of Morocc	2744,1,300000
+ein_fild06,0,0	monster	Solid Holden	2745,2,300000
+ama_dun01,0,0	monster	Miyabi Doll Ringleader	2746,2,300000
+moc_prydn1,0,0	monster	Furious Minorous	2747,2,300000
+moc_pryd05,0,0	monster	Elusive Minorous	2748,2,300000
+in_sphinx4,0,0	monster	Swift Minorous	2749,1,300000
+ein_dun02,0,0	monster	Solid Mineral	2750,2,300000
+bif_fild01,0,0	monster	Miming Ringleader	2751,2,300000
+moc_prydn2,0,0	monster	Furious Mimic	2752,2,300000
+moc_pryd06,0,0	monster	Elusive Mimic	2753,2,300000
+cmd_fild09,0,0	monster	Swift Metaller	2754,2,300000
+ein_fild08,0,0	monster	Solid Metaling	2755,2,300000
+ein_fild07,0,0	monster	Metaling Ringleader	2756,2,300000
+iz_dun04,0,0	monster	Furious Merman	2757,2,300000
+ecl_fild01,0,0	monster	Elusive Menblatt	2758,1,300000
+beach_dun,0,0	monster	Swift Medusa	2759,2,300000
+mjo_dun02,0,0	monster	Solid Martin	2760,2,300000
+gl_in01,0,0	monster	Marionette Ringleader	2761,1,300000
+xmas_fild01,0,0	monster	Furious Marin	2762,1,300000
+in_sphinx3,0,0	monster	Elusive Marduk	2763,1,300000
+prt_maze03,0,0	monster	Swift Mantis	2764,2,300000
+gef_fild04,0,0	monster	Solid Mandragora	2765,2,300000
+ma_dun01,0,0	monster	Manananggal Ringleader	2766,2,300000
+gl_dun02,0,0	monster	Furious Majoruros	2767,1,300000
+prt_fild09,0,0	monster	Elusive Magnolia	2768,2,300000
+ve_fild03,0,0	monster	Swift Magmaring	2769,2,300000
+prt_fild08,0,0	monster	Solid Lunatic	2770,1,300000
+prt_fild01,0,0	monster	Lunatic Ringleader	2771,2,300000
+niflheim,0,0	monster	Furious Lude	2772,1,300000
+spl_fild03,0,0	monster	Elusive Luciola Vespa	2773,1,300000
+nif_fild02,0,0	monster	Swift Loli Ruri	2774,1,300000
+gon_dun02,0,0	monster	Solid Enchanted Peach Tree	2775,1,300000
+new_1-3,0,0	monster	Baby Poring Ringleader	2776,2,300000
+bif_fild02,0,0	monster	Furious Little Fatum	2777,2,300000
+lou_dun01,0,0	monster	Elusive Jing Guai	2778,2,300000
+mosk_dun02,0,0	monster	Swift Les	2779,1,300000
+gld_dun01,0,0	monster	Solid Leib Olmai	2780,2,300000
+ayo_dun01,0,0	monster	Leaf Cat Ringleader	2781,2,300000
+teg_dun02,0,0	monster	Furious Wickebine Tres	2782,2,300000,0
+teg_dun01,0,0	monster	Elusive Eremes	2783,2,300000,0
+ra_fild06,0,0	monster	Swift Kobold Archer	2784,3,300000
+ra_fild05,0,0	monster	Solid Kobold	2785,3,300000
+thor_v02,0,0	monster	Knocker Ringleader	2786,1,300000
+mjolnir_08,0,0	monster	Furious Beetle King	2787,2,300000
+thor_v01,0,0	monster	Elusive Kasa	2788,2,300000
+ama_fild01,0,0	monster	Swift Karakasa	2789,2,300000
+moc_pryd04,0,0	monster	Solid Isis	2790,2,300000
+ra_san02,0,0	monster	Isilla Ringleader	2791,2,300000
+gl_prison1,0,0	monster	Furious Injustice	2792,2,300000
+lou_fild01,0,0	monster	Elusive Mi Gao	2793,1,300000
+ice_dun03,0,0	monster	Swift Ice Titan	2794,2,300000
+bra_dun02,0,0	monster	Solid Iara	2795,3,300000
+lou_dun02,0,0	monster	Yao Jun Ringleader	2796,1,300000
+gef_dun00,0,0	monster	Furious Hunter Fly	2797,1,300000
+prt_fild05,0,0	monster	Elusive Hornet	2798,2,300000
+dic_dun01,0,0	monster	Swift Uni-horn Scaraba	2799,2,300000
+pay_fild09,0,0	monster	Solid Horn	2800,2,300000
+ra_san03,0,0	monster	Hodremlin Ringleader	2801,2,300000
+moc_fild17,0,0	monster	Furious Hode	2802,2,300000
+ra_fild04,0,0	monster	Elusive Hill Wind	2803,3,300000
+ra_fild03,0,0	monster	Swift Hill Wind	2804,3,300000
+alde_dun02,0,0	monster	Solid High Orc	2805,2,300000
+yuno_fild04,0,0	monster	Harpy Ringleader	2806,3,300000
+yuno_fild03,0,0	monster	Furious Harpy	2807,3,300000
+cmd_fild01,0,0	monster	Elusive Grove	2808,2,300000
+pay_fild10,0,0	monster	Swift Greatest General	2809,2,300000
+yuno_fild09,0,0	monster	Solid Grand Peco	2810,2,300000
+yuno_fild08,0,0	monster	Grand Peco Ringleader	2811,2,300000
+cmd_fild06,0,0	monster	Furious Golem	2812,2,300000
+prt_fild11,0,0	monster	Elusive Goblin	2813,3,300000
+gef_fild11,0,0	monster	Swift Goblin	2814,3,300000
+yuno_fild11,0,0	monster	Solid Goat	2815,2,300000
+yuno_fild07,0,0	monster	Goat Ringleader	2816,2,300000
+gld2_prt,0,0	monster	Furious Dark Hammer Kobold	2817,2,300000
+gld_dun03_2,0,0	monster	Elusive Dark Hammer Kobold	2818,2,300000
+gld2_gef,0,0	monster	Swift Dark Shadow	2819,2,300000
+gld_dun04_2,0,0	monster	Solid Dark Shadow	2820,2,300000
+gld_dun02,0,0	monster	Giant Hornet Ringleader	2821,2,300000
+nameless_n,0,0	monster	Furious Ghoul	2822,1,300000
+gef_dun01,0,0	monster	Elusive Ghoul	2823,2,300000
+yuno_fild12,0,0	monster	Swift Geographer	2824,1,300000
+yuno_fild01,0,0	monster	Solid Geographer	2825,2,300000
+glast_01,0,0	monster	Gargoyle Ringleader	2826,1,300000
+gl_sew02,0,0	monster	Furious Gargoyle	2827,1,300000
+ve_fild01,0,0	monster	Elusive Galion	2828,1,300000
+cmd_fild02,0,0	monster	Swift Seal	2829,3,300000
+tur_dun05,0,0	monster	Solid Freezer	2830,1,300000
+tur_dun03,0,0	monster	Freezer Ringleader	2831,1,300000
+abyss_01,0,0	monster	Furious Ferus	2832,2,300000
+prt_sewb1,0,0	monster	Elusive Familiar	2833,1,300000
+gefenia01,0,0	monster	Swift False Angel	2834,2,300000
+prt_fild06,0,0	monster	Solid Fabre	2835,2,300000
+pay_fild03,0,0	monster	Fabre Ringleader	2836,3,300000
+mag_dun01,0,0	monster	Furious Explosion	2837,1,300000
+gl_church,0,0	monster	Elusive Evil Druid	2838,2,300000
+prt_fild10,0,0	monster	Swift Elder Willow	2839,3,300000
+mjolnir_02,0,0	monster	Solid Elder Willow	2840,3,300000
+ra_san04,0,0	monster	Echio Ringleader	2841,1,300000
+mjolnir_12,0,0	monster	Furious Dustiness	2842,2,300000
+um_fild01,0,0	monster	Swift Dryad	2843,2,300000
+ve_fild02,0,0	monster	Solid Drosera	2844,2,300000
+moc_fild07,0,0	monster	Drops Ringleader	2845,3,300000
+mjolnir_04,0,0	monster	Furious Driller	2846,3,300000
+in_sphinx1,0,0	monster	Elusive Drainliar	2847,1,300000
+tur_dun01,0,0	monster	Swift Dragon Tail	2848,1,300000
+nyd_dun01,0,0	monster	Solid Draco	2849,2,300000
+dic_fild02,0,0	monster	Dolomedes Ringleader	2850,2,300000
+pay_dun04,0,0	monster	Furious Dokebi	2851,2,300000
+nif_fild01,0,0	monster	Elusive Disguise	2852,2,300000
+jupe_core,0,0	monster	Swift Dimik	2853,3,300000
+gef_dun02,0,0	monster	Solid Deviruchi	2854,2,300000
+ra_fild01,0,0	monster	Baby Desert Wolf Ringleader	2855,2,300000
+moc_fild11,0,0	monster	Furious Baby Desert Wolf	2856,3,300000
+cmd_fild08,0,0	monster	Elusive Deniro	2857,2,300000
+anthell01,0,0	monster	Elusive Deniro	2857,3,300000
+tha_t06,0,0	monster	Swift Death Word	2858,2,300000
+//tha_t06,0,0	monster	Swift Death Word	2858,3,300000	//--Applied after Thanatos Revamped Patch.
+tha_t04,0,0	monster	Solid Death Word	2859,2,300000
+tha_t03,0,0	monster	Death Word Ringleader	2860,2,300000
+gl_chyard,0,0	monster	Furious Dark Priest	2861,2,300000
+lou_dun03,0,0	monster	Elusive Zhu Po Long	2862,1,300000
+gef_fild05,0,0	monster	Swift Creamy	2863,2,300000
+iz_dun02,0,0	monster	Solid Cornutus	2864,2,300000
+xmas_dun01,0,0	monster	Cookie Ringleader	2865,2,300000
+kh_kiehl01,0,0	monster	Furious Constant	2866,2,300000
+dew_dun01,0,0	monster	Elusive Comodo	2867,2,300000
+gef_fild09,0,0	monster	Swift Coco	2868,2,300000
+gef_fild02,0,0	monster	Solid Coco	2869,3,300000
+c_tower4,0,0	monster	Clock Ringleader	2870,2,300000
+c_tower2,0,0	monster	Furious Clock	2871,1,300000
+gef_fild00,0,0	monster	Elusive Chonchon	2872,2,300000
+dic_fild01,0,0	monster	Swift Centipede	2873,2,300000
+ecl_tdun01,0,0	monster	Solid Cenere	2874,1,300000
+lhz_dun04,0,0	monster	Celia Ringleader	2875,3,300000
+gld_dun03,0,0	monster	Furious Caterpillar	2876,2,300000
+gl_cas01,0,0	monster	Elusive Carat	2877,2,300000
+mjolnir_01,0,0	monster	Swift Caramel	2878,2,300000
+ma_fild02,0,0	monster	Solid Bungisngis	2879,2,300000
+odin_tem01,0,0	monster	Breeze Ringleader	2880,1,300000
+lhz_fild03,0,0	monster	Furious Breeze	2881,3,300000
+man_fild02,0,0	monster	Elusive Bradium Golem	2882,2,300000
+gon_dun01,0,0	monster	Swift Bloody Butterfly	2883,2,300000
+pay_fild07,0,0	monster	Bigfoot Ringleader	2884,2,300000
+alde_dun04,0,0	monster	Furious Bathory	2885,1,300000
+arug_dun01,0,0	monster	Elusive Banshee Master	2886,2,300000
+abbey01,0,0	monster	Swift Banshee	2887,3,300000
+dew_dun02,0,0	monster	Solid Banaspaty	2888,2,300000
+tur_dun04,0,0	monster	Assaulter Ringleader	2889,1,300000
+mjolnir_10,0,0	monster	Furious Argos	2890,2,300000
+mjolnir_11,0,0	monster	Elusive Argiope	2891,2,300000
+mjolnir_05,0,0	monster	Swift Argiope	2892,2,300000
+gl_dun01,0,0	monster	Solid Arclouze	2893,1,300000
+alde_dun01,0,0	monster	Arclouze Ringleader	2894,1,300000
+juperos_02,0,0	monster	Furious Apocalypse	2895,3,300000
+dic_dun02,0,0	monster	Elusive Antler Scaraba	2896,2,300000
+ecl_tdun03,0,0	monster	Swift Antique Book	2897,1,300000
+ecl_tdun02,0,0	monster	Solid Antique Book	2898,1,300000
+gl_sew04,0,0	monster	Furious Anolian	2899,2,300000
+gld2_ald,0,0	monster	Elusive Angra Mantis	2900,2,300000
+gld_dun02_2,0,0	monster	Swift Angra Mantis	2901,2,300000
+anthell02,0,0	monster	Solid Andre	2902,2,300000
+tha_t02,0,0	monster	Ancient Mimic Ringleader	2903,2,300000
+ra_fild08,0,0	monster	Furious Anacondaq	2904,2,300000
+prt_fild04,0,0	monster	Elusive Ambernite	2905,2,300000
+dew_fild01,0,0	monster	Swift Rafflesia Arnoldi	2906,2,300000
+cmd_fild03,0,0	monster	Solid Alligator	2907,3,300000
+kh_dun01,0,0	monster	Aliza Ringleader	2908,1,300000
+kh_dun02,0,0	monster	Furious Alicel	2909,1,300000
+c_tower3,0,0	monster	Elusive Alarm	2910,1,300000
+ra_san05,0,0	monster	Swift Agav	2911,2,300000
+abyss_03,0,0	monster	Solid Acidus	2912,2,300000
+abyss_02,0,0	monster	Acidus Ringleader	2913,2,300000
--- a/npc/re/mobs/dungeons/lhz_dun_n.txt
+++ b/npc/re/mobs/dungeons/lhz_dun_n.txt
@@ -9,66 +9,35 @@
 //		monsters killed. [Capuche]
 //============================================================

-lhz_dun_n,0,0	monster	Eremes Guille	3208,20,5000,0,"lhz_dun_n::OnRegularDead3208"
-lhz_dun_n,0,0	monster	Magaleta Sorin	3209,10,5000,0,"lhz_dun_n::OnRegularDead3209"
-lhz_dun_n,0,0	monster	Catherine Cheiron	3210,15,5000,0,"lhz_dun_n::OnRegularDead3210"
-lhz_dun_n,0,0	monster	Shecil Damon	3211,20,5000,0,"lhz_dun_n::OnRegularDead3211"
-lhz_dun_n,0,0	monster	Harword Alt-Eisen	3212,10,5000,0,"lhz_dun_n::OnRegularDead3212"
-lhz_dun_n,0,0	monster	Seyren Windsor	3213,10,5000,0,"lhz_dun_n::OnRegularDead3213"
+lhz_dun_n,0,0	monster	Eremes Guille	3208,20,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Magaleta Sorin	3209,10,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Catherine Cheiron	3210,15,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Shecil Damon	3211,20,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Harword Alt-Eisen	3212,10,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Seyren Windsor	3213,10,5000,0,"lhz_dun_n::OnRegularDead"

-lhz_dun_n,0,0	monster	Randel Lawrence	3226,10,5000,0,"lhz_dun_n::OnRegularDead3226"
-lhz_dun_n,0,0	monster	Flamel Emule	3227,10,5000,0,"lhz_dun_n::OnRegularDead3227"
-lhz_dun_n,0,0	monster	Celia Alde	3228,15,5000,0,"lhz_dun_n::OnRegularDead3228"
-lhz_dun_n,0,0	monster	Chen Liu	3229,15,5000,0,"lhz_dun_n::OnRegularDead3229"
-lhz_dun_n,0,0	monster	Gertie Wie	3230,15,5000,0,"lhz_dun_n::OnRegularDead3230"
-lhz_dun_n,0,0	monster	Alphoccio Basil	3231,10,5000,0,"lhz_dun_n::OnRegularDead3231"
-lhz_dun_n,0,0	monster	Trentini	3232,10,5000,0,"lhz_dun_n::OnRegularDead3232"
+lhz_dun_n,0,0	monster	Randel Lawrence	3226,10,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Flamel Emule	3227,10,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Celia Alde	3228,15,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Chen Liu	3229,15,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Gertie Wie	3230,15,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Alphoccio Basil	3231,10,5000,0,"lhz_dun_n::OnRegularDead"
+lhz_dun_n,0,0	monster	Trentini	3232,10,5000,0,"lhz_dun_n::OnRegularDead"

 lhz_dun_n,0,0,0	script	lhz_dun_n	-1,{
 	end;
-OnRegularDead3208: callsub( S_Regular, 3208 );
-OnRegularDead3209: callsub( S_Regular, 3209 );
-OnRegularDead3210: callsub( S_Regular, 3210 );
-OnRegularDead3211: callsub( S_Regular, 3211 );
-OnRegularDead3212: callsub( S_Regular, 3212 );
-OnRegularDead3213: callsub( S_Regular, 3213 );
-
-OnRegularDead3226: callsub( S_Regular, 3226 );
-OnRegularDead3227: callsub( S_Regular, 3227 );
-OnRegularDead3228: callsub( S_Regular, 3228 );
-OnRegularDead3229: callsub( S_Regular, 3229 );
-OnRegularDead3230: callsub( S_Regular, 3230 );
-OnRegularDead3231: callsub( S_Regular, 3231 );
-OnRegularDead3232: callsub( S_Regular, 3232 );
-
-S_Regular:
-	.@mob_id = getarg(0);
+OnRegularDead:
+	.@mob_id = killedrid;
 	if (.lhz_dun_n[.@mob_id] < 110 && .lhz_dun_n_boss == 0) {
 		.lhz_dun_n[.@mob_id]++;
 		if (.lhz_dun_n[.@mob_id] == 110) {
-			.@mini_boss = .@mob_id + 6 + (.@mob_id > 3219);	// mini boss version ID: regular ID +6 for non-transcendent, +7 for others
-			monster "lhz_dun_n",0,0,"--en--",.@mini_boss,1, "lhz_dun_n::OnMiniDead" + .@mini_boss;
+			.@mini_boss = .@mob_id + 6 + (.@mob_id > 3213);	// mini boss version ID: regular ID +6 for non-transcendent, +7 for others
+			monster "lhz_dun_n",0,0,"--en--",.@mini_boss,1, "lhz_dun_n::OnMiniDead";
 		}
 	}
 	end;
-
-OnMiniDead3214: callsub( S_Mini, 3214 );
-OnMiniDead3215: callsub( S_Mini, 3215 );
-OnMiniDead3216: callsub( S_Mini, 3216 );
-OnMiniDead3217: callsub( S_Mini, 3217 );
-OnMiniDead3218: callsub( S_Mini, 3218 );
-OnMiniDead3219: callsub( S_Mini, 3219 );
-
-OnMiniDead3233: callsub( S_Mini, 3233 );
-OnMiniDead3234: callsub( S_Mini, 3234 );
-OnMiniDead3235: callsub( S_Mini, 3235 );
-OnMiniDead3236: callsub( S_Mini, 3236 );
-OnMiniDead3237: callsub( S_Mini, 3237 );
-OnMiniDead3238: callsub( S_Mini, 3238 );
-OnMiniDead3239: callsub( S_Mini, 3239 );
-
-S_Mini:
-	.@mob_id = getarg(0);
+OnMiniDead:
+	.@mob_id = killedrid;
 	if (.lhz_dun_n[.@mob_id] < 4 && .lhz_dun_n_boss == 0) {
 		.lhz_dun_n[.@mob_id]++;
 		.@regular = .@mob_id - 6 - (.@mob_id > 3219);
@@ -84,7 +53,11 @@ S_Mini:
 			monster "lhz_dun_n",140,230,"--en--", F_Rand(3220,3221,3222,3223,3224,3225,3240,3241,3242,3243,3244,3245,3246),1, "lhz_dun_n::OnMyMVPDead";
 			mapannounce "lhz_dun_n", "Voice of Reaper: It's been a while.", bc_map;	// unknown message
 			.lhz_dun_n_boss = 1;
-			deletearray .lhz_dun_n;
+			for ( .@i = 0; .@i < 13; ++.@i ) {	
+				.@regular = .@mini_boss_list[.@i] - 6 - (.@mini_boss_list[.@i] > 3219);
+				.lhz_dun_n[.@regular] = 0;
+				.lhz_dun_n[.@mini_boss_list[.@i]] = 0;
+			}
 		}
 	}
 	end;
--- a/npc/re/mobs/dungeons/oz_dun.txt
+++ b/npc/re/mobs/dungeons/oz_dun.txt
@@ -1,17 +0,0 @@
-//===== rAthena Script =======================================
-//= oz_dun Monsters Spawn Script
-//===== Current Version: =====================================
-//= 1.0
-//===== Additional Comments: =================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-oz_dun01	monster	Rake Hand	21296,70
-oz_dun01	monster	Ash Toad	21295,65
-oz_dun01	monster	Spark	21297,10
-
-oz_dun02	monster	Spark	21297,25
-oz_dun02	monster	Volcaring	21299,35
-oz_dun02	monster	Lava Toad	21300,25
-oz_dun02	monster	Hot Molar	21298,60
-oz_dun02	boss_monster	Burning Fang	21301,1,21600000,600000,0
--- a/npc/re/mobs/fields/gw_fild.txt
+++ b/npc/re/mobs/fields/gw_fild.txt
@@ -1,17 +0,0 @@
-//===== rAthena Script =======================================
-//= gw_fild Monsters Spawn Script
-//===== Current Version: =====================================
-//= 1.0
-//===== Additional Comments: =================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-gw_fild01	monster	Ashhopper	21302,50
-gw_fild01	monster	Ashring	21303,70
-gw_fild01	monster	Grey Wolf	21304,35
-
-gw_fild02	monster	Ashring	21303,15
-gw_fild02	monster	Bushring	21305,60
-gw_fild02	monster	Phantom Wolf	21307,25
-gw_fild02	monster	Grey Wolf	21304,35
-gw_fild02	monster	Firewind Kite	21306,35
--- a/npc/re/mobs/fields/prontera.txt
+++ b/npc/re/mobs/fields/prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.8
+//= 1.7
 //===== Additional Comments: =================================
 //= 1.2 fixed some map name typos [Lupus]
 //= 1.3 Official kRO 10.1 spawns [Playtester]
@@ -11,7 +11,6 @@
 //= 1.5 Updated to Renewal spawns.
 //= 1.6 Added Prontera Field 8 duplicates. [Euphy]
 //= 1.7 Correct Spawn by Navigation's mob data. [attackjom]
-//= 1.8 Official 18.1 Field 8 spawns, duplicates removed [Playtester]
 //============================================================

 //==================================================
@@ -91,27 +90,36 @@ prt_fild07,225,110,5,5	monster	Black Mushroom	1084,3,360000,180000
 //==================================================
 // prt_fild08 - Prontera Field
 //==================================================
-prt_fild08,0,0	monster	Poring	1002,20,5000
-prt_fild08,0,0	monster	Lunatic	1063,20,5000
-prt_fild08,0,0	monster	Fabre	1007,10,5000
-prt_fild08,305,233,10,10	monster	Poring	1002,2,15000
-prt_fild08,305,233,10,10	monster	Lunatic	1063,2,15000
-prt_fild08,305,233,10,10	monster	Fabre	1007,2,15000
-prt_fild08,271,249,20,20	monster	Poring	1002,5,15000
-prt_fild08,271,249,20,20	monster	Lunatic	1063,5,15000
-prt_fild08,271,249,20,20	monster	Fabre	1007,5,15000
-prt_fild08,94,335,50,50	monster	Poring	1002,20,10000
-prt_fild08,166,334,50,50	monster	Poring	1002,20,10000
-prt_fild08,253,337,50,50	monster	Poring	1002,20,10000
-prt_fild08,228,230,30,30	monster	Lunatic	1063,10,10000
-prt_fild08,246,263,50,50	monster	Lunatic	1063,10,10000
-prt_fild08,190,237,50,50	monster	Lunatic	1063,10,10000
-prt_fild08,100,256,50,50	monster	Lunatic	1063,10,10000
-prt_fild08,70,164,70,70	monster	Fabre	1007,20,10000
-prt_fild08,144,147,70,70	monster	Fabre	1007,20,10000
-prt_fild08,263,79,90,90	monster	Fabre	1007,20,10000
-prt_fild08,336,113,40,40	monster	Pupa	1008,20,10000
-prt_fild08,330,269,40,40	monster	Little Poring	2398,20,10000
+prt_fild08,0,0	monster	Poring	1002,110,5000
+prt_fild08,0,0	monster	Lunatic	1063,110,5000
+prt_fild08,0,0	monster	Fabre	1007,88,5000
+prt_fild08,0,0	monster	Little Poring	2398,33,50000
+prt_fild08,0,0	monster	Pupa	1008,66,5000
+
+//==================================================
+// prt_fild08 - Duplicates
+//==================================================
+prt_fild08a,0,0	monster	Poring	1002,110,5000
+prt_fild08a,0,0	monster	Lunatic	1063,110,5000
+prt_fild08a,0,0	monster	Fabre	1007,88,5000
+prt_fild08a,0,0	monster	Little Poring	2398,33,50000
+prt_fild08a,0,0	monster	Pupa	1008,66,5000
+prt_fild08b,0,0	monster	Poring	1002,110,5000
+prt_fild08b,0,0	monster	Lunatic	1063,110,5000
+prt_fild08b,0,0	monster	Fabre	1007,88,5000
+prt_fild08b,0,0	monster	Little Poring	2398,33,50000
+prt_fild08b,0,0	monster	Pupa	1008,66,5000
+prt_fild08c,0,0	monster	Poring	1002,110,5000
+prt_fild08c,0,0	monster	Lunatic	1063,110,5000
+prt_fild08c,0,0	monster	Fabre	1007,88,5000
+prt_fild08c,0,0	monster	Little Poring	2398,33,50000
+prt_fild08c,0,0	monster	Pupa	1008,66,5000
+prt_fild08d,0,0	monster	Poring	1002,110,5000
+prt_fild08d,0,0	monster	Lunatic	1063,110,5000
+prt_fild08d,0,0	monster	Fabre	1007,88,5000
+prt_fild08d,0,0	monster	Little Poring	2398,33,50000
+prt_fild08d,0,0	monster	Pupa	1008,66,5000
+

 //==================================================
 // prt_fild09 - Prontera Field
--- a/npc/re/mobs/fields/rachel.txt
+++ b/npc/re/mobs/fields/rachel.txt
@@ -82,23 +82,12 @@ ra_fild08,0,0	monster	Anopheles	1627,15,5000
 //==================================================

 //==================================================
-// ra_fild10
+// ra_fild10 - Disabled on Renewal
 //==================================================
-ra_fild10	monster	Drosera	1781,5
-ra_fild10	monster	Magmaring	1836,5
-ra_fild10	monster	Grey Baby Wolf	21324,50
-ra_fild10	monster	Grey Goat	21323,60
-ra_fild10	monster	Rake Hand	21296,5

 //==================================================
-// ra_fild11
+// ra_fild11 - Disabled on Renewal
 //==================================================
-ra_fild11	monster	Red Plant	1078,5
-ra_fild11	monster	Yellow Plant	1081,15
-ra_fild11	monster	Drosera	1781,10
-ra_fild11	monster	Grey Baby Wolf	21324,50
-ra_fild11	monster	Grey Goat	21323,70
-ra_fild11	monster	Rake Hand	21296,5

 //==================================================
 // ra_fild12 - The Plain of Ida
--- a/npc/re/quests/quests_17_2.txt
+++ b/npc/re/quests/quests_17_2.txt
@@ -4007,21 +4007,12 @@ OnInit:
 }


-// ba_in01,26,266,3	script	Smart Ellie#ep18ely01	4_EP17_TABLET,{
 ba_in01,26,266,3	script	Smart Ellie#ep172_ely01	4_EP17_TABLET,{
 	if (checkweight(1000103,15) == 0) {
 		mes "You cannot proceed with the quest because you have too many items in your possession.";
 		mes "Please clean up your inventory and try again.";
 		close;
 	}
-	if (ep17_2_main < 32) {
-		cutin "ep172_beta.bmp", 2;
-		mes "[Ellie]";
-		mes "Hello, guest.";
-		mes "I'm responsible for the airship hangar's information.";
-		mes "Please call me Ellie.";
-		close3;
-	}
 	if (ep17_2_main == 32) {
 		cutin "ep172_beta",2;
 		mes "[Ellie]";
@@ -4148,179 +4139,6 @@ ba_in01,26,266,3	script	Smart Ellie#ep172_ely01	4_EP17_TABLET,{
 		cloakonnpcself( "Rookie#ep172_rk03" );
 		end;
 	}
-	if (ep18_1_main == 0 && BaseLevel >= 170) {
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "The periodic signal has not yet been received.";
-		mes "The whereabouts of your master's collection#3 are also being tracked.";
-		next;
-		mes "[Ellie]";
-		mes "Don't worry.";
-		mes "Time is on our side";
-		next;
-		mes "[Ellie]";
-		mes "I and Alpha will analyze the information properly, so if you clean up the abandoned remnants... Ah!";
-		next;
-		mes "[Ellie]";
-		mes "Please don't go anywhere for a moment.";
-		mes "It will be over soon";
-		mes "Time was on our side, wasn't it?";
-		next;
-		// note: progressbar_npc must be after "next" otherwise the client may crash
-		progressbar_npc "FFFF00",4;
-		mes "[Ellie]";
-		mes "Wait a minute...";
-		mes "...";
-		mes "...";
-		next;
-		mes "[Ellie]";
-		mes "As soon as the password is decrypted, it will be fast.";
-		mes "The thing that took the longest is an instant.";
-		next;
-		mes "[Ellie]";
-		mes "There is something in ^0000FFRachel^000000";
-		mes "Of course I've only heard of Rachel, but I've never been there.";
-		mes "The 'collaborators' there don't seem to know that their heads have moved yet.";
-		next;
-		mes "[Ellie]";
-		mes "Although we don't know where your master's Collection#3 is yet, we'll have to keep an eye out for information coming in here...";
-		mes "what if?";
-		next;
-		select( "What?" );
-		mes "[" + strcharinfo(0) + "]";
-		mes "What are you doing?";
-		next;
-		mes "[Ellie]";
-		mes "The collaborator's position has been roughly secured. Reportedly 'waiting for your next instruction',";
-		mes "Then, before the next instruction is issued, we should catch up on that side as soon as possible...";
-		cloakoffnpcself( "Rookie#ep181_rk01" );
-		cloakoffnpcself( "EST#ep181_est01" );
-		npctalk "Rookie: Did you call?", "Rookie#ep181_rk01", bc_self;
-		npctalk "EST: It ended sooner than I thought.", "EST#ep181_est01", bc_self;
-		next;
-		cutin "ep162_est01.bmp",1;
-		mes "[EST]";
-		mes "Okay then Rachel...";
-		next;
-		cutin "16loo_01.bmp",0;
-		mes "[Rookie]";
-		mes "Rachel... who's going?";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "Is this a conflict of opinion?";
-		next;
-		cutin "16loo_03.bmp",0;
-		mes "[Rookie]";
-		mes "It's not like that...";
-		mes "I think it will be a bit difficult if we all go.";
-		next;
-		cutin "ep162_est01.bmp",1;
-		mes "[EST]";
-		mes "Ah... I see.";
-		mes "Yes. If 'Rebellion' moves, it could become a diplomatic matter.";
-		next;
-		cutin "16loo_03.bmp",0;
-		mes "[Rookie]";
-		mes "Yes. Especially if it's Rachel.";
-		mes "The problem between the mansion and the business has not yet been fully resolved...";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "Okay.";
-		next;
-		mes "[Ellie]";
-		mes "Then...";
-		next;
-		select( "Why are you looking at me?" );
-		cutin "",255;
-		mes "[" + strcharinfo(0) + "]";
-		mes "what are you doing?";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "Let's go, Rachel.";
-		npctalk "Rookie: name.", "Rookie#ep181_rk01", bc_self;
-		npctalk "Est: Name.", "EST#ep181_est01", bc_self;
-		next;
-		mes "[Ellie]";
-		mes "Are other guests affiliated?";
-		mes "It is difficult when disputes arise because of jurisdiction.";
-		mes "You never know how long it will take, so it's not suitable for a companion.";
-		next;
-		cutin "ep162_est01.bmp",1;
-		mes "[EST]";
-		mes "It sounds like you want to go there yourself.";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "Yes.";
-		mes "Please wait a minute.";
-		next;
-		progressbar_npc "00CCFF",7;
-		mes "[Ellie]";
-		mes "...";
-		next;
-		mes "[Ellie]";
-		mes "You have permission.";
-		npctalk "Meeting ended.", "", bc_self;
-		next;
-		mes "[Ellie]";
-		mes "The purpose is support, not hindrance.";
-		mes "I will follow you without burden.";
-		mes "I'll give you this.";
-		next;
-		cutin "",255;
-		mes "What Ellie gave her was a doll with a slightly droopy feel that resembled Ellie.";
-		mes "It may not necessarily be Ellie.";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "We have equipment that can transmit and receive data over long distances.";
-		mes "Because we are such beings.";
-		next;
-		mes "[Ellie]";
-		mes "But things are a little different now, so I'll give you a simple beta.";
-		npctalk "Be sure to take it with you", "", bc_self;
-		next;
-		cutin "16loo_02.bmp",0;
-		mes "[Rookie]";
-		mes "Uh... Mini Ellie?";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "Okay. I'll take that name.";
-		mes "Using the resources of the main body, it is possible to collect visual and auditory information and communicate like a clone.";
-		next;
-		mes "[Ellie]";
-		mes "There is no individual core, so the information obtained is not shared between betas unless I update it,";
-		mes "If communication is lost, it's just a doll.";
-		next;
-		cutin "16loo_01.bmp",0;
-		mes "[Rookie]";
-		mes "Then call us if you need assistance.";
-		mes "Like Ellie, we will provide generous support except for the manpower.";
-		next;
-		cutin "ep172_beta.bmp",2;
-		mes "[Ellie]";
-		mes "It will be so";
-		mes "Please take care of yourself.";
-		npctalk "I'm going with you, but it's strange to greet you like this.", "", bc_self;
-		next;
-		mes "[Ellie]";
-		mes "The almost exact coordinates from which the signal was sent...";
-		mes "About <NAVI>[here]<INFO>rachel,182,176,0,101,0</INFO></NAVI>";
-		ep18_1_main = 1;
-		setquest 8681;
-		getitem 400127,1;	// Ep18_Mini_Elly
-		close3;
-	}
-	if (ep18_1_main == 1) {
-		mes "[Ellie]";
-		mes "Please be safe.";
-		close;
-
-	}
 	cutin "ep172_beta",2;
 	mes "[Ellie]";
 	mes "No intermittent signal has been received yet.";
@@ -4334,13 +4152,10 @@ ba_in01,26,266,3	script	Smart Ellie#ep172_ely01	4_EP17_TABLET,{
 	mes "Me and Alpha will analyze the information properly, so I'd like you to clean up the intruders remnant.";
 	close3;

-OnInit:
+// OnInit:
 	// note: commented (no questinfo at this point)
 	// questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(18018) == 1" );
-
-	// check for episode 17.2 completion
-	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(8681) == 0 && isbegin_quest(18018) == 2 && BaseLevel >= 170" );
-	end;
+	// end;
 }

 ba_in01,22,262,5	duplicate(dummy_cloaked_npc)	Est#ep172_est02	4_F_ESTLOVELOY
--- a/npc/re/quests/quests_18_1.txt
+++ b/npc/re/quests/quests_18_1.txt
--- a/npc/re/quests/quests_illusion_dungeons.txt
+++ b/npc/re/quests/quests_illusion_dungeons.txt
@@ -9563,7 +9563,6 @@ iz_d04_i,127,228,4	script	Jerrymon#jerry3	1_M_01,{
 			.@menu$[0] = "^999999" + getitemname(25899) + " Collection - Pending^000000";
 			break;
 		case 2:
-			.@menu$[0] = "Collect " + getitemname(25899) + "";
 			break;
 		}

@@ -9587,7 +9586,6 @@ iz_d04_i,127,228,4	script	Jerrymon#jerry3	1_M_01,{
 			.@menu$[1] = "^999999Deep Sea Creatures Killed - Pending^000000";
 			break;
 		case 2:
-			.@menu$[1] = "Kill Deep Sea Creatures";
 			break;
 		}

--- a/npc/re/scripts_athena.conf
+++ b/npc/re/scripts_athena.conf
@@ -85,7 +85,6 @@ npc: npc/re/instances/IsleOfBios.txt
 npc: npc/re/instances/LastRoom.txt
 npc: npc/re/instances/LostFarm.txt
 npc: npc/re/instances/MalangdoCulvert.txt
-npc: npc/re/instances/MazeofOz.txt
 npc: npc/re/instances/MorseCave.txt
 npc: npc/re/instances/NightmarishJitterbug.txt
 npc: npc/re/instances/OctopusCave.txt
@@ -100,16 +99,12 @@ npc: npc/re/instances/SaraMemory.txt
 npc: npc/re/instances/SealedOs.txt
 npc: npc/re/instances/SkyFortress.txt
 npc: npc/re/instances/TempleOfDemonGod.txt
-npc: npc/re/instances/ThorGunsuBase.txt
 npc: npc/re/instances/TwilightGarden.txt
-npc: npc/re/instances/VillaofDeception.txt
-npc: npc/re/instances/VillaofHighPriest.txt
 npc: npc/re/instances/WaterGarden.txt
 //npc: npc/re/instances/WaveMode.txt
 npc: npc/re/instances/WeekendDungeon.txt
 npc: npc/re/instances/WernerLaboratoryCentralRoom.txt
 npc: npc/re/instances/WolfchevLaboratory.txt
-npc: npc/re/instances/Wolves.txt
 //npc: npc/custom/official/GeffenMagicTournament.txt

 // ---------------- Kafras & Cool Event Corp. -------------------
@@ -243,7 +238,6 @@ npc: npc/re/quests/quests_16_2.txt
 npc: npc/re/quests/quests_illusion_dungeons.txt
 npc: npc/re/quests/quests_17_1.txt
 npc: npc/re/quests/quests_17_2.txt
-npc: npc/re/quests/quests_18_1.txt
 npc: npc/re/quests/quests_aldebaran.txt
 npc: npc/re/quests/quests_brasilis.txt
 npc: npc/re/quests/quests_dewata.txt
--- a/npc/re/scripts_mapflags.conf
+++ b/npc/re/scripts_mapflags.conf
@@ -21,4 +21,3 @@ npc: npc/re/mapflag/restricted.txt
 npc: npc/re/mapflag/town.txt
 npc: npc/re/mapflag/reset.txt
 npc: npc/re/mapflag/skill_duration.txt
-npc: npc/re/mapflag/nodynamicnpc.txt
--- a/npc/re/scripts_monsters.conf
+++ b/npc/re/scripts_monsters.conf
@@ -55,7 +55,6 @@ npc: npc/re/mobs/dungeons/nif_dun.txt
 npc: npc/re/mobs/dungeons/nyd_dun.txt
 npc: npc/re/mobs/dungeons/odin.txt
 npc: npc/re/mobs/dungeons/orcsdun.txt
-npc: npc/re/mobs/dungeons/oz_dun.txt
 npc: npc/re/mobs/dungeons/pay_dun.txt
 npc: npc/re/mobs/dungeons/prt_maze.txt
 npc: npc/re/mobs/dungeons/prt_prison.txt
@@ -87,7 +86,6 @@ npc: npc/re/mobs/fields/eclage.txt
 npc: npc/re/mobs/fields/einbroch.txt
 npc: npc/re/mobs/fields/geffen.txt
 npc: npc/re/mobs/fields/gonryun.txt
-npc: npc/re/mobs/fields/gw_fild.txt
 npc: npc/re/mobs/fields/hugel.txt
 npc: npc/re/mobs/fields/lighthalzen.txt
 npc: npc/re/mobs/fields/louyang.txt
--- a/npc/re/scripts_warps.conf
+++ b/npc/re/scripts_warps.conf
@@ -30,11 +30,9 @@ npc: npc/re/warps/dungeons/iz_dun.txt
 npc: npc/re/warps/dungeons/mag_dun.txt
 npc: npc/re/warps/dungeons/moc_pryd.txt
 npc: npc/re/warps/dungeons/nif_dun.txt
-npc: npc/re/warps/dungeons/oz_dun.txt
 npc: npc/re/warps/dungeons/rockmi1.txt
 npc: npc/re/warps/dungeons/sp_rudus.txt
 npc: npc/re/warps/dungeons/slabw01.txt
-npc: npc/re/warps/dungeons/thor_v.txt

 // --------------------------- Fields ---------------------------
 npc: npc/re/warps/fields/bif_fild.txt
@@ -42,7 +40,6 @@ npc: npc/re/warps/fields/bra_fild.txt
 npc: npc/re/warps/fields/com_fild.txt
 npc: npc/re/warps/fields/dic_fild.txt
 npc: npc/re/warps/fields/geffen_fild.txt
-npc: npc/re/warps/fields/gw_fild.txt
 npc: npc/re/warps/fields/hugel_fild.txt
 npc: npc/re/warps/fields/morroc_fild.txt
 npc: npc/re/warps/fields/payon_fild.txt
--- a/npc/re/warps/cities/rachel.txt
+++ b/npc/re/warps/cities/rachel.txt
@@ -106,7 +106,7 @@ ra_temsky,99,135,0	warp	rachel71	1,1,ra_temsky,99,113
 ra_temsky,137,139,0	warp	rachel72	1,1,ra_temsky,109,143
 ra_temsky,62,139,0	warp	rachel73	1,1,ra_temsky,91,143

-rachel,25,125,0	warp	rachel74	1,1,ra_fild11,353,226
+//rachel,25,125,0	warp	rachel74	1,1,ra_fild11,353,226
 rachel,275,125,0	warp	rachel75	1,1,ra_fild12,40,226
 rachel,130,21,0	warp	rachel76	1,1,ve_fild02,195,377

--- a/npc/re/warps/dungeons/oz_dun.txt
+++ b/npc/re/warps/dungeons/oz_dun.txt
@@ -1,10 +0,0 @@
-//===== rAthena Script =======================================
-//= Warps
-//===== Description: =========================================
-//= Warp Points for oz_dun
-//===== Additional Comments: =================================
-//= 1.0 First version. [Capuche]
-//============================================================
-
-oz_dun01,112,30,0	warp	to_oz_dun02	1,1,oz_dun02,142,279
-oz_dun02,142,284,0	warp	to_oz_dun01	1,1,oz_dun01,112,34
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Atemo	1a572258f4	Updated format	2024-01-26 15:39:45 +01:00
Atemo	c8729f5bd6	Updated ResultRefine * Converted ResultRefine to a ResultRefine array * Converted the values between ResultRefineMinimum and ResultRefineMaximum to a ResultRefine array	2024-01-16 15:12:24 +01:00
Atemo	5c8555791e	Merge branch 'master' into hotfix/issue6669	2024-01-14 20:57:35 +01:00
Atemo	b2a74e228e	Added rate per refine in laphine upgrade	2022-09-07 14:21:30 +02:00