Merge pull request #316 from jeffreykirchner/dev

store and report health generated by the house.

Author: jeffreykirchner

main/models/session.py

@@ -176,6 +176,7 @@ def setup_summary_data(self):
             v["end_health"] = None
             v["health_from_sleep"] = 0
             v["health_from_house"] = 0
+            v["health_generated_by_house"] = 0
             v["hat_at_end"] = None
 
             #total harvested / consumption
@@ -429,7 +430,7 @@ def get_download_summary_csv(self):
 
             writer = csv.writer(output, quoting=csv.QUOTE_NONNUMERIC)
 
-            temp_header = ["Session ID", "Period", "Client #", "Label", "Group", "Period Earnings ¢", "Hat at End", "Start Health", "End Health", "Health From Sleep", "Health From House"]
+            temp_header = ["Session ID", "Period", "Client #", "Label", "Group", "Period Earnings ¢", "Hat at End", "Start Health", "End Health", "Health From Sleep", "Health From House", "Health Generated By House"]
 
             #good totals
             for k in main.globals.Goods.choices:
@@ -488,6 +489,7 @@ def get_download_summary_csv(self):
                                     temp_p["end_health"],
                                     temp_p["health_from_sleep"],
                                     temp_p["health_from_house"],
+                                    temp_p.get("health_generated_by_house", None),
                                     ]
 
                     #good totals

main/models/session_period.py

@@ -157,6 +157,7 @@ def do_consumption(self, world_state, parameter_set):
             avatar["health"] = str(Decimal(avatar["health"]) + Decimal(house["health_value"]))
 
             summary_data[session_player_id]["health_from_house"] = house["health_value"]
+            summary_data[session_player_id]["health_generated_by_house"] = house["health_value"]
 
             if Decimal(avatar["health"]) > 100:
                 health_overage = Decimal(avatar["health"]) - 100

scripts/update_health_from_house.py

@@ -0,0 +1,35 @@
+import main
+
+from main.models import Session
+
+from main.globals import convert_goods_to_health
+
+print("Enter session ids, comma separated")
+session_ids = input().split(',')
+
+for i in range(len(session_ids)):
+    session = Session.objects.get(id=session_ids[i])
+
+    parameter_set = session.parameter_set.json()
+
+    for j in session.session_periods.all():
+        
+        summary_data = j.summary_data
+
+        for k in session.session_players.all():
+            temp_p = summary_data[str(k.id)]
+
+            parameter_set_player = k.parameter_set_player
+
+            good_one_total = temp_p["house_" + parameter_set_player.good_one]
+            good_two_total = temp_p["house_" + parameter_set_player.good_two]
+            good_three_total = temp_p["house_" + parameter_set_player.good_three]
+
+            temp_p["health_generated_by_house"] = convert_goods_to_health(good_one_total,
+                                                            good_two_total,
+                                                            good_three_total if parameter_set["good_mode"] == "Three" else 0,
+                                                            parameter_set)
+
+            print(f"Player {k.id} has {good_one_total} {parameter_set_player.good_one}, {good_two_total} {parameter_set_player.good_two}, {good_three_total} {parameter_set_player.good_three}, for a total of {temp_p['health_generated_by_house']} health")
+            
+        j.save()