external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Big map update 13.2

Browse Source 
Some files left behind.
This commit is contained in:
Magpie
2022-04-23 02:42:20 +02:00
parent 7fd050378c
commit 87ad9d2dd5
6 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/adventure/data/DialogData.java
View File

@@ -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}
}

1
forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java
View File

@@ -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() {

6
forge-gui-mobile/src/forge/adventure/util/MapDialog.java
View File

@@ -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;
}
}
}

28
forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx
View File

@@ -220,6 +220,34 @@
</object>
<object id="81" template="../obj/enemy.tx" x="288" y="224">
<properties>
<property name="dialog">[
{
&quot;text&quot;: &quot;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!!!!&quot;,
&quot;condition&quot;: [
{
&quot;actorID&quot;: 1111,
&quot;not&quot;: true
}
],
&quot;options&quot;: [
{
&quot;name&quot;: &quot;Uh oh.&quot;,
&quot;effect&quot;: [
{
&quot;setEffect&quot;: {
&quot;lifeModifier&quot;: 200,
&quot;startBattleWithCard&quot;: [
&quot;Elesh Norn, Grand Cenobyte&quot;,
&quot;Avacyn, Angel of Hope&quot;,
&quot;Urabrask the Hidden&quot;
]
}, &quot;battleWithActorID&quot;: -1
}
]
}
]
}
]</property>
<property name="enemy" value="Goblin"/>
</properties>
</object>

2
forge-gui/res/adventure/Shandalar/ui/inventory_portrait.json
View File

@@ -87,7 +87,7 @@
{
"type": "TextButton",
"name": "delete",
"text": "Delete",
"text": "Discard",
"width": 80,
"height": 30,
"x": 8,

87
forge-gui/res/adventure/Shandalar/ui/statistic_portrait.json
View File

@@ -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",