Merge pull request #60 from hyeminyoo/master

Finished the last 500+ points!
ucsb-cs56-projects · Nov 26, 2016 · 3d7b591 · 3d7b591
2 parents 946719b + 9187365
commit 3d7b591
Show file tree

Hide file tree

Showing 37 changed files with 6,780 additions and 50 deletions.
diff --git a/.nfs0000000008967c4700000005 b/.nfs0000000008967c4700000005
diff --git a/README.md b/README.md
@@ -1,13 +1,65 @@
 cs56-memory-card-game
 =====================
 
-A memory card game that the player tries to match all pairs of cards to go to next level before time runs out.
+This is a memory card game in which the player tries to match pairs of cards
+based on their pictures.
 
-launch the game with command
+The faster the player can match the cards, the higher their score will be.
+Each time they make an incorrect match, they lose points.
+
+The first level begins with a small grid, and each level that follows gets
+increasing more difficult (the grid goes larger and larger).
+
+At any point during the game, the player can click the reset button if they
+would like to start over again.
+
+At the end of the game, if the user has reached a new high score, they get
+to enter their name into the leaderboard.
+
+
+
+Instructions
+============
+
+Launch the game on terminal with
 ```
 ant run
 ```
-Detailed instructions can be found by clicking on "instruction" in the main menu
+
+After launching the game, you can choose one of three options:
+
+### 1. Start the game
+Allows the user to begin playing.
+
+### 2. Instructions
+Gives the user detailed instructions on how to play the game.
+
+### 3. High Score
+Lets the user view the current leaderboard, with the names and scores of the best players.
+
+Developer Notes
+===============
+
+### HighScoreBoard.java
+Creates the highscore board and the information that goes on the board
+
+### MemoryGameComponent.java
+A Swing component for playing the Memory Card Game
+
+### MemoryGameLevel.java
+Has the constructor to fully initialize the level, such as target time, grid size, and delay time before two cards flip back over
+
+### MemoryGrid.java
+makes the grid (arraylist of MemoryCards) for the game
+
+### MemoryCard.java
+makes objects for cards
+
+### MemoryGameGui.java
+GUI for the game, and has the main class
+
+### MemoryGameTest.java
+tests the MemoryGame class
 
 project history
 ===============

diff --git a/build.xml b/build.xml
@@ -9,14 +9,15 @@
   <property environment="env"/> <!-- load environment vars -->
 
   <property name="webRoot" value="${env.HOME}/public_html/cs56/13S/${env.USER}/games_memory_card" />
-  <property name="webBaseURL" value="http://www.cs.ucsb.edu/~${env.USER}/cs56" />
+  <property name="webBaseURL" value="UCSB-CS56-Projects.github.io" />
   <property name="webBaseURL1" value="https://foo.cs.ucsb.edu/56mantis/view.php?id=805" />
 
   <property name="course" value="cs56" />
   <property name="quarter" value="13S" />
   <property name="projectName" value="memorycard" />
   <property name="projectPath" value="${course}/projects/games/${projectName}"/>
-  <property name="javadocDest" value="${webRoot}/${projectName}/javadoc" />
+  <property name="javadocDest" value="./javadoc" />
+  <!--property name="javadocDest" value="${webRoot}/${projectName}/javadoc" /-->
   <property name="javadocURL" value="${webBaseURL}/${projectName}/javadoc" /> 
   <property name="mainClass" value="edu.ucsb.cs56.projects.games.memorycard.MemoryGameGui" />
 
@@ -56,7 +57,11 @@
       <fileset dir="src" includes="**/*.java" />
       <classpath refid="project.class.path" />
     </javadoc>
-    <delete quiet="true" dir="${javadocDest}" />
+	<mkdir dir="${javadocDest}"/>
+
+	<!-- Removed following line when making javadoc in root, not sure what it was for before -->
+    <!-- delete quiet="true" dir="${javadocDest}" /-->
+
     <copy todir="${javadocDest}" >
       <fileset dir="javadoc"/>
     </copy>

diff --git a/dist/cs56_13S_memorycard.jar b/dist/cs56_13S_memorycard.jar
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_111) on Sun Nov 20 16:08:38 PST 2016 -->
+<title>All Classes</title>
+<meta name="date" content="2016-11-20">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/HighScoreBoard.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">HighScoreBoard</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryCard.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryCard</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameComponent.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryGameComponent</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameGui.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryGameGui</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameLevel.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryGameLevel</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameTest.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryGameTest</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGrid.html" title="class in edu.ucsb.cs56.projects.games.memorycard" target="classFrame">MemoryGrid</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_111) on Sun Nov 20 16:08:38 PST 2016 -->
+<title>All Classes</title>
+<meta name="date" content="2016-11-20">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<h1 class="bar">All&nbsp;Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/HighScoreBoard.html" title="class in edu.ucsb.cs56.projects.games.memorycard">HighScoreBoard</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryCard.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryCard</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameComponent.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryGameComponent</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameGui.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryGameGui</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameLevel.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryGameLevel</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGameTest.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryGameTest</a></li>
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/MemoryGrid.html" title="class in edu.ucsb.cs56.projects.games.memorycard">MemoryGrid</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
@@ -0,0 +1,122 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_111) on Sun Nov 20 16:08:38 PST 2016 -->
+<title>Constant Field Values</title>
+<meta name="date" content="2016-11-20">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Constant Field Values";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
@@ -0,0 +1,122 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_111) on Sun Nov 20 16:08:38 PST 2016 -->
+<title>Deprecated List</title>
+<meta name="date" content="2016-11-20">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Deprecated List";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="edu/ucsb/cs56/projects/games/memorycard/package-summary.html">Package</a></li>
+<li>Class</li>
+<li>Use</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>