It kinda works!

Added some Windows fixes, Added MAXXCON option to CMake

.github/workflows/analysis_codeql.yml

@@ -18,6 +18,8 @@ on:
       # This workflow should run when a file in a source directory has been modified.
       - 'src/**'
       - '3rdparty/**'
+      # This workflow should run whenever a CMake related file has been modified
+      - '**/CMakeLists.txt'
 
 jobs:
   analyze:
@@ -31,8 +33,6 @@ jobs:
           # The ubuntu-latest label currently points to ubuntu-20.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
-          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['10']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE','RE']
 
@@ -64,10 +64,10 @@ jobs:
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
-        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
+        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md
         run: |
           sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+          sudo apt install zlib1g-dev libpcre3-dev
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
@@ -77,16 +77,16 @@ jobs:
       # ?? If the Autobuild fails above, remove it and uncomment the following
       #    three lines and modify them (or add more) to build your code if your
       #    project uses a compiled language
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
+      - name: Create build directory
+        run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Command - make clean
-        run: make clean
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake .. -DENABLE_PRERENEWAL=${{env.PRERE}} -DENABLE_EXTRA_BUILDBOT_CODE=ON
 
-      - name: Command - make server
-        run: make server
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . -j2 --target server
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/build_servers_clang.yml

@@ -1,54 +0,0 @@
-name: Build servers with Clang
-# build_servers_clang.yml
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      # Always trigger all Github Actions if an action or something CI related was changed
-      - '.github/workflows/**'
-      - 'tools/ci/**'
-      # This workflow should run when a file in a source directory has been modified.
-      - 'src/**'
-      - '3rdparty/**'
-
-jobs:
-  build:
-    # Github Actions checks for '[ci skip]', '[skip ci]', '[no ci]', '[skip actions]', or '[actions skip]' but not a hyphenated version.
-    # It's a catch-all incase a Pull Request has been opened and someone is on auto-pilot.
-    if: "!contains(github.event.head_commit.message, 'ci-skip')"
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
-          os: [ubuntu-20.04]
-          # Version list can be found on https://github.com/marketplace/actions/install-clang
-          clang: ['6.0', '7', '8', '9', '10', '11'] #, '12', '13']
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Clang
-        uses: egor-tensin/setup-clang@v1
-        with:
-          version: ${{ matrix.clang }}
-          platform: x64
-
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=clang-${{ matrix.clang }} CXX=clang++-${{ matrix.clang }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
-
-      - name: Command - make clean
-        run: make clean
-
-      - name: Command - make all
-        run: make all

.github/workflows/build_servers_gcc.yml

@@ -1,61 +0,0 @@
-name: Build servers with GCC
-# build_servers_gcc.yml
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      # Always trigger all Github Actions if an action or something CI related was changed
-      - '.github/workflows/**'
-      - 'tools/ci/**'
-      # This workflow should run when a file in a source directory has been modified.
-      - 'src/**'
-      - '3rdparty/**'
-
-jobs:
-  build:
-    # Github Actions checks for '[ci skip]', '[skip ci]', '[no ci]', '[skip actions]', or '[actions skip]' but not a hyphenated version.
-    # It's a catch-all incase a Pull Request has been opened and someone is on auto-pilot.
-    if: "!contains(github.event.head_commit.message, 'ci-skip')"
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
-          os: [ubuntu-latest]
-          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['9', '10', '11', '12']
-          # GCC 13 was removed from 22.04, include it as a separate job
-          include:
-            - os: ubuntu-24.04
-              gcc: 13
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Update & Install packages
-        # Ubuntu runners already have most of the packages rAthena requires to build.
-        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
-        run: |
-          sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
-
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }}'
-        # -Werror: to treat all warnings as errors
-        # -Wno-error=builtin-declaration-mismatch: otherwise ./configure checks fail
-        run: ./configure $CONFIGURE_FLAGS --enable-buildbot=yes CXXFLAGS='-Werror -Wno-error=builtin-declaration-mismatch'
-      
-      - name: Command - make clean
-        run: make clean
-
-      - name: Command - make all
-        run: make all

.github/workflows/build_servers_modes.yml

@@ -18,6 +18,8 @@ on:
       # This workflow should run when a file in a source directory has been modified.
       - 'src/**'
       - '3rdparty/**'
+      # This workflow should run whenever a CMake related file has been modified
+      - '**/CMakeLists.txt'
 
 jobs:
   build:
@@ -30,8 +32,6 @@ jobs:
           # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
-          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE','RE']
 
@@ -42,18 +42,18 @@ jobs:
       - name: Variable Parsing - PRE
         if: ${{ matrix.mode == 'PRE' }} 
         run: |
-          echo "PRERE=yes" >> $GITHUB_ENV
+          echo "PRERE=ON" >> $GITHUB_ENV
       - name: Variable Parsing - RE
         if: ${{ matrix.mode == 'RE' }} 
         run: |
-          echo "PRERE=no" >> $GITHUB_ENV
+          echo "PRERE=OFF" >> $GITHUB_ENV
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
-        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
+        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md
         run: |
           sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+          sudo apt install zlib1g-dev libpcre3-dev
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
@@ -61,16 +61,16 @@ jobs:
       - name: Setup Database and import table data
         run: ./tools/ci/sql.sh
 
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
+      - name: Create build directory
+        run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Command - make clean
-        run: make clean
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake .. -DENABLE_PRERENEWAL=${{env.PRERE}} -DENABLE_EXTRA_BUILDBOT_CODE=ON
 
-      - name: Command - make server
-        run: make server
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . -j2 --target server
 
       - name: Run Once - login-server
         run: ./login-server --run-once

.github/workflows/build_servers_msbuild.yml

@@ -1,48 +0,0 @@
-name: Build servers with MSVS
-# build_servers_msbuild.yml
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      # Always trigger all Github Actions if an action or something CI related was changed
-      - '.github/workflows/**'
-      - 'tools/ci/**'
-      # This workflow should run when a file in a source directory has been modified.
-      - 'src/**'
-      - '3rdparty/**'
-
-jobs:
-  build:
-    # Github Actions checks for '[ci skip]', '[skip ci]', '[no ci]', '[skip actions]', or '[actions skip]' but not a hyphenated version.
-    # It's a catch-all incase a Pull Request has been opened and someone is on auto-pilot.
-    if: "!contains(github.event.head_commit.message, 'ci-skip')"
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-          # The windows-latest label currently points to windows-2019.
-          # Available: windows-2016, windows-2019 and windows-2022
-          os: [windows-latest]
-          # We run build checks for both Renewal and PRE-Renewal
-          mode: ['PRE', 'RE']
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
-
-      - name: Build solution in Debug
-        if: ${{ matrix.mode == 'PRE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT%3BPRERE" /warnaserror
-
-      - name: Build solution in Debug
-        if: ${{ matrix.mode == 'RE' }}
-        run: msbuild rAthena.sln -t:rebuild -property:Configuration=Debug /p:DefineConstants="BUILDBOT" /warnaserror

.github/workflows/build_servers_packetversions.yml

@@ -18,6 +18,8 @@ on:
       # This workflow should run when a file in a source directory has been modified.
       - 'src/**'
       - '3rdparty/**'
+      # This workflow should run whenever a CMake related file has been modified
+      - '**/CMakeLists.txt'
 
 jobs:
   build:
@@ -30,8 +32,6 @@ jobs:
           # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
-          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE','RE']
           # Check build success for different packet-versions
@@ -44,18 +44,18 @@ jobs:
       - name: Variable Parsing - PRE
         if: ${{ matrix.mode == 'PRE' }} 
         run: |
-          echo "PRERE=yes" >> $GITHUB_ENV
+          echo "PRERE=ON" >> $GITHUB_ENV
       - name: Variable Parsing - RE
         if: ${{ matrix.mode == 'RE' }} 
         run: |
-          echo "PRERE=no" >> $GITHUB_ENV
+          echo "PRERE=OFF" >> $GITHUB_ENV
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
         # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
         run: |
           sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+          sudo apt install zlib1g-dev libpcre3-dev
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
@@ -63,13 +63,13 @@ jobs:
       - name: Setup Database and import table data
         run: ./tools/ci/sql.sh
 
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-packetver=${{ matrix.packetver }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
+      - name: Create build directory
+        run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Command - make clean
-        run: make clean
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake .. -DENABLE_PRERENEWAL=${{env.PRERE}} -DPACKETVER=${{matrix.packetver}} -DENABLE_EXTRA_BUILDBOT_CODE=ON
 
-      - name: Command - make all
-        run: make all
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . -j2

.github/workflows/build_servers_vip.yml

@@ -18,6 +18,8 @@ on:
       # This workflow should run when a file in a source directory has been modified.
       - 'src/**'
       - '3rdparty/**'
+      # This workflow should run whenever a CMake related file has been modified
+      - '**/CMakeLists.txt'
 
 jobs:
   build:
@@ -30,8 +32,6 @@ jobs:
           # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
-          # Older versions of GCC are not available via unaltered aptitude repo lists.
-          gcc: ['11']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE', 'RE']
 
@@ -42,18 +42,18 @@ jobs:
       - name: Variable Parsing - PRE
         if: ${{ matrix.mode == 'PRE' }} 
         run: |
-          echo "PRERE=yes" >> $GITHUB_ENV
+          echo "PRERE=ON" >> $GITHUB_ENV
       - name: Variable Parsing - RE
         if: ${{ matrix.mode == 'RE' }} 
         run: |
-          echo "PRERE=no" >> $GITHUB_ENV
+          echo "PRERE=OFF" >> $GITHUB_ENV
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
         # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
         run: |
           sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+          sudo apt install zlib1g-dev libpcre3-dev
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
@@ -61,16 +61,16 @@ jobs:
       - name: Setup Database and import table data
         run: ./tools/ci/sql.sh
 
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-buildbot=yes --enable-vip=yes'
-        run: ./configure $CONFIGURE_FLAGS
-      
-      - name: Command - make clean
-        run: make clean
+      - name: Create build directory
+        run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Command - make server
-        run: make server
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake .. -DENABLE_PRERENEWAL=${{env.PRERE}} -DENABLE_EXTRA_BUILDBOT_CODE=ON -DENABLE_VIP=ON
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . -j2 --target server
 
       - name: Run Once - login-server
         run: ./login-server --run-once

.github/workflows/build_servers_windows.yml

@@ -1,5 +1,5 @@
-name: Build servers with CMake
-# build_servers_cmake.yml
+name: Build servers on Windows
+# build_servers_windows.yml
 
 concurrency:
   group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }}
@@ -29,25 +29,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-          # The ubuntu-latest label currently points to ubuntu-22.04.
-          # Available: ubuntu-22.04, ubuntu-20.04
-          os: [ubuntu-latest]
+          os: [windows-latest]
 
     steps:
       - uses: actions/checkout@v4
 
-      # Install latest CMake.
-      - uses: lukka/get-cmake@latest
-
       - name: Create build directory
-        run: mkdir cbuild
+        run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Create Unix Makefiles
-        run: |
-          cd cbuild
-          cmake -G "Unix Makefiles" ..
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake ..
 
-      - name: Command - make
-        run: |
-          cd cbuild
-          make
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        # Execute the build.  You can specify a specific target with "--target <NAME>"
+        run: cmake --build . -j2 --target server tools

.github/workflows/npc_db_validation.yml

@@ -21,6 +21,8 @@ on:
       # This workflow should run when a file in either the db/ or npc/ directory has been modified.
       - 'db/**'
       - 'npc/**'
+      # This workflow should run whenever a CMake related file has been modified
+      - '**/CMakeLists.txt'
 
 jobs:
   build:
@@ -33,8 +35,6 @@ jobs:
           # The ubuntu-latest label currently points to ubuntu-22.04.
           # Available: ubuntu-22.04, ubuntu-20.04
           os: [ubuntu-latest]
-          # Only a single version of GCC is required for validating NPC scripts and database changes.
-          gcc: ['11']
           # We run build checks for both Renewal and PRE-Renewal
           mode: ['PRE', 'RE']
 
@@ -43,45 +43,41 @@ jobs:
       
       # A simple 'yes' and 'no' can be confusing, so we use names to display in the current job then convert them for use in the compiler.
       - name: Variable Parsing - PRE
-        if: ${{ matrix.mode == 'PRE' }} 
+        if: ${{ matrix.mode == 'PRE' }}
         run: |
-          echo "PRERE=yes" >> $GITHUB_ENV
+          echo "PRERE=ON" >> $GITHUB_ENV
       - name: Variable Parsing - RE
-        if: ${{ matrix.mode == 'RE' }} 
+        if: ${{ matrix.mode == 'RE' }}
         run: |
-          echo "PRERE=no" >> $GITHUB_ENV
+          echo "PRERE=OFF" >> $GITHUB_ENV
 
       - name: Update & Install packages
         # Ubuntu runners already have most of the packages rAthena requires to build.
-        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
+        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2204-Readme.md
         run: |
           sudo apt update
-          sudo apt install zlib1g-dev libpcre3-dev gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
+          sudo apt install zlib1g-dev libpcre3-dev
           
       - name: Start MySQL
         run: sudo systemctl start mysql.service
 
       - name: Setup Database and import table data
         run: ./tools/ci/sql.sh
-          
-      - name: Command - configure
-        env:
-            CONFIGURE_FLAGS: 'CC=gcc-${{ matrix.gcc }} CXX=g++-${{ matrix.gcc }} --enable-prere=${{ env.PRERE }} --enable-buildbot=yes'
-        run: ./configure $CONFIGURE_FLAGS
-      
+
+      - name: Create build directory
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake .. -DENABLE_PRERENEWAL=${{env.PRERE}} -DENABLE_EXTRA_BUILDBOT_CODE=ON
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . -j2 --target map-server
+
       # npc.sh enables all NPC scripts in the custom and test folders.
       - name: Enable All NPCs for Testing
         run: ./tools/ci/npc.sh
 
-      - name: Command - make clean
-        run: make clean
-
-      # Create import directories
-      - name: Command - make import
-        run: make import
-
-      - name: Command - make map
-        run: make map
-
       - name: Run Once - map-server
         run: ./map-server --run-once

.gitignore

@@ -139,6 +139,12 @@ Thumbs.db
 /yamlupgrade.bat
 /navigenerator.bat
 
+# Linux script tools
+/athena-start.sh
+# /function.sh
+# /install.sh
+# /uninstall.sh
+
 # dlls
 /libmysql.dll
 /pcre8.dll

3rdparty/httplib/CMakeLists.txt

@@ -1,38 +1,18 @@
-cmake_minimum_required(VERSION 2.8)
+add_library(httplib STATIC)
 
-if ( NOT ENABLE_WEB_SERVER )
-    return()
-endif( NOT ENABLE_WEB_SERVER )
+target_sources(httplib PRIVATE "httplib.cc")
 
-SET (this_target httplib)
-PROJECT(${this_target})
+target_include_directories(httplib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-find_path ( HTTPLIB_INCLUDE_DIRS "httplib.h"
-    PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-    NO_DEFAULT_PATH )
-
-find_path ( HTTPLIB_SOURCE_DIR "httplib.cc"
-    PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-    NO_DEFAULT_PATH )
-
-mark_as_advanced( HTTPLIB_INCLUDE_DIRS )
-mark_as_advanced( HTTPLIB_SOURCE_DIR )
-
-set ( HTTPLIB_HEADERS
-    "${HTTPLIB_INCLUDE_DIRS}/httplib.h"
-    CACHE INTERNAL "httplib headers" )
-
-set ( HTTPLIB_SOURCES
-    "${HTTPLIB_SOURCE_DIR}/httplib.cc"
-    CACHE INTERNAL "httplib sources" )
-
-set ( HTTPLIB_DEFINITIONS
-    "-std=c++11"
-    CACHE INTERNAL "http definitions" )
-include_directories( ${HTTPLIB_INCLUDE_DIRS} ${HTTPLIB_SOURCE_DIR} )
-
-ADD_LIBRARY( ${this_target} STATIC ${HTTPLIB_SOURCES} )
-
-if (NOT WIN32)
-    target_compile_definitions(${this_target} PUBLIC "CPPHTTPLIB_SEND_FLAGS=MSG_NOSIGNAL")
+if(NOT WIN32)
+    target_compile_definitions(httplib PUBLIC "CPPHTTPLIB_SEND_FLAGS=MSG_NOSIGNAL")
+endif()
+
+if(WIN32)
+    target_sources(httplib PRIVATE "httplib.h")
+    set_target_properties(httplib PROPERTIES FOLDER "3rdparty")
+endif()
+
+if(NOT ENABLE_WEB_SERVER)
+    set_target_properties(httplib PROPERTIES EXCLUDE_FROM_ALL TRUE)
 endif()

3rdparty/json/CMakeLists.txt

@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 2.8)
+add_library(json INTERFACE)
 
-set (JSON_INCLUDE_DIRS
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    CACHE INTERNAL "json include dir" )
-
-mark_as_advanced( JSON_INCLUDE_DIRS )
+target_include_directories(json INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")

3rdparty/libconfig/CMakeLists.txt

@@ -1,29 +1,27 @@
 
-find_path( LIBCONFIG_INCLUDE_DIRS "libconfig.h"
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-	NO_DEFAULT_PATH )
-find_path( LIBCONFIG_SOURCE_DIR "libconfig.c"
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
-	NO_DEFAULT_PATH )
-mark_as_advanced( LIBCONFIG_INCLUDE_DIRS )
-mark_as_advanced( LIBCONFIG_SOURCE_DIR )
+add_library(libconfig STATIC)
 
-set( LIBCONFIG_HEADERS
-	"${CMAKE_CURRENT_SOURCE_DIR}/grammar.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/libconfig.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/parsectx.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/scanctx.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/scanner.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/strbuf.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/wincompat.h"
-	CACHE INTERNAL "libconfig headers" )
-set( LIBCONFIG_SOURCES
-	"${CMAKE_CURRENT_SOURCE_DIR}/grammar.c"
-	"${CMAKE_CURRENT_SOURCE_DIR}/libconfig.c"
-	"${CMAKE_CURRENT_SOURCE_DIR}/scanctx.c"
-	"${CMAKE_CURRENT_SOURCE_DIR}/scanner.c"
-	"${CMAKE_CURRENT_SOURCE_DIR}/strbuf.c"
-	CACHE INTERNAL "libconfig sources" )
-set( LIBCONFIG_DEFINITIONS
-	"-DLIBCONFIG_STATIC"
-	CACHE INTERNAL "libconfig definitions" )
+target_sources(libconfig PRIVATE
+	"grammar.c"
+	"libconfig.c"
+	"scanctx.c"
+	"scanner.c"
+	"strbuf.c"
+)
+
+target_include_directories(libconfig PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
+target_compile_definitions(libconfig PUBLIC "-DLIBCONFIG_STATIC")
+
+if(WIN32)
+	target_sources(libconfig PRIVATE
+		"grammar.h"
+		"libconfig.h"
+		"parsectx.h"
+		"scanctx.h"
+		"scanner.h"
+		"strbuf.h"
+		"wincompat.h"
+	)
+	set_target_properties(libconfig PROPERTIES FOLDER "3rdparty")
+endif()

3rdparty/rapidyaml/CMakeLists.txt

@@ -95,6 +95,7 @@ endif()
 
 c4_add_dev_targets()
 
-add_custom_target(ryml-uninstall
-    "${CMAKE_COMMAND}" -P "${PROJECT_SOURCE_DIR}/cmake/uninstall.cmake"
-)
+# rathena
+if(WIN32)
+    set_target_properties(ryml PROPERTIES FOLDER "3rdparty")
+endif()

3rdparty/rapidyaml/ext/c4core/CMakeLists.txt

@@ -78,13 +78,6 @@ endif()
 set(C4CORE_AMALGAMATED ${C4CORE_SRC_DIR}/../src_singleheader/c4/c4core_all.hpp)
 list(TRANSFORM C4CORE_SRC_FILES PREPEND "${C4CORE_SRC_DIR}/" OUTPUT_VARIABLE C4CORE_SRC_FILES_FULL)
 
-add_custom_target(c4core-amalgamate
-    python ${CMAKE_CURRENT_LIST_DIR}/tools/amalgamate.py ${C4CORE_AMALGAMATED}
-    COMMENT "${CMAKE_CURRENT_LIST_DIR}/tools/amalgamate.py ${C4CORE_AMALGAMATED}"
-    BYPRODUCTS ${C4CORE_AMALGAMATED}
-    DEPENDS ${C4CORE_SRC_FILES_FULL}
-    )
-
 c4_add_library(c4core
     INC_DIRS
        $<BUILD_INTERFACE:${C4CORE_SRC_DIR}> $<INSTALL_INTERFACE:include>
@@ -105,3 +98,8 @@ c4_install_exports()
 c4_add_dev_targets()
 
 c4_pack_project(TYPE LIBRARY)
+
+# rathena
+if(WIN32)
+    set_target_properties(c4core PROPERTIES FOLDER "3rdparty")
+endif()

3rdparty/yaml-cpp/CMakeLists.txt

@@ -1,87 +1,78 @@
-cmake_minimum_required(VERSION 2.8)
+set(YAML_HEADERS
+	"yaml.h"
+	"traits.h"
+	"stlemitter.h"
+	"parser.h"
+	"ostream_wrapper.h"
+	"null.h"
+	"noncopyable.h"
+	"noexcept.h"
+	"mark.h"
+	"exceptions.h"
+	"eventhandler.h"
+	"emitterstyle.h"
+	"emittermanip.h"
+	"emitter.h"
+	"emitterdef.h"
+	"emitfromevents.h"
+	"dll.h"
+	"depthguard.h"
+	"binary.h"
+	"anchor.h"
+	"node/type.h"
+	"node/ptr.h"
+	"node/parse.h"
+	"node/node.h"
+	"node/iterator.h"
+	"node/impl.h"
+	"node/emit.h"
+	"node/convert.h"
+	"contrib/graphbuilder.h"
+	"contrib/anchordict.h"
+)
+list(TRANSFORM YAML_HEADERS PREPEND "include/yaml-cpp/")
 
-## start setting
-SET (this_target yaml-cpp)
-PROJECT(${this_target})
+set(YAML_SOURCES
+	"binary.cpp"
+	"convert.cpp"
+	"depthguard.cpp"
+	"directives.cpp"
+	"emit.cpp"
+	"emitfromevents.cpp"
+	"emitter.cpp"
+	"emitterstate.cpp"
+	"emitterutils.cpp"
+	"exceptions.cpp"
+	"exp.cpp"
+	"memory.cpp"
+	"nodebuilder.cpp"
+	"node.cpp"
+	"node_data.cpp"
+	"nodeevents.cpp"
+	"null.cpp"
+	"ostream_wrapper.cpp"
+	"parse.cpp"
+	"parser.cpp"
+	"regex_yaml.cpp"
+	"scanner.cpp"
+	"scanscalar.cpp"
+	"scantag.cpp"
+	"scantoken.cpp"
+	"simplekey.cpp"
+	"singledocparser.cpp"
+	"stream.cpp"
+	"tag.cpp"
+	"contrib/graphbuilderadapter.cpp"
+	"contrib/graphbuilder.cpp"
+)
+list(TRANSFORM YAML_SOURCES PREPEND "src/")
 
-find_path( YAML_INCLUDE_DIRS "yaml-cpp/yaml.h"
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/include"
-	NO_DEFAULT_PATH )
-find_path( YAML_SOURCE_DIR "regex_yaml.cpp"
-	PATHS "${CMAKE_CURRENT_SOURCE_DIR}/src"
-	NO_DEFAULT_PATH )
-mark_as_advanced( YAML_INCLUDE_DIRS )
-mark_as_advanced( YAML_SOURCE_DIR )
+add_library(yaml-cpp STATIC EXCLUDE_FROM_ALL ${YAML_SOURCES})
 
-set( YAML_HEADERS
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/yaml.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/traits.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/stlemitter.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/parser.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/ostream_wrapper.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/null.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/noncopyable.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/noexcept.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/mark.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/exceptions.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/eventhandler.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/emitterstyle.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/emittermanip.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/emitter.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/emitterdef.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/emitfromevents.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/dll.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/depthguard.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/binary.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/anchor.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/type.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/ptr.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/parse.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/node.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/iterator.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/impl.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/emit.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/node/convert.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/contrib/graphbuilder.h"
-    "${YAML_INCLUDE_DIRS}/yaml-cpp/contrib/anchordict.h"
-    CACHE INTERNAL "yaml headers" )
-set( YAML_SOURCES
-	"${YAML_SOURCE_DIR}/binary.cpp"
-  "${YAML_SOURCE_DIR}/convert.cpp"
-  "${YAML_SOURCE_DIR}/depthguard.cpp"
-  "${YAML_SOURCE_DIR}/directives.cpp"
-  "${YAML_SOURCE_DIR}/emit.cpp"
-  "${YAML_SOURCE_DIR}/emitfromevents.cpp"
-  "${YAML_SOURCE_DIR}/emitter.cpp"
-  "${YAML_SOURCE_DIR}/emitterstate.cpp"
-  "${YAML_SOURCE_DIR}/emitterutils.cpp"
-  "${YAML_SOURCE_DIR}/exceptions.cpp"
-  "${YAML_SOURCE_DIR}/exp.cpp"
-  "${YAML_SOURCE_DIR}/memory.cpp"
-  "${YAML_SOURCE_DIR}/nodebuilder.cpp"
-  "${YAML_SOURCE_DIR}/node.cpp"
-  "${YAML_SOURCE_DIR}/node_data.cpp"
-  "${YAML_SOURCE_DIR}/nodeevents.cpp"
-  "${YAML_SOURCE_DIR}/null.cpp"
-  "${YAML_SOURCE_DIR}/ostream_wrapper.cpp"
-  "${YAML_SOURCE_DIR}/parse.cpp"
-  "${YAML_SOURCE_DIR}/parser.cpp"
-  "${YAML_SOURCE_DIR}/regex_yaml.cpp"
-  "${YAML_SOURCE_DIR}/scanner.cpp"
-  "${YAML_SOURCE_DIR}/scanscalar.cpp"
-  "${YAML_SOURCE_DIR}/scantag.cpp"
-  "${YAML_SOURCE_DIR}/scantoken.cpp"
-  "${YAML_SOURCE_DIR}/simplekey.cpp"
-  "${YAML_SOURCE_DIR}/singledocparser.cpp"
-  "${YAML_SOURCE_DIR}/stream.cpp"
-  "${YAML_SOURCE_DIR}/tag.cpp"
-  "${YAML_SOURCE_DIR}/contrib/graphbuilderadapter.cpp"
-  "${YAML_SOURCE_DIR}/contrib/graphbuilder.cpp"
-	CACHE INTERNAL "yaml sources" )
-set( YAML_DEFINITIONS
-	"-std=c++11"
-	CACHE INTERNAL "yaml definitions" )
-include_directories(${YAML_INCLUDE_DIRS} ${YAML_SOURCE_DIR})
-#message(STATUS "YAML_INCLUDE_DIRS : ${YAML_INCLUDE_DIRS}, YAML_SOURCE_DIR=${YAML_SOURCE_DIR}")
-ADD_LIBRARY(${this_target} STATIC ${YAML_SOURCES} )
-target_compile_definitions(${this_target} PUBLIC "-DYAML_CPP_STATIC_DEFINE")
+target_include_directories(yaml-cpp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+target_compile_definitions(yaml-cpp PUBLIC "-DYAML_CPP_STATIC_DEFINE")
+
+if(WIN32)
+	set_target_properties(yaml-cpp PROPERTIES FOLDER "3rdparty")
+endif()

CMakeLists.txt

@@ -1,630 +1,105 @@
-#####################################################################
-#
-# "Getting Started with CMake", a tutorial video by Eric Wing.
-#   Part 1 of 6: http://www.youtube.com/watch?v=CLvZTyji_Uw
-#   Part 2 of 6: http://www.youtube.com/watch?v=gUW-RrRQjEg
-#   Part 3 of 6: http://www.youtube.com/watch?v=sz6cPhbuTk4
-#   Part 4 of 6: http://www.youtube.com/watch?v=JICZOkyNXbg
-#   Part 5 of 6: http://www.youtube.com/watch?v=lAiuLHy4dCk
-#   Part 6 of 6: http://www.youtube.com/watch?v=fAtJNzDZdH8
-#
-# You can use notepad++ for syntax highlighting.
-# Naming conventions:
-#   WITH_*   : option to use an external package or not
-#   ENABLE_* : option to use an internal feature/code or not
-#   HAVE_*   : internal variable indicating if we have and are using something
-#
-# Maintainers: Flavio J. Saraiva (feel free to send complaints or suggestions)
-#   flaviojs @ rAthena forum/irc
-#   flaviojs2005 \A-T/ gmail <D.o,T> com
-#   lightaisme \A-T/ gmail <D.o,T> com
-#
-#####################################################################
+cmake_minimum_required(VERSION 3.11)
+
+project(rAthena)
+
+# Configure CMake Modules
+list(APPEND CMAKE_MODULE_PATH
+    "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake")
 
 
-#cmake_minimum_required( VERSION 2.8.4 )
-# Functional changes from 2.8.3 to 2.8.4:
-#   string(SUBSTRING) works with length -1 as "rest of string"
-#   changes to some CPack generators
-#   CYGWIN no longer defines WIN32
-#   CMP0017: Prefer files from the CMake module directory when including from there.
-# Update to 3.1 for CMAKE_CXX_STANDARD cross support definition
-set( CMAKE_LEGACY_CYGWIN_WIN32 0 )
-cmake_minimum_required( VERSION 3.1 )
-project( rAthena )
-if( CYGWIN )
-	unset( WIN32 )
-endif()
-set(CMAKE_CXX_STANDARD 17) # C++17...
-set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
-#set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
+# options
+set(PACKETVER 20211103 CACHE STRING "Sets the PACKETVER define of the servers (see src/common/mmo.hpp)")
+set(MAXCONN CACHE STRING "Sets the MAXCONN define of the servers. (see src/common/socket.hpp)")
+option(ENABLE_PRERENEWAL "Whether or not to enable Pre-renewal (default=OFF)" OFF)
+option(ENABLE_WEB_SERVER "Build web-server (default=ON)" ON)
+option(ENABLE_RDTSC "Enable RDTSC instruction as a timing source (default=OFF)" OFF)
+option(ENABLE_EXTRA_DEBUG_CODE "Enable extra debug code (default=OFF)" OFF)
+option(ENABLE_MEMMGR "Enable memory manager (default=ON)" ON)
+# TODO(vstumpf): If no one uses this, we can just remove it
+# set(ENABLE_MEMORY "system" CACHE STRING "Enable memory library (default=system)")
+option(ENABLE_PROFILER "Enable profiler (default=OFF)" OFF)
+option(ENABLE_EXTRA_BUILDBOT_CODE "Enable extra buildbot code (default=OFF)" OFF)
+option(ENABLE_EPOLL "Use epoll instead of select (default=OFF)" OFF)
+option(ENABLE_VIP "Enable VIP system (default=OFF)" OFF)
 
-#actually this might be misleading for arm...
-if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-	set(architecture x86)
-elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-	set(architecture x64)
-else()
-	message( FATAL_ERROR "unexpected architecture (CMAKE_SIZEOF_VOID_P is ${CMAKE_SIZEOF_VOID_P})" )
-endif()
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-set(CMAKE_C_CREATE_SHARED_LIBRARY)
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY)
-set(CMAKE_DEBUG_POSTFIX "d")
-set(CMAKE_RELEASE_POSTFIX "r")
 
 # Set a default build type if none was specified
 set(default_build_type "Release")
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
-  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
-      STRING "Choose the type of build." FORCE)
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+    set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
+        STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel" FORCE)
+    message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
 endif()
 
+if(CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(ENABLE_MSVC_PARALLEL ON CACHE STRING "\
+Enables /MP flag for parallel builds using MSVC. Specify an integer value to control \
+the number of threads used (Only works on versions of Visual Studio). Setting to ON \
+lets the toolchain decide how many threads to use. Set to OFF to disable /MP completely." )
+
+  if(ENABLE_MSVC_PARALLEL)
+    if(ENABLE_MSVC_PARALLEL GREATER 0)
+      string(APPEND CMAKE_C_FLAGS " /MP${ENABLE_MSVC_PARALLEL}")
+      string(APPEND CMAKE_CXX_FLAGS " /MP${ENABLE_MSVC_PARALLEL}")
+    else()
+      string(APPEND CMAKE_C_FLAGS " /MP")
+      string(APPEND CMAKE_CXX_FLAGS " /MP")
+    endif()
+  endif()
+endif()
+
+
 #
 # Prevent building in the source directory by default
 #
-option( ALLOW_SAME_DIRECTORY "Allow CMake to build in the source directory." OFF )
-if( ALLOW_SAME_DIRECTORY )
-elseif( "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}" )
-	message( FATAL_ERROR
-		"Do not use the source directory to build your files, instead delete CMakeCache.txt, create a separate folder and build there.\n"
-		"Example: (build in subdir 'build' and install to source dir)\n"
-		"  rm -f CMakeCache.txt\n"
-		"  mkdir build\n"
-		"  cd build\n"
-		"  cmake -G\"Unix Makefiles\" -DINSTALL_TO_SOURCE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\n"
-		"  make install\n"
-		"  cd ..\n"
-		"  rm -rf build\n"
-		"To skip this check, set ALLOW_SAME_DIRECTORY to ON (-DALLOW_SAME_DIRECTORY=ON)" )
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    message( FATAL_ERROR
+        "Do not use the source directory to build your files, instead delete CMakeCache.txt, create a separate folder and build there.\n"
+        "Example: (build in subdir 'build' and install to source dir)\n"
+        "  rm -f CMakeCache.txt\n"
+        "  mkdir build\n"
+        "  cd build\n"
+        "  cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\n"
+        "  make install\n"
+        "  cd ..\n"
+        "  rm -rf build\n")
 endif()
 
-
-#
-# Global stuff
-#
-set( GLOBAL_LIBRARIES ${LINK_LIBRARIES}  CACHE INTERNAL "" )# list (comma separated values)
-set( GLOBAL_INCLUDE_DIRS ${INCLUDE_DIRECTORIES}  CACHE INTERNAL "" )# list (comma separated values)
-set( GLOBAL_DEFINITIONS ${COMPILE_DEFINITIONS}  CACHE INTERNAL "" )# string (space separated values -DFOO=bar)
-mark_as_advanced( GLOBAL_LIBRARIES  GLOBAL_INCLUDE_DIRS  GLOBAL_DEFINITIONS )
-if( WIN32 )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DFD_SETSIZE=4096" )
-endif()
-if( MSVC )
-	set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} "oldnames.lib" "ws2_32.lib" )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" )
-endif()
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
-  set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -fno-strict-aliasing" )
-  #set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -O2" ); #need more test to enable this
+if(WIN32)
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
-
-#
-# 3rd party
-#
-set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cmake  CACHE INTERNAL "" )
-include( CheckCSourceCompiles )
-include( CheckCSourceRuns )
-include( CheckIncludeFile )
-include( CheckFunctionExists )
-include( FindFunctionLibrary )
-include( TestBigEndian )
+# Configure C++ Standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
-#
-# PACKETVER
-#
-set( PACKETVER CACHE STRING "Sets the PACKETVER define of the servers. (see src/common/mmo.h)" )
-if( PACKETVER )
-	list( APPEND GLOBAL_DEFINITIONS  PACKETVER=${PACKETVER} )
+# Set build directories
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/${suffixInstallStr})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+if(WIN32)
+    set(RuntimeOutputDir "${CMAKE_BINARY_DIR}/..")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RuntimeOutputDir})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${RuntimeOutputDir})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${RuntimeOutputDir})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${RuntimeOutputDir})
+
+    if (MSVC AND NOT MSVC_VERSION VERSION_LESS 142)
+        add_link_options($<$<CONFIG:Debug>:/INCREMENTAL>)
+        add_compile_options($<$<CONFIG:Debug>:/ZI>)
+    endif()
+    add_compile_definitions($<$<CONFIG:DEBUG>:_ITERATOR_DEBUG_LEVEL=0>)
 endif()
 
+add_subdirectory(db)
+add_subdirectory(conf)
+add_subdirectory(3rdparty)
+add_subdirectory(src)
+add_subdirectory(tools)
 
