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 af4b4ba..8fdeb61 100644 Binary files a/bin/model/Profession.class and b/bin/model/Profession.class differ diff --git a/src/model/Card.java b/src/model/Card.java index 84bdcdb..29b9cea 100644 --- a/src/model/Card.java +++ b/src/model/Card.java @@ -1,3 +1,5 @@ +package model; + /* * this is a very broad object class * i know we said all the card stacks would be in here but like diff --git a/src/model/Market_Cards.java b/src/model/Market_Cards.java index 35ff5ba..1d6b890 100644 --- a/src/model/Market_Cards.java +++ b/src/model/Market_Cards.java @@ -1,3 +1,5 @@ +package model; + /* * hi im very forgetful so my code is usually full of comments when its not finished sorry * diff --git a/src/model/Profession.java b/src/model/Profession.java index e111d62..5e43780 100644 --- a/src/model/Profession.java +++ b/src/model/Profession.java @@ -1,3 +1,5 @@ +package model; + public class Profession { diff --git a/src/model/Professions.java b/src/model/Professions.java index c94ff63..6c9587c 100644 --- a/src/model/Professions.java +++ b/src/model/Professions.java @@ -1,56 +1,57 @@ +package model; + +import java.util.*; public class Professions { - Profession Nurse = new Profession(Nurse, 3100, 600, 400, 100, 100, 200, 600, 0, 0, 200, - 500, 47000, 6000, 5000, 4000); + 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, 200, - 400, 50000, 12000, 5000, 4000); + Profession Teacher = new Profession("Teacher", 3300, 500, 500, 100, 100, 200, 700, 0, 0, + 200, 400, 50000, 12000, 5000, 4000); - Profession TruckDriver = new Profession(TruckDriver, 2500, 500, 400, 0, 100, 100, 600, + Profession TruckDriver = new Profession("TruckDriver", 2500, 500, 400, 0, 100, 100, 600, 0, 0, 200, 800, 38000, 0, 4000, 3000); - Profession Secretary = new Profession(Secretary, 2500, 500, 400, 0, 100, 100, 600, 0, 0, + Profession Secretary = new Profession("Secretary", 2500, 500, 400, 0, 100, 100, 600, 0, 0, 100, 700, 38000, 0, 4000, 3000); - Profession Engineer = new Profession(Engineer, 4900, 1000, 700, 100, 200, 200, 1000, 0, 0, + Profession Engineer = new Profession("Engineer", 4900, 1000, 700, 100, 200, 200, 1000, 0, 0, 200, 400, 75000, 12000, 7000, 5000); - Profession BusinessManager = new Profession(BusinessManager, 4600, 900, 700, 100, 100, 200, + Profession BusinessManager = new Profession("BusinessManager", 4600, 900, 700, 100, 100, 200, 1000, 0, 0, 300, 400, 75000, 12000, 6000, 4000); - Profession AirlinePilot = new Profession(AirlinePilot, 9500, 2000, 1000, 0, 300, 700, 2000, + Profession AirlinePilot = new Profession("AirlinePilot", 9500, 2000, 1000, 0, 300, 700, 2000, 0, 0, 400, 2500, 90000, 0, 15000, 22000); - Profession Lawyer = new Profession(Lawyer, 7500, 1800, 1100, 300, 200, 200, 1500, 0, 0, 400, + Profession Lawyer = new Profession("Lawyer", 7500, 1800, 1100, 300, 200, 200, 1500, 0, 0, 400, 2000, 115000, 78000, 11000, 7000); - Profession PoliceOfficer = new Profession(PoliceOfficer, 3000, 600, 400, 0, 100, 100, 700, 0, 0, + Profession PoliceOfficer = new Profession("PoliceOfficer", 3000, 600, 400, 0, 100, 100, 700, 0, 0, 200, 500, 46000, 0, 5000, 3000); - Profession Doctor = new Profession(Doctor, 13200, 3200, 1900, 700, 300, 200, 2000, 0, 0, 700, + Profession Doctor = new Profession("Doctor", 13200, 3200, 1900, 700, 300, 200, 2000, 0, 0, 700, 3500, 202000, 150000, 19000, 10000); - Profession Mechanic = new Mechanic(Mechanic, 2000, 400, 300, 0, 100, 100, 400, 0, 0, 100, + Profession Mechanic = new Profession("Mechanic", 2000, 400, 300, 0, 100, 100, 400, 0, 0, 100, 700, 31000, 0, 3000, 3000); - Profession Janitor = new Profession(Janitor, 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100, + Profession Janitor = new Profession("Janitor", 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100, 600, 20000, 0, 4000, 3000); - Profession[] profs = [Nurse, Teacher, TruckDriver, Secretary, Engineer, BusinessManager, - AirlinePilot, Lawyer, PoliceOfficer, Doctor, Mechanic, Janitor]; + Profession[] profs = {Nurse, Teacher, TruckDriver, Secretary, Engineer, BusinessManager, + AirlinePilot, Lawyer, PoliceOfficer, Doctor, Mechanic, Janitor}; public Profession playerProf; public Profession getProfession() { - int rand = new Random(11); - playerProf = Profession[rand]; - return playerProf; - + Random rand = new Random(); + int n = rand.nextInt(11); + return profs[n]; }