Fixed different signedness

Removed accidentally committed test script
Merge branch 'master' into feature/array_sort
2024-06-13 01:40:23 +02:00 · 2024-06-13 01:33:18 +02:00 · 2024-06-13 01:30:52 +02:00 · 2018-06-14 22:14:23 +02:00 · 2018-02-02 17:31:05 +01:00 · 2018-01-11 00:06:51 +07:00
194 changed files with 26394 additions and 40261 deletions
--- a/conf/atcommands.yml
+++ b/conf/atcommands.yml
@ -1032,11 +1032,6 @@ Body:
  - Command: setcard 
    Help: |
      Adds a card or enchant to the specific slot of the equipment.
-  - Command: resetcooltime
-    Aliases:
-      - resetcooldown
-    Help: |
-      Resets the cooldown of all skills of the player and if active also of the homunculus or the mercenary.

 Footer:
  Imports:
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@ -17,18 +17,10 @@
 // 0x10: They display luk/3+1 instead of their actual critical in the
 //       stat window (by default they don't crit)
 // 0x20: Their Min-Matk is always the same as their max
+// 0x40: Skill re-use delay is reset when they are vaporized.
+// 0x80: Skill re-use delay is reset when they are warped (by skill or item) with player.
 hom_setting: 0x3D

-// Should the cooldown or aftercast delay of homunculi skills be reset when
-// the homunculus is vaporized?
-// Default on official servers: yes for Pre-renewal, no for Renewal
-//hom_delay_reset_vaporize: no
-
-// Should the cooldown or aftercast delay of homunculi skills be reset when
-// warping or changing maps?
-// Default on official servers: yes for Pre-renewal, no for Renewal
-//hom_delay_reset_warp: no
-
 // The rate a homunculus will get friendly by feeding it. (Note 2)
 homunculus_friendly_rate: 100

--- a/conf/battle/instance.conf
+++ b/conf/battle/instance.conf
@ -1,27 +0,0 @@
-//--------------------------------------------------------------
-// rAthena Battle Configuration File
-// Originally Translated by Peter Kieser <pfak@telus.net>
-// Made in to plainer English by Ancyker
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Block leaving for parties, guilds or clans if they have an active instance?
-// Default: yes (Official)
-instance_block_leave: yes
-
-// Block leader changes for parties or guilds if they have an active instance?
-// Default: yes (Official)
-instance_block_leaderchange: yes
-
-// Block inviting for parties or guilds if they have an active instance?
-// This also blocks joining parties, guilds or clans that have a running instance.
-// Default: yes (Official)
-instance_block_invite: yes
-
-// Block expulsion for parties or guilds if they have an active instance?
-// Default: yes (Official)
-instance_block_expulsion: yes
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@ -12,10 +12,8 @@
 // The highest value at which an item can be sold via the merchant vend skill. (in zeny)
 vending_max_value: 1000000000

-// Whether to allow placing items on a vending store when the player's zeny plus the total price
-// of the items exceeds the maximum zeny allowed. (Note 1)
-// If set to "yes", the items will be placed in the store but other players will not be able to buy them.
-// Official behavior is "yes", but on some official servers the client doesn't allow this.
+// Whether to allow buying from vending chars that are at their max. zeny limit.
+// If set to yes, the rest of the zeny above the char's capacity will disappear.
 vending_over_max: yes

 // Tax to apply to all vending transactions (eg: 10000 = 100%, 50 = 0.50%)
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@ -295,12 +295,15 @@ trait_points_job_change: 7

 // Max trait stats cap.
 // Trait Stats: POW, STA, WIS, SPL, CON, CRT
-// Official is 110.
-max_trait_parameter: 110
+// Official is 100.
+max_trait_parameter: 100

-// Max percent of RES/MRES that can be ignored by item bonus/skill.
-// Default: 50
-max_res_mres_ignored: 50
+// Max amount of RES/MRES to take into the resistance damage reduction formula.
+// A setting of 625 means the max reduction of damage allowed is 50.0%.
+// Formula is 100 - 100 * (5000 + RES) / (5000 + 10 * RES)
+// Note: Best to leave this setting alone unless you know what your doing.
+// Default: 625
+max_res_mres_reduction: 625

 // Maximum AP
 // Default: 1000
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@ -270,10 +270,8 @@ allow_skill_without_day: no
 // Allow use of ES-type magic on players?
 allow_es_magic_player: no

-// Miracle of the Sun, Moon and Stars skill ratio
-// Valid values range from 1 (0.005% per hit) to 20000 (100% per hit)
-// This chance is further reduced if AGI is above 46 (92 = halved chance)
-sg_miracle_skill_ratio: 1
+// Miracle of the Sun, Moon and Stars skill ratio (100% = 10000)
+sg_miracle_skill_ratio: 2

 // Miracle of the Sun, Moon and Stars skill duration in milliseconds
 sg_miracle_skill_duration: 3600000
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@ -8,9 +8,6 @@
 //General battle-related settings.
 import: conf/battle/battle.conf

-//Battleground settings
-import: conf/battle/battleground.conf
-
 //Settings specific to the client.
 import: conf/battle/client.conf

@ -20,20 +17,14 @@ import: conf/battle/drops.conf
 //Experience rates, exp penalties, stats and max level settings.
 import: conf/battle/exp.conf

-//Feature control (on/off) settings
-import: conf/battle/feature.conf
-
 //GM levels, atcommands and hack-related configs.
 import: conf/battle/gm.conf

 //Guild and WoE settings
 import: conf/battle/guild.conf

-//Homunc related configuration
-import: conf/battle/homunc.conf
-
-//Instance settings
-import: conf/battle/instance.conf
+//Battleground settings
+import: conf/battle/battleground.conf

 //Item/card-specific and crafting related options.
 import: conf/battle/items.conf
@ -41,16 +32,15 @@ import: conf/battle/items.conf
 //Mob related configuration
 import: conf/battle/monster.conf

-// Anything else that didn't fit anywhere else.
-// Includes duel, day/night, mute/manner, log settings.
-import: conf/battle/misc.conf
-
 //Party related configuration
 import: conf/battle/party.conf

 //Pet related configuration
 import: conf/battle/pet.conf

+//Homunc related configuration
+import: conf/battle/homunc.conf
+
 //Player specific settings
 import: conf/battle/player.conf

@ -60,5 +50,12 @@ import: conf/battle/skill.conf
 //Status change related settings
 import: conf/battle/status.conf

+//Feature control (on/off) settings
+import: conf/battle/feature.conf
+
+// Anything else that didn't fit anywhere else.
+// Includes duel, day/night, mute/manner, log settings.
+import: conf/battle/misc.conf
+
 //Your custom config goes here.
 import: conf/import/battle_conf.txt
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@ -144,10 +144,6 @@ unknown_char_name: Unknown
 // To log the character server?
 log_char: yes

-// Minimum length for a character name.
-// Must be set to '4' unless your client uses the 'Remove 4/6 letter Character Name limit' diff patch.
-char_name_min_length: 4
-
 // Allow or not identical name for characters but with a different case (upper/lower):
 // example: Test-test-TEST-TesT; Value: 0 not allowed (default), 1 allowed
 name_ignoring_case: no
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@ -55,15 +55,9 @@ console: off
 // Note: This only works if client side password encryption is not enabled.
 new_account: no

-// If new_account is enabled, changes the minimum length for the account name.
-// By default is set to '4' or '6' (depending on the new login UI).
-// Don't change it unless your client uses the 'Remove 4/6 letter User Name limit' diff patch.
-//acc_name_min_length: 6
-
-// If new_account is enabled, changes the minimum length for the password.
-// By default is set to '4' or '6' (depending on the new login UI).
-// Don't change it unless your client uses the 'Remove 4/6 letter Password limit' diff patch.
-//password_min_length: 6
+//If new_account is enabled, minimum length to userid and passwords should be 4?
+//Must be 'Yes' unless your client uses both 'Disable 4 LetterUserID/Password' Diffs
+new_acc_length_limit: yes

 // Account registration flood protection system
 // allowed_regs is the number of registrations allowed in time_allowed (in seconds)
--- a/conf/maps_athena.conf
+++ b/conf/maps_athena.conf
@ -1634,8 +1634,5 @@ map: luna_sf1
 map: luna_sf2
 map: mbase_in

-// Market place
-map: prt_mk
-
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@ -1823,8 +1823,5 @@
 1534: Usage: @stockall {<type>}
 1535: %d items are transferred (%d skipped)!

-1536: Log configuration has been reloaded.
-1537: Found skill '%s', unblocking...
-
 //Custom translations
 import: conf/msg_conf/import/map_msg_eng_conf.txt
--- a/db/import-tmpl/mob_summon.yml
+++ b/db/import-tmpl/mob_summon.yml
@ -33,24 +33,3 @@ Header:
  Type: MOB_SUMMONABLE_DB
  Version: 1

-#Body:
-# Pre-re Brasilis
-#=============================================================
-#  - Group: BLOODY_DEAD_BRANCH
-#    Summon:
-#      - Mob: BOITATA
-#        Rate: 1000000
-#  - Group: Branch_Of_Dead_Tree
-#    Summon:
-#      - Mob: IARA
-#        Rate: 71428
-#      - Mob: PIRANHA
-#        Rate: 71428
-#      - Mob: HEADLESS_MULE
-#        Rate: 71428
-#      - Mob: JAGUAR
-#        Rate: 71428
-#      - Mob: TOUCAN
-#        Rate: 71428
-#      - Mob: CURUPIRA
-#        Rate: 71428
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
--- a/db/map_index.txt
+++ b/db/map_index.txt
@ -1260,7 +1260,6 @@ jor_tmple2
 luna_sf1
 luna_sf2
 mbase_in
-prt_mk

 //======================================================================================
 // - Other/Extra maps -
--- a/db/pre-re/item_db_usable.yml
+++ b/db/pre-re/item_db_usable.yml
@ -2613,7 +2613,7 @@ Body:
    Flags:
      BuyingStore: true
    Script: |
-      sc_start SC_SLOWDOWN,5000,100;
+      sc_start SC_SlowDown,5000,0;
  - Id: 12018
    AegisName: Fire_Cracker
    Name: Firecracker
@ -8637,21 +8637,21 @@ Body:
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
+      searchstores 10,0;
  - Id: 12581
    AegisName: Vending_Search_Scroll2
    Name: Universal Catalog Gold
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12591
    AegisName: Uni_Catalog_Bz
    Name: Universal Catalog Bronze
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12609
    AegisName: Old_Ore_Box
    Name: Old Ore Box
--- a/db/pre-re/pet_db.yml
+++ b/db/pre-re/pet_db.yml
@ -866,14 +866,3 @@ Body:
        bonus2 bSubEle,Ele_Fire,2;
        bonus2 bAddEle,Ele_Fire,2;
      }
-  - Mob: E_HYDRA
-    TameItem: Leaf_Cat_Ball
-    EggItem: Mystic_Leaf_Cat_Ball
-    Fullness: 0
-    HungryDelay: 0
-    IntimacyStart: 0
-    IntimacyFed: 0
-    IntimacyOverfed: 0
-    IntimacyOwnerDie: 0
-    CaptureRate: 50
-    SpecialPerformance: false
--- a/db/pre-re/skill_db.yml
+++ b/db/pre-re/skill_db.yml
@ -3660,27 +3660,17 @@ Body:
        Reproduce: true
    CastCancel: true
    CastTime:
-      - Level: 1
-        Time: 700
-      - Level: 2
-        Time: 1400
-      - Level: 3
-        Time: 2100
-      - Level: 4
-        Time: 2800
-      - Level: 5
-        Time: 3500
-    AfterCastActDelay:
      - Level: 1
        Time: 1000
      - Level: 2
-        Time: 1200
+        Time: 2000
      - Level: 3
-        Time: 1400
+        Time: 3000
      - Level: 4
-        Time: 1600
+        Time: 4000
      - Level: 5
-        Time: 1800
+        Time: 5000
+    AfterCastActDelay: 700
    Requires:
      SpCost:
        - Level: 1
@ -3732,7 +3722,7 @@ Body:
        Time: 4000
      - Level: 5
        Time: 5000
-    AfterCastActDelay: 1000
+    AfterCastActDelay: 700
    Duration1: 100
    Requires:
      SpCost:
@ -7369,7 +7359,7 @@ Body:
        Time: 1500
      - Level: 5
        Time: 1000
-    Duration1: 300000
+    Duration2: 300000
    Requires:
      SpCost: 1
      Weapon:
@ -8548,7 +8538,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 15000
    Duration2: 12000
    Requires:
      SpCost:
@ -8840,7 +8829,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 4000
-    Duration1: 5000
    Duration2: 5000
    Requires:
      SpCost:
@ -30736,8 +30724,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+    Range: 9
+    Hit: Single
+    HitCount: 1
    AfterCastActDelay: 2000
-    AfterCastWalkDelay: 1000
    Requires:
      SpCost:
        - Level: 1
@ -30760,8 +30750,11 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+      Splash: true
+    Hit: Single
+    HitCount: 1
+    SplashArea: -1
    AfterCastActDelay: 35000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@ -30790,6 +30783,7 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
+    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@ -30797,14 +30791,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay:
-      - Level: 1
-        Time: 600000
-      - Level: 2
-        Time: 900000
-      - Level: 3
-        Time: 1200000
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@ -30812,6 +30799,13 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
+    Duration2:
+      - Level: 1
+        Time: 600000
+      - Level: 2
+        Time: 900000
+      - Level: 3
+        Time: 1200000
    Requires:
      SpCost: 100
    Status: Change
@ -30822,8 +30816,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay: 1000
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    Duration2: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@ -30833,8 +30827,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
+    Hit: Single
    AfterCastActDelay: 30000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 40000
@ -30863,6 +30857,8 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@ -30870,14 +30866,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastActDelay:
-      - Level: 1
-        Time: 300000
-      - Level: 2
-        Time: 600000
-      - Level: 3
-        Time: 900000
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@ -30885,6 +30874,13 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
+    Duration2:
+      - Level: 1
+        Time: 300000
+      - Level: 2
+        Time: 600000
+      - Level: 3
+        Time: 900000
    Requires:
      SpCost: 120
    Status: Bloodlust
@ -30907,6 +30903,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
+    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@ -30927,18 +30924,6 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastActDelay:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@ -30950,6 +30935,17 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
+    Duration2:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
    Requires:
      SpCost:
        - Level: 1
@ -30973,18 +30969,6 @@ Body:
      NoDamage: true
    Hit: Single
    CastCancel: true
-    AfterCastActDelay:
-      - Level: 1
-        Time: 60000
-      - Level: 2
-        Time: 70000
-      - Level: 3
-        Time: 80000
-      - Level: 4
-        Time: 90000
-      - Level: 5
-        Time: 120000
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@ -30996,6 +30980,17 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
+    Duration2:
+      - Level: 1
+        Time: 60000
+      - Level: 2
+        Time: 70000
+      - Level: 3
+        Time: 80000
+      - Level: 4
+        Time: 90000
+      - Level: 5
+        Time: 120000
    Requires:
      SpCost:
        - Level: 1
@ -31018,6 +31013,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
+    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@ -31039,6 +31035,17 @@ Body:
        Count: 4
      - Level: 5
        Count: 5
+    AfterCastActDelay:
+      - Level: 1
+        Time: 2000
+      - Level: 2
+        Time: 2200
+      - Level: 3
+        Time: 2400
+      - Level: 4
+        Time: 2600
+      - Level: 5
+        Time: 2800
    Requires:
      SpCost:
        - Level: 1
@ -31059,7 +31066,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1500
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@ -31083,6 +31091,7 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
--- a/db/pre-re/statpoint.yml
+++ b/db/pre-re/statpoint.yml
@ -552,33 +552,3 @@ Body:
    Points: 4545
  - Level: 260
    Points: 4545
-  - Level: 261
-    Points: 4545
-  - Level: 262
-    Points: 4545
-  - Level: 263
-    Points: 4545
-  - Level: 264
-    Points: 4545
-  - Level: 265
-    Points: 4545
-  - Level: 266
-    Points: 4545
-  - Level: 267
-    Points: 4545
-  - Level: 268
-    Points: 4545
-  - Level: 269
-    Points: 4545
-  - Level: 270
-    Points: 4545
-  - Level: 271
-    Points: 4545
-  - Level: 272
-    Points: 4545
-  - Level: 273
-    Points: 4545
-  - Level: 274
-    Points: 4545
-  - Level: 275
-    Points: 4545
--- a/db/pre-re/status.yml
+++ b/db/pre-re/status.yml
@ -2478,17 +2478,13 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
+      RemoveOnChangeMap: true
    Fail:
      Change: true
  - Status: Bloodlust
@ -2496,9 +2492,6 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@ -2513,10 +2506,6 @@ Body:
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
      Def: true
-      Vit: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@ -3974,7 +3963,7 @@ Body:
      Unlimitedhummingvoice: true
      Sircleofnature: true
  - Status: Deepsleep
-    Icon: EFST_DEEP_SLEEP
+    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
    DurationLookup: WM_LULLABY_DEEPSLEEP
    States:
      NoCast: true
--- a/db/re/enchantgrade.yml
+++ b/db/re/enchantgrade.yml
@ -76,15 +76,15 @@ Body:
              - Refine: 15
                Chance: 7000
              - Refine: 16
-                Chance: 8000
+                Chance: 7000
              - Refine: 17
-                Chance: 8000
+                Chance: 7000
              - Refine: 18
-                Chance: 8000
+                Chance: 7000
              - Refine: 19
-                Chance: 8000
+                Chance: 7000
              - Refine: 20
-                Chance: 8000
+                Chance: 7000
            Bonus: 10
            Catalyst:
                Item: Blessed_Etel_Dust
@ -116,15 +116,15 @@ Body:
              - Refine: 15
                Chance: 6000
              - Refine: 16
-                Chance: 7000
+                Chance: 6000
              - Refine: 17
-                Chance: 7000
+                Chance: 6000
              - Refine: 18
-                Chance: 7000
+                Chance: 6000
              - Refine: 19
-                Chance: 7000
+                Chance: 6000
              - Refine: 20
-                Chance: 7000
+                Chance: 6000
            Bonus: 30
            Catalyst:
                Item: Blessed_Etel_Dust
@ -154,15 +154,15 @@ Body:
              - Refine: 15
                Chance: 5000
              - Refine: 16
-                Chance: 6000
+                Chance: 5000
              - Refine: 17
-                Chance: 6000
+                Chance: 5000
              - Refine: 18
-                Chance: 6000
+                Chance: 5000
              - Refine: 19
-                Chance: 6000
+                Chance: 5000
              - Refine: 20
-                Chance: 6000
+                Chance: 5000
            Bonus: 50
            AnnounceFail: true
            Catalyst:
@ -193,15 +193,15 @@ Body:
              - Refine: 15
                Chance: 4000
              - Refine: 16
-                Chance: 5000
+                Chance: 4000
              - Refine: 17
-                Chance: 5000
+                Chance: 4000
              - Refine: 18
-                Chance: 5000
+                Chance: 4000
              - Refine: 19
-                Chance: 5000
+                Chance: 4000
              - Refine: 20
-                Chance: 5000
+                Chance: 4000
            Bonus: 100
            AnnounceFail: true
            Catalyst:
@ -240,15 +240,15 @@ Body:
              - Refine: 15
                Chance: 7000
              - Refine: 16
-                Chance: 8000
+                Chance: 7000
              - Refine: 17
-                Chance: 8000
+                Chance: 7000
              - Refine: 18
-                Chance: 8000
+                Chance: 7000
              - Refine: 19
-                Chance: 8000
+                Chance: 7000
              - Refine: 20
-                Chance: 8000
+                Chance: 7000
            Bonus: 10
            Catalyst:
                Item: Blessed_Etel_Dust
@ -280,15 +280,15 @@ Body:
              - Refine: 15
                Chance: 6000
              - Refine: 16
-                Chance: 7000
+                Chance: 6000
              - Refine: 17
-                Chance: 7000
+                Chance: 6000
              - Refine: 18
-                Chance: 7000
+                Chance: 6000
              - Refine: 19
-                Chance: 7000
+                Chance: 6000
              - Refine: 20
-                Chance: 7000
+                Chance: 6000
            Bonus: 30
            Catalyst:
                Item: Blessed_Etel_Dust
@ -318,15 +318,15 @@ Body:
              - Refine: 15
                Chance: 5000
              - Refine: 16
-                Chance: 6000
+                Chance: 5000
              - Refine: 17
-                Chance: 6000
+                Chance: 5000
              - Refine: 18
-                Chance: 6000
+                Chance: 5000
              - Refine: 19
-                Chance: 6000
+                Chance: 5000
              - Refine: 20
-                Chance: 6000
+                Chance: 5000
            Bonus: 50
            AnnounceFail: true
            Catalyst:
@ -357,15 +357,15 @@ Body:
              - Refine: 15
                Chance: 4000
              - Refine: 16
-                Chance: 5000
+                Chance: 4000
              - Refine: 17
-                Chance: 5000
+                Chance: 4000
              - Refine: 18
-                Chance: 5000
+                Chance: 4000
              - Refine: 19
-                Chance: 5000
+                Chance: 4000
              - Refine: 20
-                Chance: 5000
+                Chance: 4000
            Bonus: 100
            AnnounceFail: true
            Catalyst:
--- a/db/re/instance_db.yml
+++ b/db/re/instance_db.yml
@ -501,19 +501,19 @@ Body:
      7@thts: true
      8@thts: true
  - Id: 67
-    Name: Oz Labyrinth
+    Name: The Maze of Oz
    Enter:
      Map: 1@oz
      X: 284
      Y: 167
  - Id: 68
-    Name: Thor Military Base
+    Name: Thor Gunsu Base
    Enter:
      Map: 1@tcamp
      X: 103
      Y: 237
  - Id: 69
-    Name: Wolves Gathering Place
+    Name: A Gathering Place of Wolves
    Enter:
      Map: 1@nyr
      X: 194
@ -529,7 +529,7 @@ Body:
    AdditionalMaps:
      2@nyr: true
  - Id: 71
-    Name: High Priest's Villa
+    Name: Villa of High Priest
    Enter:
      Map: 1@adv
      X: 123
--- a/db/re/item_combos.yml
+++ b/db/re/item_combos.yml
@ -20852,6 +20852,25 @@ Body:
         bonus bMdef,3*.@r_shoes;
         bonus bMatk,5*.@r;
      }
+  - Combos:
+      - Combo:
+          - Hollow_Shoes
+          - Berzebub_Card
+    Script: |
+      .@r = getrefine();
+      skill "PR_MAGNUS",10;
+      bonus2 bMagicAddRace,RC_Undead,30;
+      bonus2 bMagicAddRace,RC_Demon,30;
+      bonus2 bMagicAddEle,Ele_Dark,30;
+      bonus2 bMagicAddEle,Ele_Undead,30;
+      if (BaseLevel >= 100) {
+         bonus bMatk,15*.@r;
+         bonus bVariableCastrate,-7*.@r;
+      }
+      else {
+         bonus bMatk,5*.@r;
+         bonus bVariableCastrate,-2*.@r;
+      }
  - Combos:
      - Combo:
          - Astraea_Ring
@ -21727,7 +21746,7 @@ Body:
      if (.@sum >= 27) {
         bonus3 bAutoSpell,"HW_NAPALMVULCAN",5,80;
      }
-      else if (.@sum >= 21) {
+      else if (.@sum >= 27) {
         bonus3 bAutoSpell,"HW_NAPALMVULCAN",3,40;
      }
  - Combos:
@ -21741,7 +21760,7 @@ Body:
      if (.@sum >= 27) {
         bonus3 bAutoSpell,"AS_SONICBLOW",10,80;
      }
-      else if (.@sum >= 21) {
+      else if (.@sum >= 27) {
         bonus3 bAutoSpell,"AS_SONICBLOW",7,40;
      }
  - Combos:
@ -21751,10 +21770,10 @@ Body:
    Script: |
      .@sum = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_SHOES);
      bonus bMatkRate,2;
-      if (.@sum >= 20) {
+      if (.@sum >= 27) {
         bonus3 bAutoSpell,"WL_JACKFROST",max(getskilllv("WL_JACKFROST"),4),80;
      }
-      else if (.@sum >= 18) {
+      else if (.@sum >= 27) {
         bonus3 bAutoSpell,"WL_JACKFROST",max(getskilllv("WL_JACKFROST"),2),40;
      }
  - Combos:
@ -28384,7 +28403,7 @@ Body:
      bonus bVariableCastrate,-10;
  - Combos:
      - Combo:
-          - Hero_Token_HN   # 490220
+          - aegis_490220   # 490220
          - Blessed_Knife_LT   # 510072
    Script: |
      bonus2 bAddSize,Size_All,15;
@ -28399,7 +28418,7 @@ Body:
      }
  - Combos:
      - Combo:
-          - Hero_Token_HN   # 490220
+          - aegis_490220   # 490220
          - Freedom_Stick_LT   # 550082
    Script: |
      bonus2 bMagicAddSize,Size_All,15;
@ -46520,7 +46539,6 @@ Body:
    Script: |
      bonus2 bAddEle,Ele_All,20;
      bonus bAspdRate,5;
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",40;
      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",40;
      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",20;
  - Combos:
@ -47389,7 +47407,6 @@ Body:
    Script: |
      bonus2 bSkillAtk,"TR_RHYTHMSHOOTING",25;
      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",25;
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",25;
      bonus2 bSubRace,RC_Player_Human,10;
      bonus2 bSubRace,RC_Player_Doram,10;
  - Combos:
@ -50855,6 +50872,14 @@ Body:
      bonus bMaxHP,2000;
      bonus bMaxSP,200;
      bonus bHealPower,15;
+  - Combos:
+      - Combo:
+          - aegis_311883    # 311883
+          - aegis_410302    # 410302
+    Script: |
+      bonus bSpeedRate,25;
+      bonus2 bSubRace,RC_Player_Human,5;
+      bonus2 bSubRace,RC_Player_Doram,5;
  - Combos:
      - Combo:
          - R001_Bestia_Card    # 300281
@ -51458,6 +51483,12 @@ Body:
         bonus bMatk,15*.@eq;
         bonus bVariableCastrate,-7*.@eq;
      }
+  - Combos:
+      - Combo:
+          - Berzebub_Card    # 4145
+          - VesperHeadGear    # 19436
+    Script: |
+      bonus bVariableCastrate,30;
  - Combos:
      - Combo:
          - Preschool_Hat    # 18860
@ -52004,206 +52035,3 @@ Body:
          - Ignis_Cap    # 18651
    Script: |
      bonus bAspdRate,getequiprefinerycnt(EQI_HEAD_TOP)/2;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_TR   # 400673
-          - MetalVilolin_Furious   # 570072
-      - Combo:
-          - FuriousCirclet_TR   # 400673
-          - MetalWhip_Furious   # 580072
-    Script: |
-      bonus2 bMagicAddRace,RC_All,10;
-      bonus2 bMagicAddRace,RC_Player_Human,-10;
-      bonus2 bMagicAddRace,RC_Player_Doram,-10;
-      bonus2 bSkillAtk,"WM_REVERBERATION",35;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_TR   # 400673
-          - Harp_Furious   # 570073
-      - Combo:
-          - FuriousCirclet_TR   # 400673
-          - Whip_Furious   # 580073
-    Script: |
-      bonus2 bAddRace,RC_All,10;
-      bonus2 bAddRace,RC_Player_Human,-10;
-      bonus2 bAddRace,RC_Player_Doram,-10;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_BO   # 400674
-          - Lapier_Furious   # 500101
-    Script: |
-      bonus2 bSkillCooldown,"BO_EXPLOSIVE_POWDER",-120;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_BO   # 400674
-          - SharpSword_Furious   # 500102
-    Script: |
-      bonus2 bSkillCooldown,"BO_MAYHEMIC_THORNS",-120;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_HN   # 400675
-          - WhiteSword_Furious   # 500103
-    Script: |
-      bonus2 bSkillCooldown,"HN_DOUBLEBOWLINGBASH",-150;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_HN   # 400675
-          - Stick_Furious   # 550148
-    Script: |
-      bonus2 bSkillCooldown,"HN_JUPITEL_THUNDER_STORM",-250;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_AG   # 400694
-          - Specter_Furious   # 550150
-    Script: |
-      bonus2 bMagicAddRace,RC_All,10;
-      bonus2 bMagicAddRace,RC_Player_Human,-10;
-      bonus2 bMagicAddRace,RC_Player_Doram,-10;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_AG   # 400694
-          - Flame_Staff_Furious   # 640053
-    Script: |
-      bonus2 bSkillAtk,"AG_ALL_BLOOM",25;
-      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",25;
-      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",25;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_IQ   # 400695
-          - GaleClaw_Furious   # 560067
-    Script: |
-      bonus2 bSkillCooldown,"IQ_MASSIVE_F_BLASTER",-1200;
-      bonus2 bSkillAtk,"IQ_MASSIVE_F_BLASTER",20;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_IQ   # 400695
-          - Exterminate_Furious   # 560068
-    Script: |
-      bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",25;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_NW   # 400696
-          - Rifle_Furious   # 810042
-    Script: |
-      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",25;
-  - Combos:
-      - Combo:
-          - FuriousCirclet_NW   # 400696
-          - Gatling_Furious   # 830038
-    Script: |
-      bonus2 bAddRace,RC_All,10;
-      bonus2 bAddRace,RC_Player_Human,-10;
-      bonus2 bAddRace,RC_Player_Doram,-10;
-      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",15;
-  - Combos:
-      - Combo:
-          - Lapier_Furious   # 500101
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      bonus2 bSkillAtk,"BO_EXPLOSIVE_POWDER",.@sum;
-  - Combos:
-      - Combo:
-          - SharpSword_Furious   # 500102
-          - FuriousBoots   # 470265
-    Script: |
-      bonus bCritAtkRate,15;
-      bonus bCritical,5;
-      if (getenchantgrade()>=ENCHANTGRADE_B) {
-         bonus2 bSkillAtk,"BO_MAYHEMIC_THORNS",15;
-      }
-  - Combos:
-      - Combo:
-          - WhiteSword_Furious   # 500103
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
-      bonus2 bSkillAtk,"HN_DOUBLEBOWLINGBASH",.@sum;
-  - Combos:
-      - Combo:
-          - Stick_Furious   # 550148
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"HN_HELLS_DRIVE",20;
-      if (getenchantgrade()>=ENCHANTGRADE_B) {
-         bonus4 bAutoSpellOnSkill,"HN_HELLS_DRIVE","EM_TERRA_DRIVE",4,1000;
-      }
-  - Combos:
-      - Combo:
-          - Specter_Furious   # 550150
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"AG_SOUL_VC_STRIKE",20;
-  - Combos:
-      - Combo:
-          - GaleClaw_Furious   # 560067
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"IQ_MASSIVE_F_BLASTER",20;
-  - Combos:
-      - Combo:
-          - Exterminate_Furious   # 560068
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
-      bonus2 bSkillAtk,"IQ_THIRD_FLAME_BOMB",.@sum;
-  - Combos:
-      - Combo:
-          - MetalVilolin_Furious   # 570072
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"WM_REVERBERATION",70;
-      bonus2 bSkillAtk,"TR_METALIC_FURY",20;
-  - Combos:
-      - Combo:
-          - Harp_Furious   # 570073
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",.@sum;
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",.@sum;
-  - Combos:
-      - Combo:
-          - MetalWhip_Furious   # 580072
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"WM_REVERBERATION",70;
-      bonus2 bSkillAtk,"TR_METALIC_FURY",20;
-  - Combos:
-      - Combo:
-          - Whip_Furious   # 580073
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_SHOES);
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM",.@sum;
-      bonus2 bSkillAtk,"TR_ROSEBLOSSOM_ATK",.@sum;
-  - Combos:
-      - Combo:
-          - Flame_Staff_Furious   # 640053
-          - FuriousBoots   # 470265
-    Script: |
-      .@sum = getequiprefinerycnt(EQI_HAND_R)+getequiprefinerycnt(EQI_HEAD_TOP);
-      bonus2 bSkillAtk,"AG_ALL_BLOOM",.@sum;
-      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK",.@sum;
-      bonus2 bSkillAtk,"AG_ALL_BLOOM_ATK2",.@sum;
-  - Combos:
-      - Combo:
-          - Rifle_Furious   # 810042
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"NW_ONLY_ONE_BULLET",25;
-  - Combos:
-      - Combo:
-          - Gatling_Furious   # 830038
-          - FuriousBoots   # 470265
-    Script: |
-      bonus2 bSkillAtk,"NW_MAGAZINE_FOR_ONE",25;
-      bonus2 bSkillAtk,"NW_THE_VIGILANTE_AT_NIGHT",15;
-  - Combos:
-      - Combo:
-          - aegis_300549   # 300549
-          - Sesrumnir_Evt_Ring   # 490557
-    Script: |
-      bonus bShortAtkRate,7;
-      bonus bLongAtkRate,7;
-      bonus2 bMagicAtkEle,Ele_All,7;
--- 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
@ -14232,7 +14232,7 @@ Body:
    Type: Card
    SubType: Enchant
    Script: |
-      autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+      autobonus2 "{ bonus bStr,200; bonus2 bHPLossRate,500,1000; }",20,5000,BF_WEAPON,"{ active_transform 1060,5000; specialeffect2 EF_POTION_BERSERK; showscript \"Bigfoot Power !\"; }";
    UnEquipScript: |
      heal 0,-300;
  - Id: 4876
@ -50596,8 +50596,8 @@ Body:
    Script: |
      bonus2 bAddRace,RC_Demon,40;
      bonus2 bAddRace,RC_DemiHuman,40;
-      bonus3 bSubRace,RC_Demon,-30,BF_WEAPON;
-      bonus3 bSubRace,RC_DemiHuman,-30,BF_WEAPON;
+      bonus3 bSubRace,RC_Demon,-30,BF_NORMAL;
+      bonus3 bSubRace,RC_DemiHuman,-30,BF_NORMAL;
  - Id: 300281
    AegisName: R001_Bestia_Card
    Name: R001-Bestia Card
@ -53760,20 +53760,6 @@ Body:
      bonus bMaxHPrate,-15;
      bonus bPAtk,.@r;
      bonus bAtkRate,.@r;
-  - Id: 300549
-    AegisName: aegis_300549
-    Name: Summer Vacation Pope Card
-    Type: Card
-    Weight: 10
-    Locations:
-      Left_Accessory: true
-    Flags:
-      BuyingStore: true
-      DropEffect: CLIENT
-    Script: |
-      bonus bShortAtkRate,3;
-      bonus bLongAtkRate,3;
-      bonus2 bMagicAtkEle,Ele_All,3;
  - Id: 310000
    AegisName: Ranger_Top2
    Name: Sniper Stone II (Top)
