Add/edit tool script templates for later install while building

.gitignore

@@ -608,3 +608,5 @@ cython_debug/
 /webserv.bat
 /yaml2sql.bat
 /yamlupgrade.bat
+/brokkserv.bat
+/sindriserv.bat

src/bot/Sindri/Sindri.vcxproj

@@ -142,7 +142,7 @@
     <ClCompile Include="sindri.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Brokk\sindri.hpp" />
+    <ClInclude Include="sindri.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/bot/Sindri/Sindri.vcxproj.filters

@@ -20,7 +20,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Brokk\sindri.hpp">
+    <ClInclude Include="sindri.hpp">
       <Filter>Headerdateien</Filter>
     </ClInclude>
   </ItemGroup>

src/bot/Sindri/sindri.hpp

@@ -0,0 +1,33 @@
+// Copyright (c) 4lexKidd
+// This software is licensed under the GPL v3 as to be fitting with the rathena project with the additional requirement
+// that any distributed versions must include an attribution to the original author (4lexKidd) in all copies
+// or substantial portions of the software.
+
+#ifndef SINDRI_HPP
+#define SINDRI_HPP
+
+#include <common/cbasetypes.hpp>
+#include <common/core.hpp>
+#include <common/mmo.hpp> // NAME_LENGTH,SEX_*
+#include <common/timer.hpp>
+#include <config/core.hpp>
+
+using rathena::server_core::Core;
+using rathena::server_core::e_core_type;
+
+namespace rathena {
+	namespace server_sindri {
+		class SindriServer : public Core {
+		protected:
+			bool initialize(int argc, char* argv[]) override;
+			void finalize() override;
+			void handle_shutdown() override;
+
+		public:
+			SindriServer() : Core(e_core_type::SINDRI) {
+
+			}
+		};
+	}
+}
+#endif /* SINDRI_HPP */

src/common/core.cpp

