From d026e9324eb10d5de07e3d66b6dd789d8e51480c Mon Sep 17 00:00:00 2001 From: TabletopGeneral <56438137+jjayers99@users.noreply.github.com> Date: Wed, 28 Jun 2023 21:59:15 -0400 Subject: [PATCH] MOM jumpstart typo, adventure event patch (#3357) * Adventure - draft fixes * Update AdventureEventData.java cleanup * Adventure map updates Adding collision barriers around several maps, expanding entry objects to prevent moving outside the map minor Temple of Gideon progress * Adventure draft set filtering Preventing sealed-only sets from being selected only for drafts * Adventure mob spawn rate adjustment Making enemy spawn allocation more reasonable while still allowing for higher and lower rates. * Adventure - Map updates Removing unneeded collision layers from dungeons * Adventure - Fix for missing event rewards getHumanPlayer() is backed by a transient field and will lose track of game wins if saved / reloaded * Removal of unneeded collision layers * Adventure - Event bugfix Preventing NPE if event was created with an enemy participant that is no longer found in enemies.json * MOM Red Jumpstart insert typo fix --------- Co-authored-by: Anthony Calosa --- .../src/forge/adventure/data/AdventureEventData.java | 5 +++++ forge-gui/res/blockdata/printsheets.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java index c3c457f8d36..c30e99c6ccc 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java @@ -429,6 +429,11 @@ public class AdventureEventData implements Serializable { public Image getAvatar() { if (sprite == null) { + EnemyData data = WorldData.getEnemy(enemyDataName); + if (data == null){ + //enemyDataName was not found, replace with something valid. + enemyDataName = Aggregates.random(WorldData.getAllEnemies()).getName(); + } sprite = new EnemySprite(WorldData.getEnemy(enemyDataName)); } return sprite.getAvatar() == null ? new Image() : new Image(sprite.getAvatar()); diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index 0386cd35b02..22ae52beb14 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -6188,7 +6188,7 @@ Kaya, Ghost Assassin|CN2|2 [MOM Red Inserts] 1 Bloodfeather Phoenix|MOM 1 City on Fire|MOM -1 Etali, Primal Conquerer|MOM +1 Etali, Primal Conqueror|MOM 1 Into the Fire|MOM 1 Invasion of Kaldheim|MOM 1 Invasion of Karsus|MOM