External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Some fixes to Ferocious cards (missing LockedInCondition). Some changes to tooltip text generation.

Browse source
This commit is contained in:
LevelX2 2015-01-25 11:28:56 +01:00
parent a39c4aa4f4
commit bc1757a90f
14 changed files with 65 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/mage/abilities/effects/Effects.java
View file

@ -72,8 +72,10 @@ public class Effects extends ArrayList<Effect> {
endString = " ";
} else if (nextRule.startsWith(",")) {
endString = "";
} else if (lastRule != null && lastRule.length()> 3 && !lastRule.endsWith(".")) {
endString = ". ";
} else if (lastRule != null && lastRule.length()> 3) {
if (!lastRule.endsWith(".") && !lastRule.endsWith("<br>")) {
endString = ". ";
}
if (nextRule.length() > 3) {
nextRule = Character.toUpperCase(nextRule.charAt(0)) + nextRule.substring(1);
}
@ -82,7 +84,12 @@ public class Effects extends ArrayList<Effect> {
}
lastRule = nextRule;
}
if (lastRule != null && lastRule.length()> 3 && !lastRule.endsWith(".") && !lastRule.endsWith("\"") && !lastRule.startsWith("<b>Level ")) {
if (lastRule != null && lastRule.length()> 3 &&
!lastRule.endsWith(".") &&
!lastRule.endsWith("\"") &&
!lastRule.startsWith("<b>Level ") &&
!lastRule.endsWith(".)") &&
!lastRule.endsWith("<i/>") ) {
sbText.append(".");
}
return sbText.toString();

2
Mage/src/mage/abilities/effects/common/EndTurnEffect.java
View file

@ -37,7 +37,7 @@ public class EndTurnEffect extends OneShotEffect {
public EndTurnEffect() {
super(Outcome.Detriment);
staticText = "End the turn (Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)";
staticText = "End the turn <i>(Exile all spells and abilities on the stack. Discard down to your maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)<i/>";
}
public EndTurnEffect(EndTurnEffect effect) {