From c751ca6b74a6916dce8373044dfabffb73ab30f3 Mon Sep 17 00:00:00 2001 From: Vincent Stumpf Date: Fri, 26 Aug 2022 21:31:45 -0700 Subject: [PATCH] Client Navigation Generator (#6023) Creates navigation files for the client. --- .gitignore | 3 + Makefile.in | 1 + doc/script_commands.txt | 19 + npc/custom/warper.txt | 701 +++++++++++++++++++++++++++++ src/map/Makefile.in | 23 + src/map/battle.cpp | 4 + src/map/map-server.vcxproj | 2 + src/map/map-server.vcxproj.filters | 6 + src/map/map.cpp | 12 + src/map/map.hpp | 8 + src/map/navi.cpp | 649 ++++++++++++++++++++++++++ src/map/navi.hpp | 43 ++ src/map/npc.cpp | 12 + src/map/npc.hpp | 7 + src/map/script.cpp | 53 +++ src/map/script.hpp | 3 + tools/navi.py | 123 +++++ 17 files changed, 1669 insertions(+) create mode 100644 src/map/navi.cpp create mode 100644 src/map/navi.hpp create mode 100755 tools/navi.py diff --git a/.gitignore b/.gitignore index a069110ead..faba648217 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,6 @@ Thumbs.db # CMakeFiles /CMakeFiles/ + +# generated files +generated diff --git a/Makefile.in b/Makefile.in index e3783d5d85..2cf9c70e41 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,6 +60,7 @@ libconfig: tools: @$(MAKE) -C src/tool + @$(MAKE) -C src/map tools rapidyaml: @$(MAKE) -C 3rdparty/rapidyaml diff --git a/doc/script_commands.txt b/doc/script_commands.txt index a97cb8bf78..ca4f58a00b 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -978,6 +978,11 @@ Only the special labels which are not associated with any script command are listed here. There are other kinds of labels which may be triggered in a similar manner, but they are described with their associated commands. +OnNaviGenerate: + +This special label triggers when running the map-server-generator binary. It is used +in combination with 'naviregisterwarp' to register extra warps for an npc. + On