update ura mod per Sep 25 2018

.travis.yml

@@ -17,11 +17,11 @@ script:
  - . mod.config;
    awk '/\r$$/ { exit(1); }' mod.config || (printf "Invalid mod.config format. File must be saved using unix-style (CR, not CRLF) line endings.\n"; travis_terminate 1);
    if [ "${TRAVIS_TEST_MOD}" == "True" ]; then make test || travis_terminate 1; fi;
-   if [ "${TRAVIS_TEST_PACKAGING}" == "True" ]; then ./packaging/package-all.sh test-0 || travis_terminate 1; fi
+   if [ "${TRAVIS_TEST_PACKAGING}" == "True" ]; then make check-packaging-scripts && ./packaging/package-all.sh test-0 || travis_terminate 1; fi
 
 before_deploy:
  - mkdir build
- - cd build && ../packaging/package-all.sh ${TRAVIS_TAG} ${PWD} && cd ..
+ - make check-packaging-scripts && cd build && ../packaging/package-all.sh ${TRAVIS_TAG} ${PWD} && cd ..
  - . mod.config
 
 deploy:

Makefile

@@ -12,14 +12,15 @@
 # to check lua scripts for syntax errors, run:
 #   make check-scripts
 #
-# to check the official mods for erroneous yaml files, run:
-#   make test
-#
-# to check the official mod dlls for StyleCop violations, run:
+# to check the engine and your mod dlls for StyleCop violations, run:
 #   make check
 #
+# the following are internal sdk helpers that are not intended to be run directly:
+#   make check-variables
+#   make check-sdk-scripts
+#   make check-packaging-scripts
 
-.PHONY: utility stylecheck build clean engine version check-scripts check test
+.PHONY: utility stylecheck build clean engine version check check-scripts check-sdk-scripts check-packaging-scripts check-variables
 .DEFAULT_GOAL := build
 
 VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
