Commit 37782225 authored by Justin White's avatar Justin White

Fixes mergrge conflicts and double triggers

parent f3820539
......@@ -135,10 +135,10 @@ public class GameView extends TrackableObject {
set(TrackableProperty.WinningTeam, game.getOutcome().getWinningTeam());
}
//=======
if (game.getOutcome() != null && game.getOutcome().getWinningLobbyPlayer() != null) {
set(TrackableProperty.WinningPlayerName, game.getOutcome().getWinningLobbyPlayer().getName());
}
set(TrackableProperty.WinningTeam, game.getOutcome() == null ? -1 : game.getOutcome().getWinningTeam());
// if (game.getOutcome() != null && game.getOutcome().getWinningLobbyPlayer() != null) {
// set(TrackableProperty.WinningPlayerName, game.getOutcome().getWinningLobbyPlayer().getName());
// }
// set(TrackableProperty.WinningTeam, game.getOutcome() == null ? -1 : game.getOutcome().getWinningTeam());
//>>>>>>> cdb47e0e10fc7ebee7e65769ad027f9335cfecef
}
......
......@@ -437,13 +437,13 @@ public class CardFactory {
for (Entry<String, String> v : face.getVariables()) c.setSVar(v.getKey(), v.getValue());
//=======
// Name first so Senty has the Card name
c.setName(face.getName());
// c.setName(face.getName());
for (String r : face.getReplacements()) c.addReplacementEffect(ReplacementHandler.parseReplacement(r, c, true));
for (String s : face.getStaticAbilities()) c.addStaticAbility(s);
for (String t : face.getTriggers()) c.addTrigger(TriggerHandler.parseTrigger(t, c, true));
// for (String r : face.getReplacements()) c.addReplacementEffect(ReplacementHandler.parseReplacement(r, c, true));
// for (String s : face.getStaticAbilities()) c.addStaticAbility(s);
// for (String t : face.getTriggers()) c.addTrigger(TriggerHandler.parseTrigger(t, c, true));
for (Entry<String, String> v : face.getVariables()) c.setSVar(v.getKey(), v.getValue());
// for (Entry<String, String> v : face.getVariables()) c.setSVar(v.getKey(), v.getValue());
//>>>>>>> cdb47e0e10fc7ebee7e65769ad027f9335cfecef
// keywords not before variables
......@@ -454,8 +454,8 @@ public class CardFactory {
c.setManaCost(face.getManaCost());
c.setText(face.getNonAbilityText());
//=======
c.setManaCost(face.getManaCost());
c.setText(face.getNonAbilityText());
// c.setManaCost(face.getManaCost());
// c.setText(face.getNonAbilityText());
//>>>>>>> cdb47e0e10fc7ebee7e65769ad027f9335cfecef
c.getCurrentState().setBaseLoyalty(face.getInitialLoyalty());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment