From 4369d8221512b11d111d8f038928cdd2b48fe472 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Wed, 1 Mar 2017 21:42:22 -0500 Subject: [PATCH 01/36] Create Market_Card --- src/model/Market_Card | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/Market_Card diff --git a/src/model/Market_Card b/src/model/Market_Card new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/Market_Card @@ -0,0 +1 @@ + From ce906d5196100825d3d0a440efbcce2a5cc3040d Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Wed, 1 Mar 2017 21:42:33 -0500 Subject: [PATCH 02/36] Create Market_Cards --- src/model/Market_Cards | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/Market_Cards diff --git a/src/model/Market_Cards b/src/model/Market_Cards new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/Market_Cards @@ -0,0 +1 @@ + From e95c037f1812f15bbd6ac42e706dbc6af8842636 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Wed, 1 Mar 2017 21:42:51 -0500 Subject: [PATCH 03/36] Rename Market_Card to Market_Card.java --- src/model/{Market_Card => Market_Card.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/model/{Market_Card => Market_Card.java} (100%) diff --git a/src/model/Market_Card b/src/model/Market_Card.java similarity index 100% rename from src/model/Market_Card rename to src/model/Market_Card.java From 0f2ab54fe0759f42e09df0bc7ad9804d4b2ed15c Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Wed, 1 Mar 2017 21:42:59 -0500 Subject: [PATCH 04/36] Rename Market_Cards to Market_Cards.java --- src/model/{Market_Cards => Market_Cards.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/model/{Market_Cards => Market_Cards.java} (100%) diff --git a/src/model/Market_Cards b/src/model/Market_Cards.java similarity index 100% rename from src/model/Market_Cards rename to src/model/Market_Cards.java From e30aa5403a3fed281be0c5d5115c0378e6b92f85 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 1 Mar 2017 22:23:59 -0500 Subject: [PATCH 05/36] hello mtv welcome to my crib --- src/model/Market_Card.java | 45 ++++++++++++++++ src/model/Market_Cards.java | 103 ++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/src/model/Market_Card.java b/src/model/Market_Card.java index 8b13789..2eaea2a 100644 --- a/src/model/Market_Card.java +++ b/src/model/Market_Card.java @@ -1 +1,46 @@ +/* + * hello + */ +public class Market_Card +{ + private String _title; + private String _type; // repercent, refixed, expense, stock, gold, profit, aoffer, hoffer + private Boolean _effect; //True if it effects all players + private int _money; //If card type is expense or profit or gold + private int _fixedpayment; //For cards of type refixed with a sell price in addition to initial purchase OR for an offer amount (apartment offer - per unit, house offer - whole house) + private int _percentpayment; // percent + 100 for repercent with percentage payment + + // When implemented there needs to be a way to check whether the player has the necessary things or not + + public Market_Card(String title, String type, Boolean effect, int money, int fixedpayment, int percentpayment){ + _title = title; + _type = type; + _effect = effect; + _money = money; + _fixedpayment = fixedpayment; + _percentpayment = percentpayment; + } + + + public String getTitle() + { + return _title; + } + + public String getType() + { + return _type; + } + public int getCost(){ + return _money; + } + public int getFixed(){ + return _fixedpayment; + } + public int getPercent(){ + return _percentpayment; + } + + +} diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 8b13789..7aa4935 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -1 +1,104 @@ +/* help my booleans aren't working and i dont know why + * also i havent quite done much except make a very annoying marketcard class + * but i swear theres a method to my madness + * this will all come together i swear + * + */ +public class Market_Cards extends Market_Card { + private static final Boolean True = null; + private static final Boolean False = null; + //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out + Market_Card Profit1 = new Market_Card("Small Business Boom!", "profit", True, 250, 0, 0); + //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 + Market_Card Profit2 = new Market_Card("New Management System", "profit", False, 400, 0, 0); + // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. + // For profit cards: add profit amount to all business with cash flow of $1000 or less + Market_Card Gold1 = new Market_Card("Price of Gold Soars", "gold", True, 2000, 0, 0); + // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. + Market_Card Gold2 = new Market_Card("Collector wants Gold Coins", "gold", True, 1000, 0, 0); + //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. + Market_Card Gold3 = new Market_Card("Price of Gold Soars", "gold", True, 1000, 0, 0); + //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. + Market_Card Gold4 = new Market_Card("Collector wants Gold Coins", "gold", True, 500, 0, 0); + //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. + Market_Card Expense1 = new Market_Card("Sewer Line Breaks", "expense", False, 1000, 0, 0); + //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. + Market_Card Expense2 = new Market_Card("Sewer Line Breaks", "expense", False, 2000, 0, 0); + //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. + Market_Card Expense3 = new Market_Card("Tenant Damages Your Property", "expense", False, 500, 0, 0); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. + Market_Card Expense4 = new Market_Card("Tenant Damages Your Property", "expense", False, 500, 0, 0); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. + Market_Card Expense5 = new Market_Card("Tenant Damages Your Property", "expense", False, 1000, 0, 0); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. + Market_Card Stock1 = new Market_Card("Stock - MYT4U Electronics Co.","stock",True,0,0,0); + //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. + Market_Card Stock2 = new Market_Card("Stock - GRO4US Fund","stock",True,0,0,0); + //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. + Market_Card Stock3 = new Market_Card("Stock - ON2U Entertainment Co.","stock",True,0,0,0); + //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. + Market_Card Stock4 = new Market_Card("Stock - OK4U Drug Co.","stock",True,0,0,0); + //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. + Market_Card REPercent1 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,110); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent2 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,0,0,110); + //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent3 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,120); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent4 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,0,0,120); + //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent5 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,115); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent6 = new Market_Card("Plex Buyer","repercent",True,0,0,110); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent7 = new Market_Card("Plex Buyer","repercent",True,0,0,105); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent8 = new Market_Card("Plex Buyer","repercent",True,0,0,115); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REPercent9 = new Market_Card("Plex Buyer","repercent",True,0,0,120); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed1 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,15000,0); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed2 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,10000,0); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed3 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,20000,0); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed4 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,5000,0); + //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REHOffer1 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,0,45000,0); + //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REHOffer2 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,0,65000,0); + //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed5 = new Market_Card("Plex Buyer","refixed",True,0,1000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed6 = new Market_Card("Plex Buyer","refixed",True,0,30000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed7 = new Market_Card("Plex Buyer","refixed",True,0,15000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed8 = new Market_Card("Plex Buyer","refixed",True,0,5000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed9 = new Market_Card("Plex Buyer","refixed",True,0,1000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed10 = new Market_Card("Plex Buyer","refixed",True,0,20000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REFixed11 = new Market_Card("Plex Buyer","refixed",True,0,10000,0); + //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REAOffer1 = new Market_Card("Apartment House Buyer","aoffer",True,0,25000,0); + //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REAOffer2 = new Market_Card("Apartment House Buyer","aoffer",True,0,45000,0); + //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REAOffer3 = new Market_Card("Apartment House Buyer","aoffer",True,0,30000,0); + //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + Market_Card REAOffer4 = new Market_Card("Apartment House Buyer","aoffer",True,0,40000,0); + //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + + /* + * Write a method below that evaluates what the card type is + who it effects and performs operations based on that and yeah stuff + * + */ + public static void main(String[] args) { + + } + +} From 2e17aeea9eb971d9a5dc33f122980240e4e0191d Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 2 Mar 2017 11:04:47 -0500 Subject: [PATCH 06/36] hello mtv welcome to my crib --- src/model/Market_Card.java | 34 +++++------- src/model/Market_Cards.java | 101 +++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/src/model/Market_Card.java b/src/model/Market_Card.java index 2eaea2a..cd22df0 100644 --- a/src/model/Market_Card.java +++ b/src/model/Market_Card.java @@ -1,24 +1,23 @@ /* - * hello + * this is a very broad object class + * i know we said all the card stacks would be in here but like + * would it make more sense for them to be in the individual card classes? + * - jackie */ -public class Market_Card +public class Card { private String _title; - private String _type; // repercent, refixed, expense, stock, gold, profit, aoffer, hoffer + private String _type; // you dont have to use this but i added it because theres so many different types of market cards i need something to keep track of which is which private Boolean _effect; //True if it effects all players - private int _money; //If card type is expense or profit or gold - private int _fixedpayment; //For cards of type refixed with a sell price in addition to initial purchase OR for an offer amount (apartment offer - per unit, house offer - whole house) - private int _percentpayment; // percent + 100 for repercent with percentage payment - - // When implemented there needs to be a way to check whether the player has the necessary things or not + private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0 + + - public Market_Card(String title, String type, Boolean effect, int money, int fixedpayment, int percentpayment){ + public Market_Card(String title, String type, Boolean effect, int value){ _title = title; _type = type; _effect = effect; - _money = money; - _fixedpayment = fixedpayment; - _percentpayment = percentpayment; + _value = value; } @@ -32,15 +31,10 @@ public String getType() { return _type; } - public int getCost(){ - return _money; - } - public int getFixed(){ - return _fixedpayment; - } - public int getPercent(){ - return _percentpayment; + public int getValue(){ + return _value; } + } diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 7aa4935..9511a92 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -1,99 +1,106 @@ -/* help my booleans aren't working and i dont know why - * also i havent quite done much except make a very annoying marketcard class - * but i swear theres a method to my madness - * this will all come together i swear - * +/* + * this is just a marketcard class + * i haven't added the method or the stack yet + * not much to see here + * carry on */ public class Market_Cards extends Market_Card { private static final Boolean True = null; private static final Boolean False = null; + //profit card - value is how much $ is added //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out - Market_Card Profit1 = new Market_Card("Small Business Boom!", "profit", True, 250, 0, 0); + Market_Card Profit1 = new Market_Card("Small Business Boom!", "profit", True, 250); //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 - Market_Card Profit2 = new Market_Card("New Management System", "profit", False, 400, 0, 0); + Market_Card Profit2 = new Market_Card("New Management System", "profit", False, 400); // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. - // For profit cards: add profit amount to all business with cash flow of $1000 or less - Market_Card Gold1 = new Market_Card("Price of Gold Soars", "gold", True, 2000, 0, 0); + //gold card - value is $ per coin + Market_Card Gold1 = new Market_Card("Price of Gold Soars", "gold", True, 2000); // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. - Market_Card Gold2 = new Market_Card("Collector wants Gold Coins", "gold", True, 1000, 0, 0); + Market_Card Gold2 = new Market_Card("Collector wants Gold Coins", "gold", True, 1000); //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. - Market_Card Gold3 = new Market_Card("Price of Gold Soars", "gold", True, 1000, 0, 0); + Market_Card Gold3 = new Market_Card("Price of Gold Soars", "gold", True, 1000); //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. - Market_Card Gold4 = new Market_Card("Collector wants Gold Coins", "gold", True, 500, 0, 0); + Market_Card Gold4 = new Market_Card("Collector wants Gold Coins", "gold", True, 500); //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. - Market_Card Expense1 = new Market_Card("Sewer Line Breaks", "expense", False, 1000, 0, 0); + //expense card - quite obviously the value is how much this expense costs + Market_Card Expense1 = new Market_Card("Sewer Line Breaks", "expense", False, 1000); //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense2 = new Market_Card("Sewer Line Breaks", "expense", False, 2000, 0, 0); + Market_Card Expense2 = new Market_Card("Sewer Line Breaks", "expense", False, 2000); //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense3 = new Market_Card("Tenant Damages Your Property", "expense", False, 500, 0, 0); + Market_Card Expense3 = new Market_Card("Tenant Damages Your Property", "expense", False, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense4 = new Market_Card("Tenant Damages Your Property", "expense", False, 500, 0, 0); + Market_Card Expense4 = new Market_Card("Tenant Damages Your Property", "expense", False, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense5 = new Market_Card("Tenant Damages Your Property", "expense", False, 1000, 0, 0); + Market_Card Expense5 = new Market_Card("Tenant Damages Your Property", "expense", False, 1000; //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Stock1 = new Market_Card("Stock - MYT4U Electronics Co.","stock",True,0,0,0); + //stock card - no value necessary + Market_Card Stock1 = new Market_Card("Stock - MYT4U Electronics Co.","stock",True,0); //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. - Market_Card Stock2 = new Market_Card("Stock - GRO4US Fund","stock",True,0,0,0); + Market_Card Stock2 = new Market_Card("Stock - GRO4US Fund","stock",True,0); //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. - Market_Card Stock3 = new Market_Card("Stock - ON2U Entertainment Co.","stock",True,0,0,0); + Market_Card Stock3 = new Market_Card("Stock - ON2U Entertainment Co.","stock",True,0); //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. - Market_Card Stock4 = new Market_Card("Stock - OK4U Drug Co.","stock",True,0,0,0); + Market_Card Stock4 = new Market_Card("Stock - OK4U Drug Co.","stock",True,0); //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. - Market_Card REPercent1 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,110); + //repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe + Market_Card REPercent1 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,110); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent2 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,0,0,110); + Market_Card REPercent2 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,110); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent3 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,120); + Market_Card REPercent3 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,120); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent4 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,0,0,120); + Market_Card REPercent4 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,120); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent5 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,0,0,115); + Market_Card REPercent5 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,115); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent6 = new Market_Card("Plex Buyer","repercent",True,0,0,110); + Market_Card REPercent6 = new Market_Card("Plex Buyer","repercent",True,110); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent7 = new Market_Card("Plex Buyer","repercent",True,0,0,105); + Market_Card REPercent7 = new Market_Card("Plex Buyer","repercent",True,105); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent8 = new Market_Card("Plex Buyer","repercent",True,0,0,115); + Market_Card REPercent8 = new Market_Card("Plex Buyer","repercent",True,115); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent9 = new Market_Card("Plex Buyer","repercent",True,0,0,120); + Market_Card REPercent9 = new Market_Card("Plex Buyer","repercent",True,120); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed1 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,15000,0); + //refixed - value is the amount of money you get for selling property + Market_Card REFixed1 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,15000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed2 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,10000,0); + Market_Card REFixed2 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,1000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed3 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,20000,0); + Market_Card REFixed3 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,20000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed4 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,0,5000,0); + Market_Card REFixed4 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,5000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REHOffer1 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,0,45000,0); + Market_Card REHOffer1 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,45000); //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REHOffer2 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,0,65000,0); + Market_Card REHOffer2 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,65000); //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed5 = new Market_Card("Plex Buyer","refixed",True,0,1000,0); + Market_Card REFixed5 = new Market_Card("Plex Buyer","refixed",True,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed6 = new Market_Card("Plex Buyer","refixed",True,0,30000,0); + Market_Card REFixed6 = new Market_Card("Plex Buyer","refixed",True,30000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed7 = new Market_Card("Plex Buyer","refixed",True,0,15000,0); + Market_Card REFixed7 = new Market_Card("Plex Buyer","refixed",True,15000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed8 = new Market_Card("Plex Buyer","refixed",True,0,5000,0); + Market_Card REFixed8 = new Market_Card("Plex Buyer","refixed",True,5000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed9 = new Market_Card("Plex Buyer","refixed",True,0,1000,0); + Market_Card REFixed9 = new Market_Card("Plex Buyer","refixed",True,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed10 = new Market_Card("Plex Buyer","refixed",True,0,20000,0); + Market_Card REFixed10 = new Market_Card("Plex Buyer","refixed",True,20000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed11 = new Market_Card("Plex Buyer","refixed",True,0,10000,0); + Market_Card REFixed11 = new Market_Card("Plex Buyer","refixed",True,10000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer1 = new Market_Card("Apartment House Buyer","aoffer",True,0,25000,0); + //aoffer - value is amount of money you get for selling each unit + Market_Card REAOffer1 = new Market_Card("Apartment House Buyer","aoffer",True,25000); //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer2 = new Market_Card("Apartment House Buyer","aoffer",True,0,45000,0); + Market_Card REAOffer2 = new Market_Card("Apartment House Buyer","aoffer",True,45000); //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer3 = new Market_Card("Apartment House Buyer","aoffer",True,0,30000,0); + Market_Card REAOffer3 = new Market_Card("Apartment House Buyer","aoffer",True,30000); //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer4 = new Market_Card("Apartment House Buyer","aoffer",True,0,40000,0); + Market_Card REAOffer4 = new Market_Card("Apartment House Buyer","aoffer",True,40000); //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. /* * Write a method below that evaluates what the card type is + who it effects and performs operations based on that and yeah stuff + * Then put them all into a stack so they can be used in game! * */ public static void main(String[] args) { From 6d9b684de8334d74d0c9e0973a92722ac3c00d24 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 11:05:23 -0500 Subject: [PATCH 07/36] Rename Market_Card.java to Card.java hello mtv welcome to my crib --- src/model/{Market_Card.java => Card.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/model/{Market_Card.java => Card.java} (100%) diff --git a/src/model/Market_Card.java b/src/model/Card.java similarity index 100% rename from src/model/Market_Card.java rename to src/model/Card.java From 71e75a565e7b4311e1363aa379d2cc1886dacead Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 11:06:25 -0500 Subject: [PATCH 08/36] hello mtv welcome to my crib --- src/model/Card.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/model/Card.java b/src/model/Card.java index cd22df0..84bdcdb 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -3,6 +3,7 @@ * i know we said all the card stacks would be in here but like * would it make more sense for them to be in the individual card classes? * - jackie + * */ public class Card { From 5171dbd09c08cf48726799f14ae56abe2822142c Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 2 Mar 2017 11:07:49 -0500 Subject: [PATCH 09/36] hello mtv welcome to my crib --- src/model/Market_Cards.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 9511a92..35ff5ba 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -1,8 +1,6 @@ /* - * this is just a marketcard class - * i haven't added the method or the stack yet - * not much to see here - * carry on + * hi im very forgetful so my code is usually full of comments when its not finished sorry + * */ public class Market_Cards extends Market_Card { private static final Boolean True = null; From a4ac7c86046ada2878e4bbfadf0da503ef7b37f6 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 12:19:44 -0500 Subject: [PATCH 10/36] Delete Profession.java --- src/Main/Profession.java | 124 --------------------------------------- 1 file changed, 124 deletions(-) delete mode 100644 src/Main/Profession.java diff --git a/src/Main/Profession.java b/src/Main/Profession.java deleted file mode 100644 index 4e8a2e7..0000000 --- a/src/Main/Profession.java +++ /dev/null @@ -1,124 +0,0 @@ - -public class Profession -{ - private String _name; - private int _salary; - private int _taxes; - private int _mortgagePay; - private int _schoolLoanPay; - private int _carLoanPay; - private int _creditCardPay; - private int _otherExp; - private int _bankLoanPay; - private int _childExp; - private int _childExpPer; - private int _savings; - private int _mortgage; - private int _schoolLoans; - private int _carLoans; - private int _creditCardDebt; - - public Profession(String name, int salary, int taxes, int mortgagePay, int schoolLoanPay, - int carLoanPay, int creditCardPay, int otherExp, int bankLoanPay, int childExp, int childExpPer, - int savings, int mortgage, int schoolLoans, int carLoans, int creditCardDebt) - { - _name = name; - _salary = salary; - _taxes = taxes; - _mortgagePay = mortgagePay; - _schoolLoanPay = schoolLoanPay; - _carLoanPay = carLoanPay; - _creditCardPay = creditCardPay; - _otherExp = otherExp; - _bankLoanPay = bankLoanPay; - _childExp = childExp; - _childExpPer = childExpPer; - _savings = savings; - _mortgage = mortgage; - _schoolLoans = schoolLoans; - _carLoans = carLoans; - _creditCardDebt = creditCardDebt; - - } - - public String getName() - { - return _name; - } - - public int getSalary() - { - return _salary; - } - - public int getTaxes() - { - return _taxes; - } - - public int getMortgagePay() - { - return _mortgagePay; - } - - public int getSchoolLoanPay() - { - return _schoolLoanPay; - } - - public int getCarLoanPay() - { - return _carLoanPay; - } - - public int getCreditCardPay() - { - return _creditCardPay; - } - - public int getOtherExp() - { - return _otherExp; - } - - public int getBankLoanPay() - { - return _bankLoanPay; - } - - public int getChildExp() - { - return _childExp; - } - - public int getChildExpPer() - { - return _childExpPer; - } - - public int getSavings() - { - return _savings; - } - - public int getMortgage() - { - return _mortgage; - } - - public int getSchoolLoans() - { - return _schoolLoans; - } - - public int getCarLoans() - { - return _carLoans; - } - - public int getCreditCardDebt() - { - return _creditCardDebt; - } - -} From 31cb8c836bd27d51a6d3edd54c6484927ce2f0e7 Mon Sep 17 00:00:00 2001 From: Joe Date: Thu, 2 Mar 2017 12:29:22 -0500 Subject: [PATCH 11/36] Made changes in Professions class --- .project | 6 ++++++ bin/model/Profession.class | Bin 387 -> 2597 bytes src/model/Card.java | 2 ++ src/model/Market_Cards.java | 2 ++ src/model/Profession.java | 2 ++ src/model/Professions.java | 41 ++++++++++++++++++------------------ 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.project b/.project index eb79e8f..2fd13b9 100644 --- a/.project +++ b/.project @@ -5,7 +5,13 @@ + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature diff --git a/bin/model/Profession.class b/bin/model/Profession.class index af4b4ba0e3273ebd7f1ae7ce3a8fc6f5c736f104..8fdeb619cfbf0611443cdf9dd2e107bdaf0a3a90 100644 GIT binary patch literal 2597 zcmZvcdvjAo7{;HICe3YgY2}DYODSz>a|(nCwL-ZlDQK~@)s%`N#&eQm8cY*B4ILc6 z5`XB7XPEI1KY$;~@!8#6+QTL@d4GF(cHiCi+5G$8-~Rx(0Y8bDh2mki;kV1XLHB3> z=&050BoSxt3-{P9x7|*&yyLy_>pcsJTE{)~Elh5W#;U!b)oHFMi zUhBE9{UZyacGwMiO}FXqx*W^bj_L>9ZhNcic2q~UR(FG8D_^Szexuc^xIse=r)%Bb zfge10{ZcOFxt(8zbJMl@L95;94-I(N4=kjZ%Q4g9{^{ZVa)Ht2YN)?8xo~3R4d3Ho z$8Wbft=?S=^Goj@ck}e8v~M9^;Vot`hI0aEF=b(FskEPlh4TUlj7z#8kVHz-MS--Y zd4Y_kO9EL0HG!h0j|C<)-4K}6^ohWGnm!dcqv@7_t?9PF z`$+NNTdj`2{p!&3gFV-4tLk>^ZhPMiTC&~mjQ0*&yr#*ms8?9|xOT<(p#F(|>9eOQ zpBvr1s%++D-E)z$r$$xJo+^53P-hF-0jiQGhZRo^w&j%3o=iS9DtCUgpRRVY>G!sk zxz8+>-mN!%#0k~D!C6^aJjI?pZSp+v@kyH(L+XT3baLTSeMhMVeYgT3SUKT1DDfMVeW~Vn5Qzs!bcK zNE53_3#&*2t4RAYPB4?R_<+A30@h3BF~MHXd5e#nfAF$3x6Hb|S=r zV~>YebnIk^l4GYrEIW2O#1+TRgeW_9HpGf!ixAfxI~QWrvGXC;9J>(WrehaFtpBNU zxWnH^d~je6ah&6$p5il|=EFPBd}jE)fCb*xGA?2Tb6CSX?y#qVOW4FBcCdseDB&3# zxVVhFTo0S_CbxS|K7grbKeSrrdokdlhNB*`1| zxO0k`N_s@fDEf+&RkTGCiXM}4ind94MLVQ|qFqvvd3}v<^zEa}DDzA>e_{F$LX3w+ zKly9wa6(V$AI?G*dj|2$n}~STD1KrT&ql?!jN*NxcrGfwXB2;H6fZ=@8%FU{qj)hY z-ZYB8Gm1-5@wQR?y-~az6<3YoXGZarsQ9T-{DVff$?3=9k=4B`{H^w>BGit^L^CR$7Ru@xugBo39iAk9`nI)MZaW2|sBpX Date: Thu, 2 Mar 2017 13:18:52 -0500 Subject: [PATCH 12/36] All changes by joe --- .classpath | 6 +++ bin/.gitignore | 3 ++ bin/controller/Cashflow.class | Bin 271 -> 425 bytes src/controller/Cashflow.java | 8 ++- src/model/Card.java | 2 +- src/model/Market_Cards.java | 94 ++++++++++++++++++---------------- src/view/MainWindow.java | 50 ++++++++++++++++++ 7 files changed, 116 insertions(+), 47 deletions(-) create mode 100644 .classpath create mode 100644 bin/.gitignore create mode 100644 src/view/MainWindow.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..b9e6658 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..66b02ab --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/model/ +/view/ +/controller/ diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 80f4f93fffdac57d8939bcb22ecd16f50059f5bd..6d77dff1c0a7cc0adfa5e79aa054c0b0958ee080 100644 GIT binary patch delta 208 zcmeBYTFK0H>ff$?3=9k=4B`{HriZZPCT8X_GKgtJ`(!1SCFuVGVqsWrk3mb0@a0Q=B4D9b1?`oa56HmBo?I?GcpKcYMeMvlaXoS39STH25z8D zJPeFLk`+kv0%=YLJ_dfE2s@B%3Zy}D?7JBRwlfHA1TvWzxPT-VkOnDb1F{fCurmlV NhycYI8AQP<#Q?hzB|-oI delta 57 zcmZ3<+|R^y>ff$?3=9k=3<49mrceB##>hBXo>5DdnSmQ9%EQ12Bw2wpFOX(r-~*CO G4Ez9&lnDX= diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index bb9db74..83039bb 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -1,5 +1,11 @@ package controller; -public class Cashflow { +import view.*; +public class Cashflow +{ + public static void main(String[] args) + { + new MainWindow(); + } } diff --git a/src/model/Card.java b/src/model/Card.java index 29b9cea..ffaa466 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -16,7 +16,7 @@ public class Card - public Market_Card(String title, String type, Boolean effect, int value){ + public Card(String title, String type, Boolean effect, int value){ _title = title; _type = type; _effect = effect; diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 1d6b890..795a2fa 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -4,98 +4,102 @@ * hi im very forgetful so my code is usually full of comments when its not finished sorry * */ -public class Market_Cards extends Market_Card { +public class Market_Cards extends Card { + public Market_Cards(String title, String type, Boolean effect, int value) { + super(title, type, effect, value); + // TODO Auto-generated constructor stub + } private static final Boolean True = null; private static final Boolean False = null; //profit card - value is how much $ is added //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out - Market_Card Profit1 = new Market_Card("Small Business Boom!", "profit", True, 250); + Card Profit1 = new Card("Small Business Boom!", "profit", True, 250); //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 - Market_Card Profit2 = new Market_Card("New Management System", "profit", False, 400); + Card Profit2 = new Card("New Management System", "profit", False, 400); // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. //gold card - value is $ per coin - Market_Card Gold1 = new Market_Card("Price of Gold Soars", "gold", True, 2000); + Card Gold1 = new Card("Price of Gold Soars", "gold", True, 2000); // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. - Market_Card Gold2 = new Market_Card("Collector wants Gold Coins", "gold", True, 1000); + Card Gold2 = new Card("Collector wants Gold Coins", "gold", True, 1000); //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. - Market_Card Gold3 = new Market_Card("Price of Gold Soars", "gold", True, 1000); + Card Gold3 = new Card("Price of Gold Soars", "gold", True, 1000); //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. - Market_Card Gold4 = new Market_Card("Collector wants Gold Coins", "gold", True, 500); + Card Gold4 = new Card("Collector wants Gold Coins", "gold", True, 500); //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. //expense card - quite obviously the value is how much this expense costs - Market_Card Expense1 = new Market_Card("Sewer Line Breaks", "expense", False, 1000); + Card Expense1 = new Card("Sewer Line Breaks", "expense", False, 1000); //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense2 = new Market_Card("Sewer Line Breaks", "expense", False, 2000); + Card Expense2 = new Card("Sewer Line Breaks", "expense", False, 2000); //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense3 = new Market_Card("Tenant Damages Your Property", "expense", False, 500); + Card Expense3 = new Card("Tenant Damages Your Property", "expense", False, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense4 = new Market_Card("Tenant Damages Your Property", "expense", False, 500); + Card Expense4 = new Card("Tenant Damages Your Property", "expense", False, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Market_Card Expense5 = new Market_Card("Tenant Damages Your Property", "expense", False, 1000; + Card Expense5 = new Card("Tenant Damages Your Property", "expense", False, 1000; //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. //stock card - no value necessary - Market_Card Stock1 = new Market_Card("Stock - MYT4U Electronics Co.","stock",True,0); + Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",True,0); //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. - Market_Card Stock2 = new Market_Card("Stock - GRO4US Fund","stock",True,0); + Card Stock2 = new Card("Stock - GRO4US Fund","stock",True,0); //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. - Market_Card Stock3 = new Market_Card("Stock - ON2U Entertainment Co.","stock",True,0); + Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",True,0); //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. - Market_Card Stock4 = new Market_Card("Stock - OK4U Drug Co.","stock",True,0); + Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",True,0); //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. //repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe - Market_Card REPercent1 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,110); + Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",True,110); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent2 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,110); + Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",True,110); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent3 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,120); + Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",True,120); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent4 = new Market_Card("House Buyer - 2BR/1BA","repercent",True,120); + Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",True,120); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent5 = new Market_Card("House Buyer - 3BR/2BA","repercent",True,115); + Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",True,115); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent6 = new Market_Card("Plex Buyer","repercent",True,110); + Card REPercent6 = new Card("Plex Buyer","repercent",True,110); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent7 = new Market_Card("Plex Buyer","repercent",True,105); + Card REPercent7 = new Card("Plex Buyer","repercent",True,105); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent8 = new Market_Card("Plex Buyer","repercent",True,115); + Card REPercent8 = new Card("Plex Buyer","repercent",True,115); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REPercent9 = new Market_Card("Plex Buyer","repercent",True,120); + Card REPercent9 = new Card("Plex Buyer","repercent",True,120); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //refixed - value is the amount of money you get for selling property - Market_Card REFixed1 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,15000); + Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",True,15000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed2 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,1000); + Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",True,1000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed3 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,20000); + Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",True,20000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed4 = new Market_Card("House Buyer - 3BR/2BA","refixed",True,5000); + Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",True,5000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REHOffer1 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,45000); + Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",True,45000); //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REHOffer2 = new Market_Card("House or Condo Buyer - 2BR/1BA","hoffer",True,65000); + Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",True,65000); //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed5 = new Market_Card("Plex Buyer","refixed",True,1000); + Card REFixed5 = new Card("Plex Buyer","refixed",True,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed6 = new Market_Card("Plex Buyer","refixed",True,30000); + Card REFixed6 = new Card("Plex Buyer","refixed",True,30000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed7 = new Market_Card("Plex Buyer","refixed",True,15000); + Card REFixed7 = new Card("Plex Buyer","refixed",True,15000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed8 = new Market_Card("Plex Buyer","refixed",True,5000); + Card REFixed8 = new Card("Plex Buyer","refixed",True,5000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed9 = new Market_Card("Plex Buyer","refixed",True,1000); + Card REFixed9 = new Card("Plex Buyer","refixed",True,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed10 = new Market_Card("Plex Buyer","refixed",True,20000); + Card REFixed10 = new Card("Plex Buyer","refixed",True,20000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REFixed11 = new Market_Card("Plex Buyer","refixed",True,10000); + Card REFixed11 = new Card("Plex Buyer","refixed",True,10000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //aoffer - value is amount of money you get for selling each unit - Market_Card REAOffer1 = new Market_Card("Apartment House Buyer","aoffer",True,25000); + Card REAOffer1 = new Card("Apartment House Buyer","aoffer",True,25000); //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer2 = new Market_Card("Apartment House Buyer","aoffer",True,45000); + Card REAOffer2 = new Card("Apartment House Buyer","aoffer",True,45000); //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer3 = new Market_Card("Apartment House Buyer","aoffer",True,30000); + Card REAOffer3 = new Card("Apartment House Buyer","aoffer",True,30000); //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Market_Card REAOffer4 = new Market_Card("Apartment House Buyer","aoffer",True,40000); + Card REAOffer4 = new Card("Apartment House Buyer","aoffer",True,40000); //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. /* @@ -103,9 +107,9 @@ public class Market_Cards extends Market_Card { * Then put them all into a stack so they can be used in game! * */ - public static void main(String[] args) { - - } + //public static void main(String[] args) { + + //} } diff --git a/src/view/MainWindow.java b/src/view/MainWindow.java new file mode 100644 index 0000000..b1a94ed --- /dev/null +++ b/src/view/MainWindow.java @@ -0,0 +1,50 @@ +package view; + +import java.awt.*; + +import javax.swing.JFrame; +import javax.swing.JPanel; + +public class MainWindow { + + private JFrame frame; + + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + MainWindow window = new MainWindow(); + window.frame.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the application. + */ + public MainWindow() { + initialize(); + } + + /** + * Initialize the contents of the frame. + */ + private void initialize() { + frame = new JFrame(); + frame.setExtendedState(JFrame.MAXIMIZED_BOTH); + //frame.setBackground(new Color(186,85,211)); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + //frame.getContentPane().setLayout(null); + frame.setVisible(true); + + JPanel panel = new JPanel(); + panel.setBackground(new Color(186,85,211)); + frame.add(panel); + } +} From 48af30b204038e97c700bd8443d2936088cfe9ec Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 13:22:08 -0500 Subject: [PATCH 13/36] github is stup!d --- src/model/Market_Cards.java | 100 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 51 deletions(-) diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 795a2fa..b5b25b1 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -1,115 +1,113 @@ package model; - /* * hi im very forgetful so my code is usually full of comments when its not finished sorry * */ public class Market_Cards extends Card { - public Market_Cards(String title, String type, Boolean effect, int value) { - super(title, type, effect, value); - // TODO Auto-generated constructor stub - } - private static final Boolean True = null; - private static final Boolean False = null; + //profit card - value is how much $ is added //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out - Card Profit1 = new Card("Small Business Boom!", "profit", True, 250); + Card Profit1 = new Card("Small Business Boom!", "profit", true, 250); //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 - Card Profit2 = new Card("New Management System", "profit", False, 400); + Card Profit2 = new Card("New Management System", "profit", false, 400); // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. //gold card - value is $ per coin - Card Gold1 = new Card("Price of Gold Soars", "gold", True, 2000); + Card Gold1 = new Card("Price of Gold Soars", "gold", true, 2000); // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. - Card Gold2 = new Card("Collector wants Gold Coins", "gold", True, 1000); + Card Gold2 = new Card("Collector wants Gold Coins", "gold", true, 1000); //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. - Card Gold3 = new Card("Price of Gold Soars", "gold", True, 1000); + Card Gold3 = new Card("Price of Gold Soars", "gold", true, 1000); //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. - Card Gold4 = new Card("Collector wants Gold Coins", "gold", True, 500); + Card Gold4 = new Card("Collector wants Gold Coins", "gold", true, 500); //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. //expense card - quite obviously the value is how much this expense costs - Card Expense1 = new Card("Sewer Line Breaks", "expense", False, 1000); + Card Expense1 = new Card("Sewer Line Breaks", "expense", false, 1000); //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense2 = new Card("Sewer Line Breaks", "expense", False, 2000); + Card Expense2 = new Card("Sewer Line Breaks", "expense", false, 2000); //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense3 = new Card("Tenant Damages Your Property", "expense", False, 500); + Card Expense3 = new Card("Tenant Damages Your Property", "expense", false, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense4 = new Card("Tenant Damages Your Property", "expense", False, 500); + Card Expense4 = new Card("Tenant Damages Your Property", "expense", false, 500); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense5 = new Card("Tenant Damages Your Property", "expense", False, 1000; + Card Expense5 = new Card("Tenant Damages Your Property", "expense", false, 1000; //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. //stock card - no value necessary - Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",True,0); + Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",true,0); //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. - Card Stock2 = new Card("Stock - GRO4US Fund","stock",True,0); + Card Stock2 = new Card("Stock - GRO4US Fund","stock",true,0); //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. - Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",True,0); + Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",true,0); //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. - Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",True,0); + Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",true,0); //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. //repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe - Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",True,110); + Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",true,110); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",True,110); + Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",true,110); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",True,120); + Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",true,120); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",True,120); + Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",true,120); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",True,115); + Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",true,115); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent6 = new Card("Plex Buyer","repercent",True,110); + Card REPercent6 = new Card("Plex Buyer","repercent",true,110); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent7 = new Card("Plex Buyer","repercent",True,105); + Card REPercent7 = new Card("Plex Buyer","repercent",true,105); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent8 = new Card("Plex Buyer","repercent",True,115); + Card REPercent8 = new Card("Plex Buyer","repercent",true,115); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent9 = new Card("Plex Buyer","repercent",True,120); + Card REPercent9 = new Card("Plex Buyer","repercent",true,120); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //refixed - value is the amount of money you get for selling property - Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",True,15000); + Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",true,15000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",True,1000); + Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",true,1000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",True,20000); + Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",true,20000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",True,5000); + Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",true,5000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",True,45000); + Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,45000); //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",True,65000); + Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,65000); //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed5 = new Card("Plex Buyer","refixed",True,1000); + Card REFixed5 = new Card("Plex Buyer","refixed",true,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed6 = new Card("Plex Buyer","refixed",True,30000); + Card REFixed6 = new Card("Plex Buyer","refixed",true,30000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed7 = new Card("Plex Buyer","refixed",True,15000); + Card REFixed7 = new Card("Plex Buyer","refixed",true,15000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed8 = new Card("Plex Buyer","refixed",True,5000); + Card REFixed8 = new Card("Plex Buyer","refixed",true,5000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed9 = new Card("Plex Buyer","refixed",True,1000); + Card REFixed9 = new Card("Plex Buyer","refixed",true,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed10 = new Card("Plex Buyer","refixed",True,20000); + Card REFixed10 = new Card("Plex Buyer","refixed",true,20000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed11 = new Card("Plex Buyer","refixed",True,10000); + Card REFixed11 = new Card("Plex Buyer","refixed",true,10000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //aoffer - value is amount of money you get for selling each unit - Card REAOffer1 = new Card("Apartment House Buyer","aoffer",True,25000); + Card REAOffer1 = new Card("Apartment House Buyer","aoffer",true,25000); //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer2 = new Card("Apartment House Buyer","aoffer",True,45000); + Card REAOffer2 = new Card("Apartment House Buyer","aoffer",true,45000); //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer3 = new Card("Apartment House Buyer","aoffer",True,30000); + Card REAOffer3 = new Card("Apartment House Buyer","aoffer",true,30000); //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer4 = new Card("Apartment House Buyer","aoffer",True,40000); + Card REAOffer4 = new Card("Apartment House Buyer","aoffer",true,40000); //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. /* * Write a method below that evaluates what the card type is + who it effects and performs operations based on that and yeah stuff * Then put them all into a stack so they can be used in game! - * + * ldasjkfdasjf;lads */ - //public static void main(String[] args) { + public static void main(String[] args) { + /* Need a decision function + *Need separate functionalities (if statements) based on card type + * Need a way that every player who is affected gets the decision option + */ Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have - //} + } } From 2139984ad884a194ab0e40e78c4a9c9b7364d6dd Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:26:44 -0500 Subject: [PATCH 14/36] Update Card.java --- src/model/Card.java | 59 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/src/model/Card.java b/src/model/Card.java index ffaa466..8f793de 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -1,43 +1,88 @@ -package model; + + /* + * this is a very broad object class + * i know we said all the card stacks would be in here but like + * would it make more sense for them to be in the individual card classes? + * - jackie + * + */ + public class Card + { + private String _title; + private String _type; // you dont have to use this but i added it because theres so many different types of market cards i need something to keep track of which is which + private Boolean _effect; //True if it effects all players - private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0 + private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0 + private int _value1; //value of cost + + private int _value2; //value of Down Payment + + private int _value3; //value of Mortgage + private int _value4; //value of Cash Flow + + + public Card(String title, String type, Boolean effect, int value){ + _title = title; + _type = type; + _effect = effect; - _value = value; - } - + _value = value; + } public String getTitle() + { return _title; } - + public String getType() { return _type; } + public int getValue(){ return _value; } - + public Card (String title, String type, Boolean effect, int value, int value2, int value3, int value4){ + + _title = title; + + _type = type; + + _effect = effect; + + _value = value; + + _value1 = value; + + _value2 = value; + + _value3 = value; + + _value4 = value; + + + } + } From d02d2a0aeb85e9a178389fa98b6a455aa15b3474 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:28:59 -0500 Subject: [PATCH 15/36] Update Card.java --- src/model/Card.java | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/model/Card.java b/src/model/Card.java index 8f793de..6c4df64 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -37,7 +37,7 @@ public class Card - public Card(String title, String type, Boolean effect, int value){ + public Card (String title, String type, Boolean effect, int value, int value2, int value3, int value4){ _title = title; @@ -46,7 +46,13 @@ public Card(String title, String type, Boolean effect, int value){ _effect = effect; _value = value; - + + _value1 = value2; + + _value2 = value3; + + _value3 = value4; + } public String getTitle() @@ -62,27 +68,17 @@ public String getType() public int getValue(){ return _value; } + public int getValue2(){ + return _value2; + } + public int getValue3(){ + return _value3; + } + public int getValue4(){ + return _value4; + } - public Card (String title, String type, Boolean effect, int value, int value2, int value3, int value4){ - - _title = title; - - _type = type; - - _effect = effect; - - _value = value; - - _value1 = value; - - _value2 = value; - - _value3 = value; - - _value4 = value; - - } } From 39194a9a1bd62d8accba23423d0f8fcb19d6a98d Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:29:24 -0500 Subject: [PATCH 16/36] Update Card.java --- src/model/Card.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/model/Card.java b/src/model/Card.java index 6c4df64..344c514 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -25,9 +25,7 @@ public class Card private Boolean _effect; //True if it effects all players - private int _value; // Any integer value that can be attached to the card. If card needs no value, put 0 - - private int _value1; //value of cost + 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 apparently. private int _value2; //value of Down Payment From b39f37f7cb2f5b496b86c838ff671f653df3b236 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:32:22 -0500 Subject: [PATCH 17/36] Update Market_Cards.java --- src/model/Market_Cards.java | 82 ++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index b5b25b1..8347058 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -7,93 +7,93 @@ public class Market_Cards extends Card { //profit card - value is how much $ is added //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out - Card Profit1 = new Card("Small Business Boom!", "profit", true, 250); + Card Profit1 = new Card("Small Business Boom!", "profit", true, 250,0,0,0); //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 - Card Profit2 = new Card("New Management System", "profit", false, 400); + Card Profit2 = new Card("New Management System", "profit", false, 400,0,0,0); // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. //gold card - value is $ per coin - Card Gold1 = new Card("Price of Gold Soars", "gold", true, 2000); + Card Gold1 = new Card("Price of Gold Soars", "gold", true, 2000,0,0,0); // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. - Card Gold2 = new Card("Collector wants Gold Coins", "gold", true, 1000); + Card Gold2 = new Card("Collector wants Gold Coins", "gold", true, 1000,0,0,0); //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. - Card Gold3 = new Card("Price of Gold Soars", "gold", true, 1000); + Card Gold3 = new Card("Price of Gold Soars", "gold", true, 1000,0,0,0); //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. - Card Gold4 = new Card("Collector wants Gold Coins", "gold", true, 500); + Card Gold4 = new Card("Collector wants Gold Coins", "gold", true, 500,0,0,0); //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. //expense card - quite obviously the value is how much this expense costs - Card Expense1 = new Card("Sewer Line Breaks", "expense", false, 1000); + Card Expense1 = new Card("Sewer Line Breaks", "expense", false, 1000,0,0,0); //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense2 = new Card("Sewer Line Breaks", "expense", false, 2000); + Card Expense2 = new Card("Sewer Line Breaks", "expense", false, 2000,0,0,0); //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense3 = new Card("Tenant Damages Your Property", "expense", false, 500); + Card Expense3 = new Card("Tenant Damages Your Property", "expense", false, 500,0,0,0); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense4 = new Card("Tenant Damages Your Property", "expense", false, 500); + Card Expense4 = new Card("Tenant Damages Your Property", "expense", false, 500,0,0,0); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense5 = new Card("Tenant Damages Your Property", "expense", false, 1000; + Card Expense5 = new Card("Tenant Damages Your Property", "expense", false, 1000,0,0,0); //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. //stock card - no value necessary - Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",true,0); + Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",true,0,0,0,0); //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. - Card Stock2 = new Card("Stock - GRO4US Fund","stock",true,0); + Card Stock2 = new Card("Stock - GRO4US Fund","stock",true,0,0,0,0); //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. - Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",true,0); + Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",true,0,0,0,0); //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. - Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",true,0); + Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",true,0,0,0,0); //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. //repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe - Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",true,110); + Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",true,110,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",true,110); + Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",true,110,0,0,0); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",true,120); + Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",true,120,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",true,120); + Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",true,120,0,0,0); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",true,115); + Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",true,115,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent6 = new Card("Plex Buyer","repercent",true,110); + Card REPercent6 = new Card("Plex Buyer","repercent",true,110,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent7 = new Card("Plex Buyer","repercent",true,105); + Card REPercent7 = new Card("Plex Buyer","repercent",true,105,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent8 = new Card("Plex Buyer","repercent",true,115); + Card REPercent8 = new Card("Plex Buyer","repercent",true,115,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent9 = new Card("Plex Buyer","repercent",true,120); + Card REPercent9 = new Card("Plex Buyer","repercent",true,120,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //refixed - value is the amount of money you get for selling property - Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",true,15000); + Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",true,15000,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",true,1000); + Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",true,1000,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",true,20000); + Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",true,20000,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",true,5000); + Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",true,5000,0,0,0); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,45000); + Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,45000,0,0,0); //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,65000); + Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,65000,0,0,0); //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed5 = new Card("Plex Buyer","refixed",true,1000); + Card REFixed5 = new Card("Plex Buyer","refixed",true,1000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed6 = new Card("Plex Buyer","refixed",true,30000); + Card REFixed6 = new Card("Plex Buyer","refixed",true,30000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed7 = new Card("Plex Buyer","refixed",true,15000); + Card REFixed7 = new Card("Plex Buyer","refixed",true,15000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed8 = new Card("Plex Buyer","refixed",true,5000); + Card REFixed8 = new Card("Plex Buyer","refixed",true,5000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed9 = new Card("Plex Buyer","refixed",true,1000); + Card REFixed9 = new Card("Plex Buyer","refixed",true,1000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed10 = new Card("Plex Buyer","refixed",true,20000); + Card REFixed10 = new Card("Plex Buyer","refixed",true,20000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed11 = new Card("Plex Buyer","refixed",true,10000); + Card REFixed11 = new Card("Plex Buyer","refixed",true,10000,0,0,0); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //aoffer - value is amount of money you get for selling each unit - Card REAOffer1 = new Card("Apartment House Buyer","aoffer",true,25000); + Card REAOffer1 = new Card("Apartment House Buyer","aoffer",true,25000,0,0,0); //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer2 = new Card("Apartment House Buyer","aoffer",true,45000); + Card REAOffer2 = new Card("Apartment House Buyer","aoffer",true,45000,0,0,0); //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer3 = new Card("Apartment House Buyer","aoffer",true,30000); + Card REAOffer3 = new Card("Apartment House Buyer","aoffer",true,30000,0,0,0); //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer4 = new Card("Apartment House Buyer","aoffer",true,40000); + Card REAOffer4 = new Card("Apartment House Buyer","aoffer",true,40000,0,0,0); //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. /* From 641467ad07dfff8d198bd4493f863f7fa7b50fd7 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:34:10 -0500 Subject: [PATCH 18/36] Create Big_Deals --- src/model/Big_Deals | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/Big_Deals diff --git a/src/model/Big_Deals b/src/model/Big_Deals new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/Big_Deals @@ -0,0 +1 @@ + From d73a76131b34083b1b922d54eabf7f0f120dbd88 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:34:26 -0500 Subject: [PATCH 19/36] Create Doodads --- src/model/Doodads | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/Doodads diff --git a/src/model/Doodads b/src/model/Doodads new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/Doodads @@ -0,0 +1 @@ + From 9f4b56fc1f0fa589d1d55c5ab5926f5a215efc81 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:34:58 -0500 Subject: [PATCH 20/36] Rename Doodads to Doodads.java --- src/model/{Doodads => Doodads.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/model/{Doodads => Doodads.java} (100%) diff --git a/src/model/Doodads b/src/model/Doodads.java similarity index 100% rename from src/model/Doodads rename to src/model/Doodads.java From 4036046558777a68a6ee5e525b458c84fe724ec2 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:35:10 -0500 Subject: [PATCH 21/36] Rename Big_Deals to Big_Deals.java --- src/model/{Big_Deals => Big_Deals.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/model/{Big_Deals => Big_Deals.java} (100%) diff --git a/src/model/Big_Deals b/src/model/Big_Deals.java similarity index 100% rename from src/model/Big_Deals rename to src/model/Big_Deals.java From 47b519bed0d34853e03dac356024e1a4beb2141c Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 2 Mar 2017 21:40:46 -0500 Subject: [PATCH 22/36] hello its me --- src/model/Big_Deals.java | 119 +++++++++++++++++++++++++++++++++++++++ src/model/Card.java | 10 +--- src/model/Doodads.java | 54 ++++++++++++++++++ 3 files changed, 174 insertions(+), 9 deletions(-) diff --git a/src/model/Big_Deals.java b/src/model/Big_Deals.java index 8b13789..3a58297 100644 --- a/src/model/Big_Deals.java +++ b/src/model/Big_Deals.java @@ -1 +1,120 @@ +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 344c514..4e74377 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -1,18 +1,10 @@ - - /* - * this is a very broad object class - * i know we said all the card stacks would be in here but like - * would it make more sense for them to be in the individual card classes? - * - jackie - * - */ public class Card @@ -79,4 +71,4 @@ public int getValue4(){ -} +} \ No newline at end of file diff --git a/src/model/Doodads.java b/src/model/Doodads.java index 8b13789..1273bd1 100644 --- a/src/model/Doodads.java +++ b/src/model/Doodads.java @@ -1 +1,55 @@ + +public class Doodads extends Card { + + Card D01 = new Card("New Tennis Racket", "doodad", true, 200,0,0,0); + Card D02 = new Card("Food Processor", "doodad", true, 200,0,0,0); + Card D03 = new Card("Birthday Party for You Child", "doodad", true, 500,0,0,0); //if you have a child + Card D04 = new Card("Next-Gen Game Console", "doodad", true, 600,0,0,0); + Card D05 = new Card("First Card for Child (Take out a loan if you must)", "doodad", true, 5000,0,0,0); //if you have a child + Card D06 = new Card("Jet Ski (Take out a loan if you must)", "doodad", true, 3000,0,0,0); + Card D07 = new Card("New Tailored Suit", "doodad", true, 1000,0,0,0); + Card D08 = new Card("New Rims for Your Card (Take outa loan if you must)", "doodad", true, 2000,0,0,0); + Card D09 = new Card("New Car Stereo", "doodad", true, 700,0,0,0); + Card D10 = new Card("Go to Casino", "doodad", true, 800,0,0,0); + Card D11 = new Card("New Easy Chair", "doodad", true, 500,0,0,0); + Card D12 = new Card("Cappuccino Machine", "doodad", true, 300,0,0,0); + Card D13 = new Card("Pay for Lunch with Friends", "doodad", true, 200,0,0,0); + Card D14 = new Card("New Computuer (Take out a loan if you must)", "doodad", true, 1800,0,0,0); + Card D15 = new Card("Golf Club Membership (Take out a loan if you must)", "doodad", true, 2000,0,0,0); + Card D16 = new Card("Child Needs Braces (Take out a loan if you must)", "doodad", true, 4000,0,0,0); + //if you have a child + Card D17 = new Card("Concert Tickets", "doodad", true, 200,0,0,0); + Card D18 = new Card("New Watch", "doodad", true, 200,0,0,0); + Card D19 = new Card("New Tires", "doodad", true, 600,0,0,0); + Card D20 = new Card("Replace Car Air Conditioner", "doodad", true, 700,0,0,0); + Card D21 = new Card("Get Newest Phone", "doodad", true, 300,0,0,0); + Card D22 = new Card("New Sunglasses", "doodad", true, 200,0,0,0); + Card D23 = new Card("New Gym Clothes", "doodad", true, 300,0,0,0); + Card D24 = new Card("New Clothes", "doodad", true, 1000,0,0,0); + Card D25 = new Card("Private Tutoring for Your Child", "doodad", true, 500,0,0,0); + //if you have a child + Card D26 = new Card("Big Screen TV (Take out a loan if you must)", "doodad", true, 2500,0,0,0); + Card D27 = new Card("Date Night: Dinner, Concert & Dessert", "doodad", true, 500,0,0,0); + Card D28 = new Card("Take a Trip to Wine Country", "doodad", true, 1000,0,0,0); + Card D29 = new Card("Buy Local Artist's Painting", "doodad", true, 800,0,0,0); + Card D30 = new Card("High School Reunion", "doodad", true, 500,0,0,0); + Card D31 = new Card("Build a Home Gym (Take out a loan if you must)", "doodad", true, 3000,0,0,0); + Card D32 = new Card("New Golf Clubs", "doodad", true, 800,0,0,0); + Card D33 = new Card("Costume Jewlry", "doodad", true, 400,0,0,0); + Card D34 = new Card("Fishing Boat (Take out a loan if you must)", "doodad", true, 5000,0,0,0); + Card D35 = new Card("New Bowling Ball", "doodad", true, 100,0,0,0); + Card D36 = new Card("Repaint Your House", "doodad", true, 600,0,0,0); + Card D37 = new Card("New Sound System", "doodad", true, 1500,0,0,0); + Card D38 = new Card("Visit the Dentist (Maybe get a shiny gold tooth!)", "doodad", true, 700,0,0,0); + Card D39 = new Card("Help Pay for Child's Wedding", "doodad", true, 2000,0,0,0); + Card D40 = new Card("Family Vacation (Take out a loan if you must)", "doodad", true, 2500,0,0,0); + Card D41 = new Card("Remodel Kitchen (Take out a loan if you must)", "doodad", true, 7500,0,0,0); + Card D42 = new Card("Season Tickets", "doodad", true, 1500,0,0,0); + + public Doodads(String title, String type, Boolean effect, int value) { + super(title, type, effect, value); + // TODO Auto-generated constructor stub + } + +} \ No newline at end of file From dcbb816ab44ed0349e8eb91eb67dadbcd873b732 Mon Sep 17 00:00:00 2001 From: Jacklyn J Videira Date: Thu, 2 Mar 2017 21:42:20 -0500 Subject: [PATCH 23/36] hello its me --- src/model/Card.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/model/Card.java b/src/model/Card.java index 4e74377..d980ff6 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -17,7 +17,7 @@ public class Card private Boolean _effect; //True if it effects all players - 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 apparently. + 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 _value2; //value of Down Payment @@ -71,4 +71,4 @@ public int getValue4(){ -} \ No newline at end of file +} From 9efaf16e6361b3b92680ca90e3f6b95d36e0c20a Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 00:16:03 -0500 Subject: [PATCH 24/36] idk whats going on --- bin/controller/Cashflow.class | Bin 425 -> 579 bytes src/controller/Cashflow.java | 1 + src/model/Market_Cards.java | 4 ++-- src/view/MainWindow.java | 7 +++++- src/view/MainWindow1.java | 42 ++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/view/MainWindow1.java diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 6d77dff1c0a7cc0adfa5e79aa054c0b0958ee080..3963c5c78619282100e18e82fe72c4e367467dcc 100644 GIT binary patch delta 242 zcmZ36ov-I)5MdBwXAos%5Xed_OVrOv%uCk~t}HG|&E;Vb zXOLiIV9qZsVPp{X0ZV7*>jxBN=9L7O6s0EST5~W+F*2}vq~_%0b1}#;$gwlXGBOBb zQOUy~&!E7_z+M2-oRbGMPXlZqKh(k!pm@5qX4u4=6MP&Qm>3v=F67_MAh4Z5XcL35 xkmNQ7>5V`kCI&7b$;ZG9Bsm$_fIL11ZXje};DKmiP-IX7@)#MEfg}@y3IIf+GhF}x delta 87 zcmX@ivXYtW)W2Q(7#J8#7{n)Xou8b}IKjb`fe{E97}$3+2yAB%+6ZJaF>nD%E+Eao dz{$V{WN`yoJP>6J!VDrn9wUP&kYr*I0{{xF3uXWS diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 83039bb..ec0ad31 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -7,5 +7,6 @@ public class Cashflow public static void main(String[] args) { new MainWindow(); + System.out.println("Hello"); } } diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index b5b25b1..c00e108 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -105,8 +105,8 @@ public static void main(String[] args) { /* Need a decision function *Need separate functionalities (if statements) based on card type * Need a way that every player who is affected gets the decision option - */ Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have - + * Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have + */ } } diff --git a/src/view/MainWindow.java b/src/view/MainWindow.java index b1a94ed..ea95c70 100644 --- a/src/view/MainWindow.java +++ b/src/view/MainWindow.java @@ -45,6 +45,11 @@ private void initialize() { JPanel panel = new JPanel(); panel.setBackground(new Color(186,85,211)); - frame.add(panel); + frame.getContentPane().add(panel); + panel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBounds(6, 6, 48, 47); + panel.add(panel_1); } } diff --git a/src/view/MainWindow1.java b/src/view/MainWindow1.java new file mode 100644 index 0000000..b68860b --- /dev/null +++ b/src/view/MainWindow1.java @@ -0,0 +1,42 @@ +package view; + +import java.awt.BorderLayout; +import java.awt.EventQueue; + +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; + +public class MainWindow1 extends JFrame { + + private JPanel contentPane; + + /** + * Launch the application. + */ + public static void main(String[] args) { + EventQueue.invokeLater(new Runnable() { + public void run() { + try { + MainWindow1 frame = new MainWindow1(); + frame.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + /** + * Create the frame. + */ + public MainWindow1() { + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + setBounds(100, 100, 450, 300); + contentPane = new JPanel(); + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + contentPane.setLayout(new BorderLayout(0, 0)); + setContentPane(contentPane); + } + +} From 9fd28b8fa48cb02a28ab376905ff9a2dd800360d Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 00:16:23 -0500 Subject: [PATCH 25/36] idk --- src/model/Profession.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/model/Profession.java b/src/model/Profession.java index 5e43780..780ae2f 100644 --- a/src/model/Profession.java +++ b/src/model/Profession.java @@ -122,6 +122,4 @@ public int getCreditCardDebt() { return _creditCardDebt; } - } - From 99d866ef8fe11dc73bbae9ebcdf64dbc50cfa234 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 00:21:25 -0500 Subject: [PATCH 26/36] Minor changes --- src/model/Big_Deals.java | 1 + src/model/Card.java | 7 ++++--- src/model/Market_Cards.java | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/model/Big_Deals.java b/src/model/Big_Deals.java index 3a58297..928bfd5 100644 --- a/src/model/Big_Deals.java +++ b/src/model/Big_Deals.java @@ -1,3 +1,4 @@ +package model; public class Big_Deals extends Card { diff --git a/src/model/Card.java b/src/model/Card.java index d980ff6..5c8aee2 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -1,3 +1,4 @@ +package model; /* * this is a very broad object class @@ -37,11 +38,11 @@ public Card (String title, String type, Boolean effect, int value, int value2, _value = value; - _value1 = value2; + _value2 = value2; - _value2 = value3; + _value3 = value3; - _value3 = value4; + _value4 = value4; } public String getTitle() diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 1468eca..f79d3db 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -5,6 +5,11 @@ */ public class Market_Cards extends Card { + public Market_Cards(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 + } + //profit card - value is how much $ is added //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out Card Profit1 = new Card("Small Business Boom!", "profit", true, 250,0,0,0); From b0e34742acf2a13823725259e08e1efc1d8b3ebf Mon Sep 17 00:00:00 2001 From: Sara S Saulat Date: Fri, 3 Mar 2017 11:15:27 -0500 Subject: [PATCH 27/36] Create something.java --- src/model/something.java | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/something.java diff --git a/src/model/something.java b/src/model/something.java new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/something.java @@ -0,0 +1 @@ + From 72fd900478d92284a897e106fcc0969b865e9ce0 Mon Sep 17 00:00:00 2001 From: Sara S Saulat Date: Fri, 3 Mar 2017 11:15:49 -0500 Subject: [PATCH 28/36] Delete something.java --- src/model/something.java | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/model/something.java diff --git a/src/model/something.java b/src/model/something.java deleted file mode 100644 index 8b13789..0000000 --- a/src/model/something.java +++ /dev/null @@ -1 +0,0 @@ - From dafba6342fdb38203add3c82a31f64602e6188ba Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 12:56:09 -0500 Subject: [PATCH 29/36] Doodads done. Working on the others now --- bin/controller/Cashflow.class | Bin 579 -> 1157 bytes src/controller/Cashflow.java | 12 ++++- src/model/Card.java | 34 ++++-------- src/model/CardStack.java | 39 ++++++++++++++ src/model/Die.java | 1 - src/model/DoodadCard.java | 10 ++++ src/model/DoodadStack.java | 94 ++++++++++++++++++++++++++++++++++ src/model/Doodads.java | 55 -------------------- src/model/Professions.java | 6 ++- 9 files changed, 167 insertions(+), 84 deletions(-) create mode 100644 src/model/CardStack.java create mode 100644 src/model/DoodadCard.java create mode 100644 src/model/DoodadStack.java delete mode 100644 src/model/Doodads.java diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 3963c5c78619282100e18e82fe72c4e367467dcc..7665aef46dca2bb2f859772cf4a2420f27d83a42 100644 GIT binary patch literal 1157 zcmZuwO;Zy=5Pg#@Y_cp62mwVv6qN*oRYXt%CsXfQ8X11Lzh^n` zR45Fw1AfE}i`!*mbN9e3dJL`e!WP~lLpYf#Fen+PWNHW_s-p$144pY)n;W&tuIX;` zUCU(X&N)SH6}T(pz454c`{Ixxk-H>yn!;ANuo-%juXAT5|dx12@UbsZoa#LCL}~wy0hzz%_X#t>P9#-+402HDQ%Z zSHm47Rg5-=_UYqV`9KnS2xM)umA}|<2bHmc}zK$t8 zpkeZA)wD|t6PH0QL}^s(H}0X18O##rs#9g?XlgGxJO(kIW6;hzt79Gu!BDn^Cza7d zsPi2m>*>8(WW{Y9_m3!ni^{O zPd+5OHmPmFtzhUZ%fJLtv}+ZHc3(;ByxLH(mUn7y(OeahN&CNVGbzg>H4utE7!aZp z{R>)Ex*4=H+FQns5&7bqHCm-vu5GmHfdlRBbc><`o%ABXKcP@4VC@94on!h|<8{RA z=vxRce#X?G@@7W)iop|%>?D+LxP6TA?#Vjt1zyv2Jfce-i*+o0470(3Pk(;P3c`>T z4EY%}L?~~JGAAf&Kb@B7oJHKPY&yt}RXis|geLNWY$RFCVGS>dYBy$)qf?l$qgbbt Xf(`O*L+BI<6*0yp39v~|A#D8xJv;=j delta 254 zcmZqWJj}v%>ff$?3=9k=45|~kcGdHjWu}(v`zB`Qg=glakmq4gU}Rt~0O`)jn|y~+V)8vE`N=NKfsCw^ zr!mX>I5IFXFall6znei|JA=?B24Nw|Z4A;IfkI3STtJeKff-10GOz)8d<@(`$iTn@ T(ZZm}pakSGGAIK{CI%G%aXK}B diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index ec0ad31..b02f9e7 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -1,12 +1,20 @@ package controller; import view.*; +import model.*; public class Cashflow { public static void main(String[] args) { - new MainWindow(); - System.out.println("Hello"); + DoodadStack ds = new DoodadStack(); + + int initialSize = ds.getStack().getSize(); + for(int i=0; i +{ + private static final long serialVersionUID = 1L; + private int _size; + + public CardStack() + { + super(); + _size = 0; + } + + @Override + public Card push(Card c) + { + _size++; + return super.push(c); + } + + @Override + public Card pop() + { + _size--; + return super.pop(); + } + + public int getSize() + { + return _size; + } +} diff --git a/src/model/Die.java b/src/model/Die.java index 8ea6be0..77ce069 100644 --- a/src/model/Die.java +++ b/src/model/Die.java @@ -1,7 +1,6 @@ package model; import java.util.Random; - public class Die { /* * Die will probably have to go in each individual turn, so that it can pull charity status diff --git a/src/model/DoodadCard.java b/src/model/DoodadCard.java new file mode 100644 index 0000000..f52c0b0 --- /dev/null +++ b/src/model/DoodadCard.java @@ -0,0 +1,10 @@ +package model; + +public class DoodadCard extends Card +{ + public DoodadCard(String title, int value) + { + super(title, value); + } + +} diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java new file mode 100644 index 0000000..8bdb568 --- /dev/null +++ b/src/model/DoodadStack.java @@ -0,0 +1,94 @@ +package model; + +import java.util.*; + +public class DoodadStack +{ + private CardStack _doodadCardStack; + + private static DoodadCard D01 = new DoodadCard("New Tennis Racket", 200); + private static DoodadCard D02 = new DoodadCard("Food Processor",200); + private static DoodadCard D03 = new DoodadCard("Birthday Party for You Child", 500); //if you have a child + private static DoodadCard D04 = new DoodadCard("Next-Gen Game Console", 600); + private static DoodadCard D05 = new DoodadCard("First DoodadCard for Child (Take out a loan if you must)", 5000); //if you have a child + private static DoodadCard D06 = new DoodadCard("Jet Ski (Take out a loan if you must)", 3000); + private static DoodadCard D07 = new DoodadCard("New Tailored Suit", 1000); + private static DoodadCard D08 = new DoodadCard("New Rims for Your DoodadCard (Take outa loan if you must)", 2000); + private static DoodadCard D09 = new DoodadCard("New Car Stereo", 700); + private static DoodadCard D10 = new DoodadCard("Go to Casino", 800); + private static DoodadCard D11 = new DoodadCard("New Easy Chair", 500); + private static DoodadCard D12 = new DoodadCard("Cappuccino Machine", 300); + private static DoodadCard D13 = new DoodadCard("Pay for Lunch with Friends", 200); + private static DoodadCard D14 = new DoodadCard("New Computuer (Take out a loan if you must)", 1800); + private static DoodadCard D15 = new DoodadCard("Golf Club Membership (Take out a loan if you must)", 2000); + private static DoodadCard D16 = new DoodadCard("Child Needs Braces (Take out a loan if you must)", 4000); + //if you have a child + private static DoodadCard D17 = new DoodadCard("Concert Tickets", 200); + private static DoodadCard D18 = new DoodadCard("New Watch", 200); + private static DoodadCard D19 = new DoodadCard("New Tires", 600); + private static DoodadCard D20 = new DoodadCard("Replace Car Air Conditioner", 700); + private static DoodadCard D21 = new DoodadCard("Get Newest Phone", 300); + private static DoodadCard D22 = new DoodadCard("New Sunglasses", 200); + private static DoodadCard D23 = new DoodadCard("New Gym Clothes", 300); + private static DoodadCard D24 = new DoodadCard("New Clothes", 1000); + private static DoodadCard D25 = new DoodadCard("Private Tutoring for Your Child", 500); + //if you have a child + private static DoodadCard D26 = new DoodadCard("Big Screen TV (Take out a loan if you must)", 2500); + private static DoodadCard D27 = new DoodadCard("Date Night: Dinner, Concert & Dessert", 500); + private static DoodadCard D28 = new DoodadCard("Take a Trip to Wine Country", 1000); + private static DoodadCard D29 = new DoodadCard("Buy Local Artist's Painting", 800); + private static DoodadCard D30 = new DoodadCard("High School Reunion", 500); + private static DoodadCard D31 = new DoodadCard("Build a Home Gym (Take out a loan if you must)", 3000); + private static DoodadCard D32 = new DoodadCard("New Golf Clubs", 800); + private static DoodadCard D33 = new DoodadCard("Costume Jewlry", 400); + private static DoodadCard D34 = new DoodadCard("Fishing Boat (Take out a loan if you must)", 5000); + private static DoodadCard D35 = new DoodadCard("New Bowling Ball", 100); + private static DoodadCard D36 = new DoodadCard("Repaint Your House", 600); + private static DoodadCard D37 = new DoodadCard("New Sound System", 1500); + private static DoodadCard D38 = new DoodadCard("Visit the Dentist (Maybe get a shiny gold tooth!)", 700); + private static DoodadCard D39 = new DoodadCard("Help Pay for Child's Wedding", 2000); + private static DoodadCard D40 = new DoodadCard("Family Vacation (Take out a loan if you must)", 2500); + private static DoodadCard D41 = new DoodadCard("Remodel Kitchen (Take out a loan if you must)", 7500); + private static DoodadCard D42 = new DoodadCard("Season Tickets", 1500); + + + public DoodadStack() + { + _doodadCardStack = randomizeStack(); + } + + + + private CardStack randomizeStack() + { + CardStack cardStack = new CardStack(); + ArrayList cardList = new ArrayList(); + Random r = new Random(); + DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10, + D11, D12, D13, D14, D15, D16, D17, D18, D19, D20, + D21, D22, D23, D24, D25, D26, D27, D28, D29, D30, + D31, D32, D33, D34, D35, D36, D37, D38, D39, D40, D41, D42}; + + // Add all array contents to list + for(DoodadCard c : cardArray) + { + cardList.add(c); + } + + int initialLength = cardList.size(); + for(int i=0; i < initialLength; i++) + { + cardStack.push(cardList.remove(r.nextInt(cardList.size()))); + } + return cardStack; + + } + + public CardStack getStack() + { + return _doodadCardStack; + } + + + +} \ No newline at end of file diff --git a/src/model/Doodads.java b/src/model/Doodads.java deleted file mode 100644 index 1273bd1..0000000 --- a/src/model/Doodads.java +++ /dev/null @@ -1,55 +0,0 @@ - - -public class Doodads extends Card { - - Card D01 = new Card("New Tennis Racket", "doodad", true, 200,0,0,0); - Card D02 = new Card("Food Processor", "doodad", true, 200,0,0,0); - Card D03 = new Card("Birthday Party for You Child", "doodad", true, 500,0,0,0); //if you have a child - Card D04 = new Card("Next-Gen Game Console", "doodad", true, 600,0,0,0); - Card D05 = new Card("First Card for Child (Take out a loan if you must)", "doodad", true, 5000,0,0,0); //if you have a child - Card D06 = new Card("Jet Ski (Take out a loan if you must)", "doodad", true, 3000,0,0,0); - Card D07 = new Card("New Tailored Suit", "doodad", true, 1000,0,0,0); - Card D08 = new Card("New Rims for Your Card (Take outa loan if you must)", "doodad", true, 2000,0,0,0); - Card D09 = new Card("New Car Stereo", "doodad", true, 700,0,0,0); - Card D10 = new Card("Go to Casino", "doodad", true, 800,0,0,0); - Card D11 = new Card("New Easy Chair", "doodad", true, 500,0,0,0); - Card D12 = new Card("Cappuccino Machine", "doodad", true, 300,0,0,0); - Card D13 = new Card("Pay for Lunch with Friends", "doodad", true, 200,0,0,0); - Card D14 = new Card("New Computuer (Take out a loan if you must)", "doodad", true, 1800,0,0,0); - Card D15 = new Card("Golf Club Membership (Take out a loan if you must)", "doodad", true, 2000,0,0,0); - Card D16 = new Card("Child Needs Braces (Take out a loan if you must)", "doodad", true, 4000,0,0,0); - //if you have a child - Card D17 = new Card("Concert Tickets", "doodad", true, 200,0,0,0); - Card D18 = new Card("New Watch", "doodad", true, 200,0,0,0); - Card D19 = new Card("New Tires", "doodad", true, 600,0,0,0); - Card D20 = new Card("Replace Car Air Conditioner", "doodad", true, 700,0,0,0); - Card D21 = new Card("Get Newest Phone", "doodad", true, 300,0,0,0); - Card D22 = new Card("New Sunglasses", "doodad", true, 200,0,0,0); - Card D23 = new Card("New Gym Clothes", "doodad", true, 300,0,0,0); - Card D24 = new Card("New Clothes", "doodad", true, 1000,0,0,0); - Card D25 = new Card("Private Tutoring for Your Child", "doodad", true, 500,0,0,0); - //if you have a child - Card D26 = new Card("Big Screen TV (Take out a loan if you must)", "doodad", true, 2500,0,0,0); - Card D27 = new Card("Date Night: Dinner, Concert & Dessert", "doodad", true, 500,0,0,0); - Card D28 = new Card("Take a Trip to Wine Country", "doodad", true, 1000,0,0,0); - Card D29 = new Card("Buy Local Artist's Painting", "doodad", true, 800,0,0,0); - Card D30 = new Card("High School Reunion", "doodad", true, 500,0,0,0); - Card D31 = new Card("Build a Home Gym (Take out a loan if you must)", "doodad", true, 3000,0,0,0); - Card D32 = new Card("New Golf Clubs", "doodad", true, 800,0,0,0); - Card D33 = new Card("Costume Jewlry", "doodad", true, 400,0,0,0); - Card D34 = new Card("Fishing Boat (Take out a loan if you must)", "doodad", true, 5000,0,0,0); - Card D35 = new Card("New Bowling Ball", "doodad", true, 100,0,0,0); - Card D36 = new Card("Repaint Your House", "doodad", true, 600,0,0,0); - Card D37 = new Card("New Sound System", "doodad", true, 1500,0,0,0); - Card D38 = new Card("Visit the Dentist (Maybe get a shiny gold tooth!)", "doodad", true, 700,0,0,0); - Card D39 = new Card("Help Pay for Child's Wedding", "doodad", true, 2000,0,0,0); - Card D40 = new Card("Family Vacation (Take out a loan if you must)", "doodad", true, 2500,0,0,0); - Card D41 = new Card("Remodel Kitchen (Take out a loan if you must)", "doodad", true, 7500,0,0,0); - Card D42 = new Card("Season Tickets", "doodad", true, 1500,0,0,0); - - public Doodads(String title, String type, Boolean effect, int value) { - super(title, type, effect, value); - // TODO Auto-generated constructor stub - } - -} \ No newline at end of file diff --git a/src/model/Professions.java b/src/model/Professions.java index 6c9587c..9755f44 100644 --- a/src/model/Professions.java +++ b/src/model/Professions.java @@ -4,8 +4,6 @@ public class Professions { - - Profession Nurse = new Profession("Nurse", 3100, 600, 400, 100, 100, 200, 600, 0, 0, 200, 500, 47000, 6000, 5000, 4000); Profession Teacher = new Profession("Teacher", 3300, 500, 500, 100, 100, 200, 700, 0, 0, @@ -47,6 +45,10 @@ public class Professions public Profession playerProf; + public Professions() {} + + + public Profession getProfession() { Random rand = new Random(); From 53e1fc045b89c5925c15e7b14c1df7ed397b6665 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 13:00:07 -0500 Subject: [PATCH 30/36] ?? --- src/model/DoodadCard.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/model/DoodadCard.java b/src/model/DoodadCard.java index f52c0b0..07edb7c 100644 --- a/src/model/DoodadCard.java +++ b/src/model/DoodadCard.java @@ -6,5 +6,4 @@ public DoodadCard(String title, int value) { super(title, value); } - } From 6df164952bb750630ddb5924bfc21df9757dbb11 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 13:24:04 -0500 Subject: [PATCH 31/36] More doodad changes --- bin/controller/Cashflow.class | Bin 1157 -> 1087 bytes src/controller/Cashflow.java | 4 ++-- src/model/DoodadStack.java | 26 ++++++++++---------------- src/model/MarketCard.java | 10 ++++++++++ src/model/Market_Cards.java | 2 +- 5 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 src/model/MarketCard.java diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 7665aef46dca2bb2f859772cf4a2420f27d83a42..7dce6a220275a33cfda53d3033ce4b8874ef8392 100644 GIT binary patch delta 492 zcmY+9O-~b16o#KWGdja%)JYptKnAN;X{|DT)K(Zl1^hr*m^3WdIY}o?O`)WWCa`fM zKY+|HaOGBA3`P>!yEHC!;U7Vd-Ke?A$$Q_Ad)~V{bm-_WN1r|eHJ11Ek14wyC(X`I ztT4-!r6EQbvl&%*&!d-7(2X|QL34X6iPv4uFrKceVmP5F{G%rQ&PIFwMW@?}` zZO;9lA2?htP)gsalH+s9okqH2lhoALA2A(k|Q#RI&xeR3<+jQp%Q_m;r7p4F`n6b|s$PFo*2yU)d3IpeZe zrZR2_%D9~ozBZLV{^r-$_wtU3mN|hfQ{&)rLQalT6z~WIFOX+g)Y_lD%Pew_`*L-p p@VtmhEDd2FU`VLOLqVp5OFR-}@mRdW7)Ru6Jf*4sKo%IrU~ob|R!rCbnj{xbO#< zb#!rZci0-8VH`NP_zN8TBjvTsP`BrO-{<|l&+~jgn9l~RFWc|l1Jm4mZhd=Vw)~(G zcz5nA(#2AJt=sfF?xNRk#?7k5Fj<3risXMIoBfO^j9>fh$G##_EG-RifKh{k3g@2p z&~rQ9ddqD*dJy<)HitMYtnNmj$kgL;yBm(FWVN6e`iCC$+v}}`jdrK$_btXK8jSCJ zFlN}4I2!g;!OU~aW*5i9mn!SH3av6~k>{k%6sN+^syaK&X`3=La=+K@DfaBJDlTWK z8dMb4Uzav#sf87-P|kDC<~%ip8FU-*af<~m7%WO^f1J20B3q*D`<{5cC~974-*0_F z7iF-#g|oUzsy-2sju@&X=3XnoWOtlv Xf^@D6cMxrxjDe%nq%7Q!md46Y-phEw diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index b02f9e7..0ad2aaa 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -9,11 +9,11 @@ public static void main(String[] args) { DoodadStack ds = new DoodadStack(); - int initialSize = ds.getStack().getSize(); + int initialSize = ds.getSize(); for(int i=0; i cardList = new ArrayList(); Random r = new Random(); DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10, @@ -75,19 +73,15 @@ private CardStack randomizeStack() cardList.add(c); } + // Pushes a card at a random index in the card list int initialLength = cardList.size(); for(int i=0; i < initialLength; i++) { - cardStack.push(cardList.remove(r.nextInt(cardList.size()))); + this.push(cardList.remove(r.nextInt(cardList.size()))); } - return cardStack; } - - public CardStack getStack() - { - return _doodadCardStack; - } + diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java new file mode 100644 index 0000000..90a9b1b --- /dev/null +++ b/src/model/MarketCard.java @@ -0,0 +1,10 @@ +package model; + +public class MarketCard extends Card +{ + public MarketCard(String title, int value) { + super(title, value); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index f79d3db..82b22ba 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -3,7 +3,7 @@ * hi im very forgetful so my code is usually full of comments when its not finished sorry * */ -public class Market_Cards extends Card { +public class MarketCardStack extends Card { public Market_Cards(String title, String type, Boolean effect, int value, int value2, int value3, int value4) { super(title, type, effect, value, value2, value3, value4); From 22810c796f8d68d195d605e4043bca9ac5662f72 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 13:59:54 -0500 Subject: [PATCH 32/36] Finished market cards --- bin/controller/Cashflow.class | Bin 1087 -> 1087 bytes src/controller/Cashflow.java | 7 +- src/model/Card.java | 37 +---- src/model/CardStack.java | 30 ++++ src/model/DoodadStack.java | 27 +-- src/model/MarketCard.java | 20 ++- .../{Market_Cards.java => MarketStack.java} | 154 +++++++++--------- 7 files changed, 139 insertions(+), 136 deletions(-) rename src/model/{Market_Cards.java => MarketStack.java} (56%) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 7dce6a220275a33cfda53d3033ce4b8874ef8392..9e775fba0c1597a396c8d40e4861cf48872530f0 100644 GIT binary patch delta 47 zcmdnbv7ckYX*S=)qU_X?jThfC3gs3vG6?(R=BK3Q=tG1zUtp4CWE7hGia8Vjw>1$# delta 47 zcmdnbv7ckYX*QSq{FKC$jThfC3Z)b?G6?(R=BK3Q=tG1zUtp4CWE7tKia8Vjv3?N; diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 0ad2aaa..f45feb3 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -7,14 +7,13 @@ public class Cashflow { public static void main(String[] args) { - DoodadStack ds = new DoodadStack(); + MarketStack ms = new MarketStack(); - int initialSize = ds.getSize(); + int initialSize = ms.getSize(); for(int i=0; i cardList = new ArrayList(); + Random r = new Random(); + + // Add all array contents to list + for(Card c : cardArray) + { + cardList.add(c); + } + + // Pushes a card at a random index in the card list + int initialLength = cardList.size(); + for(int i=0; i < initialLength; i++) + { + push(cardList.remove(r.nextInt(cardList.size()))); + } + + } + } diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java index 59317d2..cd36519 100644 --- a/src/model/DoodadStack.java +++ b/src/model/DoodadStack.java @@ -52,36 +52,17 @@ public class DoodadStack extends CardStack // Constructor just calls makes this stack a randomized stack with Doodad cards public DoodadStack() { - randomizeStack(); - } - - - // Randomizes the stack with the member variable cards - private void randomizeStack() - { - //CardStack cardStack = new CardStack(); - ArrayList cardList = new ArrayList(); - Random r = new Random(); DoodadCard[] cardArray = {D01, D02, D03, D04, D05, D06, D07, D08, D09, D10, D11, D12, D13, D14, D15, D16, D17, D18, D19, D20, D21, D22, D23, D24, D25, D26, D27, D28, D29, D30, D31, D32, D33, D34, D35, D36, D37, D38, D39, D40, D41, D42}; - // Add all array contents to list - for(DoodadCard c : cardArray) - { - cardList.add(c); - } - - // Pushes a card at a random index in the card list - int initialLength = cardList.size(); - for(int i=0; i < initialLength; i++) - { - this.push(cardList.remove(r.nextInt(cardList.size()))); - } - + super.randomizeCards(cardArray); } + + + diff --git a/src/model/MarketCard.java b/src/model/MarketCard.java index 90a9b1b..6e72aaa 100644 --- a/src/model/MarketCard.java +++ b/src/model/MarketCard.java @@ -2,9 +2,25 @@ public class MarketCard extends Card { - public MarketCard(String title, int value) { + private String _type; + private boolean _affectAll; + + public MarketCard(String title, String type, boolean affectAll, int value) + { super(title, value); - // TODO Auto-generated constructor stub + _type = type; + _affectAll = affectAll; } + public String getType() + { + return _type; + } + + public boolean doesAffectAll() + { + return _affectAll; + } + + } diff --git a/src/model/Market_Cards.java b/src/model/MarketStack.java similarity index 56% rename from src/model/Market_Cards.java rename to src/model/MarketStack.java index 82b22ba..aff2d37 100644 --- a/src/model/Market_Cards.java +++ b/src/model/MarketStack.java @@ -3,116 +3,124 @@ * hi im very forgetful so my code is usually full of comments when its not finished sorry * */ -public class MarketCardStack extends Card { - - public Market_Cards(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 - } - - //profit card - value is how much $ is added +public class MarketStack extends CardStack +{ //Not sure how we're working in the descriptions as it's a more graphical concept but for now I'm going to type them out - Card Profit1 = new Card("Small Business Boom!", "profit", true, 250,0,0,0); + private static MarketCard Profit1 = new MarketCard("Small Business Boom!", "profit", true, 250); //The downtown economy has exploded! EVERYONE is affected! ALL businesses with a cash flow of $1000 or less have their cash flow increased by $250 - Card Profit2 = new Card("New Management System", "profit", false, 400,0,0,0); - // A new management system creates new efficiencies and lowers costs. Only the person who drew this card is affected. - //gold card - value is $ per coin - Card Gold1 = new Card("Price of Gold Soars", "gold", true, 2000,0,0,0); + private static MarketCard Profit2 = new MarketCard("New Management System", "profit", false, 400); + // A new management system creates new efficiencies and lowers costs. Only the person who drew this MarketCard is affected. + //gold MarketCard - value is $ per coin + private static MarketCard Gold1 = new MarketCard("Price of Gold Soars", "gold", true, 2000); // The Central Bank is printing money in an attempt to boost the economy causing massive inflation. The price of gold skyrockets. Buyer offers $2000 for each gold coin. Everyone may sell any number of coins at this price. - Card Gold2 = new Card("Collector wants Gold Coins", "gold", true, 1000,0,0,0); + private static MarketCard Gold2 = new MarketCard("Collector wants Gold Coins", "gold", true, 1000); //Wealthy collector is looking for gold coins. Cash offer of $1000 for each coin. Everyone may sell any number of coins at this price. - Card Gold3 = new Card("Price of Gold Soars", "gold", true, 1000,0,0,0); + private static MarketCard Gold3 = new MarketCard("Price of Gold Soars", "gold", true, 1000); //Rioting Overseas. Oil prices threatened. Price of gold skyrockets. Buyer offers $1000 cash for each gold coin. Everyone may sell any number of coins at this price. - Card Gold4 = new Card("Collector wants Gold Coins", "gold", true, 500,0,0,0); + private static MarketCard Gold4 = new MarketCard("Collector wants Gold Coins", "gold", true, 500); //Wealthy collector is looking for gold coins. Cash offer of $500 for each coin. Everyone may sell any number of coins at this price. - //expense card - quite obviously the value is how much this expense costs - Card Expense1 = new Card("Sewer Line Breaks", "expense", false, 1000,0,0,0); - //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense2 = new Card("Sewer Line Breaks", "expense", false, 2000,0,0,0); - //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense3 = new Card("Tenant Damages Your Property", "expense", false, 500,0,0,0); - //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense4 = new Card("Tenant Damages Your Property", "expense", false, 500,0,0,0); - //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - Card Expense5 = new Card("Tenant Damages Your Property", "expense", false, 1000,0,0,0); - //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. Card applies only to the person who drew it. If you own NO real estate, ignore this card. - //stock card - no value necessary - Card Stock1 = new Card("Stock - MYT4U Electronics Co.","stock",true,0,0,0,0); - //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. - Card Stock2 = new Card("Stock - GRO4US Fund","stock",true,0,0,0,0); - //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. - Card Stock3 = new Card("Stock - ON2U Entertainment Co.","stock",true,0,0,0,0); - //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. - Card Stock4 = new Card("Stock - OK4U Drug Co.","stock",true,0,0,0,0); - //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. Cardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. + //expense MarketCard - quite obviously the value is how much this expense costs + private static MarketCard Expense1 = new MarketCard("Sewer Line Breaks", "expense", false, 1000); + //Water is everywhere at your property! Pay $1000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard. + private static MarketCard Expense2 = new MarketCard("Sewer Line Breaks", "expense", false, 2000); + //Water is everywhere at your property! Pay $2000 for a new sewer line (one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard. + private static MarketCard Expense3 = new MarketCard("Tenant Damages Your Property", "expense", false, 500); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard. + private static MarketCard Expense4 = new MarketCard("Tenant Damages Your Property", "expense", false, 500); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $500(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard. + private static MarketCard Expense5 = new MarketCard("Tenant Damages Your Property", "expense", false, 1000); + //Tenant refuses to pay rent. After the tenant has been evicted, you discover significant damage to your property. Insurance covers most repairs, but you still must pay $1000(one time). Take out a bank loan if necessary to cover these expenses. MarketCard applies only to the person who drew it. If you own NO real estate, ignore this MarketCard. + //stock MarketCard - no value necessary + private static MarketCard Stock1 = new MarketCard("Stock - MYT4U Electronics Co.","stock",true,0); + //MYT4U takes a gamble on new home entertainment tech. Will it hit big or be the next Beta-Max? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns MYT4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns MYT4U loses half their shares. + private static MarketCard Stock2 = new MarketCard("Stock - GRO4US Fund","stock",true,0); + //The market is in flux and there will be monumental market swings over the next few months. How will mutual funds fair in this time of change? MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns GRO4US DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns GRO4US loses half their shares. + private static MarketCard Stock3 = new MarketCard("Stock - ON2U Entertainment Co.","stock",true,0); + //Studio backs fresh director for its summer blockbuster. Groundbreaking production could be too ambitious. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns ON2U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns ON2U loses half their shares. + private static MarketCard Stock4 = new MarketCard("Stock - OK4U Drug Co.","stock",true,0); + //OK4U begins trial on possible life-saving drug. Side effects are untested. Could change the world... if it works. MarketCardholder Rolls 1 Die. Die = 1-3, STOCK SPLITS! Everyone who owns OK4U DOUBLES their number of shares. Die 4-6, STOCK REVERSE SPLITS! Everyone who owns OK4U loses half their shares. //repercent - how much percentage selling your property would yield you (aka if it's current cost + 10%, you'd yield 110% of the original cost in the sale minus what you owe - Card REPercent1 = new Card("House Buyer - 3BR/2BA","repercent",true,110,0,0,0); + private static MarketCard REPercent1 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,110); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent2 = new Card("House Buyer - 2BR/1BA","repercent",true,110,0,0,0); + private static MarketCard REPercent2 = new MarketCard("House Buyer - 2BR/1BA","repercent",true,110); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent3 = new Card("House Buyer - 3BR/2BA","repercent",true,120,0,0,0); + private static MarketCard REPercent3 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,120); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent4 = new Card("House Buyer - 2BR/1BA","repercent",true,120,0,0,0); + private static MarketCard REPercent4 = new MarketCard("House Buyer - 2BR/1BA","repercent",true,120); //Buyer looking to aquire 2Br/1Ba rentals. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent5 = new Card("House Buyer - 3BR/2BA","repercent",true,115,0,0,0); + private static MarketCard REPercent5 = new MarketCard("House Buyer - 3BR/2BA","repercent",true,115); //Buyer searching for 3Br/2Ba house. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent6 = new Card("Plex Buyer","repercent",true,110,0,0,0); + private static MarketCard REPercent6 = new MarketCard("Plex Buyer","repercent",true,110); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 10%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent7 = new Card("Plex Buyer","repercent",true,105,0,0,0); + private static MarketCard REPercent7 = new MarketCard("Plex Buyer","repercent",true,105); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 5%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent8 = new Card("Plex Buyer","repercent",true,115,0,0,0); + private static MarketCard REPercent8 = new MarketCard("Plex Buyer","repercent",true,115); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 15%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REPercent9 = new Card("Plex Buyer","repercent",true,120,0,0,0); + private static MarketCard REPercent9 = new MarketCard("Plex Buyer","repercent",true,120); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus 20%. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //refixed - value is the amount of money you get for selling property - Card REFixed1 = new Card("House Buyer - 3BR/2BA","refixed",true,15000,0,0,0); + private static MarketCard REFixed1 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,15000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed2 = new Card("House Buyer - 3BR/2BA","refixed",true,1000,0,0,0); + private static MarketCard REFixed2 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,1000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed3 = new Card("House Buyer - 3BR/2BA","refixed",true,20000,0,0,0); + private static MarketCard REFixed3 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,20000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed4 = new Card("House Buyer - 3BR/2BA","refixed",true,5000,0,0,0); + private static MarketCard REFixed4 = new MarketCard("House Buyer - 3BR/2BA","refixed",true,5000); //Buyer searching for 3Br/2Ba house. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer1 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,45000,0,0,0); - //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REHOffer2 = new Card("House or Condo Buyer - 2BR/1BA","hoffer",true,65000,0,0,0); - //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed5 = new Card("Plex Buyer","refixed",true,1000,0,0,0); + private static MarketCard REFixed5 = new MarketCard("Plex Buyer","refixed",true,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed6 = new Card("Plex Buyer","refixed",true,30000,0,0,0); + private static MarketCard REFixed6 = new MarketCard("Plex Buyer","refixed",true,30000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $30,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed7 = new Card("Plex Buyer","refixed",true,15000,0,0,0); + private static MarketCard REFixed7 = new MarketCard("Plex Buyer","refixed",true,15000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $15,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed8 = new Card("Plex Buyer","refixed",true,5000,0,0,0); + private static MarketCard REFixed8 = new MarketCard("Plex Buyer","refixed",true,5000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $5,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed9 = new Card("Plex Buyer","refixed",true,1000,0,0,0); + private static MarketCard REFixed9 = new MarketCard("Plex Buyer","refixed",true,1000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $1,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed10 = new Card("Plex Buyer","refixed",true,20000,0,0,0); + private static MarketCard REFixed10 = new MarketCard("Plex Buyer","refixed",true,20000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $20,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REFixed11 = new Card("Plex Buyer","refixed",true,10000,0,0,0); + private static MarketCard REFixed11 = new MarketCard("Plex Buyer","refixed",true,10000); //Buyer looking for all Apartment and Plexes in any combination of units. Offers your original cost plus $10,000. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. //aoffer - value is amount of money you get for selling each unit - Card REAOffer1 = new Card("Apartment House Buyer","aoffer",true,25000,0,0,0); + private static MarketCard REHOffer1 = new MarketCard("House or Condo Buyer - 2BR/1BA","hoffer",true,45000); + //You are offered $45,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + private static MarketCard REHOffer2 = new MarketCard("House or Condo Buyer - 2BR/1BA","hoffer",true,65000); + //You are offered $65,000 for a 2Br/1Ba House or Condo. Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + private static MarketCard REAOffer1 = new MarketCard("Apartment House Buyer","aoffer",true,25000); //Buyer offers $25,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer2 = new Card("Apartment House Buyer","aoffer",true,45000,0,0,0); + private static MarketCard REAOffer2 = new MarketCard("Apartment House Buyer","aoffer",true,45000); //Buyer offers $45,000 per unit for all units in apartment houses of any size. (His 1031 tax-deferred exchange time is running out.) Buyer has their own financing. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer3 = new Card("Apartment House Buyer","aoffer",true,30000,0,0,0); + private static MarketCard REAOffer3 = new MarketCard("Apartment House Buyer","aoffer",true,30000); //REIT offers $30,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. - Card REAOffer4 = new Card("Apartment House Buyer","aoffer",true,40000,0,0,0); + private static MarketCard REAOffer4 = new MarketCard("Apartment House Buyer","aoffer",true,40000); //REIT offers $40,000 per unit for all units in apartment houses of 12 units or more. Buyer has capital from the sale of another apartment complex. Everyone may sell any number of properties at this price. If you sell, pay off the related mortgage and give up the cash flow on this property. + public MarketStack() + { + MarketCard[] MarketCardArray = {Profit1, Profit2, + Gold1, Gold2, Gold3, Gold4, + Expense1, Expense2, Expense3, Expense4, Expense5, + Stock1, Stock2, Stock3, Stock4, + REPercent1, REPercent2, REPercent3, REPercent4, REPercent5, REPercent6, REPercent7, REPercent8, REPercent9, + REFixed1, REFixed2, REFixed3, REFixed4, REFixed5, REFixed6, REFixed7, REFixed8, REFixed9, REFixed10, REFixed11, + REHOffer1, REHOffer2, + REAOffer1, REAOffer2, REAOffer3, REAOffer4}; + super.randomizeCards(MarketCardArray); + } + + //profit MarketCard - value is how much $ is added + /* - * Write a method below that evaluates what the card type is + who it effects and performs operations based on that and yeah stuff + * Write a method below that evaluates what the MarketCard type is + who it effects and performs operations based on that and yeah stuff * Then put them all into a stack so they can be used in game! - * ldasjkfdasjf;lads */ - public static void main(String[] args) { - /* Need a decision function - *Need separate functionalities (if statements) based on card type - * Need a way that every player who is affected gets the decision option - * Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have - */ - } + + /* Need a decision function + *Need separate functionalities (if statements) based on MarketCard type + * Need a way that every player who is affected gets the decision option + * Do we check if they have the proper real estate needed? Or do we assume the player knows and obviously make it so they can't sell something they don't have + */ + } From 7be7b0dae982c234c676e9e8a45f81fd85a8fa00 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 14:47:02 -0500 Subject: [PATCH 33/36] 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) Date: Fri, 3 Mar 2017 15:20:58 -0500 Subject: [PATCH 34/36] Fixed market cards. Added the descriptions to the arguments of the cards so they can be accessed later. --- bin/controller/Cashflow.class | Bin 1090 -> 1102 bytes src/controller/Cashflow.java | 6 +- src/model/Card.java | 1 - src/model/MarketCard.java | 11 +- src/model/MarketStack.java | 211 +++++++++++++++++++++------------- 5 files changed, 141 insertions(+), 88 deletions(-) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 710eb773f9d4d776ebd511af87a81f277d7f73c5..0c0513698444633e9aaeec129fd05ccdc6cb92cc 100644 GIT binary patch delta 270 zcmX@aagJlc5njRE{FKxjec!~Q?9`Htm;4z`*%^!(83d4pofC^vxEPEWOnDg07|awq>?k&R`_Vl3>QNi9vifgKVTI%MJ$l?F_0y8rvAOfJ*cZFc@uP zFadJ5F<5M4ux?>yl$BZd|NP`5%u3dF47?0(3_=XtKyytXrZYG&I0AVb4E79849*OU oKowRDE)1>=Obq-C=0Mf149pDT4C<2=S;V;YfbyO|)l3Xt0QF=&v;Y7A delta 243 zcmX@dafoBW5k8^Z{FKxjeW%QHm(;|ZjTikHRk;|98BEz3Oc)usAd=3BMJYTCW(?+x z3>@jHB_Ww5IjNHanJPq?lTwNq8ANw6`$` z+cMiNXV9NKhgnu+8-vj{2CZ!j7TXxCTbLPTWfuOwH2DIvQj9eNFM~6K5Cb<*vkAlq z1_uU5AdiE=hQSFa#|Ttm&fvn}%D}|H4^-m@WHB>{GpI1Q16eE#9zeC+3{3wRgxDDb P7#X#J8a#nQOblKC>$Ec4 diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 3ac0df3..6ee73c9 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -7,13 +7,13 @@ public class Cashflow { public static void main(String[] args) { - BigDealStack bds = new BigDealStack(); + MarketStack ms = new MarketStack(); - int initialSize = bds.getSize(); + int initialSize = ms.getSize(); for(int i=0; i Date: Fri, 3 Mar 2017 15:40:07 -0500 Subject: [PATCH 35/36] New stuff --- src/model/MarketStack.java | 2 +- src/model/SmallDealStack.java | 141 ++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 src/model/SmallDealStack.java diff --git a/src/model/MarketStack.java b/src/model/MarketStack.java index 50e7338..aad4cfb 100644 --- a/src/model/MarketStack.java +++ b/src/model/MarketStack.java @@ -152,7 +152,7 @@ public MarketStack() REFixed1, REFixed2, REFixed3, REFixed4, REFixed5, REFixed6, REFixed7, REFixed8, REFixed9, REFixed10, REFixed11, REHOffer1, REHOffer2, REAOffer1, REAOffer2, REAOffer3, REAOffer4}; - super.randomizeCards(marketCardArray); + randomizeCards(marketCardArray); } //profit MarketCard - value is how much $ is added diff --git a/src/model/SmallDealStack.java b/src/model/SmallDealStack.java new file mode 100644 index 0000000..00a8cd6 --- /dev/null +++ b/src/model/SmallDealStack.java @@ -0,0 +1,141 @@ +package model; + +public class SmallDealStack extends CardStack +{ + private static DealCard SD01 = new DealCard("", + "", + , , , ); + private static DealCard SD02 = new DealCard("", + "", + , , , ); + private static DealCard SD03 = new DealCard("", + "", + , , , ); + private static DealCard SD04 = new DealCard("", + "", + , , , ); + private static DealCard SD05 = new DealCard("", + "", + , , , ); + private static DealCard SD06 = new DealCard("", + "", + , , , ); + private static DealCard SD07 = new DealCard("", + "", + , , , ); + private static DealCard SD08 = new DealCard("", + "", + , , , ); + private static DealCard SD09 = new DealCard("", + "", + , , , ); + private static DealCard SD10 = new DealCard("", + "", + , , , ); + private static DealCard SD11 = new DealCard("", + "", + , , , ); + private static DealCard SD12 = new DealCard("", + "", + , , , ); + private static DealCard SD13 = new DealCard("", + "", + , , , ); + private static DealCard SD14 = new DealCard("", + "", + , , , ); + private static DealCard SD15 = new DealCard("", + "", + , , , ); + private static DealCard SD16 = new DealCard("", + "", + , , , ); + private static DealCard SD17 = new DealCard("", + "", + , , , ); + private static DealCard SD18 = new DealCard("", + "", + , , , ); + private static DealCard SD19 = new DealCard("", + "", + , , , ); + private static DealCard SD20 = new DealCard("", + "", + , , , ); + private static DealCard SD21 = new DealCard("", + "", + , , , ); + private static DealCard SD22 = new DealCard("", + "", + , , , ); + private static DealCard SD23 = new DealCard("", + "", + , , , ); + private static DealCard SD24 = new DealCard("", + "", + , , , ); + private static DealCard SD25 = new DealCard("", + "", + , , , ); + private static DealCard SD26 = new DealCard("", + "", + , , , ); + private static DealCard SD27 = new DealCard("", + "", + , , , ); + private static DealCard SD28 = new DealCard("", + "", + , , , ); + private static DealCard SD29 = new DealCard("", + "", + , , , ); + private static DealCard SD30 = new DealCard("", + "", + , , , ); + private static DealCard SD31 = new DealCard("", + "", + , , , ); + private static DealCard SD32 = new DealCard("", + "", + , , , ); + private static DealCard SD33 = new DealCard("", + "", + , , ); + private static DealCard SD34 = new DealCard("", + "", + , , , ); + private static DealCard SD35 = new DealCard("", + "", + , , , ); + private static DealCard SD36 = new DealCard("", + "", + , , , ); + private static DealCard SD37 = new DealCard("", + "", + , , , ); + private static DealCard SD38 = new DealCard("", + "", + , , , ); + + public SmallDealStack() + { + DealCard[] sdArray = {SD01, SD02, SD03, SD04, SD05, SD06, SD07, SD08, SD09, SD10, + SD11, SD12, SD13, SD14, SD15, SD16, SD17, SD18, SD19, SD20, + SD21, SD22, SD23, SD24, SD25, SD26, SD27, SD28, SD29, SD30, + SD31, SD32, SD33, SD34, SD35, SD36, SD37, SD38}; + super.randomizeCards(sdArray); + } + } + +} + + + + + + + + + + + From aa7fb944ceffb86333d9101619b6790d8d82a870 Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 3 Mar 2017 17:42:22 -0500 Subject: [PATCH 36/36] Okay so I made a lot of commits today so heres a small summary: -Changed the card classes a little. -Added some card stack classes with randomize functionality. -Added some empty classes like Player, Financial Statement, GameBoard and Tile. -Added some empty methods in the Cashflow class with some mediocre pseudocode. --- bin/controller/Cashflow.class | Bin 1102 -> 1340 bytes src/controller/Cashflow.java | 35 ++++++++++++++++++++++++++++++- src/model/DealCard.java | 2 -- src/model/FinacialStatement.java | 6 ++++++ src/model/GameBoard.java | 8 +++++++ src/model/Player.java | 7 +++++++ src/model/Tile.java | 6 ++++++ 7 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/model/FinacialStatement.java create mode 100644 src/model/GameBoard.java create mode 100644 src/model/Player.java create mode 100644 src/model/Tile.java diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 0c0513698444633e9aaeec129fd05ccdc6cb92cc..bf36558152ab881448e4d626a6a50d6de2641929 100644 GIT binary patch literal 1340 zcmah}TTc@~7(LT2-BK2Taur2UR9bHJf`C*&0YS7}w1$N6fJ0fz!nWHiTMRz?M||>G zABvI07$1G{AE9TqRkE9( zjSfwqep~Lzge~*g#Nzt4nehZdYwM15Hv}3|IcLMP6SFdBPAXGUAiP$v<-Y0e3e>Gu z{7b%t&d^$hQFKNBxTbhcdor`5ybrCs<&6sjWASAHZHmPs2%^qF4Gh*xS$T7zm|Hj9 zS90ApStjLVq`fR%OPwo5&D*jF(VRMGB%)|JY2^i4VymftqoqC9%4d`DWgV@Yt31}c zbazb8?=FHC)TvLqflIh7pl9i^-m(WaJ6DY>=+trb1YPOQ7Af6_M}}j7dKfxHWxoTR0Lh< zQxx{Ah_n9qau^ALz-Xt6ykp=l?(s5Yp1TMtl z6&a|z=CBVq%5j2~If4-+4Lrmc6G-i}xtnpVf@e9rswP%A%?^ROFk#@4$_RT-`2r)D z#I%kn>e){?Nwk3{iUYl%xVKqYlWvwuX*@>>)*+C369SR6Q*<-tjHR?&`{$Vrs8*>GR^WpSB7iD{xC=l>*k7v= z;i@r$?||Q0o)TOI*Q%ZaT=?jR)$<$jjUhB}uRps|qY2HlsO0Y~R>gJp5G^YQ zXiN2$aB(a+{sDJ8wAVx0Cv+U5Yo%HHjGG7OjSiG>n<0bWFjB%O4<(G3@c3O&bX!*SbLcw2Q&mdfwV6}vcqLsfkjB`JOcE7E`GBnS#j16M~Pci2=Hi~C>&bjL_j1+f4 z=5}MAI}HnrtwG=jQ5`Kp3@~BwFB!dbs#(QpBKnRI!M_Wi2!W;lC*CB!=%kw&UtCAX2vMloach)YUAmPB7Jb{dAGA_QRb4(G*$1dR-ACS zVlzWkVRp9~19FS2)D336KiZf+N6!1JJ@vYJb{jNQa1lX64pkDX#10kvm^wNq6mi=kxVfBosdw$;x4h3KJn#ApTo0y{XJzT^l&=#k>oDUN+R@$<9$xY z^ZqtP>6!XQ*{9-D^ttR)d!;KU_3q#AKwlr|rw9BN=0G({Tr`vNOLf`dmPEl`m3?il yaa|&lIc_j7n?>aoH(8LEj8K*C1>sDRV^O?Rh}+UUjJ8MIAg0umOe{%C