From 9101ccfb703ab1c346871beb8196bb129227d16e Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Sun, 7 Jun 2026 22:19:08 +0100
Subject: [PATCH 01/16] Create ID_SPEEDBOAT.xml

---
 .../TR2/ID_SPEEDBOAT.xml                      | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml
new file mode 100644
index 000000000..e2d03a678
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<propertyCatalog>
+  <moveable id="55">
+		<property
+		  internalName="SpeedboatMist"
+		  displayName="Render mist"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Speedboat Mist"
+		  description="Add mist effect."
+		/>
+		<property
+		  internalName="SpeedboatMistStartColor"
+		  displayName="Mist start color"
+		  type="Color"
+		  defaultValue="0,0,0"
+		  category="Speedboat Mist"
+		  description="Starting color of mist particles."
+		/>
+		<property
+		  internalName="SpeedboatMistEndColor"
+		  displayName="Mist end color"
+		  type="Color"
+		  defaultValue="64,64,64"
+		  category="Speedboat Mist"
+		  description="Ending color of mist particles."
+		/>
+		<property
+		  internalName="SpeedboatMistLife"
+		  displayName="Mist life"
+		  type="Float"
+		  defaultValue="20"
+		  category="Speedboat Mist"
+		  description="Determines the lifespan length of a particle."
+		/>
+		<property
+		  internalName="SpeedboatFoam"
+		  displayName="Render foam"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Speedboat Foam"
+		  description="Add foam effect"
+		/>
+		<property
+		  internalName="SpeedboatWake"
+		  displayName="Render wake"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Speedboat Wake"
+		  description="Add wake effect"
+		/>
+	</moveable>
+</propertyCatalog>
\ No newline at end of file

From 4aac2ebafbe059b719e19be0e2e891002d3dd460 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Mon, 8 Jun 2026 02:47:13 +0100
Subject: [PATCH 02/16] Move file to dedicated `Vehicles` folder

---
 .../TEN Property Catalogs/{TR2 => Vehicles}/ID_SPEEDBOAT.xml      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{TR2 => Vehicles}/ID_SPEEDBOAT.xml (100%)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/TR2/ID_SPEEDBOAT.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml

From 5077f2b7ea228cbcfe4cf303e505235052346890 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Tue, 9 Jun 2026 08:06:08 +0100
Subject: [PATCH 03/16] Add shared vehicle properties / removed particle life
 property

---
 .../Vehicles/ID_SPEEDBOAT.xml                 | 18 ++---------
 .../Vehicles/Vehicles_Shared.xml              | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml
index e2d03a678..151293b76 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml	
@@ -14,6 +14,7 @@
 		  displayName="Mist start color"
 		  type="Color"
 		  defaultValue="0,0,0"
+		  hasAlpha = "true"
 		  category="Speedboat Mist"
 		  description="Starting color of mist particles."
 		/>
@@ -22,17 +23,10 @@
 		  displayName="Mist end color"
 		  type="Color"
 		  defaultValue="64,64,64"
+		  hasAlpha = "true"
 		  category="Speedboat Mist"
 		  description="Ending color of mist particles."
 		/>
-		<property
-		  internalName="SpeedboatMistLife"
-		  displayName="Mist life"
-		  type="Float"
-		  defaultValue="20"
-		  category="Speedboat Mist"
-		  description="Determines the lifespan length of a particle."
-		/>
 		<property
 		  internalName="SpeedboatFoam"
 		  displayName="Render foam"
@@ -41,13 +35,5 @@
 		  category="Speedboat Foam"
 		  description="Add foam effect"
 		/>
-		<property
-		  internalName="SpeedboatWake"
-		  displayName="Render wake"
-		  type="Bool"
-		  defaultValue="false"
-		  category="Speedboat Wake"
-		  description="Add wake effect"
-		/>
 	</moveable>
 </propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml
new file mode 100644
index 000000000..5389f0d7e
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<propertyCatalog>
+  <moveable id="51,53,55,57,59,61,63,65,67">
+  		<property
+		  internalName="VehicleWake"
+		  displayName="Render wake"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Vehicle Wake"
+		  description="Add wake effect"
+		/>
+		<property
+		  internalName="WakeStartColor"
+		  displayName="Wake start color"
+		  type="Color"
+		  defaultValue="191,191,191,191"
+		  hasAlpha = "true"
+		  category="Vehicle Wake"
+		  description="Vehicle wake starting color."
+		/>
+		<property
+		  internalName="WakeEndColor"
+		  displayName="Wake end color"
+		  type="Color"
+		  defaultValue="0,0,0,0"
+		  hasAlpha = "true"
+		  category="Vehicle Wake"
+		  description="Vehicle wake ending color."
+		/>
+	</moveable>
+</propertyCatalog>
\ No newline at end of file

From b71c18408fc01607f81830afe47d005212b03cda Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Tue, 9 Jun 2026 09:07:58 +0100
Subject: [PATCH 04/16] Add vehicle properties to global folder

global folder introduced in another PR.
---
 .../TEN Property Catalogs/Global/Vehicles.xml | 75 +++++++++++++++++++
 .../Vehicles/ID_SPEEDBOAT.xml                 | 39 ----------
 .../Vehicles/Vehicles_Shared.xml              | 31 --------
 TombLib/TombLib/TombLib.csproj                |  3 +
 4 files changed, 78 insertions(+), 70 deletions(-)
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
 delete mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml
 delete mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
new file mode 100644
index 000000000..8a7c42c48
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<propertyCatalog>
+  <moveable id="51,53,55,57,59,61,63,65,67">
+  		<property
+		  internalName="VehicleWake"
+		  displayName="Render wake"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Vehicle Effects"
+		  description="Add wake effect"
+		/>
+		<property
+		  internalName="WakeStartColor"
+		  displayName="Wake start color"
+		  type="Color"
+		  defaultValue="191,191,191,191"
+		  hasAlpha = "true"
+		  category="Vehicle Effects"
+		  description="Vehicle wake starting color."
+		/>
+		<property
+		  internalName="WakeEndColor"
+		  displayName="Wake end color"
+		  type="Color"
+		  defaultValue="0,0,0,0"
+		  hasAlpha = "true"
+		  category="Vehicle Effects"
+		  description="Vehicle wake ending color."
+		/>
+	</moveable>
+	<moveable id="55">
+		<property
+		  internalName="VehicleMist"
+		  displayName="Render mist"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Vehicle Effects"
+		  description="Add mist effect."
+		/>
+		<property
+		  internalName="VehicleMistStartColor"
+		  displayName="Mist start color"
+		  type="Color"
+		  defaultValue="0,0,0"
+		  hasAlpha = "true"
+		  category="Vehicle Effects"
+		  description="Starting color of mist particles."
+		/>
+		<property
+		  internalName="VehicleMistEndColor"
+		  displayName="Mist end color"
+		  type="Color"
+		  defaultValue="64,64,64"
+		  hasAlpha = "true"
+		  category="Vehicle Effects"
+		  description="Ending color of mist particles."
+		/>
+		<property
+		  internalName="VehicleFoam"
+		  displayName="Render foam"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Vehicle Effects"
+		  description="Add foam effect"
+		/>
+		<property
+		  internalName="VehicleVelocity"
+		  displayName="Speed modifier"
+		  type="Int"
+		  defaultValue="110"
+		  category="Vehicle Control"
+		  description="Modify the overall speed."
+		/>
+	</moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml
deleted file mode 100644
index 151293b76..000000000
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/ID_SPEEDBOAT.xml	
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<propertyCatalog>
-  <moveable id="55">
-		<property
-		  internalName="SpeedboatMist"
-		  displayName="Render mist"
-		  type="Bool"
-		  defaultValue="false"
-		  category="Speedboat Mist"
-		  description="Add mist effect."
-		/>
-		<property
-		  internalName="SpeedboatMistStartColor"
-		  displayName="Mist start color"
-		  type="Color"
-		  defaultValue="0,0,0"
-		  hasAlpha = "true"
-		  category="Speedboat Mist"
-		  description="Starting color of mist particles."
-		/>
-		<property
-		  internalName="SpeedboatMistEndColor"
-		  displayName="Mist end color"
-		  type="Color"
-		  defaultValue="64,64,64"
-		  hasAlpha = "true"
-		  category="Speedboat Mist"
-		  description="Ending color of mist particles."
-		/>
-		<property
-		  internalName="SpeedboatFoam"
-		  displayName="Render foam"
-		  type="Bool"
-		  defaultValue="false"
-		  category="Speedboat Foam"
-		  description="Add foam effect"
-		/>
-	</moveable>
-</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml
deleted file mode 100644
index 5389f0d7e..000000000
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Vehicles/Vehicles_Shared.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<propertyCatalog>
-  <moveable id="51,53,55,57,59,61,63,65,67">
-  		<property
-		  internalName="VehicleWake"
-		  displayName="Render wake"
-		  type="Bool"
-		  defaultValue="false"
-		  category="Vehicle Wake"
-		  description="Add wake effect"
-		/>
-		<property
-		  internalName="WakeStartColor"
-		  displayName="Wake start color"
-		  type="Color"
-		  defaultValue="191,191,191,191"
-		  hasAlpha = "true"
-		  category="Vehicle Wake"
-		  description="Vehicle wake starting color."
-		/>
-		<property
-		  internalName="WakeEndColor"
-		  displayName="Wake end color"
-		  type="Color"
-		  defaultValue="0,0,0,0"
-		  hasAlpha = "true"
-		  category="Vehicle Wake"
-		  description="Vehicle wake ending color."
-		/>
-	</moveable>
-</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/TombLib.csproj b/TombLib/TombLib/TombLib.csproj
index afdb8c8ba..f853928f3 100644
--- a/TombLib/TombLib/TombLib.csproj
+++ b/TombLib/TombLib/TombLib.csproj
@@ -426,6 +426,9 @@
     <None Update="Catalogs\Engines\TR5\States.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Catalogs\TEN Property Catalogs\Global\Vehicles.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Catalogs\Engines\TRNG\CLICK_DISTANCE_32.txt">