@@ -334,10 +334,22 @@ static void display_botserver_title(void) {
 	ShowMessage("" CL_PASS "       " CL_GREEN "              http://rathena.org/board/                        " CL_PASS "" CL_CLL "" CL_NORMAL "\n");
 	ShowMessage("" CL_PASS "     " CL_BOLD "                                                                 " CL_PASS "" CL_CLL "" CL_NORMAL "\n");
 	ShowMessage("" CL_WTBL "     " CL_BOLD "                                                                 " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
-	ShowMessage("" CL_WTBL "     " CL_BOLD "                   Svartalfheim Edition                          " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "   _____                    _          _   __  _            _             " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "  / ____|                  | |        | | / _|| |          (_)            " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD " | (___ __   __ __ _  _ __ | |_  __ _ | || |_ | |__    ___  _  _ __ ___   " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "  \\___ \\\\ \\ / // _` || '__|| __|/ _` || ||  _|| '_ \\  / _ \\| || '_ ` _ \\  " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "  ____) |\\ V /| (_| || |   | |_| (_| || || |  | | | ||  __/| || | | | | | " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD " |_____/  \\_/  \\__,_||_|    \\__|\\__,_||_||_|  |_| |_| \\___||_||_| |_| |_| " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                  ______     _  _  _    _                                 " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                 |  ____|   | |(_)| |  (_)                                " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                 | |__    __| | _ | |_  _   ___   _ __                    " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                 |  __|  / _` || || __|| | / _ \\ | '_ \\                   " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                 | |____| (_| || || |_ | || (_) || | | |                  " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                 |______|\\__,_||_| \\__||_| \\___/ |_| |_|                  " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                                                                          " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
 	ShowMessage("" CL_WTBL "     " CL_BOLD "                                                                 " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
 	ShowMessage("" CL_WTBL "     " CL_CYAN "                  <Enter Final Git Here>                         " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
-	ShowMessage("" CL_PASS "     " CL_BOLD "                                                                 " CL_PASS "" CL_CLL "" CL_NORMAL "\n");
+	ShowMessage("" CL_WTBL "     " CL_BOLD "                                                                 " CL_WTBL "" CL_CLL "" CL_NORMAL "\n");
 
 
 	if (svn[0] != UNKNOWN_VERSION)

tools/brokkserv.bat

@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL serv.bat brokk-server.exe Brokk-Server %*

tools/runserver.bat

@@ -19,6 +19,8 @@ set "login_running=false"
 set "char_running=false"
 set "web_running=false"
 set "map_running=false"
+set "brokk_running=false"
+set "sindri_running=false"
 
 
 if "%target%" == "status" (
@@ -39,6 +41,8 @@ call :stopLogin
 call :stopChar
 call :stopWeb
 call :stopMap
+call :stopBrokk
+call :stopSindri
 goto :EOF
 
 :Watch
@@ -49,6 +53,8 @@ call :startLogin
 call :startChar
 call :startWeb
 call :startMap
+call :startBrokk
+call :startSindri
 goto :EOF
 
 :Start
@@ -58,6 +64,8 @@ call :startLogin
 call :startChar
 call :startWeb
 call :startMap
+call :startBrokk
+call :startSindri
 goto :EOF
 
 :getStatus
@@ -66,6 +74,8 @@ call :getLoginStatus
 call :getCharStatus
 call :getWebStatus
 call :getMapStatus
+call :getBrokkStatus
+call :getSindriStatus
 
 if "%login_running%" == "false" ( echo "login_serv is not running"
 ) else echo "login_serv is running pid=%LoginServPID%"
@@ -75,6 +85,11 @@ if "%web_running%" == "false" ( echo "web_serv is not running"
 ) else echo "web_serv is running pid=%WebServPID%"
 if "%map_running%" == "false" ( echo "map_serv is not running"
 ) else echo "map_serv is running pid=%MapServPID%"
+if "%brokk_running%" == "false" ( echo "brokk_serv is not running"
+) else echo "brokk_serv is running pid=%BrokkServPID%"
+if "%sindri_running%" == "false" ( echo "sindri_serv is not running"
+) else echo "sindri_serv is running pid=%SindriServPID%"
+
 
 goto :EOF
 
@@ -104,6 +119,15 @@ goto :EOF
 call :getMapStatus
 if "%map_running%" == "true" Taskkill /PID %MapServPID% /F
 goto :EOF
+:stopBrokk
+call :getBrokkStatus
+if "%brokk_running%" == "true" Taskkill /PID %BrokkServPID% /F
+goto :EOF
+:stopSindri
+call :getSindriStatus
+if "%sindri_running%" == "true" Taskkill /PID %SindriServPID% /F
+goto :EOF
+
 
 REM start sub targets
 :startLogin
@@ -129,6 +153,17 @@ call :getMapStatus
 if "%map_running%" == "false" ( start cmd /k mapserv.bat %restart_mode%
 ) else echo "Map serv is already running, pid=%MapServPID%"
 goto :EOF
+:startBrokk
+call :getBrokkStatus
+if "%brokk_running%" == "false" ( start cmd /k brokkserv.bat %restart_mode%
+) else echo "Brokk serv is already running, pid=%BrokkServPID%"
+goto :EOF
+:startSindri
+call :getMapStatus
+if "%sindri_running%" == "false" ( start cmd /k sindriserv.bat %restart_mode%
+) else echo "Sindri serv is already running, pid=%SindriServPID%"
+goto :EOF
+
 
 REM status sub targets
 
@@ -151,3 +186,13 @@ goto :EOF
 for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq map-server.exe"') do set MapServPID=%%b
 echo(%MapServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "map_running=true" || set "map_running=false"
 goto :EOF
+
+:getBrokkStatus
+for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq brokk-server.exe"') do set BrokkServPID=%%b
+echo(%BrokkServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "brokk_running=true" || set "brokk_running=false"
+goto :EOF
+
+:getSindriStatus
+for /F "TOKENS=1,2,*" %%a in ('tasklist /FI "IMAGENAME eq sindri-server.exe"') do set SindriServPID=%%b
+echo(%SindriServPID%|findstr "^[-][1-9][0-9]*$ ^[1-9][0-9]*$ ^0$">nul&& set "sindri_running=true" || set "sindri_running=false"
+goto :EOF

tools/sindriserv.bat

@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL serv.bat sindri-server.exe Sindri-Server %*