40.21/22/23 layouts, fix missing units

- layouts for 40.21, 40.22, 40.23 - fixes layouts for 40.20 - fixes #229 where units are sometimes excluded because DT thinks they're zombies
splintermind · Dec 26, 2014 · 356ae80 · 356ae80
1 parent aa744bd
commit 356ae80
Show file tree

Hide file tree

Showing 14 changed files with 3,618 additions and 100 deletions.
diff --git a/scripts/export-dt-ini.lua b/scripts/export-dt-ini.lua
@@ -429,27 +429,25 @@ out:write[[
 size=0
 
 [invalid_flags_1]
-size=10
-1\name=a zombie
-1\value=0x00001000
-2\name=a skeleton
-2\value=0x00002000
-3\name=a merchant
-3\value=0x00000040
-4\name=outpost liason or diplomat
-4\value=0x00000800
+size=9
+1\name=a skeleton
+1\value=0x00002000
+2\name=a merchant
+2\value=0x00000040
+3\name=outpost liason or diplomat
+3\value=0x00000800
+4\name=an invader or hostile
+4\value=0x00020000
 5\name=an invader or hostile
-5\value=0x00020000
-6\name=an invader or hostile
-6\value=0x00080000
-7\name=resident, invader or ambusher
-7\value=0x00600000
-8\name=part of a merchant caravan
-8\value=0x00000080
-9\name="Dead, Jim."
-9\value=0x00000002
-10\name=marauder
-10\value=0x00000010
+5\value=0x00080000
+6\name=resident, invader or ambusher
+6\value=0x00600000
+7\name=part of a merchant caravan
+7\value=0x00000080
+8\name="Dead, Jim."
+8\value=0x00000002
+9\name=marauder
+9\value=0x00000010
 
 [invalid_flags_2]
 size=5

diff --git a/scripts/make-dt.pl b/scripts/make-dt.pl
@@ -445,27 +445,25 @@ ($$$$)
 size=0
 
 [invalid_flags_1]
-size=10
-1\\name=a zombie
-1\\value=0x00001000
-2\\name=a skeleton
-2\\value=0x00002000
-3\\name=a merchant
-3\\value=0x00000040
-4\\name=outpost liason or diplomat
-4\\value=0x00000800
+size=9
+1\\name=a skeleton
+1\\value=0x00002000
+2\\name=a merchant
+2\\value=0x00000040
+3\\name=outpost liason or diplomat
+3\\value=0x00000800
+4\\name=an invader or hostile
+4\\value=0x00020000
 5\\name=an invader or hostile
-5\\value=0x00020000
-6\\name=an invader or hostile
-6\\value=0x00080000
-7\\name=resident, invader or ambusher
-7\\value=0x00600000
-8\\name=part of a merchant caravan
-8\\value=0x00000080
-9\\name="Dead, Jim."
-9\\value=0x00000002
-10\\name=marauder
-10\\value=0x00000010
+5\\value=0x00080000
+6\\name=resident, invader or ambusher
+6\\value=0x00600000
+7\\name=part of a merchant caravan
+7\\value=0x00000080
+8\\name="Dead, Jim."
+8\\value=0x00000002
+9\\name=marauder
+9\\value=0x00000010
 
 [invalid_flags_2]
 size=5

diff --git a/share/memory_layouts/linux/v040.20.ini b/share/memory_layouts/linux/v040.20.ini
@@ -353,27 +353,25 @@ uniform_indiv_choice=0x0020
 size=0
 
 [invalid_flags_1]
-size=10
-1\name=a zombie
-1\value=0x00001000
-2\name=a skeleton
-2\value=0x00002000
-3\name=a merchant
-3\value=0x00000040
-4\name=outpost liason or diplomat
-4\value=0x00000800
+size=9
+1\name=a skeleton
+1\value=0x00002000
+2\name=a merchant
+2\value=0x00000040
+3\name=outpost liason or diplomat
+3\value=0x00000800
+4\name=an invader or hostile
+4\value=0x00020000
 5\name=an invader or hostile
-5\value=0x00020000
-6\name=an invader or hostile
-6\value=0x00080000
-7\name=resident, invader or ambusher
-7\value=0x00600000
-8\name=part of a merchant caravan
-8\value=0x00000080
-9\name="Dead, Jim."
-9\value=0x00000002
-10\name=marauder
-10\value=0x00000010
+5\value=0x00080000
+6\name=resident, invader or ambusher
+6\value=0x00600000
+7\name=part of a merchant caravan
+7\value=0x00000080
+8\name="Dead, Jim."
+8\value=0x00000002
+9\name=marauder
+9\value=0x00000010
 
 [invalid_flags_2]
 size=5