diff options
-rw-r--r-- | .gitlab-ci.yml | 196 | ||||
-rw-r--r-- | conf/map/battle/client.conf | 5 | ||||
-rw-r--r-- | npc/mapflag/zone.txt | 12 | ||||
-rw-r--r-- | sql-files/item_db_re.sql | 2 | ||||
-rw-r--r-- | src/map/battle.c | 1 | ||||
-rw-r--r-- | src/map/battle.h | 1 | ||||
-rw-r--r-- | src/map/clif.c | 4 | ||||
-rw-r--r-- | src/map/map.h | 1 |
8 files changed, 131 insertions, 91 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbdc2caae..13d140fbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: &base_vars - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mysql - ./tools/ci/travis.sh getplugins || true services: @@ -37,10 +37,10 @@ pre_re:clang-3.9: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mysql-client + INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -49,22 +49,46 @@ re:clang-3.9: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: clang-3.9 mysql-client + INSTALL_PACKAGES: clang-3.9 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=clang-3.9 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql +pre_re:clang-4.0: + <<: *branch_exceptions + <<: *prerequisites + stage: primary + image: debian:unstable + variables: + <<: *base_vars + INSTALL_PACKAGES: clang-4.0 mysql-client libmysqlclient-dev + script: + - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot --disable-renewal + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql + +re:clang-4.0: + <<: *branch_exceptions + <<: *prerequisites + stage: primary + image: debian:unstable + variables: + <<: *base_vars + INSTALL_PACKAGES: clang-4.0 mysql-client libmysqlclient-dev + script: + - ./tools/ci/travis.sh build CC=clang-4.0 --enable-debug --enable-Werror --enable-buildbot + - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql + pre_re:gcc-4.6: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:oldstable + image: debian:wheezy variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.6 mysql-client + INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -73,10 +97,10 @@ re:gcc-4.6: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:oldstable + image: debian:wheezy variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.6 mysql-client + INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -85,10 +109,10 @@ pre_re:gcc-4.7: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:oldstable + image: debian:wheezy variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.7 mysql-client + INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -97,10 +121,10 @@ re:gcc-4.7: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:oldstable + image: debian:wheezy variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.7 mysql-client + INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -109,10 +133,10 @@ pre_re:gcc-4.8: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.8 mysql-client + INSTALL_PACKAGES: gcc-4.8 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -121,10 +145,10 @@ re:gcc-4.8: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.8 mysql-client + INSTALL_PACKAGES: gcc-4.8 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.8 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -133,10 +157,10 @@ pre_re:gcc-4.9: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.9 mysql-client + INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -145,10 +169,10 @@ re:gcc-4.9: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc-4.9 mysql-client + INSTALL_PACKAGES: gcc-4.9 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -157,10 +181,10 @@ pre_re:gcc-5: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-5 mysql-client + INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -169,10 +193,10 @@ re:gcc-5: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-5 mysql-client + INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -181,10 +205,10 @@ pre_re:gcc-6: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -193,10 +217,10 @@ re:gcc-6: <<: *branch_exceptions <<: *prerequisites stage: primary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -208,7 +232,7 @@ pre_re:gcc-6_i386: image: vicamo/debian:sid-i386 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -220,7 +244,7 @@ re:gcc-6_i386: image: vicamo/debian:sid-i386 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -229,10 +253,10 @@ pre_re:gcc-6_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -241,10 +265,10 @@ re:gcc-6_sanitize: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -256,7 +280,7 @@ pre_re:gcc-6_i386_sanitize: image: vicamo/debian:sid-i386 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -268,7 +292,7 @@ re:gcc-6_i386_sanitize: image: vicamo/debian:sid-i386 variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 mysql-client + INSTALL_PACKAGES: gcc-6 mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-manager --enable-sanitize=full - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -277,10 +301,10 @@ pre_re:gcc-6_cov: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 gcovr mysql-client + INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal CFLAGS="-coverage" LDFLAGS="-coverage" - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -296,10 +320,10 @@ re:gcc-6_cov: <<: *branch_exceptions <<: *prerequisites stage: secondary - image: debian:unstable + image: debian:stretch variables: <<: *base_vars - INSTALL_PACKAGES: gcc-6 gcovr mysql-client + INSTALL_PACKAGES: gcc-6 gcovr mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build CC=gcc-6 --enable-debug --enable-Werror --enable-buildbot CFLAGS="-coverage" LDFLAGS="-coverage" - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -317,10 +341,10 @@ pre_re:debian-oldstable: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:wheezy + image: debian:oldstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -329,10 +353,10 @@ re:debian-oldstable: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:wheezy + image: debian:oldstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -341,10 +365,10 @@ pre_re:debian-stable: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:jessie + image: debian:stable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -353,10 +377,10 @@ re:debian-stable: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:jessie + image: debian:stable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -365,10 +389,10 @@ pre_re:debian-testing: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stretch + image: debian:testing variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -377,10 +401,10 @@ re:debian-testing: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stretch + image: debian:testing variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mariadb-client libmariadbclient-dev-compat script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -474,7 +498,7 @@ pre_re:ubuntu-xenial: - mysql:latest variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -488,7 +512,7 @@ re:ubuntu-xenial: - mysql:latest variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql @@ -499,10 +523,10 @@ pre_re:mysql-5.5: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.5 + INSTALL_PACKAGES: gcc mysql-client-5.5 libmysqlclient-dev services: - mysql:5.5 script: @@ -513,10 +537,10 @@ re:mysql-5.5: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.5 + INSTALL_PACKAGES: gcc mysql-client-5.5 libmysqlclient-dev services: - mysql:5.5 script: @@ -527,10 +551,10 @@ pre_re:mysql-5.6: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:unstable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.6 + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev services: - mysql:5.6 script: @@ -541,10 +565,10 @@ re:mysql-5.6: <<: *branch_exceptions <<: *prerequisites stage: platforms - image: debian:unstable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client-5.6 + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev services: - mysql:5.6 script: @@ -558,8 +582,7 @@ pre_re:mysql-5.7: image: debian:unstable variables: <<: *base_vars - # mysql-client-5.7 is not available - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev services: - mysql:5.7 script: @@ -573,26 +596,25 @@ re:mysql-5.7: image: debian:unstable variables: <<: *base_vars - # mysql-client-5.7 is not available - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client-5.7 libmysqlclient-dev services: - mysql:5.7 script: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mysql -pre_re:mariadb-10: +pre_re:mariadb-10.0: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 + INSTALL_PACKAGES: gcc mariadb-client-10.0 libmysqlclient-dev before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb - ./tools/ci/travis.sh getplugins || true services: @@ -601,18 +623,18 @@ pre_re:mariadb-10: - ./tools/ci/travis.sh build --enable-debug --enable-Werror --enable-buildbot --disable-renewal - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok mariadb -re:mariadb-10: +re:mariadb-10.0: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 + INSTALL_PACKAGES: gcc mariadb-client-10.0 libmysqlclient-dev before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb - ./tools/ci/travis.sh getplugins || true services: @@ -624,15 +646,15 @@ re:mariadb-10: pre_re:mariadb-latest: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:unstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 + INSTALL_PACKAGES: gcc mariadb-client-10.1 libmariadbclient-dev-compat before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb - ./tools/ci/travis.sh getplugins || true services: @@ -644,15 +666,15 @@ pre_re:mariadb-latest: re:mariadb-latest: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:unstable variables: <<: *base_vars - INSTALL_PACKAGES: gcc mariadb-client-10.0 + INSTALL_PACKAGES: gcc mariadb-client-10.1 libmariadbclient-dev-compat before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok mariadb - ./tools/ci/travis.sh getplugins || true services: @@ -664,15 +686,15 @@ re:mariadb-latest: pre_re:percona: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok percona - ./tools/ci/travis.sh getplugins || true services: @@ -684,15 +706,15 @@ pre_re:percona: re:percona: <<: *branch_exceptions stage: platforms - image: debian:stable + image: debian:jessie variables: <<: *base_vars - INSTALL_PACKAGES: gcc mysql-client + INSTALL_PACKAGES: gcc mysql-client libmysqlclient-dev before_script: - echo "Building $CI_BUILD_NAME" - uname -a - ./tools/ci/retry.sh apt-get update - - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES libmysqlclient-dev + - ./tools/ci/retry.sh apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES - ./tools/ci/travis.sh importdb ragnarok ragnarok ragnarok percona - ./tools/ci/travis.sh getplugins || true services: diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf index 818db3142..15fa71faf 100644 --- a/conf/map/battle/client.conf +++ b/conf/map/battle/client.conf @@ -69,6 +69,9 @@ pet_hair_style: 100 // Visible area size (how many squares away from a player can they see) area_size: 14 +// Chat area size (how many squares away from a player can they chat) +chat_area_size: 9 + // Maximum walk path (how many cells a player can walk going to cursor) // default: 17(official) max_walk_path: 17 @@ -107,7 +110,7 @@ save_body_style: false // Do not display cloth colors for the wedding costume? // Note: Both save_clothcolor and wedding_modifydisplay have to be enabled -// for this option to take effect. Set this to true if your cloth palettes +// for this option to take effect. Set this to true if your cloth palettes // pack doesn't has wedding palettes (or has less than the other jobs) wedding_ignorepalette: false diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt index d3b88c0c7..cb73a32ec 100644 --- a/npc/mapflag/zone.txt +++ b/npc/mapflag/zone.txt @@ -137,3 +137,15 @@ umbala mapflag zone Towns veins mapflag zone Towns xmas mapflag zone Towns yuno mapflag zone Towns + +// WoE SE +arug_cas01 mapflag zone GvG2 +arug_cas02 mapflag zone GvG2 +arug_cas03 mapflag zone GvG2 +arug_cas04 mapflag zone GvG2 +arug_cas05 mapflag zone GvG2 +schg_cas01 mapflag zone GvG2 +schg_cas02 mapflag zone GvG2 +schg_cas03 mapflag zone GvG2 +schg_cas04 mapflag zone GvG2 +schg_cas05 mapflag zone GvG2 diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index 825a51c5b..93f4a323c 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -9768,7 +9768,7 @@ REPLACE INTO `item_db` VALUES ('22077','Red_Eco_Friendly_Shoes','Red Eco-Friendl REPLACE INTO `item_db` VALUES ('22083','Private_Doram_Shoes','Private Doram Shoes','4','20','10','500','0','0','25','0','1','0','63','2','64','0','100',NULL,'1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMaxHP, 100; bonus bMaxSP, 50; bonus bHPrecovRate, getrefine() * 10 / 3; bonus bSPrecovRate, getrefine() * 10 / 3;','',''); REPLACE INTO `item_db` VALUES ('22084','Luxury_Doram_Shoes','Luxury Doram Shoes','4','20','10','600','0','0','30','0','1','0','63','2','64','0','140',NULL,'1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMaxHP, 300; bonus bMaxSP, 100; bonus bHPrecovRate, 20 * getrefine() / 3; bonus bSPrecovRate, 20 * getrefine() / 3;','',''); REPLACE INTO `item_db` VALUES ('22085','Elegant_Doram_Shoes','Elegant Doram Shoes','4','20','10','700','0','0','35','0','1','0','63','2','64','0','175',NULL,'1','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMaxHPrate, 10; bonus bMaxSPrate, 5; bonus bMaxHP, 100 * getrefine() / 2; bonus bMaxSP, 20 * getrefine() / 2; if ((getrefine() / 2) >= 4) bonus2 bSkillUseSP, SU_LOPE, 5;','',''); -REPLACE INTO `item_db` VALUES ('22508','Para_Team_Mark_','Eden Group Mark','11','0','0','0','0','0','0','0','0','18446744073709551615','63','2','0','0','0',NULL,'0','0','0','0','0','1200000','507',NULL,'0',NULL,'0',NULL,'0','unitskilluseid getcharid(CHAR_ID_ACCOUNT), \"AL_TELEPORT\", 3;','',''); +REPLACE INTO `item_db` VALUES ('22508','Para_Team_Mark_','Eden Group Mark','11','0','0','0','0','0','0','0','0','18446744073709551615','63','2','0','0','0',NULL,'0','0','0','0','0','1200000','507',NULL,'0',NULL,'0',NULL,'0','warp \"moc_para01\", 171, 115;','',''); REPLACE INTO `item_db` VALUES ('22514','Candy_Holder','Candy Holder','11','20','10','10','0','0','0','0','0','18446744073709551615','63','2','0','0','0',NULL,'0','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db` VALUES ('22515','Key_Of_Twisted_Time','Twisted Key of Time','3','10','5','300','0','0','0','0','0','18446744073709551615','63','2','0','0','0',NULL,'0','0','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','',''); REPLACE INTO `item_db` VALUES ('22540','Runstone_Lux','Lux Anima Rune','11','2','1','100','0','0','0','0','0','18446744073709551615','63','2','0','0','0',NULL,'0','0','0','0','0','60000','475',NULL,'0',NULL,'20','1','0','itemskill RK_LUXANIMA,1;','',''); diff --git a/src/map/battle.c b/src/map/battle.c index bb20b94ff..64fda033f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7167,6 +7167,7 @@ static const struct battle_data { { "castrate_dex_scale", &battle_config.castrate_dex_scale, 150, 1, INT_MAX, }, { "vcast_stat_scale", &battle_config.vcast_stat_scale, 530, 1, INT_MAX, }, { "area_size", &battle_config.area_size, 14, 0, INT_MAX, }, + { "chat_area_size", &battle_config.chat_area_size, 9, 0, INT_MAX, }, { "zeny_from_mobs", &battle_config.zeny_from_mobs, 0, 0, 1, }, { "mobs_level_up", &battle_config.mobs_level_up, 0, 0, 1, }, { "mobs_level_up_exp_rate", &battle_config.mobs_level_up_exp_rate, 1, 1, INT_MAX, }, diff --git a/src/map/battle.h b/src/map/battle.h index 7e7048a38..c55d5ef19 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -362,6 +362,7 @@ struct Battle_Config { int castrate_dex_scale; // added by [MouseJstr] int area_size; // added by [MouseJstr] + int chat_area_size; // added by [gumi] int max_def, over_def_bonus; //added by [Skotlex] diff --git a/src/map/clif.c b/src/map/clif.c index 887fa9d64..c48241898 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -451,8 +451,8 @@ bool clif_send(const void* buf, int len, struct block_list* bl, enum send_target break; case AREA_CHAT_WOC: nullpo_retr(true, bl); - map->foreachinarea(clif->send_sub, bl->m, bl->x-(AREA_SIZE-5), bl->y-(AREA_SIZE-5), - bl->x+(AREA_SIZE-5), bl->y+(AREA_SIZE-5), BL_PC, buf, len, bl, AREA_WOC); + map->foreachinarea(clif->send_sub, bl->m, bl->x-CHAT_AREA_SIZE, bl->y-CHAT_AREA_SIZE, + bl->x+CHAT_AREA_SIZE, bl->y+CHAT_AREA_SIZE, BL_PC, buf, len, bl, AREA_WOC); break; case CHAT: diff --git a/src/map/map.h b/src/map/map.h index b76128762..8c5372093 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -47,6 +47,7 @@ enum E_MAPSERVER_ST { #define MAX_NPC_PER_MAP 512 #define AREA_SIZE (battle->bc->area_size) +#define CHAT_AREA_SIZE (battle->bc->chat_area_size) #define DAMAGELOG_SIZE 30 #define LOOTITEM_SIZE 10 #define MAX_MOBSKILL 50 |