From 0672a837561c91363a95fd4ce8c4820f21b1c658 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 11:32:30 +0100
Subject: [PATCH 05/16] Update defaultValue / add speed modifier

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 8a7c42c48..0772f5824 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -13,7 +13,7 @@
 		  internalName="WakeStartColor"
 		  displayName="Wake start color"
 		  type="Color"
-		  defaultValue="191,191,191,191"
+		  defaultValue="TEN.Color(191,191,191,191)"
 		  hasAlpha = "true"
 		  category="Vehicle Effects"
 		  description="Vehicle wake starting color."
@@ -22,11 +22,19 @@
 		  internalName="WakeEndColor"
 		  displayName="Wake end color"
 		  type="Color"
-		  defaultValue="0,0,0,0"
+		  defaultValue="TEN.Color(0,0,0,0)"
 		  hasAlpha = "true"
 		  category="Vehicle Effects"
 		  description="Vehicle wake ending color."
 		/>
+		<property
+		  internalName="VehicleVelocity"
+		  displayName="Speed modifier"
+		  type="Int"
+		  defaultValue="110"
+		  category="Vehicle Control"
+		  description="Modify the overall speed."
+		/>
 	</moveable>
 	<moveable id="55">
 		<property
@@ -41,8 +49,7 @@
 		  internalName="VehicleMistStartColor"
 		  displayName="Mist start color"
 		  type="Color"
-		  defaultValue="0,0,0"
-		  hasAlpha = "true"
+		  defaultValue="TEN.Color(0,0,0)"
 		  category="Vehicle Effects"
 		  description="Starting color of mist particles."
 		/>
@@ -50,8 +57,7 @@
 		  internalName="VehicleMistEndColor"
 		  displayName="Mist end color"
 		  type="Color"
-		  defaultValue="64,64,64"
-		  hasAlpha = "true"
+		  defaultValue="TEN.Color(64,64,64)"
 		  category="Vehicle Effects"
 		  description="Ending color of mist particles."
 		/>
@@ -63,13 +69,5 @@
 		  category="Vehicle Effects"
 		  description="Add foam effect"
 		/>
-		<property
-		  internalName="VehicleVelocity"
-		  displayName="Speed modifier"
-		  type="Int"
-		  defaultValue="110"
-		  category="Vehicle Control"
-		  description="Modify the overall speed."
-		/>
 	</moveable>
 </propertyCatalog>
\ No newline at end of file

From 3aca20e44bde6666e28bc573032246700aed0053 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 12:15:13 +0100
Subject: [PATCH 06/16] Remove speed modifier

---
 .../TEN Property Catalogs/Global/Vehicles.xml       | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 0772f5824..570ce26c8 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -5,7 +5,7 @@
 		  internalName="VehicleWake"
 		  displayName="Render wake"
 		  type="Bool"
