diff --git a/vpet.py b/vpet.py index 63c9f9e..ad3505b 100644 --- a/vpet.py +++ b/vpet.py @@ -1,6 +1,5 @@ import time import os -import threading import json from pathlib import Path @@ -14,8 +13,6 @@ class Pet: self.hygiene = 100 self.is_alive = True self.birthday = time.time() - self.last_decay = time.time() - self.decay_delay = 10 self.status = "Happy" def rename(self): @@ -33,11 +30,10 @@ class Pet: self.hygiene = min(100, self.hygiene + 13) def decay(self): - self.last_decay = time.time() self.happiness = max(0, self.happiness - 5) self.energy = max(0, self.energy - 3) self.hunger = min(100, self.hunger + 2) - self.hygiene = max(0, self.hygiene - 4) + self.hygiene = max(0, self.hygiene + 4) def sleep(self): self.energy = 100 @@ -47,6 +43,7 @@ class Pet: print(time.time() - self.birthday) def make_bar(self, percent): + bar = "[" + "X" * (percent//10) + "-" * (10-percent//10) + "]" return bar @@ -69,7 +66,6 @@ class Pet: return line def print_stats(self): - os.system("clear") full_line = "----------------------------" print(full_line) print(f" o)__ Name:" + "{:>10}".format(f"{self.name}")) @@ -87,6 +83,7 @@ class Pet: fp = Path("~/.vpet.sav").expanduser() with open(fp, "w") as f: json.dump(self.__dict__,f) + print("Done") def load(self): print("Loading game...") @@ -98,31 +95,19 @@ class Pet: data = json.load(f) self.__dict__.update(data) return 1 - -def run(p): - time.sleep(p.decay_delay) - p.running = True - while p.running: - if time.time() - p.last_decay >= p.decay_delay: - p.decay() - p.print_stats() - time.sleep(1) - print("Done") - + p = Pet("sally", "frog") if not p.load(): p.rename() -p.running = True -run_t = threading.Thread(target=run, args=[p]) -run_t.start() +os.system("clear") while 1: p.print_stats() x = input() + os.system("clear") if x == 'p': p.play() elif x == 'q': p.save() - p.running = False exit() elif x == 'f': p.feed()