death star II

README.md

@@ -12,3 +12,4 @@ I used to play this game when I was like 7 and it's off the play store so I thou
 # Additional functionality:
   * randomly get fined based on threat level
   * permanent saves
+  * businesses·lose·10%·of·their·value·upon·purchase

data.py

@@ -18,42 +18,51 @@ businesses = [
         {"pretty_name":"Charity Shop",           "cost":27500,"earning":2.5,"threat":-2.75},# Positive affect
         {"pretty_name":"Corner Shop",            "cost":32500,"earning":460,"threat":5},
         {"pretty_name":"Casino",                 "cost":47500,"earning":5120,"threat":40},# High risk
+        {"pretty_name":"Travel Agent",           "cost":75000,"earning":1100,"threat":1},
         {"pretty_name":"Petrol Station",         "cost":90000,"earning":1350,"threat":8},
         {"pretty_name":"Community Space",        "cost":125875,"earning":0.5,"threat":-15},# Positive affect
+        {"pretty_name":"Fancy Restaurant",       "cost":147000,"earning":2300,"threat":1},
         {"pretty_name":"Car Dealership",         "cost":184000,"earning":2900,"threat":8},
         {"pretty_name":"Fast Food Chain",        "cost":280000,"earning":4500,"threat":5},
         {"pretty_name":"Tech Startup",           "cost":565000,"earning":9100,"threat":12},
         {"pretty_name":"Advertising Agency",     "cost":875000,"earning":14500,"threat":6},
         {"pretty_name":"Mini Golf Course",       "cost":900000,"earning":17000,"threat":2},
         {"pretty_name":"Botanical Garden",       "cost":1000000,"earning":20,"threat":-130},# Positive affect
+        {"pretty_name":"Fancy Hotel",            "cost":1710569,"earning":28933,"threat":4},
         {"pretty_name":"Golf Course",            "cost":5000000,"earning":89500,"threat":4},
-        {"pretty_name":"Drug Empire",            "cost":6730000,"eanring":828240,"threat":80},# High Risk
+        {"pretty_name":"Drug Empire",            "cost":6730000,"earning":828240,"threat":80},# High Risk
         {"pretty_name":"Bank",                   "cost":12500000,"earning":231600,"threat":1},
         {"pretty_name":"Hogwarts",               "cost":38890000,"earning":690000,"threat":12},
         {"pretty_name":"Car Manufacturer",       "cost":95000000,"earning":1853838,"threat":6},
+        {"pretty_name":"Stark Industries",       "cost":148368246,"earning":2943154,"threat":48},# High Risk
         {"pretty_name":"World Heritage Site",    "cost":273812672,"earning":-100,"threat":-42000},# Positive affect
         {"pretty_name":"Gold Mine",              "cost":1200000000,"earning":28512500,"threat":12},
         {"pretty_name":"Record Label",           "cost":16086117467,"earning":377219792,"threat":4},
         {"pretty_name":"North Korean Hackers",   "cost":49090934652,"earning":1197973460,"threat":390},# High Risk
         {"pretty_name":"Royal Mint",             "cost":31418198177,"earning":754581418,"threat":0},
+        {"pretty_name":"HS2",                    "cost":80265000000,"earning":50,"threat":2000},# Joke inclusion, High Risk
         {"pretty_name":"Nuclear Power Plant",    "cost":149813643350,"earning":3804520446,"threat":12},
         {"pretty_name":"Mithril Mine",           "cost":187267054187,"earning":4793695763,"threat":24},# High Risk
         {"pretty_name":"Asgardian Bank",         "cost":2730000000000,"earning":76800000000,"threat":2},
-        {"pretty_name":"HS2",                    "cost":80265000000000,"earning":2000000000000,"threat":2},
+        {"pretty_name":"Atlantis",               "cost":39655341208057,"earning":1229033018189.84,"threat":14},
+        {"pretty_name":"Galactic Empire",        "cost":577061163611609,"earning":19679320186973,"threat":80},# High Risk
         {"pretty_name":"McDuck Enterprises",     "cost":1752500000000000,"earning":62497524783840,"threat":4},
         {"pretty_name":"Silmaril Factory",       "cost":40000000000000000,"earning":1588731290169286,"threat":84},# High Risk
         {"pretty_name":"Death Star I",           "cost":850000000000000000,"earning":37600000000000000,"threat":110}, # High Risk
-        {"pretty_name":"Death Star II",          "cost":113000000000000000,"earning":5089000000000000,"threat":110}, # High Risk
+        {"pretty_name":"Death Star II",          "cost":1130000000000000000,"earning":50890000000000000,"threat":110}, # High Risk
         {"pretty_name":"Starkiller Base",        "cost":9315000000000000000,"earning":480000000000000000,"threat":200}, #High Risk
         {"pretty_name":"Duplication Exploiter",  "cost":32300000000000000000,"earning":1630000000000000000,"threat":128},# High Risk
         {"pretty_name":"Midas Touch Factory",    "cost":470000000000000000000,"earning":26000000000000000000,"threat":1400},#High Risk
 ]
 leaderboard = [
         ["King Midas",  641990000000000000000000000],
+        ["Caishen",        742000000000000000000000],
+        ["Emperor Palpatine",9840000000000000000000],
         ["Scrooge McDuck",     18921600000000000000],
         ["Rumpelstiltskin",     2910000000000000000],
-        ["Emperor Palpatine",  984000000000000000],
+        ["The Dark Lord Sauron", 247500000000000000],
         ["Thor",                  15000000000000000],
+        ["Durin the Deathless",    4206900000000000],
         ["Namor",                   800000000000000],
         ["Plutus",                  662000000000000],
         ["Aquaman",                 150000000000000],
@@ -62,7 +71,10 @@ leaderboard = [
         ["Tony Stark",               30000000000000],
         ["Augustus Caesar",           4600000000000],
         ["King Solomon",              2200000000000],
+        ["The House of Saud",         1400000000000],
         ["Genghis Khan",              1300000000000],
+        ["Prince Ali",                 893000000000],
+        ["Dain II Ironfoot",           750000000000],
         ["Mansa Musa",                 415000000000],
         ["Elon Musk",                  342000000000],
         ["Jakob Fugger",               277000000000],
@@ -92,12 +104,14 @@ leaderboard = [
         ["Notch",                        1300000000],
         ["J.K. Rowling",                 1000000000],
         ["Rishi Sunak",                   830000000],
+        ["King Charles III",              747000000],
         ["Harry Styles",                  120000000],
         ["Pewdiepie",                      45000000],
         ["Harry Potter",                   33000000],
         ["Joe Biden",                      10000000],
         ["Sir Keir Starmer",                7700000],
-        ["Jeremy Corbyn",                 1000000],
+        ["Frank Abagnale Jr.",              2500000],
+        ["Jeremy Corbyn",                    925000],
         ["Bernie Sanders",                   513513],
         ["Greta Thunberg",                   100000],
         ["Luke Skywalker",                    93000],

main.py

@@ -4,50 +4,76 @@ from datetime import datetime
 import math
 try:
     import save # TODO saving functionality
+# If the save file doesn't exist, create one
 except:
     with open("save.py", "w") as file:
         content = f"businesses = []\nmoney = 100\ndatetime = {datetime.now().strftime('%s')}\nfine_count = 0"
-# Commands
+        file.write(content)
-# help: help's the user
+    import save
-# status: output's networth, available money, TL, your businesses and earning/hour
+help_text = '''# Commands:
-# shop/buy: lists available businesses
+ * help: help's the user
-# sell: sells that business
+ * status: output's networth, available money, TL, your businesses and earning/hour
-# leaderboard: shows the wealth leaderboard
+ * shop/buy: lists available businesses
-# quit: exit's game
+ * sell: sells one of your businesses
-# TODO upgrade: upgrades some stats about a business for some money
+ * leaderboard: shows the wealth leaderboard
+ * quit: exit's game
+ * TODO upgrade (?): upgrades some stats about a business for some money
 
 # Additional functionality:
-# randomly get sent to get fined based on threat level, more than 5 fines means next time is prision and that's 2 years ingame
+ * randomly get sent to get fined based on threat level, more than 5 fines means next time is prision and that's 2 years ingame
-# permanent saves
+ * permanent saves
+ * businesses lose 10% of their value upon purchase'''
 
+
+# This function accepts a number and returns the value millified
+# For example 1000 becomes 1K
+# 135220 becomes 135.22K
+# 25012345 becomes 25.01M etc
+# millnames can be redefined in data.py
 def millify(n):
     exponent = len(str(round(n))) - 1 # n = 1,000 return 3, n = 300,000 returns 5
-    millvalue = exponent//3
+    millvalue = exponent//3 # millvalue = how many sets of 3 zero's there are after the mill, 1000 -> 999999 all equals 3, 1million -> 999 million all equal 6, etc
     millname = data.millnames[millvalue] # exponent = 3 returns K (thousand), exponent = 7 returns M (million)
-    #print(f"E: {exponent}, M: {millname}, Mv: {millvalue} = ",end="")
+    return f"{round((n/(10**(millvalue*3))),2)}{millname}" # Returns the formatted value
-    return f"{round((n/(10**(millvalue*3))),2)}{millname}"
-    #return '{:.0f}{}'.format(n / 10**(3 * millidx), data.millnames[millidx])
 
+# Returns a random bool based on a percentage, 100 or more always returns True
 def rand_bool(percent):
     return random.randrange(100) < percent
 
-def try_arrest():
+# Every day there is a chance that you will be fined based on the threat level
+# This function checks if the day has changed, if it has then it uses your threat level to 
+# randomly fine you or not, eg a threat level of 100% or more (threat level MIDNIGHT) will always
+# result in an arrest and a threat level of 5% will result in a fine 1/20 of the time
+# Every time you get a fine the value increases based on the fine values in data.fines
+# If all fines have been received then each fine results in the highest fine in data.fines
+def try_fine():
     current_day = datetime.now().strftime("%d")
     current_month = datetime.now().strftime("%m")
     current_year = datetime.now().strftime("%Y")
-    if datetime.fromtimestamp(int(save.datetime)).strftime("%d") != current_day or datetime.fromtimestamp(int(save.datetime)).strftime("%m") != current_month or datetime.fromtimestamp(int(save.datetime)).strftime("%Y") != current_year:
+    previous_date = datetime.fromtimestamp(int(save.datetime))
+    # Checks if the day, month or year has changed
+    if previous_date.strftime("%d") != current_day or previous_date.strftime("%m") != current_month or previous_date.strftime("%Y") != current_year:
+        # Work out the current threat level
         for biz in save.businesses:
             threat += biz['cost']
+        # Randomly decide to fine or not based on threat level
         if rand_bool(threat):
+            # If the user has been fined more times than there are fines in data.fines, fine them the last fine in that list
             if save.fine_count >= len(data.fines):
                 save.money -= data.fines[len(data.fines)-1]
                 print(f"You've been fined {data.currency}{data.fines[len(data.fines)-1]}")
+            # Else just fine them the amount at the current fine index
             else:
                 save.money -= data.fines[save.fine_count]
                 print(f"You've been fined {data.currency}{data.fines[save.fine_count]}")
-            save.fine_count += 1
+            save.fine_count += 1 # Increase the amount of times you've been fined
             save_game()
 
+def input_command():
+    user_input = input()
+    user_input = user_input.strip()
+    return user_input
+
 def add_new_money():
     current_time = datetime.now().strftime("%s")
     time_difference = int(current_time) - int(save.datetime)
@@ -57,7 +83,7 @@ def add_new_money():
         save.money += (earning / 3600) * time_passed
 
 def display_leaderboard():
-    leaderboard = data.leaderboard
+    leaderboard = data.leaderboard[:]
     networth = save.money
     for biz in save.businesses:
         networth += biz['cost']
@@ -78,9 +104,11 @@ def main():
     while game_loop:
         save.datetime = datetime.now().strftime("%s")
         print(f"{data.currency}{millify(save.money)} > ", end="")
-        user_input = input()
+        user_input = input_command()
         # TODO make this a match case?
-        if user_input.lower() == "quit" or user_input.lower() == "exit":
+        if user_input == "" or user_input is None:
+            print("",end="")
+        elif user_input.lower() == "quit" or user_input.lower() == "exit":
             save.datetime = datetime.now().strftime("%s")
             add_new_money()
             save_game()
@@ -90,28 +118,33 @@ def main():
         elif user_input.lower() == "buy" or user_input.lower() == "shop":
             print("    0: cancel")
             for i in range(len(data.businesses)):
-                if data.businesses[i]['cost'] <= save.money:
+                if save.money >= data.businesses[i]['cost']:
+                    print("  * ",end="")
+                else:
+                    print("    ",end="")
                 print(f"{i+1}: {data.businesses[i]['pretty_name']}: {data.currency}{millify(data.businesses[i]['cost'])}, Earning: {data.currency}{millify(data.businesses[i]['earning'])}/hour, Threat: {data.businesses[i]['threat']}%")
-            user_input = input()
+            user_input = input_command()
-            try:
             user_input_int = int(user_input) - 1
             if user_input_int == -1:
                 continue
-                elif user_input_int < len(data.businesses) and save.money >= data.businesses[user_input_int]['cost']:
+            elif user_input_int < len(data.businesses):
+                if save.money >= data.businesses[user_input_int]['cost']:
                     print(f"Buying {data.businesses[user_input_int]['pretty_name']}")
-                    save.businesses.append(data.businesses[user_input_int])
+                    save.businesses.append(data.businesses[user_input_int].copy())
+                    save.businesses[len(save.businesses)-1]['cost'] *= 0.9 # Remove 10% of it's value so the sell price is slightly less
                     save.money -= data.businesses[user_input_int]['cost']
+                else:
+                    print("You can't afford that!")
             else:
                 print("Invalid number")
-            except:
-                print("Didn't input a number")
 
         ### Sell an owned business
         elif user_input.lower() == "sell":
             print("    0: cancel")
             for i in range(len(save.businesses)):
                 print(f"    {i+1}: {save.businesses[i]['pretty_name']}: {data.currency}{millify(save.businesses[i]['cost'])}")
-            user_input = input()
+            user_input = input_command()
+
             user_input_int = int(user_input) - 1
             if user_input_int == -1:
                 continue
@@ -149,27 +182,13 @@ def main():
             display_leaderboard()
 
         elif user_input.lower() == "help":
-            print('''
+            print(help_text)
-Commands
-  help: help's the user
-  status: output's networth, available money, threat level, your businesses and earning/hour
-  shop/buy: lists available businesses
-  sell: sells that business
-  leaderboard: shows the wealth leaderboard
-  quit: exit's game
-
-Additional functionality:
-  randomly get fined based on threat level
-  permanent saves
-                  ''')
-        elif user_input == "" or user_input == undefined:
-            print("",end="")
         else:
-            print("Error: Invalid command")
+            print(f"Error: Invalid command: '{user_input}'")
 
         ### End of loop
         add_new_money()
-        try_arrest()
+        try_fine()
         save_game()
 
 main()