@ -80408,28 +80394,6 @@ Body:
    Name: Footprint Effect
    Type: Card
    SubType: Enchant
-    Script: |
-      hateffect FOOTPRINT_EF_BASE,true;
-    UnEquipScript: |
-      hateffect FOOTPRINT_EF_BASE,false;
-  - Id: 313067
-    AegisName: aegis_313067
-    Name: Purple Star Footprint
-    Type: Card
-    SubType: Enchant
-    Script: |
-      hateffect FOOTPRINT_EF_PURPLESTAR,true;
-    UnEquipScript: |
-      hateffect FOOTPRINT_EF_PURPLESTAR,false;
-  - Id: 313068
-    AegisName: aegis_313068
-    Name: Yellow Star Footprint
-    Type: Card
-    SubType: Enchant
-    Script: |
-      hateffect FOOTPRINT_EF_YELLOWSTAR,true;
-    UnEquipScript: |
-      hateffect FOOTPRINT_EF_YELLOWSTAR,false;
  - Id: 313070
    AegisName: Ep21_4_Def
    Name: Forest Magic Orb (Physical Defense)
@ -81918,15 +81882,6 @@ Body:
    Script: |
      bonus bLongAtkRate,getskilllv("SH_HOWLING_OF_CHUL_HO");
      bonus bBaseAtk,4*getskilllv("SH_HOWLING_OF_CHUL_HO");
-  - Id: 313345
-    AegisName: aegis_313345
-    Name: Puppy Footprint
-    Type: Card
-    SubType: Enchant
-    Script: |
-      hateffect FOOTPRINT_EF_DOGFOOT,true;
-    UnEquipScript: |
-      hateffect FOOTPRINT_EF_DOGFOOT,false;
  - Id: 1000000
    AegisName: IDTest_event
    Name: IDTest event
@ -83090,42 +83045,6 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
-  - Id: 1000284
-    AegisName: EpisodClear13
-    Name: Eps 13 Clear Ticket
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1000285
-    AegisName: EpisodClear14
-    Name: Eps 14 Clear Ticket
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1000286
-    AegisName: EpisodClear15
-    Name: Eps 15 Clear Ticket
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
  - Id: 1000287
    AegisName: EpisodClear17
    Name: Episode 17 Clear Ticket
@ -86231,31 +86150,31 @@ Body:
    Flags:
      BuyingStore: true
  - Id: 1001072
-    AegisName: Evil_Black_Bid
+    AegisName: aegis_1001072
    Name: Evil Orb
    Type: Etc
    Buy: 1480
    Weight: 10
  - Id: 1001073
-    AegisName: Ectoplasmic_Stone
+    AegisName: aegis_1001073
    Name: Ectoplasmic Stone
    Type: Etc
    Buy: 1460
    Weight: 10
  - Id: 1001074
-    AegisName: Heavy_Chain
+    AegisName: aegis_1001074
    Name: Heavy Chain
    Type: Etc
    Buy: 1480
    Weight: 10
  - Id: 1001075
-    AegisName: Evil_Minded_Ruby
+    AegisName: aegis_1001075
    Name: Evil Minded Ruby
    Type: Etc
    Buy: 1500
    Weight: 10
  - Id: 1001076
-    AegisName: Small_Sewing_Box
+    AegisName: aegis_1001076
    Name: Small Sewing Kit
    Type: Etc
    Buy: 1640
@ -86267,37 +86186,37 @@ Body:
    Buy: 1600
    Weight: 10
  - Id: 1001078
-    AegisName: Blue_Moon_Stone
+    AegisName: aegis_1001078
    Name: Fragments of the Blue Moon
    Type: Etc
    Buy: 1720
    Weight: 10
  - Id: 1001079
-    AegisName: Weird_Tentacle
+    AegisName: aegis_1001079
    Name: Monstrous Tentacles
    Type: Etc
    Buy: 1520
    Weight: 10
  - Id: 1001080
-    AegisName: Congealed_Poison
+    AegisName: aegis_1001080
    Name: Congealed Poison
    Type: Etc
    Buy: 1600
    Weight: 10
  - Id: 1001081
-    AegisName: Slicky_Fluid
+    AegisName: aegis_1001081
    Name: Slimy Fluid
    Type: Etc
    Buy: 1560
    Weight: 10
  - Id: 1001082
-    AegisName: Reptile_Stone
+    AegisName: aegis_1001082
    Name: Monster's Stone
    Type: Etc
    Buy: 1720
    Weight: 10
  - Id: 1001083
-    AegisName: Turn_Yellow_Leaf
+    AegisName: aegis_1001083
    Name: Maple Leaves
    Type: Etc
    Buy: 1640
@ -86309,13 +86228,13 @@ Body:
    Buy: 1480
    Weight: 10
  - Id: 1001085
-    AegisName: Cool_Liquid
+    AegisName: aegis_1001085
    Name: Cool Liquid
    Type: Etc
    Buy: 1460
    Weight: 10
  - Id: 1001086
-    AegisName: Green_Crystal_Fragment
+    AegisName: aegis_1001086
    Name: Blue Crystal Shard
    Type: Etc
    Buy: 1480
@ -86327,7 +86246,7 @@ Body:
    Buy: 1600
    Weight: 10
  - Id: 1001088
-    AegisName: Fresh_Pear
+    AegisName: aegis_1001088
    Name: Fresh Pear
    Type: Etc
    Buy: 1640
@ -89471,11 +89390,6 @@ Body:
    Name: Footprint Effect (Garment)
    Type: Etc
    Weight: 100
-  - Id: 1001617
-    AegisName: PurpleStar_Foot_Robe
-    Name: Purple Star Footprint (Garment)
-    Type: Etc
-    Weight: 100
  - Id: 1001618
    AegisName: aegis_1001618
    Name: Wigner Premium Exchange Ticket
@ -89745,11 +89659,6 @@ Body:
    Weight: 10
    Flags:
      BuyingStore: true
-  - Id: 1001650
-    AegisName: YellowStar_Foot_Robe
-    Name: Yellow Star Footprint (Garment)
-    Type: Etc
-    Weight: 100
  - Id: 1001653
    AegisName: Ep21_Armor_E_Stone1
    Name: Turquoise Magic Stone
@ -89872,402 +89781,6 @@ Body:
    Weight: 1
    Flags:
      BuyingStore: true
-  - Id: 1001689
-    AegisName: R_Snowflower_Armor
-    Name: Printed Snow Flower Armor
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001690
-    AegisName: R_Snowflower_Manteau
-    Name: Printed Snow Flower Manteau
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001691
-    AegisName: R_Snowflower_Boots
-    Name: Printed Snow Flower Boots
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001692
-    AegisName: R_Snowflower_Pendant
-    Name: Printed Snow Flower Pendant
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001693
-    AegisName: R_Snowflower_Necklace
-    Name: Printed Snow Flower Necklace
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001694
-    AegisName: R_Snowflower_Robe
-    Name: Printed Snow Flower Robe
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001695
-    AegisName: R_Snowflower_Muffler
-    Name: Printed Snow Flower Muffler
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001696
-    AegisName: R_Snowflower_Shoes
-    Name: Printed Snow Flower Shoes
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001697
-    AegisName: R_Snowflower_Ring
-    Name: Printed Snow Flower Ring
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001698
-    AegisName: R_Snowflower_Earring
-    Name: Printed Snow Flower Earring
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001699
-    AegisName: R_Glacier_T_Sword
-    Name: Printed Glacier Two-handed Sword
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001700
-    AegisName: R_Glacier_Lance
-    Name: Printed Glacier Lance
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001701
-    AegisName: R_Glacier_Sword
-    Name: Printed Glacier Sword
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001702
-    AegisName: R_Glacier_B_Sword
-    Name: Printed Glacier Basic Sword
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001703
-    AegisName: R_Glacier_Spear
-    Name: Printed Glacier Spear
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001704
-    AegisName: R_Glacier_T_Axe
-    Name: Printed Glacier Mechanic Axe
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001705
-    AegisName: R_Glacier_Axe
-    Name: Printed Glacier Axe
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001706
-    AegisName: R_Glacier_Mace
-    Name: Printed Glacier Mace
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001707
-    AegisName: R_Glacier_M_Mace
-    Name: Printed Glacier Mechanic Mace
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001708
-    AegisName: R_Glacier_R_Knife
-    Name: Printed Glacier Rogue Knife
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001709
-    AegisName: R_Glacier_B_Knife
-    Name: Printed Glacier Basic Knife
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001710
-    AegisName: R_Glacier_Knuckle
-    Name: Printed Glacier Knuckle
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001711
-    AegisName: R_Glacier_Katar
-    Name: Printed Glacier Katar
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001712
-    AegisName: R_Glacier_Bow
-    Name: Printed Glacier Bow
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001713
-    AegisName: R_Glacier_Violin
-    Name: Printed Glacier Violin
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001714
-    AegisName: R_Glacier_Whip
-    Name: Printed Glacier Whip
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001715
-    AegisName: R_Glacier_Humma
-    Name: Printed Glacier Huuma Shuriken
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001716
-    AegisName: R_Glacier_Book
-    Name: Printed Glacier Book
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001717
-    AegisName: R_Glacier_Wand
-    Name: Printed Glacier Wand
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001718
-    AegisName: R_Glacier_Staff
-    Name: Printed Glacier Staff
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001719
-    AegisName: R_Glacier_Foxtail
-    Name: Printed Glacier Foxtail
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001720
-    AegisName: R_Glacier_Revolver
-    Name: Printed Glacier Revolver
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001721
-    AegisName: R_Glacier_Rifle
-    Name: Printed Glacier Rifle
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001722
-    AegisName: R_Glacier_Shotgun
-    Name: Printed Glacier Shotgun
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001723
-    AegisName: R_Glacier_Gatling
-    Name: Printed Glacier Gatling
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001724
-    AegisName: R_Glacier_Launcher
-    Name: Printed Glacier Launcher
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
  - Id: 1001737
    AegisName: BioloStone_Robe
    Name: Biolo Stone (Garment)
@ -90283,38 +89796,6 @@ Body:
    Name: Spirit Handler Stone (Garment)
    Type: Etc
    Weight: 100
-  - Id: 1001740
-    AegisName: Summer_Ticket
-    Name: Ocean Week Commemoration Ticket
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001741
-    AegisName: Summer_W_Melon
-    Name: Summer Watermelon
-    Type: Etc
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001742
-    AegisName: aegis_1001742
-    Name: Festival Food Bag
-    Type: Etc
-    Weight: 10
-    Flags:
-      BuyingStore: true
  - Id: 1001744
    AegisName: Kr_B_Event04
    Name: Sweet Strawberry Fresh Cream
@ -90327,47 +89808,6 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
-  - Id: 1001753
-    AegisName: D_EpisodClear13
-    Name: Episode 13 Pass Ticket    # !todo check english name
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001755
-    AegisName: D_EpisodClear14
-    Name: Episode 14 Pass Ticket    # !todo check english name
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001756
-    AegisName: D_EpisodClear15
-    Name: Episode 15 Pass Ticket    # !todo check english name
-    Type: Etc
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 1001772
-    AegisName: aegis_1001772
-    Name: Puppy Footprint (Garment)
-    Type: Etc
-    Weight: 100
  - Id: 1200000
    AegisName: IDTest_arrow
    Name: IDTest arrow
@ -90430,7 +89870,7 @@ Body:
      Ammo: true
    EquipLevelMin: 1
    Script: |
-      bonus bAtkEle,Ele_Ghost;
+      bonus bAtkEle,Ele_Neutral;
  - Id: 1220003
    AegisName: Kunai_Of_Shadow
    Name: Kunai Of Shadow
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml
@ -4371,38 +4371,6 @@ Body:
      BuyingStore: true
 #   Script: |
 #     /* TODO */
-  - Id: 11636
-    AegisName: 24_S_Ev_Lime_Soda
-    Name: Lime Soda
-    Type: Healing
-    Weight: 1
-    EquipLevelMin: 90
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      itemheal 1800,0; /* average value */
-  - Id: 11637
-    AegisName: 24_S_Ev_Berry_Soda
-    Name: Berry Soda
-    Type: Healing
-    Weight: 1
-    EquipLevelMin: 90
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      itemheal 0,180; /* average value */
  - Id: 11701
    AegisName: Girl_Bunch_Of_Flower
    Name: Girl's Bouquet
@ -5732,6 +5700,7 @@ Body:
    AegisName: Tropical_Sograt
    Name: Tropical Sograt
    Type: Usable
+    Buy: 1000
    Weight: 100
    Flags:
      BuyingStore: true
@ -5741,6 +5710,7 @@ Body:
    AegisName: Vermilion_The_Beach
    Name: Vermilion on the Beach
    Type: Usable
+    Buy: 1000
    Weight: 100
    Flags:
      BuyingStore: true
@ -11365,7 +11335,7 @@ Body:
    Type: Usable
    Weight: 10
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
+      searchstores 10,0;
  - Id: 12581
    AegisName: Vending_Search_Scroll2
    Name: Universal Catalog Gold
@ -11380,7 +11350,7 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12582
    AegisName: Siege_Supply_Box
    Name: WoE Supply Box
@ -11524,7 +11494,7 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      searchstores 10, SEARCHSTORE_EFFECT_REMOTE;
+      searchstores 10,1;
  - Id: 12592
    AegisName: Cyclops_Box1
    Name: Cyclops Box1
@ -51160,8 +51130,8 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
-    Script: |
-      getitem 5464,1;
+#   Script: |
+#     /* TODO */
  - Id: 17203
    AegisName: Free_Pass_Box
    Name: Free Pass Box
@ -63120,6 +63090,7 @@ Body:
    AegisName: Vend_Arbeit1_1Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv1"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63128,6 +63099,7 @@ Body:
    AegisName: Vend_Arbeit1_2Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv2"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63136,6 +63108,7 @@ Body:
    AegisName: Vend_Arbeit1_3Lv
    Name: "[1 Day] Consignment Merchant Envelope Lv3"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63144,6 +63117,7 @@ Body:
    AegisName: Buy_Arbeit1_1Lv
    Name: "[1 Day] Personal Shopper Envelope Lv1"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63152,6 +63126,7 @@ Body:
    AegisName: Buy_Arbeit1_2Lv
    Name: "[1 Day] Personal Shopper Envelope Lv2"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63160,6 +63135,7 @@ Body:
    AegisName: Buy_Arbeit1_3Lv
    Name: "[1 Day] Personal Shopper Envelope Lv3"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63258,6 +63234,7 @@ Body:
    AegisName: Vend_Arbeit3_1Lv
    Name: "[3 Day] Consignment Merchant Envelope Lv1"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63266,6 +63243,7 @@ Body:
    AegisName: Vend_Arbeit3_2Lv
    Name: Consignment Merchant Envelope
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63274,6 +63252,7 @@ Body:
    AegisName: Vend_Arbeit3_3Lv
    Name: "[3 Day] Consignment Merchant Envelope Lv3"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63282,6 +63261,7 @@ Body:
    AegisName: Buy_Arbeit3_1Lv
    Name: "[3 Day] Personal Shopper Envelope Lv1"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63290,6 +63270,7 @@ Body:
    AegisName: Buy_Arbeit3_2Lv
    Name: Personal Shopper Envelope
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63298,6 +63279,7 @@ Body:
    AegisName: Buy_Arbeit3_3Lv
    Name: "[3 Day] Personal Shopper Envelope Lv3"
    Type: Usable
+    Weight: 10
    Flags:
      Container: true
    Script: |
@ -63403,8 +63385,8 @@ Body:
    Name: Special Shopper Catalog
    Type: Usable
    Weight: 10
-    Script: |
-      searchstores 3, SEARCHSTORE_EFFECT_NORMAL;
+#   Script: |
+#     /* TODO */
  - Id: 23374
    AegisName: Fire_Armor_S
    Name: Fire Armor Scroll
@ -68494,8 +68476,8 @@ Body:
    Weight: 10
    Flags:
      BuyingStore: true
-    Script: |
-      sc_start SC_EXPBOOST,900000,100;
+#   Script: |
+#     /* TODO */
  - Id: 100352
    AegisName: Real_Battle_Manual
    Name: Real Combat Manual
@ -68503,9 +68485,8 @@ Body:
    Weight: 10
    Flags:
      BuyingStore: true
-    Script: |
-      sc_start SC_EXPBOOST,3600000,100;
-      sc_start SC_SPEEDUP0,600000,25;
+#   Script: |
+#     /* TODO */
  - Id: 100354
    AegisName: Auto_Armor_Refine_Cube
    Name: Automatic Armor +11 Refinement Cube
@ -70358,8 +70339,8 @@ Body:
    Weight: 50
    Flags:
      BuyingStore: true
-    Script: |
-      pet 1198;
+#   Script: |
+#     /* TODO */
  - Id: 100810
    AegisName: BroadcastBox_
    Name: Broadcast Box
@ -72654,8 +72635,8 @@ Body:
    Name: Spring Regulator
    Type: Usable
    Weight: 10
-    Script: |
-      item_enchant(24);
+#   Script: |
+#     /* TODO */
  - Id: 101100
    AegisName: Poenetentia_Box3
    Name: Poenitentia Two Swords Set Box
@ -73620,7 +73601,6 @@ Body:
    Flags:
      BuyingStore: true
    Script: |
-      /* TODO : pet 21632; */
      pet 1005;
  - Id: 101336
    AegisName: aegis_101336
@ -76700,31 +76680,23 @@ Body:
    Script: |
      item_reform();
  - Id: 102128
-    AegisName: All_In_One_buff
+    AegisName: aegis_102128
    Name: All-in-One Buff Potion    # !todo check english name
    Type: Usable
    Weight: 10
    Flags:
      BuyingStore: true
-    Script: |
-      specialeffect2 EF_POTION_BERSERK;
-      sc_start SC_M_DEFSCROLL,3600000,0;
-      sc_start SC_LIMIT_POWER_BOOSTER,3600000,30;
-      sc_start SC_INFINITY_DRINK,3600000,0;
-      sc_start SC_SPEEDUP0,600000,25;
+#   Script: |
+#     /* TODO */
  - Id: 102129
-    AegisName: All_In_One_Healing
+    AegisName: aegis_102129
    Name: All-in-one Healing Potion    # !todo check english name
    Type: Usable
    Weight: 10
    Flags:
      BuyingStore: true
-    Script: |
-      specialeffect2 EF_HEAL3;
-      sc_start2 SC_S_LIFEPOTION,3600000,-5,5;
-      sc_start2 SC_L_LIFEPOTION,3600000,-7,4;
-      sc_start2 SC_M_LIFEPOTION,3600000,-4,3;
-      sc_start SC_SPEEDUP0,600000,25;
+#   Script: |
+#     /* TODO */
  - Id: 102193
    AegisName: aegis_102193
    Name: Costume Enchant Stone Box 30
@ -78678,99 +78650,6 @@ Body:
      Container: true
    Script: |
      getgroupitem(IG_ENCHANT_STONE_BOX35);
-  - Id: 103065
-    AegisName: 24_S_Ev_Noodle
-    Name: Summer Festival Noodle
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103066
-    AegisName: 24_S_Ev_Grilled
-    Name: Herb Calamari Barbecue
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103067
-    AegisName: 24_S_Ev_Podding
-    Name: Sweet Watermelon Pudding
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103068
-    AegisName: 24_S_Ev_Juice
-    Name: Cool Watermelon Juice
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103069
-    AegisName: 24_S_Ev_IceFlake
-    Name: Cool Red Beans Bingsu
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103070
-    AegisName: 24_S_Ev_Pop_Corn
-    Name: Gourmet Butter Popcorn
-    Type: Usable
-    Weight: 10
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 103071
-    AegisName: 24_S_Ev_Ripe_Melon
-    Name: Ripe Golden Melon
-    Type: Usable
-    Weight: 50
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      percentheal 100,100;
  - Id: 103095
    AegisName: Kr_B_Special10
    Name: Love Cake
@ -78783,83 +78662,6 @@ Body:
      NoGuildStorage: true
      NoMail: true
      NoAuction: true
-  - Id: 103106
-    AegisName: Stove_Channeling_Box_1
-    Name: Channeling Commemoration Box I
-    Type: Usable
-    Weight: 400
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_STOVE_CHANNELING_BOX_1);
-  - Id: 103107
-    AegisName: Stove_Channeling_Box_2
-    Name: Channeling Commemoration Box II
-    Type: Usable
-    Weight: 400
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_STOVE_CHANNELING_BOX_2);
-  - Id: 103108
-    AegisName: Stove_Channeling_Box_3
-    Name: Channeling Commemoration Box III
-    Type: Usable
-    Weight: 400
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_STOVE_CHANNELING_BOX_3);
-  - Id: 103109
-    AegisName: Stove_Channeling_Box_4
-    Name: Channeling Commemoration Box IV
-    Type: Usable
-    Weight: 400
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_STOVE_CHANNELING_BOX_4);
-  - Id: 103263
-    AegisName: Summer_Select_Box4
-    Name: Star Footprint Selection Box (Summer Beach)
-    Type:  Usable
-    Weight: 10
  - Id: 200000
    AegisName: IDTest_Cash
    Name: IDTest Cash
@ -80987,8 +80789,6 @@ Body:
 #   Name: (Limited) Nyangvine Fruit Package I (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package I (Stone Box 35
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -80998,14 +80798,12 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_LI_NYANGVINE_BOX1_35);
+      /* TODO */
  - Id: 200406
    AegisName: LI_Nyangvine_Box2_35
 #   Name: (Limited) Nyangvine Fruit Package II (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package II (Stone Box 3
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81015,14 +80813,12 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_LI_NYANGVINE_BOX2_35);
+      /* TODO */
  - Id: 200407
    AegisName: LI_Nyangvine_Box3_35
 #   Name: (Limited) Nyangvine Fruit Package III (Stone Box 35)
    Name: (Limited) Nyangvine Fruit Package III (Stone Box 
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81032,14 +80828,12 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_LI_NYANGVINE_BOX3_35);
+      /* TODO */
  - Id: 200411
    AegisName: A_Speed_Booster_Box
    Name: Speed Booster Package
    Type: Cash
    Weight: 10
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81049,14 +80843,12 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_A_SPEED_BOOSTER_BOX);
+      /* TODO */
  - Id: 200412
    AegisName: A_Speed_Booster_10_Box
    Name: Speed Booster Package 10 Sets
    Type: Cash
    Weight: 10
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81066,13 +80858,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_A_SPEED_BOOSTER_10_BOX);
+      /* TODO */
  - Id: 200415
    AegisName: L_Infinity_Power_Pack
    Name: (Limited) Infinity Power Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81082,13 +80872,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_INFINITY_POWER_PACK);
+      /* TODO */
  - Id: 200416
    AegisName: L_All_Red_Pack
    Name: (Limited) All Red Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81098,13 +80886,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_ALL_RED_PACK);
+      /* TODO */
  - Id: 200417
    AegisName: L_Defense_Potion_Pack
    Name: (Limited) Defender Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81114,13 +80900,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_DEFENSE_POTION_PACK);
+      /* TODO */
  - Id: 200418
    AegisName: L_Speed_Force_Pack
    Name: (Limited) Speed Force Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81130,13 +80914,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_SPEED_FORCE_PACK);
+      /* TODO */
  - Id: 200419
    AegisName: L_Special_Speed_Pack
    Name: (Limited) Speed Booster Special Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81146,13 +80928,11 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_SPECIAL_SPEED_PACK);
+      /* TODO */
  - Id: 200420
    AegisName: L_Special_Force_Pack
    Name: (Limited) Force Booster Special Package
    Type: Cash
-    Flags:
-      Container: true
    Trade:
      NoDrop: true
      NoTrade: true
@ -81162,58 +80942,7 @@ Body:
      NoMail: true
      NoAuction: true
    Script: |
