From 31cb8c836bd27d51a6d3edd54c6484927ce2f0e7 Mon Sep 17 00:00:00 2001
From: Joe <Joe@localhost>
Date: Thu, 2 Mar 2017 12:29:22 -0500
Subject: [PATCH] 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 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
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)oHF<NY;+rwj2Cr!P>Mi
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_kO9EL<O9DcZBaqW{Ss<_Jsz5>0HG!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(<?Pc&&#{ZP9@<w<shl=@mR&nTyURuI
zpESH2t_&?NhX*Zn0~vNy2ey}U2O06z$)RC7yb86HPKK=sxzsQfeIc1@_f=5$AGV|=
z3ZwsqtMch%mL4ACUq}%#X>L+XT3baLTSeMhMVeYgT3SUKT1DDfMVeW~Vn5Qzs!bcK
zNE53_3#&*2t4RAYPB4?R_<+A30@h3BF~MHXd5e#n<q*@(REQa8I>fAF$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#
zxVVhFT<MKI0q)^5ws;nN&KtHA-RGHOiYg>o0S_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-{DV<kj*6cf#m|l6m8jS=ihneUuSdmA
rqqt@iuSUgfqxdJIcr7aa)hKq2;+s+Nu~F<9#p_Y=??!Q5y}ic&jfapU

delta 230
zcmZ1~(#*_t>ff$?3=9k=4B`{H^w>BGit^L^CR$7Ru@xugBo<XNGBA2FGH|3;6r|=A
zrxr6ZuoowmW#**=S=>39iAk9`nI)MZaW<RGyv!0iMh0dL%`ip=7U%qwR4xW)1_2%h
z9tPgYTuiQ$Ran%DSQ!`@SQ*%WHUf=e-~iK{P?`%$b3<uHkWQdFKA<XnAk7G*S+%w^
j@NWb%m>2|sBpX<enL!B1=7A_+5M~eo@)#LJ!K%anP-h^T

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];
 	}