From fc7e4c768e4fbc3c81f50162dc8fa9d1a2aae193 Mon Sep 17 00:00:00 2001
From: Owlet7 <keltic.owlet7@gmail.com>
Date: Sun, 6 Apr 2025 09:31:50 +0300
Subject: [PATCH] Use correct ID24 actors ednums

---
 wadsrc/static/mapinfo/doomitems.txt           | 101 +++++++++---------
 .../zscript/actors/doom/id24/id24tech.zs      |   4 -
 2 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/wadsrc/static/mapinfo/doomitems.txt b/wadsrc/static/mapinfo/doomitems.txt
index aa4fff87e..c754ada77 100644
--- a/wadsrc/static/mapinfo/doomitems.txt
+++ b/wadsrc/static/mapinfo/doomitems.txt
@@ -119,57 +119,6 @@ DoomEdNums
   3004 = Zombieman
   3005 = Cacodemon
   3006 = LostSoul
-  3007 = ID24Ghoul
-  3008 = ID24Banshee
-  3009 = ID24Mindweaver
-  3010 = ID24PlasmaGuy
-  3011 = ID24Vassago
-  3012 = ID24Tyrant
-  3013 = ID24TyrantBoss1
-  3014 = ID24TyrantBoss2
-  3100 = ID24GrayStalagmite
-  3101 = ID24LargeCorpsePile
-  3102 = ID24HumanBBQ1
-  3103 = ID24HumanBBQ2
-  3104 = ID24HangingBodyBothLegs
-  3105 = ID24HangingBodyBothLegsSolid
-  3106 = ID24HangingBodyCrucified
-  3107 = ID24HangingBodyCrucifiedSolid
-  3108 = ID24HangingBodyArmsBound
-  3109 = ID24HangingBodyArmsBoundSolid
-  3110 = ID24HangingBaronOfHell
-  3111 = ID24HangingBaronOfHellSolid
-  3112 = ID24HangingChainedBody
-  3113 = ID24HangingChainedBodySolid
-  3114 = ID24HangingChainedTorso
-  3115 = ID24HangingChainedTorsoSolid
-  3116 = ID24SkullPoleTrio
-  3117 = ID24SkullGibs
-  3118 = ID24BushShort
-  3119 = ID24BushShortBurned1
-  3120 = ID24BushShortBurned2
-  3121 = ID24BushTall
-  3122 = ID24BushTallBurned1
-  3123 = ID24BushTallBurned2
-  3124 = ID24CaveRockColumn
-  3125 = ID24CaveStalagmiteLarge
-  3126 = ID24CaveStalagmiteMedium
-  3127 = ID24CaveStalagmiteSmall
-  3128 = ID24CaveStalactiteLarge
-  3129 = ID24CaveStalactiteLargeSolid
-  3130 = ID24CaveStalactiteMedium
-  3131 = ID24CaveStalactiteMediumSolid
-  3132 = ID24CaveStalactiteSmall
-  3133 = ID24CaveStalactiteSmallSolid
-  3134 = ID24OfficeChair
-  3135 = ID24OfficeLamp
-  3136 = ID24LiveWire
-  3137 = ID24CeilingLamp
-  3138 = ID24CandelabraShort
-  3139 = ID24AmbientKlaxon
-  3140 = ID24AmbientPortalOpen
-  3141 = ID24AmbientPortalLoop
-  3142 = ID24AmbientPortalClose
   4001 = "$Player5Start"
   4002 = "$Player6Start"
   4003 = "$Player7Start"
@@ -200,6 +149,56 @@ DoomEdNums
   9109 = MarinePlasma
   9110 = MarineRailgun
   9111 = MarineBFG
+  -28672 = ID24Ghoul
+  -28671 = ID24Banshee
+  -28670 = ID24Mindweaver
+  -28669 = ID24PlasmaGuy
+  -28668 = ID24Vassago
+  -28667 = ID24Tyrant
+  -28666 = ID24TyrantBoss1
+  -28665 = ID24TyrantBoss2
+  -28664 = ID24GrayStalagmite
+  -28663 = ID24LargeCorpsePile
+  -28662 = ID24HumanBBQ1
+  -28661 = ID24HumanBBQ2
+  -28660 = ID24HangingBodyBothLegs
+  -28659 = ID24HangingBodyBothLegsSolid
+  -28658 = ID24HangingBodyCrucified
+  -28657 = ID24HangingBodyCrucifiedSolid
+  -28656 = ID24HangingBodyArmsBound
+  -28655 = ID24HangingBodyArmsBoundSolid
+  -28654 = ID24HangingBaronOfHell
+  -28653 = ID24HangingBaronOfHellSolid
+  -28652 = ID24HangingChainedBody
+  -28651 = ID24HangingChainedBodySolid
+  -28650 = ID24HangingChainedTorso
+  -28649 = ID24HangingChainedTorsoSolid
+  -28648 = ID24SkullPoleTrio
+  -28647 = ID24SkullGibs
+  -28646 = ID24BushShort
+  -28645 = ID24BushShortBurned1
+  -28644 = ID24BushShortBurned2
+  -28643 = ID24BushTall
+  -28642 = ID24BushTallBurned1
+  -28641 = ID24BushTallBurned2
+  -28640 = ID24CaveRockColumn
+  -28639 = ID24CaveStalagmiteLarge
+  -28638 = ID24CaveStalagmiteMedium
+  -28637 = ID24CaveStalagmiteSmall
+  -28636 = ID24CaveStalactiteLarge
+  -28635 = ID24CaveStalactiteLargeSolid
+  -28634 = ID24CaveStalactiteMedium
+  -28633 = ID24CaveStalactiteMediumSolid
+  -28632 = ID24CaveStalactiteSmall
+  -28631 = ID24CaveStalactiteSmallSolid
+  -28630 = ID24OfficeChair
+  -28629 = ID24OfficeLamp
+  -28628 = ID24CeilingLamp
+  -28627 = ID24CandelabraShort
+  -28626 = ID24AmbientKlaxon
+  -28625 = ID24AmbientPortalOpen
+  -28624 = ID24AmbientPortalLoop
+  -28623 = ID24AmbientPortalClose
   -28622 = ID24Fuel
   -28621 = ID24FuelTank
   -28620 = ID24CalamityBlade
diff --git a/wadsrc/static/zscript/actors/doom/id24/id24tech.zs b/wadsrc/static/zscript/actors/doom/id24/id24tech.zs
index b886e097e..c68fcc729 100644
--- a/wadsrc/static/zscript/actors/doom/id24/id24tech.zs
+++ b/wadsrc/static/zscript/actors/doom/id24/id24tech.zs
@@ -63,10 +63,6 @@ class ID24OfficeLamp : Actor
 	}
 }
 
-// this actor has an editor number in the decohack,
-// but it doesn't actually exist in it
-class ID24LiveWire : Actor { }
-
 class ID24CeilingLamp : Actor
 {
 	Default