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

Merge branch 'typo' into 'master'

Browse Source 
Some typos

Closes #1584

See merge request core-developers/forge!3168
This commit is contained in:
Sol
2020-09-22 00:23:02 +00:00
parent a1f9a8a51f 6fb14b35c3
commit 2b676115c9
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/res/cardsfolder/v/vampire_sovereign.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 B B
Types:Creature Vampire Noble Types:Creature Vampire Noble
PT:3/4 PT:3/4
K:Flying K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBite | TriggerDescription$ When CARDNAME enters the battlefield target opponent loses 3 life and you gain 3 life. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBite | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 3 life and you gain 3 life.
SVar:TrigBite:DB$LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 3 life and you gain 3 life. SVar:TrigBite:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 3 life and you gain 3 life.
SVar:DBGainLife:DB$GainLife | LifeAmount$ 3 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
Oracle:Flying\nWhen Vampire Sovereign enters the battlefield, target opponent loses 3 life and you gain 3 life. Oracle:Flying\nWhen Vampire Sovereign enters the battlefield, target opponent loses 3 life and you gain 3 life.

2
forge-gui/res/editions/Masters 25.txt
View File

@@ -54,7 +54,7 @@ FoilChanceInBooster=100
43 U Blue Elemental Blast 43 U Blue Elemental Blast
44 R Blue Sun's Zenith 44 R Blue Sun's Zenith
45 C Borrowing 100,000 Arrows 45 C Borrowing 100,000 Arrows
46 U Brainstorm 46 C Brainstorm
47 U Brine Elemental 47 U Brine Elemental
48 C Choking Tethers 48 C Choking Tethers
49 C Coralhelm Guide 49 C Coralhelm Guide

0
forge-gui/res/editions/Zendikar_Rising_Expeditions.txt → forge-gui/res/editions/Zendikar Rising Expeditions.txt
View File

2
forge-gui/res/languages/en-US.properties
View File

@@ -1142,7 +1142,7 @@ lblStormCount=Storm Count
#InputAttack.java #InputAttack.java
lblCallBack=Call Back lblCallBack=Call Back
lblDisabled=Disabled lblDisabled=Disabled
lblSelectAttackCreatures=Select creatures to attack lblSelectAttackCreatures=Select creatures to attack
lblSelectAttackTarget= or select player/planeswalker you wish to attack. lblSelectAttackTarget= or select player/planeswalker you wish to attack.
lblSelectBandingTarget= To attack as a band, select an attacking creature to activate its ''band'' then select another to join it. lblSelectBandingTarget= To attack as a band, select an attacking creature to activate its ''band'' then select another to join it.
#InputBlock.java #InputBlock.java

2
forge-gui/src/main/java/forge/match/input/InputAttack.java
View File

@@ -328,7 +328,7 @@ public class InputAttack extends InputSyncronizedBase {
private void updateMessage() { private void updateMessage() {
Localizer localizer = Localizer.getInstance(); Localizer localizer = Localizer.getInstance();
String message = localizer.getMessage("lblSelectAttackCreatures") + currentDefender + localizer.getMessage("lblSelectAttackTarget"); String message = localizer.getMessage("lblSelectAttackCreatures") + " " + currentDefender + " " + localizer.getMessage("lblSelectAttackTarget");
if (potentialBanding) { if (potentialBanding) {
message += localizer.getMessage("lblSelectBandingTarget"); message += localizer.getMessage("lblSelectBandingTarget");
} }

2
forge-gui/src/main/java/forge/match/input/InputBlock.java
View File

@@ -86,7 +86,7 @@ public class InputBlock extends InputSyncronizedBase {
} }
else { else {
String attackerName = currentAttacker.isFaceDown() ? localizer.getMessage("lblMorph") : currentAttacker.getName() + " (" + currentAttacker.getId() + ")"; String attackerName = currentAttacker.isFaceDown() ? localizer.getMessage("lblMorph") : currentAttacker.getName() + " (" + currentAttacker.getId() + ")";
String message = localizer.getMessage("lblSelectBlocker") + attackerName + localizer.getMessage("lblOrSelectBlockTarget"); String message = localizer.getMessage("lblSelectBlocker") + attackerName + " " + localizer.getMessage("lblOrSelectBlockTarget");
showMessage(message); showMessage(message);
} }