Skip to content

Commit 560d12f

Browse files
committed
-code cleanup
1 parent b187725 commit 560d12f

65 files changed

Lines changed: 247 additions & 257 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/Main.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import com.google.gson.Gson;
22
import com.google.gson.reflect.TypeToken;
3-
import controller.User;
43
import controller.ApplicationManger;
4+
import controller.User;
55
import model.UserData;
66
import model.cards.data.ReadMonsterCardsData;
77
import model.cards.data.ReadSpellTrapCardsData;
88

9-
import java.io.*;
9+
import java.io.File;
10+
import java.io.IOException;
1011
import java.nio.file.Files;
1112
import java.nio.file.Paths;
1213
import java.util.ArrayList;
@@ -16,7 +17,7 @@ public static void main(String[] args) {
1617
ApplicationManger applicationManger = new ApplicationManger();
1718
try {
1819
firstSetup();
19-
}catch (IOException e){
20+
} catch (IOException e) {
2021
System.out.println("ERROR: Couldn't load game!");
2122
System.exit(-1);
2223
}

src/main/java/controller/ApplicationManger.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import view.menus.*;
44

5-
import java.io.*;
6-
import java.util.Locale;
7-
85
public class ApplicationManger {
96
private static Scene currentScene;
107
private static User loggedInUser;

src/main/java/controller/DataManager.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
import com.google.gson.GsonBuilder;
55
import com.google.gson.JsonObject;
66
import com.google.gson.JsonParser;
7-
import model.UserData;
87
import model.cards.data.CardData;
98
import model.cards.data.MonsterCardData;
109
import model.cards.data.SpellCardData;
1110
import model.cards.data.TrapCardData;
1211

13-
import java.io.*;
12+
import java.io.File;
13+
import java.io.FileReader;
14+
import java.io.FileWriter;
15+
import java.io.IOException;
1416
import java.nio.file.Files;
1517
import java.nio.file.Paths;
16-
import java.util.ArrayList;
1718

1819
public class DataManager {
1920

@@ -28,7 +29,7 @@ public static void exportCard(CardData cardData) {
2829
fileWriter.write(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(cardData));
2930
fileWriter.close();
3031
System.out.println("card exported successfully.");
31-
}catch (IOException e) {
32+
} catch (IOException e) {
3233
System.out.println("the file isn't saved yet.");
3334
}
3435
}
@@ -44,7 +45,7 @@ public static void importCard(String cardName) {
4445
JsonObject jsonObject = JsonParser.parseReader(fileReader).getAsJsonObject();
4546
CardData cardData;
4647
switch (jsonObject.get("cardType").toString().replaceAll("\"", "")) {
47-
case "MONSTER" :
48+
case "MONSTER":
4849
cardData = new Gson().fromJson(fileData, MonsterCardData.class);
4950
break;
5051
case "SPELL":

src/main/java/controller/GamePlaySceneController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package controller;
22

3-
import controller.gameplay.AI_Player;
43
import controller.gameplay.GameManager;
54
import model.Command;
65
import model.Deck;

src/main/java/controller/ProfileController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
import model.Command;
44
import model.enums.CommandFieldType;
5+
import model.enums.ProfileMessages;
56
import model.exceptions.ParseCommandException;
67
import view.menus.ProfileScene;
78

89
import java.util.HashMap;
9-
import java.util.regex.Matcher;
10-
11-
import model.enums.ProfileMessages;
1210

1311
public class ProfileController {
1412

src/main/java/controller/RegisterController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static int registerUser(String userInput) {
2323
if (User.doesUsernameExists(registerCommand.getField("username")))
2424
System.out.println("user with username " + registerCommand.getField("username") + " already exists");
2525
else if (User.doesNicknameExists(registerCommand.getField("nickname")))
26-
System.out.println("user with nickname "+ registerCommand.getField("nickname") +" already exists");
26+
System.out.println("user with nickname " + registerCommand.getField("nickname") + " already exists");
2727
else {
2828
User user = new User(registerCommand.getField("username"), registerCommand.getField("nickname"), registerCommand.getField("password"));
2929
System.out.println("user created successfully!");

src/main/java/controller/ShopController.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ public void buyCard(String cardName) {
1717
CardData cardData = CardData.getCardByName(cardName);
1818
if (cardData == null) {
1919
shopScene.printMessage("there is no card with this name");
20-
}
21-
else if (activeUser.getUserData().getMoney() < cardData.getPrice()) {
20+
} else if (activeUser.getUserData().getMoney() < cardData.getPrice()) {
2221
shopScene.printMessage("you have not enough money");
2322
shopScene.printMessage("your money is " + activeUser.getUserData().getMoney() + " card Price is " + cardData.getPrice());
24-
}
25-
else {
23+
} else {
2624
activeUser.getUserData().decreaseMoney(cardData.getPrice());
2725
activeUser.getUserData().addCard(cardData.getCardId());
2826
shopScene.printMessage("you bought " + cardName + " successfully.");

src/main/java/controller/User.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public User(String username, String nickname, String password) {
1919
allUser.add(this);
2020
}
2121

22-
public User(UserData data){
22+
public User(UserData data) {
2323
userData = data;
2424
allUser.add(this);
2525
}
@@ -82,7 +82,7 @@ public void addDeck(Deck deck) {
8282
userData.addDeck(deck);
8383
}
8484

85-
public Deck getActiveDeck(){
85+
public Deck getActiveDeck() {
8686
return userData.getActiveDeck();
8787
}
8888

@@ -94,7 +94,7 @@ public String getUsername() {
9494
return userData.getUsername();
9595
}
9696

97-
public boolean haveThisCardFree(String cardName){
97+
public boolean haveThisCardFree(String cardName) {
9898
try {
9999
return getCardsThatThereIsNotInAnyDeck().contains(Card.getCardIdByName(cardName));
100100
} catch (Exception e) {
@@ -104,7 +104,7 @@ public boolean haveThisCardFree(String cardName){
104104

105105
public ArrayList<Integer> getCardsThatThereIsNotInAnyDeck() {
106106
ArrayList<Integer> result = new ArrayList<>(userData.getMyCardsIds());
107-
for (Deck deck : getDecks()){
107+
for (Deck deck : getDecks()) {
108108
deck.getMainDeckIds().forEach(result::remove);
109109
deck.getSideDeckIds().forEach(result::remove);
110110
}

src/main/java/controller/gameplay/AI_Player.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ private void setTraps() {
7878
}
7979
}
8080

81-
private void activateSpells(){
81+
private void activateSpells() {
8282
if (board.isSpellTrapZoneFull()) return;
8383
ArrayList<Card> spellCards = new ArrayList<>();
8484
spellCards.addAll(board.getHand().getAllCards().stream().filter(c -> c.getCardType() == CardType.SPELL).collect(Collectors.toList()));
8585
ArrayList<Card> fieldCards = new ArrayList<>();
86-
fieldCards.addAll(spellCards.stream().filter(c -> ((SpellCard)c).getData().getSpellProperty() == SpellTrapProperty.FIELD).collect(Collectors.toList()));
86+
fieldCards.addAll(spellCards.stream().filter(c -> ((SpellCard) c).getData().getSpellProperty() == SpellTrapProperty.FIELD).collect(Collectors.toList()));
8787
spellCards.removeAll(fieldCards);
8888

8989
while (!board.isSpellTrapZoneFull() && spellCards.size() > 0) {
@@ -101,7 +101,7 @@ private void activateSpells(){
101101
}
102102
}
103103

104-
if(fieldCards.size() > 0){
104+
if (fieldCards.size() > 0) {
105105
try {
106106
gameManager.selectCard("--hand " + (board.getHand().getAllCards().indexOf(fieldCards.get(0)) + 1));
107107
gameManager.activateCard();
@@ -139,12 +139,12 @@ private void summonMonster() {
139139
}
140140
}
141141

142-
private ArrayList<Integer> chooseTribute(int n){
142+
private ArrayList<Integer> chooseTribute(int n) {
143143
ArrayList<CardSlot> myMonsters = new ArrayList<>(board.getMonsterZone().stream().filter(c -> !c.isEmpty()).collect(Collectors.toList()));
144-
myMonsters.sort(Comparator.comparing(c -> ((MonsterCard)c.getCard()).getData().getLevel()));
144+
myMonsters.sort(Comparator.comparing(c -> ((MonsterCard) c.getCard()).getData().getLevel()));
145145

146146
ArrayList<Integer> result = new ArrayList<>();
147-
for(int i=0; i<n; i++){
147+
for (int i = 0; i < n; i++) {
148148
result.add(board.getMonsterZone().indexOf(myMonsters.get(i)) + 1);
149149
}
150150

@@ -167,11 +167,11 @@ private void doAttack() {
167167
System.out.println(a);
168168
}*/
169169

170-
for(int i=0; i<attacks.size(); i++){
170+
for (int i = 0; i < attacks.size(); i++) {
171171
AttackResultCalculated attack = attacks.get(i);
172-
if(attack.attacker.isAttackedThisTurn()) continue;
173-
if(attack.attackValue() <= 0) break;
174-
if(attack.attacked.getCardSlot().getZoneType() != ZoneType.MONSTER) continue;
172+
if (attack.attacker.isAttackedThisTurn()) continue;
173+
if (attack.attackValue() <= 0) break;
174+
if (attack.attacked.getCardSlot().getZoneType() != ZoneType.MONSTER) continue;
175175

176176
try {
177177
gameManager.selectCard("--monster " + (board.getMonsterZone().indexOf(attack.attacker.getCardSlot()) + 1));
@@ -181,10 +181,10 @@ private void doAttack() {
181181
}
182182
}
183183

184-
if(opponent.getPlayerBoard().numberOfMonstersInZone() == 0){
185-
for (CardSlot cardSlot : myMonsters){
186-
if(!cardSlot.isEmpty()){
187-
if(!((MonsterCard)cardSlot.getCard()).isAttackedThisTurn()){
184+
if (opponent.getPlayerBoard().numberOfMonstersInZone() == 0) {
185+
for (CardSlot cardSlot : myMonsters) {
186+
if (!cardSlot.isEmpty()) {
187+
if (!((MonsterCard) cardSlot.getCard()).isAttackedThisTurn()) {
188188
try {
189189
gameManager.selectCard("--monster " + (board.getMonsterZone().indexOf(cardSlot) + 1));
190190
gameManager.attackDirect();
@@ -238,7 +238,7 @@ public AttackResultCalculated(MonsterCard attacker, MonsterCard attacked) {
238238
}
239239
}
240240

241-
public int attackValue(){
241+
public int attackValue() {
242242
return player2LPDecrease - player1LPDecrease + (destroyCard2 ? 1 : 0) - (destroyCard1 ? 1 : 0);
243243
}
244244
}

src/main/java/controller/gameplay/GameManager.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
import model.cards.Card;
77
import model.cards.MonsterCard;
88
import model.effectSystem.Effect;
9+
import model.enums.CardStatus;
10+
import model.enums.CommandFieldType;
11+
import model.enums.Phase;
12+
import model.enums.ZoneType;
913
import model.event.Event;
1014
import model.event.EventNoParam;
1115
import model.exceptions.ParseCommandException;
16+
import model.gameplay.AttackResult;
17+
import model.gameplay.CardSlot;
18+
import model.gameplay.GameBoard;
1219
import model.gameplay.Player;
13-
import model.gameplay.*;
14-
import model.enums.*;
1520
import view.menus.GamePlayScene;
1621

1722
import java.util.ArrayList;

0 commit comments

Comments
 (0)