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

moved GameAction & its util class to forge.game

Browse Source
This commit is contained in:
Maxmtg
2013-02-06 07:06:58 +00:00
parent 7e804867de
commit ba80f2126d
16 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@@ -13440,8 +13440,6 @@ src/main/java/forge/Command.java svneol=native#text/plain
src/main/java/forge/CommandList.java svneol=native#text/plain
src/main/java/forge/Constant.java svneol=native#text/plain
src/main/java/forge/CounterType.java svneol=native#text/plain
src/main/java/forge/GameAction.java svneol=native#text/plain
src/main/java/forge/GameActionUtil.java svneol=native#text/plain
src/main/java/forge/GameEntity.java -text
src/main/java/forge/GameLog.java -text
src/main/java/forge/ImageCache.java svneol=native#text/plain
@@ -13859,6 +13857,8 @@ src/main/java/forge/error/BugzReporter.java svneol=native#text/plain
src/main/java/forge/error/ErrorViewer.java svneol=native#text/plain
src/main/java/forge/error/ExceptionHandler.java svneol=native#text/plain
src/main/java/forge/error/package-info.java svneol=native#text/plain
src/main/java/forge/game/GameAction.java svneol=native#text/plain
src/main/java/forge/game/GameActionUtil.java svneol=native#text/plain
src/main/java/forge/game/GameEndReason.java -text
src/main/java/forge/game/GameFormat.java -text
src/main/java/forge/game/GameLossReason.java -text

1
src/main/java/forge/Card.java
View File

@@ -55,6 +55,7 @@ import forge.card.staticability.StaticAbility;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerType;
import forge.card.trigger.ZCTrigger;
import forge.game.GameActionUtil;
import forge.game.GlobalRuleChange;
import forge.game.event.CounterAddedEvent;
import forge.game.event.CardEquippedEvent;

2
src/main/java/forge/card/abilityfactory/AbilityFactory.java
View File

@@ -30,7 +30,6 @@ import forge.CardUtil;
import forge.Command;
import forge.Constant;
import forge.CounterType;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -41,6 +40,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityCondition;
import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Target;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilCost;

2
src/main/java/forge/card/abilityfactory/effects/ManaEffect.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import forge.Card;
import forge.Constant;
import forge.CounterType;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.abilityfactory.AbilityFactory;
import forge.card.abilityfactory.SpellEffect;
@@ -14,6 +13,7 @@ import forge.card.spellability.AbilityManaPart;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.control.input.InputPayManaCostUtil;
import forge.game.GameActionUtil;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;

2
src/main/java/forge/control/input/InputMulligan.java
View File

@@ -26,10 +26,10 @@ import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.GameAction;
import forge.Singletons;
import forge.card.abilityfactory.AbilityFactory;
import forge.card.spellability.SpellAbility;
import forge.game.GameAction;
import forge.game.GameState;
import forge.game.GameType;
import forge.game.ai.ComputerUtil;