-#
-# Find git
-#
-message( STATUS "Detecting git" )
-find_package(Git)
-if(GIT_FOUND)
-	if(GIT_VERSION_STRING)
-		message(STATUS "Found git : ${GIT_EXECUTABLE} version (${GIT_VERSION_STRING})")
-	else()
-		message(STATUS "Found git : ${GIT_EXECUTABLE}")
-	endif()
-endif()
-
-include(GetGitVersion)
-get_git_version()
-
-#include(GetSvnVersion)
-#get_svn_version(SVN_VERSION)
-#message( STATUS "SVN_VERSION: ${SVN_VERSION}" )
-
-
-#
-# threads
-#
-message( STATUS "Detecting threads library" )
-set( CMAKE_THREAD_PREFER_PTHREAD 1 )
-find_package(Threads REQUIRED)
-if( CMAKE_THREAD_LIBS_INIT )
-	message( STATUS "Adding global library: ${CMAKE_THREAD_LIBS_INIT}" )
-	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
-endif()
-message( STATUS "Detecting threads library - done" )
-
-message( STATUS "Check if supporting Thread local storage (TLS)" )
-file( READ "${CMAKE_SOURCE_DIR}/3rdparty/cmake/tests/HAVE_TLS.c" _SOURCE )
-CHECK_C_SOURCE_RUNS( "${_SOURCE}" HAVE_TLS )
-if( HAVE_TLS )
-	message( STATUS "Check for TLS- yes" )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DHAVE_TLS" )
-else()
-	message( STATUS "Check for TLS - no" )
-endif()
-
-
-#
-# math library (FreeBSD/Linux/Solaris)
-#
-if( NOT WIN32 )
-message( STATUS "Detecting math library (m)" )
-CHECK_INCLUDE_FILE( math.h HAVE_MATH_H )
-if( NOT HAVE_MATH_H )
-	message( FATAL_ERROR "math.h not found" )
-endif()
-set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-find_function_library( floor FUNCTION_FLOOR_LIBRARIES m )
-if( FUNCTION_FLOOR_LIBRARIES )
-	message( STATUS "Adding global library: ${FUNCTION_FLOOR_LIBRARIES}" )
-	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_FLOOR_LIBRARIES} )
-endif()
-message( STATUS "Detecting math library (m) - done" )
-endif()
-
-
-#
-# dynamic loading library (Linux)
-#
-if( NOT WIN32 )
-message( STATUS "Detecting dynamic loading library (dl)" )
-set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-find_function_library( dlopen FUNCTION_DLOPEN_LIBRARIES dl )
-if( FUNCTION_DLOPEN_LIBRARIES )
-	message( STATUS "Adding global library: ${FUNCTION_DLOPEN_LIBRARIES}" )
-	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_DLOPEN_LIBRARIES} )
-endif()
-message( STATUS "Detecting dynamic loading library (dl) - done" )
-endif()
-
-
-#
-# networking library (Solaris/MinGW)
-#
-if( NOT MSVC )
-message( STATUS "Detecting networking library (socket/nsl/ws2_32)" )
-#set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-#find_function_library( bind FUNCTION_BIND_LIBRARIES socket ws2_32 )
-#if( FUNCTION_BIND_LIBRARIES )
-#	message( STATUS "Adding global library: ${FUNCTION_BIND_LIBRARIES}" )
-#	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_BIND_LIBRARIES} )
-#endif()
-set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} )
-find_function_library( gethostbyname FUNCTION_GETHOSTBYNAME_LIBRARIES nsl )
-if( FUNCTION_GETHOSTBYNAME_LIBRARIES )
-	message( STATUS "Adding global library: ${FUNCTION_GETHOSTBYNAME_LIBRARIES}" )
-	set_property( CACHE GLOBAL_LIBRARIES  PROPERTY VALUE ${GLOBAL_LIBRARIES} ${FUNCTION_GETHOSTBYNAME_LIBRARIES} )
-endif()
-message( STATUS "Detecting networking library (socket/nsl/ws2_32) - done" )
-endif()
-
-#
-# enable web server?
-#
-option( ENABLE_WEB_SERVER "Build web-server (default=ON)" ON )
-
-#
-# Test for big endian
-#
-TEST_BIG_ENDIAN( BIG_ENDIAN )
-if( NOT DEFINED BIG_ENDIAN )
-	message( WARNING "unable to determine endianness, only LITTLE ENDIAN is supported" )
-elseif( BIG_ENDIAN )
-	message( FATAL_ERROR "bigendian is not supported" )
-endif()
-
-
-#
-# Test monotonic clock
-#
-# CLOCK_MONOTONIC clock for clock_gettime
-# Normally defines _POSIX_TIMERS > 0 and _POSIX_MONOTONIC_CLOCK (for posix
-# compliant systems) and __FreeBSD_cc_version >= 500005 (for FreeBSD
-# >= 5.1.0, which does not have the posix defines (ref. r11983)) would be
-# checked but some systems define them even when they do not support it
-# (ref. bugreport:1003).
-#
-message( STATUS "Check for monotonic clock" )
-find_library( RT_LIBRARY rt )# (optional, rt on Debian)
-mark_as_advanced( RT_LIBRARY )
-set( CMAKE_REQUIRED_LIBRARIES ${GLOBAL_LIBRARIES} ${RT_LIBRARY} )
-file( READ "${CMAKE_SOURCE_DIR}/3rdparty/cmake/tests/HAVE_MONOTONIC_CLOCK.c" _SOURCE )
-CHECK_C_SOURCE_RUNS( "${_SOURCE}" HAVE_MONOTONIC_CLOCK )
-if( HAVE_MONOTONIC_CLOCK )
-	message( STATUS "Check for monotonic clock - yes" )
-	set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} ${RT_LIBRARY} )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DHAVE_MONOTONIC_CLOCK" )
-else()
-	message( STATUS "Check for monotonic clock - no" )
-endif()
-
-
-#
-# Test if function exists:
-#   setrlimit - used to set the socket limit
-#   strnlen - string length with upper scan bound
-#   getpid - process id
-#   gettid - thread id
-#
-CHECK_FUNCTION_EXISTS( setrlimit HAVE_SETRLIMIT )
-CHECK_FUNCTION_EXISTS( strnlen HAVE_STRNLEN )
-CHECK_FUNCTION_EXISTS( getpid HAVE_GETPID )
-CHECK_FUNCTION_EXISTS( gettid HAVE_GETTID )
-foreach( define HAVE_SETRLIMIT HAVE_STRNLEN HAVE_GETPID HAVE_GETTID )
-	if( ${define} )
-		set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -D${define}" )
-	endif()
-endforeach()
-
-
-#
-# Use RDTSC instruction as a timing source (time stamp counter on x86 since Pentium) (default=OFF)
-#
-# Enable it when you've timing issues. (ex: in conjunction with XEN or Other Virtualization mechanisms)
-# Please ensure that you've disabled dynamic CPU-Frequencys, such as power saving options.
-# (On the most modern Dedicated Servers cpufreq is preconfigured, see your distribution's manual how to disable it)
-#
-option( ENABLE_RDTSC "use RDTSC instruction as a timing source (default=OFF)" OFF )
-if( ENABLE_RDTSC )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DENABLE_RDTSC" )
-	message( STATUS "Enabled RDTSC as a timing source" )
-endif()
-
-
-#
-# Enable extra debug code (default=OFF)
-#
-option( ENABLE_EXTRA_DEBUG_CODE "enable extra debug code (default=OFF)" OFF )
-if( ENABLE_EXTRA_DEBUG_CODE )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DDEBUG" )
-	message( STATUS "Enabled extra DEBUG code" )
-endif()
-
-
-#
-# Enable EPOLL (default=OFF)
-# Only for Linux
-#
-option( ENABLE_EXTRA_SOCKET_POLL "enable SOCKET_EPOLL (default=OFF)" OFF )
-if( ENABLE_EXTRA_SOCKET_POLL )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DSOCKET_EPOLL" )
-	message( STATUS "Enabled SOCKET_EPOLL" )
-endif()
-
-
-#
-# Enable builtin memory manager (default=default)
-#
-set( MEMMGR_OPTIONS "default;yes;no" )
-set( ENABLE_MEMMGR "default" CACHE STRING "enable builtin memory manager: ${MEMMGR_OPTIONS} (default=default)" )
-set_property( CACHE ENABLE_MEMMGR  PROPERTY STRINGS ${MEMMGR_OPTIONS} )
-if( ENABLE_MEMMGR STREQUAL "default" )
-	# use source code default
-elseif( ENABLE_MEMMGR STREQUAL "yes" )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DUSE_MEMMGR" )
-	message( STATUS "Enabled the builtin memory manager" )
-elseif( ENABLE_MEMMGR STREQUAL "no" )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DNO_MEMMGR" )
-	message( STATUS "Disabled the builtin memory manager" )
-else()
-	message( FATAL_ERROR "invalid option ENABLE_MEMMGR=${ENABLE_MEMMGR} (valid options: ${MEMMGR_OPTIONS})" )
-endif()
-
-
-#
-# Enable memory library (default=system)
-#
-set( MEMORY_OPTIONS "system;memwatch;dmalloc;gcollect" )
-set( ENABLE_MEMORY "system" CACHE STRING "enable memory library: ${MEMORY_OPTIONS} (default=system)" )
-set_property( CACHE ENABLE_MEMORY  PROPERTY STRINGS ${MEMORY_OPTIONS} )
-if( ENABLE_MEMORY STREQUAL "system" )
-	# use system functions
-
-elseif( ENABLE_MEMORY STREQUAL "memwatch" )
-	CHECK_INCLUDE_FILE( memwatch.h HAVE_MEMWATCH_H )
-	find_library( MEMWATCH_LIBRARY memwatch )
-	mark_as_advanced( MEMWATCH_LIBRARY )
-	if( HAVE_MEMWATCH_H AND MEMWATCH_LIBRARY )
-		message( STATUS "Adding global library: ${MEMWATCH_LIBRARY}" )
-		set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} ${MEMWATCH_LIBRARY} )
-		set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DMEMWATCH" )
-		message( STATUS "Enabled the memory library memwatch" )
-	else()
-		message( FATAL_ERROR "Failed to enable the memory library memwatch" )
-	endif()
-
-elseif( ENABLE_MEMORY STREQUAL "dmalloc" )
-	CHECK_INCLUDE_FILE( dmalloc.h HAVE_DMALLOC_H )
-	find_library( DMALLOC_LIBRARY dmalloc )
-	mark_as_advanced( DMALLOC_LIBRARY )
-	if( HAVE_DMALLOC_H AND DMALLOC_LIBRARY )
-		message( STATUS "Adding global library: ${DMALLOC_LIBRARY}" )
-		set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} ${DMALLOC_LIBRARY} )
-		set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DDMALLOC -DDMALLOC_FUNC_CHECK" )
-		message( STATUS "Enabled the memory library dmalloc" )
-	else()
-		message( FATAL_ERROR "Failed to enable the memory library dmalloc" )
-	endif()
-
-elseif( ENABLE_MEMORY STREQUAL "gcollect" )
-	CHECK_INCLUDE_FILE( gc.h HAVE_GC_H )
-	find_library( GC_LIBRARY gc )
-	mark_as_advanced( GC_LIBRARY )
-	if( HAVE_GC_H AND GC_LIBRARY )
-		message( STATUS "Adding global library: ${GC_LIBRARY}" )
-		set_property( CACHE GLOBAL_LIBRARIES    PROPERTY VALUE ${GLOBAL_LIBRARIES} ${GC_LIBRARY} )
-		set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DGCOLLECT" )
-		message( STATUS "Enabled the memory library gcollect" )
-	else()
-		message( FATAL_ERROR "Failed to enable the memory library gcollect" )
-	endif()
-
-else()
-	message( FATAL_ERROR "invalid option ENABLE_MEMORY=${ENABLE_MEMORY} (valid options: ${MEMORY_OPTIONS})" )
-endif()
-
-
-#
-# Enable profiler (default=none)
-#
-set( PROFILER_OPTIONS "none;gprof" )
-set( ENABLE_PROFILER "none" CACHE STRING "enable profiler: ${PROFILER_OPTIONS} (default=none)" )
-set_property( CACHE ENABLE_PROFILER  PROPERTY STRINGS ${PROFILER_OPTIONS} )
-if( ENABLE_PROFILER STREQUAL "none" )
-	# no profiler
-
-elseif( ENABLE_PROFILER STREQUAL "gprof" )
-	if( CMAKE_C_COMPILER_ID STREQUAL "GNU" )
-		if( NOT HAVE_GPROF_FLAGS )
-			set_property( CACHE CMAKE_C_FLAGS  PROPERTY VALUE "${CMAKE_C_FLAGS} -pg" )
-			set_property( CACHE CMAKE_EXE_LINKER_FLAGS  PROPERTY VALUE "${CMAKE_EXE_LINKER_FLAGS} -pg" )
-			set( HAVE_GPROF_FLAGS ON  CACHE INTERNAL "" )
-		endif()
-		message( STATUS "Enabled the profiler gprof" )
-	else()
-		message( FATAL_ERROR "Failed to enable the profiler gprof - not GNU" )
-	endif()
-
-else()
-	message( FATAL_ERROR "invalid option ENABLE_PROFILER=${ENABLE_PROFILER} (valid options: ${PROFILER_OPTIONS})" )
-endif()
-
-
-#
-# Enable extra buildbot code (default=OFF)
-#
-option( ENABLE_EXTRA_BUILDBOT_CODE "enable extra buildbot code (default=OFF)" OFF )
-if( ENABLE_EXTRA_BUILDBOT_CODE )
-	set_property( CACHE GLOBAL_DEFINITIONS  PROPERTY VALUE "${GLOBAL_DEFINITIONS} -DBUILDBOT" )
-	message( STATUS "Enabled extra BUILDBOT code" )
-endif()
-
-
-#####################################################################
-# package stuff
-#
-set( CPACK_PACKAGE_NAME "rAthena" )
-set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "MMORPG server package" )
-set( CPACK_PACKAGE_VERSION ${SVNVERSION} )
-set( CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE )
-#set( CPACK_MONOLITHIC_INSTALL ON )
-include( CPACK  OPTIONAL  RESULT_VARIABLE HAVE_CPACK )
-if( HAVE_CPACK )
-	option( WITH_CPACK "enable building packages with CPack ('package' target)" ON )
-endif()
-if( NOT WITH_CPACK )
-	# empty replacements
-	macro( cpack_add_component_group )
-	endmacro()
-	macro( cpack_add_component )
-	endmacro()
-	message( STATUS "Disabled package creation" )
-endif()
-
-set( Runtime "Runtime files"  CACHE INTERNAL "" )
-set( Runtime_base "configurations, dbs, npcs, docs, ..."  CACHE INTERNAL "" )
-set( Runtime_templates "conf/import and save (generated from conf/import-tmpl and save-tmpl)"  CACHE INTERNAL "" )
-cpack_add_component_group( Runtime DESCRIPTION ${Runtime} DISPLAY_NAME "Runtime" )
-cpack_add_component( Runtime_base DESCRIPTION ${Runtime_base} DISPLAY_NAME "Base files" GROUP Runtime )
-cpack_add_component( Runtime_templates DESCRIPTION ${Runtime_templates} DISPLAY_NAME "Base templates" GROUP Runtime )
-
-set( Development "Development files"  CACHE INTERNAL "" )
-set( Development_base "projects, 3rdparty, sources, templates"  CACHE INTERNAL "" )
-cpack_add_component_group( Development DESCRIPTION ${Development} DISPLAY_NAME "Development" )
-cpack_add_component( Development_base DESCRIPTION ${Development_base} DISPLAY_NAME "Base files" GROUP Development )
-
-
-#
-# install stuff
-#
-option( INSTALL_COMPONENT_RUNTIME "install/package files needed to run the project" ON )
-option( INSTALL_COMPONENT_DEVELOPMENT "install/package files needed to build the project" OFF )
-option( INSTALL_TO_PATH "copy files to INSTALL_PATH" OFF )
-option( INSTALL_TO_SOURCE "copy files to source directory, skips what is already there (${CMAKE_CURRENT_SOURCE_DIR})" OFF )
-option( INSTALL_TO_SUBDIR "copy files to subdirectory (${CMAKE_CURRENT_BINARY_DIR}/install)" OFF )
-set( INSTALL_PATH "${CMAKE_INSTALL_PREFIX}"  CACHE STRING "install path (only used when INSTALL_TO_PATH is set)" )
-mark_as_advanced( CMAKE_INSTALL_PREFIX )
-if( INSTALL_TO_PATH AND NOT ("${INSTALL_TO}" STREQUAL "path") )# changed to path
-	set_property( CACHE INSTALL_TO_SOURCE INSTALL_TO_SUBDIR  PROPERTY VALUE OFF )
-elseif( INSTALL_TO_SOURCE AND NOT ("${INSTALL_TO}" STREQUAL "source") )# changed to source
-	set_property( CACHE INSTALL_TO_PATH INSTALL_TO_SUBDIR  PROPERTY VALUE OFF )
-elseif( INSTALL_TO_SUBDIR AND NOT ("${INSTALL_TO}" STREQUAL "subdir") )# changed to subdir
-	set_property( CACHE INSTALL_TO_PATH INSTALL_TO_SOURCE  PROPERTY VALUE OFF )
-elseif( NOT INSTALL_TO_PATH AND NOT INSTALL_TO_SOURCE AND NOT INSTALL_TO_SUBDIR )# default
-	set_property( CACHE INSTALL_TO_SUBDIR  PROPERTY VALUE ON )
-endif()
-if( INSTALL_TO_PATH )
-	set( INSTALL_TO "path"  CACHE INTERNAL "" )
-	set_property( CACHE CMAKE_INSTALL_PREFIX  PROPERTY VALUE "${INSTALL_PATH}" )
-elseif( INSTALL_TO_SOURCE )
-	set( INSTALL_TO "source"  CACHE INTERNAL "" )
-	set_property( CACHE CMAKE_INSTALL_PREFIX  PROPERTY VALUE "${CMAKE_CURRENT_SOURCE_DIR}" )
-elseif( INSTALL_TO_SUBDIR )
-	set( INSTALL_TO "subdir"  CACHE INTERNAL "" )
-	set_property( CACHE CMAKE_INSTALL_PREFIX  PROPERTY VALUE "${CMAKE_CURRENT_BINARY_DIR}/install" )
-endif()
-set( SVN_FOLDER_PATTERN "[\\.]svn"  CACHE STRING "pattern of svn folder that we exclude from instalations" )
-mark_as_advanced( SVN_FOLDER_PATTERN )
-set( DEVELOPMENT_FILES
-	"${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt"
-	"${CMAKE_CURRENT_SOURCE_DIR}/configure"
-	"${CMAKE_CURRENT_SOURCE_DIR}/configure.in"
-	"${CMAKE_CURRENT_SOURCE_DIR}/rAthena.sln"
-	)
-set( DEVELOPMENT_DIRECTORIES
-	"3rdparty"
-	"conf/import-tmpl"
-	"conf/msg_conf/import-tmpl"
-	"db/import-tmpl"
-	"src"
-	)
-set( RUNTIME_FILES
-	"${CMAKE_CURRENT_SOURCE_DIR}/athena-start"
-	"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-	"${CMAKE_CURRENT_SOURCE_DIR}/README.md"
-	)
-if (WIN32)
-	set (RUNTIME_FILES 
-		${RUNTIME_FILES}
-		"${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.dll"
-		"${CMAKE_CURRENT_SOURCE_DIR}/libmysql.dll"
-		"${CMAKE_CURRENT_SOURCE_DIR}/pcre3.dll"
-		"${CMAKE_CURRENT_SOURCE_DIR}/zlib1.dll"
-		"${CMAKE_CURRENT_SOURCE_DIR}/tools/charserv.bat"
-		"${CMAKE_CURRENT_SOURCE_DIR}/tools/logserv.bat"
-		"${CMAKE_CURRENT_SOURCE_DIR}/tools/mapserv.bat"
-		"${CMAKE_CURRENT_SOURCE_DIR}/tools/runserver.bat"
-		"${CMAKE_CURRENT_SOURCE_DIR}/tools/serv.bat"
-	)
-endif(WIN32)
-
-set( RUNTIME_DIRECTORIES
-	"conf"
-	"db"
-	"doc"
-	"log"
-	"npc"
-	"sql-files"
-	"tools"
-	)
-if( INSTALL_TO_SOURCE )# skip, already in the source dir
-else()
-	if( INSTALL_COMPONENT_RUNTIME )
-		install( FILES ${RUNTIME_FILES}
-			DESTINATION "."
-			COMPONENT Runtime_base )
-		foreach( DIR IN ITEMS ${RUNTIME_DIRECTORIES} )
-			if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}/" )
-				install( DIRECTORY "${DIR}/"
-					DESTINATION "${DIR}"
-					COMPONENT Runtime_base
-					PATTERN ${SVN_FOLDER_PATTERN} EXCLUDE
-					PATTERN "conf/import-tmpl" EXCLUDE )
-			else()
-				# create empty directory
-				install( CODE "file(MAKE_DIRECTORY \"\${ENV}\${CMAKE_INSTALL_PREFIX}/${DIR}\")"
-					COMPONENT Runtime_base )
-			endif()
-		endforeach()
-	endif( INSTALL_COMPONENT_RUNTIME )
-	if( INSTALL_COMPONENT_DEVELOPMENT )
-		install( FILES ${DEVELOPMENT_FILES}
-			DESTINATION "."
-			COMPONENT Development_base )
-		foreach( DIR IN ITEMS ${DEVELOPMENT_DIRECTORIES} )
-			install( DIRECTORY "${DIR}/"
-				DESTINATION "${DIR}"
-				COMPONENT Development_base
-				PATTERN ${SVN_FOLDER_PATTERN} EXCLUDE )
-		endforeach()
-	endif( INSTALL_COMPONENT_DEVELOPMENT )
-endif()
-if( INSTALL_COMPONENT_RUNTIME )
-	# templates
-	set( _TEMPLATES
-		"conf/import-tmpl" "conf/import"
-		"conf/msg_conf/import-tmpl" "conf/msg_conf/import"
-		"db/import-tmpl" "db/import"
-		)
-	set( INSTALL_TEMPLATES_FILE "${CMAKE_CURRENT_BINARY_DIR}/InstallTemplates.cmake" )
-	file( WRITE "${INSTALL_TEMPLATES_FILE}"
-		"macro( INSTALL_TEMPLATE _SRC _DST )\n"
-		"  set( SRC \"${CMAKE_CURRENT_SOURCE_DIR}/\${_SRC}\" )\n"
-		"  set( DST \"\${CMAKE_INSTALL_PREFIX}/\${_DST}\" )\n"
-		"  if( EXISTS \"\${DST}\" )\n"
-		"    message( \"-- Already exists: \${DST}\" )\n"
-		"  else()\n"
-		"    message( \"-- Installing template: \${DST}\" )\n"
-		"    execute_process( COMMAND \"${CMAKE_COMMAND}\" -E copy \"\${SRC}\" \"\${DST}\" )\n"
-		"  endif()\n"
-		"endmacro()\n"
-		)
-	while( _TEMPLATES )
-		list( GET _TEMPLATES 0 _SRC )
-		list( GET _TEMPLATES 1 _DST )
-		list( REMOVE_AT _TEMPLATES 0 1 )
-		if( IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${_SRC}" )
-			file( GLOB _PATHS "${CMAKE_CURRENT_SOURCE_DIR}/${_SRC}/*" )
-			foreach( _PATH IN ITEMS ${_PATHS} )
-				string( REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${_SRC}/" "" _PATH "${_PATH}" )
-				if( NOT "${_PATH}" MATCHES "${SVN_FOLDER_PATTERN}" )
-					list( APPEND _TEMPLATES "${_SRC}/${_PATH}" "${_DST}/${_PATH}" )
-				endif()
-			endforeach()
-		else()
-			file( APPEND "${INSTALL_TEMPLATES_FILE}" "INSTALL_TEMPLATE( \"${_SRC}\" \"${_DST}\" )\n" )
-		endif()
-	endwhile()
-	install( SCRIPT "${INSTALL_TEMPLATES_FILE}"
-		COMPONENT Runtime_templates )
-endif( INSTALL_COMPONENT_RUNTIME )
-
-
-#
-# sources
-#
-set( TARGET_LIST  CACHE INTERNAL "" )
-add_subdirectory( 3rdparty )
-add_subdirectory( src )
-
-
-#####################################################################
-# final checks and warnings
-#
-
-list( LENGTH  TARGET_LIST  _LEN )
-if( _LEN EQUAL 0 )
-	message( FATAL_ERROR "no targets available" )
-endif()
-message( STATUS "Available targets:" )
-foreach( _TARGET IN ITEMS ${TARGET_LIST} )
-	message( STATUS "\t${_TARGET}" )
-endforeach()
+add_custom_target(server
+    DEPENDS login-server char-server map-server web-server scripts
+)

athena-start

@@ -224,4 +224,5 @@ case $1 in
 	;;
 esac
 
-
+echo "Using the configure scripts and ./athena-start is deprecated. Use CMake and ./athena-start.sh" 1>&2
+exit 1

conf/CMakeLists.txt

@@ -0,0 +1,35 @@
+include(CopyImportFiles)
+
+set(CONF_FILES_TO_IMPORT
+    "atcommands.yml"
+    "battle_conf.txt"
+    "char_conf.txt"
+    "groups.yml"
+    "inter_conf.txt"
+    "inter_server.yml"
+    "log_conf.txt"
+    "login_conf.txt"
+    "map_conf.txt"
+    "packet_conf.txt"
+    "script_conf.txt"
+    "web_conf.txt")
+
+copy_import_files(${CMAKE_CURRENT_SOURCE_DIR}/import-tmpl/
+    ${CMAKE_CURRENT_SOURCE_DIR}/import
+    "${CONF_FILES_TO_IMPORT}")
+
+set(MSG_FILES_TO_IMPORT
+    "map_msg_chn_conf.txt"
+    "map_msg_eng_conf.txt"
+    "map_msg_frn_conf.txt"
+    "map_msg_grm_conf.txt"
+    "map_msg_idn_conf.txt"
+    "map_msg_mal_conf.txt"
+    "map_msg_por_conf.txt"
+    "map_msg_rus_conf.txt"
+    "map_msg_spn_conf.txt"
+    "map_msg_tha_conf.txt")
+
+copy_import_files(${CMAKE_CURRENT_SOURCE_DIR}/msg_conf/import-tmpl/
+    ${CMAKE_CURRENT_SOURCE_DIR}/msg_conf/import
+    "${MSG_FILES_TO_IMPORT}")

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:

conf/battle/battleground.conf

@@ -9,6 +9,25 @@
 //         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary, 128: NPC, 512: Elemental)
 //--------------------------------------------------------------
 
+// Melee damage adjustments (non skills) for Battleground maps (Note 2)
+bg_short_attack_damage_rate: 80
+
+// Ranged damage adjustments (non skills) for Battleground maps (Note 2)
+bg_long_attack_damage_rate: 80
+
+// Weapon skills damage adjustments for Battleground maps (Note 2)
+bg_weapon_attack_damage_rate: 60
+
+// Magic skills damage adjustments for Battleground maps (Note 2)
+bg_magic_attack_damage_rate: 60
+
+// Misc skills damage adjustments for Battleground maps (Note 2)
+bg_misc_attack_damage_rate: 60
+
+// Flee penalty on BG grounds.
+// NOTE: It's %, not absolute, so 20 is -20% of your total flee
+bg_flee_penalty: 20
+
 // Interval before updating the bg-member map mini-dots (milliseconds)
 bg_update_interval: 1000
 

conf/battle/guild.conf

@@ -27,6 +27,25 @@ guild_max_castles: 0
 // Note: This was changed in renewal in favor of individual skill cooldown.
 guild_skill_relog_delay: 300000
 
+// Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
+gvg_short_attack_damage_rate: 80
+
+// Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
+gvg_long_attack_damage_rate: 80
+
+// Weapon skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
+gvg_weapon_attack_damage_rate: 60
+
+// Magic skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
+gvg_magic_attack_damage_rate: 60
+
+// Misc skills damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
+gvg_misc_attack_damage_rate: 60
+
+// Flee penalty on gvg grounds. Official value is 20 (Note 2)
+// NOTE: It's %, not absolute, so 20 is -20% of your total flee
+gvg_flee_penalty: 20
+
 // Can the 'Glory of Guild' skill be learnt in the Guild window,
 // and does changing emblems require it? (Note 1)
 // P.S: This skill is not implemented on official servers

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
 

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%)

conf/battle/misc.conf

@@ -39,6 +39,14 @@ pk_min_level: 55
 // players to let them attack each other. 0 disables said limit.
 pk_level_range: 0
 
+// For PK servers. Damage adjustment settings, these follow the same logic
+// as their WoE counterparts (see guild.conf)  
+pk_short_attack_damage_rate: 80
+pk_long_attack_damage_rate: 70
+pk_weapon_attack_damage_rate: 60
+pk_magic_attack_damage_rate: 60
+pk_misc_attack_damage_rate: 60
+
 // Display skill usage in console? (for debug only) (default: off) (Note 3)
 skill_log: off
 

conf/battle/player.conf

@@ -295,8 +295,8 @@ 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

conf/msg_conf/map_msg.conf

@@ -936,11 +936,7 @@
 // @reloadcashdb
 832: Cash shop database has been reloaded.
 
-// Map Zones
-833: This command is disabled on this map.
-834: Map Zone database has been reloaded.
-
-//835-899 free
+//833-899 free
 
 //------------------------------------
 // More atcommands message
@@ -1131,9 +1127,9 @@
 // @mapinfo
 1038: Please enter at least one valid list number (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s (Zone: %s) | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: Map: %s | Players: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)
@@ -1827,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

conf/msg_conf/map_msg_chn.conf

@@ -871,9 +871,9 @@
 // @mapinfo
 1038: 請至少輸入一個有效的列表數字 (使用方法: @mapinfo <0-3> [地圖名稱])
 1039: ------ 地圖資訊 ------
-1040: 地圖名: %s (Zone: %s) | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d | Vendings: %d
+1040: 地圖名: %s | 地圖玩家數量: %d | 地圖NPC數量: %d | 地圖聊天室數量: %d
 1041: ------ 地圖旗標 ------
-1042: Damage Rate Adjustments:
+1042: 城市地圖
 1043: 可離線掛店
 1044: 不可離線掛店
 1045: 戰場 (類型 %d)

conf/msg_conf/map_msg_frn.conf

@@ -883,9 +883,9 @@
 // @mapinfo
 1038: Entrez un numéro de la liste (usage: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Nom de la Map: %s (Zone: %s) | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d | Vendings: %d
+1040: Nom de la Map: %s | Joueurs sur la Map: %d | NPCs sur la Map: %d | Chats sur la Map: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 1043: Autotrade Activé
 1044: Autotrade Désactivé
 1045: Battlegrounds ON (type %d)

conf/msg_conf/map_msg_idn.conf

@@ -970,9 +970,9 @@
 // @mapinfo
 1038: Harap masukkan setidaknya 1 pilihan. (Penggunaan: @mapinfo <0-3> <map>).
 1039: ------ Map Info ------
-1040: Map: %s (Zone: %s) | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
+1040: Map: %s | Pemain: %d | NPC: %d | Ruang Chat: %d | Toko: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Kota
 1043: Autotrade diaktifkan
 1044: Autotrade dinonaktifkan
 1045: Battleground ON (tipe %d)

conf/msg_conf/map_msg_por.conf

@@ -1052,9 +1052,9 @@
 // @mapinfo
 1038: Digite pelo menos um número válido da lista (uso: @mapinfo <0-3> <mapa>).
 1039: ------ Informação do Mapa ------
-1040: Mapa: %s (Zona: %s) | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
+1040: Mapa: %s | Jogadores: %d | NPCs: %d | Chats: %d | Vendas: %d
 1041: ------ Map Flags ------
-1042: Ajustes na taxa de dano:
+1042: Mapa de Cidade
 1043: Autotrade Habilitado
 1044: Autotrade Desabilitado
 1045: Battlegrounds Habilitado (tipo %d)

conf/msg_conf/map_msg_rus.conf

@@ -884,9 +884,9 @@
 // @mapinfo
 1038: Введите хотя бы один номер (Использование: @mapinfo <0-3> <локация>).
 1039: ------ Информация о локации ------
-1040: Название локации: %s (Zone: %s) | Игроки: %d | НИП: %d | Чаты: %d | Vendings: %d
+1040: Название локации: %s | Игроки: %d | НИП: %d | Чаты: %d
 1041: ------ Мапфлаги ------
-1042: Damage Rate Adjustments:
+1042: Столица
 1043: Autotrade Разрешён
 1044: Autotrade Запрещён
 1045: Battlegrounds ВКЛЮЧЕНО (тип %d)

conf/msg_conf/map_msg_spn.conf

@@ -1124,9 +1124,9 @@
 // @mapinfo
 1038: Introduce un número de la lista (instrucciones: @mapinfo <0-3> <mapa>).
 1039: ------ Información del mapa ------
-1040: Mapa: %s (Zona: %s) | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
+1040: Mapa: %s | Jugadores: %d | NPCs: %d | Chats: %d | Tiendas: %d
 1041: ------ Opciones del mapa ------
-1042: Ajuste de ratios de daño:
+1042: Mapa de ciudad
 1043: Autotrade activado
 1044: Autotrade desactivado
 1045: Battleground activado (tipo %d)

conf/msg_conf/map_msg_tha.conf

@@ -877,9 +877,9 @@
 // @mapinfo
 1038: ג»<D792>´<EFBFBD><C2B4>÷<EFBFBD>א<EFBFBD>¢<EFBFBD><C2A2>ט<EFBFBD>§<EFBFBD>¹ט<C2B9><D798><EFBFBD>¹<EFBFBD>ט§¤ט<C2A4>¨<EFBFBD><C2A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>¸<EFBFBD>ד×י: @mapinfo <0-3> <map>).
 1039: ------ <20><><EFBFBD><EFBFBD><EFBFBD>א<EFBFBD><D790><EFBFBD>´ב¼¹·<C2B9>ט ------
-1040: ב¼¹·<C2B9>ט: %s (Zone: %s) | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
+1040: ב¼¹·<C2B9>ט: %s | ¼<>יא<D799>ט¹: %d | NPCs: %d | Chats: %d | Vendings: %d
 1041: ------ Map Flags ------
-1042: Damage Rate Adjustments:
+1042: Town Map
 1043: Autotrade Enabled
 1044: Autotrade Disabled
 1045: Battlegrounds ON (type %d)

db/CMakeLists.txt

@@ -0,0 +1,72 @@
+include(CopyImportFiles)
+
+# Why do we list all the files instead of using glob?
+# This way, if we add a new file, the build system will know to regenerate
+# and the new file will be copied over.
+
+set(DB_FILES_TO_IMPORT
+    "abra_db.yml"
+    "achievement_db.yml"
+    "achievement_level_db.yml"
+    "attendance.yml"
+    "attr_fix.yml"
+    "battleground_db.yml"
+    "captcha_db.yml"
+    "castle_db.yml"
+    "const.yml"
+    "create_arrow_db.yml"
+    "elemental_db.yml"
+    "enchantgrade.yml"
+    "exp_guild.yml"
+    "exp_homun.yml"
+    "guild_skill_tree.yml"
+    "homunculus_db.yml"
+    "instance_db.yml"
+    "item_cash.yml"
+    "item_combos.yml"
+    "item_db.yml"
+    "item_enchant.yml"
+    "item_group_db.yml"
+    "item_noequip.txt"
+    "item_packages.yml"
+    "item_randomopt_db.yml"
+    "item_randomopt_group.yml"
+    "item_reform.yml"
+    "job_noenter_map.txt"
+    "job_stats.yml"
+    "laphine_synthesis.yml"
+    "laphine_upgrade.yml"
+    "level_penalty.yml"
+    "magicmushroom_db.yml"
+    "map_cache.dat"
+    "map_drops.yml"
+    "map_index.txt"
+    "mercenary_db.yml"
+    "mob_avail.yml"
+    "mob_chat_db.yml"
+    "mob_db.yml"
+    "mob_item_ratio.yml"
+    "mob_skill_db.txt"
+    "mob_summon.yml"
+    "pet_db.yml"
+    "produce_db.txt"
+    "quest_db.yml"
+    "refine.yml"
+    "reputation_group.yml"
+    "reputation.yml"
+    "size_fix.yml"
+    "skill_changematerial_db.txt"
+    "skill_damage_db.txt"
+    "skill_db.yml"
+    "skill_nocast_db.txt"
+    "skill_tree.yml"
+    "spellbook_db.yml"
+    "statpoint.yml"
+    "status_disabled.txt"
+    "status.yml"
+    "stylist.yml"
+)
+
+copy_import_files(${CMAKE_CURRENT_SOURCE_DIR}/import-tmpl/
+    ${CMAKE_CURRENT_SOURCE_DIR}/import
+    "${DB_FILES_TO_IMPORT}")

db/import-tmpl/item_noequip.txt

@@ -0,0 +1,30 @@
+// Forbidden Items Database
+// Defines restrictions on equipment, items, and cards in map types and zones.
+//
+// Structure of Database:
+// ItemID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+//
+// Passing negative value as flag will unset the flag instead.
+//
+// Examples:
+// 1201,1   // Knife can't be worn on normal maps
+// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
+// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
+// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
+// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
+// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
+

db/import-tmpl/job_noenter_map.txt

@@ -0,0 +1,28 @@
+// Defines Job(s) that are restricted to enter map (by flag/zones)
+//
+// Structure of Database:
+// JobID,FlagZone,GroupLevelBypass
+//
+// JobID: See JOB_* constants or use job number
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
+//
+// NOTES:
+// - Restriction will be overwritten for multiple defines with the same Job ID
+// - The flag is used by 'jobcanentermap' script.

db/import-tmpl/map_zones.yml

@@ -1,39 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2024 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http:#www.gnu.org/licenses/>.
-#
-###########################################################################
-# Map Zone Database
-###########################################################################
-#
-# Map Zone Settings
-#
-###########################################################################
-# - Id                        Zone ID.
-#   DisabledCommands:         List of disabled @commands. (Default: null)
-#   DisabledSkills:           List of disabled skills. (Default: null)
-#   DisabledItems:            List of disabled items. (Default: null)
-#   DisabledStatuses:         List of disabled statuses. (Default: null)
-#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
-#   Maps:                     List of maps to apply the zone to.
-#   Mapflags:                 List of mapflags. (Default: null)
-#     - Flag                  Mapflag name.
-#       Value                 Value assigned to mapflag. (Default: true)
-###########################################################################
-
-Header:
-  Type: MAP_ZONES
-  Version: 1

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

db/import-tmpl/skill_nocast_db.txt

@@ -0,0 +1,24 @@
+// Forbidden Skills Database
+// Defines unusable skills in map types and zones.
+//
+// Structure of Database:
+// SkillID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - cannot be used in normal maps
+// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
+// 4    - cannot be used in GvG maps
+// 8    - cannot be used in Battleground maps
+// 16   - cannot be cloned (clones will not copy this skill)
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - cannot be used in zone 1 maps
+// 64   - cannot be used in zone 2 maps
+// 128  - cannot be used in zone 3 maps
+// 256  - cannot be used in zone 4 maps
+// 512  - cannot be used in zone 5 maps
+// 1024 - cannot be used in zone 6 maps
+// 2048 - cannot be used in zone 7 maps
+//
+// Example:
+// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
+

db/import-tmpl/status_disabled.txt

@@ -0,0 +1,25 @@
+// Status Change Restriction Database
+//
+// Defines restrictions of status changes (SC).
+// Disabled SC will always be removed or fail to be inflicted on this map.
+//
+// Structure of Database:
+// SCType,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+//
+// Example:
+// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
+

db/map_zones.yml

@@ -1,47 +0,0 @@
-# This file is a part of rAthena.
-#   Copyright(C) 2024 rAthena Development Team
-#   https://rathena.org - https://github.com/rathena
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http:#www.gnu.org/licenses/>.
-#
-###########################################################################
-# Map Zone Database
-###########################################################################
-#
-# Map Zone Settings
-#
-###########################################################################
-# - Id                        Zone ID.
-#   DisabledCommands:         List of disabled @commands. (Default: null)
-#   DisabledSkills:           List of disabled skills. (Default: null)
-#   DisabledItems:            List of disabled items. (Default: null)
-#   DisabledStatuses:         List of disabled statuses. (Default: null)
-#   RestrictedJobs:           List of restricted jobs from entering zone. (Default: null)
-#   Maps:                     List of maps to apply the zone to.
-#   Mapflags:                 List of mapflags. (Default: null)
-#     - Flag                  Mapflag name.
-#       Value                 Value assigned to mapflag. (Default: true)
-###########################################################################
-
-Header:
-  Type: MAP_ZONES
-  Version: 1
-
-Footer:
-  Imports:
-  - Path: db/pre-re/map_zones.yml
-    Mode: Prerenewal
-  - Path: db/re/map_zones.yml
-    Mode: Renewal
-  - Path: db/import/map_zones.yml

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

db/pre-re/item_noequip.txt

@@ -0,0 +1,83 @@
+// Forbidden Items Database
+// Defines restrictions on equipment, items, and cards in map types and zones.
+//
+// Structure of Database:
+// ItemID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// Passing negative value as flag will unset the flag instead.
+//
+// Examples:
+// 1201,1   // Knife can't be worn on normal maps
+// 608,4    // Yggdrasil Seed can't be consumed in both GvG and WoE Castles
+// 4174,6   // Deviling Card has no effect in every PVP or GVG map, and during WoE
+// 501,32   // Red Potion can't be consumed on maps marked as 'restricted zone 1'
+// 519,322  // Milk can't be consumed in PVP and maps marked as 'restricted zone 2' or 'restricted zone 4' (256+64+2)
+// 519,-2   // Unset `restricted in PVP` flag from Milk. Making it usable in PVP again.
+
+//----------------------------------------------------------------------------
+// Normal maps
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+// PVP
+//----------------------------------------------------------------------------
+14529,2	//Greed_Scroll
+
+//----------------------------------------------------------------------------
+// GVG
+//----------------------------------------------------------------------------
+12218,4	//Assumptio_5_Scroll
+14529,4	//Greed_Scroll
+14590,4	//Pty_Assumptio_Scroll
+
+//----------------------------------------------------------------------------
+// Battlegrounds
+//----------------------------------------------------------------------------
+12218,8	//Assumptio_5_Scroll
+14590,8	//Pty_Assumptio_Scroll
+
+//----------------------------------------------------------------------------
+// Zone 1 - Aldebaran Turbo Track
+//----------------------------------------------------------------------------
+601,32	//Wing_Of_Fly
+605,32	//Anodyne
+506,32	//Green_Potion
+525,32	//Panacea
+
+//----------------------------------------------------------------------------
+// Zone 2 - Jail
+//----------------------------------------------------------------------------
+601,64	//Wing_Of_Fly
+602,64	//Wing_Of_Butterfly
+12212,64	//Giant_Fly_Wing
+14582,64	//WOB_Rune
+14583,64	//WOB_Schwaltz
+14584,64	//WOB_Rachel
+14585,64	//WOB_Local
+
+//----------------------------------------------------------------------------
+// Zone 3 - Izlude Battle Arena
+//----------------------------------------------------------------------------
+601,128	//Wing_Of_Fly
+
+//----------------------------------------------------------------------------
+// Zone 7 - Towns
+//----------------------------------------------------------------------------
+14529,2048	//Greed_Scroll

db/pre-re/job_noenter_map.txt

@@ -0,0 +1,28 @@
+// Defines Job(s) that are restricted to enter map (by flag/zones)
+//
+// Structure of Database:
+// JobID,FlagZone,GroupLevelBypass
+//
+// JobID: See JOB_* constants or use job number
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
+//
+// NOTES:
+// - Restriction will be overwritten for multiple defines with the same Job ID
+// - The flag is used by 'jobcanentermap' script.

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

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:
@@ -30736,8 +30726,10 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
+    Range: 9
+    Hit: Single
+    HitCount: 1
     AfterCastActDelay: 2000
-    AfterCastWalkDelay: 1000
     Requires:
       SpCost:
         - Level: 1
@@ -30760,8 +30752,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 +30785,7 @@ Body:
     Name: HLIF_BRAIN
     Description: Brain Surgery
     MaxLevel: 5
+    SplashArea: 1
   - Id: 8004
     Name: HLIF_CHANGE
     Description: Change
@@ -30797,14 +30793,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 +30801,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 +30818,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    AfterCastActDelay: 1000
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    Duration2: 1000
     Requires:
       SpCost: 10
   - Id: 8006
@@ -30833,8 +30829,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
+    Hit: Single
     AfterCastActDelay: 30000
-    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 40000
@@ -30863,6 +30859,8 @@ Body:
     Name: HAMI_SKIN
     Description: Adamantium Skin
     MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
   - Id: 8008
     Name: HAMI_BLOODLUST
     Description: Bloodlust
@@ -30870,14 +30868,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 +30876,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 +30905,7 @@ Body:
         Count: -2
       - Level: 5
         Count: -3
+    AfterCastWalkDelay: 2000
     Requires:
       SpCost:
         - Level: 1
@@ -30927,18 +30926,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 +30937,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 +30971,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 +30982,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 +31015,7 @@ Body:
     Range: 15
     Hit: Single
     HitCount: 1
+    AfterCastActDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8013
@@ -31039,6 +31037,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 +31068,8 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
-    AfterCastWalkDelay: 1500
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
     Requires:
       SpCost: 40
   - Id: 8015
@@ -31083,6 +31093,7 @@ Body:
     HitCount: 1
     Element: Weapon
     SplashArea: 4
+    AfterCastWalkDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8018

db/pre-re/skill_nocast_db.txt

@@ -0,0 +1,176 @@
+// Forbidden Skills Database
+// Defines unusable skills in map types and zones.
+//
+// Structure of Database:
+// SkillID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - cannot be used in normal maps
+// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
+// 4    - cannot be used in GvG maps
+// 8    - cannot be used in Battleground maps
+// 16   - cannot be used in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - cannot be used in zone 1 maps
+// 64   - cannot be used in zone 2 maps
+// 128  - cannot be used in zone 3 maps
+// 256  - cannot be used in zone 4 maps
+// 512  - cannot be used in zone 5 maps
+// 1024 - cannot be used in zone 6 maps
+// 2048 - cannot be used in zone 7 maps
+// 4096 - cannot be used in zone 8 maps
+//
+// Example:
+// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
+
+//----------------------------------------------------------------------------
+// Normal
+//----------------------------------------------------------------------------
+2422,1	//WM_LULLABY_DEEPSLEEP
+2423,1	//WM_SIRCLEOFNATURE
+2430,1	//WM_SATURDAY_NIGHT_FEVER
+2455,1	//SO_ARRULLO
+
+//----------------------------------------------------------------------------
+// PVP
+//----------------------------------------------------------------------------
+1013,2	//BS_GREED
+
+//----------------------------------------------------------------------------
+// GVG
+//----------------------------------------------------------------------------
+26,4	//AL_TELEPORT
+27,4	//AL_WARP
+87,4	//WZ_ICEWALL
+150,4	//TF_BACKSLIDING
+219,4	//RG_INTIMIDATE
+336,4	//WE_CALLPARTNER
+361,4	//HP_ASSUMPTIO
+362,4	//HP_BASILICA
+395,4	//CG_MOONLIT
+409,4	//WE_CALLPARENT
+410,4	//WE_CALLBABY
+491,4	//CR_CULTIVATION
+530,4	//NJ_KIRIKAGE
+691,4	//CASH_ASSUMPTIO
+1013,4	//BS_GREED
+2300,4	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Battlegrounds
+//----------------------------------------------------------------------------
+26,8	//AL_TELEPORT
+27,8	//AL_WARP
+87,8	//WZ_ICEWALL
+150,8	//TF_BACKSLIDING
+219,8	//RG_INTIMIDATE
+264,8	//MO_BODYRELOCATION
+336,8	//WE_CALLPARTNER
+361,8	//HP_ASSUMPTIO
+362,8	//HP_BASILICA
+395,8	//CG_MOONLIT
+409,8	//WE_CALLPARENT
+410,8	//WE_CALLBABY
+491,8	//CR_CULTIVATION
+411,8	//TK_RUN
+426,8	//TK_HIGHJUMP
+427,8	//SG_FEEL
+428,8	//SG_SUN_WARM
+429,8	//SG_MOON_WARM
+430,8	//SG_STAR_WARM
+431,8	//SG_SUN_COMFORT
+432,8	//SG_MOON_COMFORT
+433,8	//SG_STAR_COMFORT
+434,8	//SG_HATE
+435,8	//SG_SUN_ANGER
+436,8	//SG_MOON_ANGER
+437,8	//SG_STAR_ANGER
+438,8	//SG_SUN_BLESS
+439,8	//SG_MOON_BLESS
+440,8	//SG_STAR_BLESS
+530,8	//NJ_KIRIKAGE
+691,8	//CASH_ASSUMPITO
+2300,8	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Mixed
+//----------------------------------------------------------------------------
+488,3	//CG_HERMODE
+3013,3	//KO_KYOUGAKU
+
+//----------------------------------------------------------------------------
+// Zone 1 - Aldebaran Turbo Track
+//----------------------------------------------------------------------------
+8,32	//SM_ENDURE
+26,32	//AL_TELEPORT
+27,32	//AL_WARP
+35,32	//AL_CURE
+51,32	//TF_HIDING
+87,32	//WZ_ICEWALL
+135,32	//AS_CLOAKING
+219,32	//RG_INTIMIDATE
+264,32	//MO_BODYRELOCATION
+357,32	//LK_CONCENTRATION
+359,32	//LK_BERSERK
+362,32	//HP_BASILICA
+387,32	//WS_CARTBOOST
+389,32	//ST_CHASEWALK
+395,32	//CG_MOONLIT
+2300,32	//SC_DIMENSIONDOOR
+2478,32	//GN_CARTBOOST
+
+//----------------------------------------------------------------------------
+// Zone 2 - Jail
+//----------------------------------------------------------------------------
+421,64	//TK_JUMPKICK
+426,64	//TK_HIGHJUMP
+
+//----------------------------------------------------------------------------
+// Zone 3 - Izlude Battle Arena
+//----------------------------------------------------------------------------
+219,128 //RG_INTIMIDATE
+26,128	//AL_TELEPORT
+2300,128	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 4 - WoE:SE
+//----------------------------------------------------------------------------
+426,256 //TK_HIGHJUMP
+290,256	//SA_ABRACADABRA
+
+//----------------------------------------------------------------------------
+// Zone 5 - Sealed Shrine
+//----------------------------------------------------------------------------
+12,512	//MG_SAFETYWALL
+26,512	//AL_TELEPORT
+219,512	//RG_INTIMIDATE
+361,512	//HP_ASSUMPTIO
+691,512	//CASH_ASSUMPTIO
+2294,512	//SC_IGNORANCE
+2300,512	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
+//----------------------------------------------------------------------------
+26,1024	//AL_TELEPORT
+87,1024	//WZ_ICEWALL
+219,1024	//RG_INTIMIDATE
+405,1024	//PF_SPIDERWEB
+674,1024	//NPC_EXPULSION
+2294,1024	//SC_IGNORANCE
+2300,1024	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 7 - Towns
+//----------------------------------------------------------------------------
+232,2048	//AM_CANNIBALIZE
+233,2048	//AM_SPHEREMINE
+491,2048	//CR_CULTIVATION
+1013,2048	//BS_GREED
+2299,2048	//SC_MANHOLE
+2300,2048	//SC_DIMENSIONDOOR
+2301,2048	//SC_CHAOSPANIC
+2303,2048	//SC_BLOODYLUST
+2419,2048	//WM_POEMOFNETHERWORLD
+2482,2048	//GN_WALLOFTHORN
+2493,2048	//GN_SLINGITEM

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

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

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:

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

db/re/item_db_equip.yml

@@ -83053,7 +83053,7 @@ Body:
       Hunter: true
       Rogue: true
     Locations:
-      Both_Hand: true
+      Right_Hand: true
     WeaponLevel: 4
     EquipLevelMin: 70
     Refineable: true
@@ -112246,7 +112246,8 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All: true
+      All_Third: true
+      Fourth: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -112275,7 +112276,8 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All: true
+      All_Third: true
+      Fourth: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -112304,7 +112306,8 @@ Body:
     Defense: 30
     Slots: 1
     Classes:
-      All: true
+      All_Third: true
+      Fourth: true
     Locations:
       Garment: true
     ArmorLevel: 1
@@ -139532,7 +139535,7 @@ Body:
     AegisName: Ein_BHAXE
     Name: Saw Axe
     Type: Weapon
-    SubType: 2hAxe
+    SubType: 1hAxe
     Weight: 5000
     Attack: 350
     Range: 1
@@ -169197,8 +169200,6 @@ Body:
     Defense: 12
     Slots: 1
     Jobs:
-      Crusader: true
-      Knight: true
       Swordman: true
     Classes:
       All_Upper: true
@@ -169219,8 +169220,6 @@ Body:
     Defense: 12
     Slots: 1
     Jobs:
-      Crusader: true
-      Knight: true
       Swordman: true
     Classes:
       All_Upper: true
@@ -187653,7 +187652,7 @@ Body:
       bonus2 bSkillAtk,"GC_CROSSIMPACT",20*(.@r/3);
       bonus2 bSkillAtk,"GC_ROLLINGCUTTER",20*(.@r/3);
       bonus2 bSkillAtk,"SC_TRIANGLESHOT",20*(.@r/3);
-      bonus2 bSkillAtk,"SC_FATALMENACE",20*(.@r/3);
+      bonus2 bSkillAtk,"SC_STARTMARK",20*(.@r/3);
       if (.@r>=9) {
          bonus bLongAtkRate,10;
          bonus bShortAtkRate,10;

db/re/item_db_etc.yml

@@ -86200,31 +86200,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
@@ -86236,37 +86236,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
@@ -86278,13 +86278,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
@@ -86296,7 +86296,7 @@ Body:
     Buy: 1600
     Weight: 10
   - Id: 1001088
-    AegisName: Fresh_Pear
+    AegisName: aegis_1001088
     Name: Fresh Pear
     Type: Etc
     Buy: 1640
@@ -90384,7 +90384,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

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

db/re/job_noenter_map.txt

@@ -0,0 +1,136 @@
+// Defines Job(s) that are restricted to enter map (by flag/zones)
+//
+// Structure of Database:
+// JobID,FlagZone,GroupLevelBypass
+//
+// JobID: See JOB_* constants or use job number
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// GroupLevelBypass: Group Level (groups.conf) to ignore the restriction
+//
+// NOTES:
+// - Restriction will be overwritten for multiple defines with the same Job ID
+// - The flag is used by 'jobcanentermap' script.
+
+JOB_RUNE_KNIGHT,4112,100
+JOB_WARLOCK,4112,100
+JOB_RANGER,4112,100
+JOB_ARCH_BISHOP,4112,100
+JOB_MECHANIC,4112,100
+JOB_GUILLOTINE_CROSS,4112,100
+
+JOB_RUNE_KNIGHT_T,4112,100
+JOB_WARLOCK_T,4112,100
+JOB_RANGER_T,4112,100
+JOB_ARCH_BISHOP_T,4112,100
+JOB_MECHANIC_T,4112,100
+JOB_GUILLOTINE_CROSS_T,4112,100
+
+JOB_ROYAL_GUARD,4112,100
+JOB_SORCERER,4112,100
+JOB_MINSTREL,4112,100
+JOB_WANDERER,4112,100
+JOB_SURA,4112,100
+JOB_GENETIC,4112,100
+JOB_SHADOW_CHASER,4112,100
+
+JOB_ROYAL_GUARD_T,4112,100
+JOB_SORCERER_T,4112,100
+JOB_MINSTREL_T,4112,100
+JOB_WANDERER_T,4112,100
+JOB_SURA_T,4112,100
+JOB_GENETIC_T,4112,100
+JOB_SHADOW_CHASER_T,4112,100
+
+JOB_RUNE_KNIGHT2,4112,100
+JOB_RUNE_KNIGHT_T2,4112,100
+JOB_ROYAL_GUARD2,4112,100
+JOB_ROYAL_GUARD_T2,4112,100
+JOB_RANGER2,4112,100
+JOB_RANGER_T2,4112,100
+JOB_MECHANIC2,4112,100
+JOB_MECHANIC_T2,4112,100
+
+JOB_BABY_RUNE_KNIGHT,4112,100
+JOB_BABY_WARLOCK,4112,100
+JOB_BABY_RANGER,4112,100
+JOB_BABY_ARCH_BISHOP,4112,100
+JOB_BABY_MECHANIC,4112,100
+JOB_BABY_GUILLOTINE_CROSS,4112,100
+JOB_BABY_ROYAL_GUARD,4112,100
+JOB_BABY_SORCERER,4112,100
+JOB_BABY_MINSTREL,4112,100
+JOB_BABY_WANDERER,4112,100
+JOB_BABY_SURA,4112,100
+JOB_BABY_GENETIC,4112,100
+JOB_BABY_SHADOW_CHASER,4112,100
+
+JOB_BABY_RUNE_KNIGHT2,4112,100
+JOB_BABY_ROYAL_GUARD2,4112,100
+JOB_BABY_RANGER2,4112,100
+JOB_BABY_MECHANIC2,4112,100
+
+JOB_SUPER_NOVICE_E,4112,100
+JOB_SUPER_BABY_E,4112,100
+
+JOB_KAGEROU,4112,100
+JOB_BABY_KAGEROU,4112,100
+JOB_OBORO,4112,100
+JOB_BABY_OBORO,4112,100
+
+JOB_REBELLION,4112,100
+JOB_BABY_REBELLION,4112,100
+
+JOB_SUMMONER,4112,100
+JOB_BABY_SUMMONER,4112,100
+
+JOB_STAR_EMPEROR,4112,100
+JOB_SOUL_REAPER,4112,100
+JOB_BABY_STAR_EMPEROR,4112,100
+JOB_BABY_SOUL_REAPER,4112,100
+JOB_STAR_EMPEROR2,4112,100
+JOB_BABY_STAR_EMPEROR2,4112,100
+
+JOB_DRAGON_KNIGHT,4112,100
+JOB_MEISTER,4112,100
+JOB_SHADOW_CROSS,4112,100
+JOB_ARCH_MAGE,4112,100
+JOB_CARDINAL,4112,100
+JOB_WINDHAWK,4112,100
+JOB_IMPERIAL_GUARD,4112,100
+JOB_BIOLO,4112,100
+JOB_ABYSS_CHASER,4112,100
+JOB_ELEMENTAL_MASTER,4112,100
+JOB_INQUISITOR,4112,100
+JOB_TROUBADOUR,4112,100
+JOB_TROUVERE,4112,100
+
+JOB_WINDHAWK2,4112,100
+JOB_MEISTER2,4112,100
+JOB_DRAGON_KNIGHT2,4112,100
+JOB_IMPERIAL_GUARD2,4112,100
+
+JOB_SKY_EMPEROR,4112,100
+JOB_SOUL_ASCETIC,4112,100
+JOB_SHINKIRO,4112,100
+JOB_SHIRANUI,4112,100
+JOB_NIGHT_WATCH,4112,100
+JOB_HYPER_NOVICE,4112,100
+JOB_SPIRIT_HANDLER,4112,100
+
+JOB_SKY_EMPEROR2,4112,100

db/re/job_stats.yml

@@ -8893,10 +8893,6 @@ Body:
         Crt: 1
       - Level: 55
         Sta: 1
-      - Level: 56
-        Sta: 1
-      - Level: 58
-        Con: 1
   - Jobs:
       Meister: true
       Meister2: true
@@ -9039,10 +9035,6 @@ Body:
         Wis: 1
       - Level: 55
         Pow: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Shadow_Cross: true
     MaxWeight: 32000
@@ -9184,10 +9176,6 @@ Body:
         Crt: 1
       - Level: 55
         Crt: 1
-      - Level: 57
-        Con: 1
-      - Level: 59
-        Crt: 1
   - Jobs:
       Arch_Mage: true
     MaxWeight: 30000
@@ -9329,10 +9317,6 @@ Body:
         Wis: 1
       - Level: 55
         Spl: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Spl: 1
   - Jobs:
       Cardinal: true
     MaxWeight: 30000
@@ -9475,10 +9459,6 @@ Body:
         Wis: 1
       - Level: 55
         Crt: 1
-      - Level: 56
-        Con: 1
-      - Level: 59
-        Spl: 1
   - Jobs:
       Windhawk: true
       Windhawk2: true
@@ -9621,10 +9601,6 @@ Body:
         Sta: 1
       - Level: 55
         Pow: 1
-      - Level: 57
-        Crt: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Imperial_Guard: true
       Imperial_Guard2: true
@@ -9768,10 +9744,6 @@ Body:
       - Level: 55
         Wis: 1
         Con: 1
-      - Level: 57
-        Pow: 1
-      - Level: 59
-        Spl: 1
   - Jobs:
       Biolo: true
     MaxWeight: 32000
@@ -9913,10 +9885,6 @@ Body:
         Crt: 1
       - Level: 55
         Con: 1
-      - Level: 56
-        Sta: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Abyss_Chaser: true
     MaxWeight: 28000
@@ -10058,10 +10026,6 @@ Body:
       - Level: 55
         Sta: 1
         Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Elemental_Master: true
     MaxWeight: 30000
@@ -10204,10 +10168,6 @@ Body:
         Wis: 1
       - Level: 55
         Spl: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Con: 1
   - Jobs:
       Inquisitor: true
     MaxWeight: 30000
@@ -10349,10 +10309,6 @@ Body:
       - Level: 55
         Pow: 1
         Wis: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Con: 1
   - Jobs:
       Troubadour: true
     MaxWeight: 32000
@@ -10494,10 +10450,6 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Trouvere: true
     MaxWeight: 32000
@@ -10640,10 +10592,6 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
-      - Level: 56
-        Spl: 1
-      - Level: 59
-        Pow: 1
   - Jobs:
       Sky_Emperor: true
     MaxWeight: 42000
@@ -10786,10 +10734,6 @@ Body:
       - Level: 55
         Pow: 1
         Con: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Con: 1
   - Jobs:
       Soul_Ascetic: true
     MaxWeight: 42000
@@ -10923,10 +10867,6 @@ Body:
         Sta: 1
       - Level: 55
         Spl: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Con: 1
   - Jobs:
       Shinkiro: true
     MaxWeight: 45000
@@ -11070,14 +11010,6 @@ Body:
         Sta: 1
       - Level: 55
         Sta: 1
-      - Level: 56
-        Int: 1
-        Dex: 1
-      - Level: 57
-        Wis: 1
-      - Level: 59
-        Int: 1
-        Spl: 1
   - Jobs:
       Shiranui: true
     MaxWeight: 45000
@@ -11209,14 +11141,6 @@ Body:
       - Level: 55
         Spl: 1
         Con: 1
-      - Level: 56
-        Str: 1
-      - Level: 57
-        Vit: 1
-        Spl: 1
-      - Level: 59
-        Str: 1
-        Pow: 1
   - Jobs:
       Night_Watch: true
     MaxWeight: 48000
@@ -11357,10 +11281,6 @@ Body:
         Wis: 1
       - Level: 55
         Pow: 1
-      - Level: 56
-        Wis: 1
-      - Level: 59
-        Crt: 1
   - Jobs:
       Hyper_Novice: true
     MaxWeight: 40000
@@ -11506,12 +11426,6 @@ Body:
         Sta: 1
       - Level: 55
         Spl: 1
-      - Level: 56
-        Dex: 1
-      - Level: 57
-        Pow: 1
-      - Level: 59
-        Spl: 1
   - Jobs:
       Spirit_Handler: true
     MaxWeight: 42000
@@ -11653,7 +11567,3 @@ Body:
         Wis: 1
       - Level: 55
         Sta: 1
-      - Level: 57
-        Spl: 1
-      - Level: 59
-        Pow: 1

db/re/mob_skill_db.txt

@@ -13606,7 +13606,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 +13638,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 +14239,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 +14339,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 +14570,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

db/re/quest_db.yml

@@ -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
@@ -8198,104 +8196,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 +9335,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 +11512,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 +11852,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 +12035,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

db/re/skill_db.yml

@@ -43018,10 +43018,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 +43044,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 +43060,6 @@ Body:
         Time: 25000
       - Level: 5
         Time: 20000
-    Cooldown: 35000
     Requires:
       SpCost:
         - Level: 1
@@ -43074,6 +43077,7 @@ Body:
     Name: HLIF_BRAIN
     Description: Brain Surgery
     MaxLevel: 5
+    SplashArea: 1
   - Id: 8004
     Name: HLIF_CHANGE
     Description: Change
@@ -43081,7 +43085,7 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
     Duration1:
       - Level: 1
         Time: 60000
@@ -43089,7 +43093,7 @@ Body:
         Time: 180000
       - Level: 3
         Time: 300000
-    Cooldown:
+    Duration2:
       - Level: 1
         Time: 600000
       - Level: 2
@@ -43106,8 +43110,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    AfterCastWalkDelay: 1000
-    Cooldown: 1000
+    Hit: Single
+    Duration2: 1000
     Requires:
       SpCost: 10
   - Id: 8006
@@ -43117,7 +43121,8 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
+    AfterCastActDelay: 30000
     Duration1:
       - Level: 1
         Time: 40000
@@ -43129,7 +43134,6 @@ Body:
         Time: 25000
       - Level: 5
         Time: 20000
-    Cooldown: 30000
     Requires:
       SpCost:
         - Level: 1
@@ -43147,6 +43151,8 @@ Body:
     Name: HAMI_SKIN
     Description: Adamantium Skin
     MaxLevel: 5
+    DamageFlags:
+      NoDamage: true
   - Id: 8008
     Name: HAMI_BLOODLUST
     Description: Bloodlust
@@ -43154,7 +43160,7 @@ Body:
     TargetType: Self
     DamageFlags:
       NoDamage: true
-    AfterCastWalkDelay: 1000
+    Hit: Single
     Duration1:
       - Level: 1
         Time: 60000
@@ -43162,7 +43168,7 @@ Body:
         Time: 180000
       - Level: 3
         Time: 300000
-    Cooldown:
+    Duration2:
       - Level: 1
         Time: 300000
       - Level: 2
@@ -43191,7 +43197,7 @@ Body:
         Count: -2
       - Level: 5
         Count: -3
-    Cooldown: 2000
+    AfterCastWalkDelay: 2000
     Requires:
       SpCost:
         - Level: 1
@@ -43212,7 +43218,6 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
-    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 60000
@@ -43224,7 +43229,7 @@ Body:
         Time: 45000
       - Level: 5
         Time: 40000
-    Cooldown:
+    Duration2:
       - Level: 1
         Time: 60000
       - Level: 2
@@ -43258,7 +43263,6 @@ Body:
       NoDamage: true
     Hit: Single
     CastCancel: true
-    AfterCastWalkDelay: 1000
     Duration1:
       - Level: 1
         Time: 60000
@@ -43270,7 +43274,7 @@ Body:
         Time: 45000
       - Level: 5
         Time: 40000
-    Cooldown:
+    Duration2:
       - Level: 1
         Time: 60000
       - Level: 2
@@ -43303,7 +43307,7 @@ Body:
     Range: 15
     Hit: Single
     HitCount: 1
-    Cooldown: 1000
+    AfterCastActDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8013
@@ -43325,7 +43329,7 @@ Body:
         Count: 4
       - Level: 5
         Count: 5
-    Cooldown:
+    AfterCastActDelay:
       - Level: 1
         Time: 2000
       - Level: 2
@@ -43356,8 +43360,8 @@ Body:
     DamageFlags:
       NoDamage: true
     Hit: Single
-    AfterCastWalkDelay: 1500
-    Cooldown: 3000
+    AfterCastActDelay: 3000
+    AfterCastWalkDelay: 3000
     Requires:
       SpCost: 40
   - Id: 8015
@@ -43381,8 +43385,7 @@ Body:
     HitCount: 1
     Element: Weapon
     SplashArea: 4
-    AfterCastActDelay: 5000
-    CoolDown: 1000
+    AfterCastWalkDelay: 1000
     Requires:
       SpCost: 1
   - Id: 8018

db/re/skill_nocast_db.txt

@@ -0,0 +1,249 @@
+// Forbidden Skills Database
+// Defines unusable skills in map types and zones.
+//
+// Structure of Database:
+// SkillID,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - cannot be used in normal maps
+// 2    - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
+// 4    - cannot be used in GvG maps
+// 8    - cannot be used in Battleground maps
+// 16   - cannot be used in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - cannot be used in zone 1 maps
+// 64   - cannot be used in zone 2 maps
+// 128  - cannot be used in zone 3 maps
+// 256  - cannot be used in zone 4 maps
+// 512  - cannot be used in zone 5 maps
+// 1024 - cannot be used in zone 6 maps
+// 2048 - cannot be used in zone 7 maps
+// 4096 - cannot be used in zone 8 maps
+// 8192 - cannot be used in zone 9 maps
+//
+// Example:
+// 8,6  // Endure cannot be used in PvP and GvG maps (2+4)
+
+//----------------------------------------------------------------------------
+// Normal
+//----------------------------------------------------------------------------
+308,1	//BD_ETERNALCHAOS
+311,1	//BD_ROKISWEIL
+317,1	//BA_DISSONANCE
+325,1	//DC_UGLYDANCE
+328,1	//DC_DONTFORGETME
+2422,1	//WM_LULLABY_DEEPSLEEP
+2423,1	//WM_SIRCLEOFNATURE
+2425,1	//WM_GLOOMYDAY
+2429,1	//WM_SOUND_OF_DESTRUCTION
+2430,1	//WM_SATURDAY_NIGHT_FEVER
+2432,1	//WM_MELODYOFSINK
+2433,1	//WM_BEYOND_OF_WARCRY
+2455,1	//SO_ARRULLO
+2299,1	//SC_MANHOLE
+5359,1	//TR_ROKI_CAPRICCIO
+5363,1	//TR_NIPELHEIM_REQUIEM
+5367,1	//EM_ACTIVITY_BURN
+
+//----------------------------------------------------------------------------
+// PVP
+//----------------------------------------------------------------------------
+2300,2	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// GVG
+//----------------------------------------------------------------------------
+26,4	//AL_TELEPORT
+27,4	//AL_WARP
+87,4	//WZ_ICEWALL
+150,4	//TF_BACKSLIDING
+219,4	//RG_INTIMIDATE
+336,4	//WE_CALLPARTNER
+361,4	//HP_ASSUMPTIO
+362,4	//HP_BASILICA
+395,4	//CG_MOONLIT
+409,4	//WE_CALLPARENT
+410,4	//WE_CALLBABY
+491,4	//CR_CULTIVATION
+530,4	//NJ_KIRIKAGE
+691,4	//CASH_ASSUMPTIO
+2300,4	//SC_DIMENSIONDOOR
+5063,4	//WE_CALLALLFAMILY
+462,4	//SL_KAIZEL
+
+//----------------------------------------------------------------------------
+// Battlegrounds
+//----------------------------------------------------------------------------
+26,8	//AL_TELEPORT
+27,8	//AL_WARP
+87,8	//WZ_ICEWALL
+150,8	//TF_BACKSLIDING
+219,8	//RG_INTIMIDATE
+264,8	//MO_BODYRELOCATION
+336,8	//WE_CALLPARTNER
+361,8	//HP_ASSUMPTIO
+362,8	//HP_BASILICA
+395,8	//CG_MOONLIT
+409,8	//WE_CALLPARENT
+410,8	//WE_CALLBABY
+411,8	//TK_RUN
+426,8	//TK_HIGHJUMP
+427,8	//SG_FEEL
+428,8	//SG_SUN_WARM
+429,8	//SG_MOON_WARM
+430,8	//SG_STAR_WARM
+431,8	//SG_SUN_COMFORT
+432,8	//SG_MOON_COMFORT
+433,8	//SG_STAR_COMFORT
+434,8	//SG_HATE
+435,8	//SG_SUN_ANGER
+436,8	//SG_MOON_ANGER
+437,8	//SG_STAR_ANGER
+438,8	//SG_SUN_BLESS
+439,8	//SG_MOON_BLESS
+440,8	//SG_STAR_BLESS
+491,8	//CR_CULTIVATION
+530,8	//NJ_KIRIKAGE
+691,8	//CASH_ASSUMPITO
+2300,8	//SC_DIMENSIONDOOR
+5063,8	//WE_CALLALLFAMILY
+5023,8	//SU_LOPE
+462,8	//SL_KAIZEL
+
+//----------------------------------------------------------------------------
+// Mixed
+//----------------------------------------------------------------------------
+488,3	//CG_HERMODE
+3013,3	//KO_KYOUGAKU
+
+//----------------------------------------------------------------------------
+// Restricted in WOE:TE Castles
+//----------------------------------------------------------------------------
+8,16	// SM_ENDURE
+26,16	// AL_TELEPORT
+27,16	// AL_WARP
+41,16	// MC_VENDING
+87,16	// WZ_ICEWALL
+147,16	// AC_MAKINGARROW
+150,16	// TF_BACKSLIDING
+211,16	// RG_STEALCOIN
+219,16	// RG_INTIMIDATE
+336,16	// WE_CALLPARTNER
+359,16	// LK_BERSERK
+361,16	// HP_ASSUMPTIO
+362,16	// HP_BASILICA
+389,16	// ST_CHASEWALK
+395,16	// CG_MOONLIT
+396,16	// CG_MARIONETTE
+409,16	// WE_CALLPARENT
+410,16	// WE_CALLBABY
+426,16	// TK_HIGHJUMP
+491,16	//CR_CULTIVATION
+529,16	// NJ_SHADOWJUMP
+// 530,16	// NJ_KIRIKAGE
+691,16	// CASH_ASSUMPTIO
+2300,16	// SC_DIMENSIONDOOR
+//!TODO: More 3rd Class skills
+// 2293,16	// SC_GROOMY
+// 2296,16	// SC_UNLUCKY
+// 2494,16	// GN_CHANGEMATERIAL
+// 2462,16	// SO_EL_ANALYSIS
+5063,16	//WE_CALLALLFAMILY
+
+//----------------------------------------------------------------------------
+// Zone 1 - Aldebaran Turbo Track
+//----------------------------------------------------------------------------
+8,32	//SM_ENDURE
+26,32	//AL_TELEPORT
+27,32	//AL_WARP
+35,32	//AL_CURE
+51,32	//TF_HIDING
+87,32	//WZ_ICEWALL
+135,32	//AS_CLOAKING
+219,32	//RG_INTIMIDATE
+264,32	//MO_BODYRELOCATION
+357,32	//LK_CONCENTRATION
+359,32	//LK_BERSERK
+362,32	//HP_BASILICA
+387,32	//WS_CARTBOOST
+389,32	//ST_CHASEWALK
+395,32	//CG_MOONLIT
+2300,32	//SC_DIMENSIONDOOR
+2478,32	//GN_CARTBOOST
+
+//----------------------------------------------------------------------------
+// Zone 2 - Jail
+//----------------------------------------------------------------------------
+421,64	//TK_JUMPKICK
+426,64	//TK_HIGHJUMP
+5023,64	//SU_LOPE
+
+//----------------------------------------------------------------------------
+// Zone 3 - Izlude Battle Arena
+//----------------------------------------------------------------------------
+219,128 //RG_INTIMIDATE
+26,128	//AL_TELEPORT
+2300,128	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 4 - WoE:SE
+//----------------------------------------------------------------------------
+426,256 //TK_HIGHJUMP
+290,256	//SA_ABRACADABRA
+5023,256	//SU_LOPE
+462,256	//SL_KAIZEL
+
+//----------------------------------------------------------------------------
+// Zone 5 - Sealed Shrine
+//----------------------------------------------------------------------------
+12,512	//MG_SAFETYWALL
+26,512	//AL_TELEPORT
+219,512	//RG_INTIMIDATE
+361,512	//HP_ASSUMPTIO
+691,512	//CASH_ASSUMPTIO
+2294,512	//SC_IGNORANCE
+2300,512	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 6 - Endless Tower, Orc's Memory, Nidhoggur's Nest
+//----------------------------------------------------------------------------
+26,1024	//AL_TELEPORT
+87,1024	//WZ_ICEWALL
+219,1024	//RG_INTIMIDATE
+405,1024	//PF_SPIDERWEB
+674,1024	//NPC_EXPULSION
+2294,1024	//SC_IGNORANCE
+2300,1024	//SC_DIMENSIONDOOR
+
+//----------------------------------------------------------------------------
+// Zone 7 - Towns
+//----------------------------------------------------------------------------
+232,2048	//AM_CANNIBALIZE
+233,2048	//AM_SPHEREMINE
+491,2048	//CR_CULTIVATION
+1013,2048	//BS_GREED
+2419,2048	//WM_POEMOFNETHERWORLD
+2482,2048	//GN_WALLOFTHORN
+2493,2048	//GN_SLINGITEM
+
+//----------------------------------------------------------------------------
+// Zone 8 - WOE:TE Dungeons
+//----------------------------------------------------------------------------
+336,4096 // WE_CALLPARTNER
+409,4096 // WE_CALLPARENT
+410,4096 // WE_CALLBABY
+5063,4096	//WE_CALLALLFAMILY
+
+//----------------------------------------------------------------------------
+// Zone 9 - Wave Mode
+//----------------------------------------------------------------------------
+26,8192	//AL_TELEPORT
+87,8192	//WZ_ICEWALL
+197,8192	//NPC_EMOTION
+219,8192	//RG_INTIMIDATE
+405,8192	//PF_SPIDERWEB
+474,8192	//NPC_EMOTION_ON
+674,8192	//NPC_EXPULSION
+2284,8192	//SC_FATALMENACE
+2294,8192	//SC_IGNORANCE
+2300,8192	//SC_DIMENSIONDOOR

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

db/re/status.yml

@@ -86,7 +86,7 @@ Body:
     Opt1: StoneWait
     Flags:
       SendOption: true
-      BossResist: true
+      BossResist: true      
       StopAttacking: true
     Fail:
       Whiteimprison: true
@@ -1822,7 +1822,6 @@ Body:
     Icon: EFST_ETERNALCHAOS
     DurationLookup: BD_ETERNALCHAOS
     CalcFlags:
-      Def: true
       Def2: true
     Flags:
       NoDispell: true
@@ -2601,17 +2600,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 +2614,6 @@ Body:
     CalcFlags:
       Batk: true
       Watk: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
   - Status: Fleet
     DurationLookup: HFLI_FLEET
     CalcFlags:
@@ -2635,11 +2627,7 @@ Body:
   - Status: Defence
     DurationLookup: HAMI_DEFENCE
     CalcFlags:
-      Def: true
       Vit: true
-    Flags:
-      NoSave: true
-      RemoveFromHomOnMapWarp: true
   - Status: Incaspdrate
     CalcFlags:
       Aspd: true
@@ -4138,7 +4126,7 @@ Body:
       Unlimitedhummingvoice: true
       Sircleofnature: true
   - Status: Deepsleep
-    Icon: EFST_DEEP_SLEEP
+    Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
     DurationLookup: WM_LULLABY_DEEPSLEEP
     States:
       NoCast: true
@@ -7022,9 +7010,7 @@ Body:
     CalcFlags:
       Regen: true
   - Status: Earthshaker
-    Icon: EFST_EARTHSHAKER
     Flags:
-      BlEffect: true
       NoWarning: true
   - Status: Weaponblock_On
     Icon: EFST_WEAPONBLOCK_ON
@@ -7039,7 +7025,6 @@ Body:
     Icon: EFST_SPORE_EXPLOSION_DEBUFF
     DurationLookup: GN_SPORE_EXPLOSION
     Flags:
-      BlEffect: true
       NoDispell: true
       NoBanishingBuster: true
       NoClearance: true
@@ -7461,7 +7446,7 @@ Body:
       NoClearance: true
       NoClearbuff: true
   - Status: Madogear
-    Icon: EFST_MADOGEAR_TYPE
+    Icon: EFST_MADOGEAR
     CalcFlags:
       Speed: true
     Flags:
@@ -7975,8 +7960,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 +8011,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 +8035,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

db/status_disabled.txt

@@ -0,0 +1,505 @@
+// Status Change Restriction Database
+//
+// Defines restrictions of status changes (SC).
+// Disabled SC will always be removed or fail to be inflicted on this map.
+//
+// Structure of Database:
+// SCType,Flag
+//
+// Legend for 'Flag' field (bitmask):
+// 1    - restricted in normal maps
+// 2    - restricted in PVP
+// 4    - restricted in GVG
+// 8    - restricted in Battlegrounds
+// 16   - restricted in WOE:TE castles
+// Restricted zones - configured by 'restricted <number>' mapflag
+// 32   - restricted in zone 1
+// 64   - restricted in zone 2
+// 128  - restricted in zone 3
+// 256  - restricted in zone 4
+// 512  - restricted in zone 5
+// 1024 - restricted in zone 6
+// 2048 - restricted in zone 7
+// 4096 - restricted in zone 8
+//
+// Example:
+// SC_ENDURE,4   // Endure status will be removed when the player enters GvG and WoE Castle maps; Also cannot be inflicted again.
+
+//----------------------------------------------------------------------------
+// Disabled/Removed statuses in WoE:TE Castles (16)
+//----------------------------------------------------------------------------
+SC_ENDURE,16
+SC_BERSERK,16
+SC_ASSUMPTIO,16
+
+// RUNE_KNIGHT
+SC_ENCHANTBLADE,16
+SC_DEATHBOUND,16
+SC_MILLENNIUMSHIELD,16
+SC_CRUSHSTRIKE,16
+SC_REFRESH,16
+SC_REUSE_REFRESH,16
+SC_GIANTGROWTH,16
+SC_STONEHARDSKIN,16
+SC_VITALITYACTIVATION,16
+SC_STORMBLAST,16
+SC_FIGHTINGSPIRIT,16
+SC_ABUNDANCE,16
+
+// ARCH_BISHOP
+SC_ADORAMUS,16
+SC_EPICLESIS,16
+SC_ORATIO,16
+SC_LAUDAAGNUS,16
+SC_LAUDARAMUS,16
+SC_RENOVATIO,16
+SC_EXPIATIO,16
+SC_DUPLELIGHT,16
+SC_SECRAMENT,16
+
+// WARLOCK
+SC_WHITEIMPRISON,16
+SC_MARSHOFABYSS,16
+SC_RECOGNIZEDSPELL,16
+SC_STASIS,16
+SC_SPHERE_1,16
+SC_SPHERE_2,16
+SC_SPHERE_3,16
+SC_SPHERE_4,16
+SC_SPHERE_5,16
+SC_READING_SB,16
+SC_FREEZE_SP,16
+SC_SPELLBOOK1,16
+SC_SPELLBOOK2,16
+SC_SPELLBOOK3,16
+SC_SPELLBOOK4,16
+SC_SPELLBOOK5,16
+SC_SPELLBOOK6,16
+SC_MAXSPELLBOOK,16
+
+// RANGER
+SC_FEARBREEZE,16
+SC_ELECTRICSHOCKER,16
+SC_WUGDASH,16
+SC_BITE,16
+SC_CAMOUFLAGE,16
+
+// MECHANIC
+SC_ACCELERATION,16
+SC_HOVERING,16
+SC_SHAPESHIFT,16
+SC_INFRAREDSCAN,16
+SC_ANALYZE,16
+SC_MAGNETICFIELD,16
+SC_NEUTRALBARRIER,16
+SC_NEUTRALBARRIER_MASTER,16
+SC_STEALTHFIELD,16
+SC_STEALTHFIELD_MASTER,16
+SC_OVERHEAT,16
+SC_OVERHEAT_LIMITPOINT,16
+
+// GUILLOTINE_CROSS
+SC_VENOMIMPRESS,16
+SC_POISONINGWEAPON,16
+SC_WEAPONBLOCKING,16
+SC_CLOAKINGEXCEED,16
+SC_HALLUCINATIONWALK,16
+SC_HALLUCINATIONWALK_POSTDELAY,16
+SC_ROLLINGCUTTER,16
+SC_TOXIN,16
+SC_PARALYSE,16
+SC_VENOMBLEED,16
+SC_MAGICMUSHROOM,16
+SC_DEATHHURT,16
+SC_PYREXIA,16
+SC_OBLIVIONCURSE,16
+SC_LEECHESEND,16
+
+// ROYAL_GUARD
+SC_REFLECTDAMAGE,16
+SC_FORCEOFVANGUARD,16
+SC_SHIELDSPELL_HP,16
+SC_SHIELDSPELL_SP,16
+SC_SHIELDSPELL_ATK,16
+SC_EXEEDBREAK,16
+SC_PRESTIGE,16
+SC_BANDING,16
+SC_BANDING_DEFENCE,16
+SC_EARTHDRIVE,16
+SC_INSPIRATION,16
+
+// SORCERER
+SC_SPELLFIST,16
+SC_CRYSTALIZE,16
+SC_STRIKING,16
+SC_WARMER,16
+SC_VACUUM_EXTREME,16
+SC_PROPERTYWALK,16
+SC_VACUUM_EXTREME_POSTDELAY,16
+
+// MINSTREL
+SC_SWINGDANCE,16
+SC_SYMPHONYOFLOVER,16
+SC_MOONLITSERENADE,16
+SC_RUSHWINDMILL,16
+SC_ECHOSONG,16
+SC_HARMONIZE,16
+
+// WANDERER
+SC_VOICEOFSIREN,16
+SC_DEEPSLEEP,16
+SC_SIRCLEOFNATURE,16
+SC_GLOOMYDAY,16
+SC_GLOOMYDAY_SK,16
+
+// MINSTREL & WANDERER
+SC_SONGOFMANA,16
+SC_DANCEWITHWUG,16
+SC_SATURDAYNIGHTFEVER,16
+SC_LERADSDEW,16
+SC_MELODYOFSINK,16
+SC_BEYONDOFWARCRY,16
+SC_UNLIMITEDHUMMINGVOICE,16
+
+// SURA
+SC_SITDOWN_FORCE,16
+SC_NETHERWORLD,16
+SC_CRESCENTELBOW,16
+SC_CURSEDCIRCLE_ATKER,16
+SC_CURSEDCIRCLE_TARGET,16
+SC_LIGHTNINGWALK,16
+SC_RAISINGDRAGON,16
+SC_GT_ENERGYGAIN,16
+SC_GT_CHANGE,16
+SC_GT_REVITALIZE,16
+SC_GN_CARTBOOST,16
+
+// GENETIC
+SC_THORNSTRAP,16
+SC_BLOODSUCKER,16
+SC_SMOKEPOWDER,16
+SC_TEARGAS,16
+SC_MANDRAGORA,16
+SC_STOMACHACHE,16
+SC_MYSTERIOUS_POWDER,16
+SC_MELON_BOMB,16
+SC_BANANA_BOMB,16
+SC_BANANA_BOMB_SITDOWN,16
+SC_SAVAGE_STEAK,16
+SC_COCKTAIL_WARG_BLOOD,16
+SC_MINOR_BBQ,16
+SC_SIROMA_ICE_TEA,16
+SC_DROCERA_HERB_STEAMED,16
+SC_PUTTI_TAILS_NOODLES,16
+SC_BOOST500,16
+SC_FULL_SWING_K,16
+SC_MANA_PLUS,16
+SC_MUSTLE_M,16
+SC_LIFE_FORCE_F,16
+SC_EXTRACT_WHITE_POTION_Z,16
+SC_VITATA_500,16
+SC_EXTRACT_SALAMINE_JUICE,16
+
+// Homunculus
+SC_STYLE_CHANGE,16
+SC_TINDER_BREAKER,16
+SC_TINDER_BREAKER2,16
+SC_CBC,16
+SC_EQC,16
+SC_GOLDENE_FERSE,16
+SC_ANGRIFFS_MODUS,16
+SC_OVERED_BOOST,16
+SC_LIGHT_OF_REGENE,16
+SC_ASH,16
+SC_GRANITIC_ARMOR,16
+SC_MAGMA_FLOW,16
+SC_PYROCLASTIC,16
+SC_PARALYSIS,16
+SC_PAIN_KILLER,16
+
+// SHADOW_CHASER
+SC__REPRODUCE,16
+SC__AUTOSHADOWSPELL,16
+SC__SHADOWFORM,16
+SC__BODYPAINT,16
+SC__INVISIBILITY,16
+SC__DEADLYINFECT,16
+SC__ENERVATION,16
+SC__GROOMY,16
+SC__IGNORANCE,16
+SC__LAZINESS,16
+SC__UNLUCKY,16
+SC__WEAKNESS,16
+SC__STRIPACCESSORY,16
+SC__MANHOLE,16
+SC__BLOODYLUST,16
+
+// Elemental SORCERER
+SC_CIRCLE_OF_FIRE,16
+SC_CIRCLE_OF_FIRE_OPTION,16
+SC_FIRE_CLOAK,16
+SC_FIRE_CLOAK_OPTION,16
+SC_WATER_SCREEN,16
+SC_WATER_SCREEN_OPTION,16
+SC_WATER_DROP,16
+SC_WATER_DROP_OPTION,16
+SC_WATER_BARRIER,16
+SC_WIND_STEP,16
+SC_WIND_STEP_OPTION,16
+SC_WIND_CURTAIN,16
+SC_WIND_CURTAIN_OPTION,16
+SC_ZEPHYR,16
+SC_SOLID_SKIN,16
+SC_SOLID_SKIN_OPTION,16
+SC_STONE_SHIELD,16
+SC_STONE_SHIELD_OPTION,16
+SC_POWER_OF_GAIA,16
+SC_PYROTECHNIC,16
+SC_PYROTECHNIC_OPTION,16
+SC_HEATER,16
+SC_HEATER_OPTION,16
+SC_TROPIC,16
+SC_TROPIC_OPTION,16
+SC_AQUAPLAY,16
+SC_AQUAPLAY_OPTION,16
+SC_COOLER,16
+SC_COOLER_OPTION,16
+SC_CHILLY_AIR,16
+SC_CHILLY_AIR_OPTION,16
+SC_GUST,16
+SC_GUST_OPTION,16
+SC_BLAST,16
+SC_BLAST_OPTION,16
+SC_WILD_STORM,16
+SC_WILD_STORM_OPTION,16
+SC_PETROLOGY,16
+SC_PETROLOGY_OPTION,16
+SC_CURSED_SOIL,16
+SC_CURSED_SOIL_OPTION,16
+SC_UPHEAVAL,16
+SC_UPHEAVAL_OPTION,16
+SC_TIDAL_WEAPON,16
+SC_TIDAL_WEAPON_OPTION,16
+SC_ROCK_CRUSHER,16
+SC_ROCK_CRUSHER_ATK,16
+SC_FIRE_INSIGNIA,16
+SC_WATER_INSIGNIA,16
+SC_WIND_INSIGNIA,16
+SC_EARTH_INSIGNIA,16
+
+// KAGEROU / OBORO
+SC_MEIKYOUSISUI,16
+SC_JYUMONJIKIRI,16
+SC_KYOUGAKU,16
+SC_IZAYOI,16
+SC_ZENKAI,16
+SC_KAGEHUMI,16
+SC_KYOMU,16
+SC_KAGEMUSYA,16
+SC_ZANGETSU,16
+SC_GENSOU,16
+SC_AKAITSUKI,16
+
+//Summoner
+SC_SUHIDE,16
+SC_SU_STOOP,16
+SC_SPRITEMABLE,16
+SC_CATNIPPOWDER,16
+SC_SV_ROOTTWIST,16
+SC_BITESCAR,16
+SC_ARCLOUSEDASH,16
+SC_TUNAPARTY,16
+SC_SHRIMP,16
+SC_FRESHSHRIMP,16
+
+// Rebellion
+SC_HEAT_BARREL,16
+SC_MAGICALBULLET,16
+SC_P_ALTER,16
+SC_E_CHAIN,16
+SC_C_MARKER,16
+SC_ANTI_M_BLAST,16
+SC_B_TRAP,16
+SC_H_MINE,16
+SC_QD_SHOT_READY,16
+
+// Star Emperor
+SC_LIGHTOFMOON,16
+SC_LIGHTOFSUN,16
+SC_LIGHTOFSTAR,16
+SC_LUNARSTANCE,16
+SC_UNIVERSESTANCE,16
+SC_SUNSTANCE,16
+SC_FLASHKICK,16
+SC_NEWMOON,16
+SC_STARSTANCE,16
+SC_DIMENSION,16
+SC_DIMENSION1,16
+SC_DIMENSION2,16
+SC_CREATINGSTAR,16
+SC_FALLINGSTAR,16
+SC_NOVAEXPLOSING,16
+SC_GRAVITYCONTROL,16
+
+// Soul Reaper
+SC_SOULCOLLECT,16
+SC_SOULREAPER,16
+SC_SOULUNITY,16
+SC_SOULSHADOW,16
+SC_SOULFAIRY,16
+SC_SOULFALCON,16
+SC_SOULGOLEM,16
+SC_SOULDIVISION,16
+SC_SOULENERGY,16
+SC_USE_SKILL_SP_SPA,16
+SC_USE_SKILL_SP_SHA,16
+SC_SP_SHA,16
+SC_SOULCURSE,16
+
+// Others
+SC_FEAR,16
+SC_BURNING,16
+SC_FREEZING,16
+SC_TEARGAS_SOB,16
+SC__FEINTBOMB,16
+SC__CHAOS,16
+
+// 4th Job Common Status
+SC_HANDICAPSTATE_DEEPBLIND,16
+SC_HANDICAPSTATE_DEEPSILENCE,16
+SC_HANDICAPSTATE_LASSITUDE,16
+SC_HANDICAPSTATE_FROSTBITE,16
+SC_HANDICAPSTATE_SWOONING,16
+SC_HANDICAPSTATE_LIGHTNINGSTRIKE,16
+SC_HANDICAPSTATE_CRYSTALLIZATION,16
+SC_HANDICAPSTATE_CONFLAGRATION,16
+SC_HANDICAPSTATE_MISFORTUNE,16
+SC_HANDICAPSTATE_DEADLYPOISON,16
+SC_HANDICAPSTATE_DEPRESSION,16
+SC_HANDICAPSTATE_HOLYFLAME,16
+
+// Dragon Knight
+SC_SERVANTWEAPON,16
+SC_SERVANT_SIGN,16
+SC_CHARGINGPIERCE,16
+SC_CHARGINGPIERCE_COUNT,16
+SC_DRAGONIC_AURA,16
+SC_VIGOR,16
+
+// Arch Mage
+SC_DEADLY_DEFEASANCE,16
+SC_CLIMAX_DES_HU,16
+SC_CLIMAX,16
+SC_CLIMAX_EARTH,16
+SC_CLIMAX_BLOOM,16
+SC_CLIMAX_CRYIMP,16
+
+// Windhawk
+SC_WINDSIGN,16
+SC_CRESCIVEBOLT,16
+SC_CALAMITYGALE,16
+
+// Cardinal
+SC_MEDIALE,16
+SC_A_VITA,16
+SC_A_TELUM,16
+SC_PRE_ACIES,16
+SC_COMPETENTIA,16
+SC_RELIGIO,16
+SC_BENEDICTUM,16
+
+// Meister
+SC_AXE_STOMP,16
+SC_A_MACHINE,16
+SC_D_MACHINE,16
+SC_ABR_BATTLE_WARIOR,16
+SC_ABR_DUAL_CANNON,16
+SC_ABR_MOTHER_NET,16
+SC_ABR_INFINITY,16
+
+// Shadow Cross
+SC_SHADOW_EXCEED,16
+SC_DANCING_KNIFE,16
+SC_POTENT_VENOM,16
+SC_SHADOW_SCAR,16
+SC_E_SLASH_COUNT,16
+SC_SHADOW_WEAPON,16
+
+// Imperial Guard
+SC_GUARD_STANCE,16
+SC_ATTACK_STANCE,16
+SC_GUARDIAN_S,16
+SC_REBOUND_S,16
+SC_HOLY_S,16
+SC_ULTIMATE_S,16
+SC_SPEAR_SCAR,16
+SC_SHIELD_POWER,16
+
+// Elemental Master
+SC_SPELL_ENCHANTING,16
+SC_SUMMON_ELEMENTAL_ARDOR,16
+SC_SUMMON_ELEMENTAL_DILUVIO,16
+SC_SUMMON_ELEMENTAL_PROCELLA,16
+SC_SUMMON_ELEMENTAL_TERREMOTUS,16
+SC_SUMMON_ELEMENTAL_SERPENS,16
+SC_ELEMENTAL_VEIL,16
+
+// Troubadour/Trouvere
+SC_MYSTIC_SYMPHONY,16
+SC_KVASIR_SONATA,16
+SC_SOUNDBLEND,16
+SC_GEF_NOCTURN,16
+SC_AIN_RHAPSODY,16
+SC_MUSICAL_INTERLUDE,16
+SC_JAWAII_SERENADE,16
+SC_PRON_MARCH,16
+SC_ROSEBLOSSOM,16
+
+// Inquisitor
+SC_POWERFUL_FAITH,16
+SC_SINCERE_FAITH,16
+SC_FIRM_FAITH,16
+SC_HOLY_OIL,16
+SC_FIRST_BRAND,16
+SC_SECOND_BRAND,16
+SC_SECOND_JUDGE,16
+SC_THIRD_EXOR_FLAME,16
+SC_FIRST_FAITH_POWER,16
+SC_MASSIVE_F_BLASTER,16
+
+// Biolo
+SC_PROTECTSHADOWEQUIP,16
+SC_RESEARCHREPORT,16
+SC_BO_HELL_DUSTY,16
+SC_BIONIC_WOODENWARRIOR,16
+SC_BIONIC_WOODEN_FAIRY,16
+SC_BIONIC_CREEPER,16
+SC_BIONIC_HELLTREE,16
+
+// Abyss Chaser
+SC_SHADOW_STRIP,16
+SC_ABYSS_DAGGER,16
+SC_ABYSSFORCEWEAPON,16
+SC_ABYSS_SLAYER,16
+
+// Super Elementals
+SC_FLAMETECHNIC,16
+SC_FLAMETECHNIC_OPTION,16
+SC_FLAMEARMOR,16
+SC_FLAMEARMOR_OPTION,16
+SC_COLD_FORCE,16
+SC_COLD_FORCE_OPTION,16
+SC_CRYSTAL_ARMOR,16
+SC_CRYSTAL_ARMOR_OPTION,16
+SC_GRACE_BREEZE,16
+SC_GRACE_BREEZE_OPTION,16
+SC_EYES_OF_STORM,16
+SC_EYES_OF_STORM_OPTION,16
+SC_EARTH_CARE,16
+SC_EARTH_CARE_OPTION,16
+SC_STRONG_PROTECTION,16
+SC_STRONG_PROTECTION_OPTION,16
+SC_DEEP_POISONING,16
+SC_DEEP_POISONING_OPTION,16
+SC_POISON_SHIELD,16
+SC_POISON_SHIELD_OPTION,16

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 |
 ==============================

doc/map_zones.txt

@@ -1,76 +0,0 @@
-//===== rAthena Documentation ================================
-//= Map Zone Structure
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Last Updated: ========================================
-//= 20240112
-//===== Description: =========================================
-//= This file describes the functions of map zones, which
-//= determine the behavior of a map in various situations.
-//============================================================
-
----------------------------------------
-
-Id: Zone ID (constant). These are defined in e_map_type::clif.hpp.
-
----------------------------------------
-
-DisabledCommands: @commands can be disabled for players below a certain group level.
-Setting the group level to 0 will remove from the DisabledCommands list. Useful for imports.
-
-  heal: 70 # Makes @heal usable only to those group level 70 and above.
-
----------------------------------------
-
-DisabledSkills: Skills can be disabled for different game object types below a certain group level.
-Setting the group level to 0 will remove from the DisabledSkills list. Useful for imports.
-
-Object Types:
-Pc   - Player
-Mob  - Monster
-Hom  - Homunculus
-Mer  - Mercenary
-Elem - Elemental
-Npc  - NPC
-
-  - Skill: AL_TELEPORT #  Disables Teleport for players, monsters, homunculi, and mercenary.
-    Pc: 100
-    Mob: 100
-    Hom: 100
-    Mer: 100
-  - Skill: AL_WARP # Disables Warp Portal for players.
-    Pc: 100
-
----------------------------------------
-
-DisabledItems: Items can be disabled from being used or equipped for players below a certain group level.
-Setting the group level to 0 will remove from the DisabledItems list. Useful for imports.
-
-  Apple: 100 # Apple will not be able to be consumed by anyone.
-  Cap: 100 # Cap will not be able to be equipped by anyone.
-  Hat: 0 # Hat will be able to be equipped by all. Useful for import.
-
----------------------------------------
-
-DisabledStatuses: Statuses can be disabled in a zone for players below a certain group level. These
-statuses, if active, will be removed when entering a zone and will not be able to be re-applied while in the zone.
-Setting the group level to 0 will remove from the DisabledStatuses list. Useful for imports.
-
-  Endure: 100 # Endure will be disabled from activing and being applied within the zone.
-
----------------------------------------
-
-RestrictedJobs: Jobs can be disabled from entering a zone for players below a certain group level.
-Setting the group level to 0 will remove from the RestrictedJobs list. Useful for imports.
-
-  Priest: 30 # Makes the Priest job unable to enter the map zone to those group level less than 30.
-
----------------------------------------
-
-Mapflags: Mapflags that are applies to a zone. By default, the Value label is 1/true/on.
-
-  - Flag: NoTeleport # Sets the 'noteleport' mapflag to the zone.
-  - Flag: Skill_Duration
-	Value: AL_SANCTUARY,400 # Sets the 'skill_duration' mapflag to the zone.
-  - Flag: NoMemo # Removes the 'nomemo' mapflag to the zone. Useful for import.
-    Clear: true

doc/mapflags.txt

@@ -174,6 +174,24 @@ Disables skill usage on a map.
 
 ---------------------------------------
 
+*restricted	<zone>
+
+Disables certain items and skills on a map through a specified zone number. The zone databases are
+located in 'db/(pre-)re/item_noequip.txt' and 'db/(pre-)re/skill_nocast_db.txt', both of which
+contain explanations and examples of how this mapflag is used.
+
+Restricted Zones:
+1 - Aldebaran Turbo Track
+2 - Jail
+3 - Izlude Battle Arena
+4 - WoE:SE Maps
+5 - Sealed Shrine
+6 - Instances: Endless Tower, Orc's Memory, Nidhoggr's Instance
+7 - Towns
+8 - WOE:TE Dungeons
+
+---------------------------------------
+
 *monster_noteleport
 
 Prevents monsters from teleporting on a map, including through the skill RG_INTIMIDATE.
@@ -282,16 +300,6 @@ Disable RODex on a map.
 
 ---------------------------------------
 
-*nobonusitemdrop
-
-Disable the following item bonuses on a map.
- - bAddMonsterDropItem
- - bAddClassDropItem
- - bAddMonsterDropItemGroup
- - bAddClassDropItemGroup
-
----------------------------------------
-
 =====================
 | 2. Battle-related |
 =====================
@@ -388,69 +396,6 @@ prtg_cas01	mapflag	skill_duration	HT_ANKLESNARE,400
 
 ---------------------------------------
 
-*invincible_time {<duration>}
-
-Sets the duration (in milliseconds) for when a player loads onto a map with how long they are invincible for.
-The duration is cancelled if the player walks or interacts in any fashion.
-
-Duration defaults to 5 seconds if the value is not specified.
-
----------------------------------------
-
-*noknockback
-
-Disables knockback on a map.
-
----------------------------------------
-
-*hidedamage
-
-Disables the damage display on a map.
-
----------------------------------------
-
-*weapon_damage_rate	{<rate>}
-
-Weapon skills damage adjustments.
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
-
----------------------------------------
-
-*magic_damage_rate	{<rate>}
-
-Magic skills damage adjustments.
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
-
----------------------------------------
-
-*misc_damage_rate	{<rate>}
-
-Misc skills damage adjustments.
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
-
----------------------------------------
-
-*short_damage_rate	{<rate>}
-
-Melee damage adjustments (non-skill).
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
-
----------------------------------------
-
-*long_damage_rate	{<rate>}
-
-Ranged damage adjustments (non-skill).
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 100.
-
----------------------------------------
-
-*flee_penalty	{<rate>}
-
-Flee penalty applied to players.
-<rate> is given as a percentage (i.e. 60 = 60%). Defaulted to 20.
-
----------------------------------------
-
 ==================
 | 3. Map Effects |
 ==================
@@ -479,6 +424,12 @@ Displays night mode effects on a map. This is used on most outdoor maps.
 ====================
 ---------------------------------------
 
+*town
+
+Marks a map as a town. This allows players to access their mail and disables kill stealing.
+
+---------------------------------------
+
 *reset
 
 Allows usage of item Neuralizer (ID 12213).
@@ -523,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.
-
----------------------------------------

doc/script_commands.txt

@@ -6124,12 +6124,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
@@ -8509,15 +8508,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
@@ -10691,7 +10681,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.
 
 ---------------------------------------
 

doc/skill_db.txt

@@ -81,7 +81,6 @@ IsShadowSpell				- Make skill available for SC_AUTOSHADOWSPELL.
 IsChorus					- Chorus skill.
 IgnoreBgReduction			- Ignore Battleground reduction.
 IgnoreGvgReduction			- Ignore GvG reduction.
-IgnorePKReduction			- Ignore PK reduction.
 DisableNearNpc				- Disable self/ground skills near NPC. In tandem with NoNearNpc node.
 TargetTrap					- Damage traps. If TargetType is Trap.
 IgnoreLandProtector			- Ignore SA_LANDPROTECTOR.

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.

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

npc/custom/battleground/bg_pvp.txt

@@ -14,19 +14,6 @@
 //= 1.1 Use up to date battleground script commands [AnnieRuru]
 //============================================================
 
-//= Enable applicable mapflags
-//guild_vs3	mapflag	gvg	off
-//guild_vs3	mapflag	battleground	2
-//guild_vs3	mapflag	nosave	SavePoint
-//guild_vs3	mapflag	nowarp
-//guild_vs3	mapflag	nowarpto
-//guild_vs3	mapflag	noteleport
-//guild_vs3	mapflag	nomemo
-//guild_vs3	mapflag	nopenalty
-//guild_vs3	mapflag	nobranch
-//guild_vs3	mapflag	noicewall
-//guild_vs3	mapflag	hidemobhpbar
-
 -	script	bg_pvp#control	-1,{
 OnInit:
 	.minplayer2start = 2;      // minimum players to start (ex. if 3vs3, set to 3)
@@ -120,3 +107,15 @@ OnStart:
 	waitingroom "Blue Team", getvariableofnpc( .minplayer2start, "bg_pvp#control" ) +1, "bg_pvp#control::OnStart", getvariableofnpc( .minplayer2start, "bg_pvp#control" );
 	end;
 }
+
+guild_vs3	mapflag	gvg	off
+guild_vs3	mapflag	battleground	2
+guild_vs3	mapflag	nosave	SavePoint
+guild_vs3	mapflag	nowarp
+guild_vs3	mapflag	nowarpto
+guild_vs3	mapflag	noteleport
+guild_vs3	mapflag	nomemo
+guild_vs3	mapflag	nopenalty
+guild_vs3	mapflag	nobranch
+guild_vs3	mapflag	noicewall
+guild_vs3	mapflag	hidemobhpbar

npc/custom/official/GeffenMagicTournament.txt

@@ -4830,3 +4830,33 @@ OnInstanceInit:
 	hideonnpc instance_npcname("Handsome Adventurer#gef");
 	end;
 }
