Fetch last change from original repo

.gitignore

@@ -34,6 +34,10 @@
 /server/catchchallenger-server-cli-epoll
 /client/catchchallenger
 
+# generated output
+/tools/map-procedural-generation/dest
+/tools/datapack-explorer-generator-cli/datapack-explorer-generator
+
 ### Qt ###
 # C++ objects and libs
 *.so.*
@@ -61,6 +65,13 @@ Makefile*
 *.qm
 *.prl
 
+.qtcreator
+moc_*
+ui_*
+qrc_*
+Makefile
+.claude
+
 # Qt unit tests
 target_wrapper.*
 
@@ -94,4 +105,7 @@ tools/to-pack/data/windows-x*
 # Configurations
 /server/server-properties.xml
 /client/datapack
-/server/datapack
+/server/datapack
+
+client/qtopengl/catchchallenger
+client/qtcpu800x600/catchchallenger

README.md

@@ -1,120 +1,52 @@
 # Intro
 
-The client and server is under GPL3. And part of the project:
 http://catchchallenger.first-world.info/
 
-## Description
-This game is a MMORPG, Lan game and a single player game. It's mix of pokemon for the RPG part, lineage for the crafting/clan/MMORPG, X3 for the commerce/fabric/industry. With mod possibility, and datapack.
+![structure](structure.png)
 
-It's a pixel art game. The work is concentrated on the gameplay/performance/security/creativity/accessibility. The income is to paid the developping and the artwork. The game is fully open source (GPL3).
-
-The gameplay have strong team part, but remain interresting in single player. Have clear advantage on 3G/wifi/TOR connexion or into the tiers world.
+This game is a MMORPG, Lan game and a single player game. It's mix of pokemon for the RPG part, crafting/clan/TvT, industry. Modular datapck.
 
 ## License
 client/tiled/ is extracted version of http://www.mapeditor.org/, https://github.com/bjorn/tiled
 libogg and fileopus is extracted from other project
-Interface UI is from buyed template (then under copyright)
-
-## Programing
-
-Asynchronous protocol with no influence of internet and server latency. Thread isolation for the important or heavy server task. It can be hosted on ADSL connection.
-
-SGBD for Qt version: Mysql 5+, SQLite, PostgreSQL 9+. SGBD for epoll version (async to high performance): Mysql 5.5+, PostgreSQL 9+.
+Interface UI is from bought template (then under copyright)
 
-## Prerequisites
-
-### Postgresql
-
-You need to create this roles:
-* catchchallenger-login
-* catchchallenger-base
-
-Then:
-```sh
-su -l postgres
-cd server/databases/postgresql
-echo 'CREATE DATABASE catchchallenger_login;' | psql postgres postgres
-echo 'CREATE DATABASE catchchallenger_base;' | psql postgres postgres
-echo 'CREATE DATABASE catchchallenger_common;' | psql postgres postgres
-echo 'CREATE DATABASE catchchallenger_server;' | psql postgres postgres
-psql catchchallenger_login postgres < catchchallenger-postgresql-login.sql
-psql catchchallenger_base postgres < catchchallenger-postgresql-base.sql
-psql catchchallenger_common postgres < catchchallenger-postgresql-common.sql
-psql catchchallenger_server postgres < catchchallenger-postgresql-server.sql
-echo 'GRANT ALL ON ALL TABLES IN SCHEMA public TO "catchchallenger-login";' | psql catchchallenger_login postgres
-echo 'GRANT ALL ON ALL TABLES IN SCHEMA public TO "catchchallenger-base";' | psql catchchallenger_base postgres
-echo 'GRANT ALL ON ALL TABLES IN SCHEMA public TO "catchchallenger-login";' | psql catchchallenger_common postgres
-echo 'GRANT ALL ON ALL TABLES IN SCHEMA public TO "catchchallenger-login";' | psql catchchallenger_server postgres
-```
+# Target
+- minimal dependency (searcg dependency hell, bug/security problem in dependency)
+- no bloatware (no stupid features, no features used for only 1 person if imply lot of code or dangerous code, no unrelated features)
+- async, support high latency, very low bandwidth (tipical of TOR/I2P)
+- send datapack by internal protocol (overall compression to group similar part into multiple file) and http mirror, and when datapack is downloaded by client can be used to mount new server with same datapack
+- most processing is cliend side
 
 ## Compiling
 
-Use **C++11**
+Use **C++11** to **C++23**, C++23 is preferred to use std::flat_map on read only data of datapack where apply (lower RAM and improve speed)
 
 Dependency:
