Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
aab91a6
Minigame Factory is now a static class, as it should be
ajamesVISD May 4, 2018
8f2c8dc
Added comments to Minigame. Added a Cards class to utils.
ajamesVISD May 4, 2018
9f9c1af
It works, but needs work.
profitsamuel May 18, 2018
61951bd
Works, but I still need to make the method that checks whether each g…
BeckersAmaze May 18, 2018
00f054f
It works
nedmonds May 18, 2018
49bfed9
It works, and I cleaned it up a bit
nedmonds May 18, 2018
5d9aa91
small changes
nedmonds May 18, 2018
6702641
Restructured. Added API utils and more general dice roller.
ajamesVISD May 20, 2018
7c27bdb
The latest and cleanest version.
ajamesVISD May 20, 2018
774713f
Added minigames from Noah, Beckett, Angelica, Sam, Sean, and Robert.
ajamesVISD May 20, 2018
6f442f3
Added a test for WriteToFile()
ajamesVISD May 21, 2018
2b3c4ca
Added a .gitignore file that should now exclude a bunch of unneeded s…
ajamesVISD May 22, 2018
b99c7f8
Removed an unneeded file that was causing trouble.
ajamesVISD May 22, 2018
e194002
Done
ajamesVISD May 22, 2018
1f266e7
It works
nedmonds May 18, 2018
346a579
It works, and I cleaned it up a bit
nedmonds May 18, 2018
e1eda9f
small changes
nedmonds May 18, 2018
3b53a75
Added LetterStore class to Utils
ajamesVISD Jun 5, 2018
1bfb6e0
idk at this point
nedmonds Jun 7, 2018
c5b89d3
Merge remote-tracking branch 'origin/master'
nedmonds Jun 7, 2018
400a56d
Calling Randomizer.randomWord() gives random word
ajamesVISD Jun 7, 2018
0d65684
Basically working tic tac toe with confusing graphics.
robertson-sean May 18, 2018
3e5d42c
Added randomizer with minimum word length.
ajamesVISD Jun 12, 2018
c2fa890
Final Rock Paper Scissors
nedmonds Jun 13, 2018
25b3565
Merge pull request #7 from nedmonds/master
ajamesVISD Jun 13, 2018
7f3b56b
Initial commit.
ajamesVISD Jun 15, 2018
bfb7211
It compiles I'm the best coder ever
profitsamuel Jun 18, 2018
545208d
It compiles and works, guess a letter, you won't!
BeckersAmaze Jun 18, 2018
7bc97a3
im done, i think.
robertson-sean Jun 20, 2018
e4acec0
I commented and fixed my stuff with the money problem.
profitsamuel Jun 20, 2018
9b37394
Merge remote-tracking branch 'origin/master'
BeckersAmaze Jun 20, 2018
381914d
Removed stray Test directory in Minigames
ajamesVISD Jun 20, 2018
df5bede
Little fixes to HA's RPS game.
ajamesVISD Jun 22, 2018
6d0015c
Merge pull request #13 from ajamesVISD/huthaifa17-master
ajamesVISD Jun 22, 2018
25d6aa7
Merge branch 'master' into MessingwithgameBoard
ajamesVISD Jun 22, 2018
5faa5b2
Merge pull request #9 from robertson-sean/MessingwithgameBoard
ajamesVISD Jun 22, 2018
4e24daa
Merge branch 'master' into master
ajamesVISD Jun 22, 2018
59ae83e
Merge branch 'master' into master
ajamesVISD Jun 22, 2018
cccbf2d
Merge pull request #11 from BeckersAmaze/master
ajamesVISD Jun 22, 2018
887793f
Merge branch 'master' into master
ajamesVISD Jun 22, 2018
ef7ae31
Merge pull request #10 from profitsamuel/master
ajamesVISD Jun 22, 2018
93e5a31
Almost there! Many games added
ajamesVISD Jun 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/dictionaries
.idea/**/shelf

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/
cmake-build-release/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests
22 changes: 8 additions & 14 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 29 additions & 5 deletions Minigames.iml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Expand All @@ -19,5 +22,26 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="JUnit4">
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
</component>
</module>
15 changes: 0 additions & 15 deletions Test/org/vashonsd/Utils/UtilsTests.java

This file was deleted.

64 changes: 64 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.vashonsd</groupId>
<artifactId>Pirateshipv2</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>Minigames</artifactId>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.4</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>

<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>

</dependencies>
</project>
52 changes: 52 additions & 0 deletions src/main/java/org/vashonsd/Games/AO/AngelicaGame.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package org.vashonsd.Games.AO;

import org.vashonsd.Utils.Minigame;

/**
* Created by andy on 5/2/18.
*/
public class AngelicaGame extends Minigame {

private String lastWordSaid;
private String newWord;
private String firstWord;

public AngelicaGame() { super("Angelica", "Angelica's game that takes a word and make the user create more words out of that word.", "quit");
lastWordSaid = "";
newWord = "";
}

@Override
public String start() {
return "Welcome to my game. Let's play. Give me a word that is 5 or more letters.";
}


@Override
public String handle(String str) {
if (lastWordSaid == "") {
lastWordSaid = str;
if(lastWordSaid.length() >= 5){
return"Okay, what other words can you make out of your word?";
}
else {
if(lastWordSaid.length() < 5){
return"Your word needs to be longer";

}
}

}

return "Well done!";
}





@Override
public String quit() {
return "Okay, bye.";
}
}
Loading