+
+1@gef	mapflag	nowarp
+1@gef	mapflag	nomemo
+1@gef	mapflag	noteleport
+1@gef	mapflag	monster_noteleport
+1@gef	mapflag	nosave
+1@gef	mapflag	nobranch
+1@gef	mapflag	nowarpto
+1@gef	mapflag	noicewall
+1@gef	mapflag	restricted	9
+
+1@ge_st	mapflag	nowarp
+1@ge_st	mapflag	nomemo
+1@ge_st	mapflag	noteleport
+1@ge_st	mapflag	monster_noteleport
+1@ge_st	mapflag	nosave
+1@ge_st	mapflag	nobranch
+1@ge_st	mapflag	nowarpto
+1@ge_st	mapflag	noicewall
+1@ge_st	mapflag	restricted	9
+
+1@gef_in	mapflag	nowarp
+1@gef_in	mapflag	nomemo
+1@gef_in	mapflag	noteleport
+1@gef_in	mapflag	monster_noteleport
+1@gef_in	mapflag	nosave
+1@gef_in	mapflag	nobranch
+1@gef_in	mapflag	nowarpto
+1@gef_in	mapflag	noicewall
+1@gef_in	mapflag	restricted	9

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);

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;

npc/kafras/kafras.txt

@@ -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";
-}

