Revert "bugfix for discoveries (only german was correct)"

This reverts commit ce2f652
xanthics · Jul 29, 2018 · b1619f4 · b1619f4
1 parent ce2f652
commit b1619f4
Show file tree

Hide file tree

Showing 18 changed files with 725 additions and 76 deletions.
diff --git a/MakeGuide.py b/MakeGuide.py
@@ -373,14 +373,14 @@ def costCraft(filename, c_recipes, fast, craftexo, mTiers, cList, mytime, xp_to_
 		del (buy[19704])
 		del (tierbuy[0][19704])
 
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_de.ilist, Localde)
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_fr.ilist, Localfr)
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_es.ilist, Locales)
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_en.ilist, Localcz)
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_en.ilist, Localptbr)
-	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_zh.ilist, Localzh)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_de.ilist, Localde)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_fr.ilist, Localfr)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_es.ilist, Locales)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_en.ilist, Localcz)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_en.ilist, Localptbr)
+	printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_zh.ilist, Localzh)
 	totals = {}
-	totals.update(printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, deepcopy(cList), filename, mytime, Items_en.ilist, Localen))
+	totals.update(printtofile(tcost, treco, sell, craftexo, mTiers, deepcopy(make), pmake, buy, tierbuy, cList, filename, mytime, Items_en.ilist, Localen))
 	return totals
 
 

