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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Alessandro Coli
2019-11-18 13:44:34 +01:00
parent e9c2e1034c dffb63d95f
commit 26dc246c52
3 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -70,7 +70,7 @@ public class Combat {
public Combat(final Player attacker) { public Combat(final Player attacker) {
playerWhoAttacks = attacker; playerWhoAttacks = attacker;
initConstraints();
} }
public Combat(Combat combat, GameObjectMap map) { public Combat(Combat combat, GameObjectMap map) {
@@ -116,9 +116,9 @@ public class Combat {
} }
public void initConstraints() { public void initConstraints() {
attackableEntries.clear();
// Create keys for all possible attack targets // Create keys for all possible attack targets
attackableEntries.addAll(CombatUtil.getAllPossibleDefenders(playerWhoAttacks)); attackableEntries.addAll(CombatUtil.getAllPossibleDefenders(playerWhoAttacks));
attackConstraints = new AttackConstraints(this); attackConstraints = new AttackConstraints(this);
} }

5
forge-gui/res/cardsfolder/p/proteus_staff.txt
View File

@@ -1,8 +1,9 @@
Name:Proteus Staff Name:Proteus Staff
ManaCost:3 ManaCost:3
Types:Artifact Types:Artifact
A:AB$ ChangeZone | Cost$ 2 U T | SorcerySpeed$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Polymorph | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBDigUntil | SpellDescription$ Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order. Activate this ability only any time you could cast a sorcery. A:AB$ ChangeZone | Cost$ 2 U T | SorcerySpeed$ True | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | ValidTgts$ Creature | AILogic$ Polymorph | RememberLKI$ True | TgtPrompt$ Select target creature | SubAbility$ DBDigUntil | SpellDescription$ Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until they reveal a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order. Activate this ability only any time you could cast a sorcery.
SVar:DBDigUntil:DB$ DigUntil | Defined$ TargetedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 SVar:DBDigUntil:DB$ DigUntil | Defined$ RememberedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
AI:RemoveDeck:All AI:RemoveDeck:All
AI:RemoveDeck:Random AI:RemoveDeck:Random
DeckNeeds:Color$Blue DeckNeeds:Color$Blue

167
forge-gui/res/languages/de-DE.properties
View File

@@ -757,7 +757,7 @@ lblcopiesof=Kopien von
#ItemListView.java #ItemListView.java
lblUniqueCardsOnly=Nur eine Version lblUniqueCardsOnly=Nur eine Version
ttUniqueCardsOnly=Schaltet zwischen der Anzeige der neuesten oder aller Versionen einer Karte um. ttUniqueCardsOnly=Schaltet zwischen der Anzeige der neuesten oder aller Versionen einer Karte um.
lblListView=List View lblListView=Listanzeige
#ACEditorBase.java #ACEditorBase.java
lblAddcard=Karten hinzufügen lblAddcard=Karten hinzufügen
ttAddcard=Fügt gewählte Karte dem Deck hinzu (oder Doppelklick oder Leertaste drücken) ttAddcard=Fügt gewählte Karte dem Deck hinzu (oder Doppelklick oder Leertaste drücken)
@@ -790,9 +790,9 @@ lblCollapseallgroups=Minimiere alle Gruppen
lblGroupby=Gruppiere nach lblGroupby=Gruppiere nach
lblPileby=Stapel nach lblPileby=Stapel nach
lblColumns=Spalten lblColumns=Spalten
lblPiles=Piles: lblPiles=Stapel
lblGroups=Groups: lblGroups=Gruppen:
lblImageView=Image View lblImageView=Bildanzeige
#CEditorVariant.java, CEditorConstructed.java #CEditorVariant.java, CEditorConstructed.java
lblCatalog=Katalog lblCatalog=Katalog
lblAdd=Hinzufügen lblAdd=Hinzufügen
@@ -1243,145 +1243,144 @@ lblLifePaidForPhyrexianMana=(%d Leben wurde bezahlt für phyrexianisches Mana)
lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=Klicke auf deine Lebenspunkte um phyrexianisches Mana zu bezahlen. lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=Klicke auf deine Lebenspunkte um phyrexianisches Mana zu bezahlen.
lblClickOnYourLifeTotalToPayLifeForBlackMana=Klicke auf deine Lebenspunkte um schwarzes Mana zu bezahlen. lblClickOnYourLifeTotalToPayLifeForBlackMana=Klicke auf deine Lebenspunkte um schwarzes Mana zu bezahlen.
lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=Klicke auf deine Lebenspunkte um phyrexianisches oder schwarzes Mana zu bezahlen. lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=Klicke auf deine Lebenspunkte um phyrexianisches oder schwarzes Mana zu bezahlen.
lblPuzzleText1=Der Puzzle-Modus lädt ein Puzzle, das du in einer vorgegebenen Zeit/Weise gewinnen musst.
lblPuzzleText1=Puzzle Mode loads in a puzzle that you have to win in a predetermined time/way. lblPuzzleText2=Um zu beginnen, drücke zunächst die Start-Taste und wähle dann ein Puzzle aus einer Liste aus.
lblPuzzleText2=To begin, press the Start button below, then select a puzzle from a list. lblPuzzleText3=Dein Ziel wird beim Start des Puzzles in einem Popup-Fenster angezeigt und auf einer Spezialeffektkarte angegeben, die sich in deiner Befehlszone befindet.
lblPuzzleText3=Your objective will be displayed in a pop-up window when the puzzle starts and also specified on a special effect card which will be placed in your command zone. lblChooseAPuzzle=Wähle ein Puzzle
lblChooseAPuzzle=Choose a puzzle lblLoadingThePuzzle=Lade das Puzzle...
lblLoadingThePuzzle=Loading the puzzle...
#GameLogFormatter.java #GameLogFormatter.java
lblLogScryTopBottomLibrary=%s scried %top card(s) to the top of the library and %bottom card(s) to the bottom of the library lblLogScryTopBottomLibrary=Hellsicht: %s legte %top Karte(n) auf und %bottom Karte(n) unter die Bibliothek
lblLogScryTopLibrary=%s scried %top card(s) to the top of the library lblLogScryTopLibrary=Hellsicht: %s legte %top Karte(n) auf die Bibliothek
lblLogScryBottomLibrary=%s scried %bottom card(s) to the bottom of the library lblLogScryBottomLibrary=Hellsicht: %s legte %bottom Karte(n) unter die Bibliothek
lblPlayerHasMulliganedDownToNCards=%s has mulliganed down to %d cards. lblPlayerHasMulliganedDownToNCards=%s nutze Mulligan und hat nun %d Karten.
lblPlayerDidntAttackThisTurn=%s didn't attack this turn. lblPlayerDidntAttackThisTurn=% griff diesen Zug nicht an.
#FormatFilter.java #FormatFilter.java
lblAllSetsFormats=All Sets/Formats lblAllSetsFormats=Alle Sets/Formate
lblOtherFormats=Other Formats... lblOtherFormats=Andere Formate...
lblChooseSets=Choose Sets... lblChooseSets=Wähle Sets...
#HistoricFormatSelect.java #HistoricFormatSelect.java
lblChooseFormat=Choose Format lblChooseFormat=Wähle Format
#TriggerAdapt.java #TriggerAdapt.java
lblAdapt=Adapt lblAdapt=Adaptieren
#TriggerAttached.java #TriggerAttached.java
lblAttachee=Attachee lblAttachee=Anhang
#TriggerAttackerBlocked.java #TriggerAttackerBlocked.java
lblNumberBlockers=Number Blockers lblNumberBlockers=Anzahl Blocker
lblBlocker=Blocker lblBlocker=Blocker
#TriggerAttackersDeclared.java #TriggerAttackersDeclared.java
lblNumberAttackers=Number Attackers lblNumberAttackers=Anzahl Angreifer
#TriggerAttackerUnblockedOnce.java #TriggerAttackerUnblockedOnce.java
lblAttackingPlayer=AttackingPlayer lblAttackingPlayer=Angreifender Spieler
lblDefenders=Defenders lblDefenders=Verteidiger
#TriggerBecomeMonarch.java #TriggerBecomeMonarch.java
lblPlayer=Player lblPlayer=Spieler
#TriggerBecomeMonstrous.java #TriggerBecomeMonstrous.java
lblMonstrous=Monstrous lblMonstrous=Monströs
#TriggerBecomeRenowned.java #TriggerBecomeRenowned.java
lblRenowned=Renowned lblRenowned=Ruhm
#TriggerBecomesTarget.java #TriggerBecomesTarget.java
lblSource=Source lblSource=Quelle
lblTarget=Target lblTarget=Ziel
#TriggerBecomesTargetOnce.java #TriggerBecomesTargetOnce.java
lblTargets=Targets lblTargets=Ziele
#TriggerBlockersDeclared.java #TriggerBlockersDeclared.java
lblBlockers=Blockers lblBlockers=Blocker
#TriggerChampioned.java #TriggerChampioned.java
lblChampioned=Championed lblChampioned=Unterstützt
#TriggerChangesController.java #TriggerChangesController.java
lblChangedController=Changed Controller lblChangedController=Kontrolle geändert
#TriggerChangesZone.java #TriggerChangesZone.java
lblZoneChanger=Zone Changer lblZoneChanger=Zone geändert
#TriggerChangesZoneAll.java #TriggerChangesZoneAll.java
lblAmount=Amount lblAmount=Anzahl
#TriggerCounterAdded.java #TriggerCounterAdded.java
lblAddedOnce=Added once lblAddedOnce=Einmalig hinzugefügt
#TriggerCountered.java #TriggerCountered.java
lblCountered=Countered lblCountered=Abgewehrt
lblCause=Cause lblCause=Grund
#TriggerCounteredRemoved.java #TriggerCounteredRemoved.java
lblRemovedFrom=Removed from lblRemovedFrom=Entfernt von
#TriggerCrewed.java #TriggerCrewed.java
lblVehicle=Vehicle lblVehicle=Fahrzeug
lblCrew=Crew lblCrew=Besatzung
#TriggerCycled.java #TriggerCycled.java
lblCycled=Cycled lblCycled=Ausgetauscht
#TriggerDamageDealtOnce.java #TriggerDamageDealtOnce.java
lblDamageSource=Damage Source lblDamageSource=Schadensquelle
lblDamaged=Damaged lblDamaged=Geschädigt
#TriggerDamagePrevented.java #TriggerDamagePrevented.java
lblDamageTarget=Damage Target lblDamageTarget=Schadensziel
#TriggerDestroyed.java #TriggerDestroyed.java
lblDestroyed=Destroyed lblDestroyed=Zerstört
lblDestroyer=Destroyer lblDestroyer=Zerstörer
#TriggerDevoured.java #TriggerDevoured.java
lblDevoured=Devoured lblDevoured=Verschlungen
#TriggerDiscarded.java #TriggerDiscarded.java
lblDiscarded=Discarded lblDiscarded=Abgeworfen
#TriggerEvolved.java #TriggerEvolved.java
lblEvolved=Evolved lblEvolved=Weiterentwickelt
#TriggerExerted.java #TriggerExerted.java
lblExerted=Exerted lblExerted=Erschöpft
#TriggerExiled.java #TriggerExiled.java
lblExiled=Exiled lblExiled=im Exil
#TriggerExploited.java #TriggerExploited.java
lblExploited=Exploited lblExploited=Ausgeschlachtet
lblExploiter=Exploiter lblExploiter=Ausschlachtender
#TriggerExplores.java #TriggerExplores.java
lblExplorer=Explorer lblExplorer=Erforscher
#TriggerFight.java #TriggerFight.java
lblFighter=Fighter lblFighter=Kämpfer
#TriggerLandPlayed.java #TriggerLandPlayed.java
lblLandPlayed=Land played lblLandPlayed=Land gespielt
#TriggerLifeGained.java #TriggerLifeGained.java
lblGainedAmount=Gained Amount lblGainedAmount=Anzahl bekommen
#TriggerLifeLost.java #TriggerLifeLost.java
lblLostAmount=Lost Amount lblLostAmount=Anzahl verloren
#TriggerPayCumulativeUpkeep.java #TriggerPayCumulativeUpkeep.java
lblMana=Mana lblMana=Mana
#TriggerPayLife.java #TriggerPayLife.java
lblPaidAmount=Paid Amount lblPaidAmount=Anzahl bezahlt
#TriggerPhaseIn.java #TriggerPhaseIn.java
lblPhasedIn=Phased In lblPhasedIn=Stabilisiert
#TriggerPhaseOut.java #TriggerPhaseOut.java
lblPhasedOut=Phased Out lblPhasedOut=Destabilisiert
#TriggerRoller.java #TriggerRoller.java
lblRoller=Roller lblRoller=Würfler
#TriggerPlaneswalkedFrom.java #TriggerPlaneswalkedFrom.java
lblPlaneswalkedFrom=Planeswalked From lblPlaneswalkedFrom=Weltengewandert von
#TriggerPlaneswalkedTo.java #TriggerPlaneswalkedTo.java
lblPlaneswalkedTo=Planeswalked To lblPlaneswalkedTo=Weltengewandert nach
#TriggerRegenerated.java #TriggerRegenerated.java
lblRegenerated=Regenerated lblRegenerated=Regeneriert
#TriggerRevealed.java #TriggerRevealed.java
lblRevealed=Revealed lblRevealed=Enthüllt
#TriggerSacrificed.java #TriggerSacrificed.java
lblSacrificed=Sacrificed lblSacrificed=Geopfert
#TriggerScry.java #TriggerScry.java
lblScryer=Scryer lblScryer=Hellsicht angewendet
#TriggerSearchLibrary.java #TriggerSearchLibrary.java
lblSearcher=Searcher lblSearcher=hat gesucht
#TriggerShuffled.java #TriggerShuffled.java
lblShuffler=Shuffler lblShuffler=hat gemischt
#TriggerSpellAbilityCast.java #TriggerSpellAbilityCast.java
lblActivator=Activator lblActivator=hat aktiviert
#TriggerSpellAbilityCast.java #TriggerSpellAbilityCast.java
lblSpellAbility=SpellAbility lblSpellAbility=Spruch-Fähigkeit
#TriggerTaps.java #TriggerTaps.java
lblTapped=Tapped lblTapped=Getappt
#TriggerTapsForMana.java #TriggerTapsForMana.java
lblTappedForMana=Tapped for Mana lblTappedForMana=für Mana getappt
lblProduced=Produced lblProduced=Erzeugte
#TriggerTransformed.java #TriggerTransformed.java
lblTransformed=Transformed lblTransformed=Transformiert
#TriggerTurnFaceUp.java #TriggerTurnFaceUp.java
lblTurnFaceUp=Turn Face up lblTurnFaceUp=Aufgedeckt
#TriggerUnattach.java #TriggerUnattach.java
lblObject=Object lblObject=Objekt
lblAttachment=Attachment lblAttachment=Anhang
#TriggerUntaps.java #TriggerUntaps.java
lblUntapped=Untapped lblUntapped=nicht getappt
#TriggerVote.java #TriggerVote.java
lblVoters=Voters lblVoters=Abstimmende
#PermanentCreatureEffect.java #PermanentCreatureEffect.java
lblCreature=Creature lblCreature=Kreatur