From 3e8ef681a3cdc6b1e01f8490446059c3956ade7b Mon Sep 17 00:00:00 2001
From: Brian Kinney <briankanokinney@gmail.com>
Date: Sat, 13 Apr 2019 15:04:43 -0400
Subject: [PATCH] Change defaults to the values intended by recent update

---
 common/ruletypes.h                                   | 12 ++++++------
 .../2019_04_12_update_faction_thresholds.sql         | 10 ----------
 .../2019_04_13_restore_legacy_faction_thresholds.sql | 11 +++++++++++
 3 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 utils/sql/git/optional/2019_04_12_update_faction_thresholds.sql
 create mode 100644 utils/sql/git/optional/2019_04_13_restore_legacy_faction_thresholds.sql

diff --git a/common/ruletypes.h b/common/ruletypes.h
index e33272162..18360280a 100644
--- a/common/ruletypes.h
+++ b/common/ruletypes.h
@@ -759,14 +759,14 @@ RULE_BOOL(Bugs, DumpTargetEntity, false) // Dumps the target entity, if one is p
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Faction)
-RULE_INT(Faction, AllyFactionMinimum, 1101)
-RULE_INT(Faction, WarmlyFactionMinimum, 701)
-RULE_INT(Faction, KindlyFactionMinimum, 401)
-RULE_INT(Faction, AmiablyFactionMinimum, 101)
+RULE_INT(Faction, AllyFactionMinimum, 1100)
+RULE_INT(Faction, WarmlyFactionMinimum, 750)
+RULE_INT(Faction, KindlyFactionMinimum, 500)
+RULE_INT(Faction, AmiablyFactionMinimum, 100)
 RULE_INT(Faction, IndifferentlyFactionMinimum, 0)
 RULE_INT(Faction, ApprehensivelyFactionMinimum, -100)
-RULE_INT(Faction, DubiouslyFactionMinimum, -700)
-RULE_INT(Faction, ThreateninglyFactionMinimum, -999)
+RULE_INT(Faction, DubiouslyFactionMinimum, -500)
+RULE_INT(Faction, ThreateninglyFactionMinimum, -750)
 RULE_CATEGORY_END()
 
 #undef RULE_CATEGORY
diff --git a/utils/sql/git/optional/2019_04_12_update_faction_thresholds.sql b/utils/sql/git/optional/2019_04_12_update_faction_thresholds.sql
deleted file mode 100644
index b54edc981..000000000
--- a/utils/sql/git/optional/2019_04_12_update_faction_thresholds.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO rule_values VALUES
-	(0, "Faction:AllyFactionMinimum", 1100),
-	(0, "Faction:WarmlyFactionMinimum", 750),
-	(0, "Faction:KindlyFactionMinimu", 500),
-	(0, "Faction:AmiablyFactionMinimum", 100),
-	(0, "Faction:IndifferentlyFactionMinimum", 0)
-	(0, "Faction:ApprehensivelyFactionMinimum", -100)
-	(0, "Faction:DubiouslyFactionMinimum", -500)
-	(0, "Faction:ThreateninglyFactionMinimum", -750)
-;
diff --git a/utils/sql/git/optional/2019_04_13_restore_legacy_faction_thresholds.sql b/utils/sql/git/optional/2019_04_13_restore_legacy_faction_thresholds.sql
new file mode 100644
index 000000000..531b90ebc
--- /dev/null
+++ b/utils/sql/git/optional/2019_04_13_restore_legacy_faction_thresholds.sql
@@ -0,0 +1,11 @@
+-- Supplied for convenient configuration of faction thresholds to the values that were in place prior to 2019-03-01 update
+INSERT INTO rule_values VALUES
+	(0, "Faction:AllyFactionMinimum", 1101),
+	(0, "Faction:WarmlyFactionMinimum", 701),
+	(0, "Faction:KindlyFactionMinimu", 401),
+	(0, "Faction:AmiablyFactionMinimum", 101),
+	(0, "Faction:IndifferentlyFactionMinimum", 0)
+	(0, "Faction:ApprehensivelyFactionMinimum", -100)
+	(0, "Faction:DubiouslyFactionMinimum", -700)
+	(0, "Faction:ThreateninglyFactionMinimum", -999)
+;