-      getgroupitem(IG_L_SPECIAL_FORCE_PACK);
-  - Id: 200425
-    AegisName: CostumeMilePack_35_1
-#   Name: Nyangvine Costume Mileage Package I (Stone Box 35)
-    Name: Nyangvine Costume Mileage Package I (Stone Box 35
-    Type: Cash
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_COSTUMEMILEPACK_35_1);
-  - Id: 200426
-    AegisName: CostumeMilePack_35_2
-#   Name: Nyangvine Costume Mileage Package II (Stone Box 35)
-    Name: Nyangvine Costume Mileage Package II (Stone Box 3
-    Type: Cash
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_COSTUMEMILEPACK_35_2);
-  - Id: 200427
-    AegisName: CostumeMilePack_35_3
-#   Name: Nyangvine Costume Mileage Package III (Stone Box 35)
-    Name: Nyangvine Costume Mileage Package III (Stone Box 
-    Type: Cash
-    Flags:
-      Container: true
-    Trade:
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      getgroupitem(IG_COSTUMEMILEPACK_35_3);
+      /* TODO */
  - Id: 1100000
    AegisName: IDTest_heal
    Name: IDTest heal
--- a/db/re/item_enchant.yml
+++ b/db/re/item_enchant.yml
@ -32187,20 +32187,6 @@ Body:
      Grimoire_Furious: true
      Soul_Furious: true
      SpiritStick_Furious: true
-      Lapier_Furious: true
-      SharpSword_Furious: true
-      WhiteSword_Furious: true
-      Stick_Furious: true
-      MetalVilolin_Furious: true
-      Harp_Furious: true
-      MetalWhip_Furious: true
-      Whip_Furious: true
-      Flame_Staff_Furious: true
-      Rifle_Furious: true
-      Gatling_Furious: true
-      Specter_Furious: true
-      GaleClaw_Furious: true
-      Exterminate_Furious: true
    Reset:
      Chance: 80000
      Price: 500000
@ -32371,12 +32357,6 @@ Body:
      FuriousCirclet_MT: true
      FuriousCirclet_EM: true
      FuriousCirclet_SOA: true
-      FuriousCirclet_TR: true
-      FuriousCirclet_BO: true
-      FuriousCirclet_HN: true
-      FuriousCirclet_AG: true
-      FuriousCirclet_IQ: true
-      FuriousCirclet_NW: true
    Reset:
      Chance: 80000
      Price: 500000
--- a/db/re/item_group_db.yml
+++ b/db/re/item_group_db.yml
@ -92258,7 +92258,7 @@ Body:
            Item: Hero_Token_SH
            Rate: 10
          - Index: 17
-            Item: Hero_Token_HN
+            Item: aegis_490220
            Rate: 10
  - Group: JANUARYGIFTBOX_
    SubGroups:
@ -113177,265 +113177,3 @@ Body:
          - Index: 65
            Item: Critical_Stone_Bottom
            Rate: 400
-  - Group: STOVE_CHANNELING_BOX_1
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Battle_Manual100
-            Amount: 5
-          - Index: 1
-            Item: E_Token_Of_Siegfried
-            Amount: 5
-          - Index: 2
-            Item: Comp_Kafra_Card
-            Amount: 10
-          - Index: 3
-            Item: World_Tour_Ticket
-            Amount: 10
-  - Group: STOVE_CHANNELING_BOX_2
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Boarding_Halter_Box30_Z
-          - Index: 1
-            Item: Comp_Almighty
-            Amount: 10
-          - Index: 2
-            Item: E_Wing_Of_Fly_3Day_Box
-            Amount: 3
-          - Index: 3
-            Item: Buff_Scroll_Box
-            Amount: 3
-  - Group: STOVE_CHANNELING_BOX_3
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: E_Life_Potion_Pack
-            Amount: 2
-          - Index: 1
-            Item: Comp_Small_Mana_Potion
-            Amount: 20
-          - Index: 2
-            Item: E_Infinity_Drink
-            Amount: 10
-          - Index: 3
-            Item: Comp_Power_Booster
-            Amount: 10
-  - Group: STOVE_CHANNELING_BOX_4
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: All_In_One_buff_B
-            Amount: 10
-          - Index: 1
-            Item: All_In_One_Healing_B
-            Amount: 10
-          - Index: 2
-            Item: Cachua_Coupon
-            Amount: 10
-          - Index: 3
-            Item: Evt_Cos_Coin
-            Amount: 10
-  - Group: LI_NYANGVINE_BOX1_35
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 100
-          - Index: 1
-            Item: Enchant_Stone_Box35
-            Amount: 2
-          - Index: 2
-            Item: Comp_Bubble_Gum
-            Amount: 3
-  - Group: LI_NYANGVINE_BOX2_35
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 200
-          - Index: 1
-            Item: Battle_Manual100
-            Amount: 5
-          - Index: 2
-            Item: Enchant_Stone_Box35
-            Amount: 2
-  - Group: LI_NYANGVINE_BOX3_35
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 400
-          - Index: 1
-            Item: Comp_Bubble_Gum
-            Amount: 10
-          - Index: 2
-            Item: Battle_Manual100
-            Amount: 5
-          - Index: 3
-            Item: Enchant_Stone_Box35
-            Amount: 5
-  - Group: A_SPEED_BOOSTER_BOX
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Speed_Booster
-            Amount: 10
-          - Index: 1
-            Item: K_Secret_Key
-  - Group: A_SPEED_BOOSTER_10_BOX
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Speed_Booster
-            Amount: 100
-          - Index: 1
-            Item: K_Secret_Key
-            Amount: 11
-  - Group: L_INFINITY_POWER_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Limit_Power_Booster
-            Amount: 100
-          - Index: 1
-            Item: Infinity_Drink
-            Amount: 100
-          - Index: 2
-            Item: K_Secret_Key
-            Amount: 25
-          - Index: 3
-            Item: Cachua_Coupon
-            Amount: 5
-  - Group: L_ALL_RED_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Almighty
-            Amount: 100
-          - Index: 1
-            Item: Red_Booster
-            Amount: 125
-          - Index: 2
-            Item: K_Secret_Key
-            Amount: 25
-          - Index: 3
-            Item: Cachua_Coupon
-            Amount: 5
-  - Group: L_DEFENSE_POTION_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Small_Life_Potion
-            Amount: 200
-          - Index: 1
-            Item: Med_Life_Potion
-            Amount: 200
-          - Index: 2
-            Item: Mysterious_Water
-            Amount: 200
-          - Index: 3
-            Item: Small_Mana_Potion
-            Amount: 50
-          - Index: 4
-            Item: M_DEFScroll
-            Amount: 300
-          - Index: 5
-            Item: K_Secret_Key
-            Amount: 25
-          - Index: 6
-            Item: Cachua_Coupon
-            Amount: 5
-  - Group: L_SPEED_FORCE_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Force_Booster
-            Amount: 100
-          - Index: 1
-            Item: Speed_Booster
-            Amount: 100
-          - Index: 2
-            Item: K_Secret_Key
-            Amount: 25
-          - Index: 3
-            Item: Cachua_Coupon
-            Amount: 5
-  - Group: L_SPECIAL_SPEED_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Speed_Booster
-            Amount: 200
-          - Index: 1
-            Item: K_Secret_Key
-            Amount: 30
-          - Index: 2
-            Item: Cachua_Coupon
-            Amount: 10
-  - Group: L_SPECIAL_FORCE_PACK
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Force_Booster
-            Amount: 200
-          - Index: 1
-            Item: K_Secret_Key
-            Amount: 30
-          - Index: 2
-            Item: Cachua_Coupon
-            Amount: 10
-  - Group: COSTUMEMILEPACK_35_1
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 100
-          - Index: 1
-            Item: Evt_Cos_Coin
-            Amount: 12
-          - Index: 2
-            Item: Enchant_Stone_Box35
-            Amount: 3
-  - Group: COSTUMEMILEPACK_35_2
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 200
-          - Index: 1
-            Item: Evt_Cos_Coin
-            Amount: 25
-          - Index: 2
-            Item: Enchant_Stone_Box35
-            Amount: 5
-  - Group: COSTUMEMILEPACK_35_3
-    SubGroups:
-      - SubGroup: 0
-        List:
-          - Index: 0
-            Item: Nyangvine_Fruit
-            Amount: 400
-          - Index: 1
-            Item: Evt_Cos_Coin
-            Amount: 50
-          - Index: 2
-            Item: Enchant_Stone_Box35
-            Amount: 10
--- a/db/re/item_packages.yml
+++ b/db/re/item_packages.yml
@ -980,13 +980,3 @@ Body:
      - Group: 1
        Items:
          - Item: C_Chaos_Emerald
-  - Item: Summer_Select_Box4
-    Groups:
-      - Group: 0
-        Items:
-          - Item: PurpleStar_Foot_Robe
-          - Item: C_Summer_Beach
-      - Group: 1
-        Items:
-          - Item: YellowStar_Foot_Robe
-          - Item: C_Summer_Beach
--- a/db/re/item_reform.yml
+++ b/db/re/item_reform.yml
@ -9837,330 +9837,6 @@ Body:
        RandomOptionGroup: Group_0
        ClearSlots: true
        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Armor
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Armor
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Manteau
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Manteau
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Boots
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Boots
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Pendant
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Pendant
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Necklace
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Necklace
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Robe
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Robe
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Muffler
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Muffler
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Shoes
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Shoes
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Ring
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Ring
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Snowflower_Earring
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Snowflower_Earring
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_T_Sword
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_T_Sword
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Lance
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Lance
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Sword
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Sword
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_B_Sword
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_B_Sword
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Spear
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Spear
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_T_Axe
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_T_Axe
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Axe
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Axe
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Mace
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Mace
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_M_Mace
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_M_Mace
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_R_Knife
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_R_Knife
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_B_Knife
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_B_Knife
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Knuckle
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Knuckle
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Katar
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Katar
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Bow
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Bow
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Violin
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Violin
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Whip
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Whip
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Humma
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Humma
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Book
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Book
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Wand
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Wand
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Staff
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Staff
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Foxtail
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Foxtail
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Revolver
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Revolver
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Rifle
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Rifle
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Shotgun
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Shotgun
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Gatling
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Gatling
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
-      - BaseItem: Glacier_Launcher
-        Materials:
-          - Material: Imperfect_Rune
-            Amount: 10
-        ResultItem: R_Glacier_Launcher
-        ChangeRefine: -20
-        RandomOptionGroup: Group_0
-        ClearSlots: true
-        RemoveEnchantgrade: true
  - Item: Season_H_Upgrade
    BaseItems:
      - BaseItem: Season_Hood_Spring
@ -11225,206 +10901,6 @@ Body:
            Amount: 20
        ResultItem: FuriousCirclet_SOA
        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_TR
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_TR
-        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_BO
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_BO
-        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_HN
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_HN
-        ChangeRefine: 1
-      - BaseItem: Lapier_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Lapier_Furious
-        ChangeRefine: 1
-      - BaseItem: SharpSword_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: SharpSword_Furious
-        ChangeRefine: 1
-      - BaseItem: WhiteSword_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: WhiteSword_Furious
-        ChangeRefine: 1
-      - BaseItem: Stick_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Stick_Furious
-        ChangeRefine: 1
-      - BaseItem: MetalVilolin_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: MetalVilolin_Furious
-        ChangeRefine: 1
-      - BaseItem: Harp_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Harp_Furious
-        ChangeRefine: 1
-      - BaseItem: MetalWhip_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: MetalWhip_Furious
-        ChangeRefine: 1
-      - BaseItem: Whip_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Whip_Furious
-        ChangeRefine: 1
-      - BaseItem: Flame_Staff_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Flame_Staff_Furious
-        ChangeRefine: 1
-      - BaseItem: Rifle_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Rifle_Furious
-        ChangeRefine: 1
-      - BaseItem: Gatling_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Gatling_Furious
-        ChangeRefine: 1
-      - BaseItem: Specter_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Specter_Furious
-        ChangeRefine: 1
-      - BaseItem: GaleClaw_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: GaleClaw_Furious
-        ChangeRefine: 1
-      - BaseItem: Exterminate_Furious
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Etherdeocon
-            Amount: 10
-          - Material: Enriched_Etherdeocon
-            Amount: 20
-        ResultItem: Exterminate_Furious
-        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_AG
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_AG
-        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_IQ
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_IQ
-        ChangeRefine: 1
-      - BaseItem: FuriousCirclet_NW
-        MinimumRefine: 9
-        MaximumRefine: 11
-        Materials:
-          - Material: HD_Ethernium
-            Amount: 10
-          - Material: Enriched_Ethernium
-            Amount: 20
-        ResultItem: FuriousCirclet_NW
-        ChangeRefine: 1
  - Item: Gaebolg_A_Hammer_1
    BaseItems:
      - BaseItem: Gaebolg_Armor
--- a/db/re/job_basepoints.yml
+++ b/db/re/job_basepoints.yml
--- a/db/re/job_exp.yml
+++ b/db/re/job_exp.yml
@ -3365,7 +3365,7 @@ Body:
      Night_Watch: true
      Hyper_Novice: true
      Spirit_Handler: true
-    MaxBaseLevel: 275
+    MaxBaseLevel: 260
    BaseExp:
      - Level: 1
        Exp: 658
@ -3886,36 +3886,6 @@ Body:
      - Level: 259
        Exp: 270217017679
      - Level: 260
-        Exp: 283727868563
-      - Level: 261
-        Exp: 297914261991
-      - Level: 262
-        Exp: 312809975091
-      - Level: 263
-        Exp: 328450473845
-      - Level: 264
-        Exp: 344872997537
-      - Level: 265
-        Exp: 353494822476
-      - Level: 266
-        Exp: 362332193038
-      - Level: 267
-        Exp: 371390497864
-      - Level: 268
-        Exp: 380675260310
-      - Level: 269
-        Exp: 390192141818
-      - Level: 270
-        Exp: 397995984654
-      - Level: 271
-        Exp: 405955904348
-      - Level: 272
-        Exp: 414075022434
-      - Level: 273
-        Exp: 422356522883
-      - Level: 274
-        Exp: 430803653341
-      - Level: 275
        Exp: 999999999999
  - Jobs:
      Dragon_Knight: true
@ -3942,7 +3912,7 @@ Body:
      Night_Watch: true
      Hyper_Novice: true
      Spirit_Handler: true
-    MaxJobLevel: 60
+    MaxJobLevel: 55
    JobExp:
      - Level: 1
        Exp: 4700000
@ -4053,14 +4023,4 @@ Body:
      - Level: 54
        Exp: 6559840847
      - Level: 55
-        Exp: 7543816974
-      - Level: 56
-        Exp: 8675389520
-      - Level: 57
-        Exp: 9976697948
-      - Level: 58
-        Exp: 11473202640
-      - Level: 59
-        Exp: 13194183036
-      - Level: 60
-        Exp: 99999999999
+        Exp: 9999999999
--- a/db/re/job_stats.yml
+++ b/db/re/job_stats.yml
--- a/db/re/map_drops.yml
+++ b/db/re/map_drops.yml
--- 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
@ -13105,108 +13105,6 @@
 20280,G_ILL_WOOTAN_FIGHTER@KN_BRANDISHSPEAR,attack,57,5,2000,0,10000,yes,target,always,0,,,,,,6,
 20280,G_ILL_WOOTAN_FIGHTER@NPC_FIREATTACK,attack,186,4,1000,0,5000,yes,target,always,0,,,,,,,

-// Illusion of Teddy Bear
-20255,ILL_TEDDY_BEAR_R@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20255,ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
-20255,ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
-20255,ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,2,1000,0,5000,yes,target,always,0,,,,,,37,
-20255,ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
-20256,ILL_TEDDY_BEAR_Y@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
-20256,ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
-20256,ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
-20256,ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
-20256,ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
-20256,ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
-20257,ILL_TEDDY_BEAR_G@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20257,ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
-20257,ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
-20258,ILL_TEDDY_BEAR_W@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
-20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
-20258,ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
-20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
-20258,ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
-20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
-20258,ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
-20258,ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
-20258,ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
-20259,ILL_TEDDY_BEAR_B@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
-20259,ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
-20259,ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
-20259,ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_AGIUP,attack,350,1,5000,0,20000,yes,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_BLEEDING2,attack,764,5,2000,500,10000,no,target,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_CRITICALWOUND,attack,673,3,1000,500,20000,no,target,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_WIDESIGHT,attack,669,1,10000,0,30000,yes,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_WEAPONBRAKER,attack,343,1,10000,0,40000,yes,target,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_DARKBREATH,attack,202,5,2000,3000,10000,no,target,myhpltmaxrate,60,,,,,,0,
-20260,ILL_TEDDY_BEAR_S@CR_HOLYCROSS,attack,253,10,500,0,5000,yes,target,always,0,,,,,,32,
-20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_CALLSLAVE,chase,352,1,10000,0,5000,yes,self,always,0,,,,,,,
-// 20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE_K,attack,750,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_EARTHQUAKE,attack,653,5,1500,2000,20000,no,target,myhpltmaxrate,30,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_PULSESTRIKE,attack,661,5,3000,3000,20000,no,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,idle,196,1,10000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
-20260,ILL_TEDDY_BEAR_S@NPC_SUMMONSLAVE,attack,196,1,5000,1000,30000,no,self,slavele,1,20255,20256,20257,20259,,,
-20260,ILL_TEDDY_BEAR_S@NPC_POWERUP,attack,349,5,10000,0,60000,yes,self,myhpltmaxrate,20,,,,,,6,
-20260,ILL_TEDDY_BEAR_S@NPC_GRANDDARKNESS,attack,339,10,3000,1000,5000,no,self,always,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,walk,26,1,5000,0,10000,yes,self,rudeattacked,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20260,ILL_TEDDY_BEAR_S@SA_LANDPROTECTOR,attack,288,2,3000,1000,10000,no,target,groundattacked,0,,,,,,6,
-20260,ILL_TEDDY_BEAR_S@AL_PNEUMA,attack,25,1,3000,0,5000,yes,target,longrangeattacked,0,,,,,,18,
-20261,ILL_PITMAN@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20261,ILL_PITMAN@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
-20261,ILL_PITMAN@NPC_SILENCEATTACK,chase,178,3,500,0,5000,no,target,always,0,,,,,,6,
-20261,ILL_PITMAN@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
-20261,ILL_PITMAN@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
-20261,ILL_PITMAN@SM_MAGNUM,attack,7,3,1000,0,20000,yes,self,always,0,,,,,,32,
-20261,ILL_PITMAN@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
-20262,ILL_MINERAL@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,0,,,,,,,
-20262,ILL_MINERAL@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
-20262,ILL_MINERAL@AL_HEAL,idle,28,9,5000,0,1500,yes,friend,mystatuson,0,,,,,,18,
-20262,ILL_MINERAL@TF_HIDING,chase,51,1,2000,0,10000,yes,self,always,0,,,,,,19,
-20262,ILL_MINERAL@TF_HIDING,chase,51,1,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,19,
-20262,ILL_MINERAL@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,mobnearbygt,4,,,,,,,
-20262,ILL_MINERAL@NPC_COMBOATTACK,attack,171,3,500,700,5000,no,target,always,0,,,,,,,
-20262,ILL_MINERAL@TF_SPRINKLESAND,attack,149,1,500,0,5000,no,target,always,0,,,,,,6,
-20262,ILL_MINERAL@NPC_GUIDEDATTACK,attack,172,3,2000,0,15000,yes,target,always,0,,,,,,37,
-20262,ILL_MINERAL@NPC_RANDOMATTACK,attack,183,2,1500,500,5000,yes,target,always,0,,,,,,,
-20263,ILL_OBSIDIAN@TF_HIDING,idle,51,1,500,500,5000,yes,self,always,0,,,,,,19,
-20263,ILL_OBSIDIAN@AS_GRIMTOOTH,idle,137,3,5000,0,500,yes,target,mystatuson,0,,,,,,,
-20263,ILL_OBSIDIAN@WZ_EARTHSPIKE,chase,90,3,1500,500,5000,no,target,always,0,,,,,,,
-20263,ILL_OBSIDIAN@CR_SHIELDCHARGE,attack,250,3,1000,1000,5000,no,target,always,0,,,,,,,
-20263,ILL_OBSIDIAN@NPC_GROUNDATTACK,attack,185,2,500,500,5000,yes,target,always,0,,,,,,,
-20263,ILL_OBSIDIAN@TF_HIDING,attack,51,1,500,500,50000,yes,self,always,0,,,,,,19,
-20264,G_ILL_TEDDY_BEAR_R@NPC_CURSEATTACK,chase,181,3,1000,500,5000,no,target,always,0,,,,,,2,
-20264,G_ILL_TEDDY_BEAR_R@NPC_CRITICALSLASH,attack,170,1,1500,500,5000,no,target,always,0,,,,,,6,
-20264,G_ILL_TEDDY_BEAR_R@NPC_FIREATTACK,attack,186,5,1000,0,5000,yes,target,always,0,,,,,,37,
-20264,G_ILL_TEDDY_BEAR_R@BS_HAMMERFALL,attack,110,5,500,1500,5000,no,target,always,0,,,,,,8,
-20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,chase,20,2,1500,1000,5000,no,target,always,0,,,,,,,
-20265,G_ILL_TEDDY_BEAR_Y@NPC_CURSEATTACK,chase,181,5,1000,500,5000,no,target,always,0,,,,,,2,
-20265,G_ILL_TEDDY_BEAR_Y@WZ_VERMILION,attack,85,3,500,1500,10000,no,target,always,0,,,,,,6,
-20265,G_ILL_TEDDY_BEAR_Y@WZ_STORMGUST,attack,89,3,1000,1500,10000,no,target,always,0,,,,,,37,
-20265,G_ILL_TEDDY_BEAR_Y@HW_GANBANTEIN,attack,483,1,1000,0,5000,no,target,skillused,18,,,,,,8,
-20265,G_ILL_TEDDY_BEAR_Y@MG_LIGHTNINGBOLT,attack,20,3,500,1500,10000,no,target,always,0,,,,,,,
-20266,G_ILL_TEDDY_BEAR_G@NPC_BLOODDRAIN,chase,199,1,1500,0,5000,yes,target,always,0,,,,,,,
-20266,G_ILL_TEDDY_BEAR_G@NPC_CLOUD_KILL,attack,739,3,500,1500,20000,no,target,always,0,,,,,,6,
-20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,friendhpltmaxrate,99,,,,,,,
-20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,chase,729,5,3000,500,3000,no,self,myhpltmaxrate,99,,,,,,,
-20267,G_ILL_TEDDY_BEAR_W@NPC_CHEAL,attack,729,5,1500,500,5000,no,self,always,0,,,,,,2,
-20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,friendhpltmaxrate,99,,,,,,,
-20267,G_ILL_TEDDY_BEAR_W@AL_HEAL,attack,28,9,2000,0,2000,yes,friend,myhpltmaxrate,99,,,,,,3,
-20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
-20267,G_ILL_TEDDY_BEAR_W@AM_POTIONPITCHER,attack,231,4,5000,500,5000,no,friend,myhpltmaxrate,30,,,,,,5,
-20267,G_ILL_TEDDY_BEAR_W@NPC_ALLHEAL,attack,687,1,10000,5000,30000,no,self,myhpltmaxrate,10,,,,,,6,
-20267,G_ILL_TEDDY_BEAR_W@CR_HOLYCROSS,attack,253,5,500,0,5000,yes,target,always,0,,,,,,32,
-20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,chase,14,2,1500,1000,5000,no,target,always,0,,,,,,23,
-20268,G_ILL_TEDDY_BEAR_B@NPC_STORMGUST2,attack,723,1,500,1500,10000,no,target,always,0,,,,,,20,
-20268,G_ILL_TEDDY_BEAR_B@NPC_WATERATTACK,attack,184,2,1500,0,5000,yes,target,always,0,,,,,,6,
-20268,G_ILL_TEDDY_BEAR_B@MG_COLDBOLT,attack,14,3,500,1500,10000,no,target,always,0,,,,,,,
-
 // Episode 17.1 - Illusion (custom) #!todo
 20340,EL-A17T@NPC_AGIUP,chase,350,5,2000,0,60000,no,self,always,0,,,,,,6,
 20340,EL-A17T@NPC_POWERUP,attack,349,5,2000,0,60000,no,self,always,0,,,,,,6,
@ -13606,7 +13504,7 @@
 20811,ILL_KRAKEN@NPC_HELLJUDGEMENT2,chase,768,2,3000,500,5000,no,target,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_HELLJUDGEMENT2,attack,768,2,3000,500,5000,no,target,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-20811,ILL_KRAKEN@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
+20811,ILL_KRAKEN@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20811,ILL_KRAKEN@NPC_PHANTOMTHRUST,chase,741,5,1000,0,5000,no,self,always,0,,,,,,,
 20811,ILL_KRAKEN@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
@ -13638,7 +13536,7 @@
 20843,ILL_ABYSMAL_WITCH@NPC_HELLJUDGEMENT2,chase,768,2,2000,500,5000,no,target,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_HELLJUDGEMENT2,attack,768,2,2000,500,5000,no,target,always,0,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-20843,ILL_ABYSMAL_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
+20843,ILL_ABYSMAL_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20843,ILL_ABYSMAL_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,

 // Episode 17.2 - Sage's Legacy
@ -14239,7 +14137,7 @@
 20934,R001_BESTIA@NPC_EARTHQUAKE,attack,653,5,10000,500,20000,no,self,myhpltmaxrate,40,,,,,,,
 20934,R001_BESTIA@NPC_PULSESTRIKE,attack,661,5,10000,0,15000,no,self,myhpltmaxrate,60,,,,,,,
 20934,R001_BESTIA@NPC_DRAGONFEAR,attack,659,5,10000,0,10000,no,self,always,0,,,,,,,
-// 20934,R001_BESTIA@NPC_DAMAGE_HEAL,attack,753,1,3000,1500,40000,no,self,myhpltmaxrate,20,,,,,,,
+// 20934,R001_BESTIA@NPC_DAMAGE_HEAL,attack,753,1,3000,1500,40000,no,target,myhpltmaxrate,20,,,,,,,

 // nif_dun
 20935,GAN_CEANN@NPC_CRITICALSLASH,attack,170,1,1000,500,5000,no,target,always,0,,,,,,,
@ -14339,7 +14237,7 @@
 20943,DEATH_WITCH@NPC_HELLJUDGEMENT,chase,662,2,2000,500,5000,no,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_HELLJUDGEMENT,attack,662,2,2000,500,5000,no,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_CLOUD_KILL,attack,739,5,2000,500,16000,no,target,always,0,,,,,,,
-// 20943,DEATH_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,self,myhpltmaxrate,10,,,,,,,
+// 20943,DEATH_WITCH@NPC_DAMAGE_HEAL,attack,753,1,10000,1000,60000,no,target,myhpltmaxrate,10,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,idle,352,1,5000,0,30000,yes,self,always,0,,,,,,,
 20943,DEATH_WITCH@NPC_CALLSLAVE,attack,352,1,5000,0,30000,yes,self,always,0,,,,,,,

@ -14570,7 +14468,7 @@
 21395,ILL_MAYA@NPC_CRITICALWOUND,attack,673,1,500,0,5000,yes,target,always,0,,,,,,,
 21395,ILL_MAYA@NPC_IMMUNE_PROPERTY,chase,754,4,1500,1500,60000,no,self,casttargeted,0,,,,,,,
 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,self,myhpltmaxrate,50,,,,,,32,
+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
@ -14775,7 +14673,7 @@
 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_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,,,,,,,
@ -14800,6 +14698,6 @@
 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_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
@ -1404,21 +1404,21 @@ Body:
    TimeLimit: 4h
  - Id: 3455
    Title: Illusion Investigation Team - Machoko
-  - Id: 3456
-    Title: Illusion of Teddy Bear 100 Kills
-    Targets:
-      - Id: 1
-        Count: 100
-        Location: ein_d02_i
-        MapMobTargets:
-          ILL_TEDDY_BEAR_B: true
-          ILL_MINERAL: true
-          ILL_PITMAN: true
-          ILL_TEDDY_BEAR_R: true
-          ILL_TEDDY_BEAR_Y: true
-          ILL_TEDDY_BEAR_W: true
-          ILL_OBSIDIAN: true
-          ILL_TEDDY_BEAR_G: true
+  # - Id: 3456
+    # Title: Illusion of Teddy Bear 100 Kills
+    # Targets:
+      # - Id: 1
+        # Count: 100
+        # Location: ein_d02_i
+        # MapMobTargets:
+          # ILL_TEDDY_BEAR_B: true
+          # ILL_MINERAL: true
+          # ILL_PITMAN: true
+          # ILL_TEDDY_BEAR_R: true
+          # ILL_TEDDY_BEAR_Y: true
+          # ILL_TEDDY_BEAR_W: true
+          # ILL_OBSIDIAN: true
+          # ILL_TEDDY_BEAR_G: true
  - Id: 3457
    Title: Illusion of Teddy Bear 100 Kills - Standby
    TimeLimit: 4h
@ -1578,26 +1578,26 @@ Body:
  - Id: 3495
    Title: Conversation with Jeojin
  - Id: 3496
-    Title: Conversation with Skuain
+    Title: Conversation with Squain
  - Id: 3497
    Title: Conversation with Senado
  - Id: 3498
    Title: Conversation with Japer
  - Id: 3499
-    Title: Conversation with Shiroan
+    Title: Conversation with Shirouan
  - Id: 3500
-    Title: Conversation with Isira
+    Title: Conversation with Ishira
  - Id: 3501
-    Title: Conversation with Dina
+    Title: Conversation with Gina
  - Id: 3502
    Title: Conversation with Hari
  - Id: 3503
-    Title: "[Daily] Opinion Gathering"
+    Title: Examine the Sky
  - Id: 3504
-    Title: "[Cooldown] Opinion Gathering"
-    TimeLimit: 4h
+    Title: Look at the Sky - Standby
  - Id: 3505
-    Title: Completed Opinion Gathering
+    Title: Report to Junok
+    TimeLimit: 4h
  - Id: 3507
    Title: Illusion Investigation Team - Sheshin
  - Id: 3508
@ -3234,28 +3234,26 @@ Body:
    Title: "[Standby] Subjugation-Yanggeochon"
    TimeLimit: 4h
  - Id: 5932
-    Title: Abused Child
+    Title: The Abused Child
  - Id: 5933
-    Title: Business Plan
+    Title: Business Plan Presentation
  - Id: 5934
-    Title: Foraging Practice (1)
+    Title: Gathering Training (1)
  - Id: 5935
-    Title: Foraging Practice (2)
+    Title: Gathering Training (2)
  - Id: 5936
-    Title: Foraging Practice (3)
+    Title: Gathering Training (3)
  - Id: 5937
-    Title: "[Cooldown] Half Flower Gathering"
+    Title: "[Standby] Flower Room's work"
    TimeLimit: 4h
  - Id: 5938
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5939
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5940
-    Title: "[Daily] Half Flower Gathering"
+    Title: Gathering Half Flower
  - Id: 5941
-    Title: "[Daily] Half Flower Gathering"
-  - Id: 5942
-    Title: Flower Room Opening Ceremony
+    Title: Gathering Half Flower
  - Id: 6000
    Title: Job Change to Taekwon
  - Id: 6001
@ -6318,55 +6316,55 @@ Body:
          DROSERA: true
          MUSCIPULAR: true
  - Id: 8681
-    Title: Towards Rachel (1)
+    Title: To Rachel (1)
  - Id: 8682
-    Title: Towards Rachel (2)
+    Title: To Rachel (2)
  - Id: 8683
-    Title: Heated Argument
+    Title: Please stop fighting
  - Id: 8684
-    Title: State of Conflict
+    Title: It's over
  - Id: 8685
-    Title: Suspicious Movement
+    Title: A suspicious movement detected in the temple
  - Id: 8686
-    Title: Intruder of the Temple
+    Title: The Intruder of the Temple
  - Id: 8687
-    Title: Staged Plot
+    Title: Did you break it?
  - Id: 8688
-    Title: Today's Daily Bread
+    Title: Thanks for today's daily food
  - Id: 8689
-    Title: "[Cooldown] Today's Daily Bread"
+    Title: Today's Daily food - Standby
    TimeLimit: 4h
  - Id: 8690
-    Title: "[Daily] Today's Daily Bread"
+    Title: Thanks for today's daily food
  - Id: 8691
-    Title: Water Purification (1)
+    Title: Sacred Relics for Essence (1)
  - Id: 8692
-    Title: Water Purification (2)
+    Title: Sacred Relics for Essence (2)
  - Id: 8693
-    Title: Water Purification (3)
+    Title: Sacred Relics for Essence (3)
  - Id: 8694
-    Title: "[Cooldown] Water Purification"
+    Title: Clean Water Procurement - Standby
    TimeLimit: 4h
  - Id: 8695
-    Title: "[Daily] Water Purification (1)"
+    Title: Procurement of clean water (1)
  - Id: 8696
-    Title: "[Daily] Water Purification (2)"
+    Title: Procurement of clean water (2)
  - Id: 8697
-    Title: "[Daily] Water Purification (3)"
+    Title: Procurement of clean water (3)
  - Id: 8698
-    Title: Horim's Bizarre Adventure (1)
+    Title: Late migration
  - Id: 8699
-    Title: Horim's Bizarre Adventure (2)
+    Title: First Step Out of the City
  - Id: 8700
-    Title: Horim's Bizarre Adventure (3)
+    Title: I couldn't even come halfway
  - Id: 8701
-    Title: Horim's Bizarre Adventure (4)
+    Title: Scenery I've Seen for the First Time
  - Id: 8702
-    Title: Horim's Bizarre Adventure (5)
+    Title: Smell of Volcanic Ash
  - Id: 8703
-    Title: Horim's Bizarre Adventure (6)
+    Title: The easy way to go
  - Id: 8718
-    Title: Greetings from a Friend
+    Title: My friend's regards
  - Id: 8719
    Title: A new area somewhere in the anthill
  - Id: 8720
@ -8040,74 +8038,14 @@ Body:
  - Id: 11555
    Title: In search of the taste of hometown - Waiting
    TimeLimit: 4h
-  - Id: 11556
-    Title: Missing Steven
-  - Id: 11557
-    Title: Missing Steven
-  - Id: 11558
-    Title: Missing Steven
-  - Id: 11559
-    Title: Missing Steven
-  - Id: 11560
-    Title: Missing Steven
-  - Id: 11561
-    Title: Missing Steven
-  - Id: 11562
-    Title: Missing Steven
-  - Id: 11563
-    Title: Nasarian Conspiracy
-    Targets:
-      - Mob: ILL_TEDDY_BEAR_R
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_Y
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_G
-        Count: 10
-  - Id: 11564
-    Title: Nasarian Conspiracy
-    Targets:
-      - Mob: ILL_TEDDY_BEAR_B
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_W
-        Count: 10
-  - Id: 11565
-    Title: RUN!
-    Targets:
-      - Mob: ILL_PITMAN
-        Count: 10
-      - Mob: ILL_MINERAL
-        Count: 10
-      - Mob: ILL_OBSIDIAN
-        Count: 10
  - Id: 11566
-    Title: RUN! - Pending
+    Title: Escape!!!! - Wait
    TimeLimit: 4h
-  - Id: 11567
-    Title: Things That Shouldn't Exist
-    Targets:
-      - Mob: ILL_TEDDY_BEAR_R
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_Y
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_G
-        Count: 10
-  - Id: 11568
-    Title: Things That Shouldn't Exist
-    Targets:
-      - Mob: ILL_TEDDY_BEAR_B
-        Count: 10
-      - Mob: ILL_TEDDY_BEAR_W
-        Count: 10
  - Id: 11569
-    Title: Things That Shouldn't Exist - Pending
+    Title: Present not to exist-wait
    TimeLimit: 4h
-  - Id: 11570
-    Title: Let the Light Devour the Darkness
-    Targets:
-      - Mob: ILL_TEDDY_BEAR_S
-        Count: 1
  - Id: 11571
-    Title: Let the Light Devour the Darkness - Pending
+    Title: Let the light consume the darkness - Wait
    TimeLimit: 4h
  - Id: 11596
    Title: Old Memories
@ -8198,104 +8136,104 @@ Body:
    Title: Squirrels are rats, too? Standby
    TimeLimit: 4h
  - Id: 11696
-    Title: Niren's Request (1)
+    Title: Niren's Request
  - Id: 11697
-    Title: Niren's Request (2)
+    Title: Niren's Request
  - Id: 11698
-    Title: Niren's Request (3)
+    Title: Niren's Request
  - Id: 11699
-    Title: Niren's Request (4)
+    Title: Niren's Request
  - Id: 11700
-    Title: Niren's Request (5)
+    Title: Niren's Request
  - Id: 11701
-    Title: Niren's Request (6)
+    Title: Niren's Request
  - Id: 11702
-    Title: Niren's Request (7)
+    Title: Niren's Request
  - Id: 11703
-    Title: Niren's Request (8)
+    Title: Niren's Request
  - Id: 11704
-    Title: Gray Children (1)
+    Title: Niren's Request
  - Id: 11705
-    Title: Gray Children (2)
+    Title: Children of Grey
  - Id: 11706
-    Title: Gray Children (3)
+    Title: Children of Grey
  - Id: 11707
-    Title: Gray Children (4)
+    Title: Children of Grey
  - Id: 11708
-    Title: Gray Children (5)
+    Title: Children of Grey
  - Id: 11709
-    Title: Gray Children (6)
+    Title: Children of Grey
  - Id: 11710
-    Title: Gray Children (7)
+    Title: Children of Grey
  - Id: 11711
-    Title: Gray Children (8)
+    Title: Children of Grey
  - Id: 11712
-    Title: Gray Children (9)
+    Title: Children of Grey
  - Id: 11713
-    Title: Gray Children (10)
+    Title: Children of Grey
  - Id: 11714
-    Title: Gray Children (11)
+    Title: Children of Grey
  - Id: 11715
-    Title: Gray Children (12)
+    Title: Children of Grey
  - Id: 11716
-    Title: Gray Children (13)
+    Title: Children of Grey
  - Id: 11717
-    Title: Gray Children (14)
+    Title: Children of Grey
  - Id: 11718
-    Title: Gray Children (15)
+    Title: Children of Grey
  - Id: 11719
-    Title: Gray Children (16)
+    Title: Children of Grey
  - Id: 11720
-    Title: Gray Children (17)
+    Title: Children of Grey
  - Id: 11721
-    Title: Gray Children (18)
+    Title: Children of Grey
  - Id: 11722
-    Title: Gray Children (19)
+    Title: Children of Grey
  - Id: 11723
-    Title: Gray Children (20)
+    Title: Children of Grey
  - Id: 11724
-    Title: Gray Children (21)
+    Title: Children of Grey
  - Id: 11725
-    Title: The Labyrinth and the Merchant (1)
+    Title: Investigation of Oz Labyrinth
  - Id: 11726
-    Title: The Labyrinth and the Merchant (2)
+    Title: Investigation of Oz Labyrinth
  - Id: 11727
-    Title: The Labyrinth and the Merchant (3)
+    Title: Investigation of Oz Labyrinth
  - Id: 11728
-    Title: The Labyrinth and the Merchant (4)
+    Title: Investigation of Oz Labyrinth
  - Id: 11729
-    Title: The Labyrinth and the Merchant (5)
+    Title: Investigation of Oz Labyrinth
  - Id: 11730
-    Title: The Labyrinth and the Merchant (6)
+    Title: Investigation of Oz Labyrinth
    Targets:
      - Id: 1
        Location: oz_dun01
        Count: 10
  - Id: 11731
-    Title: The Labyrinth and the Merchant (7)
+    Title: Investigation of Oz Labyrinth
  - Id: 11732
-    Title: The Labyrinth and the Merchant (8)
+    Title: Investigation of Oz Labyrinth
  - Id: 11733
-    Title: The Labyrinth and the Merchant (9)
+    Title: Investigation of Oz Labyrinth
  - Id: 11734
-    Title: The Labyrinth and the Merchant (10)
+    Title: Investigation of Oz Labyrinth
  - Id: 11735
-    Title: The Labyrinth and the Merchant (11)
+    Title: Investigation of Oz Labyrinth
  - Id: 11736
-    Title: Oz Labyrinth 1F (170lv)
+    Title: Maze of Oz 1st Floor (170lv)
    Targets:
      - Mob: EP18_ASH_TOAD
        Count: 20
  - Id: 11737
-    Title: "[Cooldown] Oz Labyrinth 1F"
+    Title: Maze of Oz Level 1 - Standby
    TimeLimit: 4h
  - Id: 11738
-    Title: Oz Labyrinth 2F (200lv)
+    Title: Maze of Oz Level 2 (200lv)
    Targets:
      - Mob: EP18_HOT_MOLAR
        Count: 20
  - Id: 11739
-    Title: "[Cooldown] Oz Labyrinth 2F"
+    Title: Maze of Oz Level 2 (200lv)
    TimeLimit: 4h
  - Id: 12000
    Title: An old friend
@ -9337,30 +9275,30 @@ Body:
    Title: Let's try again to seal the crack
    TimeLimit: 4h
  - Id: 12520
-    Title: "[Normal] Villa of Deception"
+    Title: Villa of Deception
  - Id: 12521
-    Title: "[Hard] Villa of Deception"
+    Title: Villa of Deception Hard
  - Id: 12522
-    Title: "[Cooldown] Villa of Deception"
+    Title: Cooldown: Villa of Deception
    TimeLimit: 4h
  - Id: 12531
-    Title: Transporting Goods
+    Title: Future General Candidate
  - Id: 12532
-    Title: Broken Wagon
+    Title: Trouble at the Top
  - Id: 12533
-    Title: Hidden Helper
+    Title: The Hidden Helper
  - Id: 12534
-    Title: Missing Camille
+    Title: The Missing Camille
  - Id: 12535
-    Title: Chief Decision
+    Title: The Governor's Decision
  - Id: 12536
-    Title: Scattered Goods (North)
+    Title: The Scattered Luggage (North)
  - Id: 12537
-    Title: Scattered Goods (West)
+    Title: Scattered Luggage (West)
  - Id: 12538
-    Title: Scattered Goods (East)
+    Title: The Scattered Luggage (East)
  - Id: 12539
-    Title: Scattered Goods (South)
+    Title: Scattered Luggage (South)
  - Id: 13000
    Title: RWC2011Card Gathering
  - Id: 13001
@ -11514,84 +11452,84 @@ Body:
      - Mob: EP18_FIREWIND_KITE
        Count: 30
  - Id: 16549
-    Title: "[Daily] I can't sleep"
+    Title: I can't sleep
    Targets:
      - Mob: EP18_FIREWIND_KITE
        Count: 30
  - Id: 16550
-    Title: "[Cooldown] I can't sleep"
+    Title: I Can't Sleep - Wait
    TimeLimit: 4h
  - Id: 16551
-    Title: Collecting Folklore (1)
+    Title: The Story of Dinar
  - Id: 16552
-    Title: Collecting Folklore (2)
+    Title: Amira's Story
  - Id: 16553
-    Title: Collecting Folklore (3)
+    Title: Shanina's Grandma's Story
  - Id: 16554
-    Title: Collecting Folklore (4)
+    Title: Please collect the stories
  - Id: 16555
-    Title: "[Daily] Dinar's Story"
+    Title: The Story of Dinar
  - Id: 16556
-    Title: "[Daily] Amira's Story"
+    Title: Amira's Story
  - Id: 16557
-    Title: "[Daily] Shanina's Story"
+    Title: Shanina's Grandma's Story
  - Id: 16558
-    Title: "[Daily] Collecting Folklore"
+    Title: Please collect the stories
  - Id: 16559
-    Title: "[Cooldown] Collecting Folklore"
+    Title: Please collect the stories - Standby
    TimeLimit: 4h
  - Id: 16560
-    Title: Ahab's Gossip (1)
+    Title: This is not the place
  - Id: 16561
-    Title: Ahab's Gossip (2)
+    Title: This is not the place
  - Id: 16562
-    Title: Ahab's Gossip (3)
+    Title: This is not the place
  - Id: 16563
-    Title: Ahab's Gossip (4)
+    Title: This is not the place
  - Id: 16564
-    Title: Ahab's Gossip (5)
+    Title: This is not the place
  - Id: 16565
-    Title: Ahab's Gossip (6)
+    Title: This is not the place
  - Id: 16566
-    Title: Ahab's Gossip (7)
+    Title: This is not the place
  - Id: 16567
-    Title: Gray Wolf Forest Tournament (1)
+    Title: The Contest of the Grey Wolf Forest
  - Id: 16568
-    Title: People's Opinion (1)
+    Title: Everyone's Opinion
  - Id: 16569
-    Title: People's Opinion (2)
+    Title: Everyone's Opinion
  - Id: 16570
-    Title: People's Opinion (3)
+    Title: Everyone's Opinion
  - Id: 16571
-    Title: People's Opinion (4)
+    Title: Everyone's Opinion
  - Id: 16572
-    Title: Gray Wolf Forest Tournament (2)
+    Title: The Contest of the Grey Wolf Forest
  - Id: 16573
-    Title: Source of Weapons (1)
+    Title: Source of Weapon
  - Id: 16574
-    Title: Source of Weapons (2)
+    Title: Source of Weapon
  - Id: 16575
-    Title: Source of Weapons (3)
+    Title: Source of Weapon
  - Id: 16576
-    Title: Source of Weapons (4)
+    Title: Source of Weapon
  - Id: 16577
-    Title: Source of Weapons (5)
+    Title: Source of Weapon
  - Id: 16578
-    Title: Source of Weapons (6)
+    Title: Source of Weapon
  - Id: 16579
-    Title: Source of Weapons (7)
+    Title: Source of Weapon
  - Id: 16580
-    Title: Source of Weapons (8)
+    Title: Source of Weapon
  - Id: 16581
-    Title: Even children know (1)
+    Title: Children Know It
  - Id: 16582
-    Title: Even children know (2)
+    Title: Children Know It
  - Id: 16583
-    Title: Even children know (3)
+    Title: Children Know It
  - Id: 16584
-    Title: The Price of Labor (1)
+    Title: The Price of Labor
  - Id: 16585
-    Title: The Price of Labor (2)
+    Title: The Price of Labor
  - Id: 17000
    Title: Meet with Father Bamph
  - Id: 17001
@ -11854,62 +11792,62 @@ Body:
    Title: (Standby) Thanatos Tower, 12th floor
    TimeLimit: 4h
  - Id: 17504
-    Title: Where is My Home (1)
+    Title: Where's My Home
  - Id: 17505
-    Title: Where is My Home (2)
+    Title: Where's My Home
  - Id: 17506
-    Title: Where is My Home (3)
+    Title: Where's My Home
  - Id: 17507
-    Title: Where is My Home (4)
+    Title: Where's My Home
  - Id: 17508
-    Title: "[Daily] Shortage of Supplies"
+    Title: Lack of Supplies
    Drops:
      - Mob: EP18_GREY_WOLF
        Item: Ep18_Very_Ddan_Crystal
        Rate: 5000
  - Id: 17509
-    Title: "[Cooldown] Shortage of Supplies"
+    Title: (Standby) Lack of supplies
    TimeLimit: 4h
  - Id: 17510
-    Title: There are no evil beasts in this world (1)
+    Title: There are no bad beasts in the world
  - Id: 17511
-    Title: There are no evil beasts in this world (2)
+    Title: There are no bad beasts in the world
  - Id: 17512
-    Title: There are no evil beasts in this world (3)
+    Title: There are no bad beasts in the world
  - Id: 17513
-    Title: An Unexpected Shepherd (1)
+    Title: The Unexpected Shepherd
  - Id: 17514
-    Title: An Unexpected Shepherd (2)
+    Title: The Unexpected Shepherd
    Targets:
      - Mob: EP18_ASHRING
        Count: 20
  - Id: 17515
-    Title: An Unexpected Shepherd (3)
+    Title: The Unexpected Shepherd
  - Id: 17516
-    Title: "[Cooldown] An Unexpected Shepherd"
+    Title: (Standby) Unexpected shepherd
    TimeLimit: 4h
  - Id: 17517
-    Title: Rebellion (1)
+    Title: The Rebels
  - Id: 17518
-    Title: Rebellion (2)
+    Title: The Rebels
  - Id: 17519
-    Title: Rebellion (3)
+    Title: The Rebels
  - Id: 17520
-    Title: Wolf Among Sheep (1)
+    Title: Wolf in the Sheep
  - Id: 17521
-    Title: Wolf Among Sheep (2)
+    Title: When you need a conversation
  - Id: 17522
-    Title: Wolf Among Sheep (3)
+    Title: Cleaning the Traitors
  - Id: 17523
-    Title: Sanctuary Purification
+    Title: Purification of the Sanctuary
  - Id: 17524
-    Title: "[Completed] Renegade Cleaning"
+    Title: Cleaning the Traitors
  - Id: 17525
-    Title: Aftermath
+    Title: When you need a conversation
  - Id: 17526
-    Title: "[Completed] Sanctuary Purification"
+    Title: Purification of the Sanctuary
  - Id: 17527
-    Title: "[Cooldown] Sanctuary Purification"
+    Title: (Standby) Cleaning strategy
    TimeLimit: 4h
  - Id: 17566
    Title: (Standby) Code name! Is it a star button?
@ -12037,21 +11975,21 @@ Body:
    Title: Goseong dungeon 1st floor attack
    TimeLimit: 4h
  - Id: 18082
-    Title: Eligibility to attend the competition
+    Title: Eligibility to Participate in the Competition
  - Id: 18083
-    Title: High Priest's Villa
+    Title: Investigation of Daishinkan's Villa
  - Id: 18084
-    Title: Fact Finding
+    Title: Fact Investigation
  - Id: 18085
-    Title: Direction of Prayer
+    Title: The Direction of Prayer
  - Id: 18086
-    Title: "[Daily] Gray Wolf Forest Hunting"
+    Title: Make the Grey Wolf Forest Safer
    Targets:
      - Id: 1
        Location: gw_fild01
        Count: 30
  - Id: 18087
-    Title: "[Cooldown] Gray Wolf Forest Hunting"
+    Title: Safer in the Gray Wolf Forest - Standby
    TimeLimit: 4h
  - Id: 18100
    Title: Legends from Moscovia
--- a/db/re/skill_db.yml
+++ b/db/re/skill_db.yml
@ -7235,7 +7235,6 @@ Body:
    TargetType: Self
    DamageFlags:
      IgnoreDefense: true
-      SimpleDefense: true
    Range: 9
    Hit: Single
    HitCount: 1
@ -7535,7 +7534,7 @@ Body:
      TargetTrap: true
    Range: 9
    Hit: Multi_Hit
-    HitCount: -5
+    HitCount: 5
    Element: Weapon
    CopyFlags:
      Skill:
@ -7665,7 +7664,6 @@ Body:
    TargetType: Attack
    DamageFlags:
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: -2
@ -7699,6 +7697,7 @@ Body:
      - Level: 5
        Time: 1000
    Duration1: 3000
+    Duration2: 300000
    FixedCastTime:
      - Level: 1
        Time: 2000
@ -8878,7 +8877,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
-    Duration1: 15000
    Duration2: 27000
    Cooldown: 4000
    Requires:
@ -9136,7 +9134,6 @@ Body:
    HitCount: 1
    SplashArea: -1
    AfterCastActDelay: 300
-    Duration1: 4500
    Duration2: 4500
    Cooldown: 4000
    Requires:
@ -9455,7 +9452,6 @@ Body:
    DamageFlags:
      IgnoreAtkCard: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      IsNpc: true
      TargetSelf: true
@ -18364,43 +18360,6 @@ Body:
    HitCount: 1
    Duration1: 60000
    Status: Relieve_off
-  - Id: 776
-    Name: NPC_DEADLYCURSE
-    Description: Deadly Curse
-    MaxLevel: 1
-    TargetType: Attack
-    DamageFlags:
-      NoDamage: true
-    Flags:
-      IgnoreGtb: true
-      IsNpc: true
-    Range: 1
-    Duration1: 15000
-    Status: Deadly_Defeasance
-  - Id: 779
-    Name: NPC_DEADLYCURSE2
-    Description: Deadly Curse 2
-    MaxLevel: 5
-    TargetType: Self
-    DamageFlags:
-      NoDamage: true
-      Splash: true
-    Flags:
-      IgnoreGtb: true
-      IsNpc: true
-    SplashArea:
-      - Level: 1
-        Area: 2
-      - Level: 2
-        Area: 3
-      - Level: 3
-        Area: 4
-      - Level: 4
-        Area: 5
-      - Level: 5
-        Area: 6
-    Duration2: 30000
-    Status: Deadly_Defeasance
  - Id: 780
    Name: NPC_CANE_OF_EVIL_EYE
    Description: Cane of evil eye
@ -19151,7 +19110,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@ -22697,7 +22655,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      AllowOnMado: true
    Range: 9
@ -28832,7 +28789,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Range:
      - Level: 1
        Size: 7
@ -29731,19 +29687,6 @@ Body:
        - Level: 2
          Amount: 100
    Status: Odins_Power
-  - Id: 2543
-    Name: ALL_RAY_OF_PROTECTION
-    Description: Ray of Protection
-    MaxLevel: 1
-    Type: Magic
-    TargetType: Support
-    DamageFlags:
-      NoDamage: true
-    Range: 1
-    Hit: Single
-    HitCount: 1
-    Duration1: 60000
-    Status: Protection
  - Id: 2544
    Name: MC_CARTDECORATE
    Description: Decorate Cart
@ -33202,7 +33145,6 @@ Body:
    DamageFlags:
      Splash: true
      IgnoreFlee: true
-      SimpleDefense: true
    Flags:
      TargetTrap: true
    Range: 9
@ -43018,10 +42960,10 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    Flags:
-      IgnoreGtb: true
-    AfterCastWalkDelay: 1000
-    Cooldown: 20000
+    Range: 9
+    Hit: Single
+    HitCount: 1
+    AfterCastActDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@ -43044,7 +42986,11 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+      Splash: true
+    Hit: Single
+    HitCount: 1
+    SplashArea: -1
+    AfterCastActDelay: 35000
    Duration1:
      - Level: 1
        Time: 40000
@ -43056,7 +43002,6 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
-    Cooldown: 35000
    Requires:
      SpCost:
        - Level: 1
@ -43074,6 +43019,7 @@ Body:
    Name: HLIF_BRAIN
    Description: Brain Surgery
    MaxLevel: 5
+    SplashArea: 1
  - Id: 8004
    Name: HLIF_CHANGE
    Description: Change
@ -43081,7 +43027,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@ -43089,7 +43035,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 600000
      - Level: 2
@ -43106,8 +43052,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
-    Cooldown: 1000
+    Hit: Single
+    Duration2: 1000
    Requires:
      SpCost: 10
  - Id: 8006
@ -43117,7 +43063,8 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    AfterCastActDelay: 30000
    Duration1:
      - Level: 1
        Time: 40000
@ -43129,7 +43076,6 @@ Body:
        Time: 25000
      - Level: 5
        Time: 20000
-    Cooldown: 30000
    Requires:
      SpCost:
        - Level: 1
@ -43147,6 +43093,8 @@ Body:
    Name: HAMI_SKIN
    Description: Adamantium Skin
    MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
  - Id: 8008
    Name: HAMI_BLOODLUST
    Description: Bloodlust
@ -43154,7 +43102,7 @@ Body:
    TargetType: Self
    DamageFlags:
      NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
    Duration1:
      - Level: 1
        Time: 60000
@ -43162,7 +43110,7 @@ Body:
        Time: 180000
      - Level: 3
        Time: 300000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 300000
      - Level: 2
@ -43191,7 +43139,7 @@ Body:
        Count: -2
      - Level: 5
        Count: -3
-    Cooldown: 2000
+    AfterCastWalkDelay: 2000
    Requires:
      SpCost:
        - Level: 1
@ -43212,7 +43160,6 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@ -43224,7 +43171,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 60000
      - Level: 2
@ -43258,7 +43205,6 @@ Body:
      NoDamage: true
    Hit: Single
    CastCancel: true
-    AfterCastWalkDelay: 1000
    Duration1:
      - Level: 1
        Time: 60000
@ -43270,7 +43216,7 @@ Body:
        Time: 45000
      - Level: 5
        Time: 40000
-    Cooldown:
+    Duration2:
      - Level: 1
        Time: 60000
      - Level: 2
@ -43303,7 +43249,7 @@ Body:
    Range: 15
    Hit: Single
    HitCount: 1
-    Cooldown: 1000
+    AfterCastActDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8013
@ -43325,7 +43271,7 @@ Body:
        Count: 4
      - Level: 5
        Count: 5
-    Cooldown:
+    AfterCastActDelay:
      - Level: 1
        Time: 2000
      - Level: 2
@ -43356,8 +43302,8 @@ Body:
    DamageFlags:
      NoDamage: true
    Hit: Single
-    AfterCastWalkDelay: 1500
-    Cooldown: 3000
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
    Requires:
      SpCost: 40
  - Id: 8015
@ -43381,8 +43327,7 @@ Body:
    HitCount: 1
    Element: Weapon
    SplashArea: 4
-    AfterCastActDelay: 5000
-    CoolDown: 1000
+    AfterCastWalkDelay: 1000
    Requires:
      SpCost: 1
  - Id: 8018
--- a/db/re/statpoint.yml
+++ b/db/re/statpoint.yml
@ -612,48 +612,3 @@ Body:
  - Level: 260
    Points: 4099
    TraitPoints: 228
-  - Level: 261
-    Points: 4099
-    TraitPoints: 231
-  - Level: 262
-    Points: 4099
-    TraitPoints: 234
-  - Level: 263
-    Points: 4099
-    TraitPoints: 237
-  - Level: 264
-    Points: 4099
-    TraitPoints: 240
-  - Level: 265
-    Points: 4099
-    TraitPoints: 247
-  - Level: 266
-    Points: 4099
-    TraitPoints: 250
-  - Level: 267
-    Points: 4099
-    TraitPoints: 253
-  - Level: 268
-    Points: 4099
-    TraitPoints: 256
-  - Level: 269
-    Points: 4099
-    TraitPoints: 259
-  - Level: 270
-    Points: 4099
-    TraitPoints: 266
-  - Level: 271
-    Points: 4099
-    TraitPoints: 269
-  - Level: 272
-    Points: 4099
-    TraitPoints: 272
-  - Level: 273
-    Points: 4099
-    TraitPoints: 275
-  - Level: 274
-    Points: 4099
-    TraitPoints: 278
-  - Level: 275
-    Points: 4099
-    TraitPoints: 285
--- a/db/re/status.yml
+++ b/db/re/status.yml
@ -72,7 +72,6 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-      Protection: true
    EndOnStart:
      Aeterna: true
    EndReturn:
@ -86,7 +85,7 @@ Body:
    Opt1: StoneWait
    Flags:
      SendOption: true
-      BossResist: true
+      BossResist: true      
      StopAttacking: true
    Fail:
      Whiteimprison: true
@ -126,7 +125,6 @@ Body:
      Stun: true
      Sleep: true
      Burning: true
-      Protection: true
    EndOnStart:
      Aeterna: true
  - Status: Stun
@ -146,7 +144,6 @@ Body:
      Inspiration: true
      Gvg_Stun: true
      Stun: true
-      Protection: true
  - Status: Sleep
    DurationLookup: NPC_SLEEPATTACK
    States:
@ -165,7 +162,6 @@ Body:
      Inspiration: true
      Gvg_Sleep: true
      Sleep: true
-      Protection: true
  - Status: Poison
    DurationLookup: NPC_POISON
    CalcFlags:
@ -184,7 +180,6 @@ Body:
      Inspiration: true
      Poison: true
      Dpoison: true
-      Protection: true
  - Status: Curse
    DurationLookup: NPC_WIDECURSE
    CalcFlags:
@ -203,7 +198,6 @@ Body:
      Inspiration: true
      Gvg_Curse: true
      Curse: true
-      Protection: true
  - Status: Silence
    DurationLookup: NPC_SILENCEATTACK
    States:
@ -220,7 +214,6 @@ Body:
      Inspiration: true
      Gvg_Silence: true
      Silence: true
-      Protection: true
  - Status: Confusion
    DurationLookup: NPC_WIDECONFUSE
    Flags:
@ -230,7 +223,6 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
    EndReturn:
      Confusion: true
  - Status: Blind
@ -250,7 +242,6 @@ Body:
      Fear: true
      Gvg_Blind: true
      Blind: true
-      Protection: true
  - Status: Bleeding
    Icon: EFST_BLOODING
    DurationLookup: NPC_BLEEDING
@ -268,7 +259,6 @@ Body:
    Fail:
      Refresh: true
      Inspiration: true
-      Protection: true
  - Status: Dpoison
    DurationLookup: NPC_POISON
    CalcFlags:
@ -1009,7 +999,6 @@ Body:
    Flags:
      SendOption: true
  - Status: Extremityfist
-    Icon: EFST_EXTREMITYFIST
    DurationLookup: MO_EXTREMITYFIST
    CalcFlags:
      Regen: true
@ -1822,7 +1811,6 @@ Body:
    Icon: EFST_ETERNALCHAOS
    DurationLookup: BD_ETERNALCHAOS
    CalcFlags:
-      Def: true
      Def2: true
    Flags:
      NoDispell: true
@ -2601,17 +2589,13 @@ Body:
    DurationLookup: HLIF_AVOID
    CalcFlags:
      Speed: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Change
    DurationLookup: HLIF_CHANGE
    CalcFlags:
      Vit: true
      Int: true
    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
+      RemoveOnChangeMap: true
    Fail:
      Change: true
  - Status: Bloodlust
@ -2619,9 +2603,6 @@ Body:
    CalcFlags:
      Batk: true
      Watk: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Fleet
    DurationLookup: HFLI_FLEET
    CalcFlags:
@ -2635,11 +2616,7 @@ Body:
  - Status: Defence
    DurationLookup: HAMI_DEFENCE
    CalcFlags:
-      Def: true
      Vit: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
  - Status: Incaspdrate
    CalcFlags:
      Aspd: true
@ -4138,7 +4115,7 @@ Body:
      Unlimitedhummingvoice: true
      Sircleofnature: true
  - Status: Deepsleep
-    Icon: EFST_DEEP_SLEEP
+    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
    DurationLookup: WM_LULLABY_DEEPSLEEP
    States:
      NoCast: true
@ -6130,6 +6107,14 @@ Body:
      NoBanishingBuster: true
      NoDispell: true
      RemoveOnHermode: true
+  - Status: Extremityfist2
+    Icon: EFST_EXTREMITYFIST
+    DurationLookup: MO_EXTREMITYFIST
+    Flags:
+      NoRemoveOnDead: true
+      NoDispell: true
+      NoBanishingBuster: true
+      NoClearance: true
  - Status: Mtf_Aspd2
    Icon: EFST_MTF_ASPD2
    CalcFlags:
@ -7022,9 +7007,7 @@ Body:
    CalcFlags:
      Regen: true
  - Status: Earthshaker
-    Icon: EFST_EARTHSHAKER
    Flags:
-      BlEffect: true
      NoWarning: true
  - Status: Weaponblock_On
    Icon: EFST_WEAPONBLOCK_ON
@ -7039,7 +7022,6 @@ Body:
    Icon: EFST_SPORE_EXPLOSION_DEBUFF
    DurationLookup: GN_SPORE_EXPLOSION
    Flags:
-      BlEffect: true
      NoDispell: true
      NoBanishingBuster: true
      NoClearance: true
@ -7461,7 +7443,7 @@ Body:
      NoClearance: true
      NoClearbuff: true
  - Status: Madogear
-    Icon: EFST_MADOGEAR_TYPE
+    Icon: EFST_MADOGEAR
    CalcFlags:
      Speed: true
    Flags:
@ -7975,8 +7957,6 @@ Body:
    DurationLookup: EM_SPELL_ENCHANTING
    CalcFlags:
      Smatk: true
-    Flags:
-      DisplayPc: true
  - Status: Summon_Elemental_Ardor
    Icon: EFST_SUMMON_ELEMENTAL_ARDOR
    DurationLookup: EM_SUMMON_ELEMENTAL_ARDOR
@ -8028,23 +8008,17 @@ Body:
    DurationLookup: TR_MUSICAL_INTERLUDE
    CalcFlags:
      Res: true
-    Flags:
-      DisplayPc: true
  - Status: Jawaii_Serenade
    Icon: EFST_JAWAII_SERENADE
    DurationLookup: TR_JAWAII_SERENADE
    CalcFlags:
      Smatk: true
      Speed: true
-    Flags:
-      DisplayPc: true
  - Status: Pron_March
    Icon: EFST_PRON_MARCH
    DurationLookup: TR_PRON_MARCH
    CalcFlags:
      Patk: true
-    Flags:
-      DisplayPc: true
  - Status: Roseblossom
    Icon: EFST_ROSEBLOSSOM
    DurationLookup: TR_ROSEBLOSSOM
@ -8058,8 +8032,6 @@ Body:
      Powerful_Faith: true
      Firm_Faith: true
      Sincere_Faith: true
-    Flags:
-      DisplayPc: true
  - Status: Sincere_Faith
    Icon: EFST_SINCERE_FAITH
    DurationLookup: IQ_SINCERE_FAITH
@ -8951,21 +8923,3 @@ Body:
      NoClearance: true
    EndOnStart:
      Decreaseagi: true
-  - Status: Protection
-    Icon: EFST_RAY_OF_PROTECTION
-    Flags:
-      NoClearbuff: true
-      NoDispell: true
-      NoBanishingBuster: true
-      NoClearance: true
-    EndOnStart:
-      Stun: true
-      Sleep: true
-      Curse: true
-      Stone: true
-      Poison: true
-      Blind: true
-      Silence: true
-      Bleeding: true
-      Confusion: true
-      Freeze: true
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@ -1250,11 +1250,6 @@ Adds a card or enchant to the specific slot of the equipment.

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

-@resetcooltime
-/resetcooltime
-
-Resets the cooldown of all skills of the player and if active also of the homunculus or the mercenary.
-
 ==============================
 | 5. Administrative Commands |
 ==============================
--- a/doc/ea_job_system.txt
+++ b/doc/ea_job_system.txt
@ -63,12 +63,11 @@ The eA Job System:
 	EAJL_2		0x300

 - The third category is type. Classes can either be normal, rebirth/advanced,
-  adopted, third class or fourth class.
+  adopted, or third class.

 	EAJL_UPPER	0x1000
 	EAJL_BABY	0x2000
 	EAJL_THIRD	0x4000
-	EAJL_FOURTH	0x8000

 So using these three categories, any job class can be constructed from the
 others. Let's take a swordman, for example.
@ -144,11 +143,6 @@ EAJL_THIRD:
 	if(@eac&EAJL_THIRD)
 		mes "Wow, you've really grown!";

-EAJL_FOURTH:
-	Checks if a class is a fourth job.
-	if(@eac&EAJL_FOURTH)
-		mes "Wow, you've really grown!";
-
 EAJ_UPPERMASK:
 	The upper mask can be used to "strip" the upper/baby characteristics of a
 	class, used when you want to know if someone is a certain class regardless
@ -175,19 +169,13 @@ EAJ_BASEMASK:
 	check will  always fail for the same reasons previously explained.

 EAJ_THIRDMASK:
-	This mask strips 3rd class attributes. It will give the "normal" class of
+	This mask strips 3rd class attributes.  It will give the "normal" class of
 	a third job, regardless of rebirth/adopted status.  When used on non-third
 	class characters, it will return the second job, or, if that also doesn't
 	exist, the first.
 	if ((@eac&EAJ_THIRDMASK) == EAJ_WARLOCK_T)
 		mes "You've gone through rebirth, I see.";

-EAJ_FOURTHMASK:
-	This mask strips 4th class attributes. Although currently there are none,
-	it is suggested to use this for checking.
-	if ((@eac&EAJ_FOURTHMASK) == EAJ_DRAGON_KNIGHT)
-		mes "Oh you are a Dragon Knight, I see.";
-
 The script commands eaclass, roclass:
 -------------------------------------------------------------------------------

--- a/doc/mapflags.txt
+++ b/doc/mapflags.txt
@ -474,9 +474,3 @@ Hides monster's HP bar on a map.
 Ignores config value of 'monster_hp_bars_info'.

 ---------------------------------------
-
-*specialpopup	<popup ID>
-
-Displays a special popup when a player enters the map. See script command "specialpopup" for details on different popup types.
-
---------------------------------------
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@ -11,12 +11,6 @@
 This file describes the functions of player group permissions,
 configured in '/conf/groups.conf' under the "permissions" bracket.

-The permission name used in '/conf/groups.conf' goes after the asterisk "*",
-while the constant name used in scripts and src goes between the parentheses "()"
-in the following format:
-
-*permission_name (PC_PERM_CONSTANT_NAME)
-
 To search for a permission, write "*" before its name.
 The format of this file is as follows:
 	1. Basic Permissions
@ -28,20 +22,20 @@ The format of this file is as follows:
 ========================
 ---------------------------------------

-*can_trade (PC_PERM_TRADE)
+*can_trade

 Allows player to distribute items, such as through trades, dropping,
 vending, storage, mail, etc.

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

-*can_party (PC_PERM_PARTY)
+*can_party

 Allows player to create and join parties.

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

-*attendance (PC_PERM_ATTENDANCE)
+*attendance

 Allows player to use the daily attendance system.

@ -52,78 +46,78 @@ Allows player to use the daily attendance system.
 ===========================
 ---------------------------------------

-*all_skill (PC_PERM_ALL_SKILL)
+*all_skill

 Grants player all available skills in the player's skill tree.

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

-*all_equipment (PC_PERM_USE_ALL_EQUIPMENT)
+*all_equipment

 Allows player to equip any item, regardless of requirements (class, level,
 etc.). Note that this can cause client errors if a sprite does not exist.

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

-*skill_unconditional (PC_PERM_SKILL_UNCONDITIONAL)
+*skill_unconditional

 Allows player to use any skill, regardless of required conditions (SP,
 items, etc.).

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

-*join_chat (PC_PERM_JOIN_ALL_CHAT)
+*join_chat

 Allows player to join password-protected chatrooms.

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

-*kick_chat (PC_PERM_NO_CHAT_KICK)
+*kick_chat

 Prevents player from being kicked from a chatroom.

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

-*view_hpmeter (PC_PERM_VIEW_HPMETER)
+*view_hpmeter

 Allows player to see the HP bar of every player.

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

-*view_equipment (PC_PERM_VIEW_EQUIPMENT)
+*view_equipment

 Allows player to view the equipment of every player, regardless of that
 player's setting.

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

-*hack_info (PC_PERM_RECEIVE_HACK_INFO)
+*hack_info

 Allows player to receive all information about players who try to hack,
 spoof a name, etc.

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

-*disable_pvm (PC_PERM_DISABLE_PVM)
+*disable_pvm

 Prevents player from attacking monsters.

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

-*disable_pvp (PC_PERM_DISABLE_PVP)
+*disable_pvp

 Prevents player from attacking other players.

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

-*can_trade_bounded (PC_PERM_TRADE_BOUNDED)
+*can_trade_bounded

 Allows player to do normal item actions with bounded items (drop, sell,
 trade, etc.).

 ---------------------------------------
 
-*item_unconditional (PC_PERM_ITEM_UNCONDITIONAL)
+*item_unconditional

 Allows player to consume any consumable item regardless the requirements
 (bypass noitemconsumption mapflag, item's class, gender, status changes,
@ -131,7 +125,7 @@ item delay, etc).

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

-*trade_unconditional (PC_PERM_TRADE_UNCONDITIONAL)
+*trade_unconditional

 Allows player to ignore the trade conditions of items (drop, trade, sell, cart, storage/gstorage, mail and auction).

@ -142,32 +136,32 @@ Allows player to ignore the trade conditions of items (drop, trade, sell, cart,
 ======================
 ---------------------------------------

-*all_commands (PC_PERM_USE_ALL_COMMANDS)
+*all_commands

 Allows usage of all atcommands and charcommands.

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

-*disable_commands_when_dead (PC_PERM_DISABLE_CMD_DEAD)
+*disable_commands_when_dead

 Disables usage of atcommands when player is dead.

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

-*hide_session (PC_PERM_HIDE_SESSION)
+*hide_session

 Hides player session from being displayed by atcommands (@who, @whomap,
 etc.).

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

-*who_display_aid (PC_PERM_WHO_DISPLAY_AID)
+*who_display_aid

 Displays all GMs and character/account IDs in the @who command.

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

-*any_warp (PC_PERM_WARP_ANYWHERE)
+*any_warp

 Allows player to bypass 'nowarp', 'nowarpto', 'noteleport', and 'nomemo'
 mapflags in commands which modify a character's map or coordinates (@memo,
@ -175,63 +169,63 @@ mapflags in commands which modify a character's map or coordinates (@memo,

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

-*receive_requests (PC_PERM_RECEIVE_REQUESTS)
+*receive_requests

 Allows player to receive requests through the @requests command.

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

-*show_bossmobs (PC_PERM_SHOW_BOSS)
+*show_bossmobs

 Displays boss mobs in the @showmobs command.

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

-*channel_admin (PC_PERM_CHANNEL_ADMIN)
+*channel_admin

 Allows player to modify #channel settings regardless of ownership and to
 join password-protected channels without a password.

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

-*use_check (PC_PERM_USE_CHECK)
+*use_check

 Allows player to use the client command /check (displays character status).

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

-*use_changemaptype (PC_PERM_USE_CHANGEMAPTYPE)
+*use_changemaptype

 Allows player to use the client command /changemaptype.

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

-*command_enable (PC_PERM_ENABLE_COMMAND)
+*command_enable

 Enable to use atcommand while talking with NPC.

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

-*bypass_stat_onclone (PC_PERM_BYPASS_STAT_ONCLONE)
+*bypass_stat_onclone

 Bypass max parameter limit while using @clonestat

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

-*bypass_max_stat (PC_PERM_BYPASS_MAX_STAT)
+*bypass_max_stat

 Allow to bypass the maximum stat parameter (at conf/player.conf) to
 maximum value 32,767.

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

-*macro_detect (PC_PERM_MACRO_DETECT)
+*macro_detect

 Allows player to use the client command /macro_detector.

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

-*macro_register (PC_PERM_MACRO_REGISTER)
+*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).

--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@ -2406,6 +2406,34 @@ For more details, see the sample in 'doc/sample/inarray.txt'.

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

+*sortarray(<array name>);
+
+This command will do an in-place sort on an array specified in <array name>.
+Original ordering of the array before execution of this command will be lost.
+
+Example:
+
+	setarray .@a,31, 44, 14, 18, 24, 42, 39, 47, 30, 17, 36, 45, 34, 21, 38, 41, 23, 25, 13, 20, 8, 5, 22, 9, 2, 12, 19, 35, 48, 37;
+	sortarray(.@a);
+	.@size = getarraysize(.@a);
+	for(.@i = 0; .@size; .@i++) {
+		.@msg$ = .@msg$ + .@a[.@i] + " ";
+	}
+	debugmes(.@msg$);
+	
+	Output: 2 5 8 9 12 13 14 17 18 19 20 21 22 23 24 25 30 31 34 35 36 37 38 39 41 42 44 45 47 48
+	
+	setarray .@text$, "Lemongrass", "Atemo", "Jey", "Lighta", "Nova", "MasterOfMuppets", "Aleos", "Cydh", "Playtester", "Stolao", "Nanakiwurtz", "Akkarin", "Secret";
+	sortarray(.@text$);
+	for(.@i = 0; .@i < getarraysize(.@text$); .@i++) {
+		.@msg$ = .@msg$ + .@text$[.@i] + " ";
+	}
+	debugmes(.@msg$);
+	
+	Output: Akkarin Aleos Atemo Cydh Jey Lemongrass Lighta MasterOfMuppets Nanakiwurtz Nova Playtester Secret Stolao 
+
+---------------------------------------
+
 ======================================
 |2.- Information-retrieving commands.|
 ======================================
@ -5694,35 +5722,22 @@ Example:

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

-*searchstores <uses>,<effect>{,"<map name>"};
+*searchstores <uses>,<effect>;

 Invokes the store search window, which allows to search for both vending
-and buying stores.
+and buying stores. Parameter uses indicates, how many searches can be
+started, before the window has to be reopened. Effect value affects,
+what happens, when a result item is double-clicked and can be one of the
+following:

-Parameter <uses> indicates how many searches can be started
-before the window has to be reopened.
+	0 = Shows the store's position on the mini-map and highlights the
+	    shop sign with yellow color, when the store is on same map
+	    as the invoking player.
+	1 = Directly opens the shop, regardless of distance.

-Parameter <effect> affects what happens when a result item is double-clicked
-and can be one of the following:
-
-	SEARCHSTORE_EFFECT_NORMAL : Shows the store's position on the mini-map and highlights the
-								shop sign with yellow color, when the store is on same map
-								as the invoking player.
-	SEARCHSTORE_EFFECT_REMOTE : Directly opens the shop, regardless of distance.
-	
-Optional parameter <map name> indicates the name of map where the stores will be searched.
-If not set, the search will be on the map the invoking character is currently on.
-Special values for <map name> are:
-
-	"this" : Will search for stores on the map where the invoking character is currently on. (default)
-	"all"  : Will search for stores on all maps.
-
-Examples:
-	// Item Vending_Search_Scroll (10 uses, effect: show mark on minimap, current map)
-	searchstores 10, SEARCHSTORE_EFFECT_NORMAL;
-	
-	// Search stores (1 use, effect: open shop, all maps on the server)
-	searchstores 1, SEARCHSTORE_EFFECT_REMOTE, "all";
+Example:
+	// Item Universal_Catalog_Gold (10 uses, effect: open shop)
+	searchstores 10,1;

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

@ -6124,12 +6139,11 @@ will always return 0.

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

-*skilleffect <skill id>,<number>{,<game ID>};
-*skilleffect "<skill name>",<number>{,<game ID>};
+*skilleffect <skill id>,<number>;
+*skilleffect "<skill name>",<number>;

 This command displays visual and aural effects of given skill on currently
-attached character or, when defined, on any unit with the given ID.
-The number parameter is for skill whose visual effect
+attached character. The number parameter is for skill whose visual effect
 involves displaying of a number (healing or damaging). Note, that this command
 will not actually use the skill, it is intended for scripts, which simulate
 skill usage by the NPC, such as buffs, by setting appropriate status and
@ -6652,8 +6666,8 @@ Examples:

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

-*macro_detector({<account ID>});
-*macro_detector({"<character name>"});
+macro_detector({<account ID>});
+macro_detector({"<character name>"});

 This command will display the captcha UI challenge onto the invoking character or the given <account ID>/<character name>.

@ -6674,46 +6688,6 @@ Example:

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

-*permission_check(<permission>{,<char_id>});
-
-This command will return true if the attached character has the specified permission, false otherwise.
-If <char_id> is given, it will check the permission for that character instead.
-
-A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
-full permissions documentation can be found in 'doc/permissions.txt'.
-
-
-Example:
-	if (permission_check(PC_PERM_TRADE)) {
-		mes "You have permission to trade!";
-	}
-	else {
-		mes "You do not have permission to trade!";
-	}
-	end;
-
---------------------------------------
-
-*permission_add(<permission>{,<char_id>});
-*permission_remove(<permission>{,<char_id>});
-
-These commands will temporarily add or remove the specified permission to the attached character,
-or the given <char_id> until the player logs out.
-
-A full list of the player permission constants (with the 'PC_PERM' prefix) along with the
-full permissions documentation can be found in 'doc/permissions.txt'.
-
-Examples:
-	// Adds the 'can_trade' permission to the attached character,
-	// allowing them to trade, drop, sell, store and mail items.
-	permission_add(PC_PERM_TRADE);
-
-	// Removes the 'can_party' permission from the attached character,
-	// preventing them from joining or creating parties.
-	permission_remove(PC_PERM_PARTY);
-
---------------------------------------
-
 ==================================
 |5.- Mob / NPC -related commands.|
 ==================================
@ -8016,15 +7990,17 @@ Return values:
 //
 ---------------------------------------

-*npcspeed( <speed value> {,"<npc name>"} );
-*npcwalkto( <x>,<y> {,"<npc name>"} } );
-*npcstop( {"<npc name>", {"<flag>"}});
+*npcspeed <speed value>;
+*npcwalkto <x>,<y>;
+*npcstop;

