From 8cd6655a67de1eb130dc0e2c32a667204a184f8b Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 21 Mar 2023 20:00:59 +0100
Subject: [PATCH] lootupgrade

---
 .../adventure/Shandalar/world/enemies.json    | 132 +++++++++++-------
 1 file changed, 84 insertions(+), 48 deletions(-)

diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json
index 64fb74008c4..f4aac3f1911 100644
--- a/forge-gui/res/adventure/Shandalar/world/enemies.json
+++ b/forge-gui/res/adventure/Shandalar/world/enemies.json
@@ -351,7 +351,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 6
+			"addMaxCount": 6,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -1241,12 +1245,16 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
 			"probability": 0.5,
-			"count": 3,
+			"count": 1,
 			"colors": [
 				"Green"
 			],
@@ -1330,7 +1338,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 5,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -2830,7 +2842,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 5,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "gold",
@@ -3366,7 +3382,7 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4
 		},
 		{
 			"type": "card",
@@ -3397,7 +3413,7 @@
 		{
 			"type": "card",
 			"probability": 1,
-			"count": 3,
+			"count": 1,
 			"colors": [
 				"Blue"
 			],
@@ -4153,7 +4169,7 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4
 		},
 		{
 			"type": "card",
@@ -4471,7 +4487,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -4519,7 +4539,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 5,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -4643,7 +4667,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -5087,7 +5115,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -6524,7 +6556,7 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4
 		},
 		{
 			"type": "card",
@@ -6755,7 +6787,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 6,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "gold",
@@ -6794,7 +6830,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "gold",
@@ -6802,23 +6842,6 @@
 			"count": 10,
 			"addMaxCount": 90
 		},
-		{
-			"type": "card",
-			"probability": 0.5,
-			"count": 2,
-			"colors": [
-				"Green"
-			],
-			"rarity": [
-				"Mythic Rare"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
 		{
 			"type": "card",
 			"probability": 1,
@@ -7255,7 +7278,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -7301,7 +7328,7 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4
 		},
 		{
 			"type": "card",
@@ -8336,7 +8363,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 4
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "gold",
@@ -9091,7 +9122,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -9722,7 +9757,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 3,
-			"addMaxCount": 7
+			"addMaxCount": 6,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "gold",
@@ -10050,7 +10089,11 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
 		},
 		{
 			"type": "card",
@@ -10572,7 +10615,7 @@
 			"type": "deckCard",
 			"probability": 1,
 			"count": 2,
-			"addMaxCount": 8
+			"addMaxCount": 4
 		},
 		{
 			"type": "card",
@@ -11075,18 +11118,11 @@
 		{
 			"type": "deckCard",
 			"probability": 1,
-			"count": 1,
-			"addMaxCount": 4,
+			"count": 2,
+			"addMaxCount": 8,
 			"rarity": [
 				"common",
 				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
 			]
 		},
 		{