Skip to content

Commit

Permalink
Add map on launch cmd to keep the map cycle
Browse files Browse the repository at this point in the history
  • Loading branch information
TriForceX committed Jun 28, 2024
1 parent e5dc09d commit 14d5ea5
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 17 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ The version control structure on this project is `<mayor>.<minor>.<patch>` where

---

## 0.20.3
- Fix client connect check messages
- Fix saber clash flare bug and more refactor
- Add private duel to spawn activate sabers cvar
- Add secure checks for config file reading
- Add more patches for proper debugging
- Add map on launch cmd to keep the map cycle

## 0.20.2
- Merge updates from UncannyFish
- Add option to hide time display on motd
Expand Down
6 changes: 3 additions & 3 deletions assets/server/configs/game_type/ctf.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// GAME SETTINGS
// -------------------------------------------------------- //

// Force power disable level: (Setup in "tools" folder)
// Force power disable level: (Setup in "calculator" file or by using /forceToggle command
set g_forcePowerDisable "0"

// Flag capture limit:
Expand All @@ -15,13 +15,13 @@ set timeLimit "20"
// MOD SETTINGS
// -------------------------------------------------------- //

// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position)
// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position on all dimensions)
set jk_teleportChat "0"

// Allow force physics on items: (Set "1" to reset the original position, "2" to keep the lastest position)
set jk_itemForcePhysics "0"

// Show damage plums when a player hit another:
// Show damage plums on player hits: (Set "1" for taken damage, "2" for given damage)
set jk_damagePlums "0"

// Allow JetPack usage: (Set "1" to enable, "2" to allow with unlimited fuel)
Expand Down
8 changes: 4 additions & 4 deletions assets/server/configs/game_type/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// GAME SETTINGS
// -------------------------------------------------------- //

// Force power disable level: (Setup in "tools" folder)
// Force power disable level: (Setup in "calculator" file or by using /forceToggle command
set g_forcePowerDisable "0"

// Weapon disable level: (Setup in "tools" folder)
// Weapon disable level: (Setup in "calculator" file)
set g_weaponDisable "65531"

// Kill limit:
Expand All @@ -18,13 +18,13 @@ set timeLimit "0"
// MOD SETTINGS
// -------------------------------------------------------- //

// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position)
// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position on all dimensions)
set jk_teleportChat "1"

// Allow force physics on items: (Set "1" to reset the original position, "2" to keep the lastest position)
set jk_itemForcePhysics "1"

// Show damage plums when a player hit another:
// Show damage plums on player hits: (Set "1" for taken damage, "2" for given damage)
set jk_damagePlums "2"

// Allow JetPack usage: (Set "1" to enable, "2" to allow with unlimited fuel)
Expand Down
6 changes: 3 additions & 3 deletions assets/server/configs/game_type/duel.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// GAME SETTINGS
// -------------------------------------------------------- //

// Force power disable level: (Setup in "tools" folder)
// Force power disable level: (Setup in "calculator" file or by using /forceToggle command
set g_forcePowerDisable "163839"

// Kill limit:
Expand All @@ -15,13 +15,13 @@ set timeLimit "0"
// MOD SETTINGS
// -------------------------------------------------------- //

// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position)
// Allow custom chat teleports: (Set "1" to enable, "2" to allow save & load position on all dimensions)
set jk_teleportChat "0"

// Allow force physics on items: (Set "1" to reset the original position, "2" to keep the lastest position)
set jk_itemForcePhysics "0"

// Show damage plums when a player hit another:
// Show damage plums on player hits: (Set "1" for taken damage, "2" for given damage)
set jk_damagePlums "0"

// Allow JetPack usage: (Set "1" to enable, "2" to allow with unlimited fuel)
Expand Down
4 changes: 3 additions & 1 deletion assets/server/jkmod_host.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
set jk_binary=jk2mvded.exe
set jk_dedicated=2
set jk_net_port=28070
set jk_mod=JediKnightPlus
set jk_start_map=ffa_bespin
set jk_config=jkmod_server.cfg

cd ..
%jk_binary% +set dedicated %jk_dedicated% +set net_port %jk_net_port% +set fs_game JediKnightPlus +exec %jk_config%
%jk_binary% +set dedicated %jk_dedicated% +set net_port %jk_net_port% +set fs_game %jk_mod% +set nextmap map %jk_start_map% +exec %jk_config%
4 changes: 3 additions & 1 deletion assets/server/jkmod_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
jk_binary=jk2mvded
jk_dedicated=2
jk_net_port=28070
jk_mod=JediKnightPlus
jk_start_map=ffa_bespin
jk_config=jkmod_server.cfg

cd ..
./$jk_binary +set dedicated $jk_dedicated +set net_port $jk_net_port +set fs_game JediKnightPlus +exec $jk_config
./$jk_binary +set dedicated $jk_dedicated +set net_port $jk_net_port +set fs_game $jk_mod +set nextmap map $jk_start_map +exec $jk_config
8 changes: 4 additions & 4 deletions assets/server/jkmod_server.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ set jk_serverClosed "0"
set jk_serverClosedText "Server closed for maintenance"

// Server idle reset time: (In minutes)
set jk_serverIdle "60"
set jk_serverIdle "120"

// Server file to execute when idle:
set jk_serverIdleFile "jkmod_server.cfg"
Expand Down Expand Up @@ -442,7 +442,7 @@ set g_autoMapCycle "1"
// -------------------------------------------------------- //

// Set minimun players needed to add a bot automatically:
set bot_minPlayers "2"
set bot_minPlayers "1"

// Enable bots duel challenge:
set bot_honorableDuelAcceptance "1"
Expand All @@ -460,8 +460,8 @@ set jk_botsAI "1"
// Developer prints:
developer 0

// Load start map: (From this point the server will start)
map ffa_bespin
// Load start & next map: (From this point the server will start)
vstr nextmap

// Kick existing bots:
kick allbots
Expand Down
2 changes: 1 addition & 1 deletion jkmod/game/jk_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ By Tr!Force. Work copyrighted (C) with holder attribution 2005 - 2024
// Version
#define JK_MAJOR 0
#define JK_MINOR 20
#define JK_PATCH 2
#define JK_PATCH 3

// Public
#define JK_VERSION JK_SHORTNAME " v" STR(JK_MAJOR) "." STR(JK_MINOR) "." STR(JK_PATCH)
Expand Down

0 comments on commit 14d5ea5

Please sign in to comment.