From d47b57535ee0ca017ae58c273346181b68504fa7 Mon Sep 17 00:00:00 2001
From: "romain.quinio" <romain.quinio@gmail.com>
Date: Sun, 27 May 2018 22:08:02 +0200
Subject: [PATCH] Misc validation errors

---
 MOD/Witcher/common/religions/W_religions.txt  |   6 +-
 .../scripted_effects/00_scripted_effects.txt  | 600 +++++++++---------
 MOD/Witcher/interface/W_decision_icons.gfx    |   5 -
 3 files changed, 303 insertions(+), 308 deletions(-)

diff --git a/MOD/Witcher/common/religions/W_religions.txt b/MOD/Witcher/common/religions/W_religions.txt
index eada8e300..f498f8f93 100644
--- a/MOD/Witcher/common/religions/W_religions.txt
+++ b/MOD/Witcher/common/religions/W_religions.txt
@@ -144,9 +144,9 @@ northern_religions = {
 		aggression = 1.2 # AI aggression factor
 		
 		# Aggressiveness
-		character_modifier = {
-			infidel_opinion = -10
-		}
+#		character_modifier = {
+#			infidel_opinion = -10
+#		}
 	}
 	
 	druidic = {
diff --git a/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt b/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt
index 302675114..ba0808e5d 100644
--- a/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt
+++ b/MOD/Witcher/common/scripted_effects/00_scripted_effects.txt
@@ -12384,306 +12384,306 @@ clr_religion_char_flag_effect = {
 }
 
 event_target_old_religion_from_flag_effect = {
-	if = {
-    	limit = { has_character_flag = character_was_catholic }
-    	catholic = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_cathar }
-    	cathar = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_fraticelli }
-    	fraticelli = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_waldensian }
-    	waldensian = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_lollard }
-    	lollard = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_orthodox }
-    	orthodox = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_miaphysite }
-    	miaphysite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_monophysite }
-    	monophysite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_bogomilist }
-    	bogomilist = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_monothelite }
-    	monothelite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_iconoclast }
-    	iconoclast = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_paulician }
-    	paulician = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_nestorian }
-    	nestorian = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_messalian }
-    	messalian = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_sunni }
-    	sunni = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_zikri }
-    	zikri = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_yazidi }
-    	yazidi = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_ibadi }
-    	ibadi = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_kharijite }
-    	kharijite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_shiite }
-    	shiite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_druze }
-    	druze = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_hurufi }
-    	hurufi = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_jewish }
-    	jewish = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_karaite }
-    	karaite = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_samaritan }
-    	samaritan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_zoroastrian }
-    	zoroastrian = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_mazdaki }
-    	mazdaki = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_manichean }
-    	manichean = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_khurmazta }
-    	khurmazta = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_bon }
-    	bon = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_taoist }
-    	taoist = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_hindu }
-    	hindu = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_buddhist }
-    	buddhist = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_jain }
-    	jain = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_norse_pagan_reformed }
-    	norse_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_slavic_pagan_reformed }
-    	slavic_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_tengri_pagan_reformed }
-    	tengri_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_baltic_pagan_reformed }
-    	baltic_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_finnish_pagan_reformed }
-    	finnish_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_west_african_pagan_reformed }
-    	west_african_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_zun_pagan_reformed }
-    	zun_pagan_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_norse_pagan }
-    	norse_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_slavic_pagan }
-    	slavic_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_tengri_pagan }
-    	tengri_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_baltic_pagan }
-    	baltic_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_finnish_pagan }
-    	finnish_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_west_african_pagan }
-    	west_african_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-    if = {
-    	limit = { has_character_flag = character_was_zun_pagan }
-    	zun_pagan = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_aztec }
-    	aztec = {
-    		save_event_target_as = old_religion
-    	}
-    }
-	if = {
-    	limit = { has_character_flag = character_was_aztec_reformed }
-    	aztec_reformed = {
-    		save_event_target_as = old_religion
-    	}
-    }
+#	if = {
+#    	limit = { has_character_flag = character_was_catholic }
+#    	catholic = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_cathar }
+#    	cathar = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_fraticelli }
+#    	fraticelli = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_waldensian }
+#    	waldensian = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_lollard }
+#    	lollard = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_orthodox }
+#    	orthodox = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_miaphysite }
+#    	miaphysite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_monophysite }
+#    	monophysite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_bogomilist }
+#    	bogomilist = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_monothelite }
+#    	monothelite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_iconoclast }
+#    	iconoclast = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_paulician }
+#    	paulician = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_nestorian }
+#    	nestorian = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_messalian }
+#    	messalian = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_sunni }
+#    	sunni = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_zikri }
+#    	zikri = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_yazidi }
+#    	yazidi = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_ibadi }
+#    	ibadi = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_kharijite }
+#    	kharijite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_shiite }
+#    	shiite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_druze }
+#    	druze = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_hurufi }
+#    	hurufi = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_jewish }
+#    	jewish = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_karaite }
+#    	karaite = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_samaritan }
+#    	samaritan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_zoroastrian }
+#    	zoroastrian = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_mazdaki }
+#    	mazdaki = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_manichean }
+#    	manichean = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_khurmazta }
+#    	khurmazta = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_bon }
+#    	bon = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_taoist }
+#    	taoist = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_hindu }
+#    	hindu = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_buddhist }
+#    	buddhist = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_jain }
+#    	jain = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_norse_pagan_reformed }
+#    	norse_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_slavic_pagan_reformed }
+#    	slavic_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_tengri_pagan_reformed }
+#    	tengri_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_baltic_pagan_reformed }
+#    	baltic_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_finnish_pagan_reformed }
+#    	finnish_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_west_african_pagan_reformed }
+#    	west_african_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_zun_pagan_reformed }
+#    	zun_pagan_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_norse_pagan }
+#    	norse_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_slavic_pagan }
+#    	slavic_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_tengri_pagan }
+#    	tengri_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_baltic_pagan }
+#    	baltic_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_finnish_pagan }
+#    	finnish_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_west_african_pagan }
+#    	west_african_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#    if = {
+#    	limit = { has_character_flag = character_was_zun_pagan }
+#    	zun_pagan = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_aztec }
+#    	aztec = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
+#	if = {
+#    	limit = { has_character_flag = character_was_aztec_reformed }
+#    	aztec_reformed = {
+#    		save_event_target_as = old_religion
+#    	}
+#    }
 }
 
 increase_visibility_effect = {
diff --git a/MOD/Witcher/interface/W_decision_icons.gfx b/MOD/Witcher/interface/W_decision_icons.gfx
index 1199fc62f..35a9e777e 100644
--- a/MOD/Witcher/interface/W_decision_icons.gfx
+++ b/MOD/Witcher/interface/W_decision_icons.gfx
@@ -1,9 +1,4 @@
 spriteTypes = {
-	# artifact decisions_W
-	spriteType = {
-		name = "GFX_use_purple_living_bone_and_conynhaela"
-		texturefile = "gfx\\interface\\decision_icon_use_purple_living_bone_and_conynhaela.dds"
-	}
 	# banker_decisions_W
 	spriteType = {
 		name = "GFX_borrow_money"