From aa5063354aa6029c9fc1e842735165d4b43ad38f Mon Sep 17 00:00:00 2001
From: SigurdCole <sigurd.cole@gmail.com>
Date: Sat, 17 Feb 2018 17:02:08 -0900
Subject: [PATCH] old HA subsidy code applied to TFS (bad copy-paste)

---
 src/uncategorized/arcmgmt.tw | 8 ++++----
 src/utility/assayWidgets.tw  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index eb08f2dd152..c20177958c8 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -742,17 +742,17 @@ The Futanari Sisters have a <<if $TFS.schoolProsperity > 4>>very prosperous<<els
 
 <<if $HA.schoolPresent == 1>>
 <br>
-The Hippolyta Academy have a <<if $TFS.schoolProsperity > 4>>very prosperous<<elseif $TFS.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch in $arcologies[0].name.
-<<if $TFS.schoolProsperity >= 10>>
+The Hippolyta Academy have a <<if $HA.schoolProsperity > 4>>very prosperous<<elseif $HA.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch in $arcologies[0].name.
+<<if $HA.schoolProsperity >= 10>>
 	They are one of the most famous schools in the world<<if $rep > 19000>>.<<else>>, @@.green;improving your reputation.@@<<set $rep += 200>><</if>>
-	<<set $TFS.subsidize = 0, $TFS.schoolProsperity = 10>>
+	<<set $HA.subsidize = 0, $HA.schoolProsperity = 10>>
 <</if>>
 <<if $HA.subsidize == 1>>
 	You have a policy of subsidizing them
 	<<set $HA.schoolProsperity++>>
 <<elseif $HA.subsidize == -1>>
 	You have a policy of covertly undermining them.
-	<<set $TFS.schoolProsperity-->>
+	<<set $HA.schoolProsperity-->>
 <</if>>
 <</if>>
 
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 04ba3c9019d..7f1087b8f09 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1270,10 +1270,10 @@
 	<<set $FResult += 2>>
 <<elseif ($args[0].energy > 60)>>
 	<<set $FResult += 1>>
-<<elseif ($args[0].energy <= 40)>>
-	<<set $FResult -= 1>>
 <<elseif ($args[0].energy <= 20)>>
 	<<set $FResult -= 2>>
+<<elseif ($args[0].energy <= 40)>>
+	<<set $FResult -= 1>>
 <</if>>
 <</if>>
 
-- 
GitLab