From 9bd7fa57de74c5756fcb08ae4eb4ba02d0a83397 Mon Sep 17 00:00:00 2001
From: Nemoel-Tomo <tomo_669@hotmail.com>
Date: Mon, 15 Jun 2026 18:17:54 +0200
Subject: [PATCH 1/4] added property catalog to 4 new traps

---
 .../Catalogs/Engines/TombEngine/Moveables.xml |  3 ++
 .../TEN Property Catalogs/ID_DISK_SHOOTER.xml | 28 +++++++++++++++++++
 .../ID_FALLING_SPIKES.xml                     | 12 ++++++++
 .../Catalogs/TEN Property Catalogs/ID_FAN.xml | 12 ++++++++
 .../TEN Property Catalogs/ID_LARGE_FAN.xml    | 12 ++++++++
 5 files changed, 67 insertions(+)
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml

diff --git a/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml b/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
index de6e38246..81a703dfa 100644
--- a/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
+++ b/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
@@ -377,6 +377,9 @@
 	<moveable id="467" name="CIRCULAR_SAW" />
 	<moveable id="468" name="ROLLING_BARRELS" />
 	<moveable id="469" name="MULTIPLE_BOULDERS" />
+	<moveable id="470" name="FAN" />
+	<moveable id="471" name="LARGE_FAN" />	
+	<moveable id="472" name="FALLING_SPIKES" />	
     <moveable id="500" name="PUZZLE_ITEM1" />
     <moveable id="501" name="PUZZLE_ITEM2" />
     <moveable id="502" name="PUZZLE_ITEM3" />
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml
new file mode 100644
index 000000000..621144cf1
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml	
@@ -0,0 +1,28 @@
+<propertyCatalog>    
+	<moveable id="DISK_SHOOTER">
+        <property
+          internalName="DiskShooterPoison"
+          displayName="Poisonous Disks"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds poison damage, if checked"
+        />
+        <property
+          internalName="DiskShooterDamage"
+          displayName="Disk Harm Damage"
+          type="Int"
+          defaultValue="45"
+          category="Trap parameters"
+          description="Disk damage"
+        />
+        <property
+          internalName="DiskShooterDelay"
+          displayName="Disk Delay"
+          type="Int"
+          defaultValue="32"
+          category="Trap parameters"
+          description="Delay"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml
new file mode 100644
index 000000000..dfdddf972
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="FALLING_SPIKES">
+        <property
+          internalName="FallingSpikeForwardVelocity"
+          displayName="Forward velocity"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a slight forward movement"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml
new file mode 100644
index 000000000..42ffbf17e
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="FAN">
+        <property
+          internalName="FanDamage"
+          displayName="Fan damage"
+          type="Int"
+          defaultValue="0"
+          category="Trap parameters"
+          description="Fan damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml
new file mode 100644
index 000000000..df4017837
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="LARGE_FAN">
+        <property
+          internalName="FanDamage"
+          displayName="Fan damage"
+          type="Int"
+          defaultValue="0"
+          category="Trap parameters"
+          description="Fan damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file

From bd01af832ae7034ed359095a6119ea9b934862a0 Mon Sep 17 00:00:00 2001
From: Nemoel-Tomo <tomo_669@hotmail.com>
Date: Mon, 15 Jun 2026 18:26:17 +0200
Subject: [PATCH 2/4] fixed default damage value for fan and large fan

---
 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml       | 2 +-
 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml
index 42ffbf17e..968796d21 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml	
@@ -4,7 +4,7 @@
           internalName="FanDamage"
           displayName="Fan damage"
           type="Int"
-          defaultValue="0"
+          defaultValue="1000"
           category="Trap parameters"
           description="Fan damage"
         />
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml
index df4017837..47ff71beb 100644
--- a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml	
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml	
@@ -4,7 +4,7 @@
           internalName="FanDamage"
           displayName="Fan damage"
           type="Int"
-          defaultValue="0"
+          defaultValue="1000"
           category="Trap parameters"
           description="Fan damage"
         />

From 2c80b90736526cc54c271c853f20df46bf1725e4 Mon Sep 17 00:00:00 2001
From: Nemoel-Tomo <tomo_669@hotmail.com>
Date: Tue, 16 Jun 2026 22:38:32 +0200
Subject: [PATCH 3/4] Adding properties for more traps PR

---
 .../TEN Property Catalogs/ID_CIRCULAR_SAW.xml | 12 ++++++++
 .../TEN Property Catalogs/ID_DRILL_BIT.xml    | 12 ++++++++
 .../ID_FIRE_PENDULUM.xml                      | 28 +++++++++++++++++++
 .../TEN Property Catalogs/ID_SWINGING_BOX.xml | 12 ++++++++
 .../ID_SWINGING_IRON_ANCHOR.xml               | 12 ++++++++
 .../ID_SWINGING_SPIKE_BAG.xml                 | 12 ++++++++
 6 files changed, 88 insertions(+)
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml
 create mode 100644 TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml
