Merge branch 'release/v0.9.0'

jlfarris91 · May 2, 2023 · 7c9c206 · 7c9c206
2 parents 908d0d3 + 9c35303
commit 7c9c206
Show file tree

Hide file tree

Showing 1,010 changed files with 440,493 additions and 30,936 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,8 @@ wurst.build
 /*.w3x
 wurst/ProjectConstants.wurst
 wurst/Spawning/SpawnRegionInit.wurst
+wurst/World/MapEventsInit.wurst
+wurst/World/BasesInit.wurst
 Workspace.code-workspace
 wurst_run.args
 
@@ -30,3 +32,4 @@ wurst_run.args
 /wurst/Save/*
 *.blend1
 /src/Save/*
+src/tools/War3.Net/
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@ url=https://github.com/jlfarris91/WurstCore.git
 [submodule "_build/dependencies/wurstStdlib2"]
 	path = _build/dependencies/wurstStdlib2
 	url = https://github.com/jlfarris91/WurstStdlib2
+[submodule "_build/dependencies/WurstMMD"]
+	path = _build/dependencies/WurstMMD
+	url = https://github.com/jlfarris91/WurstMMD
diff --git a/BaseObjectData.w3o b/BaseObjectData.w3o
diff --git a/Resources/ui/EnemyIconBorder.xcf b/Resources/ui/EnemyIconBorder.xcf
diff --git a/Resources/ui/LootProgressBarIcon.blend b/Resources/ui/LootProgressBarIcon.blend
diff --git a/_build/blizzard.j b/_build/blizzard.j
@@ -2530,6 +2530,11 @@ function SetMusicVolumeBJ takes real volumePercent returns nothing
     call SetMusicVolume(PercentToInt(volumePercent, 127))
 endfunction
 
+//===========================================================================
+function SetThematicMusicVolumeBJ takes real volumePercent returns nothing
+    call SetThematicMusicVolume(PercentToInt(volumePercent, 127))
+endfunction
+
 //===========================================================================
 function GetSoundDurationBJ takes sound soundHandle returns real
     if (soundHandle == null) then

diff --git a/_build/common.j b/_build/common.j
@@ -537,6 +537,14 @@ globals
     constant volumegroup        SOUND_VOLUMEGROUP_MUSIC             = ConvertVolumeGroup(5)
     constant volumegroup        SOUND_VOLUMEGROUP_AMBIENTSOUNDS     = ConvertVolumeGroup(6)
     constant volumegroup        SOUND_VOLUMEGROUP_FIRE              = ConvertVolumeGroup(7)
+//Cinematic Sound Constants
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_GENERAL         = ConvertVolumeGroup(8)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_AMBIENT         = ConvertVolumeGroup(9)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_MUSIC           = ConvertVolumeGroup(10)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_DIALOGUE        = ConvertVolumeGroup(11)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_SOUND_EFFECTS_1 = ConvertVolumeGroup(12)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_SOUND_EFFECTS_2 = ConvertVolumeGroup(13)
+    constant volumegroup        SOUND_VOLUMEGROUP_CINEMATIC_SOUND_EFFECTS_3 = ConvertVolumeGroup(14)
 
 
 //===================================================
@@ -3712,6 +3720,7 @@ native SetSoundVelocity             takes sound soundHandle, real x, real y, rea
 native AttachSoundToUnit            takes sound soundHandle, unit whichUnit returns nothing
 
 native StartSound                   takes sound soundHandle returns nothing
+native StartSoundEx                 takes sound soundHandle, boolean fadeIn returns nothing
 native StopSound                    takes sound soundHandle, boolean killWhenDone, boolean fadeOut returns nothing
 native KillSoundWhenDone            takes sound soundHandle returns nothing
 
@@ -4095,6 +4104,7 @@ native BlzSetSpecialEffectMatrixScale              takes effect whichEffect, rea
 native BlzResetSpecialEffectMatrix                 takes effect whichEffect returns nothing
 native BlzGetUnitAbility                           takes unit whichUnit, integer abilId returns ability
 native BlzGetUnitAbilityByIndex                    takes unit whichUnit, integer index returns ability
+native BlzGetAbilityId                             takes ability whichAbility returns integer
 native BlzDisplayChatMessage                       takes player whichPlayer, integer recipient, string message returns nothing
 native BlzPauseUnitEx                              takes unit whichUnit, boolean flag returns nothing
 // native BlzFourCC2S                                 takes integer value returns string
@@ -4195,3 +4205,20 @@ native BlzCreateDestructableZWithSkin              takes integer objectid, real
 native BlzCreateDeadDestructableWithSkin           takes integer objectid, real x, real y, real face, real scale, integer variation, integer skinId returns destructable
 native BlzCreateDeadDestructableZWithSkin          takes integer objectid, real x, real y, real z, real face, real scale, integer variation, integer skinId returns destructable
 native BlzGetPlayerTownHallCount                   takes player whichPlayer returns integer
+
+native BlzQueueImmediateOrderById      takes unit whichUnit, integer order returns boolean
+native BlzQueuePointOrderById          takes unit whichUnit, integer order, real x, real y returns boolean
+native BlzQueueTargetOrderById         takes unit whichUnit, integer order, widget targetWidget returns boolean
+native BlzQueueInstantPointOrderById   takes unit whichUnit, integer order, real x, real y, widget instantTargetWidget returns boolean
+native BlzQueueInstantTargetOrderById  takes unit whichUnit, integer order, widget targetWidget, widget instantTargetWidget returns boolean
+native BlzQueueBuildOrderById          takes unit whichPeon, integer unitId, real x, real y returns boolean
+native BlzQueueNeutralImmediateOrderById   takes player forWhichPlayer,unit neutralStructure, integer unitId returns boolean
+native BlzQueueNeutralPointOrderById       takes player forWhichPlayer,unit neutralStructure, integer unitId, real x, real y returns boolean
+native BlzQueueNeutralTargetOrderById      takes player forWhichPlayer,unit neutralStructure, integer unitId, widget target returns boolean
+
+// returns the number of orders the unit currently has queued up
+native BlzGetUnitOrderCount takes unit whichUnit returns integer
+// clears either all orders or only queued up orders
+native BlzUnitClearOrders takes unit whichUnit, boolean onlyQueued returns nothing
+// stops the current order and optionally clears the queue
+native BlzUnitForceStopOrder takes unit whichUnit, boolean clearQueue returns nothing
diff --git a/_build/dependencies/WurstCore b/_build/dependencies/WurstCore
diff --git a/_build/dependencies/wurstStdlib2 b/_build/dependencies/wurstStdlib2
diff --git a/build/RunPipeline.ps1 b/build/RunPipeline.ps1
@@ -24,7 +24,7 @@ else
   $War3ArchiveDirPath = [System.IO.Path]::Combine($env:BuildRoot, "war3.wmod")
 }
 
-& $ExeFilePath "$SourceMapDirPath" "$OutputWurstSourceMapFilePath" "$IntermediateDirPath" "$OutputSpawnRegionScriptFile" "$War3ArchiveDirPath" "$OutputListFilePath"
+& $ExeFilePath --sourceMapDir "$SourceMapDirPath" --outputMapFile "$OutputWurstSourceMapFilePath" --intermediateDir "$IntermediateDirPath" --outputSpawnRegionScriptFile "$OutputSpawnRegionScriptFile" --w3modBasePath "$War3ArchiveDirPath" --outputListFilePath "$OutputListFilePath" #--mergeWar3MapSkinFiles --writeRegionsToArchive
 
 if ($LASTEXITCODE -eq 0)
 {

diff --git a/build/SetupBuildEnvironment.ps1 b/build/SetupBuildEnvironment.ps1
@@ -63,6 +63,8 @@ $env:SourceMapFileName = "TheLastStand.w3x"
 
 $env:MapName = "The Last Stand"
 $env:MapNameVersioned = "{0} {1}" -f $env:MapName, $env:MapVersion
+$env:MapNameColored = "|cffffcc00L|r|cffffaa00ast|r |cffffcc00S|r|cffffaa00tand|r"
+$env:MapNameVersionedColored = "{0} |cff0055ff{1}|r" -f $env:MapNameColored, $env:MapVersion
 
 $env:MapNameNoSpaces = "TheLastStand"
 $env:MapNameNoSpacesVersioned = "{0}{1}" -f $env:MapNameNoSpaces, $env:MapVersion

diff --git a/build/wurst.buildtemplate b/build/wurst.buildtemplate
@@ -5,11 +5,11 @@ dependencies:
 - https://github.com/jlfarris91/WurstCore
 - https://github.com/Frotty/Ability-Tooltip-Generator
 buildMapData:
-  name: %MapNameVersioned%
+  name: "%MapNameVersioned%"
   fileName: %WurstMapName%
   author: %MapAuthor%
   scenarioData:
-    description: Join the Discord - |cFFFFCC00discord.gg/VzjbPkGN3r|r|n|cFFE03f1BWorks in Classic & Reforged|r|n|nForage by day, survive by night. Construct a camp and rally survivors to fight off the living dead.|n|n|nBuilt |cFFFFCC00%BuildDate%|r
+    description: Join the Discord - |cFFFFCC00discord.gg/VzjbPkGN3r|r|n|cFFFF0000Works in Classic Only!|r|n|nLoot by day, survive by night. Construct a base and fight off the living dead.|n|n|nBuilt |cFFFFCC00%BuildDate%|r
     loadingScreen:
       model: LoadingScreen.mdx
       title: "|cff00B2FF%MapAuthor%|r presents"
@@ -81,6 +81,11 @@ buildMapData:
     race: HUMAN
     controller: COMPUTER
     fixedStartLoc: true
+  - id: 11
+    name: Bandits
+    race: HUMAN
+    controller: COMPUTER
+    fixedStartLoc: true
   - id: 20
     name: Loot
     race: HUMAN
@@ -105,6 +110,9 @@ buildMapData:
   - name: Undead
     playerIds:
     - 8
+  - name: Bandits
+    playerIds:
+    - 11
   - name: Villagers
     playerIds:
     - 10

diff --git a/build/wurst_run_debug.args b/build/wurst_run_debug.args
@@ -6,7 +6,7 @@ Following are the default enabled arguments:
 
 -runcompiletimefunctions
 -injectobjects
--stacktraces
+stacktraces
 lua
 
 Optimization arguments (default disabled):

diff --git a/build/wurst_run_tester.args b/build/wurst_run_tester.args
@@ -6,7 +6,7 @@ Following are the default enabled arguments:
 
 -runcompiletimefunctions
 -injectobjects
--stacktraces
+stacktraces
 lua
 
 Optimization arguments (default disabled):

diff --git a/imports/PathTextures/2x2Unbuildable.tga b/imports/PathTextures/2x2Unbuildable.tga
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNBearTrap.blp b/imports/ReplaceableTextures/CommandButtons/BTNBearTrap.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNFellTree.blp b/imports/ReplaceableTextures/CommandButtons/BTNFellTree.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNFoundationLarge.blp b/imports/ReplaceableTextures/CommandButtons/BTNFoundationLarge.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNFoundationMed.blp b/imports/ReplaceableTextures/CommandButtons/BTNFoundationMed.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNFoundationTower.blp b/imports/ReplaceableTextures/CommandButtons/BTNFoundationTower.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNHawkeyeOff.blp b/imports/ReplaceableTextures/CommandButtons/BTNHawkeyeOff.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNHawkeyeOn.blp b/imports/ReplaceableTextures/CommandButtons/BTNHawkeyeOn.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNLootSpecialist.blp b/imports/ReplaceableTextures/CommandButtons/BTNLootSpecialist.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/BTNNoJob.blp b/imports/ReplaceableTextures/CommandButtons/BTNNoJob.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/DISBTNWorkbench.blp b/imports/ReplaceableTextures/CommandButtons/DISBTNWorkbench.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASBearTrap.blp b/imports/ReplaceableTextures/CommandButtons/PASBearTrap.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASCancel.blp b/imports/ReplaceableTextures/CommandButtons/PASCancel.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASFirePit.blp b/imports/ReplaceableTextures/CommandButtons/PASFirePit.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASGenericCreepBuilding.blp b/imports/ReplaceableTextures/CommandButtons/PASGenericCreepBuilding.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASTent.blp b/imports/ReplaceableTextures/CommandButtons/PASTent.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/PASTent1.blp b/imports/ReplaceableTextures/CommandButtons/PASTent1.blp
diff --git a/imports/ReplaceableTextures/CommandButtons/btnmountaineer.tga b/imports/ReplaceableTextures/CommandButtons/btnmountaineer.tga
diff --git a/imports/ReplaceableTextures/CommandButtons/btntent1.tga b/imports/ReplaceableTextures/CommandButtons/btntent1.tga
diff --git a/imports/ReplaceableTextures/CommandButtons/btntent2.tga b/imports/ReplaceableTextures/CommandButtons/btntent2.tga
diff --git a/imports/ReplaceableTextures/CommandButtons/btntent3.tga b/imports/ReplaceableTextures/CommandButtons/btntent3.tga
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNBearTrap.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNBearTrap.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFellTree.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFellTree.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationLarge.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationLarge.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationMed.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationMed.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationSmall.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationSmall.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationTower.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNFoundationTower.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNGenericCreepBuilding.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNGenericCreepBuilding.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNHawkeyeOff.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNHawkeyeOff.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNHawkeyeOn.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNHawkeyeOn.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNLootSpecialist.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNLootSpecialist.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNNoJob.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNNoJob.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNmountaineer.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISBTNmountaineer.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASBearTrap.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASBearTrap.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASCancel.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASCancel.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASFellTree.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASFellTree.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASFirePit.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASFirePit.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASGenericCreepBuilding.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASGenericCreepBuilding.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASLootSpecialist.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASLootSpecialist.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASNoJob.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASNoJob.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASTent.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASTent.blp
diff --git a/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASTent1.blp b/imports/ReplaceableTextures/CommandButtonsDisabled/DISPASTent1.blp
diff --git a/imports/ReplaceableTextures/Splats/LootableUbersplat.tga b/imports/ReplaceableTextures/Splats/LootableUbersplat.tga
+37 −4		imports/circle.mdl
+54 −52		wurst/ArcProjectile.wurst
+1 −15		wurst/BoxedValueObjects.wurst
+16 −0		wurst/BoxedValueObjectsMeta.wurst
+1 −0		wurst/CancellationToken.wurst
+1 −1		wurst/Collections/Dictionary.wurst
+0 −296		wurst/Collections/Enumerable.wurst
+19 −1		wurst/Collections/IterableMapExtensions.wurst
+0 −297		wurst/Collections/ObjectEnumerable.wurst
+27 −0		wurst/Collections/Vector.wurst
+1 −1		wurst/Collections/VectorMeta.wurst
+2 −0		wurst/Collections/WeightedSet.wurst
+13 −1		wurst/ColorUtility.wurst
+83 −6		wurst/Composition.wurst
+0 −64		wurst/Composition/Component.wurst
+0 −5		wurst/Composition/Composition.wurst
+0 −15		wurst/Composition/IComponent.wurst
+0 −23		wurst/Composition/IComposite.wurst
+4 −0		wurst/Debug/DebuggerDialog.wurst
+267 −0		wurst/Deck.wurst
+8 −2		wurst/Dispatcher.wurst
+835 −0		wurst/ECS/ECS.wurst
+19 −0		wurst/GroupExtensions.wurst
+1 −1		wurst/Inspector/Descriptors.wurst
+1 −1		wurst/Inspector/InspectionInterfaces.wurst
+1 −1		wurst/Inspector/Inspector.wurst
+3 −2		wurst/Inspector/PropertyEditors.wurst
+3 −2		wurst/Inspector/UnitDescriptor.wurst
+38 −0		wurst/IsEnabled.wurst
+1,121 −0		wurst/Jobs.wurst
+33 −1		wurst/Math.wurst
+375 −5		wurst/Meta.wurst
+0 −361		wurst/Meta/Object.wurst
+382 −0		wurst/Missile/Missile.wurst
+4 −0		wurst/PlayerExtensions.wurst
+445 −0		wurst/PlayerMetadata.wurst
+0 −65		wurst/PlayerMetadata/PlayerComponent.wurst
+0 −152		wurst/PlayerMetadata/PlayerMetadata.wurst
+0 −202		wurst/PlayerMetadata/PlayerMetadataExtensions.wurst
+20 −0		wurst/PlayerMetadataMeta.wurst
+9 −2		wurst/Predicate.wurst
+24 −1		wurst/Preload.wurst
+13 −4		wurst/RealExtensions.wurst
+1 −1		wurst/RealTime.wurst
+3 −3		wurst/RefObject.wurst
+365 −0		wurst/RepairTracking.wurst
+23 −3		wurst/Runnable.wurst
+2 −1		wurst/Serialization/Serialization.wurst
+2 −3		wurst/Serialization/Serializers.wurst
+140 −15		wurst/SmartValue.wurst
+6 −0		wurst/StringBuilder.wurst
+0 −42		wurst/TargetUtility.wurst
+50 −51		wurst/Tasks.wurst
+379 −46		wurst/Transform.wurst
+202 −0		wurst/UI/StandardTooltip.wurst
+180 −0		wurst/UnitAdmin.wurst
+5 −1		wurst/UnitExtensions.wurst
+162 −20		wurst/UnitMetadata.wurst
+0 −90		wurst/UnitMetadata/UnitComponent.wurst
+21 −0		wurst/UnitMetadataMeta.wurst
+20 −2		wurst/UnitRecycler/UnitRecycler.wurst
+1 −1		wurst/WPF/ContentPresenter.wurst
+0 −5		wurst/WPF/DockPanel.wurst
+1 −1		wurst/WPF/Frame.wurst
+1 −1		wurst/WPF/ListBox.wurst
+2 −0		wurst/WPF/TabPanel.wurst
+34 −8		wurst/_handles/Unit.wurst
+20 −8		wurst/closures/ClosureTimers.wurst
+9 −3		wurst/data/HashList.wurst
+29 −7		wurst/data/LinkedList.wurst
+52 −0		wurst/data/LinkedListTests.wurst
+142 −0		wurst/math/Quaternion.wurst
+24 −0		wurst/math/Vectors.wurst