Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e6db65d
Setting up GitHub Classroom Feedback
github-classroom[bot] Dec 11, 2021
4f2618d
Klasse Part gemaakt.
StefBrackez Dec 11, 2021
289b805
Klasse Suspect gemaakt.
StefBrackez Dec 11, 2021
b59093d
Klasse Weapon gemaakt.
StefBrackez Dec 11, 2021
4311eab
Made Assembly Class and added all methods.
nielsvanderstappen Dec 11, 2021
040f5fe
Unversioned Files commit.
StefBrackez Dec 11, 2021
b991a0b
Merge remote-tracking branch 'origin/master'
StefBrackez Dec 11, 2021
c43ee21
Assembly aangepast.
StefBrackez Dec 14, 2021
3d818e0
Part & Assembly class are now finished.
nielsvanderstappen Dec 14, 2021
f24a3f2
Assembly class is now finished.
nielsvanderstappen Dec 14, 2021
632b055
Room class has been created and programmed.
nielsvanderstappen Dec 14, 2021
0ae538d
Mansion class has been created and completed.
nielsvanderstappen Dec 14, 2021
a59aea8
Envelope base created.
StefBrackez Dec 14, 2021
5270405
Detective Class has been created and finished.
nielsvanderstappen Dec 14, 2021
32f36f0
Envelope Class has been finished.
nielsvanderstappen Dec 14, 2021
25f105d
Envelope Class has been finished.
nielsvanderstappen Dec 14, 2021
72d81a7
Command classes created.
StefBrackez Dec 14, 2021
fdf7e04
Acces modifier in game-engine has been changed, so it can be accessed…
nielsvanderstappen Dec 14, 2021
a3e1bdd
GameEngine ExecuteCommand edited.
StefBrackez Dec 14, 2021
8347f19
Merge remote-tracking branch 'origin/master'
StefBrackez Dec 14, 2021
79615c5
GameEngine small edits.
StefBrackez Dec 14, 2021
8c83fd6
GameEngine initialise() doesnt fully work yet.
StefBrackez Dec 18, 2021
cb43449
Few changes to certain classes.
StefBrackez Dec 18, 2021
b176fe0
Changed Describe Command.
StefBrackez Dec 18, 2021
41ebe50
Improve Clue command. Not yet finished.
StefBrackez Dec 18, 2021
91f98ca
Clue, Rooms, Suspects and Weapons commands finished.
StefBrackez Dec 18, 2021
a9bdb7a
Few changes.
StefBrackez Dec 18, 2021
014607f
Accuse fully works.
StefBrackez Dec 18, 2021
589499b
Few changes to Accuse.
StefBrackez Dec 19, 2021
8e95f4f
GameEngine now fully works.
StefBrackez Dec 19, 2021
49d327c
GoToCommandTests implemented.
StefBrackez Dec 19, 2021
040e2f7
Made classes for Anagrams & CrackTheCode.
nielsvanderstappen Dec 19, 2021
6ef0d1d
Merge remote-tracking branch 'origin/master'
nielsvanderstappen Dec 19, 2021
56a2db9
DescribeCommandTests implemented.
StefBrackez Dec 19, 2021
bf77c6a
Merge remote-tracking branch 'origin/master'
nielsvanderstappen Dec 19, 2021
1a3c69c
Few changes.
StefBrackez Dec 19, 2021
92b4b28
Merge remote-tracking branch 'origin/master'
StefBrackez Dec 19, 2021
216efdd
CrackTheCode object gets made properly.
StefBrackez Dec 19, 2021
bc2560c
Few changes
StefBrackez Dec 19, 2021
4886e3c
Team Goud Java PE - Cluedo [LINK NAAR YOUTUBE]
nielsvanderstappen Dec 19, 2021
5212cf1
Team Goud Java PE - Cluedo
nielsvanderstappen Dec 19, 2021
e5fc44d
Delete VIDEO YouTube
nielsvanderstappen Dec 19, 2021
991df25
Update Video Youtube definitief
nielsvanderstappen Dec 19, 2021
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
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

13 changes: 13 additions & 0 deletions .idea/compiler.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.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__org_apiguardian_apiguardian_api_1_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.

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

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

12 changes: 12 additions & 0 deletions .idea/misc.xml

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

10 changes: 10 additions & 0 deletions .idea/runConfigurations.xml

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

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

14 changes: 14 additions & 0 deletions Video Youtube definitief
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
https://youtu.be/ZUSgK_amCQw

00:00 - 00:45 = Part
00:49 - 03:06 = Assembly
03:10 - 03:38 = Suspect
03:39 - 03:50 = Weapon
03:51 - 05:55 = Room
05:57 - 07:16 = Mansion
07:19 - 08:35 = Detective
08:36 - 09:30 = Envelope
09:30 - 21:01 = Game Engine
21:02 - 28:03 = Commands
28:04 - 31:00 = Tests
31:01 - einde = Spelverloop
30 changes: 27 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,21 @@
<groupId>be.pxl</groupId>
<artifactId>CluedoOpgave</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</build>

<!-- het is toegelaten om de java versie te veranderen, maar je
gebruikt min. java versie 11 -->
<!-- het is toegelaten om de java versie te veranderen, maar je
gebruikt min. java versie 11 -->
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand All @@ -22,6 +34,18 @@
<version>5.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
27 changes: 27 additions & 0 deletions src/main/java/be/pxl/ja/Anagram.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package be.pxl.ja;

public class Anagram extends Riddle{
public String word;
public String description;
public String answer;

public Anagram(String word, String description, String answer) {
this.word = word;
this.description = description;
this.answer = answer;
}

public String getWord() {
return word;
}


public String getDescription() {
return description;
}


public String getAnswer() {
return answer;
}
}
34 changes: 34 additions & 0 deletions src/main/java/be/pxl/ja/Assembly.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package be.pxl.ja;

import java.lang.reflect.Array;
import java.util.*;
import java.util.stream.Collectors;

public class Assembly<T extends Part> {
private final List<T> assemblyParts;

public Assembly(List<T> assemblyParts) {
this.assemblyParts = assemblyParts;
}

public int getNumberOfParts() {
return assemblyParts.size();
}

public Optional<T> getPart(String name) {
return assemblyParts.stream() // loop over assemblyParts
.filter(assemblyPart -> name.equals(assemblyPart.getName())) // if name = assemblyPart name
.findFirst(); // return the first that matches the if statement
}

public T getPart(int index) {
return assemblyParts.get(index);
}

public List<T> getParts() {
return assemblyParts.stream()
.sorted(Comparator.comparing(Part::getName))
.collect(Collectors.toList());
}
}

7 changes: 7 additions & 0 deletions src/main/java/be/pxl/ja/CluedoException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package be.pxl.ja;

public class CluedoException extends RuntimeException {
public CluedoException(String message) {
super(message);
}
}
Loading