-		  defaultValue="false"
+		  defaultValue="true"
 		  category="Vehicle Effects"
 		  description="Add wake effect"
 		/>
@@ -27,21 +27,14 @@
 		  category="Vehicle Effects"
 		  description="Vehicle wake ending color."
 		/>
-		<property
-		  internalName="VehicleVelocity"
-		  displayName="Speed modifier"
-		  type="Int"
-		  defaultValue="110"
-		  category="Vehicle Control"
-		  description="Modify the overall speed."
-		/>
 	</moveable>
+	
 	<moveable id="55">
 		<property
 		  internalName="VehicleMist"
 		  displayName="Render mist"
 		  type="Bool"
-		  defaultValue="false"
+		  defaultValue="true"
 		  category="Vehicle Effects"
 		  description="Add mist effect."
 		/>

From f47a5f626c1b826e8e85e7ba4c77f8f212f7b430 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 12:53:27 +0100
Subject: [PATCH 07/16] Add mist effect property for rubberboat

---
 .../Catalogs/TEN Property Catalogs/Global/Vehicles.xml     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 570ce26c8..a80b8dcac 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -29,7 +29,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="55">
+	<moveable id="55,67">
 		<property
 		  internalName="VehicleMist"
 		  displayName="Render mist"
@@ -45,7 +45,7 @@
 		  defaultValue="TEN.Color(0,0,0)"
 		  category="Vehicle Effects"
 		  description="Starting color of mist particles."
-		/>
+		/>		
 		<property
 		  internalName="VehicleMistEndColor"
 		  displayName="Mist end color"
@@ -54,6 +54,9 @@
 		  category="Vehicle Effects"
 		  description="Ending color of mist particles."
 		/>
+	</moveable>
+	
+	<moveable id="55">
 		<property
 		  internalName="VehicleFoam"
 		  displayName="Render foam"

From e57f1c130ffd0f5e36ff7fe40c28013ac69064a5 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 13:34:16 +0100
Subject: [PATCH 08/16] Add UPV mist property

---
 .../TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index a80b8dcac..65e8846bf 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -29,7 +29,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="55,67">
+	<moveable id="55,59,67">
 		<property
 		  internalName="VehicleMist"
 		  displayName="Render mist"

From 5f055a76dea52c8802af34329932e14ef5a0182f Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 15:01:51 +0100
Subject: [PATCH 09/16] Add light color and intensity properties for UPV

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 65e8846bf..ac1032e76 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -56,6 +56,33 @@
 		/>
 	</moveable>
 	
+	<moveable id="59">
+		<property
+		  internalName="VehicleLight"
+		  displayName="Render light"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Effects"
+		  description="Render light"
+		/>
+		<property
+		  internalName="VehicleLightColor"
+		  displayName="Light color"
+		  type="Color"
+		  defaultValue="TEN.Color(255,255,255,255)"
+		  category="Vehicle Effects"
+		  description="Light color"
+		/>
+		<property
+		  internalName="VehicleLightIntensity"
+		  displayName="Light intensity"
+		  type="Float"
+		  defaultValue="0.5"
+		  category="Vehicle Effects"
+		  description="Light intensity"
+		/>
+	</moveable>
+	
 	<moveable id="55">
 		<property
 		  internalName="VehicleFoam"

From 0f0d0bbfe4bff8605af784d8f23f3c39419023df Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 22:09:58 +0100
Subject: [PATCH 10/16] Add Light radius / falloff / distance  / shadow
 property

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index ac1032e76..ed67e0581 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -62,7 +62,7 @@
 		  displayName="Render light"
 		  type="Bool"
 		  defaultValue="true"
-		  category="Vehicle Effects"
+		  category="Vehicle Light"
 		  description="Render light"
 		/>
 		<property
@@ -70,7 +70,7 @@
 		  displayName="Light color"
 		  type="Color"
 		  defaultValue="TEN.Color(255,255,255,255)"
-		  category="Vehicle Effects"
+		  category="Vehicle Light"
 		  description="Light color"
 		/>
 		<property
@@ -78,9 +78,41 @@
 		  displayName="Light intensity"
 		  type="Float"
 		  defaultValue="0.5"
-		  category="Vehicle Effects"
+		  category="Vehicle Light"
 		  description="Light intensity"
 		/>