-These commands will make the NPC object in question move around the map.
+These commands will make the NPC object in question move around the map. As they
+currently are, they are a bit buggy and are not useful for much more than making
+an NPC move randomly around the map.

-'npcspeed' will permanently set the NPCs walking speed to a specified value. As in the
-@speed GM command, MAX_WALK_SPEED (1000) is the slowest possible speed while MIN_WALK_SPEED (20) is the fastest
-possible (instant motion). DEFAULT_NPC_WALK_SPEED (200) is the default NPC walking speed.
+'npcspeed' will set the NPCs walking speed to a specified value. As in the
+@speed GM command, 200 is the slowest possible speed while 0 is the fastest
+possible (instant motion). 100 is the default character walking speed.

 'npcwalkto' will start the NPC sprite moving towards the specified coordinates
 on the same map it is currently on. The script proceeds immediately after the
@ -8032,17 +8008,10 @@ NPC begins moving.

 'npcstop' will stop the motion.

-The <flag> value in npcstop affects how the unit is stopped. The following flags are bitwise values (can be combined using the pipe operator):
-	USW_NONE = Unit will keep walking to their original destination.
-	USW_FIXPOS = Issue a fixpos packet afterwards.
-	USW_MOVE_ONCE = Force the unit to move one cell if it hasn't yet.
-	USW_MOVE_FULL_CELL = Enable moving to the next cell when unit was already half-way there (may cause on-touch/place side-effects, such as a scripted map change).
-	USW_FORCE_STOP = Force stop moving.
-Default: USW_FIXPOS | USW_MOVE_FULL_CELL | USW_FORCE_STOP
-
 While in transit, the NPC will be clickable, but invoking it will cause it to
 stop moving, which will make its coordinates different from what the client