npc/mapflag/gvg.txt

@@ -0,0 +1,99 @@
+//===== rAthena Script =======================================
+//= Mapflag: Guild versus Guild mode.
+//===== Description: =========================================
+//= Players can attack other guilds, and will have their guild
+//= icons shown. WoE damage reductions will also take place.
+//= gvg: Turns on GvG mode.
+//= gvg_castle: Describes castle maps for WoE.
+//= gvg_dungeon: Describes dungeon maps for WoE.
+//= gvg_te: Turns on GvG mode for WoE:TE.
+//= gvg_te_castle: Describes castle maps for WoE:TE.
+//===== Changelogs: ==========================================
+//= 1.1 Added Novice Guild Castles.
+//= 1.2 Updated with new meanings of gvg and gvg_castle.
+//= 1.3 Renewal split. [Euphy]
+//= 1.4 Disable costumes in GvG castles. [Aleos]
+//============================================================
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	gvg
+guild_vs2	mapflag	gvg
+guild_vs3	mapflag	gvg
+guild_vs4	mapflag	gvg
+guild_vs5	mapflag	gvg
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	gvg_castle
+aldeg_cas02	mapflag	gvg_castle
+aldeg_cas03	mapflag	gvg_castle
+aldeg_cas04	mapflag	gvg_castle
+aldeg_cas05	mapflag	gvg_castle
+gefg_cas01	mapflag	gvg_castle
+gefg_cas02	mapflag	gvg_castle
+gefg_cas03	mapflag	gvg_castle
+gefg_cas04	mapflag	gvg_castle
+gefg_cas05	mapflag	gvg_castle
+payg_cas01	mapflag	gvg_castle
+payg_cas02	mapflag	gvg_castle
+payg_cas03	mapflag	gvg_castle
+payg_cas04	mapflag	gvg_castle
+payg_cas05	mapflag	gvg_castle
+prtg_cas01	mapflag	gvg_castle
+prtg_cas02	mapflag	gvg_castle
+prtg_cas03	mapflag	gvg_castle
+prtg_cas04	mapflag	gvg_castle
+prtg_cas05	mapflag	gvg_castle
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	gvg_castle
+schg_cas02	mapflag	gvg_castle
+schg_cas03	mapflag	gvg_castle
+schg_cas04	mapflag	gvg_castle
+schg_cas05	mapflag	gvg_castle
+arug_cas01	mapflag	gvg_castle
+arug_cas02	mapflag	gvg_castle
+arug_cas03	mapflag	gvg_castle
+arug_cas04	mapflag	gvg_castle
+arug_cas05	mapflag	gvg_castle
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+//n_castle	mapflag	gvg_castle
+nguild_alde	mapflag	gvg_castle
+nguild_gef	mapflag	gvg_castle
+nguild_pay	mapflag	gvg_castle
+nguild_prt	mapflag	gvg_castle
+
+//============================================================
+// Guild Dungeons
+//============================================================
+arug_dun01	mapflag	gvg_dungeon
+schg_dun01	mapflag	gvg_dungeon
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	gvg
+2009rwc_02	mapflag	gvg
+2009rwc_03	mapflag	gvg
+2009rwc_04	mapflag	gvg
+2009rwc_05	mapflag	gvg
+2009rwc_06	mapflag	gvg
+2009rwc_07	mapflag	gvg
+2009rwc_08	mapflag	gvg
+2009rwc_f01	mapflag	gvg
+2012rwc_01	mapflag	gvg
+2012rwc_02	mapflag	gvg
+2012rwc_03	mapflag	gvg
+2012rwc_04	mapflag	gvg
+2012rwc_05	mapflag	gvg
+2012rwc_06	mapflag	gvg
+2012rwc_07	mapflag	gvg
+2012rwc_08	mapflag	gvg

npc/mapflag/gvg_noparty.txt

