Merge branch 'master' into stealth-rewrite

README.md

@@ -2,14 +2,14 @@
 
 Resources are a key part of [Multi Theft Auto](https://github.com/multitheftauto). A resource is essentially a folder or zip file that contains a collection of files - including essential script and content files, plus a meta file that describes how the resource should be loaded - and runs on a Multi Theft Auto dedicated server.
 
-A resource can be seen as being partly equivalent to a program running in an operating system - it can be started and stopped, and multiple resources can run at once. Its worth remember though, that unlike programs on an operating system, there is no multi-tasking between resources. Resources generally contain content and Lua scripts for game modes, user interfaces and other tasks affecting the players that are connected to the dedicated server on which the resources are running.
+A resource can be seen as being partly equivalent to a program running in an operating system - it can be started and stopped, and multiple resources can run at once. It's worth remembering, though, that unlike programs on an operating system, there is no multi-tasking between resources. Resources generally contain content and Lua scripts for game modes, user interfaces, and other tasks affecting the players that are connected to the dedicated server on which the resources are running.
 
-This project maintains a list of up-to-date resources that come with Multi Theft Auto. These can be checked out by anyone that wishes to run a dedicated server with the latest resources.
+This project maintains a list of up-to-date resources that come with Multi Theft Auto. These can be checked out by anyone who wishes to run a dedicated server with the latest resources. To learn about every resource in this repository, visit the [Default resources Wiki Page](https://wiki.multitheftauto.com/wiki/Default_resources).
 
-For a collection of user created resources, head over to our [Community](https://community.mtasa.com) web page which serves as a place for hosting our community's resources.
+For a collection of user-created resources, head over to our [Community](https://community.mtasa.com) web page which serves as a place for hosting our community's resources.
 
-To report a bug or suggest an idea, [please submit a GitHub issue](https://github.com/multitheftauto/mtasa-resources/issues/new/choose).
+To report a bug or suggest an idea, [please submit a GitHub issue](https://github.com/multitheftauto/mtasa-resources/issues/new/choose). To understand the entire development cycle and process of this project, read the [Contributing Guide](https://github.com/multitheftauto/mtasa-docs/blob/main/mtasa-resources/CONTRIBUTING.md).
 
 ## License
 
-Unless otherwise specified, all source code hosted on this repository is licensed under the MIT license. See the LICENSE file for more details.
+Unless otherwise specified, all source code hosted in this repository is licensed under the MIT license. See the LICENSE file for more details.

[gamemodes]/[play]/play/play_config.lua

@@ -99,6 +99,5 @@ vehicleSpawns = {
 	{475, 2024.2908935547, 1506.1636962891, 10.72031211853, 270.00003051758},
 	{541, 2024.7091064453, 1499.3103027344, 10.520312309265, 270.00003051758},
 	{429, 2025.9349365234, 1490.2434082031, 10.5703125, 270.00003051758},
-	{429, 2025.6474609375, 1494.671875, 10.5703125, 270.00003051758},
-	{469, 2024.5600585938, 1623.0500488281, 12.002040863037, 270.00003051758}
+	{429, 2025.6474609375, 1494.671875, 10.5703125, 270.00003051758}
 }

[gamemodes]/[race]/race/edf/edf.lua

@@ -29,15 +29,17 @@ addEventHandler ( "onMapOpened", root,
 addEventHandler ( "onElementCreate", root,
 	function()
 		if getElementType(source) == "checkpoint" then
-			--Find the first element without a nextid
+			--Find the first non-destroyed element without a nextid
 			for i,checkpoint in ipairs(getElementsByType"checkpoint") do
-				if checkpoint ~= source and not exports.edf:edfGetElementProperty ( checkpoint, "nextid" ) then
+				if checkpoint ~= source and not exports.edf:edfGetElementProperty ( checkpoint, "nextid" ) and getElementDimension(getRepresentation(checkpoint,"marker")) == exports.editor_main:getWorkingDimension() then
 					exports.edf:edfSetElementProperty ( checkpoint, "nextid", source )
 					break
 				end
 			end
 			local marker = getRepresentation(source,"marker")
 			setMarkerIcon ( marker, "finish" )
+			-- Clear new clone checkpoint's nextid as a checkpoint is to be pointed to by only one other
+			exports.edf:edfSetElementProperty( source, "nextid", nil)
 		end
 	end
 )

[gameplay]/internetradio/handle_radio/CHandleRadio.lua

@@ -102,7 +102,7 @@ function toggleSpeakerSounds(playerElement, toggleOn)
 		speakerSounds[playerElement] = speakerNewSound
 
 		setElementInterior(speakerNewSound, speakerInterior)
-		setElementInterior(speakerNewSound, speakerDimension)
+		setElementDimension(speakerNewSound, speakerDimension)
 
 		setSoundPaused(speakerNewSound, speakerPaused)
 		setSoundMaxDistance(speakerNewSound, speakerSoundMaxDistance)
@@ -193,6 +193,8 @@ function setPlayerSpeakerData(playerElement, speakerData)
 
 	local speakerBox = speakerData.speakerBox
 	local speakerDummy = createObject(1337, 0, 0, 3)
+	local speakerBoxDimension = getElementDimension(speakerBox)
+	setElementDimension(speakerDummy, speakerBoxDimension)
 
 	speakerData.speakerDummy = speakerDummy
 	playerSpeakers[playerElement] = speakerData