-computed based on the speed and motion coordinates.
+computed based on the speed and motion coordinates. The effect is rather
+unnerving.

 Only a few NPC sprites have walking animations, and those that do, do not get
 the animation invoked when moving the NPC, due to the problem in the NPC walking
@ -8509,15 +8478,6 @@ Opens the tip box UI for the attached player or the given character ID.

 This command requires packet version 2017-11-22 or newer.

---------------------------------------
-
-*specialpopup(<popup ID>);
-
-Open popup and/or show text by ID from list defined in the client spopup.lub file.
-Popup and text is only visible if the player warped from one map to another map.
-
-This command requires packet version 2022-10-05 or newer.
-
 ---------------------------------------
 \\
 6,1.- Unit-related commands
@ -9866,7 +9826,6 @@ For details on the other parameters, see 'announce'.

 This function checks if a party meets certain requirements, returning 1 if all
 conditions are met and 0 otherwise. It will only check online characters.
-The command returns 0 is the party ID does not exist.

 amount - number of online party members (default is 1).
 min    - minimum level of all characters in the party (default is 1).
@ -10691,7 +10650,6 @@ current invoking character.
 *addhomintimacy <amount>{,<char_id>};

 Increase or decrease a homunculus' intimacy value by the given <amount>. 100000 is full loyalty.
-Fails silently when no players are attached or if the player has no homunculus.

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

--- a/doc/skill_db.txt
+++ b/doc/skill_db.txt
@ -58,7 +58,6 @@ IgnoreFlee		- Skill ignores target's flee (Magic type always ignores)
 IgnoreDefCard	- Skill ignores target's defense cards.
 IgnoreLongCard	- Skill ignores caster's long range damage cards.
 Critical		- Skill can critical.
-SimpleDefense	- (Renewal-only) Physical damage is flatly reduced by DEF+DEF2. RES is ignored.

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

--- a/doc/status.txt
+++ b/doc/status.txt
@ -254,9 +254,6 @@ Flags: Various status flags for specific status change events.
 	SuperNoviceAngel      - Status that is given from Super Novice Angel.
 	TaekwonAngel          - Status that is given from Taekwon Angel.

-	RemoveFromHomOnWarp    - Removes the status from the Homunculus when teleporting or warping to another map.
-	RemoveFromHomOnMapWarp - Removes the status from the Homunculus when warping to another map.
-
 ---------------------------------------

 MinDuration: Minimum duration, in milliseconds, after reduction calculation for status resistance.
--- a/doc/status_change.txt
+++ b/doc/status_change.txt
@ -1001,23 +1001,17 @@ SC_FLING	()
 	desc:
 	val1:

-SC_AVOID	(EFST_HLIF_AVOID)
-	desc: Increase walkspeed for Players and Homunculus
-	val1: Skill Level
-	val2: Walkspeed increase (10 * val1 for Players, 40 * val1 for Homunculus)
+SC_AVOID	()
+	desc:
+	val1:

-SC_CHANGE	(EFST_HLIF_CHANGE)
-	desc: Increase some Homunculus' statuses (VIT, INT); Uses MATK for damage calculation; Sets Homunculus' HP and SP to 10 on expiration; On Pre-Renewal, sets Homunculus' HP and SP to 100% on cast
-	val1: Skill Level
-	val2: VIT increase (20 * val1)
-	val3: INT increase (30 * val1)
+SC_CHANGE	()
+	desc:
+	val1:

-SC_BLOODLUST	(EFST_HAMI_BLOODLUST)
-	desc: Increase the homunculus ATK and has a chance to leech HP from the target
-	val1: Skill Level
-	val2: ATK increase (20 + (10 * val1))
-	val3: Chance to leech HP (9 * val1)%
-	val4: Leeched HP percentage 20%
+SC_BLOODLUST	()
+	desc:
+	val1:

 SC_FLEET	()
 	desc:
@ -1027,10 +1021,10 @@ SC_SPEED	()
 	desc:
 	val1:

-SC_DEFENCE	(EFST_HAMI_DEFENCE)
-	desc: Increase VIT and as result VIT-based DEF of the Player and plain VIT of the Homunculus
-	val1: Skill Level
-	val2: VIT increase for players, DEF increase for homunculus (5 + (5 * val1)) [Renewal], (2 * val1) [Pre-Renewal]
+SC_DEFENCE	()
+	desc: Increase Defense, HAMI_DEFENCE effect
+	val1: (none)
+	val2: + Def(Pre-renewal) or VIT (Renewal)

 SC_INCASPDRATE	()
 	desc: Increase ASPD
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@ -184,28 +184,7 @@ function	Job_Options	{
 			Job_Options(.@job_opt,roclass(.@eac|EAJL_THIRD)); // Expanded SN is "third" cls
 		}
 	}
-
-	// babies don't get to become 4th jobs
-	if (.FourthExpanded && .@eac == EAJ_REBELLION) {
-		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
-		Job_Options(.@job_opt, roclass(EAJ_NIGHT_WATCH));
-	}
-
-	if (.FourthExpanded && .@eac == EAJ_KAGEROUOBORO) {
-		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
-		Job_Options(.@job_opt, roclass(EAJ_SHINKIRO_SHIRANUI));
-	}
-
-	if (.FourthExpanded && .@eac == EAJ_SUPER_NOVICE_E) {
-		Require_Level(.Req_Fourth[0], .Req_Fourth[1]);
-		Job_Options(.@job_opt, roclass(EAJ_HYPER_NOVICE));
-	}
 	
