Merge pull request #350 from almandite1/v0.6.4_dev

✨ Updated MOD version 0.6.4
almandite1 · Dec 18, 2021 · 3892517 · 3892517
2 parents 26919ee + fe03bc0
commit 3892517
Show file tree

Hide file tree

Showing 55 changed files with 77,948 additions and 35,804 deletions.
diff --git a/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt b/common/coat_of_arms/coat_of_arms/shgnt_dynasties.txt
@@ -3604,7 +3604,7 @@ house_shgnt_murakami_muroga={ #丸に上文字
 		instance = { position = { 0.5 0.5 } scale = { 0.9 0.9 }  }
 	}
 }
-house_shgnt_murakami_muroga=10000227
+10000227=house_shgnt_murakami_muroga
 house_shgnt_satake_yamairi={ #Satake
 	pattern = "pattern_solid.dds"	
 	color1 = "shiro"

diff --git a/content_source/map_objects/masks/tree_leaf_01_mask.png b/content_source/map_objects/masks/tree_leaf_01_mask.png
diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt
@@ -11479,13 +11479,13 @@
 		}
 		{
 			id=1918
-			position={ 4557.000000 0.000000 2818.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			position={ 4558.738770 0.000000 2844.516357 }
+			rotation={ -0.000000 -0.131938 -0.000000 0.991258 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=1919
-			position={ 4562.000000 0.000000 2827.000000 }
+			position={ 4568.215332 0.000000 2830.867188 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -11701,7 +11701,7 @@
 		}
 		{
 			id=1955
-			position={ 4542.000000 0.000000 2825.000000 }
+			position={ 4543.037598 0.000000 2831.844238 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12127,7 +12127,7 @@
 		}
 		{
 			id=2026
-			position={ 3971.722900 0.000000 2887.983154 }
+			position={ 3984.206787 0.000000 2905.878662 }
 			rotation={ -0.000000 0.239560 -0.000000 0.970882 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}

diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt
@@ -11503,13 +11503,13 @@
 		}
 		{
 			id=1918
-			position={ 4550.000000 0.000000 2816.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			position={ 4550.341797 0.000000 2827.332031 }
+			rotation={ -0.000000 0.515687 -0.000000 0.856777 }
 			scale={ 0.750000 0.750000 0.750000 }
 		}
 		{
 			id=1919
-			position={ 4557.000000 0.000000 2829.000000 }
+			position={ 4563.215332 0.000000 2832.867188 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 0.750000 0.750000 0.750000 }
 		}
@@ -11725,7 +11725,7 @@
 		}
 		{
 			id=1955
-			position={ 4535.000000 0.000000 2816.000000 }
+			position={ 4536.037598 0.000000 2822.844238 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 0.750000 0.750000 0.750000 }
 		}
@@ -12091,8 +12091,8 @@
 		}
 		{
 			id=2016
-			position={ 3993.000000 0.000000 2880.000000 }
-			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			position={ 4011.182617 0.000000 2882.967773 }
+			rotation={ -0.000000 0.076159 -0.000000 0.997096 }
 			scale={ 0.750000 0.750000 0.750000 }
 		}
 		{
@@ -12151,7 +12151,7 @@
 		}
 		{
 			id=2026
-			position={ 3979.556396 0.000000 2908.434570 }
+			position={ 3961.193115 0.000000 2908.816162 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 0.750000 0.750000 0.750000 }
 		}

diff --git a/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt b/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt
diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt
@@ -11509,7 +11509,7 @@
 		}
 		{
 			id=1919
-			position={ 4564.000000 0.000000 2818.000000 }
+			position={ 4570.215332 0.000000 2821.867188 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -11725,7 +11725,7 @@
 		}
 		{
 			id=1955
-			position={ 4543.000000 0.000000 2825.000000 }
+			position={ 4544.037598 0.000000 2831.844238 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12151,7 +12151,7 @@
 		}
 		{
 			id=2026
-			position={ 3969.531250 0.000000 2908.023926 }
+			position={ 3977.029053 0.000000 2916.832764 }
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}

diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt
@@ -11491,13 +11491,13 @@
 		}
 		{
 			id=1918
-			position={ 4556.000000 0.000000 2811.000000 }
-			rotation={ 0.000000 0.997484 0.000000 0.070889 }
+			position={ 4555.856934 0.000000 2838.045898 }
+			rotation={ -0.000000 0.979411 -0.000000 0.201876 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=1919
-			position={ 4567.000000 0.000000 2821.000000 }
+			position={ 4573.215332 0.000000 2824.867188 }
 			rotation={ 0.000000 0.940272 0.000000 -0.340425 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -11713,7 +11713,7 @@
 		}
 		{
 			id=1955
-			position={ 4538.000000 0.000000 2819.000000 }
+			position={ 4539.037598 0.000000 2825.844238 }
 			rotation={ 0.000000 0.957092 0.000000 0.289784 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -12139,7 +12139,7 @@
 		}
 		{
 			id=2026
-			position={ 3976.014648 0.000000 2882.312500 }
+			position={ 3988.498535 0.000000 2900.208008 }
 			rotation={ -0.000000 0.951457 -0.000000 -0.307782 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}

diff --git a/gfx/map/terrain/beach_02_mask.png b/gfx/map/terrain/beach_02_mask.png
diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga
diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga
diff --git a/gfx/map/terrain/farmland_01_mask.png b/gfx/map/terrain/farmland_01_mask.png
diff --git a/gfx/map/terrain/forest_leaf_01_mask.png b/gfx/map/terrain/forest_leaf_01_mask.png
diff --git a/gfx/map/terrain/hills_01_mask.png b/gfx/map/terrain/hills_01_mask.png
diff --git a/gfx/map/terrain/india_farmlands_mask.png b/gfx/map/terrain/india_farmlands_mask.png
diff --git a/gfx/map/terrain/plains_01_mask.png b/gfx/map/terrain/plains_01_mask.png
diff --git a/gfx/portraits/portrait_modifiers/02_headgear.txt b/gfx/portraits/portrait_modifiers/02_headgear.txt
@@ -346,24 +346,24 @@ headgear = {
 		}
 	}
 
-	# Reichskrone
-	hre_imperial = {
-		dna_modifiers = {
-			accessory = {
-				mode = add
-				gene = headgear
-				template = dde_hre_imperial
-				range = { 0 1 } # For the randomness to work correctly
-			}
-		}	
-		weight = {
-			base = 0
-			modifier = {
-				add = 101 # always pick the HRE crown over the western one
-				has_primary_title = title:e_hre
-			}
-		}
-	}
+#	# Reichskrone
+#	hre_imperial = {
+#		dna_modifiers = {
+#			accessory = {
+#				mode = add
+#				gene = headgear
+#				template = dde_hre_imperial
+#				range = { 0 1 } # For the randomness to work correctly
+#			}
+#		}	
+#		weight = {
+#			base = 0
+#			modifier = {
+#				add = 101 # always pick the HRE crown over the western one
+#				has_primary_title = title:e_hre
+#			}
+#		}
+#	}
 
 
 	dde_hre_war = {