From 58b555c038576146f8cf5cb715180e63a727a854 Mon Sep 17 00:00:00 2001 From: Quietust Date: Tue, 24 Jan 2023 17:49:00 -0600 Subject: [PATCH 1/5] Some entity field identifications from Putnam --- df.entities.xml | 25 +++++++++++++------------ df.world-site.xml | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/df.entities.xml b/df.entities.xml index 78a0d82b1..71252d02c 100644 --- a/df.entities.xml +++ b/df.entities.xml @@ -637,11 +637,11 @@ - - - - - + + + + + @@ -651,13 +651,14 @@ - - - - - - - + + + + + + + + diff --git a/df.world-site.xml b/df.world-site.xml index 7b57972c2..eba58f12a 100644 --- a/df.world-site.xml +++ b/df.world-site.xml @@ -1124,6 +1124,25 @@ + + + + + + + + + + + + + + + + + + + From 38a3cde55e010eddaec8dd70f9e85cf852efc2f5 Mon Sep 17 00:00:00 2001 From: Quietust Date: Tue, 24 Jan 2023 19:10:27 -0600 Subject: [PATCH 2/5] Name parleys, fix complaints, remove old guilds --- df.entities.xml | 2 +- df.jobs.xml | 10 ------ df.units.xml | 93 +++++-------------------------------------------- 3 files changed, 9 insertions(+), 96 deletions(-) diff --git a/df.entities.xml b/df.entities.xml index 71252d02c..be776162f 100644 --- a/df.entities.xml +++ b/df.entities.xml @@ -1345,7 +1345,7 @@ - + diff --git a/df.jobs.xml b/df.jobs.xml index d465bb6b1..36e5f7e41 100644 --- a/df.jobs.xml +++ b/df.jobs.xml @@ -473,16 +473,6 @@ - - - - - - - - - - diff --git a/df.units.xml b/df.units.xml index 273ace1af..3337dc32f 100644 --- a/df.units.xml +++ b/df.units.xml @@ -995,7 +995,7 @@ - + @@ -2446,93 +2446,16 @@ - - - - - - - -- 30 - - - - - - - - - - - -- 40 - - - - - - - - - - - -- 50 - - - - - - - - - - - -- 60 - - - - - - - - - - - -- 70 - - - - - - - - - - - -- 80 - - - - - - - - - - - -- 90 - - - - - + - - - - + + + + - + @@ -2541,7 +2464,7 @@ - + From 3167ef82da77bd774edb71d2661dcbbea1ae607e Mon Sep 17 00:00:00 2001 From: Quietust Date: Wed, 25 Jan 2023 20:12:07 -0600 Subject: [PATCH 3/5] Add creature/caste raw graphics --- df.creature-raws.xml | 94 +++++++++++++------------------------------- 1 file changed, 28 insertions(+), 66 deletions(-) diff --git a/df.creature-raws.xml b/df.creature-raws.xml index 78b6325c8..53101027b 100644 --- a/df.creature-raws.xml +++ b/df.creature-raws.xml @@ -1137,15 +1137,19 @@ + + + - - - + + + + @@ -1156,15 +1160,27 @@ - - + + + + + + + + + + + + - - - + + + + + + + + @@ -1226,61 +1242,7 @@ - - + From 8b4564b9a25ea524b2131ddb1d60bbf687329cec Mon Sep 17 00:00:00 2001 From: Quietust Date: Wed, 25 Jan 2023 20:45:36 -0600 Subject: [PATCH 4/5] Realign building_design and building_weaponrackst --- df.buildings.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/df.buildings.xml b/df.buildings.xml index 95c2b7d2f..46bd30597 100644 --- a/df.buildings.xml +++ b/df.buildings.xml @@ -733,9 +733,6 @@ - - - @@ -743,7 +740,6 @@ - @@ -1260,10 +1256,8 @@ - - - - + + From 7050d23387310660488b42483e6f03ba17ba6711 Mon Sep 17 00:00:00 2001 From: Quietust Date: Wed, 25 Jan 2023 21:26:35 -0600 Subject: [PATCH 5/5] Realign entity+raw --- df.entities.xml | 15 +++++---------- df.entity-raws.xml | 7 ++++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/df.entities.xml b/df.entities.xml index be776162f..888192f3b 100644 --- a/df.entities.xml +++ b/df.entities.xml @@ -763,7 +763,7 @@ - @@ -780,13 +780,12 @@ comment='includes self'/> - + - @@ -797,11 +796,6 @@ -- Civ entities. Non pointers for sites. - - - - - @@ -959,7 +953,8 @@ - + + diff --git a/df.entity-raws.xml b/df.entity-raws.xml index 5eb17343b..4ee60217d 100644 --- a/df.entity-raws.xml +++ b/df.entity-raws.xml @@ -305,10 +305,10 @@ + index-enum='entity_position_responsibility' count='43'/> + index-enum='entity_position_responsibility' count='43'/> @@ -435,6 +435,7 @@ + @@ -484,7 +485,7 @@ - +