-	if (.FourthExpanded && .@eac == EAJ_SUMMONER) {
-		Require_Level(.Req_SHandler[0], .Req_SHandler[1]);
-		Job_Options(.@job_opt, roclass(EAJ_SPIRIT_HANDLER));
-	}
-
 	if (.SecondExpanded && 
 		((.@eac&(~EAJL_BABY)) == EAJ_NINJA || 		// is (Baby) Ninja
 		(.@eac&(~EAJL_BABY)) == EAJ_GUNSLINGER)) {	// is (Baby) Gunslinger
@ -504,7 +483,6 @@ OnInit:
 	
 	// Settings
 	.FourthClass = true;				// Enable fourth classes?
-	.FourthExpanded = true;				// Enable new expanded fourth classes: Ex. Hyper Novice, Rebellion, Shinkiro/Shiranui?
 	.ThirdClass = true;					// Enable third classes?
 	.RebirthClass = true;				// Enable rebirth classes?
 	.SecondExpanded = true;				// Enable new expanded second classes: Ex. Super Novice, Kagerou/Oboro, Rebellion?
@ -526,7 +504,6 @@ OnInit:
 	setarray .Req_Fourth[0],200,70;		// Minimum base level, job level to change to fourth class
 	setarray .Req_Exp_NJ_GS[0],99,70; 	// Minimum base level, job level to turn into Expanded Ninja and Gunslinger
 	setarray .Req_Exp_SNOVI[0],99,99; 	// Minimum base level, job level to turn into Expanded Super Novice
-	setarray .Req_SHandler[0],200,60;	// Minimum base level, job level to turn into Spirit Handler
 	.SNovice = 45;						// Minimum base level to turn into Super Novice
 	
 	// Setting adjustments by PACKETVER
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@ -110,18 +110,7 @@ function Pick {
 	Go(.@map$,.@x,.@y);
 }
 function Restrict {
-	.@type$ = getarg(0);
-	
-	if (.@type$ == "Brasilis") {
-		// If the official warper to Brasilis is enabled, meaning is either
-		// Renewal mode or Pre-renewal Brasilis is enabled, we lift the restriction
-		if (getnpcid(0, "Crewman_bra2"))
-			return;
-		// Otherwise we apply the renewal restriction
-		.@type$ = "RE";
-	}
-
-	if ((.@type$ == "RE" && !checkre(0)) || (.@type$ == "Pre-RE" && checkre(0))) {
+	if ((getarg(0) == "RE" && !checkre(0)) || (getarg(0) == "Pre-RE" && checkre(0))) {
 		if (getarg(1,0)) {
 			set @warp_block,0;
 			for (set .@i,1; .@i<getargcount(); set .@i,.@i+1)
@ -152,7 +141,7 @@ T2: Go("alberta",28,234);
 T3: Go("aldebaran",140,131);
 T4: Go("amatsu",198,84);
 T5: Go("ayothaya",208,166);
-T6: Restrict("Brasilis");
+T6: Restrict("RE");
 	Go("brasilis",196,217);
 T7: Go("comodo",209,143);
 T8: Restrict("RE");
@ -229,7 +218,7 @@ F2: setarray @c[2],173,134,212,150;
 F3: Restrict("RE");
 	setarray @c[2],193,220,220,187;
 	Disp("Bifrost Field",1,2); Pick("bif_fild");
-F4: Restrict("Brasilis");
+F4: Restrict("RE");
 	setarray @c[2],74,32;
 	Disp("Brasilis Field",1,1); Pick("bra_fild");
 F5: Restrict("Pre-RE",5);
@ -354,7 +343,7 @@ D7: Restrict("RE");
 D8: Restrict("RE",4,5);
 	setarray @c[2],150,288,150,18,140,134,244,52,100,202;
 	Disp("Bio Lab 1:Bio Lab 2:Bio Lab 3:Bio Lab 4:Tomb of the Fallen"); Pick("","lhz_dun01","lhz_dun02","lhz_dun03","lhz_dun04","lhz_dun_n");
-D9: Restrict("Brasilis");
+D9: Restrict("RE");
 	setarray @c[2],87,47,262,262;
 	Disp("Brasilis Dungeon",1,2); Pick("bra_dun");
 D10: Restrict("RE",6);
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@ -1,9 +1,15 @@
-//===== rAthena Script =======================================
+//===== rAthena Script ======================================= 
 //= Assassin Job Quest
-//===== Description: =========================================
+//===== By: ================================================== 
+//= kobra_k88
+//===== Current Version: ===================================== 
+//= 3.7
+//===== Compatible With: ===================================== 
+//= rAthena Project
+//===== Description: ========================================= 
 //= [Official Conversion]
 //= Job Change quest for Assassin class.
-//===== Changelog: ===========================================
+//===== Additional Comments: ================================= 
 //= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
 //=     Also converted the booby traps from the aegis script.[kobra_k88]
 //= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
@ -22,7 +28,7 @@
 //= 2.0 Changed numbers to constants. [Vicious]
 //= 2.1 Removed Duplicates [Silent]
 //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
-//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
+//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 
 //=     was still able to bypass it) [Toms]
 //= 2.4 Fixed skipping of Nameless NPC [Lupus]
 //= 2.5 Fixed a Rogue exploit [Lupus]
@ -44,8 +50,8 @@
 //= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
 //= 3.6 Fixed broken event calls. [Euphy]
 //= 3.7 Fixed issue that the player can't progress in the quest if timed out at weapon reward step. This issue is fixed on iRO but not on kRO. [https://forums.warpportal.com/index.php?/topic/130060-didnt-receive-necklace-of-oblivion-when-changing-assassin/#entry1496042] [MrAntares]
-//= 3.8 Another 'unofficial fix'. Player can't change job if time out after the necklace is deleted. [Atemo]
-//============================================================
+//= 3.8 Another 'unofficial fix'. Player can't change job if time out after the necklace is deleted.
+//============================================================ 

 in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	if (Upper == 1) {
@ -80,7 +86,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 			mes "Well then,";
 			mes "go for it!";
 			close2;
-			ASSIN_Q = 0;
+			set ASSIN_Q,0;
 			warp "in_moc_16",19,76;
 			end;
 		}
@ -90,10 +96,9 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 		mes "[Ferocious-looking guy]";
 		mes "You'll have to walk if you want to get back to town. Oh, and don't forget to save your spawn point, alright?";
 		close2;
-		ASSIN_Q = 0;
-		ASSIN_Q2 = 0;
-		if (ASSIN_Q3 < 3)
-			ASSIN_Q3 = 0;
+		set ASSIN_Q,0;
+		set ASSIN_Q2,0;
+		set ASSIN_Q3,0;
 		savepoint "in_moc_16",18,14,1,1;
 		warp "in_moc_16",18,14;
 		end;
@ -252,7 +257,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	55,{
 					mes "It's been a while since I've received a guest. I'm sending";
 					mes "you to the office.";
 					close2;
-					ASSIN_Q = 0;
+					set ASSIN_Q,0;
 					if (checkquest(8000) != -1) {
 						changequest 8000,8001;
 					} else {
@ -548,9 +553,8 @@ OnTouch_:
 				mes "Alright then,";
 				mes "best of luck to you!";
 				close2;
-				if (ASSIN_Q3 < 3)
-					ASSIN_Q3 = 1;
-				ASSIN_Q = 1;
+				set ASSIN_Q3,1;
+				set ASSIN_Q,1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@ -572,9 +576,8 @@ OnTouch_:
 				mes "to the Test Hall.";
 				mes "Best of luck~";
 				close2;
-				if (ASSIN_Q3 < 3)
-					ASSIN_Q3 = 2;
-				ASSIN_Q = 1;
+				set ASSIN_Q3,2;
+				set ASSIN_Q,1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@ -599,8 +602,9 @@ OnTouch_:
 				mes "Eh, get outta here.";
 				mes "Stop wastin' my time...";
 				close2;
-				ASSIN_Q = 0;
-				ASSIN_Q2 = 0;
+				set ASSIN_Q,0;
+				set ASSIN_Q3,0;
+				set ASSIN_Q2,0;
 				erasequest 8001;
 				warp "moc_fild16",206,229;
 				end;
@ -626,9 +630,8 @@ OnTouch_:
 				mes "[Assassin 'Khai']";
 				mes "Are you done filling out the form? Alright, give it to me so I can send you to the Test Hall. Good luck~";
 				next;
-				if (ASSIN_Q3 < 3)
-					ASSIN_Q3 = 1;
-				ASSIN_Q = 1;
+				set ASSIN_Q3,1;
+				set ASSIN_Q,1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@ -641,9 +644,8 @@ OnTouch_:
 				mes "Then give me the form so that I can send you to the Test Hall, alright?";
 				mes "Good luck...";
 				next;
-				if (ASSIN_Q3 < 3)
-					ASSIN_Q3 = 2;
-				ASSIN_Q = 1;
+				set ASSIN_Q3,2;
+				set ASSIN_Q,1;
 				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
@ -709,7 +711,7 @@ OnTouch_:
 			mes "Although I am heartless,";
 			mes "I am not necessarily cruel. Before we proceed, is there anything you wish to know?";
 			next;
-			ASSIN_Q2 = 0;
+			set ASSIN_Q2,0;
 			while(ASSIN_Q2 < 3) {
 				switch(select("...Skills?:...Stats?:Hmpf, I know it all.")) {
 				case 1:
@ -772,7 +774,7 @@ OnTouch_:
 					mes "Now...";
 					mes "That's all I have to tell you";
 					mes "about Assassin skills.";
-					ASSIN_Q2 = 1;
+					set ASSIN_Q2,1;
 					next;
 					break;
 				case 2:
@ -785,7 +787,7 @@ OnTouch_:
 					next;
 					mes "[The Anonymous One]";
 					mes "I cannot give you better advice than that in regards to Stats. You should research and see which stats suit you, and decide what kind of Assassin you want to be.";
-					ASSIN_Q2 = 2;
+					set ASSIN_Q2,2;
 					next;
 					break;
 				case 3:
@ -795,7 +797,7 @@ OnTouch_:
 						mes "I'll be the judge of that!";
 						next;
 					}
-					ASSIN_Q2 = 3;
+					set ASSIN_Q2,3;
 					break;
 				}
 			}
@ -845,53 +847,53 @@ OnTouch_:
 			mes "1. Choose skill that is not required to learn Grimtooth.";
 			next;
 			if (select("Cloaking level 2:Sonic Blow level 5:Katar Mastery level 4:Right hand Mastery level 2") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. What property does Enchant Poison possess?";
 			next;
 			if (select("Poison:Earth:Fire:Wind") == 1)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. How does Level 4 Right Hand Mastery work?";
 			next;
 			if (select("Recover 80% of damage decrease:Recover 90% of damage decrease:Increase 90% of damage:Increase 108% of damage") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. What is the item required for using Venom Dust?";
 			next;
 			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. Which skill can you learn when you reach Level 5 Enchant Poison?";
 			next;
 			if (select("Envenom:Sonic Blow:Venom Splasher:Venom Dust") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Among the following skills, which allows you to walk while invisible?";
 			next;
 			if (select("Hiding:Back Slide:Cloaking:Sand Attack") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the condition that is unrelated to Venom Splasher.";
 			next;
 			if (select("Poisoned target.:Red Gemstone.:Remaing HP of Target.") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Which monster is weak to a weapon with Vadon card (adds 20% damage on Fire property monster)?";
 			next;
 			if (select("Steel Chonchon:Deviruchi:Elder Willow:Baphomet") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. How much SP does";
 			mes "Double Attack need?";
 			next;
 			if (select("15:It's a passive skill, so SP use is 0.:It's passive skill, so SP use is 10.:54") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "10. What is the best elemental Main Gauche weapon for hunting in Izlude dungeon?";
 			next;
 			if (select("Wind Main Gauche:Ice Main Gauche:Earth Main Gauche:Fire Main Gauche") == 1)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			break;
 		case 2:
 			mes "[The Anonymous One]";
@ -899,104 +901,104 @@ OnTouch_:
 			mes "drops a slotted Katar?";
 			next;
 			if (select("Thief Bug:Peco Peco:Desert Wolf:Hammer Cobolt") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. Which monster";
 			mes "drops a slotted Jur?";
 			next;
 			if (select("Martin:Desert Wolf:Marionette:Myst") == 1)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. Which class is allowed to craft elemental weapons?";
 			next;
 			if (select("Merchant:Blacksmith:Thief:Priest") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the weapon which is not in the Katar class.";
 			next;
 			if (select("Jamadhar:Jur:Katar:Gladius") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. What property do Izlude dungeon monsters posses?";
 			next;
 			if (select("Water:Fire:Wind:Earth") == 1)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Which monster";
 			mes "cannot be a Cute Pet?";
 			next;
 			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose a monster that Fire property Daggers work the best on.";
 			next;
 			if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the non-elemental Katar from the following:";
 			next;
 			if (select("Katar of Raging Blaze:Katar of Dusty Thornbush:Sharpened Legbone of Ghoul:Infiltrator") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. Which is the uncommon monster?";
 			next;
 			if (select("Poring:Mastering:Ghostring:Spore") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "10. Choose the monster";
 			mes "that is not Undead.";
 			next;
 			if (select("Drake:Megalodon:Spore:Khalitzburg") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			break;
 		case 3:
 			mes "[The Anonymous One]";
 			mes "1. Choose the correct amount of the maximum dodge rate increase from the 'Increase Dodge' skill when at level 10.";
 			next;
 			if (select("30:40:160:20") == 1)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. Choose a monster which detects hiding/cloaking Thieves and Assassins.";
 			next;
 			if (select("Worm Tail:Andre:Mummy:Soldier Skeleton") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. Choose a group of weapons that cannot be used by an Assassin at once.";
 			next;
 			if (select("Main Gaughe + Gladius:Stiletto + Main Gauche:Katar + Maingauche:Hammer + Stiletto") == 3)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the town where Thieves can change their jobs.";
 			next;
 			if (select("Prontera:Lutie:Alberta:Morocc") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. Choose a card that does not affect the AGI stat.";
 			next;
 			if (select("Baphomet Jr. card:Whisper Card:Female Thiefbug card:Male Thiefbug card") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Choose the correct specialty of the Assassin class.";
 			next;
 			if (select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability") == 4)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50.";
 			next;
-			if (select("7:8:9:10") == 4)
-				.@assassin_t += 10;
+			if (select("7:8:9:10") == 4) 
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the item that an Assassin cannot equip.";
 			next;
-			if (select("Dagger:Helm:Boots:Brooch") == 2)
-				.@assassin_t += 10;
+			if (select("Dagger:Helm:Boots:Brooch") == 2) 
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. Choose the job change item for Thief.";
 			next;
 			switch(select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
 			case 1:
 			case 3:
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 				break;
 			default:
 				break;
@ -1005,7 +1007,7 @@ OnTouch_:
 			mes "10. Choose a card that would typically benefit an Assassin the least.";
 			next;
 			if (select("Whisper card:Elder Willow card:Soldier Skeleton card:Cobold card") == 2)
-				.@assassin_t += 10;
+				set .@assassin_t,.@assassin_t+10;
 			break;
 		}
 		if (ASSIN_Q2 == 3) {
@ -1021,7 +1023,7 @@ OnTouch_:
 			mes "You scored";
 			mes "" + .@assassin_t + " percent...";
 			if (.@assassin_t > 80) {
-				ASSIN_Q2 = 5;
+				set ASSIN_Q2,5;
 				changequest 8002,8003;
 				mes "Well done.";
 				mes "You pass.";
@ -1031,7 +1033,7 @@ OnTouch_:
 				close;
 			}
 			else {
-				ASSIN_Q2 = 4;
+				set ASSIN_Q2,4;
 				mes "That means you fail!";
 				next;
 				mes "[The Anonymous One]";
@ -1058,7 +1060,7 @@ OnTouch_:
 			mes "You scored";
 			mes "" + .@assassin_t + " points...";
 			if (.@assassin_t > 80) {
-				ASSIN_Q2 = 5;
+				set ASSIN_Q2,5;
 				changequest 8002,8003;
 				next;
 				mes "[The Anonymous One]";
@ -1066,7 +1068,7 @@ OnTouch_:
 				close;
 			}
 			else {
-				ASSIN_Q2 = 4;
+				set ASSIN_Q2,4;
 				mes "You failed!";
 				next;
 				mes "[The Anonymous One]";
@ -1192,8 +1194,9 @@ OnTouch_:
 		mes "I guess you";
 		mes "could use a break...";
 		close2;
-		ASSIN_Q = 0;
-		ASSIN_Q2 = 0;
+		set ASSIN_Q,0;
+		set ASSIN_Q3,0;
+		set ASSIN_Q2,0;
 		changequest 8003,8000;
 		warp "in_moc_16",19,13;
 		end;
@ -1204,7 +1207,7 @@ in_moc_16,1,1,0	script	Beholder#ASNTEST	-1,{
 	end;

 OnEnable:
-	.MyMobs = 6;
+	set .MyMobs,6;
 	// Target mobs
 	monster "in_moc_16",62,161,"Job change target",1002,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",85,169,"Job change target",1063,1,"Beholder#ASNTEST::OnMyMobDead";
@ -1264,15 +1267,15 @@ OnResetmob:
 	end;

 OnMyMobDead:
-	.MyMobs--;
+	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "in_moc_16","You seem to be doing quite well. Keep it up!",bc_map;
-		ASSIN_Q = 3;
+		set ASSIN_Q,3;
 		changequest 8003,8004;
 		donpcevent "timestopper#1::OnEnable";
 		donpcevent "Keeper of the Door#ASN::OnEnable";
 		donpcevent "Beholder#ASNTEST::OnResetmob";
-		.DisableTraps = 1;
+		set .DisableTraps,1;
 		stopnpctimer;
 	}
 	else {
@ -1282,7 +1285,7 @@ OnMyMobDead:

 OnMyMobDead2:
 	mapannounce "in_moc_16",strcharinfo(0) + "! You made a mistake! I'm bringing you back!",bc_map;
-	ASSIN_Q = 2;
+	set ASSIN_Q,2;
 	warp "in_moc_16",19,161;
 	donpcevent "Beholder#ASNTEST::OnReset";
 	end;
@ -1338,7 +1341,7 @@ OnTimer184000:
 OnTimer185000:
 	mapannounce "in_moc_16","Time's up!",bc_map;
 	mapannounce "in_moc_16","Well, good job... If you wanted to waste your time. You'll have to try again!",bc_map;
-	//ASSIN_Q = 2;
+	//set ASSIN_Q,2;
 	end;

 OnTimer186000:
@ -1354,7 +1357,7 @@ in_moc_16,68,158,0	script	01_1::SinTrap	-1,0,0,{
 OnTouch_:
 	if (getvariableofnpc(.DisableTraps,"Beholder#ASNTEST")  < 1) {
 		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
-		ASSIN_Q = 2;
+		set ASSIN_Q,2;
 		warp "in_moc_16",19,161;
 		donpcevent "Beholder#ASNTEST::OnResetmob";
 		donpcevent "Standby Room#ASNTEST::OnStart";
@ -1454,9 +1457,9 @@ OnInit:
 OnTouch_:
 	donpcevent "Thomas#ASNTEST::OnDisable";
 	if (ASSIN_Q == 3)
-		ASSIN_Q = 3;
+		set ASSIN_Q,3;
 	else
-		ASSIN_Q = 4;
+		set ASSIN_Q,4;
 	warp "in_moc_16",87,102;
 	savepoint "in_moc_16",16,13,1,1;
 	end;
@ -1484,13 +1487,13 @@ OnTimer187000:
 OnDisable:
 	stopnpctimer;
 	end;
-
+	
 OnMyMobDead:
 	mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
 	mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
-	ASSIN_Q = 3;
+	set ASSIN_Q,3;
 	warp "in_moc_16",87,102;
-	killmonster "in_moc_16","timestopper#1::OnMyMobDead";
+	killmonsterall "in_moc_16";
 	end;
 }

@ -1522,8 +1525,9 @@ OnTouch_:
 			mes "Oh hey, don't forget to save your respawn point in town.";
 			close2;
 			mapannounce "in_moc_16",strcharinfo(0) + " got scared and quit the test...Who's Next?!",bc_map;
-			ASSIN_Q = 0;
-			ASSIN_Q2 = 0;
+			set ASSIN_Q,0;
+			set ASSIN_Q2,0;
+			set ASSIN_Q3,0;
 			changequest 8004,8000;
 			savepoint "in_moc_16",18,14,1,1;
 			warp "in_moc_16",18,14;
@ -1544,7 +1548,7 @@ OnTouch_:
 	mes "[Thomas]";
 	mes "If you run away, get a nose bleed and pass out or something like that, I'll fail ya'. Enough talk. Let's see what you got.";
 	close2;
-	ASSIN_Q = 4;
+	set ASSIN_Q,4;

 	monster "in_moc_16",81,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
 	monster "in_moc_16",82,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
@ -1579,7 +1583,7 @@ OnTouch_:

 OnDisable:
 	donpcevent "Standby Room#ASNTEST::OnStart";
-	killmonster "in_moc_16","timestopper#1::OnMyMobDead";
+	killmonsterall "in_moc_16";
 	end;
 }

@ -1592,7 +1596,7 @@ OnTouch_:
 	mes "Oh! Congratulations!";
 	mes "You may now proceed to our Guildmaster's room. Good luck!!";
 	close2;
-	ASSIN_Q = 5;
+	set ASSIN_Q,5;
 	changequest 8004,8005;
 	warp "in_moc_16",181,183;
 	end;
@ -1602,7 +1606,7 @@ in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
 OnTouch_:
 	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
-		ASSIN_Q++;
+		set ASSIN_Q,ASSIN_Q+1;
 		if (!isbegin_quest(8006))
 			changequest 8005,8006;
 	}
@ -1644,7 +1648,7 @@ OnTouch_:
 	else
 		savepoint "moc_ruins",79,99,1,1;
 	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
-		ASSIN_Q = 8;
+		set ASSIN_Q,8;
 		mes "[Guildmaster]";
 		mes "Welcome.";
 		mes "I apologize for";
@ -1678,6 +1682,7 @@ OnTouch_:
 			next;
 			switch(select("Revenge...!:Money~:I want to travel.")) {
 			case 1:
+				set ASSIN_Q,8;
 				mes "[Guildmaster]";
 				mes "Revenge...?";
 				mes "Yes, I understand. All of us hold grudges against someone else eventually.";
@ -1691,7 +1696,7 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				ASSIN_Q = 9;
+				set ASSIN_Q,9;
 				mes "[Guildmaster]";
 				mes "Financial reasons...? I won't deny that we all need money to live. But being Assassin means living for a higher purpose.";
 				next;
@ -1702,7 +1707,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				ASSIN_Q = 10;
+				set ASSIN_Q,10;
 				mes "[Guildmaster]";
 				mes "Good idea. Traveling around the world will allow you to broaden your experiences.";
 				next;
@ -1731,7 +1736,7 @@ OnTouch_:
 			next;
 			switch(select("I like the solitude.:Making money being an Assassin.:They just look interesting.")) {
 			case 1:
-				ASSIN_Q = 11;
+				set ASSIN_Q,11;
 				mes "[Guildmaster]";
 				mes "You got the point...";
 				mes "We are lonely. We will always be alone, even amongst each other...";
@ -1746,13 +1751,13 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				ASSIN_Q = 12;
+				set ASSIN_Q,12;
 				mes "[Guildmaster]";
 				mes "Well, I can't deny it, we do need money to make a living. But don't you think we should pursue something even more important than money?";
 				next;
 				break;
 			case 3:
-				ASSIN_Q = 13;
+				set ASSIN_Q,13;
 				mes "[Guildmaster]";
 				mes "Style and appearance is only superficial. It is sad that many people think this way...";
 				next;
@ -1777,7 +1782,7 @@ OnTouch_:
 			next;
 			switch(select("To broaden my skills.:It's a goal of mine.:For spiritual improvement.")) {
 			case 1:
-				ASSIN_Q = 14;
+				set ASSIN_Q,14;
 				mes "[Guildmaster]";
 				mes "Learning skills comes naturally with the Assassin job. But don't think of skills as the best value of your training.";
 				next;
@ -1786,7 +1791,7 @@ OnTouch_:
 				next;
 				break;
 			case 2:
-				ASSIN_Q = 15;
+				set ASSIN_Q,15;
 				mes "[Guildmaster]";
 				mes "It's a goal of yours, eh? Well, I guess you've got to have goals...";
 				next;
@ -1800,7 +1805,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				ASSIN_Q = 16;
+				set ASSIN_Q,16;
 				mes "[Guildmaster]";
 				mes "Good idea...";
 				mes "That is a good way to improve yourself. I've seen many people who know how to be strong physically but not in their mental state.";
@ -1832,14 +1837,14 @@ OnTouch_:
 			next;
 			switch(select("I would level up fast.:I want to explore my Assassin skills.:I will go where I couldn't go as a Thief.")) {
 			case 1:
-				.@assassin_sangdam += 10;
+				set .@assassin_sangdam,.@assassin_sangdam+10;
 				mes "[Guildmaster]";
 				mes "Don't act recklessly...";
 				mes "Being an Assassin never makes you a different person. And don't rely on chance.";
 				next;
 				break;
 			case 2:
-				.@assassin_sangdam += 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "It is good for one to examine oneself. I can understand that you will be excited by the great change in your ability.";
 				next;
@ -1866,14 +1871,14 @@ OnTouch_:
 			next;
 			switch(select("My friends.:My Guildsmen.:My lover.")) {
 			case 1:
-				.@assassin_sangdam += 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "I see...";
 				mes "Appreciate them for caring about you, even when you're alone.";
 				next;
 				break;
 			case 2:
-				.@assassin_sangdam += 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "Great...";
 				mes "Comrades for whom you would die for...";
@ -1904,7 +1909,7 @@ OnTouch_:
 			next;
 			switch(select("Places where Assassins can level up...:Main goals as an Assassin.:Financial consulting.")) {
 			case 1:
-				.@assassin_sangdam += 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "It all depends on your mind. Any place could be the best to level up according to your mind state.";
 				next;
@ -1922,7 +1927,7 @@ OnTouch_:
 				next;
 				break;
 			case 3:
-				.@assassin_sangdam += 10;
+				set .@assassin_sangdam,.@assassin_sangdam+10;
 				mes "[Guildmaster]";
 				mes "Oh my lord...";
 				mes "Are you planning to become an Assassin in order to make money?";
@ -1974,7 +1979,7 @@ OnTouch_:
 		mes "supports you. How";
 		mes "about you, Huey?";
 		next;
-		if (ASSIN_Q3 == 1) { // player Job Level was above 48
+		if (ASSIN_Q3 == 1) {
 			mes "[Huey]";
 			mes "A rarity.";
 			mes "You can tell";
@ -1984,7 +1989,7 @@ OnTouch_:
 			mes "I agree with";
 			mes "the Anonymous One.";
 		}
-		else { // player Job Level was below 48
+		else {
 			mes "[Huey]";
 			mes "Although "+ strcharinfo(0) +" looks too mellow and gentle, kind of like a pussycat, "+ strcharinfo(0) +" has the stuff.";
 			next;
@ -2059,8 +2064,7 @@ OnTouch_:
 			mes "I believe you stand out amongst them...";
 			next;
 		}
-		switch(ASSIN_Q3) {
-		case 1: // player Job Level was above 48
+		if (ASSIN_Q3 == 1 && BaseJob == Job_Thief && ASSIN_Q > 6 && ASSIN_Q < 17) {
 			mes "[Guildmaster]";
 			mes "Well, I've said too much. Please choose a weapon as a present.";
 			next;
@ -2094,10 +2098,10 @@ OnTouch_:
 				mes "It used to rule over the Assassin weapon market. Please take care of my gladius.";
 				getitem 1220,1; //Gladius_
 			}
-			ASSIN_Q3 = 3;
+			ASSIN_Q3 = 2;
 			next;
-			break;
-		case 2: // player Job Level was below 48
+		}
+		else if (ASSIN_Q3 != 2) {
 			mes "[Guildmaster]";
 			mes "Well, I talked too much.";
 			mes "Please take this first.";
@ -2118,7 +2122,7 @@ OnTouch_:
 			case 5:
 				getitem 1252,1; //Katar
 			}
-			ASSIN_Q3 = 3;
+			ASSIN_Q3 = 2;
 		}
 		mes "[Guildmaster]";
 		mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance.";
@ -2161,7 +2165,7 @@ OnTouch_:
 		end;
 	}
 	else if (ASSIN_Q > 7 && ASSIN_Q < 17) {
-		ASSIN_Q = 7;
+		set ASSIN_Q,7;
 		mes "[Guildmaster]";
 		mes "What the hell? You pressed 'Cancel' during the process. Do you want to change your job or what?";
 		next;
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@ -59,7 +59,7 @@ aldeba_in,96,181,4	script	Kafra Service	113,{
 			mes "seems that you don't";
 			mes "have the 20 zeny to pay";
 			mes "the Storage access fee...";
-			close3;
+			close;
 		}
 		mes "[Kafra Leilah]";
 		mes "Although this facility is";
@ -687,12 +687,3 @@ alb2trea,59,69,5	script	Kafra Employee::kaf_alb2trea	117,{
 	savepoint "alb2trea",92,64,1,1;
 	callfunc "F_KafEnd",0,1,"at Sunken Ship";
 }
-
-// Brasilis
-//============================================================
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
-	cutin "kafra_01",2;
-	callfunc "F_Kafra",0,3,0,80,700;
-	savepoint "brasilis",195,259,1,1;
-	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
-}
--- a/npc/mapflag/night.txt
+++ b/npc/mapflag/night.txt
@ -298,12 +298,6 @@ man_fild02	mapflag	nightenabled
 splendide	mapflag	nightenabled
 spl_fild01	mapflag	nightenabled

-//============================================================
-// Brasilis
-//============================================================
-brasilis	mapflag	nightenabled
-bra_fild01	mapflag	nightenabled
-
 //============================================================
 // Events
 //============================================================
--- a/npc/mapflag/nobranch.txt
+++ b/npc/mapflag/nobranch.txt
@ -371,12 +371,6 @@ splendide	mapflag	nobranch
 spl_in01	mapflag	nobranch
 spl_in02	mapflag	nobranch

-//============================================================
-// Brasilis
-//============================================================
-brasilis	mapflag	nobranch
-bra_in01	mapflag	nobranch
-
 //============================================================
 // RWC
 //============================================================
--- a/npc/mapflag/nomemo.txt
+++ b/npc/mapflag/nomemo.txt
@ -731,13 +731,6 @@ spl_fild01	mapflag	nomemo
 spl_in01	mapflag	nomemo
 spl_in02	mapflag	nomemo

-//============================================================
-// Brasilis
-//============================================================
-bra_in01	mapflag	nomemo
-bra_dun01	mapflag	nomemo
-bra_dun02	mapflag	nomemo
-
 //evt_zombie	mapflag	nomemo

 //============================================================
--- a/npc/mapflag/nopenalty.txt
+++ b/npc/mapflag/nopenalty.txt
@ -25,8 +25,6 @@ ama_in01	mapflag	nopenalty
 ama_in02	mapflag	nopenalty
 ama_test	mapflag	nopenalty
 arena_room	mapflag	nopenalty
-brasilis	mapflag	nopenalty
-bra_in01	mapflag	nopenalty
 comodo	mapflag	nopenalty
 cmd_in01	mapflag	nopenalty
 cmd_in02	mapflag	nopenalty
--- a/npc/mapflag/nopvp.txt
+++ b/npc/mapflag/nopvp.txt
@ -58,8 +58,6 @@ aldebaran	mapflag	pvp	off
 ama_in01	mapflag	pvp	off
 ama_in02	mapflag	pvp	off
 amatsu	mapflag	pvp	off
-brasilis	mapflag	pvp	off
-bra_in01	mapflag	pvp	off
 cmd_in01	mapflag	pvp	off
 cmd_in02	mapflag	pvp	off
 comodo	mapflag	pvp	off
--- a/npc/mapflag/noteleport.txt
+++ b/npc/mapflag/noteleport.txt
@ -426,7 +426,7 @@ bat_a01	mapflag	noteleport
 bat_a02	mapflag	noteleport

 //============================================================
-// Episode 13.2
+// Episode 13
 //============================================================
 mid_campin	mapflag	noteleport
 moc_fild22b	mapflag	noteleport
@ -438,11 +438,6 @@ man_in01	mapflag	noteleport
 spl_in01	mapflag	noteleport
 spl_in02	mapflag	noteleport

-//============================================================
-// Brasilis
-//============================================================
-bra_in01	mapflag	noteleport
-
 //============================================================
 // Orc's Memory
 //============================================================
--- a/npc/mapflag/reset.txt
+++ b/npc/mapflag/reset.txt
@ -14,7 +14,6 @@ alberta	mapflag	reset
 aldebaran	mapflag	reset
 amatsu	mapflag	reset
 ayothaya	mapflag	reset
-brasilis	mapflag	reset
 comodo	mapflag	reset
 einbroch	mapflag	reset
 einbech	mapflag	reset
--- a/npc/mapflag/town.txt
+++ b/npc/mapflag/town.txt
@ -28,4 +28,3 @@ louyang	mapflag	town
 hugel	mapflag	town
 rachel	mapflag	town
 veins	mapflag	town
-brasilis	mapflag	town
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@ -302,7 +302,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 						mes "Oooh, there must";
 						mes "be some style that";
 						mes "you like, right? Hmmm...";
-						close3;
+						close;
 					}
 				}
 				mes "[Assistant Beautician]";
@ -353,7 +353,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	862,{
 				mes "me! Thank you for using";
 				mes "my service and come again~";
 				emotion ET_CHUP;
-				close3;
+				close;
 			case 2:
 				mes "[Assistant Beautician]";
 				mes "Huh? Oh no, you're";
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@ -203,47 +203,6 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	}
 }

-//======================== Brasilis =================================
-bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
-	mes "[Hotel Keeper]";
-	mes "Welcome to the beautiful Brasilis Hotel.";
-	next;
-	switch(select("Save:Rest -5000 zeny:Cancel")) {
-	case 1:
-		mes "[Hotel Keeper]";
-		mes "Do you want to save here at the Brasilis Hotel?";
-		next;
-		switch(select("No thank you.:Absolutely.")) {
-		case 1:
-			mes "[Hotel Keeper]";
-			mes "Ok then, enjoy your stay.";
-			close;
-		case 2:
-			mes "[Hotel Keeper]";
-			mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
-			savepoint "bra_in01",144,69,1,1;
-			close;
-		}
-		end;
-	case 2:
-		if (Zeny > 4999) {
-			mes "[Hotel Keeper]";
-			mes "I will show you a great room.";
-			close2;
-			if (Zeny < 5000)
-				end;
-			Zeny -= 5000;
-			percentheal 100,100;
-			warp "bra_in01",144,69;
-			end;
-		}
-		mes "[Hotel Keeper]";
-		mes "I'm sorry, but the service charge is 5,000 zeny per night.";
-	case 3:
-		close;
-	}
-}
-
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	.@npc_name$ = getarg(0);
--- a/npc/pre-re/cities/brasilis.txt
+++ b/npc/pre-re/cities/brasilis.txt
@ -1,20 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Town Pre-Renewal
-//===== Description: =========================================
-//= [Official Conversion based on bRO & jRO servers]
-//= Brasilis town NPCs.
-//
-// Note:
-// - Brasilis was introduced in Pre-Renewal only for bRO and
-//   jRO official servers with differences in monster stats,
-//   spawns and quests.
-//   It was added in Renewal for every other official server.
-//   Since we follow kRO this is disabled by default.
-//   You can enable it on npc/pre-re/scripts_athena.conf
-//===== Changelog: ===========================================
-//= 1.0 First Version [Daegaladh]
-//============================================================
-
-// Brasilis Transportation :: brasilis_trans
-//============================================================
-alberta,247,115,3	duplicate(Crewman_bra2)	Crewman#bra2	100
--- a/npc/pre-re/guides/guides_brasilis.txt
+++ b/npc/pre-re/guides/guides_brasilis.txt
@ -1,77 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Guide
-//===== Description: =========================================
-//= [Official Conversion based on bRO & jRO servers]
-//= Guide for the city of Brasilis.
-//
-// Note:
-// - Brasilis was introduced in Pre-Renewal only for bRO and
-//   jRO official servers with differences in monster stats,
-//   spawns and quests.
-//   It was added in Renewal for every other official server.
-//   Since we follow kRO this is disabled by default.
-//   You can enable it on npc/pre-re/scripts_athena.conf
-//===== Changelog: ===========================================
-//= 1.0 First Version [Daegaladh]
-//============================================================
-
-brasilis,219,97,3	script	Brasilis Guide	478,{
-	mes "[Brasilis Guide]";
-	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
-	mes "If you have any questions, please ask me.";
-	next;
-	switch(select("Ask about locations:Remove Marks from Mini-Map:Cancel")) {
-	case 1:
-		mes "[Brasilis Guide]";
-		mes "Where can I guide you?";
-		next;
-		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]")) {
-		case 1:
-			mes "[Brasilis Guide]";
-			mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,274,151,2,0xFF3355;
-			close;
-		case 2:
-			mes "[Brasilis Guide]";
-			mes "Do you want to go through the rough jungle? You can take a ";
-			mes "Jungle Cable here ^CE6300+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,308,335,3,0xCE6300;
-			close;
-		case 3:
-			mes "[Brasilis Guide]";
-			mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,137,167,4,0x00FF00;
-			close;
-		case 4:
-			mes "[Brasilis Guide]";
-			mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,254,248,5,0x55FF33;
-			close;
-		case 5:
-			mes "[Brasilis Guide]";
-			mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,195,235,6,0x3355FF;
-			close;
-		}
-		end;
-	case 2:
-		mes "[Brasilis Guide]";
-		mes "I'll remove all marks from your mini-map.";
-		mes "Is there anything else I can do for you?";
-		viewpoint 0,274,151,2,0x00FF00;
-		viewpoint 0,308,335,3,0x00FF00;
-		viewpoint 0,137,167,4,0x00FF00;
-		viewpoint 0,254,248,5,0x00FF00;
-		viewpoint 0,195,235,6,0x00FF00;
-		close;
-	case 3:
-		mes "[Brasilis Guide]";
-		mes "Wandering on your own is always the best way to explore. Anyway, take care.";
-		close;
-	}
-}
--- a/npc/pre-re/merchants/hair_dyer.txt
+++ b/npc/pre-re/merchants/hair_dyer.txt
@ -136,7 +136,7 @@ prt_in,243,168,4	script	Jovovich	91,{
 			mes "* Fees and Information *";
 			mes "- 1 Dyestuffs item of the color of hair you want.";
 			mes "- 1000 zeny fee.";
-			close;
+			break;

 		case 3:
 			mes "[Hairdresser Jovovich]";
--- a/npc/pre-re/merchants/hair_style.txt
+++ b/npc/pre-re/merchants/hair_style.txt
@ -594,7 +594,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 					mes "you can be more daring than";
 					mes "that! Be fashionably adventurous, you fashionable adventurer~";
 					emotion ET_THROB;
-					close3;
+					close;
 				}
 			}
 			else {
@ -917,7 +917,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "I'll make you the best looking";
 				mes "person in the entire world!";
 				emotion ET_BEST;
-				close3;
+				close;
 			case 2:
 				mes "[Prince Shammi]";
 				mes "Oh, did you forget which";
@ -925,7 +925,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	122,{
 				mes "number? By all means, please";
 				mes "check again! Find the one that";
 				mes "is perfect just for you, okay?";
-				close3;
+				close;
 			}
 		}
 		break;
--- a/npc/pre-re/mobs/dungeons/bra_dun.txt
+++ b/npc/pre-re/mobs/dungeons/bra_dun.txt
@ -1,64 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Dungeon Monster Spawn Script
-//===== Description: =========================================
-//= [Official Conversion based on bRO & jRO servers]
-//
-// Note:
-// - Brasilis was introduced in Pre-Renewal only for bRO and
-//   jRO official servers with differences in monster stats,
-//   spawns and quests.
-//   It was added in Renewal for every other official server.
-//   Since we follow kRO this is disabled by default.
-//   You can enable it on npc/pre-re/scripts_athena.conf
-//===== Changelog: ===========================================
-//= 1.0 First Version [Playtester]
-//============================================================
-
-//bRO Pre-Renewal spawns
-
-//==================================================
-// bra_dun01 - Behind the Waterfall
-//==================================================
-bra_dun01	monster	Iara	2069,60,5000
-bra_dun01	monster	Piranha	2070,100,5000
-bra_dun01	monster	Hydra	1068,10,5000
-bra_dun01	monster	Plankton	1161,10,5000
-bra_dun01	monster	Marina	1141,10,5000
-bra_dun01	monster	Black Mushroom	1084,10,180000,90000
-
-//==================================================
-// bra_dun02 - Behind the Waterfall
-//==================================================
-bra_dun02	monster	Iara	2069,120,5000
-bra_dun02	monster	Piranha	2070,80,5000
-bra_dun02	monster	Hydra	1068,20,5000
-bra_dun02	monster	Plankton	1161,20,5000
-bra_dun02	monster	Marina	1141,10,5000
-bra_dun02	monster	Black Mushroom	1084,10,180000,90000
-bra_dun02	boss_monster	Boitata	2068,1,7200000,600000,1
-
-
-//jRO Pre-Renewal spawns
-
-//==================================================
-// bra_dun01 - Behind the Waterfall
-//==================================================
-//bra_dun01	monster	Kukre	1070,40,5000
-//bra_dun01	monster	Hydra	1068,60,5000
-//bra_dun01	monster	Marina	1141,5,5000
-//bra_dun01	monster	Thara Frog	1034,40,5000
-//bra_dun01	monster	Piranha	2070,50,5000
-//bra_dun01	monster	Iara	2069,30,5000
-//bra_dun01	monster	Headless Mule	2071,10,5000
-//bra_dun01	monster	Black Mushroom	1084,5,120000,60000
-
-//==================================================
-// bra_dun02 - Behind the Waterfall
-//==================================================
-//bra_dun02	monster	Hydra	1068,20,5000
-//bra_dun02	monster	Piranha	2070,60,5000
-//bra_dun02	monster	Iara	2069,40,5000
-//bra_dun02	monster	Headless Mule	2071,40,5000
-//bra_dun02	monster	Shining Plant	1083,1,1800000,900000
-//bra_dun02	monster	Red Mushroom	1084,5,120000,60000
-//bra_dun02	boss_monster	Boitata	2068,1,7200000,600000,1
--- a/npc/pre-re/mobs/fields/brasilis.txt
+++ b/npc/pre-re/mobs/fields/brasilis.txt
@ -1,48 +0,0 @@
-//===== rAthena Script =======================================
-//= Brasilis Fields Monster Spawn Script
-//===== Description: =========================================
-//= [Official Conversion based on bRO & jRO servers]
-//
-// Note:
-// - Brasilis was introduced in Pre-Renewal only for bRO and
-//   jRO official servers with differences in monster stats,
-//   spawns and quests.
-//   It was added in Renewal for every other official server.
-//   Since we follow kRO this is disabled by default.
-//   You can enable it on npc/pre-re/scripts_athena.conf
-//===== Changelog: ===========================================
-//= 1.0 First Version [Playtester]
-//============================================================
-
-//==================================================
-// Brasilis, Strange Hydras
-//==================================================
-brasilis,283,88,6,6	monster	Strange Hydra	2081,5,30000
-brasilis,284,104,6,6	monster	Strange Hydra	2081,4,30000
-brasilis,215,80,6,6	monster	Strange Hydra	2081,4,30000
-brasilis,96,50,8,8	monster	Strange Hydra	2081,5,30000
-
-//bRO Pre-Renewal spawns
-
-//==================================================
-// bra_fild01 - Brasilis Field
-//==================================================
-bra_fild01	monster	Headless Mule	2071,40,5000
-bra_fild01	monster	Curupira	2074,80,5000
-bra_fild01	monster	Dokebi	1110,20,5000
-bra_fild01	monster	Jaguar	2072,10,5000
-bra_fild01	monster	Savage	1166,20,5000
-bra_fild01	monster	Toucan	2073,10,5000
-bra_fild01	monster	Red Mushroom	1085,3,360000,180000
-
-//jRO Pre-Renewal spawns
-
-//==================================================
-// bra_fild01
-//==================================================
-//bra_fild01	monster	Savage	1166,10,5000
-//bra_fild01	monster	Dokebi	1110,20,5000
-//bra_fild01	monster	Curupira	2074,50,5000
-//bra_fild01	monster	Jaguar	2072,35,5000
-//bra_fild01	monster	Toucan	2073,40,5000
-//bra_fild01	monster	Red Mushroom	1085,5,120000,60000
--- a/npc/pre-re/scripts_athena.conf
+++ b/npc/pre-re/scripts_athena.conf
@ -98,34 +98,3 @@ npc: npc/pre-re/quests/quests_nameless.txt
 npc: npc/pre-re/quests/quests_niflheim.txt
 npc: npc/pre-re/quests/the_sign_quest.txt
 npc: npc/pre-re/quests/quests_veins.txt
-
-// - Disable Brasilis by default --------------------------------
-// DO NOT COMMENT!!!
-// Instead, follow the instructions below.
-// --------------------------------------------------------------
-delnpc: npc/cities/brasilis.txt
-delnpc: npc/quests/quests_brasilis.txt
-delnpc: npc/warps/cities/brasilis.txt
-delnpc: npc/warps/dungeons/bra_dun.txt
-delnpc: npc/warps/fields/bra_fild.txt
-
-// -------------------- Pre-Renewal Brasilis --------------------
-// Brasilis was introduced in Pre-Renewal only for bRO and
-// jRO official servers with differences in monster stats,
-// spawns and quests.
-// It was added in Renewal for every other official server.
-// Since we follow kRO this is disabled by default.
-//
-// Uncomment the following NPC scripts to enable bRO/jRO's
-// Pre-Renewal version of Brasilis.
-// You also need to uncomment the data from file
-// mob_summon.yml in /db/import/ folder
-//npc: npc/cities/brasilis.txt
-//npc: npc/quests/quests_brasilis.txt
-//npc: npc/warps/cities/brasilis.txt
-//npc: npc/warps/dungeons/bra_dun.txt
-//npc: npc/warps/fields/bra_fild.txt
-//npc: npc/pre-re/cities/brasilis.txt
-//npc: npc/pre-re/guides/guides_brasilis.txt
-//npc: npc/pre-re/mobs/dungeons/bra_dun.txt
-//npc: npc/pre-re/mobs/fields/brasilis.txt
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@ -157,19 +157,19 @@ geffen,132,38,3	script	Bard#2	51,{
 		next;
 		mes "[Errende]";
 		mes "I hope that you'll always remain honest and respectful towards other people, and that you continue to ignore greed for fortune or power.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q > 11 && gef_bard_q < 14) {
 		cutin "bard_eland02",2;
 		mes "[Errende]";
 		mes "It seems you haven't found it yet. Well, take your time, I can wait as long as you want. It doesn't really bore me, since waiting seems to be a part of my profession.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 11) {
 		cutin "bard_eland01",2;
 		mes "[Errende]";
 		mes "Mr. Skezti has a small book store on the book street at the right side of Mineta in Juno. If you show him the seal, he'll help you out.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 10) {
 		cutin "bard_eland01",2;
@ -199,7 +199,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "show him the Seal of Friendship.";
 		mes "Good luck, now~";
 		set gef_bard_q,11;
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 20) {
 		cutin "bard_eland03",2;
@ -249,7 +249,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "[Errende]";
 			mes "Waaah, wah~";
 			mes "You can't just ignore me like that! Where's your sense of merriment, your sense of romance?";
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 27) {
@ -295,7 +295,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
 			set gef_bard_q,22;
 		}
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 26) {
 		cutin "bard_eland01",2;
@ -349,17 +349,17 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "in advance~";
 				set gef_bard_q,24;
 			}
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther Doubleharmony") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Errende") {
 			cutin "bard_eland04",2;
@ -368,7 +368,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "If I did, why would";
 			mes "I not know what";
 			mes "this song is about?";
-			close3;
+			goto L_End;

 		} else {
 			mes "[Errende]";
@ -381,7 +381,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "How could I forget";
 			mes "the 8th love?";
 			set gef_bard_q,26;
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 25) {
@ -427,7 +427,7 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "heart wrenching song.";
 				mes "But at what cost to your soul?^000000";
 			}
-			close3;
+			goto L_End;

 		} else {
 			cutin "bard_eland01",2;
@ -438,7 +438,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "Noboooody looooves meee";
 			mes "Friends foooooor never...";
 			mes "Ooooooooh wah!^000000";
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 24) {
@ -464,7 +464,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "Once again,";
 		mes "thank you so much";
 		mes "for your help.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 22) {
 		mes "[Errende]";
@ -480,7 +480,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		next;
 		mes "[Errende]";
 		mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 23) {
 		cutin "bard_eland02",2;
@ -570,19 +570,19 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "in advance~";
 				set gef_bard_q,24;
 			}
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
 			set gef_bard_q,26;
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther Doubleharmony") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
 			set gef_bard_q,26;
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Errende") {
 			cutin "bard_eland04",2;
@ -592,7 +592,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "I not know what this";
 			mes "song is about?";
 			set gef_bard_q,26;
-			close3;
+			goto L_End;

 		} else {
 			mes "[Errende]";
@ -605,7 +605,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "How could I forget";
 			mes "the 8th love?";
 			set gef_bard_q,26;
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 21) {
@ -655,7 +655,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
 			set gef_bard_q,2;
 		}
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 6) {
 		cutin "bard_eland04",2;
@ -699,23 +699,23 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "I'll pay you back somehow! Thank you for your trouble in advance~";
 				set gef_bard_q,4;
 			}
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther Doubleharmony") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Errende") {
 			cutin "bard_eland04",2;
 			mes "[Errende]";
 			mes "Surely you jest! If I did, why would I not know what this song is about?";
-			close3;
+			goto L_End;

 		} else {
 			mes "[Errende]";
@ -727,7 +727,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "How could I forget";
 			mes "the 8th love?";
 			set gef_bard_q,6;
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 5) {
@ -764,7 +764,7 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "heart wrenching song.";
 				mes "But at what cost to your soul?^000000";
 			}
-			close3;
+			goto L_End;

 		} else {
 			cutin "bard_eland01",2;
@ -775,7 +775,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "Noboooody looooves meee";
 			mes "Friends foooooor never...";
 			mes "Ooooooooooh wah!^000000";
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 4) {
@ -800,7 +800,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		mes "Once again,";
 		mes "thank you so much";
 		mes "for your help.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 2) {
 		cutin "bard_eland04",2;
@ -813,7 +813,7 @@ geffen,132,38,3	script	Bard#2	51,{
 		next;
 		mes "[Errende]";
 		mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance.";
-		close3;
+		goto L_End;

 	} else if (gef_bard_q == 3) {
 		cutin "bard_eland02",2;
@ -898,27 +898,27 @@ geffen,132,38,3	script	Bard#2	51,{
 				mes "I'll pay you back somehow! Thank you for your trouble in advance~";
 				set gef_bard_q,4;
 			}
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Gunther") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
 			set gef_bard_q,6;
-			close3;
+			goto L_End;
 		}

 		else if (.@inputstr$ == "Gunther Doubleharmony") {
 			mes "[Errende]";
 			mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that.";
 			set gef_bard_q,6;
-			close3;
+			goto L_End;

 		} else if (.@inputstr$ == "Errende") {
 			cutin "bard_eland04",2;
 			mes "[Errende]";
 			mes "Surely you jest! If I did, why would I not know what this song is about?";
 			set gef_bard_q,6;
-			close3;
+			goto L_End;

 		} else {
 			mes "[Errende]";
@ -930,7 +930,7 @@ geffen,132,38,3	script	Bard#2	51,{
 			mes "How could I forget";
 			mes "the 8th love?";
 			set gef_bard_q,6;
-			close3;
+			goto L_End;
 		}

 	} else if (gef_bard_q == 1) {
@ -993,7 +993,11 @@ geffen,132,38,3	script	Bard#2	51,{
 		}

 	}
-	close3;
+
+L_End:
+	close2;
+	cutin "",255;
+	end;

 // SubRoutine for 5 similiar dialogues of the quest

@ -1110,7 +1114,7 @@ S_StorySong:
 			mes "[Errende]";
 			mes "Oh, how disappointing. But promise me that you will drop by later, so that we can share stories and merriment.";
 		}
-		close3;
+		goto L_End;

 	case 2:
 		.@num = getarg(0);
@ -1145,7 +1149,7 @@ S_StorySong:
 				mes "My apologies,";
 				mes "But I cannot offer my services for free. Even a Bard needs zeny to live, wouldn't you agree?";
 			}
-			close3;
+			goto L_End;

 		case 2:
 			cutin "bard_eland03",2;
@ -1214,7 +1218,7 @@ S_StorySong:
 					mes "may never know";
 					mes "with certainty.";
 				}
-				close3;
+				goto L_End;

 			} else if (.@random == 2) {

@ -1317,7 +1321,7 @@ S_StorySong:
 						if(gef_bard_q==1) set gef_bard_q,7;
 						if(gef_bard_q==21) set gef_bard_q,27;
 					}
-					close3;
+					goto L_End;

 				}
 				mes "^483D8BA good Bard sings";
@ -1341,7 +1345,7 @@ S_StorySong:
 				mes "[Errende]";
 				mes "H-how can you say such a thing, "+ @name$ +"? Have you ever been a Bard before? It's difficult to come up with fresh, original melodies!";
 			}
-			close3;
+			goto L_End;

 		case 3:
 			cutin "bard_eland01",2;
@ -1351,7 +1355,7 @@ S_StorySong:
 			mes "enjoyed when you";
 			mes "are in the mood for it.";
 			mes "Please come again.";
-			close3;
+			goto L_End;

 		}

@ -1360,7 +1364,7 @@ S_StorySong:
 		mes "[Errende]";
 		mes "Hmm~?";
 		mes "Well, alright. Though, listening to a good story or cheerful song can really do you some good. Alright then, see you later.";
-		close3;
+		goto L_End;
 	}
 }

--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@ -61,7 +61,7 @@
 			mes "cooking when Novices";
 			mes "like yourself are running";
 			mes "around here like children.";
-			close3;
+			close;
 		}
 		cutin "orleans_1",0;
 		mes "[Charles Orleans]";
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@ -3816,7 +3816,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "wouldn't come here to pray...";
 				mes "Well, I hope you enjoy your";
 				mes "time here, adventurer.";
-				close3;
+				goto L_End;
 			}
 			mes "[Priestess Nemma]";
 			mes "Oh! I'm glad to see that";
@ -3869,7 +3869,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "all your journeys. May the";
 				mes "grace of the goddess always";
 				mes "support us in all that we do~";
-				close3;
+				goto L_End;
 			}
 			mes "[Priestess Nemma]";
 			mes "Great! How much would you";
@ -3898,7 +3898,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "protecting you, wherever you go~";
 				break;
 			}
-			close3;
+			goto L_End;
 		}
 		else {
 			cutin "ra_nemma03",2;
@ -3939,7 +3939,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 					mes "protecting you, wherever you go~";
 					break;
 				}
-				close3;
+				goto L_End;
 			case 2:
 				mes "[Priestess Nemma]";
 				mes "Oh! If you'd like some";
@ -3968,7 +3968,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "Oh, how sweet of you~";
 				break;
 			}
-			close3;
+			goto L_End;
 		}
 	}
 	else {
@ -3976,7 +3976,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			cutin "ra_nemma01",2;
 			mes "[Priestess Nemma]";
 			mes "Welcome to our temple!";
-			close3;
+			goto L_End;
 		}
 		if (ra_tem_q < 1) {
 			mes "[Priestess Nemma]";
@ -4009,7 +4009,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "to go inside. ^333333*Sob*^000000 P-Panno!";
 			mes "Panno, I neeeed heeeeelp~!";
 			set ra_tem_q,1;
-			close3;
+			goto L_End;
 		}
 		else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) {
 			mes "[Priestess Nemma]";
@ -4024,7 +4024,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "Panno would know";
 			mes "what to do... I think.";
 			mes "Ooh, Panno, help me!";
-			close3;
+			goto L_End;
 		}
 		else if (ra_tem_q == 10) {
 			cutin "ra_nemma04",2;
@ -4050,7 +4050,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "I'm outside. What if";
 			mes "the gate locks up again?";
 			mes "Oooh, what should I do?!";
-			close3;
+			goto L_End;
 		}
 		else if (ra_tem_q == 11) {
 			emotion ET_DELIGHT;
@ -4062,7 +4062,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "longer asking for donations,";
 			mes "but you can still redeem your";
 			mes "Lottery Tickets inside, okay?";
-			close3;
+			goto L_End;
 		}
 		else if (ra_tem_q == 12) {
 			mes "[Priestess Nemma]";
@ -4089,7 +4089,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 			mes "like, ^FF000020 of them^000000! Thank";
 			mes "you thank you thank you!";
 			set ra_tem_q,13;
-			close3;
+			goto L_End;
 		}
 		else if (ra_tem_q == 13) {
 			mes "[Priestess Nemma]";
@ -4124,7 +4124,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 					mes "to play! Hm, maybe";
 					mes "our pope would like";
 					mes "to see these too?";
-					close3;
+					goto L_End;
 				}
 				cutin "ra_nemma02",2;
 				mes "[Priestess Nemma]";
@ -4143,16 +4143,20 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				mes "have much to pay you";
 				mes "back with, anyway~";
 			}
-			close3;
+			goto L_End;
 		}
 		else {
 			cutin "ra_nemma01",2;
 			mes "[Priestess Nemma]";
 			mes "Welcome to our temple!";
 		}
-		close3;
+		goto L_End;
 	}
-	close3;
+
+L_End:
+	close2;
+	cutin "",255;
+	end;

 S_Donate:
 	.@num = getarg(0);
@ -6325,7 +6329,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "everything I know.";
 			mes "Remember to keep";
 			mes "quiet about what I said.";
-			close3;
+			goto L_End;
 		}
 	}
 	else if (ra_tem_q < 2) {
@ -6354,7 +6358,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "time, so please visit";
 			mes "me at your leisure.";
 			mes "Go with Freya.";
-			close3;
+			goto L_End;

 		case 2:
 			cutin "ra_fano01",2;
@ -6393,14 +6397,14 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "side of the hallway. However,";
 			mes "you can only enter if you've";
 			mes "been permitted beforehand.";
-			close3;
+			goto L_End;

 		case 3:
 			mes "[Priestess Panno]";
 			mes "......................";
 			mes "No chit-chat";
 			mes "inside the temple.";
-			close3;
+			goto L_End;
 		}
 	}
 	else if (ra_tem_q == 10) {
@ -6435,7 +6439,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "time, so please visit";
 			mes "me at your leisure.";
 			mes "Go with Freya.";
-			close3;
+			goto L_End;

 		case 2:
 			cutin "ra_fano01",2;
@ -6474,7 +6478,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "side of the hallway. However,";
 			mes "you can only enter if you've";
 			mes "been permitted beforehand.";
-			close3;
+			goto L_End;

 		case 3:
 			cutin "ra_fano02",2;
@ -6521,7 +6525,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 			mes "[Priestess Panno]";
 			mes ".........";
 			set ra_tem_q,11;
-			close3;
+			goto L_End;
 		}
 	}
 	else if (ra_tem_q == 11) {
@ -6656,7 +6660,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 		mes "Excuse me now, I need";
 		mes "to get back to work.";
 		set ra_tem_q,12;
-		close3;
+		goto L_End;
 	}
 	cutin "ra_fano02",2;
 	mes "[Priestess Panno]";
@ -6664,7 +6668,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 	mes "Behave yourself, and";
 	mes "respect those who have";
 	mes "come here just to worship.";
-	close3;
+	goto L_End;

 L_Lottery:
 	if(checkweight(607,1) == 0){
@ -6676,7 +6680,7 @@ L_Lottery:
 		mes "something large, unwieldy";
 		mes "and heavy? Put your junk";
 		mes "away in Storage first.";
-		close3;
+		goto L_End;
 	}
 	mes "[Priestess Panno]";
 	mes "Here we go";
@ -6712,7 +6716,7 @@ L_Lottery:
 		else if (.@bonus_donate > 5 && .@bonus_donate < 11) getitem 518,1;	//Honey 5%
 		else if (.@bonus_donate > 0 && .@bonus_donate < 6) getitem 526,1;	//Royal Jelly 5%
 		else getitem 547,1; //Condensed White Potion 39%
-		close3;
+		goto L_End;
 	}
 	mes "[Priestess Panno]";
 	mes "You...";
@ -6732,7 +6736,7 @@ L_Lottery:
 	cutin "ra_fano03",2;
 	mes "[Priestess Panno]";
 	mes "May Freya be with you.";
-	close3;
+	goto L_End;

 L_End:
 	close2;
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@ -284,7 +284,7 @@ prontera,124,297,3	script	Tialfi	706,{
 				next;
 				mes "[Tialfi]";
 				mes "I think we'd better wait and see what's happening. Someone will deliver the news to us. Though, I am unsure of whether or not it will be good news or bad...";
-				close3;
+				close;
 			}
 			else if (BaseLevel < 70) {
 				cutin "god_tialpi02",2;
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@ -3093,11 +3093,13 @@ OnTouch_:
 	end;
 }

+/* Currently broken.
 prt_maze02,25,161,0	script	#music	-1,7,7,{
 OnTouch_:
-	soundeffect "effect\\석양의 어쌔신.wav",1;
+	soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1;
 	end;
 }
+*/

 prt_maze02,132,132,0	script	#skill	-1,{
 OnEnable:
--- a/npc/re/cities/alberta.txt
+++ b/npc/re/cities/alberta.txt
@ -21,10 +21,6 @@ alberta,246,74,3	duplicate(Sea_Captain_amatsu)	Sea Captain#ama1	709
 //============================================================
 alberta,246,29,3	duplicate(Aibakthing_ayothaya)	Aibakthing#ayo	843

