Version 2 update

michael-bateman · Apr 15, 2018 · 4bbacfd · 4bbacfd
1 parent 0fd291a
commit 4bbacfd
Show file tree

Hide file tree

Showing 147 changed files with 2,972 additions and 2 deletions.
diff --git a/Assignment_MB/bin/Assignment.class b/Assignment_MB/bin/Assignment.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$1.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$1.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$10.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$10.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$11.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$11.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$2.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$2.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$3.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$3.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$4.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$4.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$5.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$5.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$6.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$6.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$7.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$7.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$8.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$8.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap$9.class b/Assignment_MB/bin/Game2_MB2ZZZEncap$9.class
diff --git a/Assignment_MB/bin/Game2_MB2ZZZEncap.class b/Assignment_MB/bin/Game2_MB2ZZZEncap.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB$1.class b/Assignment_MB/bin/Scratch/Game2_MB$1.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB$2.class b/Assignment_MB/bin/Scratch/Game2_MB$2.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB.class b/Assignment_MB/bin/Scratch/Game2_MB.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB2$1.class b/Assignment_MB/bin/Scratch/Game2_MB2$1.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB2.class b/Assignment_MB/bin/Scratch/Game2_MB2.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB2ZZZ.class b/Assignment_MB/bin/Scratch/Game2_MB2ZZZ.class
diff --git a/Assignment_MB/bin/Scratch/Game2_MB2ZZZ_WORKING.class b/Assignment_MB/bin/Scratch/Game2_MB2ZZZ_WORKING.class
diff --git a/Assignment_MB/images/1-Hydrogen-Tile.png b/Assignment_MB/images/1-Hydrogen-Tile.png
diff --git a/Assignment_MB/images/10-Neon-Tile.png b/Assignment_MB/images/10-Neon-Tile.png
diff --git a/Assignment_MB/images/100-Fermium-Tile.png b/Assignment_MB/images/100-Fermium-Tile.png
diff --git a/Assignment_MB/images/101-Mendelevium-Tile.png b/Assignment_MB/images/101-Mendelevium-Tile.png
diff --git a/Assignment_MB/images/102-Nobelium-Tile.png b/Assignment_MB/images/102-Nobelium-Tile.png
diff --git a/Assignment_MB/images/103-Lawrencium-Tile.png b/Assignment_MB/images/103-Lawrencium-Tile.png
diff --git a/Assignment_MB/images/104-Rutherfordium-Tile.png b/Assignment_MB/images/104-Rutherfordium-Tile.png
diff --git a/Assignment_MB/images/105-Dubnium-Tile.png b/Assignment_MB/images/105-Dubnium-Tile.png
diff --git a/Assignment_MB/images/106-Seaborgium-Tile.png b/Assignment_MB/images/106-Seaborgium-Tile.png
diff --git a/Assignment_MB/images/107-Bohrium-Tile.png b/Assignment_MB/images/107-Bohrium-Tile.png
diff --git a/Assignment_MB/images/108-Hassium-Tile.png b/Assignment_MB/images/108-Hassium-Tile.png
diff --git a/Assignment_MB/images/109-Meitnerium-Tile.png b/Assignment_MB/images/109-Meitnerium-Tile.png
diff --git a/Assignment_MB/images/11-Sodium-Tile.png b/Assignment_MB/images/11-Sodium-Tile.png
diff --git a/Assignment_MB/images/110-Darmstadtium-Tile.png b/Assignment_MB/images/110-Darmstadtium-Tile.png
diff --git a/Assignment_MB/images/111-Roentgenium-Tile.png b/Assignment_MB/images/111-Roentgenium-Tile.png
diff --git a/Assignment_MB/images/112-Copernicium-Tile.png b/Assignment_MB/images/112-Copernicium-Tile.png
diff --git a/Assignment_MB/images/113-Ununtrium-Tile.png b/Assignment_MB/images/113-Ununtrium-Tile.png
diff --git a/Assignment_MB/images/114-Flerovium-Tile.png b/Assignment_MB/images/114-Flerovium-Tile.png
diff --git a/Assignment_MB/images/115-Ununpentium-Tile.png b/Assignment_MB/images/115-Ununpentium-Tile.png
diff --git a/Assignment_MB/images/116-Livermorium-Tile.png b/Assignment_MB/images/116-Livermorium-Tile.png
diff --git a/Assignment_MB/images/117-Ununseptium-Tile.png b/Assignment_MB/images/117-Ununseptium-Tile.png
diff --git a/Assignment_MB/images/118-Ununoctium-Tile.png b/Assignment_MB/images/118-Ununoctium-Tile.png
diff --git a/Assignment_MB/images/12-Magnesium-Tile.png b/Assignment_MB/images/12-Magnesium-Tile.png
diff --git a/Assignment_MB/images/13-Aluminum-Tile.png b/Assignment_MB/images/13-Aluminum-Tile.png
diff --git a/Assignment_MB/images/14-Silicon-Tile.png b/Assignment_MB/images/14-Silicon-Tile.png
diff --git a/Assignment_MB/images/15-Phosphorus-Tile.png b/Assignment_MB/images/15-Phosphorus-Tile.png
diff --git a/Assignment_MB/images/16-Sulfur-Tile.png b/Assignment_MB/images/16-Sulfur-Tile.png
diff --git a/Assignment_MB/images/17-Chlorine-Tile.png b/Assignment_MB/images/17-Chlorine-Tile.png
diff --git a/Assignment_MB/images/18-Argon-Tile.png b/Assignment_MB/images/18-Argon-Tile.png
diff --git a/Assignment_MB/images/19-Potassium-Tile.png b/Assignment_MB/images/19-Potassium-Tile.png
diff --git a/Assignment_MB/images/2-Helium-Tile.png b/Assignment_MB/images/2-Helium-Tile.png
diff --git a/Assignment_MB/images/20-Calcium-Tile.png b/Assignment_MB/images/20-Calcium-Tile.png
diff --git a/Assignment_MB/images/21-Scandium-Tile.png b/Assignment_MB/images/21-Scandium-Tile.png
diff --git a/Assignment_MB/images/22-Titanium-Tile.png b/Assignment_MB/images/22-Titanium-Tile.png
diff --git a/Assignment_MB/images/23-Vanadium-Tile.png b/Assignment_MB/images/23-Vanadium-Tile.png
diff --git a/Assignment_MB/images/24-Chromium-Tile.png b/Assignment_MB/images/24-Chromium-Tile.png
diff --git a/Assignment_MB/images/25-Manganese-Tile.png b/Assignment_MB/images/25-Manganese-Tile.png
diff --git a/Assignment_MB/images/26-Iron-Tile.png b/Assignment_MB/images/26-Iron-Tile.png
diff --git a/Assignment_MB/images/27-Cobalt-Tile.png b/Assignment_MB/images/27-Cobalt-Tile.png
diff --git a/Assignment_MB/images/28-Nickel-Tile.png b/Assignment_MB/images/28-Nickel-Tile.png
diff --git a/Assignment_MB/images/29-Copper-Tile.png b/Assignment_MB/images/29-Copper-Tile.png
diff --git a/Assignment_MB/images/3-Lithium-Tile.png b/Assignment_MB/images/3-Lithium-Tile.png
diff --git a/Assignment_MB/images/30-Zinc-Tile.png b/Assignment_MB/images/30-Zinc-Tile.png
diff --git a/Assignment_MB/images/31-Gallium-Tile.png b/Assignment_MB/images/31-Gallium-Tile.png
diff --git a/Assignment_MB/images/32-Germanium-Tile.png b/Assignment_MB/images/32-Germanium-Tile.png
diff --git a/Assignment_MB/images/33-Arsenic-Tile.png b/Assignment_MB/images/33-Arsenic-Tile.png
diff --git a/Assignment_MB/images/34-Selenium-Tile.png b/Assignment_MB/images/34-Selenium-Tile.png
diff --git a/Assignment_MB/images/35-Bromine-Tile.png b/Assignment_MB/images/35-Bromine-Tile.png
diff --git a/Assignment_MB/images/36-Krypton-Tile.png b/Assignment_MB/images/36-Krypton-Tile.png
diff --git a/Assignment_MB/images/37-Rubidium-Tile.png b/Assignment_MB/images/37-Rubidium-Tile.png
diff --git a/Assignment_MB/images/38-Strontium-Tile.png b/Assignment_MB/images/38-Strontium-Tile.png
diff --git a/Assignment_MB/images/39-Yttrium-Tile.png b/Assignment_MB/images/39-Yttrium-Tile.png
diff --git a/Assignment_MB/images/4-Beryllium-Tile.png b/Assignment_MB/images/4-Beryllium-Tile.png
diff --git a/Assignment_MB/images/40-Zirconium-Tile.png b/Assignment_MB/images/40-Zirconium-Tile.png
diff --git a/Assignment_MB/images/41-Niobium-Tile.png b/Assignment_MB/images/41-Niobium-Tile.png
diff --git a/Assignment_MB/images/42-Molybdenum-Tile.png b/Assignment_MB/images/42-Molybdenum-Tile.png
diff --git a/Assignment_MB/images/43-Technetium-Tile.png b/Assignment_MB/images/43-Technetium-Tile.png
diff --git a/Assignment_MB/images/44-Ruthenium-Tile.png b/Assignment_MB/images/44-Ruthenium-Tile.png
diff --git a/Assignment_MB/images/45-Rhodium-Tile.png b/Assignment_MB/images/45-Rhodium-Tile.png
diff --git a/Assignment_MB/images/46-Palladium-Tile.png b/Assignment_MB/images/46-Palladium-Tile.png
diff --git a/Assignment_MB/images/47-Silver-Tile.png b/Assignment_MB/images/47-Silver-Tile.png
diff --git a/Assignment_MB/images/48-Cadmium-Tile.png b/Assignment_MB/images/48-Cadmium-Tile.png
diff --git a/Assignment_MB/images/49-Indium-Tile.png b/Assignment_MB/images/49-Indium-Tile.png
diff --git a/Assignment_MB/images/5-Boron-Tile.png b/Assignment_MB/images/5-Boron-Tile.png
diff --git a/Assignment_MB/images/50-Tin-Tile.png b/Assignment_MB/images/50-Tin-Tile.png
diff --git a/Assignment_MB/images/51-Antimony-Tile.png b/Assignment_MB/images/51-Antimony-Tile.png
diff --git a/Assignment_MB/images/52-Tellurium-Tile.png b/Assignment_MB/images/52-Tellurium-Tile.png
diff --git a/Assignment_MB/images/53-Iodine-Tile.png b/Assignment_MB/images/53-Iodine-Tile.png
diff --git a/Assignment_MB/images/54-Xenon-Tile.png b/Assignment_MB/images/54-Xenon-Tile.png
diff --git a/Assignment_MB/images/55-Cesium-Tile.png b/Assignment_MB/images/55-Cesium-Tile.png
diff --git a/Assignment_MB/images/56-Barium-Tile.png b/Assignment_MB/images/56-Barium-Tile.png
diff --git a/Assignment_MB/images/57-Lanthanum-Tile.png b/Assignment_MB/images/57-Lanthanum-Tile.png
diff --git a/Assignment_MB/images/58-Cerium-Tile.png b/Assignment_MB/images/58-Cerium-Tile.png
diff --git a/Assignment_MB/images/59-Praseodymium-Tile.png b/Assignment_MB/images/59-Praseodymium-Tile.png
diff --git a/Assignment_MB/images/6-Carbon-Tile.png b/Assignment_MB/images/6-Carbon-Tile.png
diff --git a/Assignment_MB/images/60-Neodymium-Tile.png b/Assignment_MB/images/60-Neodymium-Tile.png
diff --git a/Assignment_MB/images/61-Promethium-Tile.png b/Assignment_MB/images/61-Promethium-Tile.png
diff --git a/Assignment_MB/images/62-Samarium-Tile.png b/Assignment_MB/images/62-Samarium-Tile.png
diff --git a/Assignment_MB/images/63-Europium-Tile.png b/Assignment_MB/images/63-Europium-Tile.png
diff --git a/Assignment_MB/images/64-Gadolinium-Tile.png b/Assignment_MB/images/64-Gadolinium-Tile.png
diff --git a/Assignment_MB/images/65-Terbium-Tile.png b/Assignment_MB/images/65-Terbium-Tile.png
diff --git a/Assignment_MB/images/66-Dysprosium-Tile.png b/Assignment_MB/images/66-Dysprosium-Tile.png
diff --git a/Assignment_MB/images/67-Holmium-Tile.png b/Assignment_MB/images/67-Holmium-Tile.png
diff --git a/Assignment_MB/images/68-Erbium-Tile.png b/Assignment_MB/images/68-Erbium-Tile.png
diff --git a/Assignment_MB/images/69-Thulium-Tile.png b/Assignment_MB/images/69-Thulium-Tile.png
diff --git a/Assignment_MB/images/7-Nitrogen-Tile.png b/Assignment_MB/images/7-Nitrogen-Tile.png
diff --git a/Assignment_MB/images/70-Ytterbium-Tile.png b/Assignment_MB/images/70-Ytterbium-Tile.png
diff --git a/Assignment_MB/images/71-Lutetium-Tile.png b/Assignment_MB/images/71-Lutetium-Tile.png
diff --git a/Assignment_MB/images/72-Hafnium-Tile.png b/Assignment_MB/images/72-Hafnium-Tile.png
diff --git a/Assignment_MB/images/73-Tantalum-Tile.png b/Assignment_MB/images/73-Tantalum-Tile.png
diff --git a/Assignment_MB/images/74-Tungsten-Tile.png b/Assignment_MB/images/74-Tungsten-Tile.png
diff --git a/Assignment_MB/images/75-Rhenium-Tile.png b/Assignment_MB/images/75-Rhenium-Tile.png
diff --git a/Assignment_MB/images/76-Osmium-Tile.png b/Assignment_MB/images/76-Osmium-Tile.png
diff --git a/Assignment_MB/images/77-Iridium-Tile.png b/Assignment_MB/images/77-Iridium-Tile.png
diff --git a/Assignment_MB/images/78-Platinum-Tile.png b/Assignment_MB/images/78-Platinum-Tile.png
diff --git a/Assignment_MB/images/79-Gold-Tile.png b/Assignment_MB/images/79-Gold-Tile.png
diff --git a/Assignment_MB/images/8-Oxygen-Tile.png b/Assignment_MB/images/8-Oxygen-Tile.png
diff --git a/Assignment_MB/images/80-Mercury-Tile.png b/Assignment_MB/images/80-Mercury-Tile.png
diff --git a/Assignment_MB/images/81-Thallium-Tile.png b/Assignment_MB/images/81-Thallium-Tile.png
diff --git a/Assignment_MB/images/82-Lead-Tile.png b/Assignment_MB/images/82-Lead-Tile.png
diff --git a/Assignment_MB/images/83-Bismuth-Tile.png b/Assignment_MB/images/83-Bismuth-Tile.png
diff --git a/Assignment_MB/images/84-Polonium-Tile.png b/Assignment_MB/images/84-Polonium-Tile.png
diff --git a/Assignment_MB/images/85-Astatine-Tile.png b/Assignment_MB/images/85-Astatine-Tile.png
diff --git a/Assignment_MB/images/86-Radon-Tile.png b/Assignment_MB/images/86-Radon-Tile.png
diff --git a/Assignment_MB/images/87-Francium-Tile.png b/Assignment_MB/images/87-Francium-Tile.png
diff --git a/Assignment_MB/images/88-Radium-Tile.png b/Assignment_MB/images/88-Radium-Tile.png
diff --git a/Assignment_MB/images/89-Actinium-Tile.png b/Assignment_MB/images/89-Actinium-Tile.png
diff --git a/Assignment_MB/images/9-Fluorine-Tile.png b/Assignment_MB/images/9-Fluorine-Tile.png
diff --git a/Assignment_MB/images/90-Thorium-Tile.png b/Assignment_MB/images/90-Thorium-Tile.png
diff --git a/Assignment_MB/images/91-Protactinium-Tile.png b/Assignment_MB/images/91-Protactinium-Tile.png
diff --git a/Assignment_MB/images/92-Uranium-Tile.png b/Assignment_MB/images/92-Uranium-Tile.png
diff --git a/Assignment_MB/images/93-Neptunium-Tile.png b/Assignment_MB/images/93-Neptunium-Tile.png
diff --git a/Assignment_MB/images/94-Plutonium-Tile.png b/Assignment_MB/images/94-Plutonium-Tile.png
diff --git a/Assignment_MB/images/95-Americium-Tile.png b/Assignment_MB/images/95-Americium-Tile.png
diff --git a/Assignment_MB/images/96-Curium-Tile.png b/Assignment_MB/images/96-Curium-Tile.png
diff --git a/Assignment_MB/images/97-Berkelium-Tile.png b/Assignment_MB/images/97-Berkelium-Tile.png
diff --git a/Assignment_MB/images/98-Californium-Tile.png b/Assignment_MB/images/98-Californium-Tile.png
diff --git a/Assignment_MB/images/99-Einsteinium-Tile.png b/Assignment_MB/images/99-Einsteinium-Tile.png
diff --git a/Assignment_MB/images/error.png b/Assignment_MB/images/error.png
diff --git a/Assignment_MB/images/question.png b/Assignment_MB/images/question.png
diff --git a/Assignment_MB/src/Assignment.java b/Assignment_MB/src/Assignment.java
@@ -226,6 +226,7 @@ public static void game() {
 			 * This do while loop will do the following:
 			 * 1. check to make sure the input is valid A-D
 			 * 2. Will write out the multiple choice possible answers
+			 * inputdata[2] - this is if there is a "unit" associated
 			 */
 			do {
 				if (strinput.length() >= 2 || !strinput.equals("A") && !strinput.equals("B") && !strinput.equals("C") && !strinput.equals("D")) {
@@ -267,7 +268,7 @@ public static void game() {
 			}
 			question[grandom] = null; // we need to set null to the question so it can no longer be asked
 
-		} //end game loop
+		} //end question/game loop
 
 		scorepercent = Math.round(((double)(score)/intinput) * 10000.0)/100.0; // calculates the percent and rounds the percent to 2 decimals
 		System.out.println("\nYou got " + scorepercent + "% of the questions correct"); // will tell you your percentage of correct questions