Merge branch 'development' into macos-crosscompile

Author: Causeless

CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Release v6.0.0] - 2024/02/11
 
 <details><summary><b>Added</b></summary>
 
@@ -58,7 +58,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	Most base explosions and Riot Shield sounds have been redone.  
 	Human actors have redone foley sounds (terrain impacts, device switching sounds) and also new subtle footstep sounds, including light and heavy variants for the various light and heavy actors.  
 	Shields now make noise when walked with.  
-	New sounds effects have been added for when helmets or armour are shot at.
+	Flesh and metal penetration sounds have been overhauled to be more varied and interesting.
 
 - New delivery system, Buy Doors:  
 	Buy doors are customizable inert background objects that can take orders either via Lua messages or by using the pie menu near them.  
@@ -183,6 +183,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	`z` is the patch number, which is currently not enforced.  
 
   Mods published for any development builds must match that development version exactly.
+  
+- Flesh and metal penetration sounds have been overhauled.
+	Base.rte wounds have been tweaked a bit to aid sound organization. Most actors now re-define their wounds inline to change the sound used, rather than having copies pre-defined in Base.rte.
+	
+	As a result, the following wounds have been removed: Dent Metal Chest Plate, Dent Metal Helmet, Wound Clothed Flesh Head, Wound Clothed Flesh Limb, Wound Clothed Flesh Torso.
+	
+	The following sounds have been removed: Armored Flesh Limb Impact.
+	
+	The following sounds have been renamed:
+	Flesh Impact Exit Sweetener -> Flesh Exit Sweetener
+	Clothed Flesh Head Impact -> Flesh Head Impact
+	Clothed Flesh Torso Impact -> Flesh Torso Impact
+	Clothed Flesh Limb Impact -> Flesh Limb Impact
+	Armored Flesh Head Impact -> Flesh Head Impact Armored
+	Armored Flesh Torso Impact -> Flesh Torso Impact Armored
+	Metal Penetration Hit -> Metal Impact Generic
+	
+	There has also been mild repathing of these newer flesh sounds but the old Steam-build ones are still in the same place.
 
 - Pressing F2 to reload scripts now also reloads the scripts for all MOs currently in the scene.
 
@@ -251,7 +269,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ***
 
-## [0.1.0 pre-release 5.0][0.1.0-pre5.0] - 2023/06/17
+## [Release v5.0.0] - 2023/06/17
 
 <details><summary><b>Added</b></summary>
 
@@ -1165,7 +1183,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 ***
 
-## [0.1.0 pre-release 4.0][0.1.0-pre4.0] - 2022/02/28
+## [Release v4.0.0] - 2022/02/28
 
 <details><summary><b>Added</b></summary>
 
@@ -1706,7 +1724,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 ***
 
-## [0.1.0 pre-release 3.0][0.1.0-pre3.0] - 2020/12/25
+## [Release v3.0.0] - 2020/12/25
 
 <details><summary><b>Added</b></summary>
 
@@ -2042,7 +2060,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 ***
 
-## [0.1.0 pre-release 2][0.1.0-pre2] - 2020/05/08
+## [Release v2.0.0] - 2020/05/08
 
 <details><summary><b>Added</b></summary>
 
@@ -2270,7 +2288,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 
 ***
 
-## [0.1.0 pre-release 1][0.1.0-pre1] - 2020/01/27
+## [Release v1.0.0] - 2020/01/27
 
 <details><summary><b>Added</b></summary>
 
