From 3de2568dfaf9856bf340f2b42e6850f3cda7aaed Mon Sep 17 00:00:00 2001 From: louis chauvet Date: Tue, 21 Aug 2018 10:44:05 +0200 Subject: [PATCH] Add some items, repair to_make_recursive --- modules/deeptown.py | 11 +++++++++++ modules/deeptownOptimizer/items.json | 27 ++++++++++++++++++-------- modules/deeptownOptimizer/optimizer.py | 1 - 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/modules/deeptown.py b/modules/deeptown.py index 08f01a8..9c914cf 100644 --- a/modules/deeptown.py +++ b/modules/deeptown.py @@ -13,6 +13,9 @@ class MainClass: self.optimizer = optimizer.Optimizer() async def best_place_mine(self, msg, command, args): + if len(args) == 0: + await msg.channel.send(tr.tr[self.guild.config["lang"]]["errors"]["NotEnoughParamError"]) + return if args[0] not in self.optimizer.mines["0"].keys(): await msg.channel.send(tr.tr[self.guild.config["lang"]]["error"]["OreNotFoundError"].format(ore=args[0])) return @@ -42,6 +45,9 @@ class MainClass: self.optimizer = optimizer.Optimizer() async def to_make(self, msg, command, args): + if len(args) == 0: + await msg.channel.send(tr.tr[self.guild.config["lang"]]["errors"]["NotEnoughParamError"]) + return if args[0] not in self.optimizer.items.keys(): await msg.channel.send(tr.tr[self.guild.config["lang"]]["errors"]["ItemNotFoundError"].format(item=args[0])) return @@ -59,6 +65,11 @@ class MainClass: value=result["value"])) async def to_make_recursive(self, msg, command, args): + if len(args) == 0: + await msg.channel.send(tr.tr[self.guild.config["lang"]]["errors"]["NotEnoughParamError"]) + return + if len(args) == 1: + args.append("1") if args[0] not in self.optimizer.items.keys(): await msg.channel.send(tr.tr[self.guild.config["lang"]]["errors"]["ItemNotFoundError"].format(item=args[0])) return diff --git a/modules/deeptownOptimizer/items.json b/modules/deeptownOptimizer/items.json index e4df4bf..3a75737 100644 --- a/modules/deeptownOptimizer/items.json +++ b/modules/deeptownOptimizer/items.json @@ -4,7 +4,7 @@ "time": 5, "quantity": 1, "required": { - "coal": 1 + "coal": 5 }, "building": "crafting" }, @@ -140,7 +140,7 @@ "time": 1800, "quantity": 2, "required": { - "liana":1 + "liana": 1 }, "building": "chemistery" }, @@ -156,11 +156,22 @@ }, "water": { "value": 5, - "time":120, - "quantity":10, - "required":{ - "amberCharger":20, - "cosmicIce":10 - } + "time": 120, + "quantity": 10, + "required": { + "amberCharger": 20, + "cosmicIce": 10 + }, + "building": "smelting" + }, + "copperKnive": { + "value": 300, + "time": 120, + "quantity": 1, + "required": { + "copperBar": 1, + "pumpkin": 1 + }, + "building": "crafting" } } diff --git a/modules/deeptownOptimizer/optimizer.py b/modules/deeptownOptimizer/optimizer.py index d1d7b5f..b0df433 100644 --- a/modules/deeptownOptimizer/optimizer.py +++ b/modules/deeptownOptimizer/optimizer.py @@ -50,7 +50,6 @@ class Optimizer(): already_crafted = [result[0] for result in results] index = 0 for i, q, t in needed_result: - print(i, q, t) if i in already_crafted: results[already_crafted.index(i)] = ( results[already_crafted.index(i)][0],