Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alessandro Coli
2019-11-18 13:44:34 +01:00
3 changed files with 88 additions and 88 deletions

View File

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

View File

@@ -1,8 +1,9 @@
Name:Proteus Staff
ManaCost:3
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.
SVar:DBDigUntil:DB$ DigUntil | Defined$ TargetedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1
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$ RememberedController | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
AI:RemoveDeck:All
AI:RemoveDeck:Random
DeckNeeds:Color$Blue

View File

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