diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 3963c5c..7665aef 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ 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();