@@ -34,7 +35,7 @@ HAS_LUAC = $(shell command -v luac 2> /dev/null)
 LUA_FILES = $(shell find mods/*/maps/* -iname '*.lua')
 PROJECT_DIRS = $(shell dirname $$(find . -iname "*.csproj" -not -path "$(ENGINE_DIRECTORY)/*"))
 
-scripts:
+check-sdk-scripts:
 	@awk '/\r$$/ { exit(1); }' mod.config || (printf "Invalid mod.config format: file must be saved using unix-style (CR, not CRLF) line endings.\n"; exit 1)
 	@if [ ! -x "fetch-engine.sh" ] || [ ! -x "launch-dedicated.sh" ] || [ ! -x "launch-game.sh" ] || [ ! -x "utility.sh" ]; then \
 		echo "Required SDK scripts are not executable:"; \
@@ -57,7 +58,30 @@ scripts:
 		exit 1; \
 	fi
 
-variables:
+check-packaging-scripts:
+	@if [ ! -x "packaging/package-all.sh" ] || [ ! -x "packaging/linux/buildpackage.sh" ] || [ ! -x "packaging/osx/buildpackage.sh" ] || [ ! -x "packaging/windows/buildpackage.sh" ]; then \
+		echo "Required SDK scripts are not executable:"; \
+		if [ ! -x "packaging/package-all.sh" ]; then \
+			echo "   packaging/package-all.sh"; \
+		fi; \
+		if [ ! -x "packaging/linux/buildpackage.sh" ]; then \
+			echo "   packaging/linux/buildpackage.sh"; \
+		fi; \
+		if [ ! -x "packaging/osx/buildpackage.sh" ]; then \
+			echo "   packaging/osx/buildpackage.sh"; \
+		fi; \
+		if [ ! -x "packaging/windows/buildpackage.sh" ]; then \
+			echo "   packaging/windows/buildpackage.sh"; \
+		fi; \
+		echo "Repair their permissions and try again."; \
+		echo "If you are using git you can repair these permissions by running"; \
+		echo "   git update-index --chmod=+x *.sh"; \
+		echo "in the directories containing the affected files"; \
+		echo "and commiting the changed files to your repository."; \
+		exit 1; \
+	fi
+
+check-variables:
 	@if [ -z "$(MOD_ID)" ] || [ -z "$(ENGINE_DIRECTORY)" ]; then \
 		echo "Required mod.config variables are missing:"; \
 		if [ -z "$(MOD_ID)" ]; then \
@@ -70,7 +94,7 @@ variables:
 		exit 1; \
 	fi
 
-engine: variables scripts
+engine: check-variables check-sdk-scripts
 	@./fetch-engine.sh || (printf "Unable to continue without engine files\n"; exit 1)
 	@cd $(ENGINE_DIRECTORY) && make core
 
@@ -96,7 +120,7 @@ endif
 	@cd $(ENGINE_DIRECTORY) && make clean
 	@printf "The engine has been cleaned.\n"
 
-version: variables
+version: check-variables
 	@awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $(MANIFEST_PATH) > $(MANIFEST_PATH).tmp && \
 	awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $(MANIFEST_PATH).tmp > $(MANIFEST_PATH) && \
 	rm $(MANIFEST_PATH).tmp

changelog.txt

@@ -23,7 +23,7 @@ https://github.com/RAunplugged/OpenRA/commit/1a51f48412e08403279f6d97f715b499e07
 
 Latest updates:
 
-OpenRAModSDK commit tag: bbb2131 - bbb21311f5bf8395cc1d11d4c630d3ced78ece37
+OpenRAModSDK commit tag: 8a1f1a9 - 8a1f1a9706057cb8872a784cbe8fc0b915778554
 OpenRA Engine commit tag:  978d447 - 978d447d427821d9afec9f503f1ff29387d4f47a
 
 

mod.config

@@ -65,7 +65,7 @@ PACKAGING_FAQ_URL="http://wiki.openra.net/FAQ"
 PACKAGING_AUTHORS="SoScared"
 
 # The git tag to use for the macOS Launcher files.
-PACKAGING_OSX_LAUNCHER_TAG="osx-launcher-20180723"
+PACKAGING_OSX_LAUNCHER_TAG="osx-launcher-20171118"
 
 # Filename to use for the launcher executable on Windows.
 PACKAGING_WINDOWS_LAUNCHER_NAME="Red Alert Unplugged Alpha"

mods/ura/chrome/ingame-player.yaml

@@ -398,6 +398,8 @@ Container@PLAYER_WIDGETS:
 							Y: 41
 							Width: 220
 							Height: 220
+							SoundUp: RadarUp
+							SoundDown: RadarDown
 							Children:
 						VqaPlayer@PLAYER:
 							X: 8

mods/ura/rules/defaults.yaml

@@ -61,6 +61,7 @@
 
 ^GainsExperience:
 	GainsExperience:
+		LevelUpNotification: LevelUp
 		Conditions:
 			200: rank-veteran
 			400: rank-veteran
@@ -694,6 +695,7 @@
 		AreaTypes: building, fake
 	RepairableBuilding:
 		PlayerExperience: 25
+		RepairingNotification: Repairing
 	EngineerRepairable:
 	ExternalCapturable:
 	ExternalCapturableBar:

mods/ura/rules/player.yaml

@@ -11,50 +11,81 @@ Player:
 	ClassicProductionQueue@Building:
 		Type: Building
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 	ClassicProductionQueue@Defense:
 		Type: Defense
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
+		ReadyAudio: UnitReady
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 		BuildTimeSpeedReduction: 100, 75, 60, 50
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
 		LowPowerSlowdown: 3
+		ReadyAudio: UnitReady
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 	ClassicProductionQueue@Ship:
 		Type: Ship
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
+		ReadyAudio: UnitReady
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 	ClassicProductionQueue@Aircraft:
 		Type: Aircraft
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
+		ReadyAudio: UnitReady
+		BlockedAudio: NoBuild
 		LimitedAudio: BuildingInProgress
+		QueuedAudio: Building
+		OnHoldAudio: OnHold
+		CancelledAudio: Cancelled
 		SpeedUp: True
 	PlaceBuilding:
+		NewOptionsNotification: NewOptions
+		CannotPlaceNotification: BuildingCannotPlaceAudio
 	SupportPowerManager:
 	ScriptTriggers:
 	MissionObjectives:
+		WinNotification: Win
+		LoseNotification: Lose
+		LeaveNotification: Leave
 	ConquestVictoryConditions:
 	PowerManager:
+		SpeechNotification: LowPower
 	AllyRepair:
 	PlayerResources:
 		InsufficientFundsNotification: InsufficientFunds
+		CashTickUpNotification: CashTickUp
+		CashTickDownNotification: CashTickDown
 	DeveloperMode:
 		CheckboxDisplayOrder: 9
 	GpsWatcher:

mods/ura/rules/structures.yaml

@@ -226,6 +226,7 @@ KENN:
 		Produces: Infantry, Dog
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 175
@@ -278,6 +279,7 @@ TENT:
 		Produces: Infantry, Soldier
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 20
@@ -372,6 +374,7 @@ BARR:
 		Produces: Infantry, Soldier
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
@@ -462,6 +465,7 @@ WEAP:
 		Produces: Vehicle
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 80
@@ -568,8 +572,9 @@ FIX:
 	RepairsUnits:
 		HpPerStep: 10
 		Interval: 7
-		FinishRepairingNotification: UnitRepaired
 		PlayerExperience: 15
+		StartRepairingNotification: Repairing
+		FinishRepairingNotification: UnitRepaired
 	Reservable:
 	Buildable:
 		Queue: Building
@@ -617,15 +622,17 @@ SYRD:
 		Amount: -30
 	RepairsUnits:
 		HpPerStep: 1000
-		FinishRepairingNotification: UnitRepaired
 		PlayerExperience: 15
+		StartRepairingNotification: Repairing
+		FinishRepairingNotification: UnitRepaired
 	RequiresBuildableArea:
 		Adjacent: 10
 	-GivesBuildableArea:
 	Production:
 		Produces: Ship, Boat
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 40
@@ -739,8 +746,9 @@ SPEN:
 		Amount: -30
 	RepairsUnits:
 		HpPerStep: 1000
-		FinishRepairingNotification: UnitRepaired
 		PlayerExperience: 15
+		StartRepairingNotification: Repairing
+		FinishRepairingNotification: UnitRepaired
 	RequiresBuildableArea:
 		AreaTypes: building
 		Adjacent: 10
@@ -749,6 +757,7 @@ SPEN:
 		Produces: Ship, Submarine
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
@@ -999,12 +1008,15 @@ HPAD:
 		HpPerStep: 1
 		Interval: 10
 		PlayerExperience: 15
+		StartRepairingNotification: Repairing
+		FinishRepairingNotification: UnitRepaired
 	Reservable:
 	WithRepairAnimation:
 	Production:
 		Produces: Aircraft, Helicopter
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 120
@@ -1095,11 +1107,14 @@ AFLD:
 		HpPerStep: 1
 		Interval: 12
 		PlayerExperience: 15
+		StartRepairingNotification: Repairing
+		FinishRepairingNotification: UnitRepaired
 	Reservable:
 	Production:
 		Produces: Aircraft, Plane
 	PrimaryBuilding:
 		PrimaryCondition: primary
+		SelectionNotification: PrimaryBuildingSelected
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 130

packaging/windows/buildpackage.sh

@@ -112,7 +112,7 @@ popd > /dev/null
 echo "Packaging zip archive"
 pushd "${BUILTDIR}" > /dev/null
 find "${SRC_DIR}/thirdparty/download/windows/" -name '*.dll' -exec cp '{}' '.' ';'
-zip "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable" -r -9 * --quiet
+zip "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable.zip" -r -9 * --quiet
 mv "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable.zip" "${OUTPUTDIR}"
 popd > /dev/null