merge:

ACR_Changelog.txt

@@ -9,6 +9,29 @@ General:
 Hellenic:
  - Dionysian Mysteries
 
+
+2017-09-03 v0.40.4 "Asteria 2"
+-------------------------
+
+General:
+ - Resolves bug where tribal characters would usurp county titles in their de jure kingdom, turn feudal, and all holdings would be destroyed.
+
+
+2017-09-02 v0.40.3 "Asteria"
+-------------------------
+> Asteria "the starry one" was the titan of falling stars and nocturnal oracles and the daughter of Coeus and Pheobe, her sister was Leto. Unlike her husband, Asteria has several stories attributed to her. One such tale describes her flight from the advances of Zeus; she transformed into a quail and dived into the ocean, where she became an island bearing her name.
+
+General:
+ - Merged changes from the CK2 2.7.2 "Tiny Patch"
+
+Celtic:
+ - Removed two year cooldown for "Invite Druid to Court" decision.
+
+Kemetic:
+ - Pyramids are now an actual building that will appear in your holdings.
+  - Thanks to IhateTrains for importing the code from WtWSMS.
+
+
 2017-07-04 v0.40.2 "Eurybia"
 -------------------------
 > Eurybia, whose name means "she who has a heart of flint", was the titan mother of Perses. Like her husband Krios, very little is known of Eurybia other than her immediate family. The meaning of her name suggests a cruel and callous nature.

AncientReligions/common/artifact_spawns/ACR_generic_artifact_spawns.txt

@@ -1,127 +0,0 @@
-wine = {
-	max_amount = 1000
-	spawn_date = -1.1.1
-
-	spawn_chance = {
-		value = 100
-		modifier = {
-			factor = 0
-			OR = {
-				NOR = {
-					religion_group = muslim
-					religion = jain
-				}
-				trait = drunkard
-				trait = carouser
-				trait = hedonist
-
-			}
-		}
-	}
-
-	weight = {
-		value = 0
-		additive_modifier = {
-			value = 100
-			is_landed = yes
-		}
-	}
-
-	artifacts = {
-		wine_left_1 = {
-			value = 250
-		}
-		wine_right_1 = {
-			value = 250
-		}
-
-		wine_left_2 = {
-			value = 125
-		}
-		wine_right_2 = {
-			value = 125
-		}
-
-		wine_left_3 = {
-			value = 75
-		}
-		wine_right_3 = {
-			value = 75
-		}
-
-		wine_left_4 = {
-			value = 25
-		}
-		wine_right_4 = {
-			value = 25
-		}
-
-		wine_left_5 = {
-			value = 10
-		}
-		wine_right_5 = {
-			value = 10
-		}
-	}
-}
-
-oils = {
-	max_amount = 1000
-	spawn_date = -1.1.1
-
-	spawn_chance = {
-		value = 100
-	}
-
-	weight = {
-		value = 25
-		additive_modifier = {
-			value = 25
-			is_landed = yes
-		}
-		additive_modifier = {
-			value = 25
-			OR = {
-				trait = gregarious
-				trait = decadent
-			}
-		}
-	}
-
-	artifacts = {
-		oil_left_1 = {
-			value = 250
-		}
-		oil_right_1 = {
-			value = 250
-		}
-
-		oil_left_2 = {
-			value = 125
-		}
-		oil_right_2 = {
-			value = 125
-		}
-
-		oil_left_3 = {
-			value = 75
-		}
-		oil_right_3 = {
-			value = 75
-		}
-
-		oil_left_4 = {
-			value = 25
-		}
-		oil_right_4 = {
-			value = 25
-		}
-
-		oil_left_5 = {
-			value = 10
-		}
-		oil_right_5 = {
-			value = 10
-		}
-	}
-}

AncientReligions/common/artifacts/ACR_generic_artifacts.txt

@@ -1,159 +1,3 @@
 # Content by Adam 'theStormWeaver/xirsoi' Chevalier
+# common, uncommon, rare, epic, legendary
 
