Automatic harmonization of graphics raws with master files.

Modified all tilesets to match the maste files where diferences were detected in *non-display* elements. This is an automatic harmonization on changes which were detected to be safe, and constitutes approximately 30% of the detected significant, non-display differences between tilesets and the master files. The remaining ~70% of mismatches require either human intervention, or (more likely) smarter code to harmonize them.
pjf · Nov 17, 2013 · 92f48e4 · 92f48e4
1 parent 5048531
commit 92f48e4
Show file tree

Hide file tree

Showing 126 changed files with 1,328 additions and 1,153 deletions.
diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_birds.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_birds.txt
@@ -15,7 +15,7 @@ YESBIRD[OBJECT:CREATURE]
 	[BIOME:FOREST_TEMPERATE_BROADLEAF]
 	[BIOME:FOREST_TEMPERATE_CONIFER]
 	[VERMIN_GROUNDER][FREQUENCY:100]100]
-	[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-250:500]
+	[POPULATION_NUMBER:3000:3000]30000:30000]-UBIQUITOUS-250:500]
 	[SMALL_REMAINS]
 	[FLIER]
 	[CHILD:1]
@@ -492,7 +492,7 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
 	[NATURAL]
 	[LARGE_ROAMING]
 	[BIOME:OCEAN_ARCTIC]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[CLUSTER_NUMBER:5:10]
 	[PETVALUE:10]
 	[BENIGN][MEANDERER]
@@ -577,7 +577,7 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
 	[NATURAL]
 	[LARGE_ROAMING]
 	[BIOME:OCEAN_ARCTIC]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[CLUSTER_NUMBER:5:10]
 	[PETVALUE:10]
 	[BENIGN][MEANDERER]
@@ -663,7 +663,7 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
 	[NATURAL]
 	[LARGE_ROAMING]
 	[BIOME:OCEAN_ARCTIC]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[CLUSTER_NUMBER:5:10]
 	[PETVALUE:10]
 	[BENIGN][MEANDERER]
@@ -761,7 +761,7 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
 	[GO_TO_START]
 	[NAME:penguin man:penguin men:penguin man]
 	[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:A humanoid with the head, feet, and feathers of a penguin.]
-	[POPULATION_NUMBER:30:50]
+	[POPULATION_NUMBER:3000:3000]30:50]
 	[CLUSTER_NUMBER:5:10]
 	[MAXAGE:60:80]
 	[CREATURE_TILE:'p']
@@ -779,7 +779,7 @@ Penguins were sponsored by the generous contributions of the Bay 12 community.
 	[CASTE_NAME:giant penguin:giant penguins:giant penguin]
 	[GENERAL_CHILD_NAME:giant penguin chick:giant penguin chicks]
 	[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:A huge monster, shaped like a penguin.]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[CLUSTER_NUMBER:5:10]
 	[CREATURE_TILE:'P']
 	[COLOR:0:0:1]
@@ -803,7 +803,7 @@ Peregrine falcons were sponsored by the generous contributions of the Bay 12 com
 	[NAME:peregrine falcon:peregrine falcons:peregrine falcon]
 	[GENERAL_CHILD_NAME:peregrine falcon chick:peregrine falcon chicks]
 	[CREATURE_TILE:'p'][COLOR:6:0:0]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[NATURAL]
 	[LARGE_ROAMING]
 	[PETVALUE:25]
@@ -920,7 +920,7 @@ Peregrine falcons were sponsored by the generous contributions of the Bay 12 com
 	[GO_TO_START]
 	[NAME:peregrine falcon man:peregrine falcon men:peregrine falcon man]
 	[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:A person with the head and wings of a peregrine falcon.]
-	[POPULATION_NUMBER:30:50]
+	[POPULATION_NUMBER:3000:3000]30:50]
 	[CLUSTER_NUMBER:5:10]
 	[MAXAGE:60:80]
 	[CREATURE_TILE:'p']
@@ -963,8 +963,8 @@ Kiwis were sponsored by the generous contributions of the Bay 12 community.
 	[CREATURE_TILE:'k'][COLOR:6:0:0]
 	[BIOME:ANY_TEMPERATE_FOREST]
 	[BIOME:SHRUBLAND_TEMPERATE]
-	[POPULATION_NUMBER:15:30]
-	[CLUSTER_NUMBER:3:1]
+	[POPULATION_NUMBER:3000:3000]15:30]
+	[CLUSTER_NUMBER:3:6]
 	[NATURAL]
 	[LARGE_ROAMING]
 	[PETVALUE:10]
@@ -1057,7 +1057,7 @@ Kiwis were sponsored by the generous contributions of the Bay 12 community.
 	[GO_TO_START]
 	[NAME:kiwi man:kiwi men:kiwi man]
 	[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:A person with the head and feathers of a kiwi.]
-	[POPULATION_NUMBER:30:50]
+	[POPULATION_NUMBER:3000:3000]30:50]
 	[CLUSTER_NUMBER:5:10]
 	[MAXAGE:60:80]
 	[CREATURE_TILE:'k']
