ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sending over information if ring is being worn

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-07 01:14:27 -07:00
parent 154b7b5a9e
commit 603e98c217
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/EventSerializer.java
View File

@@ -57,6 +57,8 @@ public class EventSerializer {
eventElem.setAttribute("message", gameEvent.getMessage());
if (gameEvent.getGameStats() != null) {
GameStats gameStats = gameEvent.getGameStats();
if (gameStats.getWearingRing() != null)
eventElem.setAttribute("wearingRing", String.valueOf(gameStats.getWearingRing()));
eventElem.setAttribute("fellowshipArchery", String.valueOf(gameStats.getFellowshipArchery()));
eventElem.setAttribute("shadowArchery", String.valueOf(gameStats.getShadowArchery()));

18
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java
View File

@@ -16,6 +16,8 @@ import java.util.HashMap;
import java.util.Map;
public class GameStats {
private Integer wearingRing;
private Integer _fellowshipArchery;
private Integer _shadowArchery;
@@ -42,6 +44,16 @@ public class GameStats {
*/
public boolean updateGameStats(LotroGame game) {
boolean changed = false;
PlayerOrder playerOrder = game.getGameState().getPlayerOrder();
final PhysicalCard ringBearer = game.getGameState().getRingBearer(game.getGameState().getCurrentPlayerId());
if (game.getGameState().isWearingRing() && (wearingRing == null || wearingRing != ringBearer.getCardId())) {
changed = true;
wearingRing = ringBearer.getCardId();
} else if (!game.getGameState().isWearingRing() && wearingRing != null) {
changed = true;
wearingRing = null;
}
if (game.getGameState().getCurrentPhase() == Phase.ARCHERY) {
int newFellowshipArcheryTotal = RuleUtils.calculateFellowshipArcheryTotal(game);
@@ -115,7 +127,6 @@ public class GameStats {
}
Map<String, Map<Zone, Integer>> newZoneSizes = new HashMap<String, Map<Zone, Integer>>();
PlayerOrder playerOrder = game.getGameState().getPlayerOrder();
if (playerOrder != null) {
for (String player : playerOrder.getAllPlayers()) {
final HashMap<Zone, Integer> playerZoneSizes = new HashMap<Zone, Integer>();
@@ -199,6 +210,10 @@ public class GameStats {
return changed;
}
public Integer getWearingRing() {
return wearingRing;
}
public Integer getFellowshipArchery() {
return _fellowshipArchery;
}
@@ -261,6 +276,7 @@ public class GameStats {
public GameStats makeACopy() {
GameStats copy = new GameStats();
copy.wearingRing = wearingRing;
copy._fellowshipArchery = _fellowshipArchery;
copy._fellowshipSkirmishStrength = _fellowshipSkirmishStrength;
copy._fellowshipSkirmishDamageBonus = _fellowshipSkirmishDamageBonus;