60 Commits

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

View File

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

6
.idea/encodings.xml generated
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,6 +1,11 @@
FROM ubuntu:latest as build FROM ubuntu:22.04 as build
WORKDIR /app 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 # Update the system and install various dependencies
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y git cmake ninja-build build-essential tar curl zip unzip pkg-config autoconf python3 \ apt-get install -y git cmake ninja-build build-essential tar curl zip unzip pkg-config autoconf python3 \
@ -21,7 +26,7 @@ RUN mkdir build/
RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake .. RUN cd build && cmake -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ..
RUN cd build && make -j $(nproc) RUN cd build && make -j $(nproc)
FROM ubuntu:latest as app FROM ubuntu:22.04 as app
WORKDIR /app WORKDIR /app
RUN apt-get update && apt-get install -y python2 libdevil-dev libbsd-dev && apt-get clean 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/ . COPY ./gamefiles/ .
# Compile the quests # Compile the quests
RUN cd /app/locale/english/quest && python2 make.py RUN cd /app/data/quest && python2 make.py
# Symlink the configuration files # Symlink the configuration files
RUN ln -s "./conf/CMD" "CMD" RUN ln -s "./conf/CMD" "CMD"

View File

@ -41,8 +41,6 @@ tstr IMPLEMENTOR
tint IMPLEMENTOR tint IMPLEMENTOR
tcon IMPLEMENTOR tcon IMPLEMENTOR
mob_ld IMPLEMENTOR mob_ld IMPLEMENTOR
pcbang_check IMPLEMENTOR
pcbang_update IMPLEMENTOR
setqf IMPLEMENTOR setqf IMPLEMENTOR
delqf IMPLEMENTOR delqf IMPLEMENTOR
effect 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