Merge branch 'farmer-republic-Branch' into current-patch-bugfixing-dev

common/bookmarks/bookmarks/00_bookmarks.txt

@@ -45,7 +45,7 @@
 		type = male
 		birth = 2524.6.18 
 		title = k_venice
-		government = administrative_government
+		government = urbanrepublic_government
 		culture = venetian
 		religion = "roman_catholic"
 		difficulty = "BOOKMARK_CHARACTER_DIFFICULTY_MEDIUM"

common/culture/cultures/NEOW_central_germanic.txt

@@ -11,8 +11,8 @@
 		tradition_mountain_homes
 		tradition_artisans
 		tradition_storytellers
-		tradition_festivities
 		tradition_staunch_traditionalists
+		tradition_farmer_republics
 	}
 	
 	name_list = name_list_bavarian

common/culture/cultures/NEOW_italian.txt

@@ -16,6 +16,7 @@
 		tradition_culture_blending
 		tradition_stalwart_defenders
 		tradition_swords_for_hire
+		tradition_republican_legacy
 	}	
 	
 	name_list = name_list_gallo_italian
@@ -77,7 +78,7 @@ emilian = { #Emigliân
 		
 	traditions = {
 		tradition_city_keepers
-		tradition_republican_legacy
+		tradition_farmer_republics
 		tradition_culinary_art
 		tradition_agrarian
 		tradition_brewery
@@ -249,6 +250,7 @@ pugliese = {
 		tradition_culture_blending
 		tradition_agrarian
 		tradition_castle_keepers
+		tradition_republican_legacy
 	}
 	
 	name_list = name_list_italo_dalmatian
@@ -454,6 +456,7 @@ friulian  = { #Furlan
 		tradition_culture_blending
 		tradition_forbearing
 		tradition_hill_dwellers
+		tradition_farmer_republics
 	}
 	
 	name_list = name_list_gallo_italian

common/governments/00_government_types.txt

@@ -667,6 +667,7 @@ peasantrepublic_government = {
 		replenishes_county_fertility = yes
 		regiments_use_barter_goods_as_gold = yes
 		inherit_from_dynastic_government = no
+		house_aspirations = yes
 	}
 
 	can_get_government = {
@@ -721,6 +722,8 @@ peasantrepublic_government = {
 		government_uses_domain_limit
 		government_is_herder
 		government_has_herd
+		government_uses_domicile_but_not_adventurer
+		government_has_powerful_families
 		government_is_barterer
 		government_is_prepublic
 		government_locked_to_elective
@@ -754,6 +757,7 @@ urbanrepublic_government = {
 		treasury = yes
 		replace_gold_cost_by_treasury = yes
 		regiments_use_barter_goods_as_gold = yes
+		house_aspirations = yes
 	}
 
 	can_get_government = {
@@ -799,6 +803,8 @@ urbanrepublic_government = {
 		government_uses_legitimacy
 		government_uses_domain_limit
 		government_uses_monotowns
+		government_uses_domicile_but_not_adventurer
+		government_has_powerful_families
 		government_has_citizen_militia
 		government_elections_and_tax_influenced_by_influence
 		government_is_barterer

common/legitimacy/00_legitimacy.txt

@@ -4,9 +4,11 @@
 
 count_legitimacy = {
 	is_valid = {
-		highest_held_title_tier = tier_county
-		government_has_flag = government_is_prepublic
-		government_has_flag = government_is_urepublic
+		OR = {
+			highest_held_title_tier = tier_county
+			government_has_flag = government_is_prepublic
+			government_has_flag = government_is_urepublic
+		}
 		NOR = {
 			government_allows = administrative
 			government_has_flag = government_is_nomadic
@@ -101,8 +103,9 @@ count_legitimacy = {
 duke_legitimacy = {
 	is_valid = {
 		highest_held_title_tier = tier_duchy
-		NOT = {
+		NOR = {
 			government_has_flag = government_is_prepublic
+			government_has_flag = government_is_urepublic
 		}
 		NOR = {
 			government_allows = administrative
@@ -209,8 +212,9 @@ duke_legitimacy = {
 king_legitimacy = {
 	is_valid = {
 		highest_held_title_tier = tier_kingdom
-		NOT = {
+		NOR = {
 			government_has_flag = government_is_prepublic
+			government_has_flag = government_is_urepublic
 		}
 		OR = {
 			NOT = { government_allows = administrative }
@@ -316,8 +320,9 @@ king_legitimacy = {
 emperor_legitimacy = {
 	is_valid = {
 		highest_held_title_tier = tier_empire
-		NOT = {
+		NOR = {
 			government_has_flag = government_is_prepublic
+			government_has_flag = government_is_urepublic
 		}
 		NOR = { 
 			government_has_flag = government_is_nomadic
@@ -419,8 +424,9 @@ emperor_legitimacy = {
 hegemon_legitimacy = {
 	is_valid = {
 		highest_held_title_tier = tier_hegemony
-		NOT = {
+		NOR = {
 			government_has_flag = government_is_prepublic
+			government_has_flag = government_is_urepublic
 		}
 		NOT = { government_has_flag = government_is_mandala }
 		NAND = {