From 45c025d17e7884ae7a46f588a3f6cc4a615e1c37 Mon Sep 17 00:00:00 2001
From: Kcunningham20 <31940556+Kcunningham20@users.noreply.github.com>
Date: Tue, 24 Apr 2018 13:10:11 -0700
Subject: [PATCH] decisions.json more options updated

---
 virtupet/.idea/misc.xml      |  6 +---
 virtupet/.idea/virtupet.iml  |  2 +-
 virtupet/data/decisions.json | 53 ++++++++++++++++++++++++++++++++----
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/virtupet/.idea/misc.xml b/virtupet/.idea/misc.xml
index 7fdee36..3565ed8 100644
--- a/virtupet/.idea/misc.xml
+++ b/virtupet/.idea/misc.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-<<<<<<< HEAD
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 virtualenv at C:\Users\krist\OneDrive\Documents\repos\virtupet\virtupet\venv (1)" project-jdk-type="Python SDK" />
-=======
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (virtupet)" project-jdk-type="Python SDK" />
->>>>>>> 646eb1b184f47e99abdb335426ada9598f6f1429
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 virtualenv at C:\Users\krist\OneDrive\Documents\repos\virtupet\virtupet\venv (2)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/virtupet/.idea/virtupet.iml b/virtupet/.idea/virtupet.iml
index e0841ce..6711606 100644
--- a/virtupet/.idea/virtupet.iml
+++ b/virtupet/.idea/virtupet.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.6 (virtupet)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/virtupet/data/decisions.json b/virtupet/data/decisions.json
index 6a70adc..7f9840d 100644
--- a/virtupet/data/decisions.json
+++ b/virtupet/data/decisions.json
@@ -7,9 +7,9 @@
       "confidence": 0.2,
       "contentment": 0.6,
       "entertainment": 1,
-      "vitality": 0.1,
-      "mental_energy": 0.2,
-      "physical_energy": 0.2
+      "vitality": -0.1,
+      "mental_energy": -0.2,
+      "physical_energy": -0.2
       }
     },
     {"name": "push_car", "values":
@@ -20,10 +20,51 @@
       "confidence": 0.3,
       "contentment": 0.6,
       "entertainment": 1,
-      "vitality": 0.1,
-      "mental_energy": 0.2,
-      "physical_energy": 0.2
+      "vitality": -0.1,
+      "mental_energy": -0.2,
+      "physical_energy": -0.2
       }
+    },
+     {"name": "eat_cake", "values":
+      {"attachment": 0.1,
+      "humor": 0.1,
+      "enjoyment": 0.9,
+      "excitement": 0.9,
+      "confidence": 0.1,
+      "contentment": 0.7,
+      "entertainment": 0.5,
+      "vitality": -0.7,
+      "mental_energy": -0.5,
+      "physical_energy": 0.3
+      }
+     },
+   {"name": "sleep", "values":
+      {"attachment": 0.1,
+      "humor": 0.1,
+      "enjoyment": 0.1,
+      "excitement": 0.1,
+      "confidence": 0.1,
+      "contentment": 0.1,
+      "entertainment": 0.1,
+      "vitality": 0.8,
+      "mental_energy": 0.5,
+      "physical_energy": 0.5
+    }
+  },
+  {
+    "name": "reading",
+    "values": {
+      "attachment": 0.1,
+      "humor": 0.5,
+      "enjoyment": 0.9,
+      "excitement": 0.4,
+      "confidence": 0.3,
+      "contentment": 0.7,
+      "entertainment": 0.7,
+      "vitality": -0.1,
+      "mental_energy": -0.5,
+      "physical_energy": -0.1
     }
+  }
   ]
 }