Some cleanup (#10278)

Author: tool4ever

docs/Adventure/GAMEPAD.md

@@ -11,57 +11,52 @@ https://github.com/Ryochan7/DS4Windows/releases/
 HidHide latest:
 https://github.com/ViGEm/HidHide/releases
 
-Other XInput Controller should work, XBox or DS4 Preferaably and other similar XInput Controller with comparable button layout. Custom Key Mapping is not yet supported.
+Other XInput Controller should work, XBox or DS4 preferably and other similar XInput Controller with comparable button layout. Custom Key Mapping is not yet supported.
 
 Controls:
 
-UIScenes
-
-DPAD Up/Down/Left/Right - for selecting texboxes and textfield, Scroll Up or Down
-Button A - Ok, Show Context
-Button B - Cancel
-Button X - Increase Difficulty in NewGame Plus/Flip Backside Deck Editor
-Button Y - Decrease Difficulty in NewGame Plus/Zoom or Text Mode in Deck Editor
-Left/Right Shoulder Button - Scroll Up or Scroll Down on some UIScenes
-
-RewardScene
-
-DPAD Left/Right - Selector
-Button A - Confirm/Flip Reward
-Button B - Show Rewards/Done
-Button Y - Show/Hide Zoom Card
-
-TextInput
-
-DPAD Up/Down/Left/Right - Key Selector
-Left Shoulder Button - Shift Keys
-Right Shoulder Button - Backspace
-Button Start - Jump to Ok
-Button A - Confirm
-Button B - Cancel
-
-World/Gamescene
-
-DPAD Up/Down/Left/Right - Character Movement
-Left Analog - Character Movement
-Button A - Menu/Confirm
-Button B - Statistics/Edit
-Button X - Deck Select/Deck Edit
-Button Y - Inventory/Rename
-
-Match/Battle
-
-Left Trigger - Play/Draw/OK (Bottom Left Button)
-Right Trigger - Keep/Mulligan/Cancel/End Turn/Alpha Strike (Bottom Right Button)
-
-(To select cards on the battlefield, close Zone tabs first (Button B), then use DPAD)
-
-DPAD Up/Down/Left/Right - Selector
-Left Shoulder - Player Panel Selector
-Right Shoulder - Zone Selector/Show
-Left Analog Down - Select Player (current selected panel)
-
-Button A - Confirm
-Button B - Cancel/Hide
-Button Y - Show Zoom
-Button Back - Show Menu Tabs
+- UIScenes
+  - DPAD Up/Down/Left/Right - for selecting texboxes and textfield, Scroll Up or Down
+  - Button A - Ok, Show Context
+  - Button B - Cancel
+  - Button X - Increase Difficulty in NewGame Plus/Flip Backside Deck Editor
+  - Button Y - Decrease Difficulty in NewGame Plus/Zoom or Text Mode in Deck Editor
+  - Left/Right Shoulder Button - Scroll Up or Scroll Down on some UIScenes
+
+
+- RewardScene
+  - DPAD Left/Right - Selector
+  - Button A - Confirm/Flip Reward
+  - Button B - Show Rewards/Done
+  - Button Y - Show/Hide Zoom Card
+
+
+- TextInput
+  - DPAD Up/Down/Left/Right - Key Selector
+  - Left Shoulder Button - Shift Keys
+  - Right Shoulder Button - Backspace
+  - Button Start - Jump to Ok
+  - Button A - Confirm
+  - Button B - Cancel
+
+
+- World/Gamescene
+  - DPAD Up/Down/Left/Right - Character Movement
+  - Left Analog - Character Movement
+  - Button A - Menu/Confirm
+  - Button B - Statistics/Edit
+  - Button X - Deck Select/Deck Edit
+  - Button Y - Inventory/Rename
+
+
+- Match/Battle
+  - Left Trigger - Play/Draw/OK (Bottom Left Button)
+  - Right Trigger - Keep/Mulligan/Cancel/End Turn/Alpha Strike (Bottom Right Button)
+  - DPAD Up/Down/Left/Right - Selector (To select cards on the battlefield, close Zone tabs first (Button B))
+  - Left Shoulder - Player Panel Selector
+  - Right Shoulder - Zone Selector/Show
+  - Left Analog Down - Select Player (current selected panel)
+  - Button A - Confirm
+  - Button B - Cancel/Hide
+  - Button Y - Show Zoom
+  - Button Back - Show Menu Tabs

forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java

@@ -49,14 +49,14 @@ public DieRollResult(int naturalValue, int modifiedValue) {
             this.naturalValue = naturalValue;
             this.modifiedValue = modifiedValue;
         }
-        // Getters
+
         public int getNaturalValue() {
             return naturalValue;
         }
         public int getModifiedValue() {
             return modifiedValue;
         }
-        // Setters
+
         public void setNaturalValue(int naturalValue) {
             this.naturalValue = naturalValue;
         }

forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java

@@ -76,8 +76,6 @@ public void resolve(SpellAbility sa) {
 
         // Expand Sacrifice keyword here depending on what we need out of it.
         final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Amount", "1"), sa);
-        final boolean devour = sa.isKeyword(Keyword.DEVOUR);
-        final boolean exploit = sa.isKeyword(Keyword.EXPLOIT);
         final boolean sacEachValid = sa.hasParam("SacEachValid");
 
         String valid = sa.getParamOrDefault("SacValid", "Self");
@@ -163,14 +161,13 @@ public void resolve(SpellAbility sa) {
                 } else {
                     for (Card sac : game.getAction().sacrifice(choosenToSacrifice, sa, true, params)) {
                         Card lKICopy = zoneMovements.getLastStateBattlefield().get(sac);
-                        // Run Devour Trigger
-                        if (devour) {
+                        if (sa.isKeyword(Keyword.DEVOUR)) {
                             host.addDevoured(lKICopy);
                             final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
                             runParams.put(AbilityKey.Devoured, lKICopy);
                             game.getTriggerHandler().runTrigger(TriggerType.Devoured, runParams, false);
                         }
-                        if (exploit) {
+                        if (sa.isKeyword(Keyword.EXPLOIT)) {
                             host.addExploited(lKICopy);
                             final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(host);
                             runParams.put(AbilityKey.Exploited, lKICopy);

forge-game/src/main/java/forge/game/card/CardFactoryUtil.java

@@ -1349,7 +1349,6 @@ public static void addTriggerAbility(final KeywordInterface inst, final Card car
             parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
 
             inst.addTrigger(parsedTrigger);
-
         } else if (keyword.equals("Ingest")) {
             final String trigStr = "Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True"
                     + "| Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Ingest ("

forge-game/src/main/java/forge/game/card/CardProperty.java

@@ -1527,7 +1527,7 @@ else if (property.startsWith("attacking")) {
                 }
             }
             if (property.startsWith("attacking ")) { // generic "attacking [DefinedGameEntity]"
-                FCollection<GameEntity> defined = AbilityUtils.getDefinedEntities(source, property.split(" ")[1], spellAbility);
+                FCollection<GameEntity> defined = AbilityUtils.getDefinedEntities(source, property.split(" ", 2)[1], spellAbility);
                 final GameEntity defender = combat.getDefenderByAttacker(card);
                 if (!defined.contains(defender)) {
                     return false;

forge-game/src/main/java/forge/util/EnumMapUtil.java

@@ -1541,6 +1541,7 @@ public boolean buttonUp(Controller controller, int buttonIndex) {
                 public boolean axisMoved(Controller controller, int axisIndex, float value) {
                     //System.out.println(controller.getName()+"["+controller.getUniqueId()+"]: axis: "+axisIndex+" - "+value);
                     hasGamepad = true;
+                    // Axis deadzone filters joystick drift from counting
                     if (Math.abs(value) > 0.25f) {
                         lastInputWasController = true;
                     }

forge-gui-mobile/src/forge/Forge.java

@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ At the beginning of each end step, if you drew two or more cards this turn, you may put a quest counter on CARDNAME.
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ Tutor | IsPresent$ Card.Self+counters_GE6_QUEST | Optional$ True | Description$ As long as CARDNAME has six or more quest counters on it, if you would draw a card, you may instead search your library for a card, put that card into your hand, then shuffle.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-SVar:Tutor:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ValidCard$ Card.YouOwn
+SVar:Tutor:DB$ ChangeZone | Origin$ Library | Destination$ Hand
 SVar:X:Count$YouDrewThisTurn
 # TODO: improve AI tutoring logic
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/a/archmage_ascension.txt

@@ -5,10 +5,7 @@ PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When NICKNAME enter, ABILITY
 SVar:TrigCharm:DB$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBExile,DBToken | AdditionalDescription$ . Each mode must target a different player.
 SVar:DBExile:DB$ Dig | ValidTgts$ Player | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Target player exiles the top card of their library. Until that player's next end step, they may play that card without paying its mana cost.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ CRPlay | Duration$ Permanent | ExileOnMoved$ Exile | RememberObjects$ Remembered & RememberedOwner | Triggers$ RemoveTrigger | SubAbility$ DBCleanup
-SVar:CRPlay:Mode$ Continuous | Affected$ Card.IsRemembered | MayPlay$ True | MayPlayWithoutManaCost$ True | MayPlayPlayer$ CardOwner | AffectedZone$ Exile | Description$ Until that player's next end step, they may play that card without paying its mana cost.
-SVar:RemoveTrigger:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player.IsRemembered | Static$ True | Execute$ TrigExile
-SVar:TrigExile:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBEffect:DB$ Effect | StaticAbilities$ CRPlay | EffectOwner$ RememberedOwner | Duration$ UntilYourNextEndStep | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:CRPlay:Mode$ Continuous | Affected$ Card.IsRemembered | MayPlay$ True | MayPlayWithoutManaCost$ True | AffectedZone$ Exile | Description$ Until that player's next end step, they may play that card without paying its mana cost.
 SVar:DBToken:DB$ Token | ValidTgts$ Player | TargetUnique$ True | TokenOwner$ ThisTargetedPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | SpellDescription$ Target player creates two Treasure tokens.
 Oracle:When Casey & Raph enter, choose one or both. Each mode must target a different player.\n• Target player exiles the top card of their library. Until that player's next end step, they may play that card without paying its mana cost.\n• Target player creates two Treasure tokens.

forge-gui/res/cardsfolder/c/casey_raph_hotheads.txt

@@ -7,4 +7,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$
 SVar:TrigPlay:DB$ Play | TgtZone$ Graveyard | ValidTgts$ Instant.YouCtrl+cmcLEX,Sorcery.YouCtrl+cmcLEX | TgtPrompt$ Choose target instant or sorcery card with mana value X or less from your graveyard | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | ReplaceGraveyard$ Exile | AILogic$ ReplaySpell
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
-OOracle:Trample\nWhenever Dreadhorde Arcanist attacks, you may cast target instant or sorcery card with mana value less than or equal to Dreadhorde Arcanist's power from your graveyard without paying its mana cost. If that spell would be put into your graveyard this turn, exile it instead.
+Oracle:Trample\nWhenever Dreadhorde Arcanist attacks, you may cast target instant or sorcery card with mana value less than or equal to Dreadhorde Arcanist's power from your graveyard without paying its mana cost. If that spell would be put into your graveyard this turn, exile it instead.