@@ -0,0 +1,37 @@
+//===== rAthena Script =======================================
+//= Mapflag: gvg_noparty.
+//===== Description: =========================================
+//= Ignores party alliances on GvG-enabled maps.
+//===== Changelogs: ==========================================
+//= 1.0 First Version. [Capuche]
+//============================================================
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	gvg_noparty
+guild_vs2	mapflag	gvg_noparty
+guild_vs3	mapflag	gvg_noparty
+guild_vs4	mapflag	gvg_noparty
+guild_vs5	mapflag	gvg_noparty
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	gvg_noparty
+2009rwc_02	mapflag	gvg_noparty
+2009rwc_03	mapflag	gvg_noparty
+2009rwc_04	mapflag	gvg_noparty
+2009rwc_05	mapflag	gvg_noparty
+2009rwc_06	mapflag	gvg_noparty
+2009rwc_07	mapflag	gvg_noparty
+2009rwc_08	mapflag	gvg_noparty
+2009rwc_f01	mapflag	gvg_noparty
+2012rwc_01	mapflag	gvg_noparty
+2012rwc_02	mapflag	gvg_noparty
+2012rwc_03	mapflag	gvg_noparty
+2012rwc_04	mapflag	gvg_noparty
+2012rwc_05	mapflag	gvg_noparty
+2012rwc_06	mapflag	gvg_noparty
+2012rwc_07	mapflag	gvg_noparty
+2012rwc_08	mapflag	gvg_noparty

npc/mapflag/hidemobhpbar.txt

@@ -0,0 +1,193 @@
+//===== rAthena Script =======================================
+//= Mapflag: hidemobhpbar.
+//===== Description: =========================================
+//= Hide monster's HP bar (added in episode 14.2).
+//===== Changelogs: ==========================================
+//= 1.0 First Version. [Lemongrass]
+//============================================================
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_1-1	mapflag	hidemobhpbar
+pvp_y_1-2	mapflag	hidemobhpbar
+pvp_y_1-3	mapflag	hidemobhpbar
+pvp_y_1-4	mapflag	hidemobhpbar
+pvp_y_1-5	mapflag	hidemobhpbar
+pvp_y_2-1	mapflag	hidemobhpbar
+pvp_y_2-2	mapflag	hidemobhpbar
+pvp_y_2-3	mapflag	hidemobhpbar
+pvp_y_2-4	mapflag	hidemobhpbar
+pvp_y_2-5	mapflag	hidemobhpbar
+pvp_y_3-1	mapflag	hidemobhpbar
+pvp_y_3-2	mapflag	hidemobhpbar
+pvp_y_3-3	mapflag	hidemobhpbar
+pvp_y_3-4	mapflag	hidemobhpbar
+pvp_y_3-5	mapflag	hidemobhpbar
+pvp_y_4-1	mapflag	hidemobhpbar
+pvp_y_4-2	mapflag	hidemobhpbar
+pvp_y_4-3	mapflag	hidemobhpbar
+pvp_y_4-4	mapflag	hidemobhpbar
+pvp_y_4-5	mapflag	hidemobhpbar
+pvp_y_5-1	mapflag	hidemobhpbar
+pvp_y_5-2	mapflag	hidemobhpbar
+pvp_y_5-3	mapflag	hidemobhpbar
+pvp_y_5-4	mapflag	hidemobhpbar
+pvp_y_5-5	mapflag	hidemobhpbar
+pvp_y_6-1	mapflag	hidemobhpbar
+pvp_y_6-2	mapflag	hidemobhpbar
+pvp_y_6-3	mapflag	hidemobhpbar
+pvp_y_6-4	mapflag	hidemobhpbar
+pvp_y_6-5	mapflag	hidemobhpbar
+pvp_y_7-1	mapflag	hidemobhpbar
+pvp_y_7-2	mapflag	hidemobhpbar
+pvp_y_7-3	mapflag	hidemobhpbar
+pvp_y_7-4	mapflag	hidemobhpbar
+pvp_y_7-5	mapflag	hidemobhpbar
+pvp_y_8-1	mapflag	hidemobhpbar
+pvp_y_8-2	mapflag	hidemobhpbar
+pvp_y_8-3	mapflag	hidemobhpbar
+pvp_y_8-4	mapflag	hidemobhpbar
+pvp_y_8-5	mapflag	hidemobhpbar
+pvp_n_1-1	mapflag	hidemobhpbar
+pvp_n_1-2	mapflag	hidemobhpbar
+pvp_n_1-3	mapflag	hidemobhpbar
+pvp_n_1-4	mapflag	hidemobhpbar
+pvp_n_1-5	mapflag	hidemobhpbar
+pvp_n_2-1	mapflag	hidemobhpbar
+pvp_n_2-2	mapflag	hidemobhpbar
+pvp_n_2-3	mapflag	hidemobhpbar
+pvp_n_2-4	mapflag	hidemobhpbar
+pvp_n_2-5	mapflag	hidemobhpbar
+pvp_n_3-1	mapflag	hidemobhpbar
+pvp_n_3-2	mapflag	hidemobhpbar
+pvp_n_3-3	mapflag	hidemobhpbar
+pvp_n_3-4	mapflag	hidemobhpbar
+pvp_n_3-5	mapflag	hidemobhpbar
+pvp_n_4-1	mapflag	hidemobhpbar
+pvp_n_4-2	mapflag	hidemobhpbar
+pvp_n_4-3	mapflag	hidemobhpbar
+pvp_n_4-4	mapflag	hidemobhpbar
+pvp_n_4-5	mapflag	hidemobhpbar
+pvp_n_5-1	mapflag	hidemobhpbar
+pvp_n_5-2	mapflag	hidemobhpbar
+pvp_n_5-3	mapflag	hidemobhpbar
+pvp_n_5-4	mapflag	hidemobhpbar
+pvp_n_5-5	mapflag	hidemobhpbar
+pvp_n_6-1	mapflag	hidemobhpbar
+pvp_n_6-2	mapflag	hidemobhpbar
+pvp_n_6-3	mapflag	hidemobhpbar
+pvp_n_6-4	mapflag	hidemobhpbar
+pvp_n_6-5	mapflag	hidemobhpbar
+pvp_n_7-1	mapflag	hidemobhpbar
+pvp_n_7-2	mapflag	hidemobhpbar
+pvp_n_7-3	mapflag	hidemobhpbar
+pvp_n_7-4	mapflag	hidemobhpbar
+pvp_n_7-5	mapflag	hidemobhpbar
+pvp_n_8-1	mapflag	hidemobhpbar
+pvp_n_8-2	mapflag	hidemobhpbar
+pvp_n_8-3	mapflag	hidemobhpbar
+pvp_n_8-4	mapflag	hidemobhpbar
+pvp_n_8-5	mapflag	hidemobhpbar
+pvp_2vs2	mapflag	hidemobhpbar
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_e_4	mapflag	hidemobhpbar
+turbo_e_8	mapflag	hidemobhpbar
+turbo_e_16	mapflag	hidemobhpbar
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	hidemobhpbar
+guild_vs2	mapflag	hidemobhpbar
+guild_vs3	mapflag	hidemobhpbar
+guild_vs4	mapflag	hidemobhpbar
+guild_vs5	mapflag	hidemobhpbar
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	hidemobhpbar
+aldeg_cas02	mapflag	hidemobhpbar
+aldeg_cas03	mapflag	hidemobhpbar
+aldeg_cas04	mapflag	hidemobhpbar
+aldeg_cas05	mapflag	hidemobhpbar
+gefg_cas01	mapflag	hidemobhpbar
+gefg_cas02	mapflag	hidemobhpbar
+gefg_cas03	mapflag	hidemobhpbar
+gefg_cas04	mapflag	hidemobhpbar
+gefg_cas05	mapflag	hidemobhpbar
+payg_cas01	mapflag	hidemobhpbar
+payg_cas02	mapflag	hidemobhpbar
+payg_cas03	mapflag	hidemobhpbar
+payg_cas04	mapflag	hidemobhpbar
+payg_cas05	mapflag	hidemobhpbar
+prtg_cas01	mapflag	hidemobhpbar
+prtg_cas02	mapflag	hidemobhpbar
+prtg_cas03	mapflag	hidemobhpbar
+prtg_cas04	mapflag	hidemobhpbar
+prtg_cas05	mapflag	hidemobhpbar
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	hidemobhpbar
+schg_cas02	mapflag	hidemobhpbar
+schg_cas03	mapflag	hidemobhpbar
+schg_cas04	mapflag	hidemobhpbar
+schg_cas05	mapflag	hidemobhpbar
+arug_cas01	mapflag	hidemobhpbar
+arug_cas02	mapflag	hidemobhpbar
+arug_cas03	mapflag	hidemobhpbar
+arug_cas04	mapflag	hidemobhpbar
+arug_cas05	mapflag	hidemobhpbar
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+//n_castle	mapflag	hidemobhpbar
+nguild_alde	mapflag	hidemobhpbar
+nguild_gef	mapflag	hidemobhpbar
+nguild_pay	mapflag	hidemobhpbar
+nguild_prt	mapflag	hidemobhpbar
+
+//============================================================
+// Guild Dungeons
+//============================================================
+arug_dun01	mapflag	hidemobhpbar
+schg_dun01	mapflag	hidemobhpbar
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	hidemobhpbar
+bat_c02	mapflag	hidemobhpbar
+bat_c03	mapflag	hidemobhpbar
+bat_b01	mapflag	hidemobhpbar
+bat_b02	mapflag	hidemobhpbar
+bat_a01	mapflag	hidemobhpbar
+bat_a02	mapflag	hidemobhpbar
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	hidemobhpbar
+2009rwc_02	mapflag	hidemobhpbar
+2009rwc_03	mapflag	hidemobhpbar
+2009rwc_04	mapflag	hidemobhpbar
+2009rwc_05	mapflag	hidemobhpbar
+2009rwc_06	mapflag	hidemobhpbar
+2009rwc_07	mapflag	hidemobhpbar
+2009rwc_08	mapflag	hidemobhpbar
+2009rwc_f01	mapflag	hidemobhpbar
+2012rwc_01	mapflag	hidemobhpbar
+2012rwc_02	mapflag	hidemobhpbar
+2012rwc_03	mapflag	hidemobhpbar
+2012rwc_04	mapflag	hidemobhpbar
+2012rwc_05	mapflag	hidemobhpbar
+2012rwc_06	mapflag	hidemobhpbar
+2012rwc_07	mapflag	hidemobhpbar
+2012rwc_08	mapflag	hidemobhpbar

npc/mapflag/jail.txt

@@ -0,0 +1,48 @@
+//===== rAthena Script =======================================
+//= Mapflag: Jail.
+//===== Description: ========================================= 
+//= Jail specific restrictions, only for map sec_pri
+//= pvp: Turns on PvP mode
+//= pvp_noparty: Can't attack player in same party
+//= nomemo: No Warp Portal Memory Point allowed.
+//= nowarp: Disables warping from the map.
+//= noreturn: Disables specific warp consumables.
+//= pvp_nightmaredrop: Players drop items/equipment on death.
+//= nosave: No respawn point saving allowed.
+//= noteleport: No Teleporting allowed.  No fly wings or butterfly wings.
+//= hidemobhpbar: No HP bar will be displayed for monsters.
+//= restricted: Disables items configured in item_noequip.txt
+//=				and skills configured in skill_nocast_db.txt.
+//===== Additional Comments: ================================= 
+//= 1.0 Initial script.
+//============================================================
+
+// No Memory
+sec_pri	mapflag	nomemo
+
+// No Save
+sec_pri	mapflag	nosave	SavePoint
+
+// No Teleport
+sec_pri	mapflag	noteleport
+
+// No Warp
+sec_pri	mapflag	nowarp
+
+// No Return
+sec_pri	mapflag	noreturn
+
+// PvP
+sec_pri	mapflag	pvp
+
+// No Party
+sec_pri	mapflag	pvp_noparty
+
+// Nightmare Equipment Drops
+sec_pri	mapflag	pvp_nightmaredrop	random,equip,300
+
+// Hide Monster HP bar
+sec_pri	mapflag	hidemobhpbar
+
+// Item and Skill restrictions
+sec_pri	mapflag	restricted	2

npc/mapflag/night.txt

@@ -0,0 +1,304 @@
+//===== rAthena Script =======================================
+//= Mapflag: Night mode.
+//===== Description: ========================================= 
+//= Enables night mode effects.
+//===== Additional Comments: ================================= 
+//= 1.0 Initial script. [Skotlex]
+//= 1.1 Renewal split. [Euphy]
+//============================================================
+
+alb2trea	mapflag	nightenabled
+alberta	mapflag	nightenabled
+aldebaran	mapflag	nightenabled
+gef_fild00	mapflag	nightenabled
+gef_fild01	mapflag	nightenabled
+gef_fild02	mapflag	nightenabled
+gef_fild03	mapflag	nightenabled
+gef_fild04	mapflag	nightenabled
+gef_fild05	mapflag	nightenabled
+gef_fild06	mapflag	nightenabled
+gef_fild07	mapflag	nightenabled
+gef_fild08	mapflag	nightenabled
+gef_fild09	mapflag	nightenabled
+gef_fild10	mapflag	nightenabled
+gef_fild11	mapflag	nightenabled
+geffen	mapflag	nightenabled
+glast_01	mapflag	nightenabled
+izlu2dun	mapflag	nightenabled
+izlude	mapflag	nightenabled
+mjolnir_01	mapflag	nightenabled
+mjolnir_02	mapflag	nightenabled
+mjolnir_03	mapflag	nightenabled
+mjolnir_04	mapflag	nightenabled
+mjolnir_05	mapflag	nightenabled
+mjolnir_06	mapflag	nightenabled
+mjolnir_07	mapflag	nightenabled
+mjolnir_08	mapflag	nightenabled
+mjolnir_09	mapflag	nightenabled
+mjolnir_10	mapflag	nightenabled
+mjolnir_11	mapflag	nightenabled
+mjolnir_12	mapflag	nightenabled
+moc_fild01	mapflag	nightenabled
+moc_fild02	mapflag	nightenabled
+moc_fild03	mapflag	nightenabled
+//moc_fild04	mapflag	nightenabled
+//moc_fild05	mapflag	nightenabled
+//moc_fild06	mapflag	nightenabled
+moc_fild07	mapflag	nightenabled
+//moc_fild08	mapflag	nightenabled
+//moc_fild09	mapflag	nightenabled
+//moc_fild10	mapflag	nightenabled
+moc_fild11	mapflag	nightenabled
+moc_fild12	mapflag	nightenabled
+moc_fild13	mapflag	nightenabled
+//moc_fild14	mapflag	nightenabled
+//moc_fild15	mapflag	nightenabled
+moc_fild16	mapflag	nightenabled
+moc_fild17	mapflag	nightenabled
+moc_fild18	mapflag	nightenabled
+moc_fild19	mapflag	nightenabled
+moc_fild20	mapflag	nightenabled
+moc_fild21	mapflag	nightenabled
+moc_fild22	mapflag	nightenabled
+moc_ruins	mapflag	nightenabled
+morocc	mapflag	nightenabled
+pay_arche	mapflag	nightenabled
+pay_fild01	mapflag	nightenabled
+pay_fild02	mapflag	nightenabled
+pay_fild03	mapflag	nightenabled
+pay_fild04	mapflag	nightenabled
+pay_fild05	mapflag	nightenabled
+pay_fild06	mapflag	nightenabled
+pay_fild07	mapflag	nightenabled
+pay_fild08	mapflag	nightenabled
+pay_fild09	mapflag	nightenabled
+pay_fild10	mapflag	nightenabled
+pay_fild11	mapflag	nightenabled
+prontera	mapflag	nightenabled
+prt_fild00	mapflag	nightenabled
+prt_fild01	mapflag	nightenabled
+prt_fild02	mapflag	nightenabled
+prt_fild03	mapflag	nightenabled
+prt_fild04	mapflag	nightenabled
+prt_fild05	mapflag	nightenabled
+prt_fild06	mapflag	nightenabled
+prt_fild07	mapflag	nightenabled
+prt_fild08	mapflag	nightenabled
+prt_fild09	mapflag	nightenabled
+prt_fild10	mapflag	nightenabled
+prt_fild11	mapflag	nightenabled
+prt_monk	mapflag	nightenabled
+pvp_y_1-1	mapflag	nightenabled
+pvp_y_1-2	mapflag	nightenabled
+pvp_y_1-3	mapflag	nightenabled
+pvp_y_1-4	mapflag	nightenabled
+pvp_y_1-5	mapflag	nightenabled
+pvp_y_2-1	mapflag	nightenabled
+pvp_y_2-2	mapflag	nightenabled
+pvp_y_2-3	mapflag	nightenabled
+pvp_y_2-4	mapflag	nightenabled
+pvp_y_2-5	mapflag	nightenabled
+pvp_y_3-1	mapflag	nightenabled
+pvp_y_3-2	mapflag	nightenabled
+pvp_y_3-3	mapflag	nightenabled
+pvp_y_3-4	mapflag	nightenabled
+pvp_y_3-5	mapflag	nightenabled
+pvp_y_4-1	mapflag	nightenabled
+pvp_y_4-2	mapflag	nightenabled
+pvp_y_4-3	mapflag	nightenabled
+pvp_y_4-4	mapflag	nightenabled
+pvp_y_4-5	mapflag	nightenabled
+pvp_y_5-1	mapflag	nightenabled
+pvp_y_5-2	mapflag	nightenabled
+pvp_y_5-3	mapflag	nightenabled
+pvp_y_5-4	mapflag	nightenabled
+pvp_y_5-5	mapflag	nightenabled
+pvp_y_6-1	mapflag	nightenabled
+pvp_y_6-2	mapflag	nightenabled
+pvp_y_6-3	mapflag	nightenabled
+pvp_y_6-4	mapflag	nightenabled
+pvp_y_6-5	mapflag	nightenabled
+pvp_y_7-1	mapflag	nightenabled
+pvp_y_7-2	mapflag	nightenabled
+pvp_y_7-3	mapflag	nightenabled
+pvp_y_7-4	mapflag	nightenabled
+pvp_y_7-5	mapflag	nightenabled
+pvp_y_8-1	mapflag	nightenabled
+pvp_y_8-2	mapflag	nightenabled
+pvp_y_8-3	mapflag	nightenabled
+pvp_y_8-4	mapflag	nightenabled
+pvp_y_8-5	mapflag	nightenabled
+xmas	mapflag	nightenabled
+xmas_fild01	mapflag	nightenabled
+cmd_fild01	mapflag	nightenabled
+cmd_fild02	mapflag	nightenabled
+cmd_fild03	mapflag	nightenabled
+cmd_fild04	mapflag	nightenabled
+cmd_fild05	mapflag	nightenabled
+cmd_fild06	mapflag	nightenabled
+cmd_fild07	mapflag	nightenabled
+cmd_fild08	mapflag	nightenabled
+cmd_fild09	mapflag	nightenabled
+gef_fild12	mapflag	nightenabled
+gef_fild13	mapflag	nightenabled
+gef_fild14	mapflag	nightenabled
+tur_dun01	mapflag	nightenabled
+alde_gld	mapflag	nightenabled
+pay_gld	mapflag	nightenabled
+prt_gld	mapflag	nightenabled
+yuno	mapflag	nightenabled
+yuno_fild01	mapflag	nightenabled
+yuno_fild02	mapflag	nightenabled
+yuno_fild03	mapflag	nightenabled
+yuno_fild04	mapflag	nightenabled
+ama_fild01	mapflag	nightenabled
+amatsu	mapflag	nightenabled
+gon_fild01	mapflag	nightenabled
+gonryun	mapflag	nightenabled
+umbala	mapflag	nightenabled
+um_fild01	mapflag	nightenabled
+um_fild02	mapflag	nightenabled
+um_fild03	mapflag	nightenabled
+um_fild04	mapflag	nightenabled
+lou_fild01	mapflag	nightenabled
+louyang	mapflag	nightenabled
+jawaii	mapflag	nightenabled
+gefenia01	mapflag	nightenabled
+gefenia02	mapflag	nightenabled
+gefenia03	mapflag	nightenabled
+gefenia04	mapflag	nightenabled
+payon	mapflag	nightenabled
+ayothaya	mapflag	nightenabled
+ayo_fild01	mapflag	nightenabled
+ayo_fild02	mapflag	nightenabled
+yuno_fild05	mapflag	nightenabled
+yuno_fild07	mapflag	nightenabled
+yuno_fild08	mapflag	nightenabled
+yuno_fild09	mapflag	nightenabled
+yuno_fild11	mapflag	nightenabled
+yuno_fild12	mapflag	nightenabled
+einbech	mapflag	nightenabled
+einbroch	mapflag	nightenabled
+ein_fild06	mapflag	nightenabled
+ein_fild07	mapflag	nightenabled
+ein_fild08	mapflag	nightenabled
+ein_fild09	mapflag	nightenabled
+ein_fild10	mapflag	nightenabled
+ein_fild03	mapflag	nightenabled
+ein_fild04	mapflag	nightenabled
+lhz_fild02	mapflag	nightenabled
+lhz_fild03	mapflag	nightenabled
+lhz_fild01	mapflag	nightenabled
+lighthalzen	mapflag	nightenabled
+lhz_in01	mapflag	nightenabled
+lhz_in02	mapflag	nightenabled
+lhz_in03	mapflag	nightenabled
+hu_fild07	mapflag	nightenabled
+hu_fild05	mapflag	nightenabled
+hu_fild04	mapflag	nightenabled
+hu_fild01	mapflag	nightenabled
+yuno_fild06	mapflag	nightenabled
+tha_scene01	mapflag	nightenabled
+hugel	mapflag	nightenabled
+p_track01	mapflag	nightenabled
+p_track02	mapflag	nightenabled
+odin_tem01	mapflag	nightenabled
+odin_tem02	mapflag	nightenabled
+odin_tem03	mapflag	nightenabled
+hu_fild02	mapflag	nightenabled
+hu_fild03	mapflag	nightenabled
+hu_fild06	mapflag	nightenabled
+ein_fild01	mapflag	nightenabled
+ein_fild02	mapflag	nightenabled
+ein_fild05	mapflag	nightenabled
+yuno_fild10	mapflag	nightenabled
+rachel	mapflag	nightenabled
+ra_fild01	mapflag	nightenabled
+ra_fild02	mapflag	nightenabled
+ra_fild03	mapflag	nightenabled
+ra_fild04	mapflag	nightenabled
+ra_fild05	mapflag	nightenabled
+ra_fild06	mapflag	nightenabled
+ra_fild07	mapflag	nightenabled
+ra_fild08	mapflag	nightenabled
+ra_fild09	mapflag	nightenabled
+ra_fild10	mapflag	nightenabled
+ra_fild11	mapflag	nightenabled
+ra_fild12	mapflag	nightenabled
+ra_fild13	mapflag	nightenabled
+ra_temple	mapflag	nightenabled
+ra_temsky	mapflag	nightenabled
+veins	mapflag	nightenabled
+ve_fild01	mapflag	nightenabled
+ve_fild02	mapflag	nightenabled
+ve_fild03	mapflag	nightenabled
+ve_fild04	mapflag	nightenabled
+ve_fild05	mapflag	nightenabled
+ve_fild06	mapflag	nightenabled
+ve_fild07	mapflag	nightenabled
+
+//============================================================
+// Episode 12
+//============================================================
+poring_c01	mapflag	nightenabled
+poring_c02	mapflag	nightenabled
+nameless_i	mapflag	nightenabled
+nameless_n	mapflag	nightenabled
+poring_w01	mapflag	nightenabled
+poring_w02	mapflag	nightenabled
+moscovia	mapflag	nightenabled
+mosk_ship	mapflag	nightenabled
+mosk_fild01	mapflag	nightenabled
+mosk_fild02	mapflag	nightenabled
+mosk_dun01	mapflag	nightenabled
+mosk_dun02	mapflag	nightenabled
+mosk_dun03	mapflag	nightenabled
+que_temsky	mapflag	nightenabled
+sch_gld	mapflag	nightenabled
+aru_gld	mapflag	nightenabled
+que_qsch01	mapflag	nightenabled
+que_qsch02	mapflag	nightenabled
+que_qsch03	mapflag	nightenabled
+que_qsch04	mapflag	nightenabled
+que_qsch05	mapflag	nightenabled
+que_qaru01	mapflag	nightenabled
+que_qaru02	mapflag	nightenabled
+que_qaru03	mapflag	nightenabled
+que_qaru04	mapflag	nightenabled
+que_qaru05	mapflag	nightenabled
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nightenabled
+bat_c02	mapflag	nightenabled
+bat_c03	mapflag	nightenabled
+
+//============================================================
+// Endless Tower
+//============================================================
+e_tower	mapflag	nightenabled
+
+//============================================================
+// Episode 13
+//============================================================
+mid_camp	mapflag	nightenabled
+man_fild01	mapflag	nightenabled
+man_fild03	mapflag	nightenabled
+spl_fild02	mapflag	nightenabled
+spl_fild03	mapflag	nightenabled
+moc_fild22b	mapflag	nightenabled
+que_dan01	mapflag	nightenabled
+schg_que01	mapflag	nightenabled
+arug_que01	mapflag	nightenabled
+nyd_dun01	mapflag	nightenabled
+nyd_dun02	mapflag	nightenabled
+manuk	mapflag	nightenabled
+man_fild02	mapflag	nightenabled
+splendide	mapflag	nightenabled
+spl_fild01	mapflag	nightenabled
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	nightenabled

npc/mapflag/nightmare.txt

@@ -0,0 +1,52 @@
+//===== rAthena Script =======================================
+//= Mapflag: Nightmare mode.
+//===== Description: ========================================= 
+//= Players drop items/equipment on death.
+//= pvp_nightmaredrop	id,type,percent
+//=   id: Drop a specific item ID or "random"
+//=   type: "inventory", "equip", or "all"
+//=   percent: Rate of item drop.
+//===== Additional Comments: ================================= 
+//= 1.0 Initial script.
+//============================================================
+
+pvp_n_1-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-1	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-2	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-3	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-4	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_1-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_2-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_3-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_4-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_5-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_6-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_7-5	mapflag	pvp_nightmaredrop	random,equip,300
+pvp_n_8-5	mapflag	pvp_nightmaredrop	random,equip,300

npc/mapflag/nobranch.txt

@@ -0,0 +1,398 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable Dead Branch use.
+//===== Description: ========================================= 
+//= Disables the following items:
+//=   Dead Branch (604), Bloody Branch (12103),
+//=   Red Pouch (12024), Poring Box (12109)
+//===== Additional Comments: ================================= 
+//= 1.3 Updated. [massdriller]
+//= 1.6a Updated. [Lupus]
+//= 1.7 Added all novice maps. [L0ne_W0lf]
+//= 1.8 Removed restriction on PVP maps. [L0ne_W0lf]
+//= 1.9 Updated. [L0ne_W0lf]
+//= 2.0 Renewal split. [Euphy]
+//============================================================
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+alberta	mapflag	nobranch
+aldebaran	mapflag	nobranch
+amatsu	mapflag	nobranch
+ayothaya	mapflag	nobranch
+comodo	mapflag	nobranch
+einbroch	mapflag	nobranch
+einbech	mapflag	nobranch
+geffen	mapflag	nobranch
+gonryun	mapflag	nobranch
+izlude	mapflag	nobranch
+jawaii	mapflag	nobranch
+hugel	mapflag	nobranch
+lighthalzen	mapflag	nobranch
+louyang	mapflag	nobranch
+morocc	mapflag	nobranch
+niflheim	mapflag	nobranch
+prontera	mapflag	nobranch
+payon	mapflag	nobranch
+pay_arche	mapflag	nobranch
+umbala	mapflag	nobranch
+xmas	mapflag	nobranch
+yuno	mapflag	nobranch
+rachel	mapflag	nobranch
+veins	mapflag	nobranch
+ayo_in01	mapflag	nobranch
+ayo_in02	mapflag	nobranch
+alb_ship	mapflag	nobranch
+alberta_in	mapflag	nobranch
+aldeba_in	mapflag	nobranch
+ama_in01	mapflag	nobranch
+ama_in02	mapflag	nobranch
+ama_test	mapflag	nobranch
+cmd_in01	mapflag	nobranch
+cmd_in02	mapflag	nobranch
+gef_tower	mapflag	nobranch
+geffen_in	mapflag	nobranch
+gon_in	mapflag	nobranch
+gon_test	mapflag	nobranch
+in_orcs01	mapflag	nobranch
+izlude_in	mapflag	nobranch
+jawaii_in	mapflag	nobranch
+lou_in01	mapflag	nobranch
+lou_in02	mapflag	nobranch
+moc_castle	mapflag	nobranch
+morocc_in	mapflag	nobranch
+moscovia	mapflag	nobranch
+mosk_in	mapflag	nobranch
+nif_in	mapflag	nobranch
+payon_in01	mapflag	nobranch
+payon_in02	mapflag	nobranch
+payon_in03	mapflag	nobranch
+prt_castle	mapflag	nobranch
+prt_church	mapflag	nobranch
+prt_in	mapflag	nobranch
+um_in	mapflag	nobranch
+xmas_in	mapflag	nobranch
+yuno_in01	mapflag	nobranch
+yuno_in02	mapflag	nobranch
+yuno_in03	mapflag	nobranch
+yuno_in04	mapflag	nobranch
+yuno_in05	mapflag	nobranch
+ein_in01	mapflag	nobranch
+yuno_pre	mapflag	nobranch
+lhz_in01	mapflag	nobranch
+lhz_in02	mapflag	nobranch
+lhz_in03	mapflag	nobranch
+lhz_que01	mapflag	nobranch
+lhz_cube	mapflag	nobranch
+hu_in01	mapflag	nobranch
+auction_01	mapflag	nobranch
+auction_02	mapflag	nobranch
+ra_in01	mapflag	nobranch
+ra_temin	mapflag	nobranch
+ra_temple	mapflag	nobranch
+ra_temsky	mapflag	nobranch
+ve_in	mapflag	nobranch
+ve_in02	mapflag	nobranch
+thor_camp	mapflag	nobranch
+cave	mapflag	nobranch
+
+//============================================================
+// Airport
+//============================================================
+airport	mapflag	nobranch
+airplane	mapflag	nobranch
+airplane_01	mapflag	nobranch
+y_airport	mapflag	nobranch
+lhz_airport	mapflag	nobranch
+
+//============================================================
+// Novice Starter Zone
+//============================================================
+new_zone01	mapflag	nobranch
+new_zone02	mapflag	nobranch
+new_zone03	mapflag	nobranch
+new_zone04	mapflag	nobranch
+new_1-1	mapflag	nobranch
+new_1-2	mapflag	nobranch
+new_1-3	mapflag	nobranch
+new_1-4	mapflag	nobranch
+new_2-1	mapflag	nobranch
+new_2-2	mapflag	nobranch
+new_2-3	mapflag	nobranch
+new_2-4	mapflag	nobranch
+new_3-1	mapflag	nobranch
+new_3-2	mapflag	nobranch
+new_3-3	mapflag	nobranch
+new_3-4	mapflag	nobranch
+new_4-1	mapflag	nobranch
+new_4-2	mapflag	nobranch
+new_4-3	mapflag	nobranch
+new_4-4	mapflag	nobranch
+new_5-1	mapflag	nobranch
+new_5-2	mapflag	nobranch
+new_5-3	mapflag	nobranch
+new_5-4	mapflag	nobranch
+
+//============================================================
+// Job Quests
+//============================================================
+job_sword1	mapflag	nobranch
+job_thief1	mapflag	nobranch
+// 2-1 Classes
+job_knt	mapflag	nobranch
+job_prist	mapflag	nobranch
+job_wiz	mapflag	nobranch
+job_hunte	mapflag	nobranch
+in_hunter	mapflag	nobranch
+in_moc_16	mapflag	nobranch
+// 2-2 Classes
+alde_alche	mapflag	nobranch
+job_cru	mapflag	nobranch
+job_duncer	mapflag	nobranch
+job_monk	mapflag	nobranch
+monk_test	mapflag	nobranch
+monk_in	mapflag	nobranch
+in_rogue	mapflag	nobranch
+job_sage	mapflag	nobranch
+que_ng	mapflag	nobranch
+job_soul	mapflag	nobranch
+job_star	mapflag	nobranch
+
+//============================================================
+// Quest Places
+//============================================================
+que_god01	mapflag	nobranch
+que_god02	mapflag	nobranch
+que_bingo	mapflag	nobranch
+que_hugel	mapflag	nobranch
+poring_c01	mapflag	nobranch
+poring_c02	mapflag	nobranch
+kh_mansion	mapflag	nobranch
+kh_rossi	mapflag	nobranch
+kh_school	mapflag	nobranch
+kh_vila	mapflag	nobranch
+kh_kiehl01	mapflag	nobranch
+kh_kiehl02	mapflag	nobranch
+que_rachel	mapflag	nobranch
+que_san04	mapflag	nobranch
+que_thor	mapflag	nobranch
+que_ba	mapflag	nobranch
+que_sign01	mapflag	nobranch
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+//alde_gld	mapflag	nobranch
+aldeg_cas01	mapflag	nobranch
+aldeg_cas02	mapflag	nobranch
+aldeg_cas03	mapflag	nobranch
+aldeg_cas04	mapflag	nobranch
+aldeg_cas05	mapflag	nobranch
+gefg_cas01	mapflag	nobranch
+gefg_cas02	mapflag	nobranch
+gefg_cas03	mapflag	nobranch
+gefg_cas04	mapflag	nobranch
+gefg_cas05	mapflag	nobranch
+//pay_gld	mapflag	nobranch
+payg_cas01	mapflag	nobranch
+payg_cas02	mapflag	nobranch
+payg_cas03	mapflag	nobranch
+payg_cas04	mapflag	nobranch
+payg_cas05	mapflag	nobranch
+//prt_gld	mapflag	nobranch
+prtg_cas01	mapflag	nobranch
+prtg_cas02	mapflag	nobranch
+prtg_cas03	mapflag	nobranch
+prtg_cas04	mapflag	nobranch
+prtg_cas05	mapflag	nobranch
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+//schg_gld
+schg_cas01	mapflag	nobranch
+schg_cas02	mapflag	nobranch
+schg_cas03	mapflag	nobranch
+schg_cas04	mapflag	nobranch
+schg_cas05	mapflag	nobranch
+//aru_gld
+arug_cas01	mapflag	nobranch
+arug_cas02	mapflag	nobranch
+arug_cas03	mapflag	nobranch
+arug_cas04	mapflag	nobranch
+arug_cas05	mapflag	nobranch
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+//n_castle	mapflag	nobranch
+nguild_alde	mapflag	nobranch
+nguild_gef	mapflag	nobranch
+nguild_pay	mapflag	nobranch
+nguild_prt	mapflag	nobranch
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	nobranch
+guild_vs2	mapflag	nobranch
+guild_vs3	mapflag	nobranch
+guild_vs4	mapflag	nobranch
+guild_vs5	mapflag	nobranch
+
+//============================================================
+// Arenas
+//============================================================
+arena_room	mapflag	nobranch
+force_1-1	mapflag	nobranch
+force_1-2	mapflag	nobranch
+force_1-3	mapflag	nobranch
+ordeal_1-1	mapflag	nobranch
+ordeal_1-2	mapflag	nobranch
+//ordeal_1-3	mapflag	nobranch
+ordeal_2-1	mapflag	nobranch
+ordeal_2-2	mapflag	nobranch
+//ordeal_2-3	mapflag	nobranch
+ordeal_3-1	mapflag	nobranch
+ordeal_3-2	mapflag	nobranch
+//ordeal_3-3	mapflag	nobranch
+pvp_2vs2	mapflag	nobranch
+pvp_c_room	mapflag	nobranch
+quiz_00	mapflag	nobranch
+quiz_01	mapflag	nobranch
+sec_in01	mapflag	nobranch
+//hunter_1-1	mapflag	nobranch
+//hunter_2-1	mapflag	nobranch
+//hunter_3-1	mapflag	nobranch
+//knight_1-1	mapflag	nobranch
+//knight_2-1	mapflag	nobranch
+//knight_3-1	mapflag	nobranch
+//priest_1-1	mapflag	nobranch
+//priest_2-1	mapflag	nobranch
+//priest_3-1	mapflag	nobranch
+prt_are_in	mapflag	nobranch
+prt_are01	mapflag	nobranch
+//wizard_1-1	mapflag	nobranch
+//wizard_2-1	mapflag	nobranch
+//wizard_3-1	mapflag	nobranch
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_room	mapflag	nobranch
+pvp_n_room	mapflag	nobranch
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_room	mapflag	nobranch
+turbo_n_1	mapflag	nobranch
+turbo_n_4	mapflag	nobranch
+turbo_n_8	mapflag	nobranch
+turbo_n_16	mapflag	nobranch
+turbo_e_4	mapflag	nobranch
+turbo_e_8	mapflag	nobranch
+turbo_e_16	mapflag	nobranch
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	nobranch
+poring_w02	mapflag	nobranch
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	nobranch
+p_track02	mapflag	nobranch
+
+//============================================================
+// Vision of Okolnir
+//============================================================
+que_qsch01	mapflag	nobranch
+que_qsch02	mapflag	nobranch
+que_qsch03	mapflag	nobranch
+que_qsch04	mapflag	nobranch
+que_qsch05	mapflag	nobranch
+que_qaru01	mapflag	nobranch
+que_qaru02	mapflag	nobranch
+que_qaru03	mapflag	nobranch
+que_qaru04	mapflag	nobranch
+que_qaru05	mapflag	nobranch
+
+//============================================================
+// Episode 12
+//============================================================
+1@cata	mapflag	nobranch
+2@cata	mapflag	nobranch
+e_tower	mapflag	nobranch
+1@tower	mapflag	nobranch
+2@tower	mapflag	nobranch
+3@tower	mapflag	nobranch
+4@tower	mapflag	nobranch
+5@tower	mapflag	nobranch
+6@tower	mapflag	nobranch
+
+//============================================================
+// Episode 13.1
+//============================================================
+mid_camp	mapflag	nobranch
+mid_campin	mapflag	nobranch
+man_fild01	mapflag	nobranch
+moc_fild22b	mapflag	nobranch
+que_dan01	mapflag	nobranch
+que_dan02	mapflag	nobranch
+schg_que01	mapflag	nobranch
+arug_que01	mapflag	nobranch
+1@orcs	mapflag	nobranch
+2@orcs	mapflag	nobranch
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nobranch
+bat_c02	mapflag	nobranch
+bat_c03	mapflag	nobranch
+bat_room	mapflag	nobranch
+bat_b01	mapflag	nobranch
+bat_b02	mapflag	nobranch
+bat_a01	mapflag	nobranch
+bat_a02	mapflag	nobranch
+
+//============================================================
+// Episode 13.2
+//============================================================
+1@nyd	mapflag	nobranch
+2@nyd	mapflag	nobranch
+manuk	mapflag	nobranch
+man_fild02	mapflag	nobranch
+man_in01	mapflag	nobranch
+splendide	mapflag	nobranch
+spl_in01	mapflag	nobranch
+spl_in02	mapflag	nobranch
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	nobranch
+2009rwc_02	mapflag	nobranch
+2009rwc_03	mapflag	nobranch
+2009rwc_04	mapflag	nobranch
+2009rwc_05	mapflag	nobranch
+2009rwc_06	mapflag	nobranch
+2009rwc_07	mapflag	nobranch
+2009rwc_08	mapflag	nobranch
+2009rwc_f01	mapflag	nobranch
+2012rwc_01	mapflag	nobranch
+2012rwc_02	mapflag	nobranch
+2012rwc_03	mapflag	nobranch
+2012rwc_04	mapflag	nobranch
+2012rwc_05	mapflag	nobranch
+2012rwc_06	mapflag	nobranch
+2012rwc_07	mapflag	nobranch
+2012rwc_08	mapflag	nobranch
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	nobranch

