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()