Compare commits

...

66 Commits

Author SHA1 Message Date
WildEgo 2d35c102c2 fix: Dumb syslog usage. 2024-06-01 18:59:04 +01:00
WildEgo 20565c174b add: Owsap quest renewal. 2024-06-01 18:45:38 +01:00
WildEgo 652534ae4a Merge pull request 'nightly' (#3) from metin2/server:nightly into master
Reviewed-on: WildEgo/server#3
2024-06-01 14:44:23 +03:00
Exynox 6d65fae7e4 Argon2ID improvements 2024-06-01 14:34:27 +03:00
Exynox 8ed1e7879e Merge pull request 'Use Argon2ID as the password hashing algorithm' (#26) from WildEgo/server:master into nightly
Reviewed-on: #26
2024-06-01 14:32:21 +03:00
WildEgo 65a81ec4a1 change: Ignore build files, replace mysql password with Argon2.
add: Missing .gitignore.
2024-05-31 10:49:21 +01:00
WildEgo ae708d9315 Merge pull request 'nightly' (#2) from metin2/server:nightly into master
Reviewed-on: WildEgo/server#2
2024-05-30 22:43:22 +03:00
Exynox 48ee253534 Restructured gamefiles, locale data loading refactoring, docker build fixes 2024-05-25 20:00:26 +03:00
Exynox 27108d629a Merge pull request 'Merge changes from master' (#25) from master into nightly
Reviewed-on: #25
2024-05-25 17:55:22 +03:00
WildEgo 21e028f186 Merge pull request 'nightly' (#1) from metin2/server:nightly into master
Reviewed-on: WildEgo/server#1
2024-04-23 13:17:19 +03:00
Exynox 175816c81d Merge pull request 'Default all localized behavior to European logic' (#22) from Tr0n/server:localization/default-gf-eu into nightly
Reviewed-on: #22
2024-04-09 21:47:22 +03:00
Tr0n b15eb7f3fe
fix: wrong delay used for item drop despawn. 2024-04-09 20:33:14 +02:00
Tr0n 3a8d9e38e8
remove duplicate variable definition 2024-04-09 18:13:38 +02:00
Tr0n 4074c3b96a
fix out of order access of variables 2024-04-09 18:13:14 +02:00
Tr0n 854fef68e8
revert removal of locale initialization per country. default to English 2024-04-09 18:12:58 +02:00
Tr0n cf66bb3310
revert name change removal 2024-04-09 17:25:39 +02:00
Tr0n 254f6f6664
remove division by 1 for party exp bonus 2024-04-09 17:24:09 +02:00
Tr0n 0072bc5e14
revert removal of spam db 2024-04-09 17:21:46 +02:00
Tr0n 62f3635b86
revert removed warning for disabled version checks 2024-04-09 17:10:53 +02:00
Tr0n 2c37b2009d
revert local testing of string localization 2024-04-09 17:10:38 +02:00
Tr0n e0701ed5bd
restore accidentally removed login logic 2024-04-09 17:04:10 +02:00
Tr0n 21381a4e3a
restore accidentally removed fish logic 2024-04-09 17:03:42 +02:00
Tr0n ba44269071
remove redundant condition for skill book exp consumption 2024-04-09 16:58:02 +02:00
Tr0n f5ccb17736
remove redundant pointer to lucky pouch loot table 2024-04-09 16:56:43 +02:00
Tr0n bb52a57ffc
remove unreachable branch 2024-04-09 16:53:47 +02:00
Tr0n 8360d6939f
set damage penalty on foreign empire maps to constant 9% 2024-04-09 16:53:37 +02:00
Tr0n 1e362d8507
remove isLimitedItem 2024-04-09 16:51:51 +02:00
Tr0n 0a907f41d2
remove unnecessary leftover closures 2024-04-07 22:11:12 +02:00
Tr0n dbcabd7fa9
reduce LC_InitLocalization logic, purge LC_Is* definitions 2024-04-07 18:10:16 +02:00
Exynox fcc2a9e4a0 Logout error messages are now being sent, closes #18 2024-04-07 18:36:10 +03:00
Tr0n 12b6abf373
remove IS_BOTARYABLE_ZONE 2024-04-07 14:19:29 +02:00
Tr0n e1daa48366
remove all localization 2024-04-07 12:54:57 +02:00
Exynox 83707434ee Fix small UTF-8 conversion mistakes, converted locale_strings, added KR locale_string file 2024-04-07 10:14:51 +03:00
Exynox 042414a499 Merge pull request 'encoding' (#20) from Tr0n/server:encoding into nightly
Reviewed-on: #20
2024-04-07 08:59:36 +03:00
Tr0n 68c7c4bc4f
fix config comment 2024-04-06 18:04:29 +02:00
Tr0n eafbee616f
english locale as base 2024-04-06 17:58:03 +02:00
Tr0n 026cb861a8
fix missing quote mark 2024-04-06 17:57:30 +02:00
Tr0n 1ba21fb1f9
translate remaining SPDLOG calls 2024-04-06 17:57:14 +02:00
Tr0n 8fede9a1df
manual translation of non-localized strings 2024-04-06 17:28:22 +02:00
Tr0n dfb3d08998
manual translation of non-localized strings 2024-04-06 12:50:34 +02:00
Tr0n 326c134f9e
manual translation of non-localized strings 2024-04-06 11:13:11 +02:00
Tr0n 9b7536ee9a
Initial pass of converting string literals to english 2024-04-06 10:31:54 +02:00
Tr0n 9056f6c6c6
convert some more comments to utf8 2024-04-06 10:24:46 +02:00
Tr0n 8685b02fdc
libthecore encoding conversion 2024-04-06 10:20:42 +02:00
Tr0n 341bef9aba
Merge branch 'nightly' into comment-encoding 2024-04-06 01:09:03 +02:00
sdgmt2 8a1acefeeb
move encoding tool to separate repo 2024-04-06 00:42:30 +02:00
sdgmt2 eacc808366
convert comments to utf-8 2024-04-05 23:34:45 +02:00
sdgmt2 4a1460f36e
convert korean characters in string literals to string encoded bytes 2024-04-05 22:24:46 +02:00
sdgmt2 aae9b169df
encoding fix script 2024-04-05 21:57:49 +02:00
sdgmt2 dd74eafc24
fix db cpp encoding 2024-04-01 14:20:00 +02:00
sdgmt2 d471d99a24
fix libthecore header encoding 2024-04-01 12:48:58 +02:00
sdgmt2 350fb0d424
fix libsql header encoding 2024-04-01 12:48:16 +02:00
sdgmt2 869720f9e6
fix libgame header encoding 2024-04-01 12:46:52 +02:00
sdgmt2 4fc612552a
fix common header encoding 2024-04-01 12:45:35 +02:00
sdgmt2 248205ae01
fix db header encoding 2024-04-01 12:43:31 +02:00
sdgmt2 82317e6c4d
fix game header encoding 2024-04-01 12:39:34 +02:00
Exynox 847ab2ef89 Fixed erroneous database table parsing due to incorrect SMS phone number removal 2024-03-31 15:30:43 +03:00
Exynox ebc479b7df Fixed "Invalid Socket Count 3, set to maximum" error 2024-03-31 09:09:35 +03:00
Exynox 1ee687f269 Removed unused PROTECT_CHILD_FOR_NEWCIBN 2024-03-31 08:54:34 +03:00
Exynox d85ef28eac Removed messenger SMS 2024-03-30 21:14:50 +02:00
Exynox 01cc27a7df Removed Billing/VCard 2024-03-30 19:58:21 +02:00
Exynox 72b495c03c Removed PCBang/iCafe code 2024-03-30 18:55:44 +02:00
Exynox 0c86f802ca Removed unused highscore Lua & DB functions 2024-03-30 18:06:36 +02:00
Exynox 05a1406c7c Removed database strings and automatic greeting 2024-03-30 17:50:04 +02:00
Exynox 00c5634c09 Removed country blocking (and exceptions) 2024-03-30 17:09:03 +02:00
Exynox 42079d56b7 Removed hotbackup 2024-03-30 16:57:24 +02:00
1291 changed files with 28594 additions and 44433 deletions

View File

@ -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/
test/
# Built files
build/

View File

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

3
.vscode/settings.json vendored Normal file
View File

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

View File

@ -1,10 +1,15 @@
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 . .
@ -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"

View File

@ -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.

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More