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

- cleanups

Browse Source
This commit is contained in:
jendave
2011-08-06 03:52:00 +00:00
parent 4aa005f8b8
commit df3be094a1
6 changed files with 40 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/Card.java
View File

@@ -820,9 +820,7 @@ public class Card extends MyObservable {
public void addDamage(HashMap<Card, Integer> sourcesMap) { public void addDamage(HashMap<Card, Integer> sourcesMap) {
Iterator<Entry<Card, Integer>> iter1 = sourcesMap.entrySet().iterator(); for(Entry<Card, Integer> entry : sourcesMap.entrySet()) {
while(iter1.hasNext()) {
Entry<Card, Integer> entry = iter1.next();
this.addDamage(entry.getValue(), entry.getKey()); this.addDamage(entry.getValue(), entry.getKey());
} }

47
src/forge/CardFactoryUtil.java
View File

@@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.Map.Entry;
public class CardFactoryUtil { public class CardFactoryUtil {
@@ -2994,10 +2995,8 @@ public class CardFactoryUtil {
public static String getMostProminentCreatureType(CardList list) { public static String getMostProminentCreatureType(CardList list) {
Map<String, Integer> map = new HashMap<String, Integer>(); Map<String, Integer> map = new HashMap<String, Integer>();
String s = "";
for(int i = 0; i < list.size(); i++) { for(Card c : list) {
Card c = list.get(i);
ArrayList<String> typeList = c.getType(); ArrayList<String> typeList = c.getType();
for(String var:typeList) { for(String var:typeList) {
@@ -3013,29 +3012,24 @@ public class CardFactoryUtil {
int max = 0; int max = 0;
String maxType = ""; String maxType = "";
for(int i = 0; i < map.size(); i++) { for(Entry<String, Integer> entry : map.entrySet()){
Iterator<String> iter = map.keySet().iterator(); String type = entry.getKey();
while(iter.hasNext()) { System.out.println(type + " - " + entry.getValue());
String type = iter.next();
System.out.println(type + " - " + map.get(type));
if(max < map.get(type)) { if(max < entry.getValue()) {
max = map.get(type); max = entry.getValue();
maxType = type; maxType = type;
}
} }
} }
s = maxType;
return s; return maxType;
} }
public static String getMostProminentColor(CardList list) { public static String getMostProminentColor(CardList list) {
Map<String, Integer> map = new HashMap<String, Integer>(); Map<String, Integer> map = new HashMap<String, Integer>();
String s = "";
for(int i = 0; i < list.size(); i++) { for(Card c : list) {
Card c = list.get(i);
ArrayList<String> colorList = CardUtil.getColors(c); ArrayList<String> colorList = CardUtil.getColors(c);
for(String color:colorList) { for(String color:colorList) {
@@ -3050,20 +3044,17 @@ public class CardFactoryUtil {
int max = 0; int max = 0;
String maxColor = ""; String maxColor = "";
for(int i = 0; i < map.size(); i++) { for(Entry<String, Integer> entry : map.entrySet()){
Iterator<String> iter = map.keySet().iterator(); String color = entry.getKey();
while(iter.hasNext()) { System.out.println(color + " - " + entry.getValue());
String color = iter.next();
System.out.println(color + " - " + map.get(color));
if(max < map.get(color)) { if(max < entry.getValue()) {
max = map.get(color); max = entry.getValue();
maxColor = color; maxColor = color;
}
} }
} }
s = maxColor;
return s; return maxColor;
} }

8
src/forge/GameAction.java
View File

@@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Random; import java.util.Random;
import java.util.Map.Entry;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@@ -1375,11 +1376,10 @@ public class GameAction {
//int totalDamage = 0; //int totalDamage = 0;
CardList list = new CardList(); CardList list = new CardList();
Iterator<Card> iter = map.keySet().iterator(); for(Entry<Card, Integer> entry : map.entrySet()){
while(iter.hasNext()) { Card source = entry.getKey();
Card source = iter.next();
list.add(source); list.add(source);
int damage = map.get(source); int damage = entry.getValue();
int damageToAdd = damage; int damageToAdd = damage;
//AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd));

11
src/forge/Input_CombatDamage.java
View File

@@ -5,6 +5,7 @@ package forge;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map.Entry;
public class Input_CombatDamage extends Input { public class Input_CombatDamage extends Input {
@@ -228,10 +229,10 @@ public class Input_CombatDamage extends Input {
HashMap<Card, Integer> assignedDamageMap = c.getAssignedDamageHashMap(); HashMap<Card, Integer> assignedDamageMap = c.getAssignedDamageHashMap();
HashMap<Card, Integer> damageMap = new HashMap<Card, Integer>(); HashMap<Card, Integer> damageMap = new HashMap<Card, Integer>();
Iterator<Card> iter = assignedDamageMap.keySet().iterator();
while(iter.hasNext()) { for(Entry<Card, Integer> entry : assignedDamageMap.entrySet()){
Card crd = iter.next(); Card crd = entry.getKey();
//AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); //AllZone.GameAction.addDamage(c, crd , entry.getValue());
/* /*
for (String effect : AllZone.StateBasedEffects.getStateBasedMap().keySet() ) { for (String effect : AllZone.StateBasedEffects.getStateBasedMap().keySet() ) {
Command com = GameActionUtil.commands.get(effect); Command com = GameActionUtil.commands.get(effect);
@@ -241,7 +242,7 @@ public class Input_CombatDamage extends Input {
GameActionUtil.executeCardStateEffects(); GameActionUtil.executeCardStateEffects();
*/ */
damageMap.put(crd, assignedDamageMap.get(crd)); damageMap.put(crd, entry.getValue());
} }
AllZone.GameAction.addDamage(c, damageMap); AllZone.GameAction.addDamage(c, damageMap);

10
src/forge/Input_FirstStrikeDamage.java
View File

@@ -5,6 +5,7 @@ package forge;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map.Entry;
//import java.util.ArrayList; //unused //import java.util.ArrayList; //unused
@@ -170,11 +171,10 @@ public class Input_FirstStrikeDamage extends Input {
HashMap<Card, Integer> assignedDamageMap = c.getAssignedDamageHashMap(); HashMap<Card, Integer> assignedDamageMap = c.getAssignedDamageHashMap();
HashMap<Card, Integer> damageMap = new HashMap<Card, Integer>(); HashMap<Card, Integer> damageMap = new HashMap<Card, Integer>();
Iterator<Card> iter = assignedDamageMap.keySet().iterator(); for(Entry<Card, Integer> entry : assignedDamageMap.entrySet()){
while(iter.hasNext()) { Card crd = entry.getKey();
Card crd = iter.next(); //AllZone.GameAction.addDamage(c, crd , entry.getValue());
//AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); damageMap.put(crd, entry.getValue());
damageMap.put(crd, assignedDamageMap.get(crd));
} }
AllZone.GameAction.addDamage(c, damageMap); AllZone.GameAction.addDamage(c, damageMap);

4
src/forge/TableModel.java
View File

@@ -83,10 +83,10 @@ class TableModel extends AbstractTableModel {
}//for }//for
for(int j = 0; j < table.getColumnCount(); j++) { /*for(int j = 0; j < table.getColumnCount(); j++) {
column = table.getColumnModel().getColumn(j); column = table.getColumnModel().getColumn(j);
//System.out.println("col Width:" + column.getPreferredWidth()); //System.out.println("col Width:" + column.getPreferredWidth());
} }*/
} }
public void clear() { public void clear() {