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

Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

Browse Source
This commit is contained in:
Agetian
2020-06-30 08:26:17 +03:00
parent 0cd82d89e7 40b23e76a2
commit befcd915b3
8 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
View File

@@ -224,8 +224,10 @@ public enum CDeckEditorUI implements ICDoc {
addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); addSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1);
} }
else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) {
if (e.isControlDown() || e.isMetaDown()) {
deckView.focus(); deckView.focus();
e.consume(); //prevent losing selection e.consume(); //prevent losing selection
}
} }
} }
}); });
@@ -236,8 +238,10 @@ public enum CDeckEditorUI implements ICDoc {
removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1); removeSelectedCards(e.isControlDown() || e.isMetaDown(), e.isShiftDown() ? 4: 1);
} }
else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) { else if (KeyEvent.VK_LEFT == e.getKeyCode() || KeyEvent.VK_RIGHT == e.getKeyCode()) {
catView.focus(); if (e.isControlDown() || e.isMetaDown()) {
e.consume(); //prevent losing selection catView.focus();
e.consume(); //prevent losing selection
}
} }
else if (KeyEvent.VK_F == e.getKeyCode()) { else if (KeyEvent.VK_F == e.getKeyCode()) {
// let ctrl/cmd-F set focus to the text filter box // let ctrl/cmd-F set focus to the text filter box

4
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -458,7 +458,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptoprevioustable"), GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptoprevioustable"),
KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.META_DOWN_MASK | InputEvent.CTRL_DOWN_MASK),
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
@@ -466,7 +466,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
} }
}); });
GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptopnexttable"), GuiUtils.addMenuItem(menu, localizer.getMessage("lblJumptopnexttable"),
KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.META_DOWN_MASK | InputEvent.CTRL_DOWN_MASK),
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {

6
forge-gui/release-files/ANNOUNCEMENTS.txt
View File

@@ -1,6 +1,2 @@
#Add one announcement per line #Add one announcement per line
M21 Pre-release. Keyboard shortcut change: to help improve accessibility, the arrow key shortcuts to move between deck editor tables now require control or Command, depending on which platform you're on.
Mutate is NOT finished yet. Please be patient.
Companion is in, but unfortunately Wizards changed the rules on us. We'll get the new rules in when we can.
[b]Forge now requires Java 8 (or newer). You will not be able to start the game if you are not yet running Java 8.[/b]
We have a Discord server for hanging out with Forge devs and other Forge fans. Feel free to [url=https://discord.gg/3v9JCVr]jump on in and say hi[/url]!

2
forge-gui/res/cardsfolder/e/eliminate.txt
View File

@@ -1,5 +1,5 @@
Name:Eliminate Name:Eliminate
ManaCost:1 B ManaCost:1 B
Types:Instant Types:Instant
A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature+cmcLE3,Planeswalker+cmcLE3 | TgtPrompt$ Select target creature or planeswalker with converted mana cost 3 or less | SpellDescription$ Destroy target creature or planeswalker with converted mana cost 3 or less. A:SP$ Destroy | Cost$ 1 B | ValidTgts$ Creature.cmcLE3,Planeswalker.cmcLE3 | TgtPrompt$ Select target creature or planeswalker with converted mana cost 3 or less | SpellDescription$ Destroy target creature or planeswalker with converted mana cost 3 or less.
Oracle:Destroy target creature or planeswalker with converted mana cost 3 or less. Oracle:Destroy target creature or planeswalker with converted mana cost 3 or less.

6
forge-gui/res/cardsfolder/g/gisa_and_geralf.txt
View File

@@ -1,10 +1,10 @@
Name:Gisa and Geralf Name:Gisa and Geralf
ManaCost: 2 U B ManaCost:2 U B
Types:Legendary Creature Human Wizard Types:Legendary Creature Human Wizard
PT:4/4 PT:4/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill four cards. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill four cards.
SVar:TrigMill:DB$Mill | NumCards$ 4 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 4 | Defined$ You
S:Mode$ Continuous | Affected$ Zombie.YouCtrl | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ During each of your turns, you may cast a Zombie creature card from your graveyard. S:Mode$ Continuous | Affected$ Zombie.YouCtrl | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ During each of your turns, you may cast a Zombie creature card from your graveyard.
DeckHints:Type$Zombie DeckHints:Type$Zombie
DeckHas:Ability$Graveyard DeckHas:Ability$Graveyard & Ability$Mill
Oracle:When Gisa and Geralf enters the battlefield, mill four cards.\nDuring each of your turns, you may cast a Zombie creature card from your graveyard. Oracle:When Gisa and Geralf enters the battlefield, mill four cards.\nDuring each of your turns, you may cast a Zombie creature card from your graveyard.

3
forge-gui/res/cardsfolder/j/jaces_erasure.txt
View File

@@ -2,5 +2,6 @@ Name:Jace's Erasure
ManaCost:1 U ManaCost:1 U
Types:Enchantment Types:Enchantment
T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, you may have target player mill a card. T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, you may have target player mill a card.
SVar:TrigMill:DB$Mill | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player SVar:TrigMill:DB$ Mill | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player
DeckHas:Ability$Mill
Oracle:Whenever you draw a card, you may have target player mill a card. Oracle:Whenever you draw a card, you may have target player mill a card.

4
forge-gui/res/cardsfolder/k/keen_glidemaster.txt
View File

@@ -1,6 +1,6 @@
Name:Keen Glidemaster Name:Keen Glidemaster
ManaCost:1 U ManaCost:1 U
Types:Creature Human Soldier Types:Creature Human Soldier
PT:2/2 PT:2/1
A:AB$ Pump | Cost$ 2 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn. A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
Oracle:{2}{U}: Target creature gains flying until end of turn. Oracle:{2}{U}: Target creature gains flying until end of turn.

4
forge-gui/res/cardsfolder/s/sidisi_brood_tyrant.txt
View File

@@ -5,7 +5,7 @@ PT:3/3
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards.
T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards. T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill three cards.
T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token. T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token.
SVar:TrigMill:DB$Mill | NumCards$ 3 | Defined$ You SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You
SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You
DeckHas:Ability$Token & Ability$Graveyard DeckHas:Ability$Token & Ability$Graveyard & Ability$Mill
Oracle:Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, mill three cards.\nWhenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token. Oracle:Whenever Sidisi, Brood Tyrant enters the battlefield or attacks, mill three cards.\nWhenever one or more creature cards are put into your graveyard from your library, create a 2/2 black Zombie creature token.