Merge pull request 'nightly' (#3) from metin2/server:nightly into master

Reviewed-on: WildEgo/server#3

.dockerignore

@@ -10,9 +10,12 @@ Dockerfile
 .gitkeep
 
 # Compiled quests
-gamefiles/locale/english/quest/object/
-gamefiles/locale/english/quest/pre_qc/
-gamefiles/locale/english/quest/qc
+gamefiles/data/quest/object/
+gamefiles/data/quest/pre_qc/
+gamefiles/data/quest/qc
 
 # Test folder
 test/
+
+# Built files
+build/

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="EUC-KR" />
-  </component>
-</project>

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "cmake.configureOnOpen": true
+}

Dockerfile

@@ -1,10 +1,15 @@
-FROM ubuntu:latest as build
+FROM ubuntu:22.04 as build
 WORKDIR /app
 
+# Set up the CMake repository
+RUN apt-get update && apt-get install -y ca-certificates gpg wget
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+
 # Update the system and install various dependencies
 RUN apt-get update && \
     apt-get install -y git cmake ninja-build build-essential tar curl zip unzip pkg-config autoconf python3 \
-        libdevil-dev libncurses5-dev libbsd-dev
+    libdevil-dev libncurses5-dev libbsd-dev
 
 # Arm specific
 ENV VCPKG_FORCE_SYSTEM_BINARIES=1
@@ -12,7 +17,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=1
 # Install vcpkg and the required libraries
 RUN git clone https://github.com/Microsoft/vcpkg.git
 RUN bash ./vcpkg/bootstrap-vcpkg.sh
-RUN ./vcpkg/vcpkg install boost-system cryptopp effolkronium-random libmysql libevent lzo fmt spdlog
+RUN ./vcpkg/vcpkg install boost-system cryptopp effolkronium-random libmysql libevent lzo fmt spdlog argon2
 
 COPY . .
 
@@ -21,7 +26,7 @@ RUN mkdir build/
 RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
 RUN cd build && make -j $(nproc)
 
-FROM ubuntu:latest as app
+FROM ubuntu:22.04 as app
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean
@@ -35,7 +40,7 @@ COPY --from=build /app/build/src/quest/qc /bin/qc
 COPY ./gamefiles/ .
 
 # Compile the quests
-RUN cd /app/locale/english/quest && python2 make.py
+RUN cd /app/data/quest && python2 make.py
 
 # Symlink the configuration files
 RUN ln -s "./conf/CMD" "CMD"

README.md

@@ -39,7 +39,7 @@ Install `vcpkg` according to the [lastest instructions](https://vcpkg.io/en/gett
 
 Build and install the required libraries:
 ```shell
-vcpkg install boost-system cryptopp effolkronium-random libmysql libevent lzo fmt spdlog
+vcpkg install boost-system cryptopp effolkronium-random libmysql libevent lzo fmt spdlog argon2
 ```
 
 Then, it's time to build your binaries. Your commands should look along the lines of:
@@ -81,6 +81,7 @@ goodies you wish. Also, a lot of time.
 - Refactored macros to modern C++ functions.
 - Network settings are manually configurable through the `PUBLIC_IP`, `PUBLIC_BIND_IP`, `INTERNAL_IP`, `INTERNAL_BIND_IP` settings in the `CONFIG` file. (Might need further work)
 - Refactored logging to use [spdlog](https://github.com/gabime/spdlog) for more consistent function calls.
+- Refactored login code to use Argon2ID.
 
 ## 4. Bugfixes
 **WARNING: This project is based on the "kraizy" leak. That was over 10 years ago.
@@ -89,6 +90,7 @@ This is a very serious security risk and one of the reasons this project is stil
 
 ### Gameplay
 - Fixed invisibility bug on login/respawn/teleport etc.
+- Fixed player level not updating [(thread)](https://metin2.dev/topic/30612-official-level-update-fix-reversed/)
 
 ### Exploits
 - See the warning above :(

gamefiles/conf/CMD

@@ -41,8 +41,6 @@ tstr IMPLEMENTOR
 tint IMPLEMENTOR
 tcon IMPLEMENTOR
 mob_ld IMPLEMENTOR
-pcbang_check IMPLEMENTOR
-pcbang_update IMPLEMENTOR
 setqf IMPLEMENTOR
 delqf IMPLEMENTOR
 effect IMPLEMENTOR