npc/mapflag/nocostume.txt

@@ -0,0 +1,167 @@
+//===== rAthena Script =======================================
+//= Mapflag: nocostume
+//===== Description: =========================================
+//= A mapflag to disable costume's sprite on map.
+//= Usage:
+//=     [mapname]	mapflag	nocostume
+//===== Changelogs: ==========================================
+//= 1.0 Initial release. [Cydh]
+//= 1.1 Added arug_dun01 and schg_dun01. [Cydh]
+//============================================================
+
+//============================================================
+// Guild Dungeons
+//============================================================
+teg_dun01	mapflag	nocostume
+teg_dun02	mapflag	nocostume
+arug_dun01	mapflag	nocostume
+schg_dun01	mapflag	nocostume
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	nocostume
+aldeg_cas02	mapflag	nocostume
+aldeg_cas03	mapflag	nocostume
+aldeg_cas04	mapflag	nocostume
+aldeg_cas05	mapflag	nocostume
+gefg_cas01	mapflag	nocostume
+gefg_cas02	mapflag	nocostume
+gefg_cas03	mapflag	nocostume
+gefg_cas04	mapflag	nocostume
+gefg_cas05	mapflag	nocostume
+payg_cas01	mapflag	nocostume
+payg_cas02	mapflag	nocostume
+payg_cas03	mapflag	nocostume
+payg_cas04	mapflag	nocostume
+payg_cas05	mapflag	nocostume
+prtg_cas01	mapflag	nocostume
+prtg_cas02	mapflag	nocostume
+prtg_cas03	mapflag	nocostume
+prtg_cas04	mapflag	nocostume
+prtg_cas05	mapflag	nocostume
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	nocostume
+schg_cas02	mapflag	nocostume
+schg_cas03	mapflag	nocostume
+schg_cas04	mapflag	nocostume
+schg_cas05	mapflag	nocostume
+arug_cas01	mapflag	nocostume
+arug_cas02	mapflag	nocostume
+arug_cas03	mapflag	nocostume
+arug_cas04	mapflag	nocostume
+arug_cas05	mapflag	nocostume
+
+//============================================================
+// WoE:TE Castles
+//============================================================
+te_prtcas01	mapflag	nocostume
+te_prtcas02	mapflag	nocostume
+te_prtcas03	mapflag	nocostume
+te_prtcas04	mapflag	nocostume
+te_prtcas05	mapflag	nocostume
+te_aldecas1	mapflag	nocostume
+te_aldecas2	mapflag	nocostume
+te_aldecas3	mapflag	nocostume
+te_aldecas4	mapflag	nocostume
+te_aldecas5	mapflag	nocostume
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+//n_castle	mapflag	nocostume
+nguild_alde	mapflag	nocostume
+nguild_gef	mapflag	nocostume
+nguild_pay	mapflag	nocostume
+nguild_prt	mapflag	nocostume
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_1-1	mapflag	nocostume
+pvp_y_1-2	mapflag	nocostume
+pvp_y_1-3	mapflag	nocostume
+pvp_y_1-4	mapflag	nocostume
+pvp_y_1-5	mapflag	nocostume
+pvp_y_2-1	mapflag	nocostume
+pvp_y_2-2	mapflag	nocostume
+pvp_y_2-3	mapflag	nocostume
+pvp_y_2-4	mapflag	nocostume
+pvp_y_2-5	mapflag	nocostume
+pvp_y_3-1	mapflag	nocostume
+pvp_y_3-2	mapflag	nocostume
+pvp_y_3-3	mapflag	nocostume
+pvp_y_3-4	mapflag	nocostume
+pvp_y_3-5	mapflag	nocostume
+pvp_y_4-1	mapflag	nocostume
+pvp_y_4-2	mapflag	nocostume
+pvp_y_4-3	mapflag	nocostume
+pvp_y_4-4	mapflag	nocostume
+pvp_y_4-5	mapflag	nocostume
+pvp_y_5-1	mapflag	nocostume
+pvp_y_5-2	mapflag	nocostume
+pvp_y_5-3	mapflag	nocostume
+pvp_y_5-4	mapflag	nocostume
+pvp_y_5-5	mapflag	nocostume
+pvp_y_6-1	mapflag	nocostume
+pvp_y_6-2	mapflag	nocostume
+pvp_y_6-3	mapflag	nocostume
+pvp_y_6-4	mapflag	nocostume
+pvp_y_6-5	mapflag	nocostume
+pvp_y_7-1	mapflag	nocostume
+pvp_y_7-2	mapflag	nocostume
+pvp_y_7-3	mapflag	nocostume
+pvp_y_7-4	mapflag	nocostume
+pvp_y_7-5	mapflag	nocostume
+pvp_y_8-1	mapflag	nocostume
+pvp_y_8-2	mapflag	nocostume
+pvp_y_8-3	mapflag	nocostume
+pvp_y_8-4	mapflag	nocostume
+pvp_y_8-5	mapflag	nocostume
+pvp_n_1-1	mapflag	nocostume
+pvp_n_1-2	mapflag	nocostume
+pvp_n_1-3	mapflag	nocostume
+pvp_n_1-4	mapflag	nocostume
+pvp_n_1-5	mapflag	nocostume
+pvp_n_2-1	mapflag	nocostume
+pvp_n_2-2	mapflag	nocostume
+pvp_n_2-3	mapflag	nocostume
+pvp_n_2-4	mapflag	nocostume
+pvp_n_2-5	mapflag	nocostume
+pvp_n_3-1	mapflag	nocostume
+pvp_n_3-2	mapflag	nocostume
+pvp_n_3-3	mapflag	nocostume
+pvp_n_3-4	mapflag	nocostume
+pvp_n_3-5	mapflag	nocostume
+pvp_n_4-1	mapflag	nocostume
+pvp_n_4-2	mapflag	nocostume
+pvp_n_4-3	mapflag	nocostume
+pvp_n_4-4	mapflag	nocostume
+pvp_n_4-5	mapflag	nocostume
+pvp_n_5-1	mapflag	nocostume
+pvp_n_5-2	mapflag	nocostume
+pvp_n_5-3	mapflag	nocostume
+pvp_n_5-4	mapflag	nocostume
+pvp_n_5-5	mapflag	nocostume
+pvp_n_6-1	mapflag	nocostume
+pvp_n_6-2	mapflag	nocostume
+pvp_n_6-3	mapflag	nocostume
+pvp_n_6-4	mapflag	nocostume
+pvp_n_6-5	mapflag	nocostume
+pvp_n_7-1	mapflag	nocostume
+pvp_n_7-2	mapflag	nocostume
+pvp_n_7-3	mapflag	nocostume
+pvp_n_7-4	mapflag	nocostume
+pvp_n_7-5	mapflag	nocostume
+pvp_n_8-1	mapflag	nocostume
+pvp_n_8-2	mapflag	nocostume
+pvp_n_8-3	mapflag	nocostume
+pvp_n_8-4	mapflag	nocostume
+pvp_n_8-5	mapflag	nocostume
+pvp_2vs2	mapflag	nocostume
+turbo_e_4	mapflag	nocostume
+turbo_e_8	mapflag	nocostume
+turbo_e_16	mapflag	nocostume

npc/mapflag/nodynamicnpc.txt

@@ -0,0 +1,27 @@
+//===== rAthena Script =======================================
+//= Mapflag: No dynamic NPC map setting.
+//===== Description: ========================================= 
+//= Blocks the use of dynamic NPCs on a map.
+//===== Additional Comments: ================================= 
+//= 1.0 Initial script. [Lemongrass]
+//============================================================
+
+// Endless Tower
+1@tower	mapflag	nodynamicnpc
+2@tower	mapflag	nodynamicnpc
+3@tower	mapflag	nodynamicnpc
+4@tower	mapflag	nodynamicnpc
+5@tower	mapflag	nodynamicnpc
+6@tower	mapflag	nodynamicnpc
+
+// Sealed Catacomb
+1@cata	mapflag	nodynamicnpc
+2@cata	mapflag	nodynamicnpc
+
+// Orc's Memory
+1@orcs	mapflag	nodynamicnpc
+2@orcs	mapflag	nodynamicnpc
+
+// Nidhoggur's Nest
+1@nyd	mapflag	nodynamicnpc
+2@nyd	mapflag	nodynamicnpc

npc/mapflag/noicewall.txt

@@ -0,0 +1,149 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable Ice Wall.
+//===== Description: ========================================= 
+//= Blocks usage of WZ_ICEWALL.
+//===== Additional Comments: ================================= 
+//= 1.6a Re-enabled icewalls for cities [Lupus]
+//= 1.7 Officially icewall is allowed on interiors. [L0ne_w0lf]
+//= 1.8 Fixed arug_cas map names.
+//= 1.9 Renewal split. [Euphy]
+//============================================================
+
+//ayo_in01	mapflag	noicewall
+//ayo_in02	mapflag	noicewall
+//alberta_in	mapflag	noicewall
+//alberta	mapflag	noicewall
+//alde_alche	mapflag	noicewall
+//aldeba_in	mapflag	noicewall
+//aldebaran	mapflag	noicewall
+//ama_in01	mapflag	noicewall
+//ama_in02	mapflag	noicewall
+//amatsu	mapflag	noicewall
+//ayothaya	mapflag	noicewall
+//cmd_in01	mapflag	noicewall
+//cmd_in02	mapflag	noicewall
+//comodo	mapflag	noicewall
+//einbroch	mapflag	noicewall
+//einbech	mapflag	noicewall
+//gef_tower	mapflag	noicewall
+//geffen	mapflag	noicewall
+//geffen_in	mapflag	noicewall
+//gon_in	mapflag	noicewall
+//gonryun	mapflag	noicewall
+//in_hunter	mapflag	noicewall
+//in_moc_16	mapflag	noicewall
+//in_orcs01	mapflag	noicewall
+//izlude_in	mapflag	noicewall
+//izlude	mapflag	noicewall
+//hugel	mapflag	noicewall
+//jawaii	mapflag	noicewall
+//moc_castle	mapflag	noicewall
+//monk_in	mapflag	noicewall
+//morocc_in	mapflag	noicewall
+//morocc	mapflag	noicewall
+//mosk_in	mapflag	noicewall
+//payon_in01	mapflag	noicewall
+//payon_in02	mapflag	noicewall
+//payon_in03	mapflag	noicewall
+//payon	mapflag	noicewall
+//pay_arche	mapflag	noicewall
+//prt_are_in	mapflag	noicewall
+//prt_are01	mapflag	noicewall
+//prt_castle	mapflag	noicewall
+//prt_church	mapflag	noicewall
+//prt_in	mapflag	noicewall
+//prontera	mapflag	noicewall
+//sec_in01	mapflag	noicewall
+//job_sword1	mapflag	noicewall
+//um_in	mapflag	noicewall
+//umbala	mapflag	noicewall
+//xmas_in	mapflag	noicewall
+//xmas	mapflag	noicewall
+//yuno_in01	mapflag	noicewall
+//yuno_in02	mapflag	noicewall
+//yuno_in03	mapflag	noicewall
+//yuno_in04	mapflag	noicewall
+//yuno_in05	mapflag	noicewall
+//yuno	mapflag	noicewall
+//gon_test	mapflag	noicewall
+//nif_in	mapflag	noicewall
+//louyang	mapflag	noicewall
+//que_sign01	mapflag	noicewall
+//ein_in01	mapflag	noicewall
+//airport	mapflag	noicewall
+//airplane	mapflag	noicewall
+//airplane_01	mapflag	noicewall
+//lighthalzen	mapflag	noicewall
+//yuno_pre	mapflag	noicewall
+//y_airport	mapflag	noicewall
+//lhz_airport	mapflag	noicewall
+//lhz_in01	mapflag	noicewall
+//lhz_in02	mapflag	noicewall
+//lhz_in03	mapflag	noicewall
+//rachel	mapflag	noicewall
+//ra_in01	mapflag	noicewall
+//ra_temin	mapflag	noicewall
+//ra_temple	mapflag	noicewall
+//ra_temsky	mapflag	noicewall
+//que_rachel	mapflag	noicewall
+//auction_01	mapflag	noicewall
+//auction_02	mapflag	noicewall
+//hu_in01	mapflag	noicewall
+//kh_mansion	mapflag	noicewall
+//kh_rossi	mapflag	noicewall
+//kh_school	mapflag	noicewall
+//kh_vila	mapflag	noicewall
+//ve_in	mapflag	noicewall
+//ve_in02	mapflag	noicewall
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	noicewall
+aldeg_cas02	mapflag	noicewall
+aldeg_cas03	mapflag	noicewall
+aldeg_cas04	mapflag	noicewall
+aldeg_cas05	mapflag	noicewall
+gefg_cas01	mapflag	noicewall
+gefg_cas02	mapflag	noicewall
+gefg_cas03	mapflag	noicewall
+gefg_cas04	mapflag	noicewall
+gefg_cas05	mapflag	noicewall
+payg_cas01	mapflag	noicewall
+payg_cas02	mapflag	noicewall
+payg_cas03	mapflag	noicewall
+payg_cas04	mapflag	noicewall
+payg_cas05	mapflag	noicewall
+prtg_cas01	mapflag	noicewall
+prtg_cas02	mapflag	noicewall
+prtg_cas03	mapflag	noicewall
+prtg_cas04	mapflag	noicewall
+prtg_cas05	mapflag	noicewall
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	noicewall
+schg_cas02	mapflag	noicewall
+schg_cas03	mapflag	noicewall
+schg_cas04	mapflag	noicewall
+schg_cas05	mapflag	noicewall
+arug_cas01	mapflag	noicewall
+arug_cas02	mapflag	noicewall
+arug_cas03	mapflag	noicewall
+arug_cas04	mapflag	noicewall
+arug_cas05	mapflag	noicewall
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+nguild_alde	mapflag	noicewall
+nguild_gef	mapflag	noicewall
+nguild_pay	mapflag	noicewall
+nguild_prt	mapflag	noicewall
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	noicewall
+poring_w02	mapflag	noicewall

npc/mapflag/nomemo.txt

@@ -0,0 +1,763 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable Warp Portal memory.
+//===== Description: ========================================= 
+//= Prevents players from using /memo on a map.
+//= Also disables marriage warp skills.
+//===== Additional Comments: ================================= 
+//= 1.6a Added up to Hugel maps. [Lupus]
+//= 1.6b Added job_knt map. [Samuray22]
+//= 1.7 Added all novice maps. [L0ne_W0lf]
+//= 1.8 Added nameless_i location. [Lupus]
+//= 1.8a Removed duplicate gef_cas nomemo mapflags. [Yommy]
+//= 1.8b Removed duplicate arug_dun01 & schg_dun01 entries. [Gepard]
+//= 1.9 Updated. [L0ne_W0lf]
+//= 2.0 Renewal split. [Euphy]
+//============================================================
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+ayo_in01	mapflag	nomemo
+ayo_in02	mapflag	nomemo
+alb_ship	mapflag	nomemo
+alberta_in	mapflag	nomemo
+aldeba_in	mapflag	nomemo
+ama_in01	mapflag	nomemo
+ama_in02	mapflag	nomemo
+ama_test	mapflag	nomemo
+cmd_in01	mapflag	nomemo
+cmd_in02	mapflag	nomemo
+gef_tower	mapflag	nomemo
+geffen_in	mapflag	nomemo
+gon_test	mapflag	nomemo
+gon_in	mapflag	nomemo
+in_orcs01	mapflag	nomemo
+izlude_in	mapflag	nomemo
+jawaii_in	mapflag	nomemo
+lou_in01	mapflag	nomemo
+lou_in02	mapflag	nomemo
+moc_castle	mapflag	nomemo
+morocc_in	mapflag	nomemo
+mosk_in	mapflag	nomemo
+mosk_ship	mapflag	nomemo
+mosk_fild01	mapflag	nomemo
+mosk_fild02	mapflag	nomemo
+mosk_dun01	mapflag	nomemo
+mosk_dun02	mapflag	nomemo
+mosk_dun03	mapflag	nomemo
+nameless_in	mapflag	nomemo
+niflheim	mapflag	nomemo
+nif_in	mapflag	nomemo
+pay_arche	mapflag	nomemo
+payon_in01	mapflag	nomemo
+payon_in02	mapflag	nomemo
+payon_in03	mapflag	nomemo
+prt_castle	mapflag	nomemo
+prt_church	mapflag	nomemo
+prt_in	mapflag	nomemo
+um_in	mapflag	nomemo
+xmas_in	mapflag	nomemo
+valkyrie	mapflag	nomemo
+yuno_in01	mapflag	nomemo
+yuno_in02	mapflag	nomemo
+yuno_in03	mapflag	nomemo
+yuno_in04	mapflag	nomemo
+yuno_in05	mapflag	nomemo
+yuno	mapflag	nomemo
+ein_in01	mapflag	nomemo
+lighthalzen	mapflag	nomemo
+yuno_pre	mapflag	nomemo
+einbroch	mapflag	nomemo
+einbech	mapflag	nomemo
+lhz_cube	mapflag	nomemo
+lhz_in01	mapflag	nomemo
+lhz_in02	mapflag	nomemo
+lhz_in03	mapflag	nomemo
+hu_in01	mapflag	nomemo
+auction_01	mapflag	nomemo
+auction_02	mapflag	nomemo
+ra_in01	mapflag	nomemo
+ra_temin	mapflag	nomemo
+ra_temsky	mapflag	nomemo
+ve_in	mapflag	nomemo
+ve_in02	mapflag	nomemo
+thor_camp	mapflag	nomemo
+moc_para01	mapflag	nomemo
+
+//============================================================
+// Airport
+//============================================================
+airport	mapflag	nomemo
+airplane	mapflag	nomemo
+airplane_01	mapflag	nomemo
+y_airport	mapflag	nomemo
+lhz_airport	mapflag	nomemo
+
+//============================================================
+// Novice Starter Zone
+//============================================================
+new_zone01	mapflag	nomemo
+new_zone02	mapflag	nomemo
+new_zone03	mapflag	nomemo
+new_zone04	mapflag	nomemo
+new_1-1	mapflag	nomemo
+new_1-2	mapflag	nomemo
+new_1-3	mapflag	nomemo
+new_1-4	mapflag	nomemo
+new_2-1	mapflag	nomemo
+new_2-2	mapflag	nomemo
+new_2-3	mapflag	nomemo
+new_2-4	mapflag	nomemo
+new_3-1	mapflag	nomemo
+new_3-2	mapflag	nomemo
+new_3-3	mapflag	nomemo
+new_3-4	mapflag	nomemo
+new_4-1	mapflag	nomemo
+new_4-2	mapflag	nomemo
+new_4-3	mapflag	nomemo
+new_4-4	mapflag	nomemo
+new_5-1	mapflag	nomemo
+new_5-2	mapflag	nomemo
+new_5-3	mapflag	nomemo
+new_5-4	mapflag	nomemo
+
+//============================================================
+// Fields
+//============================================================
+alb2trea	mapflag	nomemo
+ayo_fild02	mapflag	nomemo
+cmd_fild01	mapflag	nomemo
+cmd_fild02	mapflag	nomemo
+cmd_fild03	mapflag	nomemo
+cmd_fild04	mapflag	nomemo
+cmd_fild05	mapflag	nomemo
+cmd_fild06	mapflag	nomemo
+cmd_fild07	mapflag	nomemo
+cmd_fild08	mapflag	nomemo
+cmd_fild09	mapflag	nomemo
+gef_fild02	mapflag	nomemo
+gef_fild03	mapflag	nomemo
+gef_fild06	mapflag	nomemo
+gef_fild08	mapflag	nomemo
+gef_fild10	mapflag	nomemo
+gef_fild11	mapflag	nomemo
+gef_fild12	mapflag	nomemo
+gef_fild14	mapflag	nomemo
+glast_01	mapflag	nomemo
+hu_fild01	mapflag	nomemo
+hu_fild05	mapflag	nomemo
+izlu2dun	mapflag	nomemo
+mjolnir_01	mapflag	nomemo
+mjolnir_02	mapflag	nomemo
+mjolnir_03	mapflag	nomemo
+mjolnir_04	mapflag	nomemo
+mjolnir_05	mapflag	nomemo
+mjolnir_07	mapflag	nomemo
+mjolnir_08	mapflag	nomemo
+mjolnir_10	mapflag	nomemo
+mjolnir_11	mapflag	nomemo
+moc_fild01	mapflag	nomemo
+moc_fild02	mapflag	nomemo
+moc_fild03	mapflag	nomemo
+//moc_fild04	mapflag	nomemo
+//moc_fild05	mapflag	nomemo
+//moc_fild08	mapflag	nomemo
+moc_fild09	mapflag	nomemo
+//moc_fild13	mapflag	nomemo
+//moc_fild14	mapflag	nomemo
+moc_fild15	mapflag	nomemo
+moc_fild16	mapflag	nomemo
+moc_fild17	mapflag	nomemo
+moc_fild18	mapflag	nomemo
+moc_fild20	mapflag	nomemo
+moc_fild21	mapflag	nomemo
+moc_fild22	mapflag	nomemo
+nif_fild01	mapflag	nomemo
+nif_fild02	mapflag	nomemo
+pay_fild02	mapflag	nomemo
+pay_fild04	mapflag	nomemo
+pay_fild05	mapflag	nomemo
+pay_fild09	mapflag	nomemo
+pay_fild10	mapflag	nomemo
+pay_fild11	mapflag	nomemo
+prt_fild00	mapflag	nomemo
+prt_fild03	mapflag	nomemo
+prt_fild04	mapflag	nomemo
+prt_fild09	mapflag	nomemo
+prt_fild10	mapflag	nomemo
+prt_fild11	mapflag	nomemo
+prt_monk	mapflag	nomemo
+um_fild01	mapflag	nomemo
+um_fild02	mapflag	nomemo
+um_fild03	mapflag	nomemo
+yuno_fild02	mapflag	nomemo
+yuno_fild03	mapflag	nomemo
+yuno_fild04	mapflag	nomemo
+yuno_fild05	mapflag	nomemo
+yuno_fild07	mapflag	nomemo
+yuno_fild08	mapflag	nomemo
+yuno_fild09	mapflag	nomemo
+yuno_fild10	mapflag	nomemo
+ra_fild01	mapflag	nomemo
+ra_fild02	mapflag	nomemo
+ra_fild03	mapflag	nomemo
+ra_fild04	mapflag	nomemo
+ra_fild05	mapflag	nomemo
+ra_fild06	mapflag	nomemo
+ra_fild10	mapflag	nomemo
+ve_fild01	mapflag	nomemo
+ve_fild02	mapflag	nomemo
+ve_fild03	mapflag	nomemo
+ve_fild04	mapflag	nomemo
+ve_fild06	mapflag	nomemo
+cave	mapflag	nomemo
+
+//============================================================
+// Job Quests
+//============================================================
+// First Job Class
+job_sword1	mapflag	nomemo
+job_thief1	mapflag	nomemo
+job_star	mapflag	nomemo
+// Primary Second Job Class
+job_knt	mapflag	nomemo
+job_prist	mapflag	nomemo
+job_wiz	mapflag	nomemo
+job_hunte	mapflag	nomemo
+in_hunter	mapflag	nomemo
+in_moc_16	mapflag	nomemo
+// Secondary Second Job Class
+alde_alche	mapflag	nomemo
+job_cru	mapflag	nomemo
+job_duncer	mapflag	nomemo
+job_monk	mapflag	nomemo
+monk_test	mapflag	nomemo
+monk_in	mapflag	nomemo
+in_rogue	mapflag	nomemo
+job_sage	mapflag	nomemo
+job_soul	mapflag	nomemo
+que_ba	mapflag	nomemo
+que_ng	mapflag	nomemo
+
+//============================================================
+// Quest Places
+//============================================================
+que_god01	mapflag	nomemo
+que_god02	mapflag	nomemo
+que_bingo	mapflag	nomemo
+que_sign01	mapflag	nomemo
+que_hugel	mapflag	nomemo
+que_rachel	mapflag	nomemo
+que_san04	mapflag	nomemo
+que_thor	mapflag	nomemo
+poring_c01	mapflag	nomemo
+poring_c02	mapflag	nomemo
+
+//============================================================
+// Dungeons
+//============================================================
+alde_dun01	mapflag	nomemo
+alde_dun02	mapflag	nomemo
+alde_dun03	mapflag	nomemo
+alde_dun04	mapflag	nomemo
+// Anthell
+anthell01	mapflag	nomemo
+anthell02	mapflag	nomemo
+// Amatsu Dungeon
+ama_dun01	mapflag	nomemo
+ama_dun02	mapflag	nomemo
+ama_dun03	mapflag	nomemo
+// Ayothaya
+ayo_dun01	mapflag	nomemo
+ayo_dun02	mapflag	nomemo
+// Comodo Beach
+beach_dun	mapflag	nomemo
+beach_dun2	mapflag	nomemo
+beach_dun3	mapflag	nomemo
+// Clock Tower
+c_tower1	mapflag	nomemo
+c_tower2	mapflag	nomemo
+c_tower3	mapflag	nomemo
+c_tower4	mapflag	nomemo
+// Einbech Mines
+ein_dun01	mapflag	nomemo
+ein_dun02	mapflag	nomemo
+// Geffen Dungeon
+gef_dun00	mapflag	nomemo
+gef_dun01	mapflag	nomemo
+gef_dun02	mapflag	nomemo
+gef_dun03	mapflag	nomemo
+// Glastheim
+gl_cas01	mapflag	nomemo
+gl_cas02	mapflag	nomemo
+gl_church	mapflag	nomemo
+gl_chyard	mapflag	nomemo
+gl_dun01	mapflag	nomemo
+gl_dun02	mapflag	nomemo
+gl_in01	mapflag	nomemo
+gl_knt01	mapflag	nomemo
+gl_knt02	mapflag	nomemo
+gl_prison	mapflag	nomemo
+gl_prison1	mapflag	nomemo
+gl_sew01	mapflag	nomemo
+gl_sew02	mapflag	nomemo
+gl_sew03	mapflag	nomemo
+gl_sew04	mapflag	nomemo
+gl_step	mapflag	nomemo
+// Guild Dungeon
+gld_dun01	mapflag	nomemo
+gld_dun02	mapflag	nomemo
+gld_dun03	mapflag	nomemo
+gld_dun04	mapflag	nomemo
+// Bayalan Island
+iz_dun00	mapflag	nomemo
+iz_dun01	mapflag	nomemo
+iz_dun02	mapflag	nomemo
+iz_dun03	mapflag	nomemo
+iz_dun04	mapflag	nomemo
+// Sphinx
+in_sphinx1	mapflag	nomemo
+in_sphinx2	mapflag	nomemo
+in_sphinx3	mapflag	nomemo
+in_sphinx4	mapflag	nomemo
+in_sphinx5	mapflag	nomemo
+// Luoyang Dungeon
+lou_dun03	mapflag	nomemo
+lou_dun02	mapflag	nomemo
+lou_dun01	mapflag	nomemo
+// Magma Dungeon
+mag_dun01	mapflag	nomemo
+mag_dun02	mapflag	nomemo
+// Pyramids
+moc_pryd01	mapflag	nomemo
+moc_pryd02	mapflag	nomemo
+moc_pryd03	mapflag	nomemo
+moc_pryd04	mapflag	nomemo
+moc_pryd05	mapflag	nomemo
+moc_pryd06	mapflag	nomemo
+moc_prydb1	mapflag	nomemo
+// Coal Mine (Dead Pit)
+mjo_dun01	mapflag	nomemo
+mjo_dun02	mapflag	nomemo
+mjo_dun03	mapflag	nomemo
+// Orc Dungeon
+orcsdun01	mapflag	nomemo
+orcsdun02	mapflag	nomemo
+// Payon Cave
+pay_dun00	mapflag	nomemo
+pay_dun01	mapflag	nomemo
+pay_dun02	mapflag	nomemo
+pay_dun03	mapflag	nomemo
+pay_dun04	mapflag	nomemo
+// Hidden Temple
+prt_maze01	mapflag	nomemo
+prt_maze02	mapflag	nomemo
+prt_maze03	mapflag	nomemo
+// Culvert Sewers
+prt_sewb1	mapflag	nomemo
+prt_sewb2	mapflag	nomemo
+prt_sewb3	mapflag	nomemo
+prt_sewb4	mapflag	nomemo
+// Kunlun Dungeon
+gon_dun01	mapflag	nomemo
+gon_dun02	mapflag	nomemo
+gon_dun03	mapflag	nomemo
+// Sunken Ship
+treasure01	mapflag	nomemo
+treasure02	mapflag	nomemo
+// Turtle Island
+tur_dun01	mapflag	nomemo
+tur_dun02	mapflag	nomemo
+tur_dun03	mapflag	nomemo
+tur_dun04	mapflag	nomemo
+tur_dun05	mapflag	nomemo
+tur_dun06	mapflag	nomemo
+// Umbala Dungeon
+um_dun01	mapflag	nomemo
+um_dun02	mapflag	nomemo
+// Toy Factory
+xmas_dun01	mapflag	nomemo
+xmas_dun02	mapflag	nomemo
+// Yggdrasil Tree Dungeon
+yggdrasil01	mapflag	nomemo
+// Old Geffenia
+gefenia01	mapflag	nomemo
+gefenia02	mapflag	nomemo
+gefenia03	mapflag	nomemo
+gefenia04	mapflag	nomemo
+// Bio Lab Dungeon
+lhz_dun01	mapflag	nomemo
+lhz_dun02	mapflag	nomemo
+lhz_dun03	mapflag	nomemo
+// Juperos Dungeon
+juperos_01	mapflag	nomemo
+juperos_02	mapflag	nomemo
+jupe_area1	mapflag	nomemo
+jupe_area2	mapflag	nomemo
+jupe_core	mapflag	nomemo
+jupe_ele	mapflag	nomemo
+jupe_ele_r	mapflag	nomemo
+jupe_gate	mapflag	nomemo
+jupe_cave	mapflag	nomemo
+// Thanatos Tower
+thana_boss	mapflag	nomemo
+tha_scene01	mapflag	nomemo
+tha_t01	mapflag	nomemo
+tha_t02	mapflag	nomemo
+tha_t03	mapflag	nomemo
+tha_t04	mapflag	nomemo
+tha_t05	mapflag	nomemo
+tha_t06	mapflag	nomemo
+tha_t07	mapflag	nomemo
+tha_t08	mapflag	nomemo
+tha_t09	mapflag	nomemo
+tha_t10	mapflag	nomemo
+tha_t11	mapflag	nomemo
+tha_t12	mapflag	nomemo
+thana_step	mapflag	nomemo
+// Abyss Lake Dungeon
+abyss_01	mapflag	nomemo
+abyss_02	mapflag	nomemo
+abyss_03	mapflag	nomemo
+// Odin's Temple & Kiehl
+odin_tem01	mapflag	nomemo
+odin_tem02	mapflag	nomemo
+odin_tem03	mapflag	nomemo
+kh_kiehl02	mapflag	nomemo
+kh_kiehl01	mapflag	nomemo
+kh_dun02	mapflag	nomemo
+kh_dun01	mapflag	nomemo
+kh_mansion	mapflag	nomemo
+kh_rossi	mapflag	nomemo
+kh_school	mapflag	nomemo
+kh_vila	mapflag	nomemo
+// Ice Dungeon
+ice_dun01	mapflag	nomemo
+ice_dun02	mapflag	nomemo
+ice_dun03	mapflag	nomemo
+ice_dun04	mapflag	nomemo
+// Rachel Santuary
+ra_san01	mapflag	nomemo
+ra_san02	mapflag	nomemo
+ra_san03	mapflag	nomemo
+ra_san04	mapflag	nomemo
+ra_san05	mapflag	nomemo
+// Thor Volcano
+thor_v01	mapflag	nomemo
+thor_v02	mapflag	nomemo
+thor_v03	mapflag	nomemo
+// Cursed Abbey
+nameless_i	mapflag	nomemo
+nameless_n	mapflag	nomemo
+abbey01	mapflag	nomemo
+abbey02	mapflag	nomemo
+abbey03	mapflag	nomemo
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+//alde_gld	mapflag	nomemo
+aldeg_cas01	mapflag	nomemo
+aldeg_cas02	mapflag	nomemo
+aldeg_cas03	mapflag	nomemo
+aldeg_cas04	mapflag	nomemo
+aldeg_cas05	mapflag	nomemo
+gefg_cas01	mapflag	nomemo
+gefg_cas02	mapflag	nomemo
+gefg_cas03	mapflag	nomemo
+gefg_cas04	mapflag	nomemo
+gefg_cas05	mapflag	nomemo
+//pay_gld	mapflag	nomemo
+payg_cas01	mapflag	nomemo
+payg_cas02	mapflag	nomemo
+payg_cas03	mapflag	nomemo
+payg_cas04	mapflag	nomemo
+payg_cas05	mapflag	nomemo
+//prt_gld	mapflag	nomemo
+prtg_cas01	mapflag	nomemo
+prtg_cas02	mapflag	nomemo
+prtg_cas03	mapflag	nomemo
+prtg_cas04	mapflag	nomemo
+prtg_cas05	mapflag	nomemo
+nguild_alde	mapflag	nomemo
+nguild_gef	mapflag	nomemo
+nguild_pay	mapflag	nomemo
+nguild_prt	mapflag	nomemo
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	nomemo
+schg_cas02	mapflag	nomemo
+schg_cas03	mapflag	nomemo
+schg_cas04	mapflag	nomemo
+schg_cas05	mapflag	nomemo
+arug_cas01	mapflag	nomemo
+arug_cas02	mapflag	nomemo
+arug_cas03	mapflag	nomemo
+arug_cas04	mapflag	nomemo
+arug_cas05	mapflag	nomemo
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+n_castle	mapflag	nomemo
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	nomemo
+guild_vs2	mapflag	nomemo
+guild_vs3	mapflag	nomemo
+guild_vs4	mapflag	nomemo
+guild_vs5	mapflag	nomemo
+
+//============================================================
+// Arenas
+//============================================================
+arena_room	mapflag	nomemo
+force_1-1	mapflag	nomemo
+force_1-2	mapflag	nomemo
+force_1-3	mapflag	nomemo
+force_2-1	mapflag	nomemo
+force_3-1	mapflag	nomemo
+force_4-1	mapflag	nomemo
+force_5-1	mapflag	nomemo
+ordeal_1-1	mapflag	nomemo
+ordeal_1-2	mapflag	nomemo
+//ordeal_1-3	mapflag	nomemo
+ordeal_2-1	mapflag	nomemo
+ordeal_2-2	mapflag	nomemo
+//ordeal_2-3	mapflag	nomemo
+ordeal_3-1	mapflag	nomemo
+ordeal_3-2	mapflag	nomemo
+//ordeal_3-3	mapflag	nomemo
+pvp_c_room	mapflag	nomemo
+quiz_00	mapflag	nomemo
+quiz_01	mapflag	nomemo
+sec_in01	mapflag	nomemo
+sec_in02	mapflag	nomemo
+//hunter_1-1	mapflag	nomemo
+//hunter_2-1	mapflag	nomemo
+//hunter_3-1	mapflag	nomemo
+//knight_1-1	mapflag	nomemo
+//knight_2-1	mapflag	nomemo
+//knight_3-1	mapflag	nomemo
+//priest_1-1	mapflag	nomemo
+//priest_2-1	mapflag	nomemo
+//priest_3-1	mapflag	nomemo
+prt_are_in	mapflag	nomemo
+prt_are01	mapflag	nomemo
+//wizard_1-1	mapflag	nomemo
+//wizard_2-1	mapflag	nomemo
+//wizard_3-1	mapflag	nomemo
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_room	mapflag	nomemo
+pvp_y_1-1	mapflag	nomemo
+pvp_y_1-2	mapflag	nomemo
+pvp_y_1-3	mapflag	nomemo
+pvp_y_1-4	mapflag	nomemo
+pvp_y_1-5	mapflag	nomemo
+pvp_y_2-1	mapflag	nomemo
+pvp_y_2-2	mapflag	nomemo
+pvp_y_2-3	mapflag	nomemo
+pvp_y_2-4	mapflag	nomemo
+pvp_y_2-5	mapflag	nomemo
+pvp_y_3-1	mapflag	nomemo
+pvp_y_3-2	mapflag	nomemo
+pvp_y_3-3	mapflag	nomemo
+pvp_y_3-4	mapflag	nomemo
+pvp_y_3-5	mapflag	nomemo
+pvp_y_4-1	mapflag	nomemo
+pvp_y_4-2	mapflag	nomemo
+pvp_y_4-3	mapflag	nomemo
+pvp_y_4-4	mapflag	nomemo
+pvp_y_4-5	mapflag	nomemo
+pvp_y_5-1	mapflag	nomemo
+pvp_y_5-2	mapflag	nomemo
+pvp_y_5-3	mapflag	nomemo
+pvp_y_5-4	mapflag	nomemo
+pvp_y_5-5	mapflag	nomemo
+pvp_y_6-1	mapflag	nomemo
+pvp_y_6-2	mapflag	nomemo
+pvp_y_6-3	mapflag	nomemo
+pvp_y_6-4	mapflag	nomemo
+pvp_y_6-5	mapflag	nomemo
+pvp_y_7-1	mapflag	nomemo
+pvp_y_7-2	mapflag	nomemo
+pvp_y_7-3	mapflag	nomemo
+pvp_y_7-4	mapflag	nomemo
+pvp_y_7-5	mapflag	nomemo
+pvp_y_8-1	mapflag	nomemo
+pvp_y_8-2	mapflag	nomemo
+pvp_y_8-3	mapflag	nomemo
+pvp_y_8-4	mapflag	nomemo
+pvp_y_8-5	mapflag	nomemo
+pvp_n_room	mapflag	nomemo
+pvp_n_1-1	mapflag	nomemo
+pvp_n_1-2	mapflag	nomemo
+pvp_n_1-3	mapflag	nomemo
+pvp_n_1-4	mapflag	nomemo
+pvp_n_1-5	mapflag	nomemo
+pvp_n_2-1	mapflag	nomemo
+pvp_n_2-2	mapflag	nomemo
+pvp_n_2-3	mapflag	nomemo
+pvp_n_2-4	mapflag	nomemo
+pvp_n_2-5	mapflag	nomemo
+pvp_n_3-1	mapflag	nomemo
+pvp_n_3-2	mapflag	nomemo
+pvp_n_3-3	mapflag	nomemo
+pvp_n_3-4	mapflag	nomemo
+pvp_n_3-5	mapflag	nomemo
+pvp_n_4-1	mapflag	nomemo
+pvp_n_4-2	mapflag	nomemo
+pvp_n_4-3	mapflag	nomemo
+pvp_n_4-4	mapflag	nomemo
+pvp_n_4-5	mapflag	nomemo
+pvp_n_5-1	mapflag	nomemo
+pvp_n_5-2	mapflag	nomemo
+pvp_n_5-3	mapflag	nomemo
+pvp_n_5-4	mapflag	nomemo
+pvp_n_5-5	mapflag	nomemo
+pvp_n_6-1	mapflag	nomemo
+pvp_n_6-2	mapflag	nomemo
+pvp_n_6-3	mapflag	nomemo
+pvp_n_6-4	mapflag	nomemo
+pvp_n_6-5	mapflag	nomemo
+pvp_n_7-1	mapflag	nomemo
+pvp_n_7-2	mapflag	nomemo
+pvp_n_7-3	mapflag	nomemo
+pvp_n_7-4	mapflag	nomemo
+pvp_n_7-5	mapflag	nomemo
+pvp_n_8-1	mapflag	nomemo
+pvp_n_8-2	mapflag	nomemo
+pvp_n_8-3	mapflag	nomemo
+pvp_n_8-4	mapflag	nomemo
+pvp_n_8-5	mapflag	nomemo
+pvp_2vs2	mapflag	nomemo
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_room	mapflag	nomemo
+turbo_n_1	mapflag	nomemo
+turbo_n_4	mapflag	nomemo
+turbo_n_8	mapflag	nomemo
+turbo_n_16	mapflag	nomemo
+turbo_e_4	mapflag	nomemo
+turbo_e_8	mapflag	nomemo
+turbo_e_16	mapflag	nomemo
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	nomemo
+p_track02	mapflag	nomemo
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	nomemo
+poring_w02	mapflag	nomemo
+
+//============================================================
+// Vision of Okolnir
+//============================================================
+que_qsch01	mapflag	nomemo
+que_qsch02	mapflag	nomemo
+que_qsch03	mapflag	nomemo
+que_qsch04	mapflag	nomemo
+que_qsch05	mapflag	nomemo
+que_qaru01	mapflag	nomemo
+que_qaru02	mapflag	nomemo
+que_qaru03	mapflag	nomemo
+que_qaru04	mapflag	nomemo
+que_qaru05	mapflag	nomemo
+
+//============================================================
+// Sealed Shrine
+//============================================================
+1@cata	mapflag	nomemo
+2@cata	mapflag	nomemo
+
+//============================================================
+// Endless Tower
+//============================================================
+e_tower	mapflag	nomemo
+1@tower	mapflag	nomemo
+2@tower	mapflag	nomemo
+3@tower	mapflag	nomemo
+4@tower	mapflag	nomemo
+5@tower	mapflag	nomemo
+6@tower	mapflag	nomemo
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nomemo
+bat_c02	mapflag	nomemo
+bat_c03	mapflag	nomemo
+bat_room	mapflag	nomemo
+bat_b01	mapflag	nomemo
+bat_b02	mapflag	nomemo
+bat_a01	mapflag	nomemo
+bat_a02	mapflag	nomemo
+
+//============================================================
+// Episode 13
+//============================================================
+mid_campin	mapflag	nomemo
+man_fild01	mapflag	nomemo
+man_fild03	mapflag	nomemo
+spl_fild02	mapflag	nomemo
+spl_fild03	mapflag	nomemo
+moc_fild22b	mapflag	nomemo
+que_dan01	mapflag	nomemo
+que_dan02	mapflag	nomemo
+schg_que01	mapflag	nomemo
+schg_dun01	mapflag	nomemo
+arug_que01	mapflag	nomemo
+arug_dun01	mapflag	nomemo
+nyd_dun01	mapflag	nomemo
+nyd_dun02	mapflag	nomemo
+manuk	mapflag	nomemo
+man_fild02	mapflag	nomemo
+man_in01	mapflag	nomemo
+splendide	mapflag	nomemo
+spl_fild01	mapflag	nomemo
+spl_in01	mapflag	nomemo
+spl_in02	mapflag	nomemo
+
+//evt_zombie	mapflag	nomemo
+
+//============================================================
+// Bossnia (Custom) #!todo Verify
+//============================================================
+bossnia_01	mapflag	nomemo
+bossnia_02	mapflag	nomemo
+bossnia_03	mapflag	nomemo
+bossnia_04	mapflag	nomemo
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	nomemo
+2009rwc_02	mapflag	nomemo
+2009rwc_03	mapflag	nomemo
+2009rwc_04	mapflag	nomemo
+2009rwc_05	mapflag	nomemo
+2009rwc_06	mapflag	nomemo
+2009rwc_07	mapflag	nomemo
+2009rwc_08	mapflag	nomemo
+2009rwc_f01	mapflag	nomemo
+2012rwc_01	mapflag	nomemo
+2012rwc_02	mapflag	nomemo
+2012rwc_03	mapflag	nomemo
+2012rwc_04	mapflag	nomemo
+2012rwc_05	mapflag	nomemo
+2012rwc_06	mapflag	nomemo
+2012rwc_07	mapflag	nomemo
+2012rwc_08	mapflag	nomemo

