From 290b14d0b44164e3d75c40e7d8e4248e2cf14faa Mon Sep 17 00:00:00 2001 From: Kcunningham20 <31940556+Kcunningham20@users.noreply.github.com> Date: Wed, 25 Apr 2018 17:19:44 -0700 Subject: [PATCH 1/3] update decision function. allows one pudgi to make decisions --- virtupet/.idea/misc.xml | 2 +- virtupet/Pudgi.py | 106 +++++++++++++++++++-- virtupet/data/decisions.json | 45 +++++---- virtupet/data/pudgies/0x11979.json | 84 ---------------- virtupet/data/pudgies/0x1280e.json | 148 ----------------------------- virtupet/data/pudgies/0x15b1.json | 148 ----------------------------- virtupet/data/pudgies/0x1607.json | 148 ----------------------------- virtupet/data/pudgies/0x1790b.json | 84 ---------------- virtupet/data/pudgies/0x17b07.json | 148 ----------------------------- virtupet/data/pudgies/0x1cfc.json | 148 ----------------------------- virtupet/data/pudgies/0x249a.json | 84 ---------------- virtupet/data/pudgies/0x3b44.json | 84 ---------------- virtupet/data/pudgies/0x4be0.json | 84 ---------------- virtupet/data/pudgies/0x54d0.json | 84 ---------------- virtupet/data/pudgies/0x57e9.json | 148 ----------------------------- virtupet/data/pudgies/0x6a86.json | 84 ---------------- virtupet/data/pudgies/0x6d8.json | 148 ----------------------------- virtupet/data/pudgies/0x743d.json | 84 ---------------- virtupet/data/pudgies/0x8653.json | 148 ----------------------------- virtupet/data/pudgies/0x9d3b.json | 84 ---------------- virtupet/data/pudgies/0xa333.json | 148 ----------------------------- virtupet/data/pudgies/0xa51.json | 84 ---------------- virtupet/data/pudgies/0xbbec.json | 148 ----------------------------- virtupet/data/pudgies/0xc443.json | 84 ---------------- virtupet/data/pudgies/0xf1f.json | 148 ----------------------------- virtupet/data/pudgies/default.json | 2 +- virtupet/main.py | 15 +-- 27 files changed, 130 insertions(+), 2592 deletions(-) delete mode 100644 virtupet/data/pudgies/0x11979.json delete mode 100644 virtupet/data/pudgies/0x1280e.json delete mode 100644 virtupet/data/pudgies/0x15b1.json delete mode 100644 virtupet/data/pudgies/0x1607.json delete mode 100644 virtupet/data/pudgies/0x1790b.json delete mode 100644 virtupet/data/pudgies/0x17b07.json delete mode 100644 virtupet/data/pudgies/0x1cfc.json delete mode 100644 virtupet/data/pudgies/0x249a.json delete mode 100644 virtupet/data/pudgies/0x3b44.json delete mode 100644 virtupet/data/pudgies/0x4be0.json delete mode 100644 virtupet/data/pudgies/0x54d0.json delete mode 100644 virtupet/data/pudgies/0x57e9.json delete mode 100644 virtupet/data/pudgies/0x6a86.json delete mode 100644 virtupet/data/pudgies/0x6d8.json delete mode 100644 virtupet/data/pudgies/0x743d.json delete mode 100644 virtupet/data/pudgies/0x8653.json delete mode 100644 virtupet/data/pudgies/0x9d3b.json delete mode 100644 virtupet/data/pudgies/0xa333.json delete mode 100644 virtupet/data/pudgies/0xa51.json delete mode 100644 virtupet/data/pudgies/0xbbec.json delete mode 100644 virtupet/data/pudgies/0xc443.json delete mode 100644 virtupet/data/pudgies/0xf1f.json diff --git a/virtupet/.idea/misc.xml b/virtupet/.idea/misc.xml index 3565ed8..8305311 100644 --- a/virtupet/.idea/misc.xml +++ b/virtupet/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/virtupet/Pudgi.py b/virtupet/Pudgi.py index ec5c22b..c3e285d 100644 --- a/virtupet/Pudgi.py +++ b/virtupet/Pudgi.py @@ -270,10 +270,6 @@ def go_left(self): def stop(self): self.change_x = 0 - def make_decision(self): - # make decision - return - def import_from_json(self, load): self.handler.load_file(load) self.json_object = self.handler.get_data() @@ -335,12 +331,102 @@ def select_parents(active_agent_list): return parents - def make_decicion(self): - self.handler.load_file("./data/decisions.py") + def make_decision(self): + self.handler.load_file("./data/decisions.json") decision_file = self.handler.get_data() - self.handler.load_file("./data/pudgi" + self.uid + ".json") - pudgi_file = self.handler.get_data() - - if (random.random() > 0.5): + self.handler.load_file("./data/pudgies/" + self.uid + ".json") + choice_index = -1 + happiness_optimized = 0 + t = 0 + choice = None + + w_att = self.weights["attachment"] + w_hum = self.weights["humor"] + w_enj = self.weights["enjoyment"] + w_exc = self.weights["excitement"] + w_conf = self.weights["confidence"] + w_cont = self.weights["contentment"] + w_vit = self.weights["vitality"] + w_phy = self.weights["physical"] + w_ment = self.weights["mental"] + + if random.random() > 1.0: + index = 0 for decision in self.known_decisions: name = decision["name"] + + att = None + hum = None + enj = None + exc = None + conf = None + cont = None + vit = None + phy = None + ment = None + ent = None + + for dec in decision_file: + if dec["name"] == name: + + att = dec["values"]["attachment"] + hum = dec["values"]["humor"] + enj = dec["values"]["enjoyment"] + exc = dec["values"]["excitement"] + conf = dec["values"]["confidence"] + cont = dec["values"]["contentment"] + vit = dec["values"]["vitality"] + phy = dec["values"]["physical_energy"] + ment = dec["values"]["mental_energy"] + ent = dec["values"]["entertainment"] + + for dec in self.known_decisions: + if dec["name"] == name: + t = dec["count"] + + happiness = pow(ent, t) * ((pow(att, w_att))+(pow(hum, w_hum))+(pow(enj, w_enj)) + + (pow(exc, w_exc)) + (pow(conf, w_conf))+(pow(cont, w_cont)) - + (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))) + + if happiness > happiness_optimized: + happiness_optimized = happiness + choice = decision + choice_index = index + + index += 1 + + else: + dec_attempt = random.choice(decision_file) + for known in self.known_decisions: # iterate through all known + if dec_attempt["name"] == known["name"]: # if we find a match, break out. We don't want this + break + else: + choice = dec_attempt + att = choice["values"]["attachment"] + hum = choice["values"]["humor"] + enj = choice["values"]["enjoyment"] + exc = choice["values"]["excitement"] + conf = choice["values"]["confidence"] + cont = choice["values"]["contentment"] + vit = choice["values"]["vitality"] + phy = choice["values"]["physical_energy"] + ment = choice["values"]["mental_energy"] + ent = choice["values"]["entertainment"] + + happiness_optimized = pow(ent, t)*((pow(att, w_att)) + (pow(hum, w_hum)) + (pow(enj, w_enj)) + + (pow(exc, w_exc)) + (pow(conf, w_conf)) + (pow(cont, w_cont)) - + (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))) + + self.known_decisions.append({"name": choice["name"], "count": 0}) + choice_index = len(self.known_decisions) - 1 + + if choice is not None: + if self.happiness + happiness_optimized <= 0: + self.happiness = 0 + else: + if self.happiness + happiness_optimized <= 10: + self.happiness += happiness_optimized + else: + self.happiness = 10 + + self.known_decisions[choice_index]["count"] += 1 diff --git a/virtupet/data/decisions.json b/virtupet/data/decisions.json index b51bc7b..5f9a1c0 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,9 +20,9 @@ "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": @@ -33,12 +33,12 @@ "confidence": 0.1, "contentment": 0.7, "entertainment": 1, - "vitality": -0.7, - "mental_energy": -0.5, + "vitality": 0.7, + "mental_energy": 0.5, "physical_energy": 0.3 } }, - {"name": "sleep", "values": + {"name": "sleep", "values": {"attachment": 0.1, "humor": 0.1, "enjoyment": 0.1, @@ -49,21 +49,23 @@ "vitality": 0.8, "mental_energy": 0.5, "physical_energy": 0.5 - } - }, + } + }, { "name": "reading", - "values": { - "attachment": 0.1, + "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 + "vitality": 0.1, + "mental_energy": 0.5, + "physical_energy": 0.1 + } + }, { "name": "eat_veggies", "values": {"attachment": 0.3, "humor": 0.1, @@ -72,9 +74,10 @@ "confidence": 0.4, "contentment": 0.1, "entertainment": 0.1, - "vitality": -0.1, + "vitality": 0.1, "mental_energy": 0.1, - "physical_energy": 0.1} + "physical_energy": 0.1 + } }, {"name": "meditate", "values": {"attachment": 0.3, @@ -98,9 +101,9 @@ "confidence": 0.1, "contentment": 0.1, "entertainment": 0.5, - "vitality": -0.1, - "mental_energy": -0.1, - "physical_energy": -0.1 + "vitality": 0.1, + "mental_energy": 0.1, + "physical_energy": 0.1 } } ] diff --git a/virtupet/data/pudgies/0x11979.json b/virtupet/data/pudgies/0x11979.json deleted file mode 100644 index 7dd123b..0000000 --- a/virtupet/data/pudgies/0x11979.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x11979", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "White", - "personality": "ENFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1280e.json b/virtupet/data/pudgies/0x1280e.json deleted file mode 100644 index f532c64..0000000 --- a/virtupet/data/pudgies/0x1280e.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x1280e", - "name": "Marvin", - "dna": [ - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1 - ], - "color": "Red", - "personality": "INTP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x15b1.json b/virtupet/data/pudgies/0x15b1.json deleted file mode 100644 index 6b5cf75..0000000 --- a/virtupet/data/pudgies/0x15b1.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x15b1", - "name": "Tyrone", - "dna": [ - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0 - ], - "color": "White", - "personality": "INTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1607.json b/virtupet/data/pudgies/0x1607.json deleted file mode 100644 index 5fa75a5..0000000 --- a/virtupet/data/pudgies/0x1607.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x1607", - "name": "Haiden", - "dna": [ - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Blue", - "personality": "ISFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1790b.json b/virtupet/data/pudgies/0x1790b.json deleted file mode 100644 index aa1c336..0000000 --- a/virtupet/data/pudgies/0x1790b.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x1790b", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Red", - "personality": "ISTP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x17b07.json b/virtupet/data/pudgies/0x17b07.json deleted file mode 100644 index b6d1bc7..0000000 --- a/virtupet/data/pudgies/0x17b07.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x17b07", - "name": "Lila", - "dna": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1 - ], - "color": "Green", - "personality": "ESTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1cfc.json b/virtupet/data/pudgies/0x1cfc.json deleted file mode 100644 index 43f8390..0000000 --- a/virtupet/data/pudgies/0x1cfc.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x1cfc", - "name": "Jeramiah", - "dna": [ - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1 - ], - "color": "Angel", - "personality": "INFJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x249a.json b/virtupet/data/pudgies/0x249a.json deleted file mode 100644 index 89f2a12..0000000 --- a/virtupet/data/pudgies/0x249a.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x249a", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Red", - "personality": "ISTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x3b44.json b/virtupet/data/pudgies/0x3b44.json deleted file mode 100644 index ff21426..0000000 --- a/virtupet/data/pudgies/0x3b44.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x3b44", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Blue", - "personality": "ISTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x4be0.json b/virtupet/data/pudgies/0x4be0.json deleted file mode 100644 index d44c7f3..0000000 --- a/virtupet/data/pudgies/0x4be0.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x4be0", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Vampire", - "personality": "INTP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x54d0.json b/virtupet/data/pudgies/0x54d0.json deleted file mode 100644 index 6c60f11..0000000 --- a/virtupet/data/pudgies/0x54d0.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x54d0", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "White", - "personality": "ISTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x57e9.json b/virtupet/data/pudgies/0x57e9.json deleted file mode 100644 index fcdf053..0000000 --- a/virtupet/data/pudgies/0x57e9.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x57e9", - "name": "Cindy", - "dna": [ - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1 - ], - "color": "Angel", - "personality": "INTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x6a86.json b/virtupet/data/pudgies/0x6a86.json deleted file mode 100644 index 873f6b9..0000000 --- a/virtupet/data/pudgies/0x6a86.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x6a86", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "White", - "personality": "ESTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x6d8.json b/virtupet/data/pudgies/0x6d8.json deleted file mode 100644 index c7060c1..0000000 --- a/virtupet/data/pudgies/0x6d8.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x6d8", - "name": "Porter", - "dna": [ - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0 - ], - "color": "Purple", - "personality": "ESFJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x743d.json b/virtupet/data/pudgies/0x743d.json deleted file mode 100644 index eadad96..0000000 --- a/virtupet/data/pudgies/0x743d.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x743d", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Red", - "personality": "ENFJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x8653.json b/virtupet/data/pudgies/0x8653.json deleted file mode 100644 index 054ce93..0000000 --- a/virtupet/data/pudgies/0x8653.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0x8653", - "name": "Madalynn", - "dna": [ - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1 - ], - "color": "Purple", - "personality": "ISTP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x9d3b.json b/virtupet/data/pudgies/0x9d3b.json deleted file mode 100644 index 3784c62..0000000 --- a/virtupet/data/pudgies/0x9d3b.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0x9d3b", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Red", - "personality": "ESFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xa333.json b/virtupet/data/pudgies/0xa333.json deleted file mode 100644 index 62f26c5..0000000 --- a/virtupet/data/pudgies/0xa333.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0xa333", - "name": "Alison", - "dna": [ - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1 - ], - "color": "Green", - "personality": "ISFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xa51.json b/virtupet/data/pudgies/0xa51.json deleted file mode 100644 index 0e3a89b..0000000 --- a/virtupet/data/pudgies/0xa51.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0xa51", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "White", - "personality": "ISFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xbbec.json b/virtupet/data/pudgies/0xbbec.json deleted file mode 100644 index 57159bb..0000000 --- a/virtupet/data/pudgies/0xbbec.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0xbbec", - "name": "Andrew", - "dna": [ - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0 - ], - "color": "Green", - "personality": "ISFJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xc443.json b/virtupet/data/pudgies/0xc443.json deleted file mode 100644 index f9acf08..0000000 --- a/virtupet/data/pudgies/0xc443.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "uid": "0xc443", - "name": "Pudgi", - "dna": [ - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1 - ], - "color": "Midnight", - "personality": "ISTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xf1f.json b/virtupet/data/pudgies/0xf1f.json deleted file mode 100644 index fefea16..0000000 --- a/virtupet/data/pudgies/0xf1f.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uid": "0xf1f", - "name": "Leah", - "dna": [ - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1 - ], - "color": "Midnight", - "personality": "ISFP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/default.json b/virtupet/data/pudgies/default.json index 80cca7e..e3fc788 100644 --- a/virtupet/data/pudgies/default.json +++ b/virtupet/data/pudgies/default.json @@ -77,5 +77,5 @@ "personality": null, "parents": [null, null], "happiness": 0.5, - "known_decisions": [] + "known_decisions": [{"name": "nothing", "count": 0}] } diff --git a/virtupet/main.py b/virtupet/main.py index 442e75c..9f98c04 100644 --- a/virtupet/main.py +++ b/virtupet/main.py @@ -36,10 +36,9 @@ def main(): agent2.export_to_json() pygame.display.set_caption("Pudgi Simulation") - parents = ["0x9c08", "0x11e66"] + # parents = ["0x9c08", "0x11e66"] # agent = Pudgi(parents) - agent = Pudgi(None, "./data/pudgies/0x8653.json") - # agent = Pudgi() + # agent = Pudgi(None, "./data/pudgies/0x8653.json") env_list = [environments.EnvironmentHouse(agent)] current_env_no = 0 @@ -73,13 +72,15 @@ def main(): # for char in number: # node = node[char] + agent.make_decision() + # --------------Main While loop--------------- while not done: - for parents in high_happiness: - pudgi = Pudgi(parents) - active_sprite_list.add(pudgi) - active_agent_list.append(pudgi) + # for parents in high_happiness: + # pudgi = Pudgi(parents) + # active_sprite_list.add(pudgi) + # active_agent_list.append(pudgi) for event in pygame.event.get(): # User did something if event.type == pygame.QUIT: # If user clicked close From 4b368e20615c9507441839516379edac7b836541 Mon Sep 17 00:00:00 2001 From: Kcunningham20 <31940556+Kcunningham20@users.noreply.github.com> Date: Thu, 26 Apr 2018 14:08:56 -0700 Subject: [PATCH 2/3] update decision_definition function so each pudgi executes a decision every 15 seconds (our time) --- virtupet/.idea/misc.xml | 6 +- virtupet/.idea/virtupet.iml | 2 +- virtupet/Pudgi.py | 9 +- virtupet/clock.py | 6 + virtupet/data/decisions.json | 12 +- virtupet/data/pudgies/0x10f22.json | 157 +++++++++++++++++++++++++ virtupet/data/pudgies/0x11dbe.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x12bc0.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x146f9.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x14918.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x14e47.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x14f48.json | 177 ++++++++++++++++++++++++++++ virtupet/data/pudgies/0x16fe1.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x18f1.json | 181 +++++++++++++++++++++++++++++ virtupet/data/pudgies/0x1bec.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x1dc8.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x1e15.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x2506.json | 157 +++++++++++++++++++++++++ virtupet/data/pudgies/0x30.json | 157 +++++++++++++++++++++++++ virtupet/data/pudgies/0x340c.json | 173 +++++++++++++++++++++++++++ virtupet/data/pudgies/0x3526.json | 173 +++++++++++++++++++++++++++ virtupet/data/pudgies/0x46a7.json | 157 +++++++++++++++++++++++++ virtupet/data/pudgies/0x551.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x61cb.json | 173 +++++++++++++++++++++++++++ virtupet/data/pudgies/0x6ef3.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0x88c3.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0xc51f.json | 177 ++++++++++++++++++++++++++++ virtupet/data/pudgies/0xc6e.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0xd403.json | 153 ++++++++++++++++++++++++ virtupet/data/pudgies/0xd687.json | 157 +++++++++++++++++++++++++ virtupet/data/pudgies/0xfa7f.json | 153 ++++++++++++++++++++++++ virtupet/main.py | 21 +++- 32 files changed, 4170 insertions(+), 20 deletions(-) create mode 100644 virtupet/data/pudgies/0x10f22.json create mode 100644 virtupet/data/pudgies/0x11dbe.json create mode 100644 virtupet/data/pudgies/0x12bc0.json create mode 100644 virtupet/data/pudgies/0x146f9.json create mode 100644 virtupet/data/pudgies/0x14918.json create mode 100644 virtupet/data/pudgies/0x14e47.json create mode 100644 virtupet/data/pudgies/0x14f48.json create mode 100644 virtupet/data/pudgies/0x16fe1.json create mode 100644 virtupet/data/pudgies/0x18f1.json create mode 100644 virtupet/data/pudgies/0x1bec.json create mode 100644 virtupet/data/pudgies/0x1dc8.json create mode 100644 virtupet/data/pudgies/0x1e15.json create mode 100644 virtupet/data/pudgies/0x2506.json create mode 100644 virtupet/data/pudgies/0x30.json create mode 100644 virtupet/data/pudgies/0x340c.json create mode 100644 virtupet/data/pudgies/0x3526.json create mode 100644 virtupet/data/pudgies/0x46a7.json create mode 100644 virtupet/data/pudgies/0x551.json create mode 100644 virtupet/data/pudgies/0x61cb.json create mode 100644 virtupet/data/pudgies/0x6ef3.json create mode 100644 virtupet/data/pudgies/0x88c3.json create mode 100644 virtupet/data/pudgies/0xc51f.json create mode 100644 virtupet/data/pudgies/0xc6e.json create mode 100644 virtupet/data/pudgies/0xd403.json create mode 100644 virtupet/data/pudgies/0xd687.json create mode 100644 virtupet/data/pudgies/0xfa7f.json diff --git a/virtupet/.idea/misc.xml b/virtupet/.idea/misc.xml index d4cdf73..9780b6b 100644 --- a/virtupet/.idea/misc.xml +++ b/virtupet/.idea/misc.xml @@ -1,8 +1,4 @@ -<<<<<<< HEAD - -======= - ->>>>>>> aaa86423ec248d32b4e27f160d302ae2ae368651 + \ 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/Pudgi.py b/virtupet/Pudgi.py index c3e285d..7d436f1 100644 --- a/virtupet/Pudgi.py +++ b/virtupet/Pudgi.py @@ -350,7 +350,7 @@ def make_decision(self): w_phy = self.weights["physical"] w_ment = self.weights["mental"] - if random.random() > 1.0: + if random.random() > 0.5: index = 0 for decision in self.known_decisions: name = decision["name"] @@ -430,3 +430,10 @@ def make_decision(self): self.happiness = 10 self.known_decisions[choice_index]["count"] += 1 + + print("---------------------------------------------") + print("Pudgi: " + self.name) + print("Choice: " + choice["name"]) + print("Happiness increased by: " + str(happiness_optimized)) + print("Times chosen: " + str(self.known_decisions[choice_index]["count"])) + print("---------------------------------------------") diff --git a/virtupet/clock.py b/virtupet/clock.py index 7af5ac5..fb0194e 100644 --- a/virtupet/clock.py +++ b/virtupet/clock.py @@ -33,3 +33,9 @@ def time_stamp(self): def update_time(self): self.cur_time = int(self.elapsed_time()) + + def get_minutes(self): + return "%02d" % (datetime.datetime.now().second, ) + + def get_seconds(self): + return "%02d" % (datetime.datetime.now().microsecond, ) diff --git a/virtupet/data/decisions.json b/virtupet/data/decisions.json index 5661a28..184222e 100644 --- a/virtupet/data/decisions.json +++ b/virtupet/data/decisions.json @@ -61,15 +61,12 @@ "confidence": 0.3, "contentment": 0.7, "entertainment": 0.7, -<<<<<<< HEAD + "vitality": 0.1, + "mental_energy": 0.5, + "physical_energy": 0.1, "vitality": 0.1, "mental_energy": 0.5, "physical_energy": 0.1 -======= - "vitality": -0.1, - "mental_energy": -0.5, - "physical_energy": -0.1 ->>>>>>> aaa86423ec248d32b4e27f160d302ae2ae368651 } }, { "name": "eat_veggies", "values": @@ -112,5 +109,4 @@ "physical_energy": 0.1 } } - ] -} +] diff --git a/virtupet/data/pudgies/0x10f22.json b/virtupet/data/pudgies/0x10f22.json new file mode 100644 index 0000000..0feae58 --- /dev/null +++ b/virtupet/data/pudgies/0x10f22.json @@ -0,0 +1,157 @@ +{ + "uid": "0x10f22", + "name": "Jadyn", + "dna": [ + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0 + ], + "color": "Vampire", + "personality": "ESFP", + "parents": [ + null, + null + ], + "happiness": 6.283615629740961, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "reading", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x11dbe.json b/virtupet/data/pudgies/0x11dbe.json new file mode 100644 index 0000000..517c3ae --- /dev/null +++ b/virtupet/data/pudgies/0x11dbe.json @@ -0,0 +1,153 @@ +{ + "uid": "0x11dbe", + "name": "Devyn", + "dna": [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0 + ], + "color": "Vampire", + "personality": "ESFP", + "parents": [ + null, + null + ], + "happiness": 3.2392281679259907, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x12bc0.json b/virtupet/data/pudgies/0x12bc0.json new file mode 100644 index 0000000..ac6da39 --- /dev/null +++ b/virtupet/data/pudgies/0x12bc0.json @@ -0,0 +1,153 @@ +{ + "uid": "0x12bc0", + "name": "Savannah", + "dna": [ + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1 + ], + "color": "Red", + "personality": "INTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x146f9.json b/virtupet/data/pudgies/0x146f9.json new file mode 100644 index 0000000..6d7d6ce --- /dev/null +++ b/virtupet/data/pudgies/0x146f9.json @@ -0,0 +1,153 @@ +{ + "uid": "0x146f9", + "name": "Corbin", + "dna": [ + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0 + ], + "color": "Blue", + "personality": "INTJ", + "parents": [ + null, + null + ], + "happiness": 3.7435782950469365, + "known_decisions": [ + { + "name": "nothing", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14918.json b/virtupet/data/pudgies/0x14918.json new file mode 100644 index 0000000..2eda6a6 --- /dev/null +++ b/virtupet/data/pudgies/0x14918.json @@ -0,0 +1,153 @@ +{ + "uid": "0x14918", + "name": "Jaylen", + "dna": [ + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1 + ], + "color": "Vampire", + "personality": "ESTP", + "parents": [ + null, + null + ], + "happiness": 3.0170367955205712, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14e47.json b/virtupet/data/pudgies/0x14e47.json new file mode 100644 index 0000000..c157404 --- /dev/null +++ b/virtupet/data/pudgies/0x14e47.json @@ -0,0 +1,153 @@ +{ + "uid": "0x14e47", + "name": "Dakota", + "dna": [ + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1 + ], + "color": "Blue", + "personality": "ENFJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14f48.json b/virtupet/data/pudgies/0x14f48.json new file mode 100644 index 0000000..1e76d7e --- /dev/null +++ b/virtupet/data/pudgies/0x14f48.json @@ -0,0 +1,177 @@ +{ + "uid": "0x14f48", + "name": "Nehemiah", + "dna": [ + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "color": "Angel", + "personality": "ISFJ", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "meditate", + "count": 1 + }, + { + "name": "push_car", + "count": 13 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "roll_ball", + "count": 1 + }, + { + "name": "eat_cake", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x16fe1.json b/virtupet/data/pudgies/0x16fe1.json new file mode 100644 index 0000000..b299b5c --- /dev/null +++ b/virtupet/data/pudgies/0x16fe1.json @@ -0,0 +1,153 @@ +{ + "uid": "0x16fe1", + "name": "Memphis", + "dna": [ + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1 + ], + "color": "Blue", + "personality": "ENTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x18f1.json b/virtupet/data/pudgies/0x18f1.json new file mode 100644 index 0000000..bb8d94c --- /dev/null +++ b/virtupet/data/pudgies/0x18f1.json @@ -0,0 +1,181 @@ +{ + "uid": "0x18f1", + "name": "Camilla", + "dna": [ + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1 + ], + "color": "Green", + "personality": "ENFP", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "meditate", + "count": 1 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "roll_ball", + "count": 7 + }, + { + "name": "reading", + "count": 1 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "eat_cake", + "count": 1 + }, + { + "name": "push_car", + "count": 6 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1bec.json b/virtupet/data/pudgies/0x1bec.json new file mode 100644 index 0000000..a1d4aca --- /dev/null +++ b/virtupet/data/pudgies/0x1bec.json @@ -0,0 +1,153 @@ +{ + "uid": "0x1bec", + "name": "Jonathan", + "dna": [ + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1 + ], + "color": "Midnight", + "personality": "ENTJ", + "parents": [ + null, + null + ], + "happiness": 3.916994691111455, + "known_decisions": [ + { + "name": "nothing", + "count": 2 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1dc8.json b/virtupet/data/pudgies/0x1dc8.json new file mode 100644 index 0000000..bb1c9b5 --- /dev/null +++ b/virtupet/data/pudgies/0x1dc8.json @@ -0,0 +1,153 @@ +{ + "uid": "0x1dc8", + "name": "Anika", + "dna": [ + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1 + ], + "color": "Midnight", + "personality": "ENFJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1e15.json b/virtupet/data/pudgies/0x1e15.json new file mode 100644 index 0000000..04309f7 --- /dev/null +++ b/virtupet/data/pudgies/0x1e15.json @@ -0,0 +1,153 @@ +{ + "uid": "0x1e15", + "name": "Finn", + "dna": [ + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1 + ], + "color": "Green", + "personality": "ENTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x2506.json b/virtupet/data/pudgies/0x2506.json new file mode 100644 index 0000000..e7216d8 --- /dev/null +++ b/virtupet/data/pudgies/0x2506.json @@ -0,0 +1,157 @@ +{ + "uid": "0x2506", + "name": "Ariana", + "dna": [ + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1 + ], + "color": "Blue", + "personality": "INFJ", + "parents": [ + null, + null + ], + "happiness": 5.1044258433384, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "sleep", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x30.json b/virtupet/data/pudgies/0x30.json new file mode 100644 index 0000000..553fc8a --- /dev/null +++ b/virtupet/data/pudgies/0x30.json @@ -0,0 +1,157 @@ +{ + "uid": "0x30", + "name": "Danika", + "dna": [ + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1 + ], + "color": "Blue", + "personality": "ENTP", + "parents": [ + null, + null + ], + "happiness": 3.8286040709700058, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "meditate", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x340c.json b/virtupet/data/pudgies/0x340c.json new file mode 100644 index 0000000..36b54db --- /dev/null +++ b/virtupet/data/pudgies/0x340c.json @@ -0,0 +1,173 @@ +{ + "uid": "0x340c", + "name": "Dustin", + "dna": [ + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1 + ], + "color": "Angel", + "personality": "ESTJ", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "roll_ball", + "count": 16 + }, + { + "name": "eat_cake", + "count": 1 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "meditate", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x3526.json b/virtupet/data/pudgies/0x3526.json new file mode 100644 index 0000000..a9b49ac --- /dev/null +++ b/virtupet/data/pudgies/0x3526.json @@ -0,0 +1,173 @@ +{ + "uid": "0x3526", + "name": "Zara", + "dna": [ + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1 + ], + "color": "White", + "personality": "ISFJ", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 4 + }, + { + "name": "eat_cake", + "count": 2 + }, + { + "name": "roll_ball", + "count": 2 + }, + { + "name": "push_car", + "count": 11 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "sleep", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x46a7.json b/virtupet/data/pudgies/0x46a7.json new file mode 100644 index 0000000..eefe584 --- /dev/null +++ b/virtupet/data/pudgies/0x46a7.json @@ -0,0 +1,157 @@ +{ + "uid": "0x46a7", + "name": "Kamden", + "dna": [ + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ], + "color": "White", + "personality": "ENFJ", + "parents": [ + null, + null + ], + "happiness": 3.242076363414334, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "meditate", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x551.json b/virtupet/data/pudgies/0x551.json new file mode 100644 index 0000000..a74c053 --- /dev/null +++ b/virtupet/data/pudgies/0x551.json @@ -0,0 +1,153 @@ +{ + "uid": "0x551", + "name": "Micah", + "dna": [ + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0 + ], + "color": "Vampire", + "personality": "ISTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x61cb.json b/virtupet/data/pudgies/0x61cb.json new file mode 100644 index 0000000..61348ed --- /dev/null +++ b/virtupet/data/pudgies/0x61cb.json @@ -0,0 +1,173 @@ +{ + "uid": "0x61cb", + "name": "Justice", + "dna": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0 + ], + "color": "Red", + "personality": "ISTJ", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "eat_cake", + "count": 2 + }, + { + "name": "push_car", + "count": 16 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "reading", + "count": 1 + }, + { + "name": "meditate", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x6ef3.json b/virtupet/data/pudgies/0x6ef3.json new file mode 100644 index 0000000..ce538d6 --- /dev/null +++ b/virtupet/data/pudgies/0x6ef3.json @@ -0,0 +1,153 @@ +{ + "uid": "0x6ef3", + "name": "Ariana", + "dna": [ + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0 + ], + "color": "Angel", + "personality": "INTP", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x88c3.json b/virtupet/data/pudgies/0x88c3.json new file mode 100644 index 0000000..19d1f1c --- /dev/null +++ b/virtupet/data/pudgies/0x88c3.json @@ -0,0 +1,153 @@ +{ + "uid": "0x88c3", + "name": "Rayne", + "dna": [ + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0 + ], + "color": "Purple", + "personality": "ENTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xc51f.json b/virtupet/data/pudgies/0xc51f.json new file mode 100644 index 0000000..69dec8d --- /dev/null +++ b/virtupet/data/pudgies/0xc51f.json @@ -0,0 +1,177 @@ +{ + "uid": "0xc51f", + "name": "Channing", + "dna": [ + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0 + ], + "color": "Purple", + "personality": "INTP", + "parents": [ + null, + null + ], + "happiness": 10, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "reading", + "count": 1 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "eat_cake", + "count": 9 + }, + { + "name": "meditate", + "count": 1 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "roll_ball", + "count": 5 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xc6e.json b/virtupet/data/pudgies/0xc6e.json new file mode 100644 index 0000000..6787dc9 --- /dev/null +++ b/virtupet/data/pudgies/0xc6e.json @@ -0,0 +1,153 @@ +{ + "uid": "0xc6e", + "name": "Nelson", + "dna": [ + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1 + ], + "color": "Angel", + "personality": "ISFJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xd403.json b/virtupet/data/pudgies/0xd403.json new file mode 100644 index 0000000..112303c --- /dev/null +++ b/virtupet/data/pudgies/0xd403.json @@ -0,0 +1,153 @@ +{ + "uid": "0xd403", + "name": "Landen", + "dna": [ + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0 + ], + "color": "Purple", + "personality": "ENFJ", + "parents": [ + null, + null + ], + "happiness": 3.5538269738558705, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xd687.json b/virtupet/data/pudgies/0xd687.json new file mode 100644 index 0000000..e3b7abf --- /dev/null +++ b/virtupet/data/pudgies/0xd687.json @@ -0,0 +1,157 @@ +{ + "uid": "0xd687", + "name": "Wendy", + "dna": [ + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1 + ], + "color": "Green", + "personality": "ISTJ", + "parents": [ + null, + null + ], + "happiness": 3.7676232362400612, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "push_car", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xfa7f.json b/virtupet/data/pudgies/0xfa7f.json new file mode 100644 index 0000000..e2f1c3a --- /dev/null +++ b/virtupet/data/pudgies/0xfa7f.json @@ -0,0 +1,153 @@ +{ + "uid": "0xfa7f", + "name": "Clara", + "dna": [ + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0 + ], + "color": "White", + "personality": "ESTJ", + "parents": [ + null, + null + ], + "happiness": 0.5, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/main.py b/virtupet/main.py index 9f98c04..9fb56bf 100644 --- a/virtupet/main.py +++ b/virtupet/main.py @@ -62,7 +62,7 @@ def main(): done = False - clock = pygame.time.Clock() + game_clock = pygame.time.Clock() # ----------- JSON objects ------------ # handler.load_file("./data/metadata.json") @@ -72,8 +72,7 @@ def main(): # for char in number: # node = node[char] - agent.make_decision() - + frames_run = 0 # --------------Main While loop--------------- while not done: @@ -117,11 +116,23 @@ def main(): screen.blit(clockSurface, clockRect) - clock.tick(30) + game_clock.tick(30) + + if int(time_clock.get_minutes()) % 15 == 0 and frames_run == 0: + for pudgi in active_agent_list: + pudgi.make_decision() + pygame.display.flip() - # agent.export_to_json() + frames_run += 1 + + if frames_run > 30: + frames_run = 0 + + for pudgi in active_agent_list: + pudgi.export_to_json() + pygame.quit() From f757f85f55dba6b703b67e9c50207e6f49732686 Mon Sep 17 00:00:00 2001 From: Kcunningham20 <31940556+Kcunningham20@users.noreply.github.com> Date: Fri, 27 Apr 2018 18:08:29 -0700 Subject: [PATCH 3/3] edit parent spawning and decision heuristic --- virtupet/.idea/misc.xml | 2 +- virtupet/Pudgi.py | 19 +- .../pudgies/{0xd403.json => 0x10404.json} | 64 +++---- .../data/pudgies/{0x551.json => 0x116eb.json} | 64 +++---- .../data/pudgies/{0x30.json => 0x127.json} | 66 ++++--- virtupet/data/pudgies/0x12bc0.json | 153 --------------- .../pudgies/{0x10f22.json => 0x135c7.json} | 68 +++---- .../pudgies/{0x1bec.json => 0x14362.json} | 70 ++++--- virtupet/data/pudgies/0x146f9.json | 153 --------------- virtupet/data/pudgies/0x14f48.json | 177 ----------------- .../data/pudgies/{0xc6e.json => 0x15c85.json} | 66 +++---- virtupet/data/pudgies/0x1664c.json | 165 ++++++++++++++++ virtupet/data/pudgies/0x16fe1.json | 153 --------------- .../data/pudgies/{0xfa7f.json => 0x172a.json} | 70 +++---- .../pudgies/{0x14e47.json => 0x17402.json} | 66 ++++--- .../pudgies/{0x2506.json => 0x176a2.json} | 62 +++--- virtupet/data/pudgies/0x18f1.json | 181 ------------------ virtupet/data/pudgies/0x1dc8.json | 153 --------------- virtupet/data/pudgies/0x1e15.json | 153 --------------- virtupet/data/pudgies/0x3526.json | 173 ----------------- virtupet/data/pudgies/0x46a7.json | 157 --------------- .../data/pudgies/{0x340c.json => 0x5c0b.json} | 94 +++++---- virtupet/data/pudgies/0x62f6.json | 161 ++++++++++++++++ virtupet/data/pudgies/0x6ef3.json | 153 --------------- virtupet/data/pudgies/0xbbca.json | 153 +++++++++++++++ virtupet/data/pudgies/0xc51f.json | 177 ----------------- .../data/pudgies/{0x88c3.json => 0xca5f.json} | 72 +++---- .../data/pudgies/{0x61cb.json => 0xcc34.json} | 78 ++++---- .../pudgies/{0x11dbe.json => 0xcc8a.json} | 64 +++---- virtupet/data/pudgies/0xd3f3.json | 165 ++++++++++++++++ .../pudgies/{0x14918.json => 0xe1a8.json} | 74 +++---- .../data/pudgies/{0xd687.json => 0xf709.json} | 72 +++---- virtupet/data/pudgies/default.json | 2 +- virtupet/main.py | 28 +-- 34 files changed, 1204 insertions(+), 2324 deletions(-) rename virtupet/data/pudgies/{0xd403.json => 0x10404.json} (92%) rename virtupet/data/pudgies/{0x551.json => 0x116eb.json} (94%) rename virtupet/data/pudgies/{0x30.json => 0x127.json} (87%) delete mode 100644 virtupet/data/pudgies/0x12bc0.json rename virtupet/data/pudgies/{0x10f22.json => 0x135c7.json} (88%) rename virtupet/data/pudgies/{0x1bec.json => 0x14362.json} (84%) delete mode 100644 virtupet/data/pudgies/0x146f9.json delete mode 100644 virtupet/data/pudgies/0x14f48.json rename virtupet/data/pudgies/{0xc6e.json => 0x15c85.json} (90%) create mode 100644 virtupet/data/pudgies/0x1664c.json delete mode 100644 virtupet/data/pudgies/0x16fe1.json rename virtupet/data/pudgies/{0xfa7f.json => 0x172a.json} (90%) rename virtupet/data/pudgies/{0x14e47.json => 0x17402.json} (83%) rename virtupet/data/pudgies/{0x2506.json => 0x176a2.json} (90%) delete mode 100644 virtupet/data/pudgies/0x18f1.json delete mode 100644 virtupet/data/pudgies/0x1dc8.json delete mode 100644 virtupet/data/pudgies/0x1e15.json delete mode 100644 virtupet/data/pudgies/0x3526.json delete mode 100644 virtupet/data/pudgies/0x46a7.json rename virtupet/data/pudgies/{0x340c.json => 0x5c0b.json} (86%) create mode 100644 virtupet/data/pudgies/0x62f6.json delete mode 100644 virtupet/data/pudgies/0x6ef3.json create mode 100644 virtupet/data/pudgies/0xbbca.json delete mode 100644 virtupet/data/pudgies/0xc51f.json rename virtupet/data/pudgies/{0x88c3.json => 0xca5f.json} (92%) rename virtupet/data/pudgies/{0x61cb.json => 0xcc34.json} (87%) rename virtupet/data/pudgies/{0x11dbe.json => 0xcc8a.json} (92%) create mode 100644 virtupet/data/pudgies/0xd3f3.json rename virtupet/data/pudgies/{0x14918.json => 0xe1a8.json} (90%) rename virtupet/data/pudgies/{0xd687.json => 0xf709.json} (89%) diff --git a/virtupet/.idea/misc.xml b/virtupet/.idea/misc.xml index 9780b6b..0a08196 100644 --- a/virtupet/.idea/misc.xml +++ b/virtupet/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/virtupet/Pudgi.py b/virtupet/Pudgi.py index 7d436f1..998fd07 100644 --- a/virtupet/Pudgi.py +++ b/virtupet/Pudgi.py @@ -323,11 +323,15 @@ def select_parents(active_agent_list): high_happiness = [] parents = [] for pudgi in active_agent_list: - if pudgi.happiness > .8: - high_happiness.append(pudgi.uid) + if pudgi.happiness > 9: + high_happiness.append(pudgi) for i in range(len(high_happiness)): if len(high_happiness) >= 2: - parents.append((high_happiness.pop(), high_happiness.pop())) + parent01 = high_happiness.pop() + parent02 = high_happiness.pop() + parents.append((parent01.uid, parent02.uid)) + parent01.happiness = 2.0 + parent02.happiness = 2.0 return parents @@ -384,9 +388,9 @@ def make_decision(self): if dec["name"] == name: t = dec["count"] - happiness = pow(ent, t) * ((pow(att, w_att))+(pow(hum, w_hum))+(pow(enj, w_enj)) + + happiness = .5 * (pow(ent, t) + ((pow(att, w_att))+(pow(hum, w_hum))+(pow(enj, w_enj)) + (pow(exc, w_exc)) + (pow(conf, w_conf))+(pow(cont, w_cont)) - - (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))) + (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment)))) if happiness > happiness_optimized: happiness_optimized = happiness @@ -413,9 +417,9 @@ def make_decision(self): ment = choice["values"]["mental_energy"] ent = choice["values"]["entertainment"] - happiness_optimized = pow(ent, t)*((pow(att, w_att)) + (pow(hum, w_hum)) + (pow(enj, w_enj)) + + happiness_optimized = .5 * (pow(ent, t)+((pow(att, w_att)) + (pow(hum, w_hum)) + (pow(enj, w_enj)) + (pow(exc, w_exc)) + (pow(conf, w_conf)) + (pow(cont, w_cont)) - - (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment))) + (pow(vit, w_vit)) - (pow(phy, w_phy)) - (pow(ment, w_ment)))) self.known_decisions.append({"name": choice["name"], "count": 0}) choice_index = len(self.known_decisions) - 1 @@ -437,3 +441,4 @@ def make_decision(self): print("Happiness increased by: " + str(happiness_optimized)) print("Times chosen: " + str(self.known_decisions[choice_index]["count"])) print("---------------------------------------------") + print(str(self.name) + "'s Happiness: " + str(self.happiness)) diff --git a/virtupet/data/pudgies/0xd403.json b/virtupet/data/pudgies/0x10404.json similarity index 92% rename from virtupet/data/pudgies/0xd403.json rename to virtupet/data/pudgies/0x10404.json index 112303c..3a4a041 100644 --- a/virtupet/data/pudgies/0xd403.json +++ b/virtupet/data/pudgies/0x10404.json @@ -1,38 +1,47 @@ { - "uid": "0xd403", - "name": "Landen", + "uid": "0x10404", + "name": "Jaidyn", "dna": [ - 1, 0, 0, - 1, + 0, 0, 1, 1, 1, - 0, - 1, - 0, 1, 1, + 0, + 0, 1, 0, 0, + 0, 1, 0, + 0, 1, 0, 0, + 0, + 1, + 0, + 1, + 1, + 1, 1, 1, 0, + 1, + 0, + 1, 0, 1, 1, 1, 1, 0, - 0, + 1, 1, 0, 0, @@ -42,31 +51,27 @@ 0, 1, 0, - 1, 0, 1, - 1, 0, - 1, 0, - 1, - 1, 0, 0, 1, 0, 0, 1, - 1, 0, - 1, 0, + 1, 0, + 1, + 1, 0, 0, 1, 1, - 1, + 0, 0, 1, 1, @@ -75,24 +80,21 @@ 0, 0, 0, - 1, - 1, 0, 0, - 1, + 0, 1, 1, 1, 0, - 0, + 1, 0, 1, 1, - 0, - 0, + 1, 1, 0, - 0, + 1, 1, 1, 0, @@ -101,49 +103,47 @@ 1, 1, 0, - 0, 1, 0, - 0, + 1, 0, 1, 1, 0, 0, 1, + 1, 0, 0, 0, 1, - 0, + 1, 1, 0, 0, 0, - 1, + 0, 1, 0, + 1, 0, 0, 1, 1, - 0, 1, - 0, 1, - 0, 1, 0, 1, 0 ], "color": "Purple", - "personality": "ENFJ", + "personality": "ISTJ", "parents": [ null, null ], - "happiness": 3.5538269738558705, + "happiness": 4.9400687759036614, "known_decisions": [ { "name": "nothing", diff --git a/virtupet/data/pudgies/0x551.json b/virtupet/data/pudgies/0x116eb.json similarity index 94% rename from virtupet/data/pudgies/0x551.json rename to virtupet/data/pudgies/0x116eb.json index a74c053..634fff9 100644 --- a/virtupet/data/pudgies/0x551.json +++ b/virtupet/data/pudgies/0x116eb.json @@ -1,15 +1,14 @@ { - "uid": "0x551", - "name": "Micah", + "uid": "0x116eb", + "name": "Caroline", "dna": [ 1, 1, 1, 0, - 0, - 1, - 1, 1, + 0, + 0, 1, 1, 1, @@ -18,36 +17,37 @@ 0, 0, 0, - 0, 1, 0, - 1, - 1, 0, 0, 0, 1, - 0, - 0, 1, - 0, + 1, 1, 0, 0, 0, - 1, - 1, 0, 1, 0, 0, 0, + 0, 1, + 0, 1, 1, 1, 0, 0, + 0, + 0, + 1, + 0, + 1, + 1, 1, 1, 1, @@ -56,50 +56,49 @@ 0, 0, 1, - 0, 1, 0, 0, 1, 0, - 1, 0, 0, 0, 1, 0, - 1, - 1, 0, 1, 1, + 0, 1, 1, + 0, 1, - 1, + 0, 1, 1, 0, + 0, 1, 0, 0, 0, 1, 0, - 0, - 0, + 1, 0, 0, 1, - 0, 1, 1, 0, - 0, + 1, 0, 0, 1, + 0, 1, + 0, 1, 1, 0, @@ -110,40 +109,41 @@ 1, 0, 0, + 0, + 0, 1, 0, + 0, + 0, + 1, 1, 1, 1, 1, 1, - 0, - 0, 1, - 0, - 0, - 0, - 0, - 0, - 0, 0, 1, 0, + 1, 0, + 1, + 1, 0, 0, 0, 0, 1, + 1, 0 ], "color": "Vampire", - "personality": "ISTJ", + "personality": "ISFJ", "parents": [ null, null ], - "happiness": 0.5, + "happiness": 3.0, "known_decisions": [ { "name": "nothing", diff --git a/virtupet/data/pudgies/0x30.json b/virtupet/data/pudgies/0x127.json similarity index 87% rename from virtupet/data/pudgies/0x30.json rename to virtupet/data/pudgies/0x127.json index 553fc8a..92ca5f5 100644 --- a/virtupet/data/pudgies/0x30.json +++ b/virtupet/data/pudgies/0x127.json @@ -1,35 +1,30 @@ { - "uid": "0x30", - "name": "Danika", + "uid": "0x127", + "name": "Savanna", "dna": [ - 0, - 0, - 1, 1, 0, - 1, 0, - 1, 0, - 1, - 1, 0, 0, 0, - 1, 0, 1, 1, + 1, 0, 1, + 1, 0, 0, 1, - 0, + 1, + 1, + 1, 0, 0, 1, - 0, 1, 0, 1, @@ -38,7 +33,6 @@ 0, 1, 0, - 0, 1, 1, 0, @@ -47,32 +41,31 @@ 1, 1, 0, - 0, + 1, + 1, 0, 1, 0, + 0, 1, 1, 1, 0, 1, 0, - 0, 1, - 0, 1, 1, 0, 0, 0, 0, - 0, - 1, 1, 0, 1, 1, 0, + 0, 1, 1, 1, @@ -84,22 +77,29 @@ 1, 0, 1, - 1, - 0, - 1, 0, 0, 1, 1, 1, 0, + 1, + 1, + 1, 0, 1, 0, 1, + 0, 1, + 0, 1, + 0, 1, + 0, + 0, + 0, + 0, 1, 0, 1, @@ -112,45 +112,49 @@ 0, 0, 0, - 0, 1, + 0, 1, + 0, 1, + 0, 1, 1, 0, 1, + 1, + 1, + 0, 0, 0, 0, - 1, 0, 1, 1, - 0, 1, 1, 0, 0, - 1, - 0, - 1, 1 ], - "color": "Blue", - "personality": "ENTP", + "color": "Midnight", + "personality": "ENTJ", "parents": [ null, null ], - "happiness": 3.8286040709700058, + "happiness": 2.001426294207687, "known_decisions": [ { "name": "nothing", "count": 0 }, { - "name": "meditate", + "name": "roll_ball", + "count": 1 + }, + { + "name": "sleep", "count": 1 } ] diff --git a/virtupet/data/pudgies/0x12bc0.json b/virtupet/data/pudgies/0x12bc0.json deleted file mode 100644 index ac6da39..0000000 --- a/virtupet/data/pudgies/0x12bc0.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x12bc0", - "name": "Savannah", - "dna": [ - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1 - ], - "color": "Red", - "personality": "INTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x10f22.json b/virtupet/data/pudgies/0x135c7.json similarity index 88% rename from virtupet/data/pudgies/0x10f22.json rename to virtupet/data/pudgies/0x135c7.json index 0feae58..ca9e5f1 100644 --- a/virtupet/data/pudgies/0x10f22.json +++ b/virtupet/data/pudgies/0x135c7.json @@ -1,20 +1,17 @@ { - "uid": "0x10f22", - "name": "Jadyn", + "uid": "0x135c7", + "name": "Remy", "dna": [ - 1, - 1, - 0, 0, 0, 1, 1, - 0, + 1, 1, 1, 0, 0, - 0, + 1, 0, 0, 0, @@ -24,95 +21,96 @@ 0, 1, 1, - 1, 0, - 1, 0, 1, 1, 1, 1, 1, - 0, - 0, 1, 0, 0, 0, - 1, 0, 0, 0, 1, - 0, - 0, 1, 1, - 0, - 0, + 1, 0, 1, 1, 0, 1, - 0, + 1, + 1, + 1, 0, 0, 1, 0, 1, 1, - 1, - 0, 0, 1, 1, - 0, - 0, 1, + 1, + 0, 0, 0, 1, + 1, 0, 0, 0, 1, + 0, 1, 1, 1, 0, - 1, - 1, + 0, 0, 1, 1, + 0, 1, - 1, - 1, + 0, 1, 0, 1, + 0, 1, 1, + 0, 1, + 0, 1, 0, 1, 0, 0, + 0, 1, 1, 0, 0, 0, 1, + 0, 1, 1, 1, + 0, 1, 0, 0, - 1, + 0, + 0, + 0, 1, 0, 0, @@ -120,37 +118,39 @@ 0, 0, 0, - 1, + 0, + 0, 0, 0, 1, 1, - 1, + 0, 0, 1, + 0, + 0, + 0, 1, 1, 0, 1, 1, - 0, - 0, 0 ], - "color": "Vampire", - "personality": "ESFP", + "color": "White", + "personality": "INTP", "parents": [ null, null ], - "happiness": 6.283615629740961, + "happiness": 3.933562213656309, "known_decisions": [ { "name": "nothing", "count": 1 }, { - "name": "reading", + "name": "meditate", "count": 1 } ] diff --git a/virtupet/data/pudgies/0x1bec.json b/virtupet/data/pudgies/0x14362.json similarity index 84% rename from virtupet/data/pudgies/0x1bec.json rename to virtupet/data/pudgies/0x14362.json index a1d4aca..101586a 100644 --- a/virtupet/data/pudgies/0x1bec.json +++ b/virtupet/data/pudgies/0x14362.json @@ -1,19 +1,25 @@ { - "uid": "0x1bec", - "name": "Jonathan", + "uid": "0x14362", + "name": "Makenzie", "dna": [ + 0, 1, 1, 0, - 1, 0, 0, + 1, + 0, 0, 0, 0, 1, + 1, 0, 0, + 1, + 1, + 1, 0, 0, 0, @@ -22,78 +28,76 @@ 1, 1, 0, + 0, 1, 0, 1, 1, 0, 0, - 0, 1, 0, 0, 0, - 1, 0, - 1, 0, 0, + 1, 0, 1, 1, 1, + 0, + 0, 1, 1, + 0, + 0, + 1, 1, 0, 0, 0, + 1, 0, 0, 0, 1, - 1, + 0, 0, 1, 1, 0, - 0, - 0, + 1, 1, 1, 0, 0, 0, 1, + 1, 0, 0, 0, 1, 0, 1, - 0, 1, 0, + 1, 0, 0, 0, 1, 0, - 1, 0, - 1, 0, 1, 0, 0, - 0, - 1, - 1, - 1, - 1, - 1, 1, 0, + 0, 1, 0, 0, @@ -101,27 +105,23 @@ 1, 1, 1, - 0, - 0, - 1, - 1, 1, 0, 0, - 1, 0, 0, - 1, + 0, 0, 0, 1, 1, + 1, 0, 1, 1, 1, - 0, - 0, + 1, + 1, 0, 0, 1, @@ -132,22 +132,30 @@ 0, 0, 1, + 1, 0, 0, - 0, - 1 + 0 ], "color": "Midnight", - "personality": "ENTJ", + "personality": "ISTP", "parents": [ null, null ], - "happiness": 3.916994691111455, + "happiness": 7.74372861565943, "known_decisions": [ { "name": "nothing", - "count": 2 + "count": 4 + }, + { + "name": "eat_veggies", + "count": 1 + }, + { + "name": "meditate", + "count": 1 } ] } \ No newline at end of file diff --git a/virtupet/data/pudgies/0x146f9.json b/virtupet/data/pudgies/0x146f9.json deleted file mode 100644 index 6d7d6ce..0000000 --- a/virtupet/data/pudgies/0x146f9.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x146f9", - "name": "Corbin", - "dna": [ - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0 - ], - "color": "Blue", - "personality": "INTJ", - "parents": [ - null, - null - ], - "happiness": 3.7435782950469365, - "known_decisions": [ - { - "name": "nothing", - "count": 2 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14f48.json b/virtupet/data/pudgies/0x14f48.json deleted file mode 100644 index 1e76d7e..0000000 --- a/virtupet/data/pudgies/0x14f48.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "uid": "0x14f48", - "name": "Nehemiah", - "dna": [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "color": "Angel", - "personality": "ISFJ", - "parents": [ - null, - null - ], - "happiness": 10, - "known_decisions": [ - { - "name": "nothing", - "count": 1 - }, - { - "name": "meditate", - "count": 1 - }, - { - "name": "push_car", - "count": 13 - }, - { - "name": "sleep", - "count": 1 - }, - { - "name": "eat_veggies", - "count": 1 - }, - { - "name": "roll_ball", - "count": 1 - }, - { - "name": "eat_cake", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xc6e.json b/virtupet/data/pudgies/0x15c85.json similarity index 90% rename from virtupet/data/pudgies/0xc6e.json rename to virtupet/data/pudgies/0x15c85.json index 6787dc9..d9e9fc9 100644 --- a/virtupet/data/pudgies/0xc6e.json +++ b/virtupet/data/pudgies/0x15c85.json @@ -1,59 +1,50 @@ { - "uid": "0xc6e", - "name": "Nelson", + "uid": "0x15c85", + "name": "Tania", "dna": [ - 1, + 0, 0, 0, 0, 1, 1, - 0, 1, 0, 0, 0, - 1, 0, 0, 0, 0, - 0, - 1, - 0, 1, 1, 0, 0, 0, 0, - 1, 0, 0, - 1, 0, 1, + 0, 1, 0, 1, + 1, 0, 0, 0, 0, 1, 0, - 1, + 0, 0, 1, 1, 0, - 0, - 0, - 0, - 0, 1, - 0, - 0, + 1, + 1, 0, 1, 0, @@ -61,8 +52,12 @@ 0, 1, 0, + 1, 0, + 1, + 1, 0, + 1, 0, 1, 1, @@ -75,79 +70,84 @@ 0, 0, 1, + 1, + 1, 0, 0, 0, 1, - 1, + 0, 1, 0, 0, 0, - 1, 0, 0, 0, 1, - 1, 0, 1, 1, 1, - 0, 1, - 0, + 1, 1, 0, 0, 1, 1, - 1, + 0, 0, 1, 1, 0, - 1, + 0, + 0, + 0, + 0, 1, 1, 1, 1, 0, - 0, - 0, 1, 1, 0, - 0, - 1, 1, + 0, 1, 1, + 0, 1, 0, 0, 1, 0, - 0, + 1, + 1, 1, 1, 0, 1, 1, + 0, + 1, + 0, + 0, 1, 1 ], - "color": "Angel", - "personality": "ISFJ", + "color": "Green", + "personality": "INTP", "parents": [ null, null ], - "happiness": 0.5, + "happiness": 7.3352723166997436, "known_decisions": [ { "name": "nothing", - "count": 0 + "count": 2 } ] } \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1664c.json b/virtupet/data/pudgies/0x1664c.json new file mode 100644 index 0000000..e55f8a6 --- /dev/null +++ b/virtupet/data/pudgies/0x1664c.json @@ -0,0 +1,165 @@ +{ + "uid": "0x1664c", + "name": "Ivy", + "dna": [ + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1 + ], + "color": "Angel", + "personality": "ESTJ", + "parents": [ + null, + null + ], + "happiness": 5.166811523731614, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + }, + { + "name": "push_car", + "count": 8 + }, + { + "name": "sleep", + "count": 1 + }, + { + "name": "eat_cake", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x16fe1.json b/virtupet/data/pudgies/0x16fe1.json deleted file mode 100644 index b299b5c..0000000 --- a/virtupet/data/pudgies/0x16fe1.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x16fe1", - "name": "Memphis", - "dna": [ - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1 - ], - "color": "Blue", - "personality": "ENTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xfa7f.json b/virtupet/data/pudgies/0x172a.json similarity index 90% rename from virtupet/data/pudgies/0xfa7f.json rename to virtupet/data/pudgies/0x172a.json index e2f1c3a..dd1545f 100644 --- a/virtupet/data/pudgies/0xfa7f.json +++ b/virtupet/data/pudgies/0x172a.json @@ -1,68 +1,76 @@ { - "uid": "0xfa7f", - "name": "Clara", + "uid": "0x172a", + "name": "Bethany", "dna": [ - 1, 0, + 1, 0, 0, 1, 1, - 1, - 1, 0, - 1, 0, 0, 1, 0, + 0, + 0, 1, 1, - 0, 1, 1, 0, 0, 0, - 0, - 0, 1, 1, 0, 1, - 1, 0, 0, 1, - 1, - 1, 0, 0, + 1, + 1, 0, 0, 1, 1, 1, 1, + 0, 1, + 0, 1, 0, + 1, + 1, + 0, + 0, 0, 1, + 0, + 0, + 0, 1, 0, 1, 1, 0, 0, + 1, + 0, 0, 1, 1, + 1, 0, 1, + 0, + 0, 1, 1, - 0, 1, 1, 1, @@ -70,12 +78,10 @@ 0, 0, 0, - 1, - 0, - 1, 0, 0, 1, + 1, 0, 0, 1, @@ -87,67 +93,61 @@ 1, 0, 1, + 1, + 1, + 1, 0, + 1, 0, 1, 1, 1, - 0, 1, 0, 0, 0, + 0, 1, - 1, + 0, 1, 0, 0, 1, 1, - 0, + 1, 0, 1, 0, 0, 0, - 1, 0, 0, 0, - 1, 0, 1, 1, - 0, - 0, 1, 1, - 0, - 1, - 0, 1, 0, - 0, - 0, 1, 0, 1, - 0, 1, 1, - 0 + 1 ], - "color": "White", + "color": "Purple", "personality": "ESTJ", "parents": [ - null, - null + "0x5c0b", + "0x1664c" ], - "happiness": 0.5, + "happiness": 8.544700546452308, "known_decisions": [ { "name": "nothing", - "count": 0 + "count": 4 } ] } \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14e47.json b/virtupet/data/pudgies/0x17402.json similarity index 83% rename from virtupet/data/pudgies/0x14e47.json rename to virtupet/data/pudgies/0x17402.json index c157404..1299d5e 100644 --- a/virtupet/data/pudgies/0x14e47.json +++ b/virtupet/data/pudgies/0x17402.json @@ -1,37 +1,42 @@ { - "uid": "0x14e47", - "name": "Dakota", + "uid": "0x17402", + "name": "Efrain", "dna": [ - 0, 1, 1, - 0, 1, + 0, 1, 1, 1, 0, 1, + 1, 0, 0, 1, - 0, 1, - 0, 1, 1, + 0, 1, 0, 0, 1, 0, + 0, + 0, + 0, + 0, + 0, 1, 1, 1, - 0, - 1, 1, 0, + 0, + 0, + 1, 1, 1, 1, @@ -39,26 +44,21 @@ 0, 1, 1, - 0, - 0, 1, 1, 1, 1, - 0, 1, 1, - 0, - 0, - 0, 1, 1, + 0, + 0, 1, 1, 1, 1, 0, - 0, 1, 0, 0, @@ -67,19 +67,17 @@ 0, 0, 0, - 1, 0, + 1, 0, 1, 1, 0, 1, - 0, - 0, 1, + 0, 1, 1, - 0, 1, 1, 1, @@ -87,22 +85,19 @@ 0, 1, 1, - 0, 1, 1, 0, - 0, - 0, - 1, 1, 1, 1, 1, 0, 0, - 1, + 0, 1, 0, + 0, 1, 0, 1, @@ -110,23 +105,26 @@ 0, 0, 1, - 0, 1, 1, 0, 1, + 1, + 0, + 0, 0, 1, 1, + 0, 1, 1, - 0, 1, 1, 1, 1, 0, 0, + 1, 0, 0, 1, @@ -135,19 +133,29 @@ 1, 0, 1, + 1, + 1, 1 ], - "color": "Blue", - "personality": "ENFJ", + "color": "Angel", + "personality": "INTP", "parents": [ null, null ], - "happiness": 0.5, + "happiness": 3.159129889855766, "known_decisions": [ { "name": "nothing", "count": 0 + }, + { + "name": "eat_cake", + "count": 1 + }, + { + "name": "reading", + "count": 3 } ] } \ No newline at end of file diff --git a/virtupet/data/pudgies/0x2506.json b/virtupet/data/pudgies/0x176a2.json similarity index 90% rename from virtupet/data/pudgies/0x2506.json rename to virtupet/data/pudgies/0x176a2.json index e7216d8..daac531 100644 --- a/virtupet/data/pudgies/0x2506.json +++ b/virtupet/data/pudgies/0x176a2.json @@ -1,14 +1,16 @@ { - "uid": "0x2506", - "name": "Ariana", + "uid": "0x176a2", + "name": "Lukas", "dna": [ - 0, 1, 0, + 1, 0, 0, 1, - 1, + 0, + 0, + 0, 0, 1, 0, @@ -21,40 +23,31 @@ 0, 0, 1, - 1, - 1, + 0, + 0, 0, 1, 1, 1, - 0, 1, 1, 0, 1, - 1, 0, 1, - 1, 0, - 1, - 1, 0, 0, - 1, - 1, - 1, 0, 0, 1, 1, 1, 1, - 0, - 1, 1, 0, 0, + 1, 0, 1, 1, @@ -62,26 +55,24 @@ 0, 1, 0, - 1, - 1, - 0, - 1, 0, 0, 0, 1, 1, - 0, - 0, + 1, 1, 0, 1, 0, + 0, 1, 1, + 0, 1, 0, 0, + 1, 0, 1, 0, @@ -90,20 +81,24 @@ 0, 1, 1, + 0, 1, 1, - 0, - 0, 1, 0, 1, 0, 0, + 1, 0, 1, 1, 1, + 1, 0, + 1, + 1, + 1, 0, 0, 1, @@ -112,45 +107,50 @@ 1, 0, 0, - 0, - 0, 1, 1, 1, - 0, + 1, + 1, 0, 1, 1, 1, - 0, 1, 1, 1, 0, + 1, + 1, 0, 1, + 1, + 1, 0, 1, 1, + 1, + 1, + 1, 0, 1, 0, 1 ], - "color": "Blue", + "color": "Angel", "personality": "INFJ", "parents": [ null, null ], - "happiness": 5.1044258433384, + "happiness": 9.245745024897785, "known_decisions": [ { "name": "nothing", "count": 1 }, { - "name": "sleep", + "name": "eat_veggies", "count": 1 } ] diff --git a/virtupet/data/pudgies/0x18f1.json b/virtupet/data/pudgies/0x18f1.json deleted file mode 100644 index bb8d94c..0000000 --- a/virtupet/data/pudgies/0x18f1.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "uid": "0x18f1", - "name": "Camilla", - "dna": [ - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1 - ], - "color": "Green", - "personality": "ENFP", - "parents": [ - null, - null - ], - "happiness": 10, - "known_decisions": [ - { - "name": "nothing", - "count": 1 - }, - { - "name": "meditate", - "count": 1 - }, - { - "name": "sleep", - "count": 1 - }, - { - "name": "roll_ball", - "count": 7 - }, - { - "name": "reading", - "count": 1 - }, - { - "name": "eat_veggies", - "count": 1 - }, - { - "name": "eat_cake", - "count": 1 - }, - { - "name": "push_car", - "count": 6 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1dc8.json b/virtupet/data/pudgies/0x1dc8.json deleted file mode 100644 index bb1c9b5..0000000 --- a/virtupet/data/pudgies/0x1dc8.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x1dc8", - "name": "Anika", - "dna": [ - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 1 - ], - "color": "Midnight", - "personality": "ENFJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x1e15.json b/virtupet/data/pudgies/0x1e15.json deleted file mode 100644 index 04309f7..0000000 --- a/virtupet/data/pudgies/0x1e15.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x1e15", - "name": "Finn", - "dna": [ - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1 - ], - "color": "Green", - "personality": "ENTJ", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x3526.json b/virtupet/data/pudgies/0x3526.json deleted file mode 100644 index a9b49ac..0000000 --- a/virtupet/data/pudgies/0x3526.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "uid": "0x3526", - "name": "Zara", - "dna": [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1 - ], - "color": "White", - "personality": "ISFJ", - "parents": [ - null, - null - ], - "happiness": 10, - "known_decisions": [ - { - "name": "nothing", - "count": 4 - }, - { - "name": "eat_cake", - "count": 2 - }, - { - "name": "roll_ball", - "count": 2 - }, - { - "name": "push_car", - "count": 11 - }, - { - "name": "eat_veggies", - "count": 1 - }, - { - "name": "sleep", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x46a7.json b/virtupet/data/pudgies/0x46a7.json deleted file mode 100644 index eefe584..0000000 --- a/virtupet/data/pudgies/0x46a7.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "uid": "0x46a7", - "name": "Kamden", - "dna": [ - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ], - "color": "White", - "personality": "ENFJ", - "parents": [ - null, - null - ], - "happiness": 3.242076363414334, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - }, - { - "name": "meditate", - "count": 1 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x340c.json b/virtupet/data/pudgies/0x5c0b.json similarity index 86% rename from virtupet/data/pudgies/0x340c.json rename to virtupet/data/pudgies/0x5c0b.json index 36b54db..d673d7f 100644 --- a/virtupet/data/pudgies/0x340c.json +++ b/virtupet/data/pudgies/0x5c0b.json @@ -1,30 +1,16 @@ { - "uid": "0x340c", - "name": "Dustin", + "uid": "0x5c0b", + "name": "Dana", "dna": [ - 1, - 0, 0, 1, 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, 0, 0, - 1, 0, 0, 0, 1, - 1, - 1, - 0, - 0, 0, 0, 1, @@ -35,24 +21,21 @@ 1, 0, 0, - 1, - 0, 0, 1, 1, + 0, 1, 1, 1, 0, - 0, 1, 1, 0, 1, - 1, 0, 1, - 1, + 0, 0, 0, 1, @@ -60,15 +43,21 @@ 0, 0, 1, - 0, + 1, 1, 1, 0, 0, 0, + 1, 0, + 1, + 1, + 1, + 1, 0, 0, + 1, 0, 0, 1, @@ -77,45 +66,38 @@ 0, 0, 0, - 0, 1, 0, 0, 1, - 0, - 0, - 0, - 0, 1, 1, - 0, - 0, - 0, 1, 1, 1, 0, 0, - 1, - 0, 0, 0, 1, - 0, + 1, 1, 1, 0, + 1, 0, 0, - 0, + 1, + 1, 1, 1, 0, 1, 1, 1, + 1, 0, - 0, + 1, 0, 1, 1, @@ -123,22 +105,40 @@ 1, 1, 1, + 0, + 0, 1, 1, 1, 0, 0, + 0, + 0, 1, + 0, 1, + 0, + 0, + 0, + 0, + 0, 1, - 1, + 0, + 0, + 0, + 0, 0, 1, 0, - 1 + 1, + 1, + 1, + 1, + 1, + 0 ], - "color": "Angel", - "personality": "ESTJ", + "color": "White", + "personality": "ENFJ", "parents": [ null, null @@ -147,26 +147,22 @@ "known_decisions": [ { "name": "nothing", - "count": 0 + "count": 2 }, { - "name": "roll_ball", - "count": 16 + "name": "push_car", + "count": 4 }, { - "name": "eat_cake", - "count": 1 - }, - { - "name": "sleep", + "name": "eat_veggies", "count": 1 }, { - "name": "eat_veggies", + "name": "meditate", "count": 1 }, { - "name": "meditate", + "name": "sleep", "count": 1 } ] diff --git a/virtupet/data/pudgies/0x62f6.json b/virtupet/data/pudgies/0x62f6.json new file mode 100644 index 0000000..0826bd7 --- /dev/null +++ b/virtupet/data/pudgies/0x62f6.json @@ -0,0 +1,161 @@ +{ + "uid": "0x62f6", + "name": "Paxton", + "dna": [ + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1 + ], + "color": "Blue", + "personality": "ESTJ", + "parents": [ + "0x5c0b", + "0x1664c" + ], + "happiness": 2.5653303772150235, + "known_decisions": [ + { + "name": "nothing", + "count": 3 + }, + { + "name": "meditate", + "count": 2 + }, + { + "name": "eat_veggies", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x6ef3.json b/virtupet/data/pudgies/0x6ef3.json deleted file mode 100644 index ce538d6..0000000 --- a/virtupet/data/pudgies/0x6ef3.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "uid": "0x6ef3", - "name": "Ariana", - "dna": [ - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 0, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0 - ], - "color": "Angel", - "personality": "INTP", - "parents": [ - null, - null - ], - "happiness": 0.5, - "known_decisions": [ - { - "name": "nothing", - "count": 0 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xbbca.json b/virtupet/data/pudgies/0xbbca.json new file mode 100644 index 0000000..42dcbff --- /dev/null +++ b/virtupet/data/pudgies/0xbbca.json @@ -0,0 +1,153 @@ +{ + "uid": "0xbbca", + "name": "Giovanni", + "dna": [ + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "color": "Vampire", + "personality": "ISTJ", + "parents": [ + "0xf709", + "0xd3f3" + ], + "happiness": 3.0, + "known_decisions": [ + { + "name": "nothing", + "count": 0 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0xc51f.json b/virtupet/data/pudgies/0xc51f.json deleted file mode 100644 index 69dec8d..0000000 --- a/virtupet/data/pudgies/0xc51f.json +++ /dev/null @@ -1,177 +0,0 @@ -{ - "uid": "0xc51f", - "name": "Channing", - "dna": [ - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 1, - 1, - 0, - 0, - 0, - 1, - 1, - 0, - 1, - 1, - 1, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0, - 1, - 0 - ], - "color": "Purple", - "personality": "INTP", - "parents": [ - null, - null - ], - "happiness": 10, - "known_decisions": [ - { - "name": "nothing", - "count": 1 - }, - { - "name": "reading", - "count": 1 - }, - { - "name": "sleep", - "count": 1 - }, - { - "name": "eat_cake", - "count": 9 - }, - { - "name": "meditate", - "count": 1 - }, - { - "name": "eat_veggies", - "count": 1 - }, - { - "name": "roll_ball", - "count": 5 - } - ] -} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x88c3.json b/virtupet/data/pudgies/0xca5f.json similarity index 92% rename from virtupet/data/pudgies/0x88c3.json rename to virtupet/data/pudgies/0xca5f.json index 19d1f1c..6df5568 100644 --- a/virtupet/data/pudgies/0x88c3.json +++ b/virtupet/data/pudgies/0xca5f.json @@ -1,6 +1,6 @@ { - "uid": "0x88c3", - "name": "Rayne", + "uid": "0xca5f", + "name": "Felix", "dna": [ 0, 1, @@ -8,6 +8,9 @@ 1, 0, 1, + 1, + 1, + 0, 0, 0, 1, @@ -15,135 +18,132 @@ 1, 0, 1, - 1, - 0, - 0, 0, + 1, 0, 0, 1, 1, 1, + 0, + 1, + 1, 1, 0, 0, 0, 0, 1, + 1, + 1, 0, + 1, + 1, 0, 0, 1, - 0, 1, 1, 0, 1, + 1, + 1, 0, 0, + 1, 0, 0, + 1, + 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, - 1, - 0, 0, - 1, 0, 0, 1, - 0, + 1, 1, 0, 0, + 0, 1, 0, 1, 1, - 0, - 0, - 0, 1, 0, 0, - 1, + 0, 0, 0, 1, 1, - 0, - 0, 1, 0, 1, - 0, - 0, 1, 1, 1, + 0, 1, 1, 0, 0, + 1, 0, - 0, - 0, + 1, + 1, + 1, 1, 1, 0, 0, 0, 1, - 0, 1, 1, + 0, 1, 0, 0, - 1, 0, - 1, 0, 1, - 1, - 1, - 1, 0, 1, 0, - 1, - 1, 0, - 1, + 0, + 0, 1, 0, 0, 0, + 0, 1, + 0, + 0, 1, - 1, - 1, - 1, + 0, 0, 1, 0 ], - "color": "Purple", - "personality": "ENTJ", + "color": "Midnight", + "personality": "INTP", "parents": [ null, null ], - "happiness": 0.5, + "happiness": 3.0, "known_decisions": [ { "name": "nothing", diff --git a/virtupet/data/pudgies/0x61cb.json b/virtupet/data/pudgies/0xcc34.json similarity index 87% rename from virtupet/data/pudgies/0x61cb.json rename to virtupet/data/pudgies/0xcc34.json index 61348ed..b51290a 100644 --- a/virtupet/data/pudgies/0x61cb.json +++ b/virtupet/data/pudgies/0xcc34.json @@ -1,82 +1,82 @@ { - "uid": "0x61cb", - "name": "Justice", + "uid": "0xcc34", + "name": "Gia", "dna": [ + 1, + 1, 0, 0, 0, + 1, 0, - 0, + 1, 0, 1, 1, 1, - 0, 1, - 0, + 1, 1, 0, 1, 1, 1, 0, - 1, - 1, 0, 0, - 1, 0, 0, 0, 1, + 0, 1, - 1, + 0, + 0, 0, 0, 1, + 0, 1, 0, 0, 0, 1, 1, + 1, + 1, + 0, 0, 0, 1, 1, 0, 1, + 1, + 1, 0, 0, 0, 0, 0, 1, - 1, - 0, - 1, 0, 0, 1, 1, + 0, 1, + 0, 1, 1, - 1, - 0, 0, 0, 0, 1, - 0, 1, - 0, 1, - 0, 1, 0, 0, - 0, 1, 0, 0, @@ -84,24 +84,17 @@ 0, 0, 1, - 1, 0, 1, - 0, - 0, - 0, - 0, 1, 1, 1, - 0, 1, 1, 0, 0, 1, - 1, - 1, + 0, 0, 1, 1, @@ -117,12 +110,17 @@ 0, 0, 0, + 0, + 0, 1, 0, 0, 0, + 0, + 1, 1, 0, + 0, 1, 0, 0, @@ -130,43 +128,41 @@ 0, 0, 0, - 1, - 1, + 0, 0, 1, 0, - 0 + 0, + 0, + 0, + 1 ], - "color": "Red", - "personality": "ISTJ", + "color": "Midnight", + "personality": "ESTP", "parents": [ null, null ], - "happiness": 10, + "happiness": 2.5972978884672453, "known_decisions": [ { "name": "nothing", "count": 0 }, { - "name": "eat_cake", - "count": 2 - }, - { - "name": "push_car", - "count": 16 + "name": "reading", + "count": 1 }, { - "name": "sleep", + "name": "eat_cake", "count": 1 }, { - "name": "reading", + "name": "push_car", "count": 1 }, { - "name": "meditate", + "name": "roll_ball", "count": 1 } ] diff --git a/virtupet/data/pudgies/0x11dbe.json b/virtupet/data/pudgies/0xcc8a.json similarity index 92% rename from virtupet/data/pudgies/0x11dbe.json rename to virtupet/data/pudgies/0xcc8a.json index 517c3ae..eb0e828 100644 --- a/virtupet/data/pudgies/0x11dbe.json +++ b/virtupet/data/pudgies/0xcc8a.json @@ -1,69 +1,64 @@ { - "uid": "0x11dbe", - "name": "Devyn", + "uid": "0xcc8a", + "name": "Emelia", "dna": [ - 0, - 0, - 0, 1, - 0, - 0, 1, + 0, 1, 1, 0, 0, - 1, 0, - 1, 0, 1, 0, 0, + 0, + 0, 1, 1, 1, 0, - 1, + 0, 1, 0, 1, 1, - 0, 1, 1, - 0, 1, 0, + 0, + 0, + 0, 1, 1, 1, 1, - 0, - 1, 1, 1, 1, + 0, 1, 1, 1, + 0, + 0, 1, 1, 0, 0, - 1, 0, 1, 0, 0, 0, - 0, 1, 0, 1, 0, - 1, - 1, + 0, 0, 1, 0, @@ -73,11 +68,12 @@ 1, 1, 1, + 1, 0, 0, 1, - 1, 0, + 1, 0, 0, 1, @@ -86,24 +82,26 @@ 1, 0, 0, + 1, 0, 0, 0, + 1, 0, - 0, - 0, + 1, + 1, + 1, 0, 0, 1, - 0, 1, - 0, 1, 0, - 1, 0, 1, 0, + 0, + 0, 1, 0, 0, @@ -111,39 +109,41 @@ 0, 0, 0, + 0, 1, 1, 1, 1, - 0, 1, 0, - 0, 1, - 0, - 0, + 1, 1, 1, 0, 0, + 0, 1, - 1, + 0, 0, 0, 0, 1, 0, 0, + 1, + 0, 0, + 1, 0 ], - "color": "Vampire", - "personality": "ESFP", + "color": "Midnight", + "personality": "ESTJ", "parents": [ null, null ], - "happiness": 3.2392281679259907, + "happiness": 4.846843524913967, "known_decisions": [ { "name": "nothing", diff --git a/virtupet/data/pudgies/0xd3f3.json b/virtupet/data/pudgies/0xd3f3.json new file mode 100644 index 0000000..a05d276 --- /dev/null +++ b/virtupet/data/pudgies/0xd3f3.json @@ -0,0 +1,165 @@ +{ + "uid": "0xd3f3", + "name": "Cael", + "dna": [ + 1, + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 1, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 1, + 0, + 1, + 0, + 1, + 1, + 1, + 0, + 1, + 0, + 1, + 1, + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0 + ], + "color": "Vampire", + "personality": "ISTJ", + "parents": [ + null, + null + ], + "happiness": 2.0, + "known_decisions": [ + { + "name": "nothing", + "count": 1 + }, + { + "name": "eat_cake", + "count": 3 + }, + { + "name": "push_car", + "count": 3 + }, + { + "name": "eat_veggies", + "count": 1 + } + ] +} \ No newline at end of file diff --git a/virtupet/data/pudgies/0x14918.json b/virtupet/data/pudgies/0xe1a8.json similarity index 90% rename from virtupet/data/pudgies/0x14918.json rename to virtupet/data/pudgies/0xe1a8.json index 2eda6a6..8edbca7 100644 --- a/virtupet/data/pudgies/0x14918.json +++ b/virtupet/data/pudgies/0xe1a8.json @@ -1,26 +1,16 @@ { - "uid": "0x14918", - "name": "Jaylen", + "uid": "0xe1a8", + "name": "Winston", "dna": [ - 1, - 1, 0, 1, - 1, - 1, - 1, - 1, - 1, 0, 0, - 1, - 1, - 1, - 1, + 0, + 0, 0, 1, 1, - 0, 1, 0, 0, @@ -28,49 +18,49 @@ 0, 1, 1, + 1, 0, 0, 0, + 1, + 1, 0, + 1, 0, 0, + 1, 0, 1, 1, 0, - 0, 1, 0, 1, 0, 1, 1, + 0, 1, 0, 1, + 0, 1, 1, 1, - 0, - 0, - 1, 1, 0, 0, + 1, 0, 0, - 0, - 0, - 0, - 1, 1, 0, 1, 1, - 1, - 1, 0, 0, + 0, + 1, 1, 1, 0, @@ -78,7 +68,6 @@ 0, 0, 0, - 1, 0, 0, 0, @@ -86,39 +75,43 @@ 1, 1, 1, + 1, 0, - 0, + 1, 0, 0, 1, 1, 0, 0, - 0, 1, 1, - 0, + 1, 1, 1, 0, + 1, 0, 1, 1, 0, 0, 1, - 1, 0, - 1, 0, 0, 0, 1, + 0, + 1, 1, 1, + 0, 1, + 0, 1, 0, + 0, 1, 1, 1, @@ -126,24 +119,31 @@ 1, 0, 0, - 1, 0, - 1, 0, 0, 0, 0, + 1, + 1, 0, 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, 1 ], - "color": "Vampire", - "personality": "ESTP", + "color": "Blue", + "personality": "ESTJ", "parents": [ - null, - null + "0x62f6", + "0x1664c" ], - "happiness": 3.0170367955205712, + "happiness": 5.911462983475736, "known_decisions": [ { "name": "nothing", diff --git a/virtupet/data/pudgies/0xd687.json b/virtupet/data/pudgies/0xf709.json similarity index 89% rename from virtupet/data/pudgies/0xd687.json rename to virtupet/data/pudgies/0xf709.json index e3b7abf..427c242 100644 --- a/virtupet/data/pudgies/0xd687.json +++ b/virtupet/data/pudgies/0xf709.json @@ -1,15 +1,12 @@ { - "uid": "0xd687", - "name": "Wendy", + "uid": "0xf709", + "name": "Macy", "dna": [ - 0, 0, 1, 1, 0, - 1, 0, - 1, 0, 1, 0, @@ -18,28 +15,24 @@ 0, 1, 0, - 1, 0, 0, - 0, - 0, - 1, 1, 1, 1, 0, 0, 0, - 0, - 0, 1, 1, + 0, 1, 1, 1, 0, 0, 1, + 1, 0, 0, 1, @@ -47,79 +40,73 @@ 0, 0, 1, - 0, - 1, - 1, - 1, - 1, 1, 0, 1, - 0, + 1, 0, 0, 1, 1, - 1, - 1, + 0, 0, 0, 1, + 0, 1, 0, 1, 0, 1, + 1, 0, 0, 0, 1, - 1, 0, 0, 1, 0, 0, - 0, - 1, 1, 0, 0, 0, 0, - 1, - 0, - 1, 0, 1, 1, 0, 0, 0, - 0, + 1, 0, 0, 1, - 0, 1, 1, 0, 0, 0, 1, - 1, 0, 0, + 1, 0, 0, 1, 0, 1, + 0, 1, 1, 0, - 0, 1, + 1, + 1, + 1, + 1, + 0, 0, 1, 0, @@ -127,23 +114,36 @@ 1, 1, 0, + 1, + 1, 0, 1, 1, + 1, + 1, 0, 1, 1, 1, 0, - 1 + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 0, + 0 ], - "color": "Green", - "personality": "ISTJ", + "color": "Vampire", + "personality": "ENTJ", "parents": [ - null, - null + "0x14362", + "0xd3f3" ], - "happiness": 3.7676232362400612, + "happiness": 2.0, "known_decisions": [ { "name": "nothing", @@ -151,7 +151,7 @@ }, { "name": "push_car", - "count": 1 + "count": 3 } ] } \ No newline at end of file diff --git a/virtupet/data/pudgies/default.json b/virtupet/data/pudgies/default.json index e3fc788..1051e05 100644 --- a/virtupet/data/pudgies/default.json +++ b/virtupet/data/pudgies/default.json @@ -76,6 +76,6 @@ "color": null, "personality": null, "parents": [null, null], - "happiness": 0.5, + "happiness": 3.0, "known_decisions": [{"name": "nothing", "count": 0}] } diff --git a/virtupet/main.py b/virtupet/main.py index 9fb56bf..1c8cf37 100644 --- a/virtupet/main.py +++ b/virtupet/main.py @@ -7,6 +7,7 @@ import environments from clock import Clock from pudgi import Pudgi +import random def main(): @@ -22,23 +23,18 @@ def main(): size = [constants.SCREEN_WIDTH, constants.SCREEN_HEIGHT] screen = pygame.display.set_mode(size) - #pygame.display.set_caption(json_object["name"]) - active_agent_list = [] - # parents = ["0x9c08", "0x11e66"] - # agent = Pudgi(parents) - # agent = Pudgi(None, "./data/pudgies/0x9c08.json") + agent = Pudgi() agent2 = Pudgi() + active_agent_list.append(agent) agent.export_to_json() active_agent_list.append(agent2) agent2.export_to_json() + pygame.display.set_caption("Pudgi Simulation") - # parents = ["0x9c08", "0x11e66"] - # agent = Pudgi(parents) - # agent = Pudgi(None, "./data/pudgies/0x8653.json") env_list = [environments.EnvironmentHouse(agent)] current_env_no = 0 @@ -51,7 +47,7 @@ def main(): agent.rect.y = constants.SCREEN_HEIGHT - 140 agent2.rect.x = 100 agent2.rect.y = constants.SCREEN_HEIGHT - 140 - high_happiness = Pudgi.select_parents(active_agent_list) + # for parents in high_happiness: # pudgi = Pudgi(parents) # active_sprite_list.add(pudgi) @@ -76,10 +72,15 @@ def main(): # --------------Main While loop--------------- while not done: - # for parents in high_happiness: - # pudgi = Pudgi(parents) - # active_sprite_list.add(pudgi) - # active_agent_list.append(pudgi) + high_happiness = Pudgi.select_parents(active_agent_list) + + for parents in high_happiness: + pudgi = Pudgi(parents) + active_sprite_list.add(pudgi) + active_agent_list.append(pudgi) + pudgi.export_to_json() + pudgi.rect.y = constants.SCREEN_HEIGHT - 140 + pudgi.rect.x = random.randint(100, 800) for event in pygame.event.get(): # User did something if event.type == pygame.QUIT: # If user clicked close @@ -121,6 +122,7 @@ def main(): if int(time_clock.get_minutes()) % 15 == 0 and frames_run == 0: for pudgi in active_agent_list: pudgi.make_decision() + # print(str(pudgi.name) + "'s Happiness: " + str(pudgi.happiness)) pygame.display.flip()