new file mode 100644
index 000000000..2ed403b44
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="CIRCULAR_SAW">
+        <property
+          internalName="CircularSawSparkles"
+          displayName="Spark Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a spark effect to the saw"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml
new file mode 100644
index 000000000..d5e0ea5e2
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="DRILL_BIT">
+        <property
+          internalName="DrillBitSparkles"
+          displayName="Spark Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a spark effect to the Drill Bit"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml
new file mode 100644
index 000000000..658d170f8
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml	
@@ -0,0 +1,28 @@
+<propertyCatalog>    
+	<moveable id="DISK_SHOOTER">
+        <property
+          internalName="FirePendulumFlameMesh"
+          displayName="Flame Mesh"
+          type="Int"
+          defaultValue="4"
+          category="Trap parameters"
+          description="Mesh to display the flame effect"
+        />
+		<property 
+		  internalName="FirePendulumFlameColor"
+          displayName="Flame Color"
+          type="Color"
+          defaultValue="TEN.Color(0, 0, 0)"
+          category="Appearance"
+          description="Color tint applied to the flame effect. (0, 0, 0) = real flame color" 
+		/>
+		<property
+          internalName="FirePendulumFxFogEffect"
+          displayName="Fx Fog Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a light FX fog effect to the Pendulum"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml
new file mode 100644
index 000000000..7316c09f8
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_BOX">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml
new file mode 100644
index 000000000..cfebf166a
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_IRON_ANCHOR">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml
new file mode 100644
index 000000000..b6bc7c20e
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_SPIKE_BAG">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file

From de003b9df92132925f82e63212af09dc5fabb520 Mon Sep 17 00:00:00 2001
From: Nemoel-Tomo <tomo_669@hotmail.com>
Date: Tue, 30 Jun 2026 14:06:50 +0200
Subject: [PATCH 4/4] renamed property catalogs

---
 .../{ID_CIRCULAR_SAW.xml => CIRCULAR_SAW.xml}                     | 0
 .../{ID_DISK_SHOOTER.xml => DISK_SHOOTER.xml}                     | 0
 .../TEN Property Catalogs/{ID_DRILL_BIT.xml => DRILL_BIT.xml}     | 0
 .../{ID_FALLING_SPIKES.xml => FALLING_SPIKES.xml}                 | 0
 .../Catalogs/TEN Property Catalogs/{ID_FAN.xml => FAN.xml}        | 0
 .../{ID_FIRE_PENDULUM.xml => FIRE_PENDULUM.xml}                   | 0
 .../TEN Property Catalogs/{ID_LARGE_FAN.xml => LARGE_FAN.xml}     | 0
 .../{ID_SWINGING_BOX.xml => SWINGING_BOX.xml}                     | 0
 .../{ID_SWINGING_IRON_ANCHOR.xml => SWINGING_IRON_ANCHOR.xml}     | 0
 .../{ID_SWINGING_SPIKE_BAG.xml => SWINGING_SPIKE_BAG.xml}         | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_CIRCULAR_SAW.xml => CIRCULAR_SAW.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_DISK_SHOOTER.xml => DISK_SHOOTER.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_DRILL_BIT.xml => DRILL_BIT.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_FALLING_SPIKES.xml => FALLING_SPIKES.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_FAN.xml => FAN.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_FIRE_PENDULUM.xml => FIRE_PENDULUM.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_LARGE_FAN.xml => LARGE_FAN.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_SWINGING_BOX.xml => SWINGING_BOX.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_SWINGING_IRON_ANCHOR.xml => SWINGING_IRON_ANCHOR.xml} (100%)
 rename TombLib/TombLib/Catalogs/TEN Property Catalogs/{ID_SWINGING_SPIKE_BAG.xml => SWINGING_SPIKE_BAG.xml} (100%)

diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/CIRCULAR_SAW.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_CIRCULAR_SAW.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/CIRCULAR_SAW.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DISK_SHOOTER.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DISK_SHOOTER.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/DISK_SHOOTER.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DRILL_BIT.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_DRILL_BIT.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/DRILL_BIT.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FALLING_SPIKES.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FALLING_SPIKES.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/FALLING_SPIKES.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FAN.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FAN.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/FAN.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FIRE_PENDULUM.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_FIRE_PENDULUM.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/FIRE_PENDULUM.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/LARGE_FAN.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_LARGE_FAN.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/LARGE_FAN.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_BOX.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_BOX.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_BOX.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_IRON_ANCHOR.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_IRON_ANCHOR.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_IRON_ANCHOR.xml
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_SPIKE_BAG.xml
similarity index 100%
rename from TombLib/TombLib/Catalogs/TEN Property Catalogs/ID_SWINGING_SPIKE_BAG.xml
rename to TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_SPIKE_BAG.xml