Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Made changes in Professions class
  • Loading branch information
Joe authored and Joe committed Mar 2, 2017
1 parent a4ac7c8 commit 31cb8c8
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 20 deletions.
6 changes: 6 additions & 0 deletions .project
Expand Up @@ -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>
Binary file modified bin/model/Profession.class
Binary file not shown.
2 changes: 2 additions & 0 deletions 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
Expand Down
2 changes: 2 additions & 0 deletions 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
*
Expand Down
2 changes: 2 additions & 0 deletions src/model/Profession.java
@@ -1,3 +1,5 @@
package model;


public class Profession
{
Expand Down
41 changes: 21 additions & 20 deletions 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];
}


Expand Down

0 comments on commit 31cb8c8

Please sign in to comment.