From 0ac124e252cd0664309e3b5e59e5174cdd2871e3 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 13:34:32 -0500 Subject: [PATCH 1/8] yo --- src/Main/{die.java => Die.java} | 0 src/Main/Main.java | 1 - 2 files changed, 1 deletion(-) rename src/Main/{die.java => Die.java} (100%) diff --git a/src/Main/die.java b/src/Main/Die.java similarity index 100% rename from src/Main/die.java rename to src/Main/Die.java diff --git a/src/Main/Main.java b/src/Main/Main.java index cbe24b9..6b487e9 100644 --- a/src/Main/Main.java +++ b/src/Main/Main.java @@ -1,4 +1,3 @@ -package Main; /** * Just made this stuff to make sure Eclipse and GitHub are working correctly!!!! From 2dcfc826f2f8cf53789efe3dbe336275047bece7 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 13:38:10 -0500 Subject: [PATCH 2/8] hello --- src/controller/Cashflow.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/controller/Cashflow.java diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java new file mode 100644 index 0000000..bb9db74 --- /dev/null +++ b/src/controller/Cashflow.java @@ -0,0 +1,5 @@ +package controller; + +public class Cashflow { + +} From aadf5567f5351d59d2e6757bbcab27eb6e15cd96 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 13:41:12 -0500 Subject: [PATCH 3/8] Joe is LIT --- src/model/GameBoard.java | 5 +++++ src/view/Window.java | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/model/GameBoard.java create mode 100644 src/view/Window.java diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java new file mode 100644 index 0000000..03f5321 --- /dev/null +++ b/src/model/GameBoard.java @@ -0,0 +1,5 @@ +package model; + +public class GameBoard { + +} diff --git a/src/view/Window.java b/src/view/Window.java new file mode 100644 index 0000000..63bd1e3 --- /dev/null +++ b/src/view/Window.java @@ -0,0 +1,5 @@ +package view; + +public class Window { + +} From 0fa347bdce672e0b1525e8211b839a30a1bd001c Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 13:58:59 -0500 Subject: [PATCH 4/8] yo --- src/Main/{ => model}/Die.java | 0 src/model/GameBoard.java | 5 ----- 2 files changed, 5 deletions(-) rename src/Main/{ => model}/Die.java (100%) delete mode 100644 src/model/GameBoard.java diff --git a/src/Main/Die.java b/src/Main/model/Die.java similarity index 100% rename from src/Main/Die.java rename to src/Main/model/Die.java diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java deleted file mode 100644 index 03f5321..0000000 --- a/src/model/GameBoard.java +++ /dev/null @@ -1,5 +0,0 @@ -package model; - -public class GameBoard { - -} From ca2d8da605850ad5eeaca48e297e6c487ef78671 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 14:03:34 -0500 Subject: [PATCH 5/8] Made it right --- bin/controller/Cashflow.class | Bin 0 -> 271 bytes bin/model/Profession.class | Bin 0 -> 267 bytes bin/view/Window.class | Bin 0 -> 253 bytes src/Main/Main.java | 25 ------------------------- src/Main/Profession.java | 19 ------------------- 5 files changed, 44 deletions(-) create mode 100644 bin/controller/Cashflow.class create mode 100644 bin/model/Profession.class create mode 100644 bin/view/Window.class delete mode 100644 src/Main/Main.java delete mode 100644 src/Main/Profession.java diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class new file mode 100644 index 0000000000000000000000000000000000000000..80f4f93fffdac57d8939bcb22ecd16f50059f5bd GIT binary patch literal 271 zcmZuryKcfj5S%qOPRvt8d_X#&zzrRU1}T*l3K0F-T*9HlCmja9iwcQ?58$H^dk8w3 znVnhf&RlQj3xENdAw0rYX7a)st)-18V!Qg&<`BXsG}mG;VlDFjc$%(dRuIY~m8)V* zD0R9Efx)dXu*NmzBiA2lyy)u1F*{GiT;x zGV^@h9{>gjTv&wQq_;8&mzmzlJXbn(VY7P_7ZD~R-G__lDC2@q9;s9nV?wFZ-4N^v z=RA~9t;0c?;LlVl=jT%-v$cp4NodV<*x5M0EMQAcw@ZVc;HrD_E literal 0 HcmV?d00001 diff --git a/bin/view/Window.class b/bin/view/Window.class new file mode 100644 index 0000000000000000000000000000000000000000..c68be936dff58fb320e6e1a871331e9afe1c4f25 GIT binary patch literal 253 zcmYjL%MQU%6r5A7(t0%hzzz%D*by6vRl|bR`nGPkQf*SD-(@AS@BuzboQs9c%$Yfv z%sgNB2Y?Yg8wSC>C|UX&m2R`rhDq=a;v)P+q&t5Z9b{Y(suPu}VoIp=`XRxbWn1Z> zf_eiMs)Tl+Qn@%EBbl#7lt@A+$YPO%B3D}fOtaXl6QLRWRgMYHDm&+~oGTr4ze|RC s1iIi#-U?>YRg5+(|DyqGa6|3Nh5?6Bzrg{QvGKVr<|Zpbi_t*)4N*HW4FCWD literal 0 HcmV?d00001 diff --git a/src/Main/Main.java b/src/Main/Main.java deleted file mode 100644 index 6b487e9..0000000 --- a/src/Main/Main.java +++ /dev/null @@ -1,25 +0,0 @@ - -/** - * Just made this stuff to make sure Eclipse and GitHub are working correctly!!!! - */ -/** - * EUREKA!!!! IT WORKS!!! - */ - -public class Main -{ - /** - * Main Method - * @param args - */ - public static void main(String[] args) - { - System.out.print("Hello"); - String s = " World!"; - } - - /** - * Joe is good to go!!! - */ - -} \ No newline at end of file diff --git a/src/Main/Profession.java b/src/Main/Profession.java deleted file mode 100644 index 37eefca..0000000 --- a/src/Main/Profession.java +++ /dev/null @@ -1,19 +0,0 @@ - -public class Profession -{ - - public String profName; - public int salary; - public int expenses; - public int savings; - public int liabilities; - - - - - - - - - -} From 540ded3bdc86cf92f9937af8636f9384fefc8e54 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 14:05:49 -0500 Subject: [PATCH 6/8] Hi --- src/Main/model/Die.java | 23 ----------------------- src/model/Profession.java | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 src/Main/model/Die.java create mode 100644 src/model/Profession.java diff --git a/src/Main/model/Die.java b/src/Main/model/Die.java deleted file mode 100644 index dc4eb3f..0000000 --- a/src/Main/model/Die.java +++ /dev/null @@ -1,23 +0,0 @@ -import java.util.Random; - - -public class Die { -/* - * Die will probably have to go in each individual turn, so that it can pull charity status - * from the player currently playing - */ - public int rollDice(Boolean c) { - Random rand = new Random(); - if (c) { - int face = 1+rand.nextInt(12); - return face; - /* There needs to be something that takes charity - 1 from the player after rolling - * Or maybe just a simple "if charity > 0 then charity - 1 after every turn - */ - } - else { - int face = 1+rand.nextInt(6); - return face; - } - } -} diff --git a/src/model/Profession.java b/src/model/Profession.java new file mode 100644 index 0000000..9a9219b --- /dev/null +++ b/src/model/Profession.java @@ -0,0 +1,20 @@ +package model; + +public class Profession +{ + + public String profName; + public int salary; + public int expenses; + public int savings; + public int liabilities; + + + + + + + + + +} From 0d826c2cb8687ba258caddbfbff8ce737fb3fcc9 Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 28 Feb 2017 14:06:00 -0500 Subject: [PATCH 7/8] yo --- bin/model/Profession.class | Bin 267 -> 387 bytes src/model/Die.java | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/model/Die.java diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 763e6e02e41e7263eff8ff4969181f4a5875d8b1..af4b4ba0e3273ebd7f1ae7ce3a8fc6f5c736f104 100644 GIT binary patch delta 264 zcmXYrzfQtX6vn?pZKwubmCE*OdNaw z9*TGbEb_h^`Q?Y+UoL-;0=aPgp>Qli;Cc(8zV-W(3xth z()W3$+#_dZn?E}r1RsI?Bxey;JgphkY}KU074go*N`xfzM?dI%OK9L+W>A$LdXnR# NfD2s8M!2f1>wo{}EUN$j delta 127 zcmZo>?q=dT^>5cc1_lNb27!rOdU9+wnR%Hdc8m(k*?}7M!F&b=R;}#}92 0 then charity - 1 after every turn + */ + } + else { + int face = 1+rand.nextInt(6); + return face; + } + } +} From d2e986c76fa0ea9deadfc16c7ce4cba36e0780c9 Mon Sep 17 00:00:00 2001 From: Annamarie M Fortuna Date: Tue, 28 Feb 2017 14:30:39 -0500 Subject: [PATCH 8/8] Create Professions.java --- src/model/Professions.java | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/model/Professions.java diff --git a/src/model/Professions.java b/src/model/Professions.java new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/model/Professions.java @@ -0,0 +1 @@ +