+		<property
+		  internalName="VehicleLightRadius"
+		  displayName="Light radius"
+		  type="Int"
+		  defaultValue="4"
+		  category="Vehicle Light"
+		  description="Light radius (in blocks)"
+		/>
+		<property
+		  internalName="VehicleLightFalloff"
+		  displayName="Light falloff"
+		  type="Int"
+		  defaultValue="2"
+		  category="Vehicle Light"
+		  description="Light falloff (in blocks)"
+		/>
+		<property
+		  internalName="VehicleLightDistance"
+		  displayName="Light distance"
+		  type="Int"
+		  defaultValue="10"
+		  category="Vehicle Light"
+		  description="Light distance (in blocks)"
+		/>
+		<property
+		  internalName="VehicleLightCastShadow"
+		  displayName="Light shadow cast"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Light"
+		  description="Determines whether the vehicle light casts a dynamic shadow"
+		/>
 	</moveable>
 	
 	<moveable id="55">

From e49abf54959f8354cca9340faae1def988ac63de Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Thu, 11 Jun 2026 22:49:06 +0100
Subject: [PATCH 11/16] Add quadbike smoke start/end color properties

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index ed67e0581..11225a5fd 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -56,6 +56,25 @@
 		/>
 	</moveable>
 	
+	<moveable id="53">
+		<property
+		  internalName="VehicleSmokeStartColor"
+		  displayName="Exhaust start color"
+		  type="Color"
+		  defaultValue="TEN.Color(0,0,0)"
+		  category="Vehicle Effects"
+		  description="Vehicle exhaust particle starting color."
+		/>
+		<property
+		  internalName="VehicleSmokeEndColor"
+		  displayName="Exhaust end color"
+		  type="Color"
+		  defaultValue="TEN.Color(64,64,64)"
+		  category="Vehicle Effects"
+		  description="Vehicle exhaust particle ending color."
+		/>
+	</moveable>
+	
 	<moveable id="59">
 		<property
 		  internalName="VehicleLight"

From c912196ff11ebc94b2915078a6b58f7f82674b08 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Mon, 15 Jun 2026 09:29:38 +0100
Subject: [PATCH 12/16] Use slot names instead of indexes

---
 .../Catalogs/TEN Property Catalogs/Global/Vehicles.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 11225a5fd..3945c5f48 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <propertyCatalog>
-  <moveable id="51,53,55,57,59,61,63,65,67">
+  <moveable id="SNOWMOBILE,QUAD,SPEEDBOAT,KAYAK,UPV,MINECART,JEEP,MOTORBIKE,RUBBER_BOAT">
   		<property
 		  internalName="VehicleWake"
 		  displayName="Render wake"
@@ -29,7 +29,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="55,59,67">
+	<moveable id="SPEEDBOAT,UPV,RUBBER_BOAT">
 		<property
 		  internalName="VehicleMist"
 		  displayName="Render mist"
@@ -56,7 +56,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="53">
+	<moveable id="QUAD">
 		<property
 		  internalName="VehicleSmokeStartColor"
 		  displayName="Exhaust start color"
@@ -75,7 +75,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="59">
+	<moveable id="UPV">
 		<property
 		  internalName="VehicleLight"
 		  displayName="Render light"
@@ -134,7 +134,7 @@
 		/>
 	</moveable>
 	
-	<moveable id="55">
+	<moveable id="SPEEDBOAT">
 		<property
 		  internalName="VehicleFoam"
 		  displayName="Render foam"

From e73a0c594f908eaf549dc8f7b7fa18e75be811a5 Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Mon, 15 Jun 2026 15:58:54 +0100
Subject: [PATCH 13/16] Add motorbike light parameters / renames

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 116 ++++++++++++++++--
 1 file changed, 104 insertions(+), 12 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 3945c5f48..eac79cb2e 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -77,23 +77,34 @@
 	
 	<moveable id="UPV">
 		<property
-		  internalName="VehicleLight"
-		  displayName="Render light"
-		  type="Bool"
-		  defaultValue="true"
+		  internalName="UPVLightColor"
+		  displayName="Light color"
+		  type="Color"
+		  defaultValue="TEN.Color(255,255,255,255)"
 		  category="Vehicle Light"
