Merge pull request #93 from jeffreykirchner/dev

summary data dev
jeffreykirchner · Sep 7, 2023 · 8726b56 · 8726b56
2 parents 2f5bcf3 + e57f583
commit 8726b56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/main/consumers/staff/session_consumer_mixins/timer.py b/main/consumers/staff/session_consumer_mixins/timer.py
@@ -215,10 +215,11 @@ def sync_continue_timer(event, session_id):
                 sd_player = summary_data[str(current_period_id)][i]
                 sd_player["end_health"] = world_state["avatars"][i]["health"]
 
+                avatar = world_state["avatars"][i]
                 #inventory
                 for k in main.globals.Goods.choices:                       
-                    sd_player["house_" + k[0]] = world_state["houses"][i][k[0]]
-                    sd_player["avatar_" + k[0]] =  world_state["avatars"][i][k[0]]
+                    sd_player["house_" + k[0]] = world_state["houses"][avatar["parameter_set_player_id"]][k[0]]
+                    sd_player["avatar_" + k[0]] = avatar[k[0]]
 
             session.save()
 

diff --git a/main/models/session_period.py b/main/models/session_period.py
@@ -145,7 +145,7 @@ def do_consumption(self):
         #convert goods in homes to cash
         for i in self.session.world_state["houses"]:
             house = self.session.world_state["houses"][i]
-            avatar = self.session.world_state["avatars"][i]
+            avatar = self.session.world_state["avatars"][str(house["session_player"])]
 
             avatar["health"] = str(Decimal(avatar["health"]) + Decimal(house["health_value"]))