Merge branch 'master' of https://github.com/ngraham20/Virtupet

# Conflicts: # virtupet/data/decisions.json
ngraham20 · Apr 24, 2018 · 74d46d7 · 74d46d7
2 parents 45c025d + e859852
commit 74d46d7
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/virtupet/data/decisions.json b/virtupet/data/decisions.json
@@ -64,6 +64,29 @@
       "vitality": -0.1,
       "mental_energy": -0.5,
       "physical_energy": -0.1
+    { "name": "eat_veggies", "values":
+      {"attachment": 0.3,
+      "humor": 0.1,
+      "enjoyment": 0.1,
+      "excitement": 0.1,
+      "confidence": 0.4,
+      "contentment": 0.1,
+      "entertainment": 0.1,
+      "vitality": -0.1,
+      "mental_energy": 0.1,
+      "physical_energy": 0.1}
+    },
+    {"name": "meditate", "values":
+      {"attachment": 0.3,
+      "humor": 0.1,
+      "enjoyment": 0.2,
+      "excitement": 0.1,
+      "confidence": 0.6,
+      "contentment": 0.9,
+      "entertainment": 0.2,
+      "vitality": 0.1,
+      "mental_energy": 0.6,
+      "physical_energy": 0.3}
     }
   }
   ]