diff --git a/forge-gui-mobile/src/forge/adventure/data/DialogData.java b/forge-gui-mobile/src/forge/adventure/data/DialogData.java index 4f503cb48f7..b20c55ab2f5 100644 --- a/forge-gui-mobile/src/forge/adventure/data/DialogData.java +++ b/forge-gui-mobile/src/forge/adventure/data/DialogData.java @@ -28,7 +28,8 @@ public class DialogData { public int battleWithActorID = 0; //Start a battle with enemy ID. -1 for self if possible. public EffectData giveBlessing; //Give a blessing to the player. public String setColorIdentity; //Change player's color identity. - public String advanceQuestFlag;//Increase given quest flag by 1. + public String advanceQuestFlag; //Increase given quest flag by 1. + public EffectData setEffect; //Set or replace current effects on current actor. public QuestFlag setQuestFlag; //Set quest flag {flag ID, value} } diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 171edd293f9..68be744d25f 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -158,6 +158,7 @@ public class PlayerStatisticScene extends UIScene { blessingScroll = Controls.newLabel(""); blessingScroll.setStyle(new Label.LabelStyle(Controls.getBitmapFont("default"), Color.BLACK)); blessingScroll.setAlignment(Align.topLeft); + blessingScroll.setWrap(true); ui.onButtonPress("return", new Runnable() { @Override public void run() { diff --git a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java index e3a45bdc3c8..d1564ebfb85 100644 --- a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java +++ b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java @@ -3,7 +3,9 @@ package forge.adventure.util; import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.utils.Array; import forge.Forge; +import forge.adventure.character.EnemySprite; import forge.adventure.data.DialogData; +import forge.adventure.data.EffectData; import forge.adventure.player.AdventurePlayer; import forge.adventure.stage.MapStage; import forge.util.Localizer; @@ -120,6 +122,10 @@ public class MapDialog { Current.player().advanceQuestFlag(E.advanceQuestFlag); } //Set dungeon flag. + if(E.setEffect != null){ //Replace current effects. + //EnemySprite EN = stage.getEnemyByID(parentID); + //EN.effect = E.setEffect; + } } } diff --git a/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx b/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx index 83180894b02..a86a8acc96c 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx @@ -220,6 +220,34 @@ + [ + { + "text": "You...you hurt Grog!\nYou...you filthy swine! I will stop at nothing until I see you defeated!\nGods...anyone! Grant me strength! Grant me REVENGE!!!!", + "condition": [ + { + "actorID": 1111, + "not": true + } + ], + "options": [ + { + "name": "Uh oh.", + "effect": [ + { + "setEffect": { + "lifeModifier": 200, + "startBattleWithCard": [ + "Elesh Norn, Grand Cenobyte", + "Avacyn, Angel of Hope", + "Urabrask the Hidden" + ] + }, "battleWithActorID": -1 + } + ] + } + ] + } +] diff --git a/forge-gui/res/adventure/Shandalar/ui/inventory_portrait.json b/forge-gui/res/adventure/Shandalar/ui/inventory_portrait.json index 6aeab969c15..56109660bde 100644 --- a/forge-gui/res/adventure/Shandalar/ui/inventory_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/inventory_portrait.json @@ -87,7 +87,7 @@ { "type": "TextButton", "name": "delete", - "text": "Delete", + "text": "Discard", "width": 80, "height": 30, "x": 8, diff --git a/forge-gui/res/adventure/Shandalar/ui/statistic_portrait.json b/forge-gui/res/adventure/Shandalar/ui/statistic_portrait.json index 09a737bebe0..5ca37dab220 100644 --- a/forge-gui/res/adventure/Shandalar/ui/statistic_portrait.json +++ b/forge-gui/res/adventure/Shandalar/ui/statistic_portrait.json @@ -16,15 +16,15 @@ "x": 4, "y": 4, "width": 262, - "height": 90 + "height": 98 }, { "type": "Scroll", "name": "enemies", "x": 4, - "y": 98, + "y": 106, "width": 262, - "height": 335 + "height": 327 }, { "type": "Image", @@ -36,28 +36,19 @@ }, { "type": "Image", - "name": "avatarBorder", - "image": "ui/avatarhud.png", - "x": 24, - "y": 8, + "name": "colorFrame", + "image": "ui/colorC.png", + "x": 8, + "y": 25, "width": 64, "height": 64 }, - { - "type": "Label", - "name": "playerName", - "x": 34, - "y": 70, - "width": 80, - "height": 24, - "font": "black" - }, { "type": "Label", "name": "totalWins", - "x": 234, - "y": 14, - "width": 40, + "x": 144, + "y": 56, + "width": 26, "height": 24, "font": "black" }, @@ -65,8 +56,8 @@ "type": "Label", "name": "wins", "text": "Win:", - "x": 170, - "y": 14, + "x": 98, + "y": 56, "width": 60, "height": 24, "font": "black" @@ -74,9 +65,9 @@ { "type": "Label", "name": "totalLoss", - "x": 234, - "y": 34, - "width": 40, + "x": 144, + "y": 68, + "width": 26, "height": 24, "font": "black" }, @@ -84,8 +75,8 @@ "type": "Label", "name": "loss", "text": "Loss:", - "x": 170, - "y": 34, + "x": 98, + "y": 68, "width": 60, "height": 24, "font": "black" @@ -93,9 +84,9 @@ { "type": "Label", "name": "lossWinRatio", - "x": 234, - "y": 54, - "width": 40, + "x": 144, + "y": 80, + "width": 26, "height": 24, "font": "black" }, @@ -103,8 +94,8 @@ "type": "Label", "name": "winloss", "text": "Win Loss Ratio:", - "x": 170, - "y": 54, + "x": 98, + "y": 80, "width": 60, "height": 24, "font": "black" @@ -118,12 +109,21 @@ "x": 5, "y": 440 }, + { + "type": "Label", + "name": "playerName", + "x": 98, + "y": 4, + "width": 80, + "height": 24, + "font": "black" + }, { "type": "Image", "name": "lifeIcon", "image": "ui/life.png", - "x": 104, - "y": 40, + "x": 98, + "y": 22, "width": 16, "height": 16 }, @@ -131,8 +131,8 @@ "type": "Image", "name": "goldIcon", "image": "ui/money.png", - "x": 104, - "y": 60, + "x": 98, + "y": 42, "width": 16, "height": 16 }, @@ -142,8 +142,8 @@ "font": "black", "width": 64, "height": 16, - "x": 124, - "y": 40 + "x": 118, + "y": 22 }, { "type": "Label", @@ -151,8 +151,17 @@ "font": "black", "width": 64, "height": 16, - "x": 124, - "y": 60 + "x": 118, + "y": 42 + }, + { + "type": "Scroll", + "name": "blessingInfo", + "style": "nobg", + "x": 170, + "y": 14, + "width": 86, + "height": 80 }, { "type": "Table",