Localisation, Reveng map updates, bot updates (#23)

Co-authored-by: Kenneth Watson <--global>

CHANGELOG.md

@@ -1,18 +1,32 @@
 # Changelog
 
+## 608 to 609:
+ - Properly support `bEnabled` on `MonsterWaypoint`, to allow for more complex AI navigation orchestration
+   - waypoint can now be disabled at start, and then triggered to enable (default is enabled)
+ - Adjust bot behaviour to try to clear monsters in an area before proceeding to next waypoint
+ - Localisation templates and Spanish Localisation (thanks Neon_Knight)
+   - Update build scripts/templates to support localised template variables 
+ - Optimise `MonsterWaypoint` startup, only do `AllActors` traversal if/when touched and only if events configured
+ - Add icons on the scoreboard: 
+   - a skull for players with no remaining lives
+   - a star "award" at the end for players with no deaths for the whole round
+ - Re-worked and improved MH-Revenge]\[ map, included as MH-Revenge]\[-SE
+ - Add option to hide objectives on HUD. Can be Set in `User.ini`:
+   - under `[MonsterHunt.MonsterHUD]` section, set `bHideObjectives=true` (default is false)
+
 ## 607 to 608:
-- Re-worked and improved MH-NaliVillage]\[ map, included as MH-NaliVillage][-SE
-- Include monster difficulty in scoreboard footer message
-- Show objectives on scoreboard
-- Reduce volume of objective activated/completed sounds
-- Only include unfriendly creatures in monsters remaining count
-- Tweak levers/waypoints in MH-NaliVillage]\[ map to prevent double-triggering by AI
+ - Re-worked and improved MH-NaliVillage]\[ map, included as MH-NaliVillage]\[-SE
+ - Include monster difficulty in scoreboard footer message
+ - Show objectives on scoreboard
+ - Reduce volume of objective activated/completed sounds
+ - Only include unfriendly creatures in monsters remaining count
+ - Tweak levers/waypoints in MH-NaliVillage]\[ map to prevent double-triggering by AI
 
 ## 606 to 607:
-- Introduction of support for optional objectives in maps, which can show up on the HUD, and tell players what they need to be doing
-- Cleaned up some chat log kill messaging, and do not show suicide messages as "Player1 killed Player1"
-- Polish pass for MH-Lonely][, fixing bad geometry, general cleanup and visual improvements
-- Added objectives to all standard MH maps
+ - Introduction of support for optional objectives in maps, which can show up on the HUD, and tell players what they need to be doing
+ - Cleaned up some chat log kill messaging, and do not show suicide messages as "Player1 killed Player1"
+ - Polish pass for MH-Lonely][, fixing bad geometry, general cleanup and visual improvements
+ - Added objectives to all standard MH maps
 
 ## 605 to 606:
  - Fix incorrect view offsets for U1 weapons making them seem invisible

buildscript/Makefile

@@ -104,7 +104,7 @@ $(DIR_TARG)/System/ucc-bin: | auto-download expect-cmd-tar expect-cmd-gunzip exp
 	tar xjpmvf "$(DIR_DEPS)/OldUnreal-UTPatch469b-Linux.tar.bz2" --overwrite -C "$(DIR_TARG)" ;\
 	echo Done.
 
-$(DIR_DIST)/$(PACKAGE_NAME)/$(BUILD_NUM)/$(PACKAGE_NAME)-$(BUILD_NUM).zip: $(DIR_TARG)/System/ucc-bin $(PACKAGE_ROOT)/Classes/*.uc $(PACKAGE_ROOT)/template.int $(PACKAGE_ROOT)/template-options.yml $(SCRIPTS_DIR)/buildconfig.sh | expect-cmd-tar expect-cmd-gzip expect-cmd-bzip2 expect-cmd-zip expect-cmd-bash
+$(DIR_DIST)/$(PACKAGE_NAME)/$(BUILD_NUM)/$(PACKAGE_NAME)-$(BUILD_NUM).zip: $(DIR_TARG)/System/ucc-bin $(PACKAGE_ROOT)/Classes/*.uc $(PACKAGE_ROOT)/template-options.yml $(SCRIPTS_DIR)/buildconfig.sh | expect-cmd-tar expect-cmd-gzip expect-cmd-bzip2 expect-cmd-zip expect-cmd-bash
 	echo "Building distribution: $(DIR_DIST)/$(PACKAGE_NAME)/$(BUILD_NUM)/$(PACKAGE_NAME)-$(BUILD_NUM).zip"
 	echo "Build directory: $(DIR_TARG_PACKAGE)"
 	echo '=== Starting build!' ;\

buildscript/_build.sh

@@ -80,26 +80,34 @@ cleanup() {
 				)
 				code=$?; [[ $code == 0 ]] || exit $code
 
-				# Format .int with Mustache
-				echo "Formatting: System/$packagefull.int"
-				"$MUSTACHE" "$PACKAGE_SRC_DIR/template.int" < "$TMP_YML" > "System/$packagefull.int"
-
 				# Create the final package template directory
 				PACKAGED="$packagefull"/packaged
 				mkdir -p "$PACKAGED"/System
 
-				# Move over system files
-				mv -v "System/$packagefull.int" "System/$packagefull.u" "$PACKAGED"/System
+				# Format localisation files
+				echo "Formatting localised files: $PACKAGE_RES_DIR"
+				if [[ -d $PACKAGE_RES_DIR ]]; then
+					for res in "$PACKAGE_RES_DIR"/System/*; do
+						res="$(basename "$res")"
+						if [[ $res == 'LocalisationTemplates' ]]; then continue; fi
+						"$MUSTACHE" "$PACKAGE_RES_DIR/System/$res" < "$TMP_YML" > "$PACKAGED"/System/"$res"
+					done
+				fi
 
 				# Overlay additional resources if present
-				echo $PACKAGE_RES_DIR
+				echo "Copy resources directory: $PACKAGE_RES_DIR"
 				if [[ -d $PACKAGE_RES_DIR ]]; then
 					for res in "$PACKAGE_RES_DIR"/**; do
 						res="$(basename "$res")"
+						if [[ $res == 'System' ]]; then continue; fi
 						cp -rvf "$PACKAGE_RES_DIR/$res" "$PACKAGED/$res"
 					done
 				fi
 
+				# Move over system files
+				mv -v "System/$packagefull.u" "$PACKAGED"/System
+
+				echo "Packaging up..."
 				(
 					cd $PACKAGED
 
@@ -110,12 +118,11 @@ cleanup() {
 				)
 
 				# Move to dist
-				echo Packaging up...
 				mkdir -p "$dist/$package/$build"
 				mv "$packagedist."{tar.*,zip} "$dist/$package/$build"
 
 				# Update dist/latest
-				echo Organizing dist directory...
+				echo "Organizing dist directory..."
 				mkdir -p "$dist/$package/latest"
 				rm -f "$dist/$package/latest/"*
 				cp "$dist/$package/$build/"* "$dist/$package/latest"
@@ -129,7 +136,7 @@ code=$?
 rm "$TMP_YML"
 rm "$TMP_INI"
 
-echo Cleaning up...
+echo "Cleaning up..."
 cleanup
 
 exit $code

buildscript/buildconfig.sh

@@ -7,8 +7,8 @@ SCRIPTS_DIR=$(dirname $(realpath $0))
 
 export name="Monster Hunt"
 export package=MonsterHunt
-export build=608
-export version=608
+export build=609
+export version=609
 export packagefull=$package
 export packagedist=$package$version
 export debug=1

resources/System/Localization templates/MonsterHunt.template → resources/System/LocalisationTemplates/MonsterHunt.template

@@ -1,29 +1,24 @@
 [Public]
-; EN: Object=(Name=MonsterHunt.ChainsawArena,Class=Class,MetaClass=Engine.Mutator,Description="Chainsaw Arena v608,Replaces all weapons with the Chainsaw!")
-Object=(Name=MonsterHunt.ChainsawArena,Class=Class,MetaClass=Engine.Mutator,Description=",")
+{{#mutators}}
+Object=(Name={{{package}}}.{{{class}}},Class=Class,MetaClass=Engine.Mutator,Description="{{{en.name}}} v{{{version}}},{{{en.description}}}")
+{{/mutators}}
 
-; EN: Preferences=(Caption="Game Types",Parent="Advanced Options")
-Preferences=(Caption="",Parent="")
-Object=(Name=MonsterHunt.MonsterHunt,Class=Class,MetaClass=Botpack.TournamentGameInfo)
-; EN: Preferences=(Caption="Monster Hunt v608",Parent="Game Types",Class=MonsterHunt.MonsterHunt,Immediate=True)
-Preferences=(Caption="",Parent="",Class=MonsterHunt.MonsterHunt,Immediate=True)
-Object=(Name=MonsterHunt.MonsterHuntArena,Class=Class,MetaClass=Botpack.TournamentGameInfo)
-; EN: Preferences=(Caption="Monster Arena v608",Parent="Game Types",Class=MonsterHunt.MonsterHuntArena,Immediate=True)
-Preferences=(Caption="",Parent="",Class=MonsterHunt.MonsterHuntArena,Immediate=True)
-Object=(Name=MonsterHunt.MonsterHuntDefence,Class=Class,MetaClass=Botpack.TournamentGameInfo)
-; EN: Preferences=(Caption="Monster Defence v608",Parent="Game Types",Class=MonsterHunt.MonsterHuntDefence,Immediate=True)
-Preferences=(Caption="",Parent="",Class=MonsterHunt.MonsterHuntDefence,Immediate=True)
+{{#gametypes}}
+Object=(Name={{{package}}}.{{{class}}},Class=Class,MetaClass=Botpack.TournamentGameInfo)
+Preferences=(Caption="{{{en.name}}} v{{{version}}}",Parent="Game Types",Class={{{package}}}.{{{class}}},Immediate=True)
+{{/gametypes}}
 
-; EN: Object=(Name=MonsterHunt.MonsterDefaultMaps,Class=Class,MetaClass=MonsterHunt.MonsterMapList,Description="Default Maps v608")
-Object=(Name=MonsterHunt.MonsterDefaultMaps,Class=Class,MetaClass=MonsterHunt.MonsterMapList,Description="")
-; EN: Object=(Name=MonsterHunt.MonsterArenaDefaultMaps,Class=Class,MetaClass=MonsterHunt.MonsterArenaMapList,Description="Default Maps v608")
-Object=(Name=MonsterHunt.MonsterArenaDefaultMaps,Class=Class,MetaClass=MonsterHunt.MonsterArenaMapList,Description="")
+{{#maplists}}
+Object=(Name={{{package}}}.{{{class}}},Class=Class,MetaClass={{{package}}}.{{{metaclass}}},Description="{{{en.description}}} v{{{version}}}")
+{{/maplists}}
 
-Object=(Name=MonsterHunt.MonsterBrowserWindow,Class=Class,MetaClass=UTBrowser.UTBrowserServerListWindow)
-Object=(Name=MonsterHunt.MonsterArenaBrowserWindow,Class=Class,MetaClass=UTBrowser.UTBrowserServerListWindow)
+{{#browsers}}
+Object=(Name={{{package}}}.{{{class}}},Class=Class,MetaClass=UTBrowser.UTBrowserServerListWindow)
+{{/browsers}}
 
-; EN: Object=(Name=MonsterHunt.MonsterMenuItem,Class=Class,MetaClass=UMenu.UMenuModMenuItem,Description="&Monster Hunt Credits v608,The people behind Monster Hunt.")
-Object=(Name=MonsterHunt.MonsterMenuItem,Class=Class,MetaClass=UMenu.UMenuModMenuItem,Description=",")
+{{#menus}}
+Object=(Name={{{package}}}.{{{class}}},Class=Class,MetaClass=UMenu.UMenuModMenuItem,Description="{{{en.name}}} v{{{version}}},{{{en.description}}}")
+{{/menus}}
 
 [MonsterHunt]
 ; EN: TimeOutMessage="Time up, hunt failed!"