From c31537d66e35ee0f3d4950300e653b55ff7dcba5 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Sat, 3 Jun 2023 09:40:49 -0400 Subject: [PATCH] Adventure card inventory update fix --- .../adventure/scene/AdventureDeckEditor.java | 2 +- .../adventure/Shandalar/world/enemies.json | 86 ++++--------------- 2 files changed, 19 insertions(+), 69 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index 58e5588710f..d1564f1eb28 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java @@ -240,7 +240,7 @@ public class AdventureDeckEditor extends TabPageScreen { for(TabPage page:tabPages) { if(page instanceof CardManagerPage) - ((CardManagerPage)page).initialize(); + ((CardManagerPage)page).refresh(); } for (TabPage tabPage : tabPages) { ((DeckEditorPage)tabPage).initialize(); diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index 1e61479bb5d..f95c4920b84 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -588,10 +588,7 @@ "Humanoid", "IdentityWhite", "Mythical", - "Warrior", - null, - null, - null + "Warrior" ] }, { @@ -1203,12 +1200,7 @@ "Human", "Archer", "Soldier", - "IdentitySelesnya", - null, - null, - null, - null, - null + "IdentitySelesnya" ] }, { @@ -1255,8 +1247,7 @@ "IdentityAzorius", "Archaeologist", "Scientist", - "Artificer", - null + "Artificer" ] }, { @@ -1398,11 +1389,7 @@ "Furnace", "IdentityColorless", "Construct", - "Robot", - null, - null, - null, - null + "Robot" ] }, { @@ -2670,12 +2657,7 @@ "Desert", "Domesticated", "Beast", - "IdentityWhite", - null, - null, - null, - null, - null + "IdentityWhite" ] }, { @@ -2974,10 +2956,7 @@ "Mystic", "Octopus", "Sneaky", - "Wandering", - null, - null, - null + "Wandering" ] }, { @@ -4378,8 +4357,7 @@ "Boss", "Evil", "Warlock", - "Intelligent", - null + "Intelligent" ] }, { @@ -6236,9 +6214,7 @@ "IdentityRed", "BiomeRed", "Bandit", - "Subterranean", - null, - null + "Subterranean" ] }, { @@ -6321,10 +6297,7 @@ "Mercenary", "IdentityGruul", "IdentityRed", - "Dwarf", - null, - null, - null + "Dwarf" ] }, { @@ -7347,11 +7320,7 @@ "Dragon", "Flyer", "Fire", - "Monster", - null, - null, - null, - null + "Monster" ] }, { @@ -9354,10 +9323,7 @@ "Nature", "Wizard", "Mystic", - "IdentityGreen", - null, - null, - null + "IdentityGreen" ] }, { @@ -9412,8 +9378,7 @@ "IdentityRed", "IdentityBoros", "IdentityWhite", - "Gladiator", - null + "Gladiator" ] }, { @@ -10696,9 +10661,7 @@ "IdentityGreen", "Hidden", "Sneaky", - "Plant", - null, - null + "Plant" ] }, { @@ -10748,10 +10711,7 @@ "Hidden", "Sneaky", "Ambush", - "IdentityGreen", - null, - null, - null + "IdentityGreen" ] }, { @@ -11405,9 +11365,7 @@ "IdentityGreen", "IdentityWhite", "IdentitySelesnya", - "Mercenary", - null, - null + "Mercenary" ] }, { @@ -12174,9 +12132,7 @@ "IdentityWhite", "Mercenary", "IdentityBlue", - "IdentityAzorius", - null, - null + "IdentityAzorius" ] }, { @@ -16433,12 +16389,7 @@ "Beast", "Nature", "IdentityBlack", - "Scarab", - null, - null, - null, - null, - null + "Scarab" ] }, { @@ -18208,8 +18159,7 @@ "IdentityGolgari", "Cook", "Human", - "Boss", - null + "Boss" ] }, {