-		  description="Render light"
+		  description="Light color"
+		/>
+		<property
+		  internalName="UPVLightIntensity"
+		  displayName="Light intensity"
+		  type="Float"
+		  defaultValue="0.5"
+		  category="Vehicle Light"
+		  description="Light intensity"
 		/>
+	</moveable>
+	
+	<moveable id="UPV">
 		<property
-		  internalName="VehicleLightColor"
+		  internalName="UPVLightColor"
 		  displayName="Light color"
 		  type="Color"
-		  defaultValue="TEN.Color(255,255,255,255)"
+		  defaultValue="TEN.Color(255,255,255)"
 		  category="Vehicle Light"
 		  description="Light color"
 		/>
 		<property
-		  internalName="VehicleLightIntensity"
+		  internalName="UPVLightIntensity"
 		  displayName="Light intensity"
 		  type="Float"
 		  defaultValue="0.5"
@@ -101,31 +112,112 @@
 		  description="Light intensity"
 		/>
 		<property
-		  internalName="VehicleLightRadius"
+		  internalName="UPVLight"
+		  displayName="Render light"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Light"
+		  description="Render light"
+		/>
+		<property
+		  internalName="UPVLightRadius"
 		  displayName="Light radius"
 		  type="Int"
 		  defaultValue="4"
+		  minValue = "0"
+		  maxValue = "10"
 		  category="Vehicle Light"
 		  description="Light radius (in blocks)"
 		/>
 		<property
-		  internalName="VehicleLightFalloff"
+		  internalName="UPVLightFalloff"
 		  displayName="Light falloff"
 		  type="Int"
 		  defaultValue="2"
+		  minValue = "0"
+		  maxValue = "10"
 		  category="Vehicle Light"
 		  description="Light falloff (in blocks)"
 		/>
 		<property
-		  internalName="VehicleLightDistance"
+		  internalName="UPVLightDistance"
 		  displayName="Light distance"
 		  type="Int"
 		  defaultValue="10"
+		  minValue = "0"
+		  maxValue = "100"
+		  category="Vehicle Light"
+		  description="Light distance (in blocks)"
+		/>
+		<property
+		  internalName="UPVLightCastShadow"
+		  displayName="Light shadow cast"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Light"
+		  description="Determines whether the vehicle light casts a dynamic shadow"
+		/>
+	</moveable>
+	
+	<moveable id="MOTORBIKE">
+		<property
+		  internalName="MotorbikeLightColor"
+		  displayName="Headlight color"
+		  type="Color"
+		  defaultValue="TEN.Color(255,170,0)"
+		  category="Vehicle Light"
+		  description="Light color"
+		/>
+		<property
+		  internalName="MotorbikeLightIntensity"
+		  displayName="Headlight intensity"
+		  type="Float"
+		  minValue = "0"
+		  maxValue = "2.0"
+		  defaultValue="1.0"
+		  category="Vehicle Light"
+		  description="Light intensity"
+		/>
+		<property
+		  internalName="MotorbikeLight"
+		  displayName="Render light"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Light"
+		  description="Render light"
+		/>
+		<property
+		  internalName="MotorbikeLightRadius"
+		  displayName="Headlight radius"
+		  type="Int"
+		  defaultValue="4"
+		  minValue = "0"
+		  maxValue = "10"
+		  category="Vehicle Light"
+		  description="Light radius (in blocks)"
+		/>
+		<property
+		  internalName="MotorbikeLightFalloff"
+		  displayName="Headlight falloff"
+		  type="Int"
+		  defaultValue="2"
+		  minValue = "0"
+		  maxValue = "10"
+		  category="Vehicle Light"
+		  description="Light falloff (in blocks)"
+		/>
+		<property
+		  internalName="MotorbikeLightDistance"
+		  displayName="Headlight distance"
+		  type="Int"
+		  defaultValue="10"
+		  minValue = "0"
+		  maxValue = "100"
 		  category="Vehicle Light"
 		  description="Light distance (in blocks)"
 		/>
 		<property
-		  internalName="VehicleLightCastShadow"
+		  internalName="MotorbikeLightCastShadow"
 		  displayName="Light shadow cast"
 		  type="Bool"
 		  defaultValue="true"

From 0d509f3f760180f39e49ba82c3b2e4a8cd9c8e0a Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Mon, 15 Jun 2026 17:29:26 +0100
Subject: [PATCH 14/16] Add Jeep headlight and properties

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index eac79cb2e..74a560d02 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -226,6 +226,73 @@
 		/>
 	</moveable>
 	
