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 @@
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 646eb1b184f47e99abdb335426ada9598f6f1429
+
\ 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 @@
-
+
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
}
+ }
]
}