From 7be7b0dae982c234c676e9e8a45f81fd85a8fa00 Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Fri, 3 Mar 2017 14:47:02 -0500
Subject: [PATCH] Big deal cards done

---
 bin/controller/Cashflow.class | Bin 1087 -> 1090 bytes
 src/controller/Cashflow.java  |   6 +-
 src/model/BigDealStack.java   | 149 ++++++++++++++++++++++++++++++++++
 src/model/Big_Deals.java      | 121 ---------------------------
 src/model/Card.java           |  11 +--
 src/model/DealCard.java       |  47 +++++++++++
 src/model/DoodadCard.java     |  10 ++-
 src/model/MarketCard.java     |   9 +-
 src/model/MarketStack.java    |   4 +-
 9 files changed, 222 insertions(+), 135 deletions(-)
 create mode 100644 src/model/BigDealStack.java
 delete mode 100644 src/model/Big_Deals.java
 create mode 100644 src/model/DealCard.java

diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
index 9e775fba0c1597a396c8d40e4861cf48872530f0..710eb773f9d4d776ebd511af87a81f277d7f73c5 100644
GIT binary patch
delta 52
xcmdnbafoBW5k8^Z{FKxjeW%QHm(;|ZjThfAiZUmq6f-i2_@KyazQB~v2mt&-6086K

delta 49
vcmX@av7ckY5njRE{FKxjec!~Q?9`Htm)<Z6GvyXDG6?%1i*LTnl+OqN%~ui$

diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
index f45feb3..3ac0df3 100644
--- a/src/controller/Cashflow.java
+++ b/src/controller/Cashflow.java
@@ -7,13 +7,13 @@ public class Cashflow
 {
 	public static void main(String[] args)
 	{
-		MarketStack ms = new MarketStack();
+		BigDealStack bds = new BigDealStack();
 		
-		int initialSize = ms.getSize();
+		int initialSize = bds.getSize();
 		for(int i=0; i<initialSize; i++)
 		{
 			int num = i+1;
-			System.out.println(num + ": " + ms.pop().getTitle());
+			System.out.println(num + ": " + bds.pop().getTitle());
 		}
 	}
 }
diff --git a/src/model/BigDealStack.java b/src/model/BigDealStack.java
new file mode 100644
index 0000000..e268cc2
--- /dev/null
+++ b/src/model/BigDealStack.java
@@ -0,0 +1,149 @@
+package model;
+
+public class BigDealStack extends CardStack
+{
+	private static DealCard BD1= new DealCard("Limited Partner Wanted",
+								"Successful pizza chain expanding into production  of frozen pizzas for grocery stores. Owner needs capital for equipment.",
+								20000, 20000, 0, 1200);
+	private static DealCard BD2 = new DealCard("Car Wash for Sale",
+								"Family car wash in a prime location is for sale. Family feud forces sale as they want out ASAP.",
+								350000, 50000, 300000, 2500);
+	private static DealCard BD3 = new DealCard("Apartment House for Sale",
+								"60-Unit complex available from pension fund that foreclosed on builder/owner. On-site management in place.",
+								1200000, 200000, 1000000, 11000);
+	private static DealCard BD4 = new DealCard("4-plex for Sale", 
+								"4-plex for sale in rehabilitating neighborhood. Owner being forced out by income tax liens.",
+								370000, 10000, 360000,900);
+	private static DealCard BD5 = new DealCard("Duplex for Sale",
+								"Owner is moving out of this duplex due to growing family. Tenant in other unit remains and new tenant waiting to move into this well-maintained property.",
+								250000, 16000, 234000, 900);
+	private static DealCard BD6 = new DealCard("Apartment House for Sale",
+								"Two buildings totaling 24 units for sale. Owner managed with on-site assistant. Retirement prompts sale. Big Opportunity.",
+								575000, 75000, 500000, 3600);
+	private static DealCard BD7 = new DealCard("Automated Business",
+								"Successful 4-bay, coin-operated auto wash near busy intersection. Seller is moving to retirement community out of state.",
+								125000, 25000, 100000, 1800);
+	private static DealCard BD8 = new DealCard("4-Plex for Sale",
+								"Nice, well-maintained 4-plex in good neighborhood. Stable tenants, positive cash flow, minor repairs.",
+								225000, 15000, 210000, 700);
+	private static DealCard BD9 = new DealCard("House for Sale-3Br/2Ba",
+								"Businessman needs cash to save his business and is liquidating this 3/2 house. It is currently occupied by a happy tenant.", 
+								225000, 14000, 21000, 750);
+	private static DealCard BD10 = new DealCard("Limited Partner Wanted", 
+								"Sandwich shop is doubling the number of locations. Owner needs an investor to get started.",
+								30000, 30000, 9, 1700);
+	private static DealCard BD11 = new DealCard("House for Sale-3Br/2Ba", 
+								"Split level 3/2 house on out out-of-way golf course offered by heirs of owner. Golf membership is included.",
+								275000, 15000, 260000, 800);
+	private static DealCard BD12 = new DealCard("4-plex for Sale",
+								"4-plex for sale by owner, moving to another state. Full records, fully rented, low occupant turnover in good neighborhood.",
+								340000, 32000, 308000, 1400);
+	private static DealCard BD13 = new DealCard("8-plex for Sale",
+								"Professional person urgently needs cash to save partnership. 8-plex is being sold to raise capital. Great opportunity for the right person.",
+								360000, 32000, 328000, 1800);
+	private static DealCard BD14 = new DealCard("House for Sale-3Br/2Ba",
+								"3/2 house near this airport. Low cost and lots of cash flow potential, if you can stand the noise.", 
+								275000, 16000, 259000, 750);
+	private static DealCard BD15 = new DealCard("House for Sale-3Br/2Ba",
+								"Downsized manager cannot afford payments on new salary and must sell this 3/2 house. The surrounding area is in transition.", 
+								270000, 15000, 255000, 800);
+	private static DealCard BD16 = new DealCard("Automated Business for Sale",
+								"Vintage arcade with 30 pinball machines and loyal clientele. Owner has become overextended and is desperate to liquidate.",
+								180000, 20000, 160000, 1600);
+	private static DealCard BD17 = new DealCard("Duplex for Sale",
+								"This duplex  is the best in neighborhood! Proud owner retiring to another state to be near grandchild.",
+								170000, 18000, 152000, 900);
+	private static DealCard BD18 = new DealCard("4-Plex for Sale",
+								"4-plex next to new highway for sale. Owner/ occupant moving to quieter area. Priced for quick sale.",
+								290000, 15000, 275000, 800);
+	private static DealCard BD19 = new DealCard("4-Plex for Sale",
+								"Older 4-plex available- forced sale. Out-of-state, financially-distressed owner years behind on taxes. Some records available.",
+								280000, 16000, 264000, 1000);
+	private static DealCard BD20 = new DealCard("Pizza franchise for Sale",
+								"Healthy pizza company franchise. Trend in high-end fastfood is booming. High traffic location next to college campus.",
+								500000, 100000, 400000, 5000);
+	private static DealCard BD21 = new DealCard("Duplex for Sale",
+								"Tenants in place at this investment duplex! Owner has income tax problems and needs to sell quickly.",
+								245000, 12000, 233000, 800);
+	private static DealCard BD22 = new DealCard("8-Plex for Sale",
+								"Owner offers his 8-plex at the current, appraised value. It has all the amenities renters look for. Fully rented at market rent with excellent records.", 
+								240000, 40000, 200000, 1800);
+	private static DealCard BD23 = new DealCard("Limited Partner Wanted", 
+								"Auto Dealer wants to expand into leasing 2 and 3 year old cars. Needs capital as car maker's finance company is not interested.",
+								30000, 30000, 0, 15000);
+	private static DealCard BD24 = new DealCard("Apartment House for Sale",
+								"12-unit apartment house offered by out-of-state heirs of handyman/owner. Highly desirable location with a long waiting list for apartment unites at this property.", 
+								350000, 50000, 300000, 3000);
+	private static DealCard BD25 = new DealCard("8-Plex for Sale",
+								"Owner's legal troubles lead to forced sale of this 8-plex. Jump on this deal before someone else does.", 
+								250000, 40000, 210000, 2000);
+	private static DealCard BD26 = new DealCard("House for Sale - 3Br/2Ba",
+								"Divorce leads to sale of this 3/2 house in an area full of owner-occupied homes. It has been on the market for five months.",
+								350000, 20000, 330000, 1000);
+	private static DealCard BD27 = new DealCard("Duplex for Sale",
+								"Duplex owner must sell to pay hospital bills. Two tenants are in place at this well-maintained property and it is a good investment opportunity.",
+								260000, 12000, 248000, 600);
+	private static DealCard BD28 = new DealCard("Apartment House for Sale",
+								"Owner is retiring and this older 24-unit property is fully rented with great cash flow. Great location near a community college.",
+								550000, 50000, 500000, 2400);
+	private static DealCard BD29 = new DealCard("8-Plex for Sale",
+								"Reinvesting owner offers 8-plex for sale at reasonable price. Financing already in place. All it needs is your down payment.",
+								320000, 40000, 280000, 1700);
+	private static DealCard BD30 = new DealCard("House for Sale - 3Br/2Ba",
+								"3/2 house in rough neighborhood. Positive cash flow even though rents are weak.",
+								300000, 12000, 288000, 800);
+	private static DealCard BD31 = new DealCard("4-Plex for Sale",
+								"4-plex in recovering neighborhood. Fully rented, repairs kept up. Needs your down payment and patience.",
+								300000, 20000, 280000, 1100);
+	private static DealCard BD32 = new DealCard("Duplex for Sale",
+								"Well-maintained duplex in desirable area available to transfer of owner. Excellent investment opportunity for the right buyer.", 
+								260000, 10000, 250000, 1100);
+	private static DealCard BD33 = new DealCard("Automated Business for Sale",
+								"Personal bankruptcy forces sale of busy, successful laundromat on busy highway. Growth in local area is expected to skyrocket.",
+								150000, 30000, 120000, 2500);
+	private static DealCard BD34 = new DealCard("Limited Partner Wanted",
+								"Successful doctor expanding office and clinic. Needs partner to fund equity portion of construction costs.",
+								25000, 25000, 0, 1300);
+	private static DealCard BD35 = new DealCard("House for Sale - 3Br/2Ba",
+								"Nice 3/2 house with inground pool and all appliances available in upper-middle-class area. Good schools.",
+								300000, 20000, 280000, 1000);
+	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);
+			
+	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);
+	}
+			
+	
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/model/Big_Deals.java b/src/model/Big_Deals.java
deleted file mode 100644
index 928bfd5..0000000
--- a/src/model/Big_Deals.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package model;
-
-public class Big_Deals extends Card {
-
-
-
-	Card BD1= new Card ("Limited Partner Wanted", "Big Deal", true, 20000, 20000, 0, 1200);
-	//Successful pizza chain expanding into production  of frozen pizzas for grocery stores. Owner needs capital for equipment.
-	
-	Card BD2 = new Card ("Car Wash for Sale", "Big Deal", true, 350000, 50000, 300000, 2500);
-	//Family car wash in a prime location is for sale. Family feud forces sale as they want out ASAP.
-	
-	Card BD3 = new Card ("Apartment House for Sale", "Big Deal", true, 1200000, 200000, 1000000, 11000);
-	//60-Unit complex available from pension fund that foreclosed on builder/owner. On-site management in place.
-	
-	Card BD4 = new Card ("4-plex for Sale", "Big Deal", true, 370000, 10000, 360000,900);
-	//4-plex for sale in rehabilitating neighborhood. Owner being forced out by income tax liens.
-	
-	Card BD5 = new Card ("Duplex for Sale", "Big Deal", true, 250000, 16000, 234000, 900);
-	//Owner is moving out of this duplex due to growing family. Tenant in other unit remains and new tenant waiting to move into this well-maintained property.
-	
-	Card BD6 = new Card ("Apartment House for Sale", "Big Deal", true, 575000, 75000, 500000, 3600);
-	//Two buildings totaling 24 units for sale. Owner managed with on-site assistant. Retirement prompts sale. Big Opportunity.
-	
-	Card BD7 = new Card ("Automated Business","Big Deal", true, 125000, 25000, 100000, 1800);
-	//Successful 4-bay, coin-operated auto wash near busy intersection. Seller is moving to retirement community out of state.
-	
-	Card BD8 = new Card ("4-Plex for Sale","Big Deal", true, 225000, 15000, 210000, 700);
-	//Nice, well-maintained 4-plex in good neighborhood. Stable tenants, positive cash flow, minor repairs.
-	
-	Card BD9 = new Card ("House for Sale-3Br/2Ba","Big Deal", true, 225000, 14000, 21000, 750);
-	
-	//Businessman needs cash to save his business and is liquidating this 3/2 house. It is currently occupied by a happy tenant.
-	Card BD10 = new Card ("Limited Partner Wanted","Big Deal", true, 30000, 30000, 9, 1700);
-	//Sandwich shop is doubling the number of locations. Owner needs an investor to get started.
-	
-	Card BD11 = new Card ("House for Sale-3Br/2Ba","Big Deal", true, 275000, 15000, 260000, 800);
-	//Split level 3/2 house on out out-of-way golf course offered by heirs of owner. Golf membership is included.
-	
-	Card BD12 = new Card ("4-plex for Sale","Big Deal", true, 340000, 32000, 308000, 1400);
-	//4-plex for sale by owner, moving to another state. Full records, fully rented, low occupant turnover in good neighborhood.
-	
-	Card BD13 = new Card ("8-plex for Sale","Big Deal", true, 360000, 32000, 328000, 1800);
-	//Professional person urgently needs cash to save partnership. 8-plex is being sold to raise capital. Great opportunity for the right person,
-	
-	Card BD14 = new Card ("House for Sale-3Br/2Ba","Big Deal", true, 275000, 16000, 259000, 750);
-	//3/2 house near this airport. Low cost and lots of cash flow potential, if you can stand the noise.
-	
-	Card BD15 = new Card ("House for Sale-3Br/2Ba","Big Deal", true, 270000, 15000, 255000, 800);
-	//Downsized manager cannot afford payments on new salary and must sell this 3/2 house. The surrounding area is in transition. 
-	
-	Card BD16 = new Card ("Automated Business for Sale","Big Deal", true, 180000, 20000, 160000, 1600);
-	//Vintage arcade with 30 pinball machines and loyal clientele. Owner has become overextended and is desperate to liquidate.
-	
-	Card BD17 = new Card ("Duplex for Sale","Big Deal", true, 170000, 18000, 152000, 900);
-	//This duplex  is the best in neighborhood! Proud owner retiring to another state to be near grandchild.
-	
-	Card BD18 = new Card ("4-Plex for Sale","Big Deal", true, 290000, 15000, 275000, 800);
-	//4-plex next to new highway for sale. Owner/ occupant moving to quieter area. Priced for quick sale.
-	
-	Card BD19 = new Card ("4-Plex for Sale","Big Deal", true, 280000, 16000, 264000, 1000);
-	//Older 4-plex available- forced sale. Out-of-state, financially-distressed owner years behind on taxes. Some records available.
-	
-	Card BD20 = new Card ("Pizza franchise for Sale","Big Deal", true, 500000, 100000, 400000, 5000);
-	//Healthy pizza company franchise. Trend in high-end fastfood is booming. High traffic location next to college campus.
-	
-	Card BD21 = new Card ("Duplex for Sale","Big Deal", true, 245000, 12000, 233000, 800);
-	// Tenants in place at this investment duplex! Owner has income tax problems and needs to sell quickly.
-	
-	Card B22 = new Card("", "Big Deal", true, 240000, 40000, 200000, 1800);
-	//Owner offers his 8-plex at the current, appraised value. It has all the amenities renters look for. Fully rented at market rent with excellent records. 
-	
-	Card B23 = new Card("Limited Partner Wanted", "Big Deal", true, 30000, 30000, 0, 15000);
-	//Auto Dealer wants to expand into leasing 2 and 3 year old cars. Needs capital as car maker's finance company is not interested. 
-	
-	Card B24 = new Card("Apartment House for Sale", "Big Deal", true, 350000, 50000, 300000, 3000);
-	//12-unit apartment house offered by out-of-state heirs of handyman/owner. Highly desirable location with a long waiting list for apartment unites at this property. 
-	
-	Card B25 = new Card("8-Plex for Sale", "Big Deal", true, 250000, 40000, 210000, 2000);
-	//Owner's legal troubles lead to forced sale of this 8-plex. Jump on this deal before someone else does. 
-	
-	Card B26 = new Card("House for Sale - 3Br/2Ba", "Big Deal", true, 350000, 20000, 330000, 1000);
-	//Divorce leads to sale of this 3/2 house in an area full of owner-occupied homes. It has been on the market for five months. 
-	
-	Card B27 = new Card("Duplex for Sale", "Big Deal", true, 260000, 12000, 248000, 600);
-	//Duplex owner must sell to pay hospital bills. Two tenants are in place at this well-maintained property and it is a good investment opportunity.
-	
-	Card B28 = new Card("Apartment House for Sale", "Big Deal", true, 550000, 50000, 500000, 2400);
-	//Owner is retiring and this older 24-unit property is fully rented with great cash flow. Great location near a community college. 
-	
-	Card B29 = new Card("8-Plex for Sale", "Big Deal", true, 320000, 40000, 280000, 1700);
-	//Reinvesting owner offers 8-plex for sale at reasonable price. Financing already in place. All it needs is your down payment. 
-	
-	Card B30 = new Card("House for Sale - 3Br/2Ba", "Big Deal", true, 300000, 12000, 288000, 800);
-	//3/2 house in rough neighborhood. Positive cash flow even though rents are weak. 
-	
-	Card B31 = new Card("4-Plex for Sale", "Big Deal", true, 300000, 20000, 280000, 1100);
-	//4-plex in recovering neighborhood. Fully rented, repairs kept up. Needs your down payment and patience. 
-	
-	Card B32 = new Card("Duplex for Sale", "Big Deal", true, 260000, 10000, 250000, 1100);
-	//Well-maintained duplex in desirable area available to transfer of owner. Excellent investment opportunity for the right buyer.
-	
-	Card B33 = new Card("Automated Business for Sale", "Big Deal", true, 150000, 30000, 120000, 2500);
-	//Personal bankruptcy forces sale of busy, successful laundromat on busy highway. Growth in local area is expected to skyrocket.
-	
-	Card B34 = new Card("Limited Partner Wanted", "Big Deal", true, 25000, 25000, 0, 1300);
-	//Successful doctor expanding office and clinic. Needs partner to fund equity portion of construction costs. 
-	
-	Card B35 = new Card("House for Sale - 3Br/2Ba", "Big Deal", true, 300000, 20000, 280000, 1000);
-	//Nice 3/2 house with inground pool and all appliances available in upper-middle-class area. Good schools. 
-	
-	Card B36 = new Card("House for Sale - 3Br/2Ba", "Big Deal", true, 325000, 18000, 307000, 900);
-	//Skilled Tradesman kept this 3/2 house in excellent condition, so it commands top-dollar rent in older neighborhood		
-			
-			
-	public Big_Deals(String title, String type, Boolean effect, int value, int value2, int value3, int value4) {
-		super(title, type, effect, value, value2, value3, value4);
-		// TODO Auto-generated constructor stub
-	}
-}
-
diff --git a/src/model/Card.java b/src/model/Card.java
index 90dfc83..9e625af 100644
--- a/src/model/Card.java
+++ b/src/model/Card.java
@@ -11,11 +11,11 @@
 public class Card
 {
 	private String _title;
-	private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0. Value of cost for deal cards.
+	//private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0. Value of cost for deal cards.
 
-	public  Card(String title, int value){
+	public  Card(String title)
+	{
 		_title = title;
-		_value = value;
 	}
 	
 	public String getTitle()
@@ -23,8 +23,5 @@ public String getTitle()
 		return _title;
 	}
 
-	public int getValue()
-	{
-		return _value;
-	}	
+	
 }
diff --git a/src/model/DealCard.java b/src/model/DealCard.java
new file mode 100644
index 0000000..1ab7efc
--- /dev/null
+++ b/src/model/DealCard.java
@@ -0,0 +1,47 @@
+package model;
+
+public class DealCard extends Card
+{
+	private String _description;
+	private int _cost;
+	private int _downPayment;
+	private int _mortgage;
+	private int _cashFlowChange;
+	
+	
+	
+	public DealCard(String title, String description, int cost, int downPayment, int mortgage, int cashFlowChange)
+	{
+		super(title);
+		_cost = cost;
+		_downPayment = downPayment;
+		_mortgage = mortgage;
+		_cashFlowChange = cashFlowChange;
+	}
+	
+	public String getDescription()
+	{
+		return _description;
+	}
+	
+	public int getCost()
+	{
+		return _cost;
+	}
+	
+	public int getDownPayment()
+	{
+		return _downPayment;
+	}
+	
+	public int getMortgage()
+	{
+		return _mortgage;
+	}
+	
+	public int getCashFlowChange()
+	{
+		return _cashFlowChange;
+	}
+
+}
diff --git a/src/model/DoodadCard.java b/src/model/DoodadCard.java
index 07edb7c..39e0564 100644
--- a/src/model/DoodadCard.java
+++ b/src/model/DoodadCard.java
@@ -2,8 +2,16 @@
 
 public class DoodadCard extends Card
 {
+	private int _value;
+	
 	public DoodadCard(String title, int value)
 	{
-		super(title, value);
+		super(title);
+		_value = value;
 	}
+	
+	public int getValue()
+	{
+		return _value;
+	}	
 }
diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java
index 6e72aaa..eb370ab 100644
--- a/src/model/MarketCard.java
+++ b/src/model/MarketCard.java
@@ -4,12 +4,14 @@ public class MarketCard extends Card
 {
 	private String _type;
 	private boolean _affectAll;
+	private int _value;
 	
 	public MarketCard(String title, String type, boolean affectAll, int value)
 	{
-		super(title, value);
+		super(title);
 		_type = type;
 		_affectAll = affectAll;
+		_value = value;
 	}
 
 	public String getType()
@@ -21,6 +23,11 @@ public boolean doesAffectAll()
 	{
 		return _affectAll;
 	}
+	
+	public int getValue()
+	{
+		return _value;
+	}	
 
 
 }
diff --git a/src/model/MarketStack.java b/src/model/MarketStack.java
index aff2d37..cf270ba 100644
--- a/src/model/MarketStack.java
+++ b/src/model/MarketStack.java
@@ -97,7 +97,7 @@ public class MarketStack extends CardStack
 	
 	public MarketStack()
 	{
-		MarketCard[] MarketCardArray = {Profit1, Profit2, 
+		MarketCard[] marketCardArray = {Profit1, Profit2, 
 										Gold1, Gold2, Gold3, Gold4, 
 										Expense1, Expense2, Expense3, Expense4, Expense5,
 										Stock1, Stock2, Stock3, Stock4,
@@ -105,7 +105,7 @@ public MarketStack()
 										REFixed1, REFixed2, REFixed3, REFixed4, REFixed5, REFixed6, REFixed7, REFixed8, REFixed9, REFixed10, REFixed11,
 										REHOffer1, REHOffer2,
 										REAOffer1, REAOffer2, REAOffer3, REAOffer4};
-		super.randomizeCards(MarketCardArray);
+		super.randomizeCards(marketCardArray);
 	}
 
 	//profit MarketCard - value is how much $ is added