@@ -2362,9 +2380,10 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 Note: For a log of changes made prior to the commencement of the open source community project, look [here.](https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/wiki/Previous-Closed-Source-Changelog)
 
 
-[unreleased]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/compare/master...cortex-command-community:development
-[0.1.0-pre1]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/tag/v0.1.0-pre1
-[0.1.0-pre2]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/tag/v0.1.0-pre2
-[0.1.0-pre3.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre3.0
-[0.1.0-pre4.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre4.0
-[0.1.0-pre5.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre5.0
+[Release v1.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/tag/v0.1.0-pre1
+[Release v2.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/tag/v0.1.0-pre2
+[Release v3.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre3.0
+[Release v4.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre4.0
+[Release v5.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/releases/tag/v0.1.0-pre5.0
+[Release v6.0.0]: https://github.com/cortex-command-community/Cortex-Command-Community-Project/releases/tag/v6.0.0
+[Unreleased]: https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/compare/master...cortex-command-community:development

Data/Base.rte/Actors/Brains/Brainbot/Brainbot.ini

@@ -329,6 +329,9 @@ AddActor = Arm
 		Y = -5
 	EntryWound = AEmitter
 		CopyOf = Leaking Machinery
+		PresetName = Brainbot Wound Entry Arm
+		BurstSound = SoundContainer
+			CopyOf = Metal Impact Limb
 	ExitWound = AEmitter
 		CopyOf = Leaking Machinery
 	AtomGroup = AtomGroup
@@ -478,6 +481,9 @@ AddActor = Leg
 		Y = -5
 	EntryWound = AEmitter
 		CopyOf = Leaking Machinery
+		PresetName = Brainbot Wound Entry Leg
+		BurstSound = SoundContainer
+			CopyOf = Metal Impact Limb
 	ExitWound = AEmitter
 		CopyOf = Leaking Machinery
 	AtomGroup = AtomGroup

Data/Base.rte/Effects/Wounds.ini

@@ -223,7 +223,7 @@ AddEffect = AEmitter
 		MaxVelocity = 5
 		MinVelocity = 1
 	BurstSound = SoundContainer
-		CopyOf = Flesh Penetration Hit
+		CopyOf = Flesh Limb Impact // definitely intended to be replaced rather than used as-is
 	EmissionEnabled = 1
 	EmissionsIgnoreThis = 1
 	BurstTriggered = 1
@@ -256,7 +256,7 @@ AddEffect = AEmitter
 		MaxVelocity = 10
 		MinVelocity = 0
 	BurstSound = SoundContainer
-		CopyOf = Flesh Impact Exit Sweetener
+		CopyOf = Flesh Exit Sweetener
 	EmissionCountLimit = 80
 	ParticlesPerMinute = 120
 	BurstSize = 9
@@ -326,7 +326,7 @@ AddEffect = AEmitter
 		MaxVelocity = 8
 		MinVelocity = 2
 	BurstSound = SoundContainer
-		CopyOf = Flesh Impact Exit Sweetener
+		CopyOf = Flesh Exit Sweetener
 	EmissionCountLimit = 480
 	BurstSize = 9
 	BurstScale = 3
@@ -341,7 +341,16 @@ AddEffect = AEmitter
 	BurstSize = 6
 	BurstDamage = 2
 	BurstSound = SoundContainer
-		CopyOf = Armored Flesh Limb Impact
+		CopyOf = Flesh Torso Impact
+		
+AddEffect = AEmitter
+	CopyOf = Wound Flesh Entry
+	PresetName = Wound Flesh Head Entry Strong
+	EmissionCountLimit = 50
+	BurstSize = 6
+	BurstDamage = 2
+	BurstSound = SoundContainer
+		CopyOf = Flesh Head Impact
 
 
 AddEffect = AEmitter
@@ -359,8 +368,6 @@ AddEffect = AEmitter
 AddEffect = AEmitter
 	CopyOf = Wound Flesh Entry
 	PresetName = Wound Flesh Entry Super
-	BurstSound = SoundContainer
-		CopyOf = Armored Flesh Limb Impact
 	EmissionCountLimit = 60
 	ParticlesPerMinute = 60
 	BurstSize = 5
@@ -410,28 +417,6 @@ AddEffect = AEmitter
 	BurstDamage = 3
 	EmissionDamage = 0.02
 
-
-AddEffect = AEmitter
-	CopyOf = Wound Flesh Entry
-	PresetName = Wound Clothed Flesh Head
-	BurstSound = SoundContainer
-		CopyOf = Clothed Flesh Head Impact
-
-
-AddEffect = AEmitter
-	CopyOf = Wound Flesh Entry
-	PresetName = Wound Clothed Flesh Limb
-	BurstSound = SoundContainer
-		CopyOf = Clothed Flesh Limb Impact
-
-
-AddEffect = AEmitter
-	CopyOf = Wound Flesh Entry
-	PresetName = Wound Clothed Flesh Torso
-	BurstSound = SoundContainer
-		CopyOf = Clothed Flesh Torso Impact
-
-
 AddEffect = AEmitter
 	PresetName = Wound Bone Entry
 	Mass = 0.0001
@@ -734,7 +719,7 @@ AddEffect = AEmitter
 //		CopyOf = Leaking Machinery
 //		LoopSetting = -1 // Means loop infinitely until stopped
 	BurstSound = SoundContainer
-		CopyOf = Metal Penetration Hit
+		CopyOf = Metal Impact Machinery
 	EmissionEnabled = 1
 	EmissionCountLimit = 60
 	EmissionsIgnoreThis = 1
@@ -758,7 +743,9 @@ AddEffect = AEmitter
 	CopyOf = Leaking Machinery Partial
 	PresetName = Leaking Machinery Light
 	EmissionDamage = 0.0003
-
+	
+AddEffect = AEmitter
+	CopyOf = Leaking Machinery
 
 AddEffect = AEmitter
 	CopyOf = Leaking Machinery
@@ -836,7 +823,7 @@ AddEffect = AEmitter
 		MaxVelocity = 8
 		MinVelocity = 4
 	BurstSound = SoundContainer
-		CopyOf = Metal Penetration Hit
+		CopyOf = Metal Impact Generic
 	EmissionEnabled = 1
 	EmissionsIgnoreThis = 1
 	ParticlesPerMinute = 0
@@ -867,22 +854,9 @@ AddEffect = AEmitter
 	ParticlesPerMinute = 120
 	EmissionCountLimit = 4
 	BurstScale = 2
-
-
+		
 AddEffect = AEmitter
 	CopyOf = Dent Metal Light
-	PresetName = Dent Metal Helmet
-	BurstSound = SoundContainer
-		CopyOf = Steel Helmet Impact
-
-
-AddEffect = AEmitter
-	CopyOf = Dent Metal Light
-	PresetName = Dent Metal Chest Plate
-	BurstSound = SoundContainer
-		CopyOf = Chest Plate Impact
-	BurstDamage = 0.3
-
 
 AddEffect = AEmitter
 	CopyOf = Dent Metal Light
@@ -894,7 +868,6 @@ AddEffect = AEmitter
 		X = 4
 		Y = 0
 
-
 AddEffect = AEmitter
 	CopyOf = Dent Metal Light
 	PresetName = Dent Metal Device
@@ -1049,7 +1022,7 @@ AddEffect = AEmitter
 //		CopyOf = Gas Leak Loop
 //		LoopSetting = -1 // Means loop infinitely until stopped
 	BurstSound = SoundContainer
-		CopyOf = Metal Penetration Hit
+		CopyOf = Metal Impact Generic
 //	EndSound = SoundContainer
 //		CopyOf = Gas Leak End
 	EmissionEnabled = 1