Skip to content

Commit

Permalink
just some stuff & things
Browse files Browse the repository at this point in the history
  • Loading branch information
jackie committed Mar 24, 2017
1 parent 2631b9b commit 41b18a4
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 81 deletions.
11 changes: 10 additions & 1 deletion src/model/BigDealStack.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package model;

import java.util.Arrays;
import java.util.List;
import java.util.Stack;

public class BigDealStack extends CardStack
{
private static DealCard BD1= new DealCard("Limited Partner Wanted",
Expand Down Expand Up @@ -110,14 +114,19 @@ public class BigDealStack extends CardStack
private static DealCard BD36 = new DealCard("House for Sale - 3Br/2Ba",
"Skilled Tradesman kept this 3/2 house in excellent condition, so it commands top-dollar rent in older neighborhood",
325000, 18000, 307000, 900);

private Stack<DealCard> _bigDealStack;
public BigDealStack()
{
DealCard[] bdCardArray = {BD1, BD2, BD3, BD4, BD5, BD6, BD7, BD8, BD9, BD10,
BD11, BD12, BD13, BD14, BD15, BD16, BD17, BD18, BD19, BD20,
BD21, BD22, BD23, BD24, BD25, BD26, BD27, BD28, BD29, BD30,
BD31, BD32, BD33, BD34, BD35, BD36};
super.randomizeCards(bdCardArray);
List<DealCard> list = Arrays.asList(bdCardArray);
Stack<DealCard> BDCardStack = new Stack<DealCard>();
BDCardStack.addAll(list);

_bigDealStack = BDCardStack;
}


Expand Down
8 changes: 8 additions & 0 deletions src/model/DoodadStack.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public class DoodadStack extends CardStack
private static DoodadCard D42 = new DoodadCard("Season Tickets", 1500);

// Constructor just calls makes this stack a randomized stack with Doodad cards
private Stack<DoodadCard> _doodadStack;

public DoodadStack()
{
DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10,
Expand All @@ -58,6 +60,12 @@ public DoodadStack()
D31, D32, D33, D34, D35, D36, D37, D38, D39, D40, D41, D42};

super.randomizeCards(cardArray);
List<DoodadCard> list = Arrays.asList(cardArray);
Stack<DoodadCard> DoodadCardStack = new Stack<DoodadCard>();
DoodadCardStack.addAll(list);

_doodadStack = DoodadCardStack;

}


Expand Down
2 changes: 1 addition & 1 deletion src/model/FinancialStatement.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class FinancialStatement
private double[] realEstate;
private String career;
private double expenses;
private double assets;
public static double assets; //sorry i had to make this change to use w/ cards if i messed something up just change it im sorry!!
private double liabilities;
private double income;

Expand Down
11 changes: 4 additions & 7 deletions src/model/MarketCard.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ public class MarketCard extends Card
{
private String _description;
private String _type;
private boolean _affectAll;
private int _value;
private String _addit;

public MarketCard(String title, String description, String type, boolean affectAll, int value, String addit)
public MarketCard(String title, String description, String type, int value, String addit)
{
super(title);
_description = description;
_type = type;
_affectAll = affectAll;
_value = value;
_addit = addit; //additional info
}
Expand All @@ -28,10 +26,6 @@ public String getType()
return _type;
}

public boolean doesAffectAll()
{
return _affectAll;
}

public int getValue()
{
Expand All @@ -41,6 +35,9 @@ public String getAddit()
{
return _addit;
}
public void display(){
//display cards in a pretty gui
}


}
Loading

0 comments on commit 41b18a4

Please sign in to comment.