Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed incId as getUniqueId

master
melvin 2011-09-06 23:48:06 +08:00
parent 733c97cb5a
commit 70e69e6737
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/magic/model/MagicGame.java
View File

@ -214,17 +214,17 @@ public class MagicGame {
return score;
}
/*
public long getTime() {
return time;
}
/*
public void setTime(final long t) {
time = t;
}
*/
public long incTime() {
public long getUniqueId() {
time++;
return time;
}
@ -243,7 +243,7 @@ public class MagicGame {
getPayedCost().getX(),
stack.getItemsId(),
events.getEventsId(),
time,
//time,
//identifiers[0],
//identifiers[1],
//identifiers[2],
@ -768,7 +768,7 @@ public class MagicGame {
}
public MagicPermanent createPermanent(final MagicCard card,final MagicPlayer controller) {
return new MagicPermanent(incTime(),card,controller);
return new MagicPermanent(getUniqueId(),card,controller);
}
public MagicCardList getExiledUntilEndOfTurn() {
@ -1050,8 +1050,7 @@ public class MagicGame {
}
public MagicPermanentTrigger addTrigger(final MagicPermanent permanent,final MagicTrigger trigger) {
final long id=incTime();
final MagicPermanentTrigger permanentTrigger=new MagicPermanentTrigger(id,permanent,trigger);
final MagicPermanentTrigger permanentTrigger=new MagicPermanentTrigger(getUniqueId(),permanent,trigger);
triggers.get(trigger.getType()).add(permanentTrigger);
return permanentTrigger;
}

2
src/magic/model/MagicPlayer.java
View File

@ -272,7 +272,7 @@ public class MagicPlayer implements MagicTarget {
public void createHandAndLibrary(final int handSize) {
for (final MagicCardDefinition cardDefinition : playerDefinition.getDeck()) {
final long id = MagicGame.getInstance().incTime();
final long id = MagicGame.getInstance().getUniqueId();
library.add(new MagicCard(cardDefinition,this,id));
}

3
src/magic/model/action/MagicCopyCardOnStackAction.java
View File

@ -19,8 +19,7 @@ public class MagicCopyCardOnStackAction extends MagicAction {
@Override
public void doAction(final MagicGame game) {
final MagicCardOnStack copyCardOnStack=cardOnStack.copyCardOnStack(player);
final long id=game.incTime();
copyCardOnStack.setId(id);
copyCardOnStack.setId(game.getUniqueId());
game.getStack().addToTop(copyCardOnStack);
if (copyCardOnStack.getEvent().getTargetChoice() != MagicTargetChoice.NONE) {
copyCardOnStack.getChoiceResults()[0]=null;

3
src/magic/model/action/MagicPutItemOnStackAction.java
View File

@ -16,8 +16,7 @@ public class MagicPutItemOnStackAction extends MagicAction {
@Override
public void doAction(final MagicGame game) {
final long id=game.incTime();
itemOnStack.setId(id);
itemOnStack.setId(game.getUniqueId());
game.getStack().addToTop(itemOnStack);
if (itemOnStack.hasChoices()) {
game.addEvent(new MagicStackGetChoicesEvent(itemOnStack));