Merge branch 'master' into inventory-speedup

Author: Amphitryon0

.gitignore

@@ -1 +1,14 @@
 .vscode/settings.json
+__pycache__/calculator.cpython-37.pyc
+__pycache__/config.cpython-37.pyc
+__pycache__/inventory.cpython-37.pyc
+__pycache__/logger.cpython-37.pyc
+__pycache__/recipes.cpython-37.pyc
+__pycache__/moves.cpython-37.pyc
+calculateRecipeOrder.log
+calculator.pyc
+config.pyc
+inventory.pyc
+moves.pyc
+logger.pyc
+recipes.pyc

calculator.py

@@ -13,26 +13,26 @@
 #log(5, "Inventory", "Items", "Scan", "All item names scanned successfully.")
 
 def getAlphaSort():
-	file = open(os.getcwd() + "/itemSorts/alphabetic.txt","r")
-	log(2, "Inventory", "Sort", "Load", "Sort list loaded from file.")
+	file = open(os.getcwd() + "/itemSorts/alphabetic_sort-JP.txt","r")
+	#log(2, "Inventory", "Sort", "Load", "Sort list loaded from file.")
 	sortList = []
 	for line in file:
 		sortList.append(line.strip("\n"))
-		log(7, "Inventory", "Sort", "Load", line.strip("\n") + " added to sort list")
-	log(2, "Inventory", "Sort", "Load", "Finished creating sort list.")
-	log(5, "Inventory", "Sort", "Load", str(sortList))
+		#log(7, "Inventory", "Sort", "Load", line.strip("\n") + " added to sort list")
+	#log(2, "Inventory", "Sort", "Load", "Finished creating sort list.")
+	#log(5, "Inventory", "Sort", "Load", str(sortList))
 	file.close()
 	return sortList
 
 def getTypeSort():
-	file = open(os.getcwd() + "/itemSorts/type.txt","r")
-	log(2, "Inventory", "Sort", "Load", "Sort list loaded from file.")
+	file = open(os.getcwd() + "/itemSorts/type_sort-JP.txt","r")
+	#log(2, "Inventory", "Sort", "Load", "Sort list loaded from file.")
 	sortList = []
 	for line in file:
 		sortList.append(line.strip("\n"))
-		log(7, "Inventory", "Sort", "Load", line.strip("\n") + " added to sort list")
-	log(2, "Inventory", "Sort", "Load", "Finished creating sort list.")
-	log(5, "Inventory", "Sort", "Load", str(sortList))
+		#log(7, "Inventory", "Sort", "Load", line.strip("\n") + " added to sort list")
+	#log(2, "Inventory", "Sort", "Load", "Finished creating sort list.")
+	#log(5, "Inventory", "Sort", "Load", str(sortList))
 	file.close()
 	return sortList
 

inventory.py

@@ -1,20 +1,20 @@
 Golden Leaf
 Peachy Peach
 Shooting Star
-Slow Shroom
-Volt Shroom
-Mystery
-Jammin Jelly
-Ruin Powder
-Super Shroom
 Ultra Shroom
+Cake Mix
+Thunder Rage
+Turtley Leaf
 Life Shroom
+Ice Storm
+Slow Shroom
+Mystery
 Honey Syrup
-Maple Syrup
+Volt Shroom
 Fire Flower
-Ice Storm
-Hot Dog
 Mystic Egg
-Cake Mix
+Hot Dog
+Ruin Powder
+Maple Syrup
 Hot Sauce
-Turtley Leaf
+Jammin Jelly

inventory.txt

@@ -1,92 +1,111 @@
-Mushroom
-Super Shroom
+Item
+POW Block
+Icicle Pop
+Fright Mask
+Spicy Soup
+Ink Pasta
+Couples Cake
+Point Swap
+Space Food
 Ultra Shroom
+Golden Leaf
+Cake Mix
+Courage Shell
+Courage Meal
+Thunder Bolt
+Thunder Rage
+Koopa Tea
+Turtley Leaf
+Koopasta
+[Koopa Curse]
+Koopa Bun
+Spicy Pasta
+Omelette Meal
+Mushroom
+Shroom Fry
+Shroom Crepe
+Shroom Cake
+Shroom Steak
+Shroom Roast
+Shooting Star
+Gold Bar
+Gold Bar x 3
 Life Shroom
-Slow Shroom
+Dizzy Dial
+[Cake]
+Shroom Broth
+Ice Storm
+Coconut Bomb
+Coco Candy
+Spite Pouch
+Mistake
 Dried Shroom
-Honey Syrup
-Maple Syrup
-Jammin Jelly
+Inn Coupon
+Choco Cake
+Trial Stew
+Slow Shroom
 Gradual Syrup
+Super Shroom
+HP Drain
 Tasty Tonic
-Fire Flower
-Ice Storm
-Earth Quake
-Thunder Bolt
-Thunder Rage
-Shooting Star
-Volt Shroom
+Stopwatch
+Spaghetti
+Inky Sauce
+Whacka Bump
+Horsetail
+[Trade Off]
 Repel Cape
 Boos Sheet
-Ruin Powder
-Courage Shell
-Mystery
-Hot Dog
-Coconut
-Dried Bouquet
-Mystic Egg
-Golden Leaf
+Power Punch
 Keel Mango
-Fresh Pasta
-Cake Mix
-Hot Sauce
-Turtley Leaf
-Peachy Peach
-Spite Pouch
-Shroom Fry
-Shroom Roast
-Shroom Steak
+Poison Shroom
+Dried Bouquet
+Mystery
+Zess Cookie
+Zess Special
+Zess Dynamite
+Zess Tea
+Zess Dinner
+Zess Deluxe
+Zess Frappe
+Sleepy Sheep
+Love Pudding
+Honey Candy
 Honey Shroom
-Maple Shroom
-Jelly Shroom
 Honey Super
-Maple Super
-Jelly Super
 Honey Ultra
-Maple Ultra
-Jelly Ultra
-Zess Dinner
-Zess Special
-Zess Deluxe
-Spaghetti
-Koopasta
-Spicy Pasta
-Ink Pasta
-Spicy Soup
-Fried Egg
-Omelette Meal
-Koopa Bun
+Honey Syrup
+Egg Bomb
+Volt Shroom
+Electro Pop
+Peach Tart
+Peachy Peach
+Fire Pop
+Fire Flower
+Mystic Egg
+Mr. Softener
+Fruit Parfait
+Fresh Juice
 Healthy Salad
 Meteor Meal
-Couples Cake
+Hot Dog
+Ruin Powder
+Mango Delight
+Mini Mr. Mini
 Mousse Cake
-Shroom Cake
-Choco Cake
+Maple Shroom
+Maple Super
+Maple Ultra
+Maple Syrup
+Fried Egg
 Heartful Cake
-Fruit Parfait
-Mango Delight
-Love Pudding
-Zess Cookie
-Shroom Crepe
-Peach Tart
-Koopa Tea
-Zess Tea
-Shroom Broth
-Fresh Juice
-Inky Sauce
-Icicle Pop
-Zess Frappe
+Coconut
 Snow Bunny
-Coco Candy
-Honey Candy
+Earth Quake
+Hot Sauce
+Jelly Shroom
+Jelly Super
+Jelly Ultra
 Jelly Candy
-Electro Pop
-Fire Pop
-Space Food
-Poison Shroom
-Trial Stew
-Courage Meal
-Coconut Bomb
-Egg Bomb
-Zess Dynamite
-Mistake
+Jammin Jelly
+Fresh Pasta