From 6cdde6b73e0d45c4ac6a6de6a7285f7de757d8f1 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel.krastev@luckbox.com>
Date: Thu, 15 Oct 2020 13:52:18 +0300
Subject: [PATCH] fix tree_data passing between objects

---
 forestmapview.py | 2 +-
 game.py          | 7 ++++++-
 treepopupmenu.py | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/forestmapview.py b/forestmapview.py
index a56f9ef..64bd2ec 100644
--- a/forestmapview.py
+++ b/forestmapview.py
@@ -41,7 +41,7 @@ class ForestMapView(MapView):
         # Create TreeMarker
         lat, lon = tree[20], tree[21]
         treemarker = TreeMarker(lat=lat, lon=lon)
-        treemarker.tree_data = treemarker
+        treemarker.tree_data = tree
         
         # Add TreeMarker to the map
         self.add_widget(treemarker)
diff --git a/game.py b/game.py
index 0952ffe..0441af1 100644
--- a/game.py
+++ b/game.py
@@ -1,4 +1,9 @@
 from kivy.uix.widget import Widget
+from math import sqrt
+
+def money_rate(happiness):
+    rate = sqrt(1 / happiness)
+    return rate
 
 def collides(rect1, rect2):
     r1x = rect1[0][0]
@@ -67,4 +72,4 @@ class GameWidget(Widget):
         if collides((self.player.pos,self.player.size),(self.enemy.pos,self.size)):
             print("X")
         else:
-            print('.')
\ No newline at end of file
+            print('.')
diff --git a/treepopupmenu.py b/treepopupmenu.py
index 418ee86..309488f 100644
--- a/treepopupmenu.py
+++ b/treepopupmenu.py
@@ -4,7 +4,7 @@ class TreePopupMenu(ListMDDialog):
     def __init__(self, tree_data):
         super().__init__()
 
-        print("] Selected tree data: " + str(dir(tree_data)))
+        print("] Selected tree data: " + str(tree_data))
 
         # Set all of the fields of tree data
         #headers = "Name,Lat,Lon,Description"
@@ -13,7 +13,7 @@ class TreePopupMenu(ListMDDialog):
         
         for i in range(len(headers)):
             attribute_name = headers[i]
-            print("attr name " + attribute_name)
+            #print("attr name " + str(attribute_name))
             attribute_value = tree_data[i]
-            print("attr value " + attribute_value)
+            #print("attr value " + str(attribute_value))
             setattr(self, attribute_name, attribute_value)