From dff70d92605d96ec839eb8f885be8b3aa1a8e749 Mon Sep 17 00:00:00 2001
From: jman13378 <garconiamail@gmail.com>
Date: Wed, 12 Oct 2022 23:35:58 -0400
Subject: [PATCH] complete generators upgrads for them need to be added and
 price needs to be added

---
 __pycache__/generators.cpython-310.pyc | Bin 2391 -> 3196 bytes
 generators.py                          |  44 ++++-
 mlibs.py                               |  41 ++++-
 orgver.py                              | 235 +------------------------
 4 files changed, 72 insertions(+), 248 deletions(-)

diff --git a/__pycache__/generators.cpython-310.pyc b/__pycache__/generators.cpython-310.pyc
index db95b1c97017fc6274731ee998fcb1fbfd47be46..f13af54211ee9d63a4dc0e9623bd85818c99b2be 100644
GIT binary patch
delta 1294
zcmah}OKVd>6rMTvHTUMGuV|yK+DojDNUh@A`bMNKqzLLJZj7C45n>{fi)bDMtRn7|
zS-B9BrQk}p;=+yo1L1C6h#;;tKI%EQHf>RG;C$yXXXc(c=S$uX{aDvmNvA!AtJIpF
zeV2ON_qlZ*y^s~SWCf7CU`UY0JytNKDJ|5Nw55aEmO{Fy9qGvwY9W1@M(xTz*^k<j
z19A{`N)BCM`AqE2h2>Bcql!`-zc5Q5UAatjPNV26{3B1lJPW|rj@G>($n_3Zb5p_P
zy8d81=WFyMbJVdszTulE^b7M%CibtFqfp%{mM-488P*^OV*S9n#&_y3)?Kj^Z+^zr
zq`qyB^TYb7eR6a+hVsUY+KxK5uNF%;L#6hhqxR~r_E!5Snfvv)^KhgKb+4QGyOd^E
zzjgA1bh!!;@}Rb$iZvG*KXz4E4I`|+dR&i)v0a(oLneDWtJ+}TSsR7gP`#+HILBHM
zi@0>=p$U;_K-=xGdCr++*itd04q>7?OfW@ogdi#V7+G0_yr(vhJxH*bU>(76f{g^d
z+SMj<#}M*H@(Oi=u}v)IQe|i-fi+|W2xn2MBYI2>w{QqPH+ijp`FXRYN;RCdFlTAG
zXb6<#X|K>o9>(!uRs@kT&)X*PtOHFu0%^7}+Q6rFxU{lN+9*yE;}k<rWLZQxFyF!u
z23!n41200`OH$20si`bp)VtnkSZ$lA+O`_DWU}u*tY;0U19+}K%R1Oy%y2r4FP1of
zB?|1lSk?Q%<=(dzn_n|?^=7Wir@Fje^K<3mjS$&Nv07>($Su+<H&sicvqV&MhgZ17
z+odzmY$oHZ4gZ666ZPh&1zd{8-1_gFlMyGw4lsYkoLx1Efr5d>sspr@C)hziG$sPz
z@4i&3l+-EmSMwmYi&9R9bLC68S0zGte1HRz0XQrGz%L&K4EX7p@B=LPZlm}%bb(|+
zIPlFBz=!^1n+sxzN(0MOO1@E^$@}`87~dVcQ6(yt=r^U-Qc2qgb`k6&I7o1kARsuS
g$J}gA(H|U1mFO#&$pr{UtQWp8(DMAWel4E-1}H}u*8l(j

delta 584
zcmZXRJxd%x7{_;J-{$r$a2G>34;|M_bQ6`kglj~>Lb1|DvDl<=bF&Et_r~lIk`)Og
zwiaQkR3W5N>_WbPpFt3=wXm_fN)Ys!^%TS@e*fqBKQF`VUOhj}dmY!c6gcMjO8t`j
z^e)yGAd8g{F(t$dF}$aQDpQ#Tsxh4zpgJ=d0X0~TS)eAfnFC6gyP*VLKldqa$2{tF
z_}^`Wko_;h7=8P_V^QkgmlA)TzLS<beigF2Bs1DkD+bR`dJ*r%+@BeCX2lOtvkTrl
ztyLcQjW)D?j+%0?`f#LC9M(3!cC*E;hCf`nE54{llX-Y|;sYE_Ll*L|gB_$HjI?XZ
zwoqwcd16&NE`-kAEpk(eDGfzQ|A?yMhyI<sh6M+R&j{BjyNi$vFd&c8qWGgf6Pw1^
z=o}b<y3VIT`^N24cm)z(75m0Zdr5|G0ck0lIWgMB6z^DR;qm9&O~rdNcqMP;6cAwk
z0wh!u7V&~~Gdz_M1uTpI=6K=B{ZE*yH#<qZ9^}N9T^{8lvTsUaR^p9BO@fL;dm`^a
SNECvINydpoR7VqM_OBb3Jc8l?

diff --git a/generators.py b/generators.py
index 1cee905..0d89232 100644
--- a/generators.py
+++ b/generators.py
@@ -8,6 +8,8 @@
 from tkinter import *
 
 class generator():
+    totalgens=0
+
     def regvars():
         global parent_dir, directory, file, path
         parent_dir = os.getenv('APPDATA')
@@ -30,12 +32,6 @@ def get_dir():
                 a.write(
                     '{\n'
                     +'  "generators": [{\n'
-                    +'      "1": {\n'
-                    +'          "name": "starter",\n'
-                    +'          "balper": 50,\n'
-                    +'          "interval": "1",\n'
-                    +'          "intervalType": "mi"\n'
-                    +'      }\n'
                     +'  }]'
                     +'\n}')
                 print(a.read)
@@ -63,8 +59,16 @@ def getGeneratorName(genid):
 
     def getGeneratorBalper(genid):
         return generators["{}".format(genid)]["balper"]
-
-
+    def resetgens():
+            
+        a = open(path, "w")
+        sda = str(generators).replace("'","\"")
+        a.write(
+            '{\n'
+            +'  "generators": [{}'.format(sda)
+            +']\n}')
+        a.close()
+        pass
     def close():
         
         a = open(path, "w")
@@ -73,6 +77,28 @@ def close():
             '{\n'
             +'  "generators": [{}'.format(sda)
             +']\n}')
+        
+        a.close()
+        d = open(path, "r")
+        print(d.read())
+        pass
+    def addGen(genid,nam,balper,interval,intervalType):
+        a = open(path, "w")
+        sda = str(generators).replace("'","\"")
+        llol = str(
+            '"{}"'.format(str(genid))
+            +':'
+            + '{'+'"name": "{}"'.format(str(nam))
+            +', "balper":'
+            + format(str(balper))
+            +', "interval":' +str(interval)
+            +', "intervalType": "{}"'.format(str(intervalType))+"}}").replace("'","\"")
+        a.write(
+            '{\n'
+            +'  "generators": [{},{}'.format(sda[:-1],llol)
+            +']\n}')
+        
         a.close()
+        d = open(path, "r")
+        print(d.read())
         pass
-    
\ No newline at end of file
diff --git a/mlibs.py b/mlibs.py
index c8d02ce..f00e5ac 100644
--- a/mlibs.py
+++ b/mlibs.py
@@ -1,7 +1,9 @@
 import json
+from sched import scheduler
 
-from tkinter.messagebox import CANCEL, YESNO, askyesnocancel, showinfo, askyesno
+from tkinter.messagebox import CANCEL, YESNO, askquestion, askyesnocancel, showerror, showinfo, askyesno
 from tkinter import *
+from tkinter.simpledialog import askstring
 
 from PIL import Image, ImageTk
 
@@ -33,8 +35,7 @@ def resource_path(relative_path):
     return os.path.join(base_path, relative_path)
 
 
-generators.generator.regvars()
-generators.generator.get_dir()
+
 
 
 
@@ -61,7 +62,7 @@ def resource_path(relative_path):
 data = json.loads(f.read())
 
 
-soundtype=1
+soundtype=0
 
 if soundtype==0:
     completesound = resource_path('complete.mp3')
@@ -89,7 +90,8 @@ def resource_path(relative_path):
 upgrades=data["upgrades"]
 balper= data["balper"]
 prestige=data['prestige']
-
+scheduler = BackgroundScheduler()
+scheduler.start()
 # Window icon parsing
 photo = ImageTk.PhotoImage(imageIcon)
 win.iconphoto(False, photo)
@@ -174,7 +176,6 @@ def prestigeup():
     bal = 0
     upgrades = 0
     balper = prestige + 1
-    ending()
     close()
 
 def reload_bal():
@@ -223,18 +224,43 @@ def restart():
 reload_upgrades()
 reload_upgrade_level()
 
+
+def addGen():
+    name = askstring("Gen Name!", "What would you like to name this generator!")
+    genid = generators.generator.totalgens
+    i=1
+    for x in range(generators.generator.totalgens):
+        if generators.generator.getGeneratorName(i) == name:
+            showerror("Gen Error", "Generator already exists")
+            return
+        elif name == "":
+            showerror("Gen Error", "Generator name is blank")
+            
+            return
+        else: i+=1
+    generators.generator.addGen((genid + 1),str(name),50,10,"tf")
+    scheduler.remove_all_jobs()
+    generators.generator.totalgens=0
+    getGenerators()
+    
+
+
 upgr = Button(win,text="  Upgrade  ", command=upgrade, bg="#0D1117", fg="green").grid(column=1, row=3)
 win.rowconfigure(5, weight=2)
 stats = Button(win,text="  Stats?  ", command=send_stat_msg, bg="#0D1117", fg="yellow").grid(column=0, row=5)
 
 addmoney = Button(win,text="  Add Money  ", command=addbal, bg="#0D1117", fg="blue").grid(column=1, row=0)
 win.columnconfigure(3, minsize=1, weight=1)
+
 reset = Button(win,text="  Reset  ", command=restart, bg="#0D1117", fg="red").grid(column=3, row=0)
 
+reset = Button(win,text="  Buy Gen  ", command=addGen, bg="#0D1117", fg="green").grid(column=2, row=5)
 
 
 win.protocol('WM_DELETE_WINDOW', close)
 def getGenerators():
+    generators.generator.regvars()
+    generators.generator.get_dir()
     i=1
     i2=1
     row=0
@@ -245,9 +271,8 @@ def getGenerators():
         time=generators.generator.getGeneratorInterval(i)
         baltoadd1= generators.generator.getGeneratorBalper(i)
         if baltoadd1:
-            scheduler = BackgroundScheduler()
             scheduler.add_job(lambda: genAddBal(baltoadd1), 'interval', seconds=time, id=genname)
-            scheduler.start()
+            generators.generator.totalgens +=1
             win.columnconfigure(5, minsize=1, weight=1)
             if (i2 == 9):
                 i2=1
diff --git a/orgver.py b/orgver.py
index 0225cb9..8048f5b 100644
--- a/orgver.py
+++ b/orgver.py
@@ -1,231 +1,4 @@
-import json
-
-from tkinter.messagebox import CANCEL, YESNO, askyesnocancel, showinfo, askyesno
-from tkinter import *
-
-from PIL import Image, ImageTk
-
-from time import *
-
-from playsound import playsound
-
-from os.path import exists
-import sys, os
-
-from pathlib import Path
-
-import os
-parent_dir = os.getenv('APPDATA')
-directory = "Money-Manager"
-file = "data.json"
-path = os.path.join(parent_dir,directory)
-print(path)
-def resource_path(relative_path):
-    """ Get the absolute path to the resource, works for dev and for PyInstaller """
-    try:
-        # PyInstaller creates a temp folder and stores path in _MEIPASS
-        base_path = sys._MEIPASS
-    except Exception:
-        base_path = os.path.abspath(".")
-
-    return os.path.join(base_path, relative_path)
-
-
-dir_exists = os.path.exists(path)
-if not dir_exists:
-    os.mkdir(path)
-
-path = os.path.join(path,file)
-print(os.path.exists(path))
-
-if not os.path.exists(path):
-    with open(path, 'x') as a:
-        a.write(
-            '{\n'
-            +'  "bal": 0,\n'
-            +'  "upgradeprice": 100,\n'
-            +'  "upgrades": 0,\n'
-            +'  "balper": 1,\n'
-            +'  "nextupprice": 50,\n'
-            +'  "prestige": 0'
-            +'\n}')
-        a.close()
-
-
-# Reading from file
-f = open(path, 'r')
-data = json.loads(f.read())
-
-
-type=1
-
-if type==0:
-    completesound = resource_path('complete.mp3')
-    errorsound = resource_path('error.mp3')
-    imageIcon = Image.open(resource_path('favicon.ico'))
-elif type==1:
-    completesound = 'complete.mp3'
-    errorsound = 'error.mp3'
-    imageIcon = Image.open('favicon.ico')
-
-
-win=Tk()
-win.geometry("350x350")
-win.grid()
-win.config(bg="#2C2F33")
-win.title("Money Manager")
-
-lel11= 0
-bal = data["bal"]
-upgradeprice=data["upgradeprice"]
-upgrades=data["upgrades"]
-balper= data["balper"]
-nextupprice=data["nextupprice"]
-prestige=data['prestige']
-
-# Window icon parsing
-photo = ImageTk.PhotoImage(imageIcon)
-win.iconphoto(False, photo)
-
-def send_stat_msg():
-    showinfo("Stats!",
-     'Prestige: {}\n'.format(prestige)
-    +'Level: {}\n'.format(upgrades)
-    +'MPC: {}\n'.format(balper)
-    +'Balance: {}\n'.format(bal)
-    +'Next Upgrade Price: {}\n'.format(nextupprice)
-    +'Current Upgrade Price: {}'.format(upgradeprice)
-    )
-def addbal():
-    global bal
-    bal += balper
-    reload_bal()
-    reload_upgrades()
-    print(bal)
-
-def ending():
-    global bal, upgradeprice, balper, upgrades, nextupprice
-    ans = askyesnocancel("Ending!", "You have Reached the end of the game"
-    + "\nClick YES to Prestige"
-    + "\nClick NO to exit(will save your data)"
-    + "\nClick CANCEL to restart"
-    )
-    if ans:
-        showinfo("Prestiging!","Prestiging to: {}!".format(prestige+1))
-        prestigeup()
-        pass
-    elif not ans:
-        showinfo("Exiting!","Exiting!")
-        close()
-        pass
-    elif ans == CANCEL:
-        ans1 = askyesno("restarting!", "ARE YOU SURE YOU WANT TO RESTART")
-        close()
-        pass
-
-def getPrestige():
-    global prestige
-    if prestige == 0:
-        return 1
-    else:
-        return prestige
-
-def upgrade():
-    global bal, upgradeprice, balper, upgrades, nextupprice, prestige,lel11
-    if bal >= upgradeprice:
-        upgrades += 1
-        bal -= upgradeprice
-        balper += (1 + getPrestige())
-        cost = upgradeprice
-        if upgrades >= (20 + (10 * getPrestige())):
-            prestigeup()
-        elif (upgrades == (20 + (10 * getPrestige()))):
-            lel11 = 1
-            ending()
-            return
-        elif lel11 != 1:
-            upgradeprice += upgradeprice+50*getPrestige()
-        
-        reload_bal()
-        reload_upgrades()
-        reload_upgrade_level()
-        playsound(completesound)
-        showinfo("Upgraded!", "You have upgraded your MPC(Money per click)\nUpgrade: {}\nCost: {}\nRemaining Bal: {}\nNext Cost: {}".format(upgrades, cost, bal, upgradeprice) )
-
-    else:
-        s = playsound(errorsound)
-        showinfo('Not Enought Money!', "Sorry, you doen't have enough money for this!\nCurrent Bal: {}\nNeeded: {}".format(bal, upgradeprice))
-        
-def prestigeup():
-    global bal, upgradeprice, balper, upgrades, nextupprice, prestige,lel11
-    prestige += 1
-    bal=0
-    upgradeprice=150
-    upgrades=0
-    balper= 1+prestige
-    nextupprice=50
-    close()
-
-def reload_bal():
-    global bal
-    balance = Label( win, text="Money: ${}".format(bal), bg="#0D1117", fg="white").grid(column=1,row=0)
-
-def reload_upgrades():
-    global upgradeprice
-    upgr = Label( win, text="Upgrade Price: ${}".format(upgradeprice), bg="#0D1117", fg="white").grid(column=1,row=1)
-
-def reload_upgrade_level():
-    global upgrades
-    upgrlstart = Label( win, text="Level: {}".format(upgrades), bg="#0D1117", fg="white").grid(column=2,row=1)
-
-
-#scheduler = BackgroundScheduler()
-#scheduler.add_job(reload_bal, 'interval', minutes=30)
-#scheduler.start()
-
-
-def close():
-    global bal, upgradeprice, balper, upgrades, nextupprice,prestige
-    a = open(path, "w")
-    a.write(
-        '{\n'
-        +'  "bal": {},\n'.format(bal)
-        +'  "upgradeprice": {},\n'.format(upgradeprice)
-        +'  "upgrades": {},\n'.format(upgrades)
-        +'  "balper": {},\n'.format(balper)
-        +'  "nextupprice": {},\n'.format(nextupprice)
-        +'  "prestige": {}'.format(prestige)
-        +'\n}')
-    a.close()
-    win.destroy()
-
-def restart():
-    ans = askyesno("Reset Warning!", "WOULD YOU LIKE TO RESET ALL OF YOUR DATA!")
-    if ans:
-        global bal, upgradeprice, balper, upgrades, nextupprice, prestige
-        bal=0
-        prestige= 0
-        upgradeprice=100
-        balper=1
-        upgrades=0
-        nextupprice=50
-        close()
-    else:
-        pass
-reload_bal()
-reload_upgrades()
-reload_upgrade_level()
-upgr = Button(win,text="Upgrade", command=upgrade, bg="#0D1117", fg="white").grid(column=3, row=1)
-
-stats = Button(win,text="Stats", command=send_stat_msg, bg="#0D1117", fg="white").grid(column=1, row=5)
-
-addmoney = Button(win,text="Add Money", command=addbal, bg="#0D1117", fg="white").grid(column=2, row=0)
-
-reset = Button(win,text="Reset", command=restart, bg="#0D1117", fg="white").grid(column=5, row=0)
-
-
-
-win.protocol('WM_DELETE_WINDOW', close)
-
-win.mainloop()
-
+questions = ['name', 'quest', 'favorite color']
+answers = ['lancelot', 'the holy grail', 'blue']
+for q, a in zip(questions, answers):
+    print('What is your {0}?  It is {1}.'.format(q, a))