npc/mapflag/nopenalty.txt

@@ -0,0 +1,321 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable death penalty.
+//===== Description: ========================================= 
+//= Same as 'noexppenalty' and 'nozenypenalty' combined.
+//===== Additional Comments: ================================= 
+//= 1.2 Updated. [Lupus]
+//= 1.3 Added all novice maps. [L0ne_W0lf]
+//= 1.4 Removed Nightmare PVP maps. [L0ne_W0lf]
+//= 1.5 Updated. [L0ne_Wolf]
+//= 1.6 Renewal split. [Euphy]
+//============================================================
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+ayo_in01	mapflag	nopenalty
+ayo_in02	mapflag	nopenalty
+alb_ship	mapflag	nopenalty
+alberta	mapflag	nopenalty
+alberta_in	mapflag	nopenalty
+aldebaran	mapflag	nopenalty
+aldeba_in	mapflag	nopenalty
+amatsu	mapflag	nopenalty
+ama_in01	mapflag	nopenalty
+ama_in02	mapflag	nopenalty
+ama_test	mapflag	nopenalty
+arena_room	mapflag	nopenalty
+comodo	mapflag	nopenalty
+cmd_in01	mapflag	nopenalty
+cmd_in02	mapflag	nopenalty
+geffen	mapflag	nopenalty
+gef_dun03	mapflag	nopenalty
+gef_tower	mapflag	nopenalty
+geffen_in	mapflag	nopenalty
+gonryun	mapflag	nopenalty
+gon_in	mapflag	nopenalty
+gon_test	mapflag	nopenalty
+hugel	mapflag	nopenalty
+in_orcs01	mapflag	nopenalty
+izlude	mapflag	nopenalty
+izlude_in	mapflag	nopenalty
+jawaii	mapflag	nopenalty
+jawaii_in	mapflag	nopenalty
+lighthalzen	mapflag	nopenalty
+louyang	mapflag	nopenalty
+lou_in01	mapflag	nopenalty
+lou_in02	mapflag	nopenalty
+morocc	mapflag	nopenalty
+moc_castle	mapflag	nopenalty
+morocc_in	mapflag	nopenalty
+nif_in	mapflag	nopenalty
+pay_arche	mapflag	nopenalty
+payon	mapflag	nopenalty
+payon_in01	mapflag	nopenalty
+payon_in02	mapflag	nopenalty
+payon_in03	mapflag	nopenalty
+prontera	mapflag	nopenalty
+prt_are_in	mapflag	nopenalty
+prt_are01	mapflag	nopenalty
+prt_castle	mapflag	nopenalty
+prt_church	mapflag	nopenalty
+prt_in	mapflag	nopenalty
+umbala	mapflag	nopenalty
+um_in	mapflag	nopenalty
+xmas	mapflag	nopenalty
+xmas_in	mapflag	nopenalty
+yuno	mapflag	nopenalty
+yuno_in01	mapflag	nopenalty
+yuno_in02	mapflag	nopenalty
+yuno_in03	mapflag	nopenalty
+yuno_in04	mapflag	nopenalty
+yuno_in05	mapflag	nopenalty
+yuno_pre	mapflag	nopenalty
+lhz_in01	mapflag	nopenalty
+lhz_in02	mapflag	nopenalty
+lhz_in03	mapflag	nopenalty
+rachel	mapflag	nopenalty
+ra_in01	mapflag	nopenalty
+ra_temin	mapflag	nopenalty
+ra_temple	mapflag	nopenalty
+ra_temsky	mapflag	nopenalty
+que_rachel	mapflag	nopenalty
+einbech	mapflag	nopenalty
+einbroch	mapflag	nopenalty
+ein_in01	mapflag	nopenalty
+job_soul	mapflag	nopenalty
+job_star	mapflag	nopenalty
+auction_01	mapflag	nopenalty
+auction_02	mapflag	nopenalty
+hu_in01	mapflag	nopenalty
+kh_mansion	mapflag	nopenalty
+kh_rossi	mapflag	nopenalty
+kh_school	mapflag	nopenalty
+kh_vila	mapflag	nopenalty
+kh_kiehl01	mapflag	nopenalty
+kh_kiehl02	mapflag	nopenalty
+ayothaya	mapflag	nopenalty
+veins	mapflag	nopenalty
+ve_in	mapflag	nopenalty
+ve_in02	mapflag	nopenalty
+thor_camp	mapflag	nopenalty
+moc_para01	mapflag	nopenalty
+mid_camp	mapflag	nopenalty
+mid_campin	mapflag	nopenalty
+moc_fild22b	mapflag	nopenalty
+manuk	mapflag	nopenalty
+man_in01	mapflag	nopenalty
+splendide	mapflag	nopenalty
+spl_in01	mapflag	nopenalty
+spl_in02	mapflag	nopenalty
+
+//============================================================
+// Airport
+//============================================================
+airport	mapflag	nopenalty
+airplane	mapflag	nopenalty
+y_airport	mapflag	nopenalty
+lhz_airport	mapflag	nopenalty
+
+
+//============================================================
+// Novice Starter Zone
+//============================================================
+new_zone01	mapflag	nopenalty
+new_zone02	mapflag	nopenalty
+new_zone03	mapflag	nopenalty
+new_zone04	mapflag	nopenalty
+new_1-1	mapflag	nopenalty
+new_1-2	mapflag	nopenalty
+new_1-3	mapflag	nopenalty
+new_1-4	mapflag	nopenalty
+new_2-1	mapflag	nopenalty
+new_2-2	mapflag	nopenalty
+new_2-3	mapflag	nopenalty
+new_2-4	mapflag	nopenalty
+new_3-1	mapflag	nopenalty
+new_3-2	mapflag	nopenalty
+new_3-3	mapflag	nopenalty
+new_3-4	mapflag	nopenalty
+new_4-1	mapflag	nopenalty
+new_4-2	mapflag	nopenalty
+new_4-3	mapflag	nopenalty
+new_4-4	mapflag	nopenalty
+new_5-1	mapflag	nopenalty
+new_5-2	mapflag	nopenalty
+new_5-3	mapflag	nopenalty
+new_5-4	mapflag	nopenalty
+
+//============================================================
+// Job Quests
+//============================================================
+job_sword1	mapflag	nopenalty
+job_thief1	mapflag	nopenalty
+// 2-1 Classes
+job_prist	mapflag	nopenalty
+job_wiz	mapflag	nopenalty
+job_hunte	mapflag	nopenalty
+in_hunter	mapflag	nopenalty
+in_moc_16	mapflag	nopenalty
+// 2-2 Classes
+alde_alche	mapflag	nopenalty
+job_cru	mapflag	nopenalty
+job_duncer	mapflag	nopenalty
+job_monk	mapflag	nopenalty
+monk_test	mapflag	nopenalty
+monk_in	mapflag	nopenalty
+in_rogue	mapflag	nopenalty
+job_sage	mapflag	nopenalty
+
+//============================================================
+// Quest Places
+//============================================================
+mosk_ship	mapflag	nopenalty
+que_sign01	mapflag	nopenalty
+que_sign02	mapflag	nopenalty
+que_ng	mapflag	nopenalty
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	nopenalty
+guild_vs2	mapflag	nopenalty
+guild_vs3	mapflag	nopenalty
+guild_vs4	mapflag	nopenalty
+guild_vs5	mapflag	nopenalty
+
+//============================================================
+// Arenas
+//============================================================
+sec_in01	mapflag	nopenalty
+sec_in02	mapflag	nopenalty
+// Izlude Battle Arena
+force_1-1	mapflag	nopenalty
+force_1-2	mapflag	nopenalty
+force_1-3	mapflag	nopenalty
+force_2-1	mapflag	nopenalty
+force_2-2	mapflag	nopenalty
+force_2-3	mapflag	nopenalty
+force_3-1	mapflag	nopenalty
+force_3-2	mapflag	nopenalty
+force_3-3	mapflag	nopenalty
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_1-1	mapflag	nopenalty
+pvp_y_1-2	mapflag	nopenalty
+pvp_y_1-3	mapflag	nopenalty
+pvp_y_1-4	mapflag	nopenalty
+pvp_y_1-5	mapflag	nopenalty
+pvp_y_2-1	mapflag	nopenalty
+pvp_y_2-2	mapflag	nopenalty
+pvp_y_2-3	mapflag	nopenalty
+pvp_y_2-4	mapflag	nopenalty
+pvp_y_2-5	mapflag	nopenalty
+pvp_y_3-1	mapflag	nopenalty
+pvp_y_3-2	mapflag	nopenalty
+pvp_y_3-3	mapflag	nopenalty
+pvp_y_3-4	mapflag	nopenalty
+pvp_y_3-5	mapflag	nopenalty
+pvp_y_4-1	mapflag	nopenalty
+pvp_y_4-2	mapflag	nopenalty
+pvp_y_4-3	mapflag	nopenalty
+pvp_y_4-4	mapflag	nopenalty
+pvp_y_4-5	mapflag	nopenalty
+pvp_y_5-1	mapflag	nopenalty
+pvp_y_5-2	mapflag	nopenalty
+pvp_y_5-3	mapflag	nopenalty
+pvp_y_5-4	mapflag	nopenalty
+pvp_y_5-5	mapflag	nopenalty
+pvp_y_6-1	mapflag	nopenalty
+pvp_y_6-2	mapflag	nopenalty
+pvp_y_6-3	mapflag	nopenalty
+pvp_y_6-4	mapflag	nopenalty
+pvp_y_6-5	mapflag	nopenalty
+pvp_y_7-1	mapflag	nopenalty
+pvp_y_7-2	mapflag	nopenalty
+pvp_y_7-3	mapflag	nopenalty
+pvp_y_7-4	mapflag	nopenalty
+pvp_y_7-5	mapflag	nopenalty
+pvp_y_8-1	mapflag	nopenalty
+pvp_y_8-2	mapflag	nopenalty
+pvp_y_8-3	mapflag	nopenalty
+pvp_y_8-4	mapflag	nopenalty
+pvp_y_8-5	mapflag	nopenalty
+pvp_2vs2	mapflag	nopenalty
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_room	mapflag	nopenalty
+turbo_n_1	mapflag	nopenalty
+turbo_n_4	mapflag	nopenalty
+turbo_n_8	mapflag	nopenalty
+turbo_n_16	mapflag	nopenalty
+turbo_e_4	mapflag	nopenalty
+turbo_e_8	mapflag	nopenalty
+turbo_e_16	mapflag	nopenalty
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	nopenalty
+p_track02	mapflag	nopenalty
+
+//============================================================
+// Poring War
+//============================================================
+poring_w02	mapflag	nopenalty
+
+//============================================================
+// Vision of Okolnir
+//============================================================
+que_qsch01	mapflag	nopenalty
+que_qsch02	mapflag	nopenalty
+que_qsch03	mapflag	nopenalty
+que_qsch04	mapflag	nopenalty
+que_qsch05	mapflag	nopenalty
+que_qaru01	mapflag	nopenalty
+que_qaru02	mapflag	nopenalty
+que_qaru03	mapflag	nopenalty
+que_qaru04	mapflag	nopenalty
+que_qaru05	mapflag	nopenalty
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nopenalty
+bat_c02	mapflag	nopenalty
+bat_c03	mapflag	nopenalty
+bat_room	mapflag	nopenalty
+bat_b01	mapflag	nopenalty
+bat_b02	mapflag	nopenalty
+bat_a01	mapflag	nopenalty
+bat_a02	mapflag	nopenalty
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	nopenalty
+2009rwc_02	mapflag	nopenalty
+2009rwc_03	mapflag	nopenalty
+2009rwc_04	mapflag	nopenalty
+2009rwc_05	mapflag	nopenalty
+2009rwc_06	mapflag	nopenalty
+2009rwc_07	mapflag	nopenalty
+2009rwc_08	mapflag	nopenalty
+2009rwc_f01	mapflag	nopenalty
+2012rwc_01	mapflag	nopenalty
+2012rwc_02	mapflag	nopenalty
+2012rwc_03	mapflag	nopenalty
+2012rwc_04	mapflag	nopenalty
+2012rwc_05	mapflag	nopenalty
+2012rwc_06	mapflag	nopenalty
+2012rwc_07	mapflag	nopenalty
+2012rwc_08	mapflag	nopenalty
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	nopenalty

npc/mapflag/nopvp.txt

@@ -0,0 +1,149 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable Player versus Player mode.
+//===== Description: ========================================= 
+//= Prevents PvP mode on a map.
+//===== Additional Comments: ================================= 
+//= 1.0 Initial script.
+//= 1.2 Updated. [L0ne_W0lf]
+//= 1.3 Renewal split. [Euphy]
+//============================================================
+
+//============================================================
+// Instances
+//============================================================
+1@cata	mapflag	pvp	off
+2@cata	mapflag	pvp	off
+1@nyd	mapflag	pvp	off
+2@nyd	mapflag	pvp	off
+1@orcs	mapflag	pvp	off
+2@orcs	mapflag	pvp	off
+1@tower	mapflag	pvp	off
+2@tower	mapflag	pvp	off
+3@tower	mapflag	pvp	off
+4@tower	mapflag	pvp	off
+5@tower	mapflag	pvp	off
+6@tower	mapflag	pvp	off
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_room	mapflag	pvp	off
+bat_a01	mapflag	pvp	off
+bat_a02	mapflag	pvp	off
+bat_b01	mapflag	pvp	off
+bat_b02	mapflag	pvp	off
+bat_c01	mapflag	pvp	off
+bat_c02	mapflag	pvp	off
+bat_c03	mapflag	pvp	off
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	pvp	off
+guild_vs2	mapflag	pvp	off
+guild_vs3	mapflag	pvp	off
+guild_vs4	mapflag	pvp	off
+guild_vs5	mapflag	pvp	off
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+ayo_in01	mapflag	pvp	off
+ayo_in02	mapflag	pvp	off
+alberta_in	mapflag	pvp	off
+alberta	mapflag	pvp	off
+alde_alche	mapflag	pvp	off
+aldeba_in	mapflag	pvp	off
+aldebaran	mapflag	pvp	off
+ama_in01	mapflag	pvp	off
+ama_in02	mapflag	pvp	off
+amatsu	mapflag	pvp	off
+cmd_in01	mapflag	pvp	off
+cmd_in02	mapflag	pvp	off
+comodo	mapflag	pvp	off
+gef_tower	mapflag	pvp	off
+geffen	mapflag	pvp	off
+geffen_in	mapflag	pvp	off
+gon_in	mapflag	pvp	off
+gonryun	mapflag	pvp	off
+gon_test	mapflag	pvp	off
+in_hunter	mapflag	pvp	off
+in_moc_16	mapflag	pvp	off
+in_orcs01	mapflag	pvp	off
+izlude_in	mapflag	pvp	off
+izlude	mapflag	pvp	off
+hugel	mapflag	pvp	off
+hu_in01	mapflag	pvp	off
+lighthalzen	mapflag	pvp	off
+lhz_airport	mapflag	pvp	off
+lhz_in01	mapflag	pvp	off
+lhz_in02	mapflag	pvp	off
+lhz_in03	mapflag	pvp	off
+louyang	mapflag	pvp	off
+lou_in01	mapflag	pvp	off
+lou_in02	mapflag	pvp	off
+moc_castle	mapflag	pvp	off
+monk_in	mapflag	pvp	off
+morocc_in	mapflag	pvp	off
+morocc	mapflag	pvp	off
+mosk_in	mapflag	pvp	off
+nif_in	mapflag	pvp	off
+payon_in01	mapflag	pvp	off
+payon_in02	mapflag	pvp	off
+payon_in03	mapflag	pvp	off
+payon	mapflag	pvp	off
+pay_arche	mapflag	pvp	off
+prt_are_in	mapflag	pvp	off
+prt_are01	mapflag	pvp	off
+prt_castle	mapflag	pvp	off
+prt_church	mapflag	pvp	off
+prt_in	mapflag	pvp	off
+prontera	mapflag	pvp	off
+sec_in01	mapflag	pvp	off
+job_sword1	mapflag	pvp	off
+um_in	mapflag	pvp	off
+umbala	mapflag	pvp	off
+xmas_in	mapflag	pvp	off
+xmas	mapflag	pvp	off
+yuno_in01	mapflag	pvp	off
+yuno_in03	mapflag	pvp	off
+yuno_in04	mapflag	pvp	off
+yuno_in05	mapflag	pvp	off
+yuno	mapflag	pvp	off
+yuno_pre	mapflag	pvp	off
+y_airport	mapflag	pvp	off
+rachel	mapflag	pvp	off
+ra_in01	mapflag	pvp	off
+ra_temin	mapflag	pvp	off
+airplane	mapflag	pvp	off
+airport	mapflag	pvp	off
+einbech	mapflag	pvp	off
+einbroch	mapflag	pvp	off
+ein_in01	mapflag	pvp	off
+ayothaya	mapflag	pvp	off
+veins	mapflag	pvp	off
+ve_in	mapflag	pvp	off
+ve_in02	mapflag	pvp	off
+cave	mapflag	pvp	off
+
+e_tower	mapflag	pvp	off
+
+mid_camp	mapflag	pvp	off
+mid_campin	mapflag	pvp	off
+man_fild01	mapflag	pvp	off
+moc_fild22b	mapflag	pvp	off
+que_dan01	mapflag	pvp	off
+que_dan02	mapflag	pvp	off
+schg_que01	mapflag	pvp	off
+arug_que01	mapflag	pvp	off
+
+manuk	mapflag	pvp	off
+man_in01	mapflag	pvp	off
+splendide	mapflag	pvp	off
+spl_in01	mapflag	pvp	off
+spl_in02	mapflag	pvp	off
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	pvp	off

npc/mapflag/noreturn.txt

@@ -0,0 +1,263 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable return warp.
+//===== Description: ========================================= 
+//= Disables the following items:
+//=   Butterfly Wing (602), Siege Teleport Scroll (14591),
+//=   Yellow/Green/Red/Blue Butterfly Wings (14582-14585),
+//=   Dungeon Teleport Scrolls (14527/14581)
+//= Also restricts "warpparty" and "warpguild" script commands.
+//===== Additional Comments: ================================= 
+//= 1.3 According to the patch, enabled Butterfly wings in the Castles. [Lupus]
+//= 1.4 Enabled Butterfly wings on PvP maps. [Skotlex]
+//= 1.4a Added job_knt. [Samuray22]
+//= 1.5 Commented out new_zone entries. [L0ne_W0lf]
+//= 1.6 Enabled B. wings on all maps but que_hugel. [L0ne_W0lf]
+//============================================================
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+//ayo_in01	mapflag	noreturn
+//ayo_in02	mapflag	noreturn
+//alb_ship	mapflag	noreturn
+//alberta_in	mapflag	noreturn
+//aldeba_in	mapflag	noreturn
+//ama_in01	mapflag	noreturn
+//ama_in02	mapflag	noreturn
+//ama_test	mapflag	noreturn
+//cmd_in01	mapflag	noreturn
+//cmd_in02	mapflag	noreturn
+//gef_tower	mapflag	noreturn
+//geffen_in	mapflag	noreturn
+//gon_test	mapflag	noreturn
+//gon_in	mapflag	noreturn
+//in_orcs01	mapflag	noreturn
+//izlude_in	mapflag	noreturn
+//hu_in01	mapflag	noreturn
+//jawaii_in	mapflag	noreturn
+//lou_in01	mapflag	noreturn
+//lou_in02	mapflag	noreturn
+//moc_castle	mapflag	noreturn
+//morocc_in	mapflag	noreturn
+//mosk_in	mapflag	noreturn
+//new_zone01	mapflag	noreturn
+//new_zone02	mapflag	noreturn
+//new_zone03	mapflag	noreturn
+//new_zone04	mapflag	noreturn
+//nif_in	mapflag	noreturn
+//payon_in01	mapflag	noreturn
+//payon_in02	mapflag	noreturn
+//payon_in03	mapflag	noreturn
+//prt_are_in	mapflag	noreturn
+//prt_are01	mapflag	noreturn
+//prt_castle	mapflag	noreturn
+//prt_church	mapflag	noreturn
+//prt_in	mapflag	noreturn
+//um_in	mapflag	noreturn
+//xmas_in	mapflag	noreturn
+//yuno_in01	mapflag	noreturn
+//yuno_in03	mapflag	noreturn
+//yuno_in04	mapflag	noreturn
+//yuno_in05	mapflag	noreturn
+//que_sign01	mapflag	noreturn
+//ein_in01	mapflag	noreturn
+//airport	mapflag	noreturn
+//airplane	mapflag	noreturn
+//airplane_01	mapflag	noreturn
+//yuno_pre	mapflag	noreturn
+//y_airport	mapflag	noreturn
+//lhz_airport	mapflag	noreturn
+//lhz_in01	mapflag	noreturn
+//lhz_in02	mapflag	noreturn
+//lhz_in03	mapflag	noreturn
+//lhz_que01	mapflag	noreturn
+//kh_mansion	mapflag	noreturn
+//kh_rossi	mapflag	noreturn
+//kh_school	mapflag	noreturn
+//kh_vila	mapflag	noreturn
+//ra_in01	mapflag	noreturn
+//ra_temin	mapflag	noreturn
+//ve_in	mapflag	noreturn
+//ve_in02	mapflag	noreturn
+
+//============================================================
+// Job Quests
+//============================================================
+//job_sword1	mapflag	noreturn
+//job_thief1	mapflag	noreturn
+// 2-1 Classes
+//job_knt	mapflag	noreturn
+//job_hunte	mapflag	noreturn
+//job_prist	mapflag	noreturn
+//job_wiz	mapflag	noreturn
+//in_hunter	mapflag	noreturn
+//in_moc_16	mapflag	noreturn
+// 2-2 Classes
+//alde_alche	mapflag	noreturn
+//job_cru	mapflag	noreturn
+//job_duncer	mapflag	noreturn
+//job_monk	mapflag	noreturn
+//monk_test	mapflag	noreturn
+//monk_in	mapflag	noreturn
+//in_rogue	mapflag	noreturn
+//job_sage	mapflag	noreturn
+//que_ng	mapflag	noreturn
+
+//============================================================
+// Quest Places
+//============================================================
+//que_god01	mapflag	noreturn
+//que_god02	mapflag	noreturn
+//que_bingo	mapflag	noreturn
+que_hugel	mapflag	noreturn
+//que_thor	mapflag	noreturn
+//poring_c01	mapflag	noreturn
+//poring_c02	mapflag	noreturn
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+//= 1.3 According to the kRO patch, enabled Butterfly wings in the Castles
+//aldeg_cas01	mapflag	noreturn
+//aldeg_cas02	mapflag	noreturn
+//aldeg_cas03	mapflag	noreturn
+//aldeg_cas04	mapflag	noreturn
+//aldeg_cas05	mapflag	noreturn
+//gefg_cas01	mapflag	noreturn
+//gefg_cas02	mapflag	noreturn
+//gefg_cas03	mapflag	noreturn
+//gefg_cas04	mapflag	noreturn
+//gefg_cas05	mapflag	noreturn
+//payg_cas01	mapflag	noreturn
+//payg_cas02	mapflag	noreturn
+//payg_cas03	mapflag	noreturn
+//payg_cas04	mapflag	noreturn
+//payg_cas05	mapflag	noreturn
+//prtg_cas01	mapflag	noreturn
+//prtg_cas02	mapflag	noreturn
+//prtg_cas03	mapflag	noreturn
+//prtg_cas04	mapflag	noreturn
+//prtg_cas05	mapflag	noreturn
+//nguild_alde	mapflag	noreturn
+//nguild_gef	mapflag	noreturn
+//nguild_pay	mapflag	noreturn
+//nguild_prt	mapflag	noreturn
+
+//============================================================
+// GvG Arenas
+//============================================================
+//guild_vs1	mapflag	noreturn
+//guild_vs2	mapflag	noreturn
+//guild_vs3	mapflag	noreturn
+//guild_vs4	mapflag	noreturn
+//guild_vs5	mapflag	noreturn
+
+//============================================================
+// Arenas
+//============================================================
+//arena_room	mapflag	noreturn
+//sec_in01	mapflag	noreturn
+//sec_in02	mapflag	noreturn
+
+//============================================================
+// PvP Arenas
+//============================================================
+//pvp_y_room	mapflag	noreturn
+//pvp_y_1-1	mapflag	noreturn
+//pvp_y_1-2	mapflag	noreturn
+//pvp_y_1-3	mapflag	noreturn
+//pvp_y_1-4	mapflag	noreturn
+//pvp_y_1-5	mapflag	noreturn
+//pvp_y_2-1	mapflag	noreturn
+//pvp_y_2-2	mapflag	noreturn
+//pvp_y_2-3	mapflag	noreturn
+//pvp_y_2-4	mapflag	noreturn
+//pvp_y_2-5	mapflag	noreturn
+//pvp_y_3-1	mapflag	noreturn
+//pvp_y_3-2	mapflag	noreturn
+//pvp_y_3-3	mapflag	noreturn
+//pvp_y_3-4	mapflag	noreturn
+//pvp_y_3-5	mapflag	noreturn
+//pvp_y_4-1	mapflag	noreturn
+//pvp_y_4-2	mapflag	noreturn
+//pvp_y_4-3	mapflag	noreturn
+//pvp_y_4-4	mapflag	noreturn
+//pvp_y_4-5	mapflag	noreturn
+//pvp_y_5-1	mapflag	noreturn
+//pvp_y_5-2	mapflag	noreturn
+//pvp_y_5-3	mapflag	noreturn
+//pvp_y_5-4	mapflag	noreturn
+//pvp_y_5-5	mapflag	noreturn
+//pvp_y_6-1	mapflag	noreturn
+//pvp_y_6-2	mapflag	noreturn
+//pvp_y_6-3	mapflag	noreturn
+//pvp_y_6-4	mapflag	noreturn
+//pvp_y_6-5	mapflag	noreturn
+//pvp_y_7-1	mapflag	noreturn
+//pvp_y_7-2	mapflag	noreturn
+//pvp_y_7-3	mapflag	noreturn
+//pvp_y_7-4	mapflag	noreturn
+//pvp_y_7-5	mapflag	noreturn
+//pvp_y_8-1	mapflag	noreturn
+//pvp_y_8-2	mapflag	noreturn
+//pvp_y_8-3	mapflag	noreturn
+//pvp_y_8-4	mapflag	noreturn
+//pvp_y_8-5	mapflag	noreturn
+//pvp_n_room	mapflag	noreturn
+//pvp_n_1-1	mapflag	noreturn
+//pvp_n_1-2	mapflag	noreturn
+//pvp_n_1-3	mapflag	noreturn
+//pvp_n_1-4	mapflag	noreturn
+//pvp_n_1-5	mapflag	noreturn
+//pvp_n_2-1	mapflag	noreturn
+//pvp_n_2-2	mapflag	noreturn
+//pvp_n_2-3	mapflag	noreturn
+//pvp_n_2-4	mapflag	noreturn
+//pvp_n_2-5	mapflag	noreturn
+//pvp_n_3-1	mapflag	noreturn
+//pvp_n_3-2	mapflag	noreturn
+//pvp_n_3-3	mapflag	noreturn
+//pvp_n_3-4	mapflag	noreturn
+//pvp_n_3-5	mapflag	noreturn
+//pvp_n_4-1	mapflag	noreturn
+//pvp_n_4-2	mapflag	noreturn
+//pvp_n_4-3	mapflag	noreturn
+//pvp_n_4-4	mapflag	noreturn
+//pvp_n_4-5	mapflag	noreturn
+//pvp_n_5-1	mapflag	noreturn
+//pvp_n_5-2	mapflag	noreturn
+//pvp_n_5-3	mapflag	noreturn
+//pvp_n_5-4	mapflag	noreturn
+//pvp_n_5-5	mapflag	noreturn
+//pvp_n_6-1	mapflag	noreturn
+//pvp_n_6-2	mapflag	noreturn
+//pvp_n_6-3	mapflag	noreturn
+//pvp_n_6-4	mapflag	noreturn
+//pvp_n_6-5	mapflag	noreturn
+//pvp_n_7-1	mapflag	noreturn
+//pvp_n_7-2	mapflag	noreturn
+//pvp_n_7-3	mapflag	noreturn
+//pvp_n_7-4	mapflag	noreturn
+//pvp_n_7-5	mapflag	noreturn
+//pvp_n_8-1	mapflag	noreturn
+//pvp_n_8-2	mapflag	noreturn
+//pvp_n_8-3	mapflag	noreturn
+//pvp_n_8-4	mapflag	noreturn
+//pvp_n_8-5	mapflag	noreturn
+//pvp_2vs2	mapflag	noreturn
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	noreturn
+bat_c02	mapflag	noreturn
+bat_c03	mapflag	noreturn
+bat_b01	mapflag	noreturn
+bat_b02	mapflag	noreturn
+bat_a01	mapflag	noreturn
+bat_a02	mapflag	noreturn
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	noreturn

npc/mapflag/nosave.txt