+	<moveable id="JEEP">
+		<property
+		  internalName="JeepLightColor"
+		  displayName="Headlight color"
+		  type="Color"
+		  defaultValue="TEN.Color(200,200,200)"
+		  category="Vehicle Light"
+		  description="Light color"
+		/>
+		<property
+		  internalName="JeepLightIntensity"
+		  displayName="Headlight intensity"
+		  type="Float"
+		  minValue = "0"
+		  maxValue = "2.0"
+		  defaultValue="1.0"
+		  category="Vehicle Light"
+		  description="Light intensity"
+		/>
+		<property
+		  internalName="JeepLight"
+		  displayName="Render headlight"
+		  type="Bool"
+		  defaultValue="false"
+		  category="Vehicle Light"
+		  description="Render light"
+		/>
+		<property
+		  internalName="JeepLightRadius"
+		  displayName="Headlight radius"
+		  type="Int"
+		  defaultValue="4"
+		  minValue = "0"
+		  maxValue = "10"
+		  category="Vehicle Light"
+		  description="Light radius (in blocks)"
+		/>
+		<property
+		  internalName="JeepLightFalloff"
+		  displayName="Headlight falloff"
+		  type="Int"
+		  defaultValue="2"
+		  minValue = "0"
+		  maxValue = "10"
+		  category="Vehicle Light"
+		  description="Light falloff (in blocks)"
+		/>
+		<property
+		  internalName="JeepLightDistance"
+		  displayName="Headlight distance"
+		  type="Int"
+		  defaultValue="10"
+		  minValue = "0"
+		  maxValue = "100"
+		  category="Vehicle Light"
+		  description="Light distance (in blocks)"
+		/>
+		<property
+		  internalName="JeepLightCastShadow"
+		  displayName="Light shadow cast"
+		  type="Bool"
+		  defaultValue="true"
+		  category="Vehicle Light"
+		  description="Determines whether the vehicle light casts a dynamic shadow"
+		/>
+	</moveable>
+	
 	<moveable id="SPEEDBOAT">
 		<property
 		  internalName="VehicleFoam"

From a4c4c26721724ad7d01c27575f9683c857cf27de Mon Sep 17 00:00:00 2001
From: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date: Mon, 15 Jun 2026 18:17:39 +0100
Subject: [PATCH 15/16] Remove duplicated properties

---
 .../TEN Property Catalogs/Global/Vehicles.xml | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml
index 74a560d02..e798b2ab5 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/Global/Vehicles.xml	
@@ -75,25 +75,6 @@
 		/>
 	</moveable>
 	
-	<moveable id="UPV">
-		<property
-		  internalName="UPVLightColor"
-		  displayName="Light color"
-		  type="Color"
-		  defaultValue="TEN.Color(255,255,255,255)"
-		  category="Vehicle Light"
-		  description="Light color"
-		/>
-		<property
-		  internalName="UPVLightIntensity"
-		  displayName="Light intensity"
-		  type="Float"
-		  defaultValue="0.5"
-		  category="Vehicle Light"
-		  description="Light intensity"
-		/>
-	</moveable>
-	
 	<moveable id="UPV">
 		<property
 		  internalName="UPVLightColor"

From aee8562eb121de5759593cf0e17a4cf21701e493 Mon Sep 17 00:00:00 2001
From: MontyTRC89 <montyhammet@hotmail.it>
Date: Thu, 2 Jul 2026 14:29:58 +0200
Subject: [PATCH 16/16] Fixed TombLib merge conflict

---
 TombLib/TombLib/TombLib.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/TombLib/TombLib/TombLib.csproj b/TombLib/TombLib/TombLib.csproj
index fe06d1352..7d5029ec8 100644
--- a/TombLib/TombLib/TombLib.csproj
+++ b/TombLib/TombLib/TombLib.csproj
@@ -426,11 +426,10 @@
     <None Update="Catalogs\Engines\TR5\States.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-<<<<<<< Properties-Vehicles-TR2
     <None Update="Catalogs\TEN Property Catalogs\Global\Vehicles.xml">
-=======
+	  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Catalogs\TEN Property Catalogs\Global\HitPoints.xml">
->>>>>>> develop
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>