@@ -1106,7 +1106,7 @@ Ostriches were sponsored by the generous contributions of the Bay 12 community.
 	[BIOME:SAVANNA_TROPICAL]
 	[BIOME:GRASSLAND_TROPICAL]
 	[BIOME:ANY_DESERT]
-	[POPULATION_NUMBER:15:30]
+	[POPULATION_NUMBER:3000:3000]15:30]
 	[CLUSTER_NUMBER:3:10] should be seasonal
 	[NATURAL]
 	[LARGE_ROAMING]

diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_fish_masterwork.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_fish_masterwork.txt
@@ -1820,6 +1820,8 @@ YESFISH[OBJECT:CREATURE]
 	[BODY_DETAIL_PLAN:EXOSKELETON_TISSUE_LAYERS:CHITIN:FAT:MUSCLE]
 	[BODY_DETAIL_PLAN:STANDARD_HEAD_POSITIONS]
 	[USE_MATERIAL_TEMPLATE:SINEW:SINEW_TEMPLATE]
+	[USE_MATERIAL_TEMPLATE:SHELL:SHELL_TEMPLATE]
+	[USE_TISSUE_TEMPLATE:SHELL:SHELL_TEMPLATE]
 	[TENDONS:CREATURE_MAT:ANIMAL:SINEW:200]
 	[LIGAMENTS:CREATURE_MAT:ANIMAL:SINEW:200]
 	[HAS_NERVES]

diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_insects.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_insects.txt
@@ -239,7 +239,6 @@ creature_insects
 	[SELECT_CASTE:DRONE]
 		[BODY:INSECT:2EYES:HEART:GUTS:OUTERBRAIN:BRAIN:MOUTH:2WINGS]
 		[BODYGLOSS:INSECT_UPPERBODY:INSECT_LOWERBODY]
-		[FLIER]
 	[SELECT_CASTE:ALL]
 		[BODY_DETAIL_PLAN:CHITIN_MATERIALS]
 		[BODY_DETAIL_PLAN:CHITIN_TISSUES]

diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_large_ocean.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_large_ocean.txt
@@ -2957,7 +2957,7 @@ Narwhals were sponsored by the generous contributions of the Bay 12 community.
 
 [CREATURE:NARWHAL_GIANT]
 	[COPY_TAGS_FROM:NARWHAL]
-	[APPLY_CREATURE_VARIATION:GIANT]
+	[APPLY_CREATURE_VARIATION:GIANT][FREQUENCY:75]
 	[CV_REMOVE_TAG:CHANGE_BODY_SIZE_PERC]
 	[APPLY_CURRENT_CREATURE_VARIATION]
 	[GO_TO_END]

diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_large_riverlake.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_large_riverlake.txt
@@ -454,7 +454,7 @@ Platypuses were sponsored by the generous contributions of the Bay 12 community.
 	[FREQUENCY:100]10]
 	[BIOME:ANY_RIVER]
 	[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
-	[CLUSTER_NUMBER:3:2]
+	[CLUSTER_NUMBER:3:3]
 	[BENIGN]
 	[PREFSTRING:bizarre appearance]
 	[PREFSTRING:venomous spurs]
@@ -560,7 +560,7 @@ Platypuses were sponsored by the generous contributions of the Bay 12 community.
 
 [CREATURE:PLATYPUS, GIANT]
 	[COPY_TAGS_FROM:PLATYPUS]
-	[APPLY_CREATURE_VARIATION:GIANT]
+	[APPLY_CREATURE_VARIATION:GIANT][FREQUENCY:75]
 	[CV_REMOVE_TAG:CHANGE_BODY_SIZE_PERC]
 	[APPLY_CURRENT_CREATURE_VARIATION]
 	[GO_TO_END]
@@ -571,7 +571,7 @@ Platypuses were sponsored by the generous contributions of the Bay 12 community.
 	[GENERAL_CHILD_NAME:baby giant platypus:baby giant platypuses]
 	[CREATURE_CLASS:ALL_CREATURES][DESCRIPTION:A huge monster, the shape of a platypus.]
 	[POPULATION_NUMBER:30000:30000]-UBIQUITOUS-15:30]
-	[CLUSTER_NUMBER:3:2]
+	[CLUSTER_NUMBER:3:3]
 	[CREATURE_TILE:'P']
 	[COLOR:6:0:0]
 	[PET][CREATURE_CLASS:PET_HEALING]

diff --git a/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_small_mammals.txt b/MasterworkDwarfFortress/graphics/ASCII/raw/objects/creature_small_mammals.txt
@@ -47,7 +47,7 @@ creature_small_mammals
 	[SPEED:2900]
 	[USE_MATERIAL_TEMPLATE:BLOOD:BLOOD_TEMPLATE]
 	[BLOOD:CREATURE_MAT:ANIMAL:BLOOD:LIQUID]
-	[:GENERAL_POISON]
+	[CREATURE_CLASS:GENERAL_POISON]
 	[GETS_WOUND_INFECTIONS]
 	[GETS_INFECTIONS_FROM_ROT]
 	[USE_MATERIAL_TEMPLATE:PUS:PUS_TEMPLATE]