-// cities/brasilis.txt
-//============================================================
-alberta,246,82,3	duplicate(Crewman_bra2)	Crewman#bra2	100
-
 // cities/gonryun.txt
 //============================================================
 alberta,246,62,3	duplicate(Kunlun_Envoy_gonryun)	Kunlun Envoy#gon	776
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@ -1,19 +1,26 @@
-//===== rAthena Script =======================================
+//===== rAthena Script ======================================= 
 //= Brasilis Town
-//===== Description: =========================================
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.4
+//===== Compatible With: ===================================== 
+//= rAthena Project
+//===== Description: ========================================= 
 //= [Official Conversion]
 //= Brasilis Town Script
-//===== Changelog: ===========================================
-//= 1.0 First version. Transportation and Basic NPCs. [L0ne_W0lf]
+//===== Additional Comments: ================================= 
+//= 1.0 First version. Transportation and Basic NPCs.
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
 //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy]
 //= 1.4 Added VIP features. [Euphy]
-//============================================================
+//============================================================ 

 // Brasilis Transportation :: brasilis_trans
 //============================================================
-	script	::Crewman_bra2	-1,{
+/* Pre-Renewal coordinates: alberta,247,115,3 */
+alberta,246,82,3	script	Crewman#bra2	100,{
 	mes "[Crewman]";
 	mes "Hey, have you heard of a place called Brasilis?";
 	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@ -84,8 +84,8 @@ dicastes01,234,158,0	script	Training Galten#a	450,{
 		mes "if I keep up with my training every day.";
 		close;
 	}
-	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
-	mes "¡ô ¡ø";
+	mes "ø¡ô¡ü ¡¡ø¡ô¡ü ¡ø";
+	mes "ô ¡ø";
 	next;
 	mes "Don't know what it means.";
 	close;
@ -130,7 +130,7 @@ dicastes01,248,129,0	script	Training Galten#d	450,{
 		close; 
 	}
 	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü";
-	mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø";
+	mes "¡ø¡ô¡ü ¡ø¡ ø¡ô¡ü ¡ø";
 	next;
 	mes "Don't know what it means.";
 	close;
--- a/npc/re/custom/lasagna/lasagna_npcs.txt
+++ b/npc/re/custom/lasagna/lasagna_npcs.txt
@ -323,7 +323,7 @@ lasa_fild01,60,322,3	script	Vigilante Aglio#doram02	4_DR_AGLIO,{
 				cutin "tutorial02.BMP",4;
 				mes "^4d4dff!- Notice -!^000000";
 				mes "^4d4dffCheck out the quest details by pressing the shortcut key [Alt+U],^000000 or through the Quest icon found in the menu tray.^000000";
-				close3;
+				close;
 			}
 			mes "[Vigilante Aglio]";
 			mes "Whoa, you're good!";
--- a/npc/re/custom/lasagna/warps.txt
+++ b/npc/re/custom/lasagna/warps.txt
@ -0,0 +1,45 @@
+//===== rAthena Script =======================================
+//= Lasagna Warps
+//===== Changelogs: ==========================================
+//= 1.0 First Version. [Capuche]
+//============================================================
+
+lasa_fild02,348,244,0	warp	lasa_fild02#lasa_dun01	1,1,lasa_dun01,24,143
+lasa_dun01,18,143,0	warp	lasa_dun01#lasa_fild02	1,1,lasa_fild02,344,243
+
+lasa_dun_q,190,14,0	warp	lasa_dun_q#lasa_dun01	1,1,lasa_dun01,152,98
+lasa_dun01,157,98,0	warp	lasa_dun01#lasa_dun02	1,1,lasa_dun02,22,171
+lasa_dun02,18,171,0	warp	lasa_dun02#lasa_dun01	1,1,lasa_dun01,153,98
+
+lasa_dun02,146,58,0	warp	lasa_dun02#lasa_dun03	1,1,lasa_dun03,190,18
+lasa_dun03,190,15,0	warp	lasa_dun03#lasa_dun02	1,1,lasa_dun02,146,54
+
+lasa_fild01,134,381,0	warp	lasa_fild01#lasagna_1	2,2,lasagna,153,58
+lasagna,150,54,0	warp	lasagna#lasa_fild01_1	2,2,lasa_fild01,131,378
+
+lasa_fild01,341,375,0	warp	lasa_fild01#lasagna_2	2,2,lasagna,327,56
+lasagna,327,51,0	warp	lasagna#lasa_fild01_2	2,2,lasa_fild01,344,371
+
+lasagna,358,91,0	warp	lasagna#lasa_fild02	2,2,lasa_fild02,20,98
+lasa_fild02,16,98,0	warp	lasa_fild02#lasagna	2,2,lasagna,355,92
+
+lasa_in01,159,61,0	warp	lasa_in01#lasagna	1,1,lasagna,68,202
+
+// Boat
+conch_in,60,61,0	warp2	warp_conch_in#out	1,1,lasagna,206,323
+conch_in,51,60,0	warp2	warp_conch_in#A_B	1,1,conch_in,31,60
+conch_in,34,60,0	warp2	warp_conch_in#B_A	1,1,conch_in,53,59
+conch_in,63,53,0	warp2	warp_conch_in#C_D	1,1,conch_in,63,33
+conch_in,63,35,0	warp2	warp_conch_in#D_C	1,1,conch_in,64,55
+conch_in,64,66,0	warp2	warp_conch_in#E_F	1,1,conch_in,63,89
+conch_in,63,87,0	warp2	warp_conch_in#F_E	1,1,conch_in,63,64
+conch_in,101,53,0	warp2	warp_conch_in#G_H	1,1,conch_in,101,33
+conch_in,101,35,0	warp2	warp_conch_in#H_G	1,1,conch_in,102,55
+conch_in,101,66,0	warp2	warp_conch_in#I_J	1,1,conch_in,101,89
+conch_in,102,87,0	warp2	warp_conch_in#J_I	1,1,conch_in,101,64
+conch_in,137,53,0	warp2	warp_conch_in#K_L	1,1,conch_in,139,33
+conch_in,139,35,0	warp2	warp_conch_in#L_K	1,1,conch_in,138,55
+conch_in,137,66,0	warp2	warp_conch_in#M_N	1,1,conch_in,139,89
+conch_in,140,87,0	warp2	warp_conch_in#N_M	1,1,conch_in,137,64
+conch_in,142,60,0	warp2	warp_conch_in#O_P	1,1,conch_in,162,61
+conch_in,159,61,0	warp2	warp_conch_in#P_O	1,1,conch_in,140,59
--- a/npc/re/guides/guides_brasilis.txt
+++ b/npc/re/guides/guides_brasilis.txt
@ -1,13 +1,19 @@
-//===== rAthena Script =======================================
+//===== rAthena Script ======================================= 
 //= Brasilis Guide
-//===== Description: =========================================
-//= [Official Conversion based on bRO & jRO servers]
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= rAthena Project
+//===== Description: ========================================= 
+//= [Official Conversion]
 //= Guide for the city of Brasilis.
-//===== Changelog: ===========================================
-//= 1.0 First Version, Renewal guide. [L0ne_W0lf]
-//= 1.1 Added a missing close. [L0ne_W0lf]
+//===== Additional Comments: ================================= 
+//= 1.0 First Version, Renewal guide.
+//= 1.1 Added a missing close.
 //= 1.2 Navigation system update. [Euphy]
-//============================================================
+//============================================================ 

 brasilis,219,97,3	script	Brasilis Guide	478,{
 	mes "[Brasilis Guide]";
@ -53,7 +59,6 @@ brasilis,219,97,3	script	Brasilis Guide	478,{
 			viewpoint 1,195,235,6,0x3355FF;
 			close;
 		}
-		end;
 	case 2:
 		mes "[Brasilis Guide]";
 		mes "I'll remove all marks from your mini-map.";
--- a/npc/re/guild3/agit_main_te.txt
+++ b/npc/re/guild3/agit_main_te.txt
@ -438,7 +438,7 @@ function GuardianData;
 			if (select( "Fire","Cancel" ) == 2) {
 				mes "[ Hired Kafra Employee ]";
 				mes "I'll work hard for you... Thank you!";
-				close3;
+				close;
 			}
 			mes "[ Hired Kafra Employee ]";
 			mes "Oh, my goodness! This is nonsense!";
--- a/npc/re/instances/CharlestonCrisis.txt
+++ b/npc/re/instances/CharlestonCrisis.txt
@ -727,11 +727,11 @@ OnTimer300:
 }

 1@mcd,141,214,5	script	Charleston 2#1	4_F_CHARLESTON02,{
+	cutin "dalle01.bmp",2;
 	if (is_party_leader() == false) {
-		cutin "dalle01.bmp",2;
 		mes "[Charleston 1]";
 		mes "Please let me talk to your leader about the supplementation of the factory.";
-		close3;
+		close;
 	}
 	if ('ep15_1_mcd01 > 11)
 		end;
--- a/npc/re/instances/MazeofOz.txt
+++ b/npc/re/instances/MazeofOz.txt
@ -2,35 +2,34 @@
 //= Instance: The Maze of Oz.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Part of the Episode 18 main quest.
+//- 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$ = "Oz Labyrinth";
+ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{ 
+	.@md_name$ = "The Maze of Oz";

-	if (ep18_main == 29) {
-		mes "[Disguised Miriam]";
-		mes "We are now entering the <FONT SIZE = 14><B>^e5555eMaze of Oz^000000</FONT></B>.";
-		mes "^e5555ePlease finish your preparations^000000 and come back to me.";
+	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;
-		erasequest 11717;
-		setquest 11719;
-		ep18_main = 30;
+		changequest 11717,11719;
+		ep18_1_main = 30;
 		close3;
 	}
-	if (ep18_main == 30) {
-		mes "[Disguised Miriam]";
-		mes "Then let's head to ^e5555e" + .@md_name$ + "^000000";
+	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 "[Disguised Miriam]";
-			mes "I think it would be a good idea to form a ^ff0000party before enter^000000..";
+			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.", "Quit." ) ) {
+		switch( select( "Open the door", "Enter", "Stop" ) ) {
 		case 1:
 			if (instance_create(.@md_name$) < 0) {
 				mes "Party: " + getpartyname(getcharid(1)) + "";
@ -38,21 +37,21 @@ ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{
 				mes "^0000ff" + .@md_name$ + " ^000000- Unknown error";
 				close;
 			}
-			mes "[Disguised Miriam]";
-			mes "It's better to wait a bit before entering.";
+			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 "[Disguised Miriam]";
+				mes "[Miriam in disguise]";
 				mes "^ff0000An unknown error occurred.^000000";
 				close;
 			case IE_NOINSTANCE:
-				mes "[Disguised Miriam]";
-				mes "Let's wait a bit and try again.";
+				mes "[Miriam in disguise]";
+				mes "^ff0000Your party leader has not yet created the dungeon.^000000";
 				close;
 			case IE_NOMEMBER:
-				mes "[Disguised Miriam]";
+				mes "[Miriam in disguise]";
 				mes "^ff0000Only a member of the party can enter the Memorial Dungeon.^000000";
 				close;
 			case IE_OK:
@ -63,25 +62,24 @@ ra_fild10,179,176,5	script	Merchant#ep18_gorge	4_EP18_MERCHANT,{
 			end;
 		}
 	}
-	mes "[Merchant]";
-	mes "It seems like someone was nearby but disappeared quickly.";
-	mes "Where did they go?";
 	cutin "ep18_merchant.png",2;
-	close3;
+	mes "[Vendor]";
+	mes "Someone must have been around here, but they just disappeared. Where did they go?";
+	close3; 

 OnInit:
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11717) == 1" );
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
+	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 we can use the rope to climb up.";
+	mes "I think I can climb up with a rope.";
 	next;
-	if (select( "Use the rope to climb up.", "Do not use." ) == 2)
+	if (select( "Use a rope to climb", "Do not use" ) == 2)
 		end;
-	warp "ra_fild10",173,176;
+	warp "ra_fild10",180,174;
 	end;
 }

@ -90,64 +88,64 @@ OnInit:
 		end;
 	'event_oz = 1;
 	.@miriam1$ = instance_npcname("Miriam#ozmd1");
-	.@maggi1$ = instance_npcname("Maggi#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$;
+	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;
-	cloakoffnpcself( .@maggi1$ );
-	cloakoffnpcself( .@mark1$ );
-	cloakoffnpcself( .@tamarin1$ );
+	enablenpc .@maggi1$;
+	enablenpc .@mark1$;
+	enablenpc .@tamarin1$;
 	sleep2 2000;
 	npctalk "Mark: Are you okay?", .@mark1$;
 	cutin "ep18_mark_01.png",2;
 	sleep2 2000;
-	npctalk "Miriam: Lava is flowing right below, so ash is always flying.", .@miriam1$;
+	npctalk "Miriam: There is lava flowing right below it, always scattering ashes.", .@miriam1$;
 	cutin "ep18_miriam_03.png",2;
 	sleep2 2000;
-	npctalk "Miriam: There may be embers left in the lava ash, so please be careful.", .@miriam1$;
+	npctalk "Miriam: Beware there may be embers in the lava ash.", .@miriam1$;
 	sleep2 2000;
-	npctalk "Miriam: If you inhale it incorrectly, it will burn your lungs.", .@miriam1$;
+	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 would be better to move slowly and check the situation again.", .@miriam1$;
+	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: First, please follow the road to the north.", .@miriam1$;
+	npctalk "Miriam: Please follow the road to the north first.", .@miriam1$;
 	sleep2 2000;
 	cutin "",255;
 	setpcblock PCBLOCK_NPC, false;

-	cloakonnpcself( .@maggi1$ );
-	cloakonnpcself( .@mark1$ );
-	cloakonnpcself( .@tamarin1$ );
+	disablenpc .@maggi1$;
+	disablenpc .@mark1$;
+	disablenpc .@tamarin1$;
 	disablenpc .@miriam1$;
 	enablenpc .@miriam2$;
 	end;
 }

-1@oz,279,175,5	duplicate(dummy_cloaked_npc)	Maggi#ozmd1	4_4JOB_MAGGI
-1@oz,280,175,3	duplicate(dummy_cloaked_npc)	Mark#ozmd1	4_EP18_MARK
-1@oz,279,177,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd1	4_EP18_TAMARIN
+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(DISABLED)	Miriam#ozmd2	4_EP18_MIRIAM,{
+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 the real Maze of Oz.", .@miriam2$;
+	npctalk "Miriam: If you cross the bridge in front of you, it's a real maze.", .@miriam2$;
 	sleep2 2000;
-	npctalk "Miriam: You have to be very careful when crossing the bridge, so let's talk again at the bridge.", .@miriam2$;
+	npctalk "Miriam: We must be very careful crossing the bridge, let's talk again after.", .@miriam2$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
 	disablenpc .@miriam2$;
@ -155,43 +153,69 @@ OnInit:
 	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(DISABLED)	Miriam#ozmd3	EP18_NPC_MIRIAM,{
+1@oz,241,272,3	script	Miriam#ozmd3	EP18_NPC_MIRIAM,{
 	if ('event_oz != 2)
 		end;
 	'event_oz = 3;
-	.@maggi3$ = instance_npcname("Maggi#ozmd3");
+	'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 would be better to share the luggage and cross it one at a time.", 'miriam3$;
+	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 me slowly. It will be helpful not to look under your feet.", 'miriam3$;
+	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$;
-	cloakoffnpcself( .@maggi3$ );
-	cloakoffnpcself( .@mark3$ );
-	cloakoffnpcself( .@tamarin3$ );
+	npctalk "Tamarin: Wow I can't see the bottom.", .@tamarin3$;
+	enablenpc .@maggi3$;
+	enablenpc .@mark3$;
+	enablenpc .@tamarin3$;
 	sleep2 2000;
-	npctalk "Magi: My legs look really worn out...", .@maggi3$;
+	npctalk "Magi: Your legs look very old...", .@maggi3$;
 	sleep2 2000;
-	npctalk "Mark: Everyone be careful.", .@mark3$;
+	npctalk "Mark: Everyone be careful", .@mark3$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
-	cloakonnpcself( .@maggi3$ );
-	cloakonnpcself( .@mark3$ );
-	cloakonnpcself( .@tamarin3$ );
+	disablenpc .@maggi3$;
+	disablenpc .@mark3$;
+	disablenpc .@tamarin3$;
 	'miriam3_id = getnpcid(0);

-	unitwalk 'miriam3_id,231,272, 'miriam3$ + "::OnEvent1";
+	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";
@ -212,13 +236,13 @@ OnEvent5:
 	end;
 }

-1@oz,245,272,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd3	4_4JOB_MAGGI
-1@oz,244,273,3	duplicate(dummy_cloaked_npc)	Mark#ozmd3	4_EP18_MARK
-1@oz,244,270,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd3	4_EP18_TAMARIN
+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(DISABLED)	Miriam#ozmd4	4_EP18_MIRIAM,{
+1@oz,157,272,3	script	Miriam#ozmd4	4_EP18_MIRIAM,{
 	if ('event_oz != 3)
 		end;
 	'event_oz = 4;
@ -226,25 +250,25 @@ OnEvent5:
 	.@miriam4$ = instance_npcname("Miriam#ozmd4");
 	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
 	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Maggi#ozmd4");
+	.@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, 0xB7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Miriam: Ah!! A monster!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
 	sleep2 1500;
-	mapannounce 'map_name$, "Miriam: I will take care of this rude guy.", bc_map, 0xB7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Miriam: I'll take this rude bastard.", bc_map, 0x00B7EE,FW_NORMAL,16;
 	sleep2 1500;
-	mapannounce 'map_name$, "Tamarin: It also appeared in the back!!!", bc_map, 0xB7EE,FW_NORMAL,16;
+	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: Aaaah!!!", bc_map, 0xB7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "Magi: Crazy!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
 	sleep2 500;
 	enablenpc .@maggi4$;
 	enablenpc .@mark4$;
-	mapannounce 'map_name$, "Mark: Please support the front!!!", bc_map, 0xB7EE,FW_NORMAL,16;
+	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
@ -265,7 +289,7 @@ OnMobDead:

 	.@tamarin4$ = instance_npcname("Tamarin#ozmd4");
 	.@ashtoad2$ = instance_npcname("Ash Toad#ozmd2");
-	.@maggi4$ = instance_npcname("Maggi#ozmd4");
+	.@maggi4$ = instance_npcname("Magi#ozmd4");
 	.@mark4$ = instance_npcname("Mark#ozmd4");
 	.@ashtoad3$ = instance_npcname("Ash Toad#ozmd3");
 	.@maram4$ = instance_npcname("Maram#ozmd4");
@ -277,59 +301,60 @@ OnMobDead:
 	npctalk "Tamarin: I did it!!!", .@tamarin4$;
 	disablenpc .@ashtoad2$;
 	sleep2 2000;
-	npctalk "Magi: This way too!!", .@maggi4$;
+	npctalk "Magi: Me too!!", .@maggi4$;
 	disablenpc .@ashtoad3$;
 	sleep2 2000;
-	npctalk "Miriam: Huh... It wasn't a great monster, but it would have been dangerous for ordinary merchants.", .@miriam4$;
+	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;
-	cloakoffnpcself( .@maram4$ );
-	npctalk "Maram : " + strcharinfo(0) + ", are you okay?", .@maram4$;
+	npctalk "Maram : " + strcharinfo(0) + " Are you okay?", .@maram4$;
+	enablenpc .@maram4$;
 	sleep2 2000;
 	npctalk "Miriam: You're late! Maram!!!", .@miriam4$;
 	sleep2 2000;
-	npctalk "Maram: I was a little late because I met a monster on the way.", .@maram4$;
+	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: Really? Where on earth do monsters like this come from?", .@maram4$;
+	npctalk "Maram: Yeah? Where the hell do monsters spring up like this...", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: It's a big problem because it's getting harder to move supplies because of these monsters.", .@maram4$;
+	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: What if you travel by land?", .@tamarin4$;
+	npctalk "Tamarin: If you go to the ground?", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Tamarin: I heard there used to be a bridge across the canyon?", .@tamarin4$;
+	npctalk "Tamarin: I heard there used to be a bridge to cross a canyon?", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Tamarin: There are still remains left...", .@tamarin4$;
+	npctalk "Tamarin: Because there are still remains...", .@tamarin4$;
 	sleep2 2000;
-	npctalk "Maram: It is said that the bridge above was destroyed after seeing natives crossing it while fleeing an attack by hardliners.", .@maram4$;
+	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 area across the bridge has become uninhabitable due to volcanic ash, so they must have been trying to kill him.", .@maram4$;
+	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 build a bridge again...", .@maram4$;
+	npctalk "Maram: It's not difficult to make a bridge again...", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: Since we are in a hiding position, we can't build a bridge or something and advertise that we are hiding here.", .@maram4$;
+	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: Although it is dangerous and inconvenient now, we have no choice but to use the Maze of Oz.", .@maram4$;
+	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: Because it's in this condition, it may be that it hasn't been discovered until now.", .@maram4$;
+	npctalk "Maram: In this state, it may not have been noticed until now.", .@maram4$;
 	sleep2 2000;
-	npctalk "Miriam: If the Maze of Oz didn't exist...", .@miriam4$;
+	npctalk "Miriam: Without the Maze of Oz...", .@miriam4$;
 	sleep2 2000;
-	npctalk "Miriam: It must have been much harder than it is now.", .@miriam4$;
+	npctalk "Miriam: It must have been a lot harder than it is now.", .@miriam4$;
 	sleep2 2000;
-	npctalk "Maram: That's right.", .@maram4$;
+	npctalk "Maram: That's right", .@maram4$;
 	sleep2 2000;
-	npctalk "Maram: Now then, shall we walk down the lovely maze of Oz again?", .@maram4$;
+	npctalk "Maram: Now, shall we walk the lovely maze of Oz again?", .@maram4$;
 	sleep2 2000;
-	npctalk "Miriam: What do you mean...", .@miriam4$;
+	npctalk "Miriam: What do you mean", .@miriam4$;
 	sleep2 2000;
-	npctalk "Miriam : " + strcharinfo(0) + " , from now on, just keep going down until you reach a fork in the road.", .@miriam4$;
+	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 monsters didn't appear, but...", .@miriam4$;
+	npctalk "Miriam: It would be nice if the monsters didn't appear...", .@miriam4$;
 	sleep2 1000;
-	cloakonnpcself( .@maram4$ );
+	disablenpc .@maram4$;
 	setpcblock PCBLOCK_NPC, false;
+
 	disablenpc .@maggi4$;
 	disablenpc .@mark4$;
 	disablenpc .@tamarin4$;
@ -341,43 +366,43 @@ OnMobDead:
 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)	Maggi#ozmd4	4_4JOB_MAGGI
+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_cloaked_npc)	Maram#ozmd4	4_EP18_MARAM
+1@oz,162,275,3	duplicate(dummy_npc)	Maram#ozmd4	4_EP18_MARAM


 // Step 6
-1@oz,98,172,3	script(DISABLED)	Maram#ozmd5	EP18_NPC_MARAM,{
+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");

-	npctalk "Maram: It wasn't like this before, but as the ground below begins to melt, perhaps due to the effects of Mount Tor, more monsters are appearing.", .@maram$;
-	cloakoffnpcself( "Maggi#ozmd5" );
-	cloakoffnpcself( "Mark#ozmd5" );
-	cloakoffnpcself( "Tamarin#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 where the ground has melted a lot, there are many people who try to avoid monsters and end up seriously injured or unable to return due to the lava...", .@maram$;
+	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 endure...", .@maram$;
+	npctalk "Maram: How long will the maze of Oz last...";
 	sleep2 3000;
-	mapannounce 'map_name$, "??? : Ugh!!!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
+	mapannounce 'map_name$, "??? : ugh!!!!!!!!!!!!!!!!!!!", bc_map, 0x00B7EE,FW_NORMAL,16;
 	sleep2 2000;
-	npctalk "Maram: What is this voice?!?!?!?!?", .@maram$;
+	npctalk "Maram: This voice?!?!?!?!?";
 	sleep2 2000;
 	npctalk "Miriam: Imril!!!!", .@miriam$;
 	sleep2 2000;
 	setpcblock PCBLOCK_NPC, false;
-	npctalk "Maram: I think my friend is in trouble! I'll go first, so be careful and follow me!", .@maram$;
-	cloakonnpcself( "Maggi#ozmd5" );
-	cloakonnpcself( "Mark#ozmd5" );
-	cloakonnpcself( "Tamarin#ozmd5" );
+	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;
@ -388,33 +413,33 @@ OnMove:
 	end;
 }

-1@oz,97,167,3	script(DISABLED)	Miriam#ozmd5	EP18_NPC_MIRIAM,{
+1@oz,97,167,3	script	Miriam#ozmd5	EP18_NPC_MIRIAM,{
 	end;
 OnMove:
 	npcwalkto 67,164;
 	end;
 }

-1@oz,92,170,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd5	4_4JOB_MAGGI
-1@oz,91,169,3	duplicate(dummy_cloaked_npc)	Mark#ozmd5	4_EP18_MARK
-1@oz,89,170,5	duplicate(dummy_cloaked_npc)	Tamarin#ozmd5	4_EP18_TAMARIN
+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(DISABLED)	Maram#ozmd7	4_EP18_MARAM,{
+1@oz,68,165,3	script	Maram#ozmd7	4_EP18_MARAM,{
 	if ('event_oz != 6)
 		end;
 	'event_oz = 7;
-	npctalk "Maram: Imril are you okay?";
+	npctalk "Maram: Are you okay, Imril?";
 	donpcevent instance_npcname("Imril#ozmd6") + "::OnStart";
-	disablenpc();
+	disablenpc instance_npcname("Maram#ozmd7");
 	end;
 }


 // Step 8
-1@oz,61,163,5	script(DISABLED)	Imril#ozmd6	4_EP18_IMRIL,{
+1@oz,61,163,5	script	Imril#ozmd6	4_EP18_IMRIL,{
 	end;

 OnStart:
@ -435,57 +460,56 @@ OnMobDead:
 	.@maram8$ = instance_npcname("Maram#ozmd8");
 	.@imril6$ = instance_npcname("Imril#ozmd6");
 	.@miriam5$ = instance_npcname("Miriam#ozmd5");
-	.@maggi6$ = instance_npcname("Maggi#ozmd6");
+	.@maggi6$ = instance_npcname("Magi#ozmd6");
 	.@mark6$ = instance_npcname("Mark#ozmd6");
 	.@tamarin6$ = instance_npcname("Tamarin#ozmd6");

 	setpcblock PCBLOCK_NPC, true;
-
-	cloakoffnpcself( .@maram8$ );
-	npctalk "Imril: Thank you! I almost died!", .@imril6$;
+	enablenpc .@maram8$;
+	npctalk "Imril: Thanks! We almost died!", .@imril6$;
 	sleep2 2000;
-	npctalk "Imril: The atmosphere is unusual, so don't go downstairs.", .@imril6$;
+	npctalk "Imril: Don't go downstairs because the atmosphere isn't too bad.", .@imril6$;
 	sleep2 2000;
-	npctalk "Miriam: It seems like I see monsters more often than last time.", .@miriam5$;
+	npctalk "Miriam: You seem to see monsters more often than last time.", .@miriam5$;
 	sleep2 2000;
-	npctalk "Imril: And what about those people?", .@imril6$;
-	cloakoffnpcself( .@maggi6$ );
-	cloakoffnpcself( .@mark6$ );
-	cloakoffnpcself( .@tamarin6$ );
+	npctalk "Imril: But what about those people?", .@imril6$;
+	enablenpc .@maggi6$;
+	enablenpc .@mark6$;
+	enablenpc .@tamarin6$;
 	sleep2 2000;
-	npctalk "Maram: They are adventurers who sometimes help my mother with her work.", .@maram8$;
+	npctalk "Maram: They are adventurers who sometimes help with mother's work.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: These are trustworthy people, so don't be so wary.", .@maram8$;
+	npctalk "Maram: Trustworthy people, don't be so wary.", .@maram8$;
 	sleep2 2000;
-	npctalk "Imril: I heard you trust people too easily.", .@imril6$;
+	npctalk "Imril: Because you trust people too easily.", .@imril6$;
 	sleep2 2000;
 	npctalk "Miriam: Yes.", .@miriam5$;
 	sleep2 2000;
-	npctalk "Maram: Anyway, let's escape quickly before more monsters appear.", .@maram8$;
+	npctalk "Maram: Anyway, let's escape before more monsters come out.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: Not much left.", .@maram8$;
+	npctalk "Maram: Not long left.", .@maram8$;
 	sleep2 2000;
-	npctalk "Maram: It's hard to see, but you can follow the road up here and keep moving!", .@maram8$;
+	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$;
-	cloakonnpcself( .@maggi6$ );
-	cloakonnpcself( .@mark6$ );
-	cloakonnpcself( .@tamarin6$ );
-	cloakonnpcself( .@maram8$ );
+	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_cloaked_npc)	Maram#ozmd8	4_EP18_MARAM
-1@oz,61,168,3	duplicate(dummy_cloaked_npc)	Maggi#ozmd6	4_4JOB_MAGGI
-1@oz,65,167,3	duplicate(dummy_cloaked_npc)	Mark#ozmd6	4_EP18_MARK
-1@oz,59,171,3	duplicate(dummy_cloaked_npc)	Tamarin#ozmd6	4_EP18_TAMARIN
+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(DISABLED)	#oz_way	1_SHADOW_NPC,3,3,{
+1@oz,58,256,5	script	#oz_way	1_SHADOW_NPC,3,3,{
 	end;
 OnTouch:
 	if ('event_oz != 8)
@ -496,11 +520,11 @@ OnTouch:
 }

 // Step 10 (maybe not required ?)
-1@oz,44,255,5	script(DISABLED)	Maram#ozmd6	4_EP18_MARAM,{
+1@oz,44,255,5	script	Maram#ozmd6	4_EP18_MARAM,{
 	if ('event_oz != 9)
 		end;
 	'event_oz = 10;
-	npctalk "Maram: Go down this road.";
+	npctalk "Maram: This way!!!";
 	initnpctimer;
 	end;
 OnTimer2000:
@ -512,7 +536,7 @@ OnTimer2000:

 // Step 11
 // (Step 29 on the main quest).
-1@oz,21,189,5	script(DISABLED)	Maram#ozmd9	4_EP18_MARAM,{
+1@oz,21,189,5	script	Maram#ozmd9	4_EP18_MARAM,{
 	if ('event_oz != 10)
 		end;
 	'event_oz = 11;
@ -522,47 +546,50 @@ OnTimer2000:
 	.@imril7$ = instance_npcname("Imril#ozmd7");

 	setpcblock PCBLOCK_NPC, true;
-	npctalk "Maram: If you climb up the rope in front of here, you can go outside.", .@maram9$;
-	cloakoffnpcself( .@miriam7$ );
-	cloakoffnpcself( .@imril7$ );
+	npctalk "Maram: Climb up the rope in front of this to get out.", .@maram9$;
+	enablenpc .@miriam7$;
+	enablenpc .@imril7$;
 	sleep2 2000;
-	npctalk "Imril: I'll take some hidden items here, so go up first.", .@imril7$;
+	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 up quickly.", .@miriam7$;
-	if (ep18_main == 30) {
-		erasequest 11719;
-		setquest 11720;
-		ep18_main = 31;
+	npctalk "Miriam: Everyone is very tired. Let's go upstairs.", .@miriam7$;
+	if (ep18_1_main == 30) {
+		changequest 11719,11720;
+		ep18_1_main = 31;
 	}
-	cloakonnpcself( .@miriam7$ );
-	cloakonnpcself( .@imril7$ );
+	disablenpc .@miriam7$;
+	disablenpc .@imril7$;
 	setpcblock PCBLOCK_NPC, false;
 	end;

 OnInstanceInit:
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
+	disablenpc instance_npcname("Maram#ozmd9");
+	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11719) == 1" );
 	end;
 }

-1@oz,22,187,5	duplicate(dummy_cloaked_npc)	Miriam#ozmd7	4_EP18_MIRIAM
-1@oz,16,185,3	duplicate(dummy_cloaked_npc)	Imril#ozmd7	4_EP18_IMRIL
+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) {
-		mes "It can't be used yet. Let's talk to Maram first.";
-		close;
-	}
-	mes "I think I can climb up using the rope.";
-	next;
-	if (select( "Use the rope to climb up.", "Do not use." ) == 2)
+	if ('event_oz < 11)
 		end;
-	warp "gw_fild01",275,337;
+	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_QUEST2, QMARK_YELLOW, "isbegin_quest(11720) == 1" );
+	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(11720) == 1" );
 	end;
 }

@ -574,7 +601,7 @@ 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
-	cloakonnpcself();
+	disablenpc instance_npcname( strnpcinfo(0) );
 	end;
 }