18
src/main/java/forge/GameAction.java → src/main/java/forge/game/GameAction.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge;
package forge.game;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,6 +29,15 @@ import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.Card;
import forge.CardCharacteristicName;
import forge.CardLists;
import forge.CardPredicates;
import forge.CardUtil;
import forge.Command;
import forge.CounterType;
import forge.GameEntity;
import forge.Singletons;
import forge.card.CardType;
import forge.card.SpellManaCost;
import forge.card.abilityfactory.AbilityFactory;
@@ -55,11 +64,6 @@ import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerType;
import forge.control.input.InputPayManaCost;
import forge.control.input.InputPayManaCostUtil;
import forge.game.GameEndReason;
import forge.game.GameLossReason;
import forge.game.GameState;
import forge.game.GlobalRuleChange;
import forge.game.MatchController;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilCost;
import forge.game.event.CardDestroyedEvent;
@@ -195,7 +199,7 @@ public class GameAction {
ReplacementResult repres = game.getReplacementHandler().run(repParams);
if (repres != ReplacementResult.NotReplaced) {
if (game.getStack().isResolving(c) && !zoneTo.is(ZoneType.Graveyard) && repres == ReplacementResult.Prevented) {
return Singletons.getModel().getGame().getAction().moveToGraveyard(c);
return GameAction.this.moveToGraveyard(c);
}
return c;
}

11
src/main/java/forge/GameActionUtil.java → src/main/java/forge/game/GameActionUtil.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package forge;
package forge.game;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,6 +25,14 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.CardUtil;
import forge.Command;
import forge.Constant;
import forge.CounterType;
import forge.Singletons;
import forge.CardPredicates.Presets;
import forge.card.SpellManaCost;
import forge.card.abilityfactory.AbilityFactory;
@@ -51,7 +59,6 @@ import forge.control.input.Input;
import forge.control.input.InputPayDiscardCost;
import forge.control.input.InputPayManaCostAbility;
import forge.control.input.InputPayReturnCost;
import forge.game.GameState;
import forge.game.ai.ComputerUtil;
import forge.game.event.CardDamagedEvent;
import forge.game.event.LifeLossEvent;

1
src/main/java/forge/game/GameNew.java
View File

@@ -22,7 +22,6 @@ import forge.Card;
import forge.CardLists;
import forge.CardPredicates;
import forge.CardUtil;
import forge.GameAction;
import forge.Singletons;
import forge.card.trigger.TriggerHandler;
import forge.card.trigger.TriggerType;

2
src/main/java/forge/game/GameState.java
View File

@@ -29,8 +29,6 @@ import forge.Card;
import forge.CardLists;
import forge.CardPredicates.Presets;
import forge.ColorChanger;
import forge.GameAction;
import forge.GameActionUtil;
import forge.GameLog;
import forge.Singletons;
import forge.StaticEffects;

2
src/main/java/forge/game/ai/AiController.java
View File

@@ -31,7 +31,6 @@ import forge.CardLists;
import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.Constant;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.abilityfactory.ApiType;
@@ -40,6 +39,7 @@ import forge.card.cost.CostDiscard;
import forge.card.cost.CostPart;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellPermanent;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.player.AIPlayer;
import forge.game.player.Player;

2
src/main/java/forge/game/ai/ComputerUtilMana.java
View File

@@ -10,7 +10,6 @@ import com.google.common.base.Predicate;
import forge.Card;
import forge.CardLists;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.SpellManaCost;
import forge.card.abilityfactory.AbilityFactory;
@@ -23,6 +22,7 @@ import forge.card.mana.ManaPool;
import forge.card.spellability.AbilityManaPart;
import forge.card.spellability.SpellAbility;
import forge.control.input.InputPayManaCostUtil;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.player.AIPlayer;
import forge.game.player.Player;

2
src/main/java/forge/game/phase/CombatUtil.java
View File

@@ -34,7 +34,6 @@ import forge.CardLists;
import forge.CardPredicates;
import forge.Command;
import forge.Constant;
import forge.GameActionUtil;
import forge.GameEntity;
import forge.Singletons;
import forge.card.SpellManaCost;
@@ -46,6 +45,7 @@ import forge.card.spellability.Ability;
import forge.card.spellability.AbilityStatic;
import forge.card.staticability.StaticAbility;
import forge.card.trigger.TriggerType;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.GlobalRuleChange;
import forge.game.ai.ComputerUtil;

2
src/main/java/forge/game/phase/Upkeep.java
View File

@@ -32,7 +32,6 @@ import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.Command;
import forge.CounterType;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.SpellManaCost;
import forge.card.cardfactory.CardFactoryUtil;
@@ -44,6 +43,7 @@ import forge.card.spellability.AbilityStatic;
import forge.card.spellability.SpellAbility;
import forge.control.input.Input;
import forge.control.input.InputSelectManyCards;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilCost;

2
src/main/java/forge/game/player/Player.java
View File

@@ -41,7 +41,6 @@ import forge.CardPredicates.Presets;
import forge.CardUtil;
import forge.Constant.Preferences;
import forge.CounterType;
import forge.GameActionUtil;
import forge.GameEntity;
import forge.Singletons;
import forge.card.cardfactory.CardFactoryUtil;
@@ -52,6 +51,7 @@ import forge.card.spellability.Ability;
import forge.card.spellability.SpellAbility;
import forge.card.staticability.StaticAbility;
import forge.card.trigger.TriggerType;
import forge.game.GameActionUtil;
import forge.game.GameLossReason;
import forge.game.GameState;
import forge.game.GlobalRuleChange;

2
src/main/java/forge/game/zone/MagicStack.java
View File

@@ -31,7 +31,6 @@ import forge.CardLists;
import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.Command;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.SpellManaCost;
import forge.card.abilityfactory.AbilityFactory;
@@ -51,6 +50,7 @@ import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerType;
import forge.control.input.Input;
import forge.control.input.InputPayManaCostAbility;
import forge.game.GameActionUtil;
import forge.game.GameState;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilCost;

2
src/main/java/forge/game/zone/PlayerZoneBattlefield.java
View File

@@ -30,12 +30,12 @@ import forge.CardLists;
import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.Command;
import forge.GameActionUtil;
import forge.Singletons;
import forge.card.SpellManaCost;
import forge.card.spellability.Ability;
import forge.card.spellability.SpellAbility;
import forge.card.staticability.StaticAbility;
import forge.game.GameActionUtil;
import forge.game.player.Player;
/**