diff --git a/auto_gen/Armorsmith.py b/auto_gen/Armorsmith.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Created: 2018-07-23T17:22:02 PST
+# Created: 2018-04-07T17:41:12 PST
 recipes = {
 	0: {
 		9420: {19679: 10},
@@ -769,6 +769,12 @@
 		36872: {13150: 1, 13151: 1, 37174: 1},
 		36897: {13147: 1, 13149: 1, 37174: 1},
 		37174: {19747: 1, 37897: 5},
+		41374: {13147: 1, 13149: 1, 41553: 1},
+		41378: {13150: 1, 13151: 1, 41553: 1},
+		41382: {13152: 1, 13153: 1, 41553: 1},
+		41386: {13154: 1, 13155: 1, 41553: 1},
+		41390: {13156: 1, 13157: 1, 41553: 1},
+		41394: {13148: 1, 13158: 1, 41553: 1},
 		45607: {13148: 1, 13158: 1, 19853: 1},
 		45620: {13156: 1, 13157: 1, 19853: 1},
 		45633: {13147: 1, 13149: 1, 19853: 1},
@@ -829,6 +835,12 @@
 		36870: {13150: 1, 13151: 1, 37175: 1},
 		36890: {13147: 1, 13149: 1, 37175: 1},
 		37175: {72194: 1, 37897: 10},
+		41375: {13147: 1, 13149: 1, 41554: 1},
+		41379: {13150: 1, 13151: 1, 41554: 1},
+		41383: {13152: 1, 13153: 1, 41554: 1},
+		41387: {13154: 1, 13155: 1, 41554: 1},
+		41391: {13156: 1, 13157: 1, 41554: 1},
+		41395: {13148: 1, 13158: 1, 41554: 1},
 		45608: {13148: 1, 13158: 1, 19854: 1},
 		45621: {13156: 1, 13157: 1, 19854: 1},
 		45634: {13147: 1, 13149: 1, 19854: 1},
@@ -904,7 +916,10 @@
 		38184: {13152: 1, 13153: 1, 38166: 1},
 		38189: {13150: 1, 13151: 1, 38166: 1},
 		38194: {13147: 1, 13149: 1, 38166: 1},
+		41376: {13147: 1, 13149: 1, 41555: 1},
+		41380: {13150: 1, 13151: 1, 41555: 1},
 		41384: {13152: 1, 13153: 1, 41555: 1},
+		41388: {13154: 1, 13155: 1, 41555: 1},
 		41392: {13156: 1, 13157: 1, 41555: 1},
 		41396: {13148: 1, 13158: 1, 41555: 1},
 		45609: {13148: 1, 13158: 1, 19882: 1},

diff --git a/auto_gen/Artificer.py b/auto_gen/Artificer.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Created: 2018-07-23T17:22:02 PST
+# Created: 2018-04-07T17:41:12 PST
 recipes = {
 	0: {
 		9464: {24272: 6},
@@ -171,6 +171,9 @@
 		19829: {19761: 1, 24353: 3},
 		19926: {19761: 1, 24297: 3},
 		24565: {19683: 1, 24327: 1},
+		49442: {46747: 1, 49441: 2},
+		49443: {46747: 1, 49442: 2},
+		49444: {46747: 1, 49443: 2},
 	},
 	125: {
 		8824: {12156: 1, 19750: 1, 24273: 1, 24321: 1},
@@ -624,6 +627,9 @@
 		36829: {13003: 1, 13252: 1, 37178: 1},
 		37178: {19757: 1, 37897: 5},
 		41477: {12983: 1, 13244: 1, 41557: 1},
+		41481: {12977: 1, 13256: 1, 41557: 1},
+		41485: {12970: 1, 13262: 1, 41557: 1},
+		41489: {13003: 1, 13252: 1, 41557: 1},
 		45999: {12970: 1, 13262: 1, 19848: 1},
 		46010: {13003: 1, 13252: 1, 19848: 1},
 		46025: {12977: 1, 13256: 1, 19848: 1},
@@ -678,6 +684,10 @@
 		36804: {12970: 1, 13262: 1, 37179: 1},
 		36836: {13003: 1, 13252: 1, 37179: 1},
 		37179: {12989: 1, 37897: 10},
+		41478: {12983: 1, 13244: 1, 41558: 1},
+		41482: {12977: 1, 13256: 1, 41558: 1},
+		41486: {12970: 1, 13262: 1, 41558: 1},
+		41490: {13003: 1, 13252: 1, 41558: 1},
 		46000: {12970: 1, 13262: 1, 19843: 1},
 		46011: {13003: 1, 13252: 1, 19843: 1},
 		46026: {12977: 1, 13256: 1, 19843: 1},
@@ -730,7 +740,9 @@
 		38427: {13003: 1, 13252: 1, 38432: 1},
 		38432: {12989: 2, 86601: 65},
 		41479: {12983: 1, 13244: 1, 41559: 1},
+		41483: {12977: 1, 13256: 1, 41559: 1},
 		41487: {12970: 1, 13262: 1, 41559: 1},
+		41491: {13003: 1, 13252: 1, 41559: 1},
 		46001: {12970: 1, 13262: 1, 19899: 1},
 		46012: {13003: 1, 13252: 1, 19899: 1},
 		46027: {12977: 1, 13256: 1, 19899: 1},
@@ -780,6 +792,7 @@
 		13593: {13004: 1, 13253: 1, 19923: 1, 24325: 30},
 		13594: {13004: 1, 13253: 1, 19920: 1, 24325: 30},
 		13595: {13004: 1, 13253: 1, 19921: 1, 24325: 30},
+		13596: {13004: 1, 13253: 1, 19922: 1, 24325: 30},
 		13597: {12976: 1, 13255: 1, 19917: 1, 24325: 20},
 		13598: {12976: 1, 13255: 1, 19918: 1, 24325: 20},
 		13600: {12976: 1, 13255: 1, 19923: 1, 24325: 20},

diff --git a/auto_gen/Chef.py b/auto_gen/Chef.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Created: 2018-07-23T17:22:02 PST
+# Created: 2018-04-07T17:41:12 PST
 recipes = {
 	0: {
 		12132: {12136: 1, 12152: 1, 12156: 1},

diff --git a/auto_gen/Chef_karma.py b/auto_gen/Chef_karma.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Created: 2018-07-23T17:22:02 PST
+# Created: 2018-04-07T17:41:12 PST
 recipes = {
 	0: {
 		12131: {12147: 1, 12153: 1, 12202: 1},

diff --git a/auto_gen/Huntsman.py b/auto_gen/Huntsman.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Created: 2018-07-23T17:22:02 PST
+# Created: 2018-04-07T17:41:12 PST
 recipes = {
 	0: {
 		9452: {12156: 3, 24272: 4},
@@ -834,6 +834,13 @@
 		36879: {13013: 1, 13060: 1, 37178: 1},
 		36899: {12929: 1, 12935: 1, 37178: 1},
 		37178: {19757: 1, 37897: 5},
+		41493: {12938: 1, 12966: 1, 41557: 1},
+		41497: {12923: 1, 12956: 1, 41557: 1},
+		41501: {12917: 1, 12950: 1, 41557: 1},
+		41505: {12944: 1, 12966: 1, 41557: 1},
+		41509: {12950: 1, 13052: 1, 41557: 1},
+		41513: {13013: 1, 13060: 1, 41557: 1},
+		41517: {12929: 1, 12935: 1, 41557: 1},
 		46117: {12944: 1, 12966: 1, 19848: 1},
 		46130: {12929: 1, 12935: 1, 19848: 1},
 		46145: {13013: 1, 13060: 1, 19848: 1},
@@ -902,7 +909,13 @@
 		36884: {13013: 1, 13060: 1, 37179: 1},
 		36901: {12929: 1, 12935: 1, 37179: 1},
 		37179: {12989: 1, 37897: 10},
+		41494: {12938: 1, 12966: 1, 41558: 1},
+		41498: {12923: 1, 12956: 1, 41558: 1},
+		41502: {12917: 1, 12950: 1, 41558: 1},
+		41506: {12944: 1, 12966: 1, 41558: 1},
+		41510: {12950: 1, 13052: 1, 41558: 1},
 		41514: {13013: 1, 13060: 1, 41558: 1},
+		41518: {12929: 1, 12935: 1, 41558: 1},
 		46118: {12944: 1, 12966: 1, 19843: 1},
 		46131: {12929: 1, 12935: 1, 19843: 1},
 		46146: {13013: 1, 13060: 1, 19843: 1},
@@ -985,7 +998,13 @@
 		38397: {13013: 1, 13060: 1, 38432: 1},
 		38403: {12929: 1, 12935: 1, 38432: 1},
 		38432: {12989: 2, 86601: 65},
+		41495: {12938: 1, 12966: 1, 41559: 1},
+		41499: {12923: 1, 12956: 1, 41559: 1},
+		41503: {12917: 1, 12950: 1, 41559: 1},
 		41507: {12944: 1, 12966: 1, 41559: 1},
+		41511: {12950: 1, 13052: 1, 41559: 1},
+		41515: {13013: 1, 13060: 1, 41559: 1},
+		41519: {12929: 1, 12935: 1, 41559: 1},
 		46119: {12944: 1, 12966: 1, 19899: 1},
 		46132: {12929: 1, 12935: 1, 19899: 1},
 		46147: {13013: 1, 13060: 1, 19899: 1},
@@ -1060,6 +1079,7 @@
 		13652: {12918: 1, 12953: 1, 19922: 1, 24325: 30},
 		13653: {12953: 1, 13051: 1, 19917: 1, 24325: 30},
 		13654: {12953: 1, 13051: 1, 19918: 1, 24325: 30},
+		13656: {12953: 1, 13051: 1, 19923: 1, 24325: 30},
 		13657: {12953: 1, 13051: 1, 19920: 1, 24325: 30},
 		13658: {12953: 1, 13051: 1, 19921: 1, 24325: 30},
 		13659: {12953: 1, 13051: 1, 19922: 1, 24325: 30},
@@ -1125,6 +1145,7 @@
 		36905: {12930: 1, 12936: 1, 37181: 1},
 		36906: {12941: 1, 12963: 1, 37181: 1, 24325: 30},
 		36908: {12924: 1, 12959: 1, 37181: 1, 24325: 20},
+		36910: {12918: 1, 12953: 1, 37181: 1, 24325: 30},
 		36912: {12947: 1, 12963: 1, 37181: 1, 24325: 30},
 		36914: {12953: 1, 13051: 1, 37181: 1, 24325: 30},
 		36917: {13014: 1, 13061: 1, 37181: 1, 24325: 15},
@@ -1140,8 +1161,11 @@
 		38434: {12988: 5, 19721: 5, 86601: 100},
 		41463: {12953: 1, 13051: 1, 41560: 1, 24325: 20},
 		41464: {12941: 1, 12963: 1, 41560: 1, 24325: 20},
+		41466: {12924: 1, 12959: 1, 41560: 1, 24325: 20},
 		41467: {12918: 1, 12953: 1, 41560: 1, 24325: 20},
 		41470: {12947: 1, 12963: 1, 41560: 1, 24325: 20},
+		41474: {13014: 1, 13061: 1, 41560: 1, 24325: 20},
+		41476: {12930: 1, 12936: 1, 41560: 1, 24325: 20},
 		41496: {12941: 1, 12963: 1, 41560: 1},
 		41500: {12924: 1, 12959: 1, 41560: 1},
 		41504: {12918: 1, 12953: 1, 41560: 1},