@ -585,3 +612,4 @@ OnTouch_:
 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/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@ -163,7 +163,7 @@ glast_01,204,273,5	script	Hugin	4_M_SAGE_C,{
 1@gl_k,206,79,0	warp	#3Control2	2,2,1@gl_k,195,79
 1@gl_k,227,216,0	warp	#4Control	2,2,1@gl_k,215,216
 1@gl_k,222,216,0	warp	#4Control2	2,2,1@gl_k,233,216
-// 1@gl_k,150,284,0	warp	#2F Entrance	2,2,2@gl_k,150,46
+1@gl_k,150,284,0	warp	#2F Entrance	2,2,2@gl_k,150,46
 2@gl_k,149,32,0	warp	#1 Control	2,2,1@gl_k,150,270
 2@gl_k,145,123,0	warp	#22 Control	2,2,2@gl_k,126,123
 2@gl_k,136,122,0	warp	#22 Control2	2,2,2@gl_k,150,116
@ -188,8 +188,8 @@ glast_01,204,273,5	script	Hugin	4_M_SAGE_C,{
 		next;
 		if (select( "Omit moderately.", "Appreciate everything." ) == 1) {
 			cutin "GL_BARMUND1.bmp",2;
-			mes "[Varmundt]";
-			mes "I've seen you, " + strcharinfo(0) + ".";
+			mes "[Barmund]";
+			mes "Have I seen you " + strcharinfo(0) + "";
 			mes "I'm sure I can trust you. Let's leave right away.";
 			close2;
 			cutin "",255;
@ -1073,13 +1073,8 @@ OnTimer5000:
 	close3;
 }

+// note: never hidden
 1@gl_k,156,258,3	script	Varmundt#2	4_M_BARMUND,{
-	if ('step < 6)
-		end;
-	if (checkweight(6607,1, 6608,1) == 0) {
-		mes "^ff0000It seems like you have too many types or weights of items. Please organize your inventory.^000000";
-		close;
-	}
 	cutin "gl_barmund1",2;
 	mes "[Varmundt]";
 	if (checkquest(12318,HUNTING) != 2) {
@ -1221,24 +1216,10 @@ OnMyMobDead:
 		enablenpc instance_npcname("Varmundt#21");
 		donpcevent instance_npcname("#ghmemorialmob05") + "::OnStart";
 		disablenpc instance_npcname("#ghmemorialmob04");
-		'step = 6;
 	}
 	end;
 }

-1@gl_k,150,284,0	script	#2F Entrance	WARPNPC,2,2,{
-	end;
-OnTouch:
-	if (checkquest(12318,HUNTING) == 2) {
-		mes "^0000ffIt seems that you did not receive a reward for clearing the first floor. Talk to Varmundt and receive your reward.^000000";
-		close2;
-		warp 'map_name$[0],156,256;
-		end;
-	}
-	warp 'map_name$[1],150,46;
-	end;
-}
-
 // Floor 2
 //============================================================
 2@gl_k,148,67,1	script	Heinrich#21	4_M_HEINRICH,{
@ -1265,9 +1246,9 @@ OnEffect:
 2@gl_k,150,66,0	script	#Servanton	HIDDEN_WARP_NPC,7,7,{
 	end;
 OnTouch_:
-	if ('step != 6)
+	if ('step != 5)
 		end;
-	'step = 7;
+	'step = 6;
 	disablenpc();
 	if ('mode == 1)
 		donpcevent instance_npcname("#talkinstance5") + "::OnStart";
@ -1391,18 +1372,16 @@ OnTouch_:
 	disablenpc();
 	.@hidden_name$ = strnpcinfo(2);
 	.@event_type = atoi( charat(.@hidden_name$,4) );
-	.@event_number = atoi( charat(.@hidden_name$,6) );
 	if (.@event_type == 2)
-		.@event$ = instance_npcname("#ghmemorialmob05") + "::OnMyMobDead" + .@event_number;	// left side
+		.@label$ = instance_npcname("#ghmemorialmob05") + "::OnMyMobDead";
 	else
-		.@event$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead" + .@event_number;	// right side
-	killmonster 'map_name$[1], .@event$;
+		.@label$ = instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";
 	getmapxy .@map$,.@x,.@y, BL_NPC;
-	monster .@map$,.@x,.@y, "Corrupted Palace Guard", 2468,1, .@event$;
-	monster .@map$,.@x,.@y, "Archer of Death", 2469,1, .@event$;
-	monster .@map$,.@x,.@y, "Corrupted Abysmal Knight", 2470,1, .@event$;
-	monster .@map$,.@x,.@y, "Suffered Khalitzburg", 2471,1, .@event$;
-	monster .@map$,.@x,.@y, "Bloody Knight", 2472,1, .@event$;
+	monster .@map$,.@x,.@y, "Corrupted Palace Guard", 2468,1, .@label$;
+	monster .@map$,.@x,.@y, "Archer of Death", 2469,1, .@label$;
+	monster .@map$,.@x,.@y, "Corrupted Abysmal Knight", 2470,1, .@label$;
+	monster .@map$,.@x,.@y, "Suffered Khalitzburg", 2471,1, .@label$;
+	monster .@map$,.@x,.@y, "Bloody Knight", 2472,1, .@label$;
 	initnpctimer;
 	end;
 OnTimer30000:
@ -1438,13 +1417,7 @@ OnStart:
 		enablenpc instance_npcname("#ogh_2-" + .@i);
 	end;

-OnMyMobDead1:
-OnMyMobDead2:
-OnMyMobDead3:
-OnMyMobDead4:
-OnMyMobDead5:
-OnMyMobDead6:
-OnMyMobDead7:
+OnMyMobDead:
 	if (mobcount('map_name$[1], instance_npcname("#ghmemorialmob05") + "::OnBossDead") > 0)	// Prevent boss re-spawn
 		end;
 	if ('mode == 2)	// Higher (but unknown) spawn rate in fast mode
@ -1472,9 +1445,7 @@ OnBossDead:
 	for ( .@i = 1; .@i <= 7; .@i++ )
 		donpcevent instance_npcname("#ogh_2-" + .@i) + "::OnStop";

-	.@npc_name$ = instance_npcname("#ghmemorialmob05");
-	for ( .@i = 1; .@i <= 7; .@i++ )
-		killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead" + .@i;
+	killmonster 'map_name$[1], instance_npcname("#ghmemorialmob05") + "::OnMyMobDead";
 	end;
 }

@ -1535,13 +1506,6 @@ OnStart:
 	end;

 OnMyMobDead:
-OnMyMobDead1:
-OnMyMobDead2:
-OnMyMobDead3:
-OnMyMobDead4:
-OnMyMobDead5:
-OnMyMobDead6:
-OnMyMobDead7:
 	if (mobcount('map_name$[1], instance_npcname("#ghmemorialmob06") + "::OnBossDead") > 0)	// Prevent boss re-spawn
 		end;
 	if ('mode == 2)	// Higher (but unknown) spawn rate in fast mode
@ -1571,10 +1535,7 @@ OnBossDead:
 	for ( .@i = 1; .@i <= 7; .@i++ )
 		donpcevent instance_npcname("#ogh_3-" + .@i) + "::OnStop";

-	.@npc_name$ = instance_npcname("#ghmemorialmob06");
-	killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead";
-	for ( .@i = 1; .@i <= 7; .@i++ )
-		killmonster 'map_name$[1], .@npc_name$ + "::OnMyMobDead" + .@i;
+	killmonster 'map_name$[1], instance_npcname("#ghmemorialmob06") + "::OnMyMobDead";

 	// Hidden mobs
 	setarray .@coord[0],
@ -1591,9 +1552,9 @@ OnBossDead:
 2@gl_k,150,180,0	script	#Geron	HIDDEN_WARP_NPC,7,7,{
 	end;
 OnTouch_:
-	if ('step != 7)
+	if ('step != 6)
 		end;
-	'step = 8;
+	'step = 7;
 	disablenpc instance_npcname("#Geron");
 	mapannounce 'map_name$[1], "???: Do not come here! It's a trap... Kkkkah!!!", bc_map,0xFF7777,FW_NORMAL,15;
 	enablenpc instance_npcname("Himelmez#22");
@ -1613,19 +1574,15 @@ OnTouch_:
 	else if (.@i == 3) .@mobs = 5;
 	else if (.@i < 7) .@mobs = 6;
 	else .@mobs = 7;
-	.@event$ = instance_npcname( strnpcinfo(0) ) + "::OnMobDead";
-	killmonster 'map_name$[1], .@event$;
 	getmapxy .@map$,.@x,.@y, BL_NPC;
 	specialeffect EF_VENOMDUST;
-	monster .@map$,.@x,.@y,"Maggot",2467,.@mobs, .@event$;
+	monster .@map$,.@x,.@y,"Maggot",2467,.@mobs;
 	initnpctimer;
 	end;
 OnTimer45000:
 	enablenpc();
 	stopnpctimer;
 	end;
-OnMobDead:
-	end;
 }
 2@gl_k,145,236,4	duplicate(Decomposed body#1)	Decomposed body#2	4_M_DIEMAN,5,5
 2@gl_k,141,222,2	duplicate(Decomposed body#1)	Decomposed body#3	4_M_DIEMAN,5,5
@ -1689,9 +1646,9 @@ OnMobDead:
 	mes "That is amazing ~ you made it all the way here. May I say thank you?";
 	close3;
 OnTouch_:
-	if ('step != 8)
+	if ('step != 7)
 		end;
-	'step = 9;
+	'step = 8;
 	disablenpc();
 	if ('mode == 1)
 		donpcevent instance_npcname("#talkinstance7") + "::OnStart";
@ -2015,13 +1972,9 @@ OnTimer10000:


 2@gl_k,158,241,1	script	Hugin#21	4_M_SAGE_C,{
-	if ('step != 9)
+	if ('step != 8)
 		end;
 	if (checkquest(12319,HUNTING) == 2) {// note: complete hunting 'Corrupted Soul Hunt' prerequis
-		if (checkweight(6607,5, 6608,5) == 0) {
-			mes "^ff0000It seems like you have too many types or weights of items. Please organize your inventory.^000000";
-			close;
-		}
 		mes "[Hugin]";
 		mes "Hm, you are very well. First of all, let me give you some loot from Amdarais.";
 		erasequest 12319;
@ -2078,7 +2031,7 @@ OnTimer10000:
 // Treasure Room
 //============================================================
 1@gl_k,165,136,3	script	Strange crack#2	CLEAR_NPC,{
-	if ('step != 9)
+	if ('step != 8)
 		end;
 	if (isbegin_quest(12322) == 0) {// Space Distortion
 		mes "The crack looks suspicious but nothing more to check.";
--- a/npc/re/instances/SealedOs.txt
+++ b/npc/re/instances/SealedOs.txt
@ -263,6 +263,7 @@ OnTouch:
 1@os_b,137,139,0	duplicate(Thick Wire#171_os_0)	Thick Wire#171_os_2	4_ENERGY_BLUE

 1@os_b,122,212,5	script	Dien#171_os_3	4_F_DIENE,{
+OnTalk:
 	cutin "ep162_dn01",2;
 	mes "[Dien]";
 	mes "Oh!";
@ -280,14 +281,8 @@ OnTouch:
 	mes "It will take some time to break it~";
 	npctalk "Cotnes : Oh, is this gate too hard? It will take some time to break it.";
 	next;
-	cutin "ep162_dn01",2;
-	mes "[Dien]";
-	mes "Oh!";
-	mes "If you go to the right, I think you can go back on the railroad without having to break the door.";
-	npctalk "Dien : Oh! If you go to the right, I think you can go back on the railroad without having to break the door";
-	if (!'unlocked)
-		donpcevent instance_npcname("#171_sealedos_control") + "::OnEvent04";
-	close3;
+	doevent instance_npcname("Dien#171_os_3") + "::OnTalk";
+	close;
 }

 1@os_b,146,221,7	script	Ridsh#171_os_2	4_F_LEEDSH,{
--- a/npc/re/instances/ThorGunsuBase.txt
+++ b/npc/re/instances/ThorGunsuBase.txt
@ -2,56 +2,54 @@
 //= Instance: Thor Gunsu Base.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Part of the Episode 18 main quest.
+//- 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_main < 45 || ep18_main > 46)
+	if (ep18_1_main != 45 && ep18_1_main != 46)
 		end;
-	if (ep18_main == 45) {
+	if (ep18_1_main == 45) {
 		cutin "ep18_maram_01.png",2;
 		mes "[Maram]";
-		mes "You've arrived, adventurer!";
-		mes "Thank you for coming all the way here.";
+		mes "You have arrived, adventurer!";
+		mes "You did a great job getting here.";
 		next;
 		cutin "ep18_maram_03.png",2;
 		mes "[Maram]";
-		mes "It seems like this is the real deal after all. The security here is different from what it has been so far....";
-		mes "Let's be careful not to be caught by the guards and explore the inside.";
+		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 "Try to move away from the security guard's line of sight as much as possible.";
-		mes "If you get caught, you might be attacked, so if you can't break through, we'll meet again here.";
-		erasequest 16577;
-		setquest 16578;
-		ep18_main = 46;
+		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_main == 46) {
-		cutin "ep18_maram_01.png",2;
+	else if (ep18_1_main == 46) {
 		mes "[Maram]";
-		mes "Let's try to go in while avoiding the guard tower as much as possible.";
+		mes "Let's try to get in as far as possible from the guard tower.";
 		next;
 	}

-	.@md_name$ = "Thor Military Base";
+	.@md_name$ = "Thor Gunsu Base";
 	cutin "",255;
-	mes "^FF0000Caution : If you perform arbitrary processing within the dungeon, such as monster taming, it will not be considered normal progress.^000000";
+	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())
+	if (is_party_leader()) {
 		// player is leader of the party
-		.@create$ = "Apply for entry to " + .@md_name$ + "";
-
-	switch( select( .@create$, "Enter " + .@md_name$ + "" ) ) {
+		.@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" + .@md_name$ + " entry^000000";
+		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) + "";
@ -69,14 +67,14 @@ que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
 		case IE_NOINSTANCE:
 			cutin "ep18_maram_01.png",2;
 			mes "[Maram]";
-			mes "It seems like you haven't created the dungeon yet. Please check again in a moment.";
+			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, 0xFF99;
+			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;
 		}
@ -84,24 +82,34 @@ que_thr,133,53,5	script	Maram#Armybase1	4_EP18_MARAM,{
 	end;

 OnInit:
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16577) == 1" );
+	questinfo( QTYPE_QUEST, QMARK_YELLOW, "isbegin_quest(16577) == 1" );
 	end;
 }

-1@tcamp,106,237,3	script	Maram#Base1	4_EP18_MARAM,{
+1@tcamp,106,237,3	script	Maram#base1	4_EP18_MARAM,{
+	cutin "ep18_maram_01.png",2;
 	mes "[Maram]";
-	mes "Be careful and explore inside.";
-	mes "From what I heard from Dandelion earlier, there aren't many people, but there are watchtowers here and there that monitor a fairly wide area.";
+	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 watchtower, soldiers will appear, so be careful not to get caught.";
-	mes "Well, if you find anything, please contact me!";
-	close;
+	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:
-	'step = 0;
 	'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;
@ -120,11 +128,11 @@ OnInstanceInit:
 //-------------------------------------------------------------------
 // Traps
 //-------------------------------------------------------------------
-1@tcamp,120,228,3	script	Watchtower#Watch1	4_SYSTEM_BOX,7,7,{
+1@tcamp,120,228,3	script	Watch Tower#Watch1	4_SYSTEM_BOX,7,7,{
 	end;
 OnTouch:	// note: hidden player trigger the event
-	npctalk "Intruder detected !!";
-	mapannounce 'map_tcamp$, "Intruder found, intruder found. Ruled out immediately.", bc_map, 0xFF0000;
+	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
@ -139,338 +147,316 @@ OnInstanceInit:
 	end;
 }

-1@tcamp,135,228,3	duplicate(Watchtower#Watch1)	Watchtower#Watch2	4_SYSTEM_BOX,7,7
-1@tcamp,152,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch3	4_SYSTEM_BOX,7,7
-1@tcamp,167,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch4	4_SYSTEM_BOX,7,7
-1@tcamp,182,133,3	duplicate(Watchtower#Watch1)	Watchtower#Watch5	4_SYSTEM_BOX,7,7
-1@tcamp,161,96,3	duplicate(Watchtower#Watch1)	Watchtower#Watch6	4_SYSTEM_BOX,7,7
-1@tcamp,146,96,3	duplicate(Watchtower#Watch1)	Watchtower#Watch7	4_SYSTEM_BOX,7,7
-1@tcamp,116,102,3	duplicate(Watchtower#Watch1)	Watchtower#Watch8	4_SYSTEM_BOX,7,7
-1@tcamp,88,92,3	duplicate(Watchtower#Watch1)	Watchtower#Watch9	4_SYSTEM_BOX,7,7
-1@tcamp,240,148,3	duplicate(Watchtower#Watch1)	Watchtower#Watch10	4_SYSTEM_BOX,7,7
-1@tcamp,156,71,3	duplicate(Watchtower#Watch1)	Watchtower#Watch11	4_SYSTEM_BOX,7,7
-1@tcamp,176,194,3	duplicate(Watchtower#Watch1)	Watchtower#Watch12	4_SYSTEM_BOX,7,7
-1@tcamp,192,194,3	duplicate(Watchtower#Watch1)	Watchtower#Watch13	4_SYSTEM_BOX,7,7
-1@tcamp,142,153,3	duplicate(Watchtower#Watch1)	Watchtower#Watch14	4_SYSTEM_BOX,7,7
-1@tcamp,142,168,3	duplicate(Watchtower#Watch1)	Watchtower#Watch15	4_SYSTEM_BOX,7,7
-1@tcamp,192,179,3	duplicate(Watchtower#Watch1)	Watchtower#Watch16	4_SYSTEM_BOX,7,7
-1@tcamp,237,90,3	duplicate(Watchtower#Watch1)	Watchtower#Watch17	4_SYSTEM_BOX,7,7
+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 Device#1-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock Device1");
+1@tcamp,138,216,3	script	Lock#1-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock1");
 	enablenpc .@maram$;
-	npctalk "Maram: Please wait a moment. I know how to open it.", .@maram$;
+	npctalk "Maram: Wait a minute. I know how to open it.", .@maram$;
 	progressbar_npc "3131FF",10;
-	npctalk "Maram: Well, we can pass now!", .@maram$;
-	disablenpc instance_npcname("Lock Device#1-1");
-	disablenpc instance_npcname("Lock Device#1-2");
+	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 Device#1-1)	Lock Device#1-2	4_ROPEPILE
-1@tcamp,140,218,3	duplicate(dummy_disabled_npc)	Maram#Lock Device1	4_EP18_MARAM
+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 Device#2-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock Device2");
+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 Device#2-1");
-	disablenpc instance_npcname("Lock Device#2-2");
-	disablenpc instance_npcname("Lock Device#2-3");
-	disablenpc instance_npcname("Lock Device#2-4");
+	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 Device#2-1)	Lock Device#2-2	4_ROPEPILE
-1@tcamp,141,145,3	duplicate(Lock Device#2-1)	Lock Device#2-3	4_ROPEPILE
-1@tcamp,143,145,3	duplicate(Lock Device#2-1)	Lock Device#2-4	4_ROPEPILE
-1@tcamp,142,147,3	duplicate(dummy_disabled_npc)	Maram#Lock Device2	4_EP18_MARAM
+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 Device#3-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock Device3");
+1@tcamp,223,109,3	script	Lock#3-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock3");
 	enablenpc .@maram$;
-	npctalk "Maram: This building looks quite suspicious, right? There must be a surveillance system in here too.", .@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 this time, being careful not to get caught.", .@maram$;
-	disablenpc instance_npcname("Lock Device#3-1");
-	disablenpc instance_npcname("Lock Device#3-2");
+	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 Device#3-1)	Lock Device#3-2	4_ROPEPILE
-1@tcamp,226,114,3	duplicate(dummy_disabled_npc)	Maram#Lock Device3	4_EP18_MARAM
+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 Device#4-1	4_ROPEPILE,{
-	.@maram$ = instance_npcname("Maram#Lock Device4");
+1@tcamp,80,99,3	script	Lock#4-1	4_ROPEPILE,{
+	.@maram$ = instance_npcname("Maram#Lock4");
 	enablenpc .@maram$;
-	npctalk "Maram: Looks like we're in pretty deep. We should be able to safely find what we need.", .@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 good luck?", .@maram$;
-	disablenpc instance_npcname("Lock Device#4-1");
-	disablenpc instance_npcname("Lock Device#4-2");
-	disablenpc instance_npcname("Lock Device#4-3");
+	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("Pile of documents#Base1");
-	enablenpc instance_npcname("Pile of documents#Base2");
-	enablenpc instance_npcname("Pile of documents#Base3");
-	enablenpc instance_npcname("Pile of documents#Base4");
-	enablenpc instance_npcname("Pile of documents#Base5");
-	enablenpc instance_npcname("Miriam#Base1");
-	enablenpc instance_npcname("Maram#Base5");
-	if ('step == 0)
-		'step = 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 Device#4-1)	Lock Device#4-2	4_ROPEPILE
-1@tcamp,80,95,3	duplicate(Lock Device#4-1)	Lock Device#4-3	4_ROPEPILE
-1@tcamp,82,100,3	duplicate(dummy_disabled_npc)	Maram#Lock Device4	4_EP18_MARAM
+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(DISABLED)	Pile of documents#Base1	4_EP18_PAPERS,{
-	if ('step != 1)
-		end;
-	mes "[Pile of documents]";
-	mes "All kinds of documents are all mixed up.";
-	mes "I took out a few pages from the middle and found that they were weapons expiration dates and sales records.";
+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 documents]";
-	mes "Even the date is very recent. There is also a record of handing over a large amount of weapons to Mr. Dandelion.";
-	mes "It looks like I found what I was looking for. I put the documents in my arms.";
+	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();
+	cloakonnpcself( instance_npcname("Document Pile#Site1") );
 	end;
 }

-1@tcamp,49,123,3	script(DISABLED)	Pile of documents#Base2	4_EP18_PAPERS,{
-	if ('step != 1)
-		end;
-	mes "[Pile of documents]";
-	mes "All kinds of documents are all mixed up.";
-	mes "On the top page... is it a battle to decide the menu for lunch?";
+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 documents]";
-	mes "It looks like the menu has been set on fried fish covered in sauce....";
-	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
+	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();
+	cloakonnpcself( instance_npcname("Document Pile#Site2") );
 	end;
 }

-1@tcamp,29,86,3	script(DISABLED)	Pile of documents#Base3	4_EP18_PAPERS,{
-	if ('step != 1)
-		end;
-	mes "[Pile of documents]";
-	mes "All kinds of documents are all mixed up.";
-	mes "I took one out from the middle and saw... a map of the security guards at the military base?";
+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 documents]";
-	mes "Looking at the date, it's a long time ago document.";
-	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
+	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();
+	cloakonnpcself( instance_npcname("Document Pile#Site3") );
 	end;
 }

-1@tcamp,60,122,3	script(DISABLED)	Pile of documents#Base4	4_EP18_PAPERS,{
-	if ('step != 1)
-		end;
-	mes "[Pile of documents]";
-	mes "All kinds of documents are all mixed up.";
-	mes "The top chapter is... ¡®If you feed a magmaring a potato and then hunt it after a while, should it drop a baked potato?'";
+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 documents]";
-	mes "...Why is this here? But I'm curious about the results!";
-	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
+	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();
+	cloakonnpcself( instance_npcname("Document Pile#Site4") );
 	end;
 }

-1@tcamp,31,84,3	script(DISABLED)	Pile of documents#Base5	4_EP18_PAPERS,{
-	if ('step != 1)
-		end;
-	mes "[Pile of documents]";
-	mes "All kinds of documents are all mixed up.";
-	mes "When I pulled one out from the middle... I found an illustration of the Pope drawn with Pope cookie icing using a pen.";
+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 documents]";
-	mes "What kind of picture is this? And it's really well drawn....";
-	mes "It looks like he left behind only unimportant documents. Let's take care of them for now.";
+	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();
+	cloakonnpcself( instance_npcname("Document Pile#Site5") );
 	end;
 }


-1@tcamp,34,100,3	script(DISABLED)	Miriam#Base1	4_EP18_MIRIAM,3,3,{
-	if ('step == 1) {
-		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 my connections to find out the location.";
-			mes "It looks like you found the adventurer and Maram right away.";
-			next;
-			mes "[Miriam]";
-			mes "Please read these documents. They contain what we are looking for.";
-			mes "Rather than having me explain everything to you, I think it would be better for you to see it for yourself.";
-			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;
-		}
-		mes "[Miriam]";
-		mes ".......";
-		next;
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "No, Miriam! How are you here?";
-		mes "They said they would conduct a separate investigation!";
-		next;
-		cutin "ep18_miriam_01.png",2;
-		mes "[Miriam]";
-		mes "How did you and the adventurer dig this far?";
-		mes "As expected, your skills are good. I used all my connections to find out the location, but you found it right away.";
-		next;
-		cutin "ep18_maram_02.png",2;
-		mes "[Maram]";
-		mes "Let's do something about it, right, adventurer?";
-		mes "Anyway, what information did you get?";
-		next;
+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 "Look at this document here.";
-		next;
-		cutin "",255;
-		mes "[Mini Elly]";
-		mes "This document is a weapon sales record. Please show it to me.";
-		mes "All of the weapons and firearms that these people disposed of have less than a year left before their expiration date.";
-		next;
-		cutin "ep18_miriam_03.png",2;
-		mes "[Miriam]";
-		mes "You sell weapons like this so recklessly.";
-		mes "If a weapon is not properly maintained, it may not function properly.";
-		next;
-		cutin "ep18_maram_03.png",2;
-		mes "[Maram]";
-		mes "The quality of all weapons coming out of the back hole is the same.";
-		mes "...But I guess it's at this point in time.";
-		next;
-		mes "[Maram]";
-		mes "One year is not a long expiration date, but it is not too tight.";
-		mes "Why did it pour out at this moment when we were preparing for the protest?";
-		next;
-		mes "[Maram]";
-		mes "There wouldn't have been a need to dispose of it right away.";
-		next;
-		cutin "ep18_miriam_02.png",2;
-		mes "[Miriam]";
-		mes "This is one of the military bases managed by my adoptive father.";
-		mes "I was wondering if it would really pop out at a time like this.";
-		next;
-		cutin "",255;
-		select( "If it's your adoptive father, is it Priest Amal?", "That adoptive father who is a hardliner and pro-war?" );
-		cutin "ep18_miriam_02.png",2;
-		mes "[Miriam]";
-		mes "That's right, adventurer. When I looked at the ledger, it doesn't seem like my adoptive father was involved.";
-		mes "I think it's an isolated corruption at the lowest level, the weapons leak incident.";
+		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 "I'll have to dig a little deeper, but that's my guess for now.";
-		mes "Oh, please give me the documents. I'll take them as evidence.";
-		delitem 1000409,5;	// Ep18_Docu_File
-		if ('step == 1)
-			'step = 2;
-		if (isbegin_quest(16578) == 1) {
-			erasequest 16578;
-			setquest 16579;
-		}
-		close2;
-		cutin "",255;
-		npctalk "Maram: Ha, this is really fun.", instance_npcname("Maram#Base5");
-		end;
+		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 ('step == 2) {
-		cutin "ep18_miriam_02.png",2;
-		mes "[Miriam]";
-		mes "...Just a moment, I'm reading the document.";
+	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:
-	if (countitem(1000409) < 5)
-		npctalk "Miriam: Oh, adventurer? Maram, you too!?";
+	npctalk "Miriam: Oh, adventurer? Maram you too!?";
 	end;

 OnInstanceInit:
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16578) == 1 && countitem(1000409) > 4" );	// Ep18_Docu_File
+	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(DISABLED)	Maram#Base5	4_EP18_MARAM,{
-	if ('step == 1) {
+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 would be here. Right, adventurer?";
+		mes "I didn't know Miriam was here, right, adventurer?";
 		close3;
 	}
-	if ('step == 2) {
-		mes "[Maram]";
-		mes "They moved separately, but ended up in the same place.";
-		mes "Still, what I gained from the process was different, so I guess it has some meaning.";
-		next;
-		cutin "ep18_miriam_02.png",2;
-		mes "[Miriam]";
-		mes "Then I guess I'll have to leave for a while.";
-		mes "I'll have to relay what I found out to my adoptive father.";
-		next;
-		mes "[Miriam]";
-		mes "If it's an isolated corruption, there's a chance that even my adoptive father doesn't know about it yet.";
-		next;
-		cutin "ep18_maram_03.png",2;
-		mes "[Maram]";
-		mes "Is this really an isolated case of corruption? That is something that bothers me.";
-		mes "I also have something to deliver to Rachel, so Miriam, let's go together.";
-		next;
-		cutin "ep18_maram_01.png",2;
-		mes "[Maram]";
-		mes "I will tell you a shortcut to get out, so would you, adventurer, tell Suad what you found out here?";
-		mes "We will follow shortly, so please go and tell us first.";
-		if (ep18_main == 46) {
-			ep18_main = 47;
-			erasequest 16579;
-			setquest 16580;
-			getitem 1000405,50;	// Ep18_Amethyst_Fragment
-		}
-		close2;
-		warp "wolfvill",162,154;
-		end;
+	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;
 	}
-	// debug
+	close2;
 	warp "wolfvill",162,154;
 	end;

 OnInstanceInit:
-	questinfo( QTYPE_QUEST2, QMARK_YELLOW, "isbegin_quest(16579) == 1" );
+	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
@ -2,7 +2,7 @@
 //= Instance Villa of Deception.
 //===== Description: =========================================
 //- [Walkthrough conversion]
-//- Require to complete the Episode 18 main quest.
+//- 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'.
@ -16,14 +16,14 @@
 wolfvill,79,260,0	script	#con_wp11	HIDDEN_WARP_NPC,4,4,{
 	end;
 OnTouch:
-	if (ep18_main < 57)
+	if (ep18_1_main < 57)
 		end;
 	cloakoffnpcself( "Aira#con" );
 	end;
 }

 wolfvill,79,260,4	script(CLOAKED)	Aira#con	4_M_BRZ_JACI,{
-	if (ep18_main < 57)
+	if (ep18_1_main < 57)
 		end;
 	switch( checkquest(12522,PLAYTIME) ) {
 	case -1:
--- 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/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@ -836,7 +836,7 @@ job_ko,81,124,4	script	Kuuga Gai#ko	730,{
 			1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,
 			26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50;
 		for (set .@i,getarraysize(.@n)-1; .@i>0; set .@i,.@i-1) {
-			set .@rand, rand(0,.@i);
+			set .@rand, rand(.@i);
 			set .@tmp, .@n[.@i];
 			set .@n[.@i], .@n[.@rand];
 			set .@n[.@rand], .@tmp;
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@ -5218,7 +5218,7 @@ new_1-3,99,169,3	script	Friendly Poring#ac	4_PORING,{
 			next;
 			mes "[Poring]";
 			mes "It may fail, but keep trying to lure way those Little Porings!";
-			close3;
+			close;
 		}
 	} else if (isbegin_quest(2297) == 1) {
 		mes "[Poring]";
--- a/npc/re/kafras/kafras.txt
+++ b/npc/re/kafras/kafras.txt
@ -29,6 +29,15 @@
 //= 1.7 Added Rock Ridge Kafra. [Capuche]
 //============================================================ 

+// Brasilis
+//============================================================
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,3,0,80,700;
+	savepoint "brasilis",195,259,1,1;
+	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
+}
+
 // Dewata
 //============================================================
 dewata,202,184,6	script	Kafra Employee::kaf_dewata	4_F_KAFRA1,{
--- a/npc/re/mapflag/night.txt
+++ b/npc/re/mapflag/night.txt
@ -8,8 +8,10 @@
 //============================================================

 //============================================================
-// Episode 13.3
+// Episode 13
 //============================================================
+brasilis	mapflag	nightenabled
+bra_fild01	mapflag	nightenabled
 dicastes01	mapflag	nightenabled
 dicastes02	mapflag	nightenabled
 dic_fild01	mapflag	nightenabled
--- a/npc/re/mapflag/nobranch.txt
+++ b/npc/re/mapflag/nobranch.txt
@ -42,6 +42,12 @@ job3_war01	mapflag	nobranch
 job3_war02	mapflag	nobranch
 jupe_core2	mapflag	nobranch

+//============================================================
+// Brasilis
+//============================================================
+brasilis	mapflag	nobranch
+bra_in01	mapflag	nobranch
+
 //============================================================
 // Episode 13.3
 //============================================================
--- a/npc/re/mapflag/nomemo.txt
+++ b/npc/re/mapflag/nomemo.txt
@ -18,7 +18,7 @@
 paramk	mapflag	nomemo

 //============================================================
-// Episode 13.3
+// Episode 13
 //============================================================
 job3_arch01	mapflag	nomemo
 job3_arch02	mapflag	nomemo
@ -37,6 +37,9 @@ job3_gen01	mapflag	nomemo
 job3_sha01	mapflag	nomemo
 jupe_core2	mapflag	nomemo
 s_atelier	mapflag	nomemo
+bra_in01	mapflag	nomemo
+bra_dun01	mapflag	nomemo
+bra_dun02	mapflag	nomemo
 dicastes01	mapflag	nomemo
 dicastes02	mapflag	nomemo
 dic_in01	mapflag	nomemo
--- a/npc/re/mapflag/nopenalty.txt
+++ b/npc/re/mapflag/nopenalty.txt
@ -16,6 +16,8 @@ paramk	mapflag	nopenalty
 //============================================================
 // Municipality (Cities/Towns/Villages)
 //============================================================
+brasilis	mapflag	nopenalty
+bra_in01	mapflag	nopenalty
 dicastes01	mapflag	nopenalty
 dicastes02	mapflag	nopenalty
 dic_in01	mapflag	nopenalty
--- a/npc/re/mapflag/nopvp.txt
+++ b/npc/re/mapflag/nopvp.txt
@ -85,6 +85,8 @@ paramk	mapflag	pvp	off
 // Municipality (Cities/Towns/Villages)
 //============================================================
 moc_para01	mapflag	pvp	off
+brasilis	mapflag	pvp	off
+bra_in01	mapflag	pvp	off
 dicastes01	mapflag	pvp	off
 dicastes02	mapflag	pvp	off
 dic_in01	mapflag	pvp	off
--- a/npc/re/mapflag/noteleport.txt
+++ b/npc/re/mapflag/noteleport.txt
@ -26,9 +26,10 @@ paramk	mapflag	noteleport
 moc_para01	mapflag	noteleport

 //============================================================
-// Episode 13.3
+// Episode 13
 //============================================================
 s_atelier	mapflag	noteleport
+bra_in01	mapflag	noteleport
 dic_in01	mapflag	noteleport
 job3_gen01	mapflag	noteleport
 job3_sha01	mapflag	noteleport
--- a/npc/re/mapflag/reset.txt
+++ b/npc/re/mapflag/reset.txt
@ -7,6 +7,7 @@
 //= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================

+brasilis	mapflag	reset
 dewata	mapflag	reset
 dicastes01	mapflag	reset
 dicastes02	mapflag	reset
--- a/npc/re/mapflag/restricted.txt
+++ b/npc/re/mapflag/restricted.txt
@ -247,6 +247,7 @@ lhz_d_n2	mapflag	restricted	6
 //============================================================
 // Municipality (Cities/Towns/Villages)
 //============================================================
+brasilis	mapflag	restricted	7
 dewata	mapflag	restricted	7
 dicastes01	mapflag	restricted	7
 eclage	mapflag	restricted	7
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lemongrass3110	726f7ac07b	Fixed different signedness	2024-06-13 01:40:23 +02:00
Lemongrass3110	15c6201d99	Removed accidentally committed test script	2024-06-13 01:33:18 +02:00
Lemongrass3110	e815efb565	Merge branch 'master' into feature/array_sort # Conflicts: # src/map/script.cpp	2024-06-13 01:30:52 +02:00
Lemongrass3110	22debbe86b	Merge branch 'master' into feature/array_sort # Conflicts: # doc/script_commands.txt # src/map/script.cpp	2018-06-14 22:14:23 +02:00
Lemongrass3110	0bf92ab14f	Merge branch 'master' into feature/array_sort	2018-02-02 17:31:05 +01:00
Jittapan Pluemsumran	9231262787	Added support for string array sorting	2018-01-11 00:06:51 +07:00
Jittapan Pluemsumran	12d5d99a4d	Implemented array sorting utility script command	2018-01-10 23:13:41 +07:00