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

Updated some more checks to use isCreatureType.

Browse Source
This commit is contained in:
jendave
2011-08-06 08:24:46 +00:00
parent 9ce73a11d7
commit 992b97aa77
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/CardFactory.java
View File

@@ -6077,9 +6077,7 @@ public class CardFactory implements NewConstants {
input[0] = JOptionPane.showInputDialog(null, "Which creature type?", "Pick type", input[0] = JOptionPane.showInputDialog(null, "Which creature type?", "Pick type",
JOptionPane.QUESTION_MESSAGE); JOptionPane.QUESTION_MESSAGE);
if(input[0].equals("Legendary") || input[0].equals("Artifact") if(!CardUtil.isCreatureType(input[0])) input[0] = "";
|| input[0].equals("Enchantment") || input[0].equals("Shrine")
|| input[0].equals("Creature")) input[0] = "";
//TODO: some more input validation, case-sensitivity, etc. //TODO: some more input validation, case-sensitivity, etc.
input[0] = input[0].trim(); //this is to prevent "cheating", and selecting multiple creature types,eg "Goblin Soldier" input[0] = input[0].trim(); //this is to prevent "cheating", and selecting multiple creature types,eg "Goblin Soldier"

4
src/forge/CardFactoryUtil.java
View File

@@ -4010,9 +4010,7 @@ public class CardFactoryUtil {
ArrayList<String> typeList = c.getType(); ArrayList<String> typeList = c.getType();
for(String var:typeList) { for(String var:typeList) {
if(var.equals("Creature") || var.equals("Artifact") || var.equals("Land") || var.equals("Tribal") if(CardUtil.isCreatureType(var) && !map.containsKey(var)) map.put(var, 1);
|| var.equals("Enchantment") || var.equals("Legendary")) ;
else if(!map.containsKey(var)) map.put(var, 1);
else { else {
map.put(var, map.get(var) + 1); map.put(var, map.get(var) + 1);
} }