-* zlib (can be disabled but it's for tiled map editor)
+* zlib (can be disabled but it's for tiled map editor). zstd
+* blake3 to have maximal performance and be future proof to replace sha224
+* xxh to have light check for what file have changed, eg truncated to 32Bits datapack file list
 * Client
-  * Qt openssl enabled to have QSslSocket or QtWebSocket
+  * Qt openssl enabled to have QSslSocket or QtWebSocket, QThread
 * Server
-  * Qt if generic server
-  * db
-  * db driver (mysql, sqlite for game solo, postgresql, depands of you choice)
+  * Qt if generic server + Qt SQL drivers (mysql, sqlite for game solo, postgresql)
+  * libpq (postgresql in async) or raw binary file
 * Gateway
   * curl to download datapack via http
-
-### Linux distro
-**Ubuntu**: apt-get install build-essential gcc automake qt5-qmake qt5-default libzstd-dev zlib1g-dev libssl-dev libpq-dev libqt5sql5-psql libqt5websockets5-dev libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
-
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default libqt5sql5-psql libqt5websockets5-dev libqt5sql5-psql libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
-
-### Gui server
-```sh
-cd server/
-qmake catchchallenger-server-gui.pro
-make
-git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack datapack
-```
-
-### CLI server
-```sh
-cd server/
-qmake catchchallenger-server-cli.pro
-make
-git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack datapack
-```
-
-### Epoll server (linux only, high performance)
-**Ubuntu**: apt-get install libzstd-dev zlib1g-dev libssl-dev libpq-dev
-
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default
-
-```sh
-cd server/
-qmake catchchallenger-server-cli-epoll.pro
-make
-git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack datapack
-chmod a+x catchchallenger-server-cli-epoll
-./catchchallenger-server-cli-epoll
-```
 
 ### Client
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default qtdeclarative5-dev qtscript5-dev
 
 ```sh
 cd client/
 qmake *.pro
 make
-git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack datapack
+mkdir datapack
+cd datapack
+git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack internal
 chmod a+x catchchallenger
 ./catchchallenger
 ```
 
 # Sources
 * The sources of the client/server: https://github.com/alphaonex86/CatchChallenger
 * The sources of the datapack: https://github.com/alphaonex86/CatchChallenger-datapack
-* The sources of the site: https://github.com/alphaonex86/CatchChallenger-site
-
-# Hardware
-You need CPU with support of unaligned access on 8/16/32Bits for the server at least (plan to support all CPU)
-
-The server is actually 10-20MB of memory (1MB measured by massif) and 2KB by player

client/README.md

@@ -0,0 +1,11 @@
+![client](cc-API-client.png)
+
+# CPU client
+*qtcpu800x600* folder, do into Qt widget + Qgraphicview, simple to modify via Qt creator, only 800x600 resolution
+
+# GPU client
+*qtopengl* folder, use OpenGL, responsive, mean auto change the content with the given resolution, perfect for smartphone
+
+# lib
+* *libcatchchallenger* C++ lib, just to convert binary protocol to function call, and parse datapack to in memory contant, should be able to be used as rust, python, ... lib
+* *libqtcatchchallenger* Qt lib, used to load more advanced content like images/sound via Qt to don't have to do the work into Qt client

client/catchchallenger-2.2.0.0.recipe

@@ -1,6 +1,6 @@
 SUMMARY="Game MMORPG/single player game. You can fight, farming, crafting, trading"
 DESCRIPTION="This game is a independent MMORPG or a single player game."
-HOMEPAGE="https://catchchallenger.first-world.info/"
+HOMEPAGE="https://catchchallenger.herman-brule.com/"
 COPYRIGHT="2011-2019 BRULE Herman Jacques Roger (alpha_one_x86)"
 LICENSE="GNU GPL v3"
 REVISION="1"

client/catchchallenger.pro

@@ -1,9 +1,5 @@
-include(qtopengl/client.pri)
-include(../general/general.pri)
-include(qt/qt.pri)
-
-linux:QMAKE_CXXFLAGS+="-Wno-deprecated-declarations"
-linux:QMAKE_CFLAGS+="-Wno-deprecated-declarations"
-
-DEFINES += OPENGL CATCHCHALLENGER_CACHE_HPS
-TARGET = catchchallenger
+include(qtopengl/catchchallenger-qtopengl.pro)
+#DEFINES += DEBUG_PROTOCOLPARSING_RAW_NETWORK
+#DEFINES += DEBUG_MESSAGE_CLIENT_SQL
+DEFINES += CATCHCHALLENGER_CACHE_HPS
+linux:QMAKE_LFLAGS += -fuse-ld=mold