-### Wines ###
-wine_left_0 = {
-	flags = { wine left ancrel poison }
-	picture = "GFX_wine_left_0"
-	stacking = yes
-	quality = 3
-}
-wine_left_1 = {
-	flags = { wine left ancrel common }
-	picture = "GFX_wine_left_1"
-	stacking = yes
-	quality = 1
-}
-wine_left_2 = {
-	flags = { wine left ancrel uncommon }
-	picture = "GFX_wine_left_2"
-	stacking = yes
-	quality = 2
-}
-wine_left_3 = {
-	flags = { wine left ancrel rare }
-	picture = "GFX_wine_left_3"
-	stacking = yes
-	quality = 3
-}
-wine_left_4 = {
-	flags = { wine left ancrel epic }
-	picture = "GFX_wine_left_4"
-	stacking = yes
-	quality = 4
-}
-wine_left_5 = {
-	flags = { wine left ancrel legendary }
-	picture = "GFX_wine_left_5"
-	stacking = yes
-	quality = 5
-}
-
-wine_right_0 = {
-	flags = { wine right ancrel poison }
-	picture = "GFX_wine_right_0"
-	stacking = yes
-	quality = 3
-}
-wine_right_1 = {
-	flags = { wine right ancrel common }
-	picture = "GFX_wine_right_1"
-	stacking = yes
-	quality = 1
-}
-wine_right_2 = {
-	flags = { wine right ancrel uncommon }
-	picture = "GFX_wine_right_2"
-	stacking = yes
-	quality = 2
-}
-wine_right_3 = {
-	flags = { wine right ancrel rare }
-	picture = "GFX_wine_right_3"
-	stacking = yes
-	quality = 3
-}
-wine_right_4 = {
-	flags = { wine right ancrel epic }
-	picture = "GFX_wine_right_4"
-	stacking = yes
-	quality = 4
-}
-wine_right_5 = {
-	flags = { wine right ancrel legendary }
-	picture = "GFX_wine_right_5"
-	stacking = yes
-	quality = 5
-}
-
-
-### Oils ###
-oil_left_0 = {
-	flags = { oil left ancrel poison }
-	picture = "GFX_oil_left_0"
-	stacking = yes
-	quality = 3
-}
-
-oil_left_1 = {
-	flags = { oil left ancrel common }
-	picture = "GFX_oil_left_1"
-	stacking = yes
-	quality = 1
-}
-
-oil_left_2 = {
-	flags = { oil left ancrel uncommon }
-	picture = "GFX_oil_left_2"
-	stacking = yes
-	quality = 2
-}
-oil_left_3 = {
-	flags = { oil left ancrel rare }
-	picture = "GFX_oil_left_3"
-	stacking = yes
-	quality = 3
-}
-oil_left_4 = {
-	flags = { oil left ancrel epic }
-	picture = "GFX_oil_left_4"
-	stacking = yes
-	quality = 4
-}
-oil_left_5 = {
-	flags = { oil left ancrel legendary }
-	picture = "GFX_oil_left_5"
-	stacking = yes
-	quality = 5
-}
-
-oil_right_0 = {
-	flags = { oil right ancrel poison }
-	picture = "GFX_oil_right_0"
-	stacking = yes
-	quality = 3
-}
-
-oil_right_1 = {
-	flags = { oil right ancrel common }
-	picture = "GFX_oil_right_1"
-	stacking = yes
-	quality = 1
-}
-
-oil_right_2 = {
-	flags = { oil right ancrel uncommon }
-	picture = "GFX_oil_right_2"
-	stacking = yes
-	quality = 2
-}
-
-oil_right_3 = {
-	flags = { oil right ancrel rare }
-	picture = "GFX_oil_right_3"
-	stacking = yes
-	quality = 3
-}
-
-oil_right_4 = {
-	flags = { oil right ancrel epic }
-	picture = "GFX_oil_right_4"
-	stacking = yes
-	quality = 4
-}
-
-oil_right_5 = {
-	flags = { oil right ancrel legendary }
-	picture = "GFX_oil_right_5"
-	stacking = yes
-	quality = 5
-}