@@ -0,0 +1,319 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable auto-save.
+//===== Description: ========================================= 
+//= Characters logging out on the specified map will be warped
+//= to the map specified in the last field, or "SavePoint".
+//===== Additional Comments: ================================= 
+//= 1.7 Updated. [Lupus]
+//= 1.8 Updated. [L0ne_W0lf]
+//= 1.9 Renewal split. [Euphy]
+//= 2.0 Moved instances to pre-renewal. [Lemongrass]
+//============================================================
+
+//============================================================
+// Job Quests
+//============================================================
+job_sword1	mapflag	nosave	SavePoint
+//job_thief1	mapflag	nosave	SavePoint
+// 2-1 Classes
+job_knt	mapflag	nosave	SavePoint
+job_prist	mapflag	nosave	SavePoint
+job_wiz	mapflag	nosave	SavePoint
+in_moc_16	mapflag	nosave	SavePoint
+job_hunte	mapflag	nosave	SavePoint
+//in_hunter	mapflag	nosave	SavePoint
+// 2-2 Classes
+alde_alche	mapflag	nosave	SavePoint
+job_cru	mapflag	nosave	SavePoint
+job_duncer	mapflag	nosave	SavePoint
+job_monk	mapflag	nosave	SavePoint
+monk_test	mapflag	nosave	SavePoint
+in_rogue	mapflag	nosave	SavePoint
+job_sage	mapflag	nosave	SavePoint
+// Expanded Classes
+job_star	mapflag	nosave	SavePoint
+job_soul	mapflag	nosave	SavePoint
+
+//============================================================
+// Quest Places
+//============================================================
+ama_test	mapflag	nosave	SavePoint
+gef_dun03	mapflag	nosave	SavePoint
+que_ba	mapflag	nosave	SavePoint
+que_god01	mapflag	nosave	SavePoint
+que_god02	mapflag	nosave	SavePoint
+que_sign01	mapflag	nosave	SavePoint
+que_sign02	mapflag	nosave	SavePoint
+que_thor	mapflag	nosave	SavePoint
+que_ng	mapflag	nosave	SavePoint
+gon_test	mapflag	nosave	SavePoint
+kh_kiehl01	mapflag	nosave	SavePoint
+kh_kiehl02	mapflag	nosave	SavePoint
+que_bingo	mapflag	nosave	SavePoint
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	nosave	SavePoint
+guild_vs2	mapflag	nosave	SavePoint
+guild_vs3	mapflag	nosave	SavePoint
+guild_vs4	mapflag	nosave	SavePoint
+guild_vs5	mapflag	nosave	SavePoint
+
+//============================================================
+// Arenas
+//============================================================
+force_1-1	mapflag	nosave	SavePoint
+force_1-2	mapflag	nosave	SavePoint
+force_1-3	mapflag	nosave	SavePoint
+force_2-1	mapflag	nosave	SavePoint
+force_2-2	mapflag	nosave	SavePoint
+force_2-3	mapflag	nosave	SavePoint
+force_3-1	mapflag	nosave	SavePoint
+force_3-2	mapflag	nosave	SavePoint
+force_3-3	mapflag	nosave	SavePoint
+force_4-1	mapflag	nosave	SavePoint
+force_5-1	mapflag	nosave	SavePoint
+prt_are_in	mapflag	nosave	SavePoint
+
+//============================================================
+// Juperos
+//============================================================
+jupe_area1	mapflag	nosave	SavePoint
+jupe_area2	mapflag	nosave	SavePoint
+jupe_ele	mapflag	nosave	SavePoint
+jupe_ele_r	mapflag	nosave	SavePoint
+jupe_gate	mapflag	nosave	SavePoint
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_room	mapflag	nosave	SavePoint
+pvp_y_1-1	mapflag	nosave	SavePoint
+pvp_y_1-2	mapflag	nosave	SavePoint
+pvp_y_1-3	mapflag	nosave	SavePoint
+pvp_y_1-4	mapflag	nosave	SavePoint
+pvp_y_1-5	mapflag	nosave	SavePoint
+pvp_y_2-1	mapflag	nosave	SavePoint
+pvp_y_2-2	mapflag	nosave	SavePoint
+pvp_y_2-3	mapflag	nosave	SavePoint
+pvp_y_2-4	mapflag	nosave	SavePoint
+pvp_y_2-5	mapflag	nosave	SavePoint
+pvp_y_3-1	mapflag	nosave	SavePoint
+pvp_y_3-2	mapflag	nosave	SavePoint
+pvp_y_3-3	mapflag	nosave	SavePoint
+pvp_y_3-4	mapflag	nosave	SavePoint
+pvp_y_3-5	mapflag	nosave	SavePoint
+pvp_y_4-1	mapflag	nosave	SavePoint
+pvp_y_4-2	mapflag	nosave	SavePoint
+pvp_y_4-3	mapflag	nosave	SavePoint
+pvp_y_4-4	mapflag	nosave	SavePoint
+pvp_y_4-5	mapflag	nosave	SavePoint
+pvp_y_5-1	mapflag	nosave	SavePoint
+pvp_y_5-2	mapflag	nosave	SavePoint
+pvp_y_5-3	mapflag	nosave	SavePoint
+pvp_y_5-4	mapflag	nosave	SavePoint
+pvp_y_5-5	mapflag	nosave	SavePoint
+pvp_y_6-1	mapflag	nosave	SavePoint
+pvp_y_6-2	mapflag	nosave	SavePoint
+pvp_y_6-3	mapflag	nosave	SavePoint
+pvp_y_6-4	mapflag	nosave	SavePoint
+pvp_y_6-5	mapflag	nosave	SavePoint
+pvp_y_7-1	mapflag	nosave	SavePoint
+pvp_y_7-2	mapflag	nosave	SavePoint
+pvp_y_7-3	mapflag	nosave	SavePoint
+pvp_y_7-4	mapflag	nosave	SavePoint
+pvp_y_7-5	mapflag	nosave	SavePoint
+pvp_y_8-1	mapflag	nosave	SavePoint
+pvp_y_8-2	mapflag	nosave	SavePoint
+pvp_y_8-3	mapflag	nosave	SavePoint
+pvp_y_8-4	mapflag	nosave	SavePoint
+pvp_y_8-5	mapflag	nosave	SavePoint
+pvp_n_room	mapflag	nosave	SavePoint
+pvp_n_1-1	mapflag	nosave	SavePoint
+pvp_n_1-2	mapflag	nosave	SavePoint
+pvp_n_1-3	mapflag	nosave	SavePoint
+pvp_n_1-4	mapflag	nosave	SavePoint
+pvp_n_1-5	mapflag	nosave	SavePoint
+pvp_n_2-1	mapflag	nosave	SavePoint
+pvp_n_2-2	mapflag	nosave	SavePoint
+pvp_n_2-3	mapflag	nosave	SavePoint
+pvp_n_2-4	mapflag	nosave	SavePoint
+pvp_n_2-5	mapflag	nosave	SavePoint
+pvp_n_3-1	mapflag	nosave	SavePoint
+pvp_n_3-2	mapflag	nosave	SavePoint
+pvp_n_3-3	mapflag	nosave	SavePoint
+pvp_n_3-4	mapflag	nosave	SavePoint
+pvp_n_3-5	mapflag	nosave	SavePoint
+pvp_n_4-1	mapflag	nosave	SavePoint
+pvp_n_4-2	mapflag	nosave	SavePoint
+pvp_n_4-3	mapflag	nosave	SavePoint
+pvp_n_4-4	mapflag	nosave	SavePoint
+pvp_n_4-5	mapflag	nosave	SavePoint
+pvp_n_5-1	mapflag	nosave	SavePoint
+pvp_n_5-2	mapflag	nosave	SavePoint
+pvp_n_5-3	mapflag	nosave	SavePoint
+pvp_n_5-4	mapflag	nosave	SavePoint
+pvp_n_5-5	mapflag	nosave	SavePoint
+pvp_n_6-1	mapflag	nosave	SavePoint
+pvp_n_6-2	mapflag	nosave	SavePoint
+pvp_n_6-3	mapflag	nosave	SavePoint
+pvp_n_6-4	mapflag	nosave	SavePoint
+pvp_n_6-5	mapflag	nosave	SavePoint
+pvp_n_7-1	mapflag	nosave	SavePoint
+pvp_n_7-2	mapflag	nosave	SavePoint
+pvp_n_7-3	mapflag	nosave	SavePoint
+pvp_n_7-4	mapflag	nosave	SavePoint
+pvp_n_7-5	mapflag	nosave	SavePoint
+pvp_n_8-1	mapflag	nosave	SavePoint
+pvp_n_8-2	mapflag	nosave	SavePoint
+pvp_n_8-3	mapflag	nosave	SavePoint
+pvp_n_8-4	mapflag	nosave	SavePoint
+pvp_n_8-5	mapflag	nosave	SavePoint
+pvp_2vs2	mapflag	nosave	SavePoint
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	nosave	SavePoint
+aldeg_cas02	mapflag	nosave	SavePoint
+aldeg_cas03	mapflag	nosave	SavePoint
+aldeg_cas04	mapflag	nosave	SavePoint
+aldeg_cas05	mapflag	nosave	SavePoint
+gefg_cas01	mapflag	nosave	SavePoint
+gefg_cas02	mapflag	nosave	SavePoint
+gefg_cas03	mapflag	nosave	SavePoint
+gefg_cas04	mapflag	nosave	SavePoint
+gefg_cas05	mapflag	nosave	SavePoint
+payg_cas01	mapflag	nosave	SavePoint
+payg_cas02	mapflag	nosave	SavePoint
+payg_cas03	mapflag	nosave	SavePoint
+payg_cas04	mapflag	nosave	SavePoint
+payg_cas05	mapflag	nosave	SavePoint
+prtg_cas01	mapflag	nosave	SavePoint
+prtg_cas02	mapflag	nosave	SavePoint
+prtg_cas03	mapflag	nosave	SavePoint
+prtg_cas04	mapflag	nosave	SavePoint
+prtg_cas05	mapflag	nosave	SavePoint
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	nosave	SavePoint
+schg_cas02	mapflag	nosave	SavePoint
+schg_cas03	mapflag	nosave	SavePoint
+schg_cas04	mapflag	nosave	SavePoint
+schg_cas05	mapflag	nosave	SavePoint
+arug_cas01	mapflag	nosave	SavePoint
+arug_cas02	mapflag	nosave	SavePoint
+arug_cas03	mapflag	nosave	SavePoint
+arug_cas04	mapflag	nosave	SavePoint
+arug_cas05	mapflag	nosave	SavePoint
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+nguild_alde	mapflag	nosave	SavePoint
+nguild_gef	mapflag	nosave	SavePoint
+nguild_pay	mapflag	nosave	SavePoint
+nguild_prt	mapflag	nosave	SavePoint
+
+//============================================================
+// Guild Dungeons
+//============================================================
+gld_dun01	mapflag	nosave	SavePoint
+gld_dun02	mapflag	nosave	SavePoint
+gld_dun03	mapflag	nosave	SavePoint
+gld_dun04	mapflag	nosave	SavePoint
+
+//============================================================
+// Normal Maps
+//============================================================
+yggdrasil01	mapflag	nosave	SavePoint
+thana_boss	mapflag	nosave	SavePoint
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_n_1	mapflag	nosave	SavePoint
+turbo_n_4	mapflag	nosave	SavePoint
+turbo_n_8	mapflag	nosave	SavePoint
+turbo_n_16	mapflag	nosave	SavePoint
+turbo_e_4	mapflag	nosave	SavePoint
+turbo_e_8	mapflag	nosave	SavePoint
+turbo_e_16	mapflag	nosave	SavePoint
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	nosave	SavePoint
+p_track02	mapflag	nosave	SavePoint
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	nosave	SavePoint
+poring_w02	mapflag	nosave	SavePoint
+
+//============================================================
+// Vision of Okolnir
+//============================================================
+que_qsch01	mapflag	nosave	SavePoint
+que_qsch02	mapflag	nosave	SavePoint
+que_qsch03	mapflag	nosave	SavePoint
+que_qsch04	mapflag	nosave	SavePoint
+que_qsch05	mapflag	nosave	SavePoint
+que_qaru01	mapflag	nosave	SavePoint
+que_qaru02	mapflag	nosave	SavePoint
+que_qaru03	mapflag	nosave	SavePoint
+que_qaru04	mapflag	nosave	SavePoint
+que_qaru05	mapflag	nosave	SavePoint
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nosave	SavePoint
+bat_c02	mapflag	nosave	SavePoint
+bat_c03	mapflag	nosave	SavePoint
+bat_b01	mapflag	nosave	SavePoint
+bat_b02	mapflag	nosave	SavePoint
+bat_a01	mapflag	nosave	SavePoint
+bat_a02	mapflag	nosave	SavePoint
+
+//============================================================
+// Episode 13
+//============================================================
+moc_fild22b	mapflag	nosave	SavePoint
+que_dan01	mapflag	nosave	SavePoint
+que_dan02	mapflag	nosave	SavePoint
+schg_que01	mapflag	nosave	SavePoint
+schg_dun01	mapflag	nosave	SavePoint
+arug_que01	mapflag	nosave	SavePoint
+arug_dun01	mapflag	nosave	SavePoint
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	nosave	SavePoint
+2009rwc_02	mapflag	nosave	SavePoint
+2009rwc_03	mapflag	nosave	SavePoint
+2009rwc_04	mapflag	nosave	SavePoint
+2009rwc_05	mapflag	nosave	SavePoint
+2009rwc_06	mapflag	nosave	SavePoint
+2009rwc_07	mapflag	nosave	SavePoint
+2009rwc_08	mapflag	nosave	SavePoint
+2009rwc_f01	mapflag	nosave	SavePoint
+2012rwc_01	mapflag	nosave	SavePoint
+2012rwc_02	mapflag	nosave	SavePoint
+2012rwc_03	mapflag	nosave	SavePoint
+2012rwc_04	mapflag	nosave	SavePoint
+2012rwc_05	mapflag	nosave	SavePoint
+2012rwc_06	mapflag	nosave	SavePoint
+2012rwc_07	mapflag	nosave	SavePoint
+2012rwc_08	mapflag	nosave	SavePoint
+
+//============================================================
+// Events
+//============================================================
+evt_bomb	mapflag	nosave	SavePoint
+//evt_zombie	mapflag	nosave	SavePoint

npc/mapflag/noskill.txt

@@ -0,0 +1,37 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable skill use.
+//===== Description: ========================================= 
+//= Disables all skills on the map.
+//===== Additional Comments: ================================= 
+//= 1.1 Added additional maps. [L0ne_W0lf]
+//============================================================
+
+//============================================================
+// Arenas
+//============================================================
+prt_are_in	mapflag	noskill
+
+//============================================================
+// The Sign Quest
+//============================================================
+himinn	mapflag	noskill
+
+//============================================================
+// Quiz
+//============================================================
+quiz_00	mapflag	noskill
+quiz_01	mapflag	noskill
+quiz_02	mapflag	noskill
+quiz_test	mapflag	noskill
+
+//============================================================
+// Hugel Minigames
+//============================================================
+que_bingo	mapflag	noskill
+p_track01	mapflag	noskill
+p_track02	mapflag	noskill
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	noskill

npc/mapflag/noteleport.txt

@@ -0,0 +1,481 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable teleportation.
+//===== Description: ========================================= 
+//= Disables all means of teleportation within a map.
+//= Script commands 'warp', 'areawarp', 'warpchar',
+//=   'warpparty', 'warpguild', 'warpwaitingpc' will not
+//=   work with "Random" destination.
+//= Disables skills AL_TELEPORT and TK_HIGHJUMP.
+//= Disables the following items:
+//=   Fly Wing (601), Giant Fly Wing (12212)
+//===== Additional Comments: ================================= 
+//= 1.6a Updated. [Lupus]
+//= 1.7 Updated. [L0ne_W0lf]
+//= 1.8 Renewal split. [Euphy]
+//============================================================
+
+//============================================================
+// Municipality (Cities/Towns/Villages)
+//============================================================
+ayo_in01	mapflag	noteleport
+ayo_in02	mapflag	noteleport
+alb_ship	mapflag	noteleport
+alberta_in	mapflag	noteleport
+aldeba_in	mapflag	noteleport
+ama_in01	mapflag	noteleport
+ama_in02	mapflag	noteleport
+ama_test	mapflag	noteleport
+cmd_in01	mapflag	noteleport
+cmd_in02	mapflag	noteleport
+geffen_in	mapflag	noteleport
+gef_tower	mapflag	noteleport
+gon_test	mapflag	noteleport
+gon_in	mapflag	noteleport
+in_orcs01	mapflag	noteleport
+izlude_in	mapflag	noteleport
+jawaii_in	mapflag	noteleport
+lou_in01	mapflag	noteleport
+lou_in02	mapflag	noteleport
+moc_castle	mapflag	noteleport
+morocc_in	mapflag	noteleport
+mosk_in	mapflag	noteleport
+nif_in	mapflag	noteleport
+payon_in01	mapflag	noteleport
+payon_in02	mapflag	noteleport
+payon_in03	mapflag	noteleport
+prt_castle	mapflag	noteleport
+prt_church	mapflag	noteleport
+prt_in	mapflag	noteleport
+um_in	mapflag	noteleport
+xmas_in	mapflag	noteleport
+yuno_in01	mapflag	noteleport
+yuno_in02	mapflag	noteleport
+yuno_in03	mapflag	noteleport
+yuno_in04	mapflag	noteleport
+yuno_in05	mapflag	noteleport
+ein_in01	mapflag	noteleport
+lighthalzen	mapflag	noteleport
+yuno	mapflag	noteleport
+yuno_pre	mapflag	noteleport
+einbroch	mapflag	noteleport
+einbech	mapflag	noteleport
+lhz_que01	mapflag	noteleport
+lhz_cube	mapflag	noteleport
+lhz_in01	mapflag	noteleport
+lhz_in02	mapflag	noteleport
+lhz_in03	mapflag	noteleport
+jupe_area1	mapflag	noteleport
+jupe_area2	mapflag	noteleport
+jupe_ele	mapflag	noteleport
+jupe_ele_r	mapflag	noteleport
+jupe_gate	mapflag	noteleport
+hu_in01	mapflag	noteleport
+auction_01	mapflag	noteleport
+auction_02	mapflag	noteleport
+ra_in01	mapflag	noteleport
+ra_temin	mapflag	noteleport
+ra_temsky	mapflag	noteleport
+kh_mansion	mapflag	noteleport
+kh_rossi	mapflag	noteleport
+kh_school	mapflag	noteleport
+kh_vila	mapflag	noteleport
+ve_in	mapflag	noteleport
+ve_in02	mapflag	noteleport
+thor_camp	mapflag	noteleport
+
+//============================================================
+// Dungeons
+//============================================================
+ama_dun01	mapflag	noteleport
+gef_dun03	mapflag	noteleport
+tha_t07	mapflag	noteleport
+tha_t08	mapflag	noteleport
+tha_t09	mapflag	noteleport
+tha_t10	mapflag	noteleport
+tha_t11	mapflag	noteleport
+tha_t12	mapflag	noteleport
+thana_step	mapflag	noteleport
+kh_dun01	mapflag	noteleport
+nyd_dun02	mapflag	noteleport
+
+//============================================================
+// Airport
+//============================================================
+airport	mapflag	noteleport
+airplane	mapflag	noteleport
+airplane_01	mapflag	noteleport
+y_airport	mapflag	noteleport
+lhz_airport	mapflag	noteleport
+
+//============================================================
+// Novice Starter Zone
+//============================================================
+new_zone01	mapflag	noteleport
+new_zone02	mapflag	noteleport
+new_zone03	mapflag	noteleport
+new_zone04	mapflag	noteleport
+new_1-1	mapflag	noteleport
+new_1-2	mapflag	noteleport
+new_1-3	mapflag	noteleport
+new_1-4	mapflag	noteleport
+new_2-1	mapflag	noteleport
+new_2-2	mapflag	noteleport
+new_2-3	mapflag	noteleport
+new_2-4	mapflag	noteleport
+new_3-1	mapflag	noteleport
+new_3-2	mapflag	noteleport
+new_3-3	mapflag	noteleport
+new_3-4	mapflag	noteleport
+new_4-1	mapflag	noteleport
+new_4-2	mapflag	noteleport
+new_4-3	mapflag	noteleport
+new_4-4	mapflag	noteleport
+new_5-1	mapflag	noteleport
+new_5-2	mapflag	noteleport
+new_5-3	mapflag	noteleport
+new_5-4	mapflag	noteleport
+
+//============================================================
+// Job Quests
+//============================================================
+job_sword1	mapflag	noteleport
+job_thief1	mapflag	noteleport
+// 2-1 Classes
+job_knt	mapflag	noteleport
+job_prist	mapflag	noteleport
+job_wiz	mapflag	noteleport
+job_hunte	mapflag	noteleport
+in_hunter	mapflag	noteleport
+in_moc_16	mapflag	noteleport
+// 2-2 Classes
+alde_alche	mapflag	noteleport
+job_cru	mapflag	noteleport
+job_duncer	mapflag	noteleport
+job_monk	mapflag	noteleport
+monk_test	mapflag	noteleport
+monk_in	mapflag	noteleport
+in_rogue	mapflag	noteleport
+job_sage	mapflag	noteleport
+job_star	mapflag	noteleport
+job_soul	mapflag	noteleport
+que_ng	mapflag	noteleport
+
+//============================================================
+// Quest Places
+//============================================================
+que_ba	mapflag	noteleport
+que_god01	mapflag	noteleport
+que_god02	mapflag	noteleport
+que_bingo	mapflag	noteleport
+que_hugel	mapflag	noteleport
+kh_kiehl01	mapflag	noteleport
+kh_kiehl02	mapflag	noteleport
+que_rachel	mapflag	noteleport
+que_thor	mapflag	noteleport
+poring_c01	mapflag	noteleport
+poring_c02	mapflag	noteleport
+que_job01	mapflag	noteleport
+que_job02	mapflag	noteleport
+que_job03	mapflag	noteleport
+cave	mapflag	noteleport
+que_sign01	mapflag	noteleport
+que_sign02	mapflag	noteleport
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	noteleport
+aldeg_cas02	mapflag	noteleport
+aldeg_cas03	mapflag	noteleport
+aldeg_cas04	mapflag	noteleport
+aldeg_cas05	mapflag	noteleport
+gefg_cas01	mapflag	noteleport
+gefg_cas02	mapflag	noteleport
+gefg_cas03	mapflag	noteleport
+gefg_cas04	mapflag	noteleport
+gefg_cas05	mapflag	noteleport
+payg_cas01	mapflag	noteleport
+payg_cas02	mapflag	noteleport
+payg_cas03	mapflag	noteleport
+payg_cas04	mapflag	noteleport
+payg_cas05	mapflag	noteleport
+prtg_cas01	mapflag	noteleport
+prtg_cas02	mapflag	noteleport
+prtg_cas03	mapflag	noteleport
+prtg_cas04	mapflag	noteleport
+prtg_cas05	mapflag	noteleport
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	noteleport
+schg_cas02	mapflag	noteleport
+schg_cas03	mapflag	noteleport
+schg_cas04	mapflag	noteleport
+schg_cas05	mapflag	noteleport
+arug_cas01	mapflag	noteleport
+arug_cas02	mapflag	noteleport
+arug_cas03	mapflag	noteleport
+arug_cas04	mapflag	noteleport
+arug_cas05	mapflag	noteleport
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+nguild_alde	mapflag	noteleport
+nguild_gef	mapflag	noteleport
+nguild_pay	mapflag	noteleport
+nguild_prt	mapflag	noteleport
+
+//============================================================
+// GvG Arenas
+//============================================================
+guild_vs1	mapflag	noteleport
+guild_vs2	mapflag	noteleport
+guild_vs3	mapflag	noteleport
+guild_vs4	mapflag	noteleport
+guild_vs5	mapflag	noteleport
+
+//============================================================
+// Arenas
+//============================================================
+arena_room	mapflag	noteleport
+force_1-1	mapflag	noteleport
+force_2-1	mapflag	noteleport
+force_3-1	mapflag	noteleport
+force_4-1	mapflag	noteleport
+force_5-1	mapflag	noteleport
+force_1-2	mapflag	noteleport
+force_1-3	mapflag	noteleport
+sec_in01	mapflag	noteleport
+sec_in02	mapflag	noteleport
+prt_are_in	mapflag	noteleport
+prt_are01	mapflag	noteleport
+
+//============================================================
+// PvP Arenas
+//============================================================
+pvp_y_room	mapflag	noteleport
+pvp_y_1-1	mapflag	noteleport
+pvp_y_1-2	mapflag	noteleport
+pvp_y_1-3	mapflag	noteleport
+pvp_y_1-4	mapflag	noteleport
+pvp_y_1-5	mapflag	noteleport
+pvp_y_2-1	mapflag	noteleport
+pvp_y_2-2	mapflag	noteleport
+pvp_y_2-3	mapflag	noteleport
+pvp_y_2-4	mapflag	noteleport
+pvp_y_2-5	mapflag	noteleport
+pvp_y_3-1	mapflag	noteleport
+pvp_y_3-2	mapflag	noteleport
+pvp_y_3-3	mapflag	noteleport
+pvp_y_3-4	mapflag	noteleport
+pvp_y_3-5	mapflag	noteleport
+pvp_y_4-1	mapflag	noteleport
+pvp_y_4-2	mapflag	noteleport
+pvp_y_4-3	mapflag	noteleport
+pvp_y_4-4	mapflag	noteleport
+pvp_y_4-5	mapflag	noteleport
+pvp_y_5-1	mapflag	noteleport
+pvp_y_5-2	mapflag	noteleport
+pvp_y_5-3	mapflag	noteleport
+pvp_y_5-4	mapflag	noteleport
+pvp_y_5-5	mapflag	noteleport
+pvp_y_6-1	mapflag	noteleport
+pvp_y_6-2	mapflag	noteleport
+pvp_y_6-3	mapflag	noteleport
+pvp_y_6-4	mapflag	noteleport
+pvp_y_6-5	mapflag	noteleport
+pvp_y_7-1	mapflag	noteleport
+pvp_y_7-2	mapflag	noteleport
+pvp_y_7-3	mapflag	noteleport
+pvp_y_7-4	mapflag	noteleport
+pvp_y_7-5	mapflag	noteleport
+pvp_y_8-1	mapflag	noteleport
+pvp_y_8-2	mapflag	noteleport
+pvp_y_8-3	mapflag	noteleport
+pvp_y_8-4	mapflag	noteleport
+pvp_y_8-5	mapflag	noteleport
+pvp_n_room	mapflag	noteleport
+pvp_n_1-1	mapflag	noteleport
+pvp_n_1-2	mapflag	noteleport
+pvp_n_1-3	mapflag	noteleport
+pvp_n_1-4	mapflag	noteleport
+pvp_n_1-5	mapflag	noteleport
+pvp_n_2-1	mapflag	noteleport
+pvp_n_2-2	mapflag	noteleport
+pvp_n_2-3	mapflag	noteleport
+pvp_n_2-4	mapflag	noteleport
+pvp_n_2-5	mapflag	noteleport
+pvp_n_3-1	mapflag	noteleport
+pvp_n_3-2	mapflag	noteleport
+pvp_n_3-3	mapflag	noteleport
+pvp_n_3-4	mapflag	noteleport
+pvp_n_3-5	mapflag	noteleport
+pvp_n_4-1	mapflag	noteleport
+pvp_n_4-2	mapflag	noteleport
+pvp_n_4-3	mapflag	noteleport
+pvp_n_4-4	mapflag	noteleport
+pvp_n_4-5	mapflag	noteleport
+pvp_n_5-1	mapflag	noteleport
+pvp_n_5-2	mapflag	noteleport
+pvp_n_5-3	mapflag	noteleport
+pvp_n_5-4	mapflag	noteleport
+pvp_n_5-5	mapflag	noteleport
+pvp_n_6-1	mapflag	noteleport
+pvp_n_6-2	mapflag	noteleport
+pvp_n_6-3	mapflag	noteleport
+pvp_n_6-4	mapflag	noteleport
+pvp_n_6-5	mapflag	noteleport
+pvp_n_7-1	mapflag	noteleport
+pvp_n_7-2	mapflag	noteleport
+pvp_n_7-3	mapflag	noteleport
+pvp_n_7-4	mapflag	noteleport
+pvp_n_7-5	mapflag	noteleport
+pvp_n_8-1	mapflag	noteleport
+pvp_n_8-2	mapflag	noteleport
+pvp_n_8-3	mapflag	noteleport
+pvp_n_8-4	mapflag	noteleport
+pvp_n_8-5	mapflag	noteleport
+pvp_2vs2	mapflag	noteleport
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_room	mapflag	noteleport
+turbo_n_1	mapflag	noteleport
+turbo_n_4	mapflag	noteleport
+turbo_n_8	mapflag	noteleport
+turbo_n_16	mapflag	noteleport
+turbo_e_4	mapflag	noteleport
+turbo_e_8	mapflag	noteleport
+turbo_e_16	mapflag	noteleport
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	noteleport
+p_track02	mapflag	noteleport
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	noteleport
+poring_w02	mapflag	noteleport
+poring_w02	mapflag	monster_noteleport
+
+//============================================================
+// Vision of Okolnir
+//============================================================
+que_qsch01	mapflag	noteleport
+que_qsch01	mapflag	monster_noteleport
+que_qsch02	mapflag	noteleport
+que_qsch02	mapflag	monster_noteleport
+que_qsch03	mapflag	noteleport
+que_qsch03	mapflag	monster_noteleport
+que_qsch04	mapflag	noteleport
+que_qsch04	mapflag	monster_noteleport
+que_qsch05	mapflag	noteleport
+que_qsch05	mapflag	monster_noteleport
+que_qaru01	mapflag	noteleport
+que_qaru01	mapflag	monster_noteleport
+que_qaru02	mapflag	noteleport
+que_qaru02	mapflag	monster_noteleport
+que_qaru03	mapflag	noteleport
+que_qaru03	mapflag	monster_noteleport
+que_qaru04	mapflag	noteleport
+que_qaru04	mapflag	monster_noteleport
+que_qaru05	mapflag	noteleport
+que_qaru05	mapflag	monster_noteleport
+
+//============================================================
+// Sealed Shrine
+//============================================================
+1@cata	mapflag	noteleport
+1@cata	mapflag	monster_noteleport
+2@cata	mapflag	noteleport
+2@cata	mapflag	monster_noteleport
+
+//============================================================
+// Endless Tower
+//============================================================
+e_tower	mapflag	noteleport
+1@tower	mapflag	noteleport
+1@tower	mapflag	monster_noteleport
+2@tower	mapflag	noteleport
+2@tower	mapflag	monster_noteleport
+3@tower	mapflag	noteleport
+3@tower	mapflag	monster_noteleport
+4@tower	mapflag	noteleport
+4@tower	mapflag	monster_noteleport
+5@tower	mapflag	noteleport
+5@tower	mapflag	monster_noteleport
+6@tower	mapflag	noteleport
+6@tower	mapflag	monster_noteleport
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	noteleport
+bat_c02	mapflag	noteleport
+bat_c03	mapflag	noteleport
+bat_room	mapflag	noteleport
+bat_b01	mapflag	noteleport
+bat_b02	mapflag	noteleport
+bat_a01	mapflag	noteleport
+bat_a02	mapflag	noteleport
+
+//============================================================
+// Episode 13
+//============================================================
+mid_campin	mapflag	noteleport
+moc_fild22b	mapflag	noteleport
+que_dan01	mapflag	noteleport
+que_dan02	mapflag	noteleport
+schg_que01	mapflag	noteleport
+arug_que01	mapflag	noteleport
+man_in01	mapflag	noteleport
+spl_in01	mapflag	noteleport
+spl_in02	mapflag	noteleport
+
+//============================================================
+// Orc's Memory
+//============================================================
+1@orcs	mapflag	noteleport
+1@orcs	mapflag	monster_noteleport
+2@orcs	mapflag	noteleport
+2@orcs	mapflag	monster_noteleport
+
+//============================================================
+// Nidhoggr's Instance
+//============================================================
+1@nyd	mapflag	noteleport
+1@nyd	mapflag	monster_noteleport
+2@nyd	mapflag	noteleport
+2@nyd	mapflag	monster_noteleport
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	noteleport
+2009rwc_02	mapflag	noteleport
+2009rwc_03	mapflag	noteleport
+2009rwc_04	mapflag	noteleport
+2009rwc_05	mapflag	noteleport
+2009rwc_06	mapflag	noteleport
+2009rwc_07	mapflag	noteleport
+2009rwc_08	mapflag	noteleport
+2009rwc_f01	mapflag	noteleport
+2012rwc_01	mapflag	noteleport
+2012rwc_02	mapflag	noteleport
+2012rwc_03	mapflag	noteleport
+2012rwc_04	mapflag	noteleport
+2012rwc_05	mapflag	noteleport
+2012rwc_06	mapflag	noteleport
+2012rwc_07	mapflag	noteleport
+2012rwc_08	mapflag	noteleport
+
+//============================================================
+// Events
+//============================================================
+//evt_zombie	mapflag	noteleport

npc/mapflag/nowarp.txt

@@ -0,0 +1,121 @@
+//===== rAthena Script =======================================
+//= Mapflag: Disable warping.
+//===== Description: ========================================= 
+//= Disables warping from a map.
+//= Script commands 'warpparty' and 'warpguild' will not warp
+//=   players.
+//= Atcommands @warp, @go, @load, @jump, @partyrecall,
+//=   @guildrecall, and @recallall will not warp players.
+//= GD_EMERGENCYCALL and UNT_CALLFAMILY will not warp players.
+//===== Additional Comments: ================================= 
+//= 1.3 Added WoE SE maps.
+//============================================================
+
+//============================================================
+// Quest Places
+//============================================================
+ama_test	mapflag	nowarp
+gon_test	mapflag	nowarp
+que_ba	mapflag	nowarp
+
+//============================================================
+// WoE:FE Castles
+//============================================================
+aldeg_cas01	mapflag	nowarp
+aldeg_cas02	mapflag	nowarp
+aldeg_cas03	mapflag	nowarp
+aldeg_cas04	mapflag	nowarp
+aldeg_cas05	mapflag	nowarp
+gefg_cas01	mapflag	nowarp
+gefg_cas02	mapflag	nowarp
+gefg_cas03	mapflag	nowarp
+gefg_cas04	mapflag	nowarp
+gefg_cas05	mapflag	nowarp
+payg_cas01	mapflag	nowarp
+payg_cas02	mapflag	nowarp
+payg_cas03	mapflag	nowarp
+payg_cas04	mapflag	nowarp
+payg_cas05	mapflag	nowarp
+prtg_cas01	mapflag	nowarp
+prtg_cas02	mapflag	nowarp
+prtg_cas03	mapflag	nowarp
+prtg_cas04	mapflag	nowarp
+prtg_cas05	mapflag	nowarp
+
+//============================================================
+// WoE:SE Castles
+//============================================================
+schg_cas01	mapflag	nowarp
+schg_cas02	mapflag	nowarp
+schg_cas03	mapflag	nowarp
+schg_cas04	mapflag	nowarp
+schg_cas05	mapflag	nowarp
+arug_cas01	mapflag	nowarp
+arug_cas02	mapflag	nowarp
+arug_cas03	mapflag	nowarp
+arug_cas04	mapflag	nowarp
+arug_cas05	mapflag	nowarp
+
+//============================================================
+// WoE:Novice Castles
+//============================================================
+n_castle	mapflag	nowarp
+nguild_alde	mapflag	nowarp
+nguild_gef	mapflag	nowarp
+nguild_pay	mapflag	nowarp
+nguild_prt	mapflag	nowarp
+
+//============================================================
+// Aldebaran Turbo Track
+//============================================================
+turbo_n_1	mapflag	nowarp
+turbo_n_4	mapflag	nowarp
+turbo_n_8	mapflag	nowarp
+turbo_n_16	mapflag	nowarp
+turbo_e_4	mapflag	nowarp
+turbo_e_8	mapflag	nowarp
+turbo_e_16	mapflag	nowarp
+
+//============================================================
+// Monster Races
+//============================================================
+p_track01	mapflag	nowarp
+p_track02	mapflag	nowarp
+
+//============================================================
+// Battlegrounds
+//============================================================
+bat_c01	mapflag	nowarp
+bat_c02	mapflag	nowarp
+bat_c03	mapflag	nowarp
+bat_b01	mapflag	nowarp
+bat_b02	mapflag	nowarp
+bat_a01	mapflag	nowarp
+bat_a02	mapflag	nowarp
+
+//============================================================
+// Poring War
+//============================================================
+poring_w01	mapflag	nowarp
+poring_w02	mapflag	nowarp
+
+//============================================================
+// RWC
+//============================================================
+2009rwc_01	mapflag	nowarp
+2009rwc_02	mapflag	nowarp
+2009rwc_03	mapflag	nowarp
+2009rwc_04	mapflag	nowarp
+2009rwc_05	mapflag	nowarp
+2009rwc_06	mapflag	nowarp
+2009rwc_07	mapflag	nowarp
+2009rwc_08	mapflag	nowarp
+2009rwc_f01	mapflag	nowarp
+2012rwc_01	mapflag	nowarp
+2012rwc_02	mapflag	nowarp
+2012rwc_03	mapflag	nowarp
+2012rwc_04	mapflag	nowarp
+2012rwc_05	mapflag	nowarp
+2012rwc_06	mapflag	nowarp
+2012rwc_07	mapflag	nowarp
+2012rwc_08	mapflag	nowarp