Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

added map and room definitions prototype #8

Merged
merged 5 commits into from
Jan 24, 2020
Merged

Conversation

MoreiraJorge
Copy link
Owner

@MoreiraJorge MoreiraJorge commented Jan 23, 2020

  • added map definition class
  • added room definition class

Note: Read all the code comments!!!

@MoreiraJorge MoreiraJorge self-assigned this Jan 23, 2020
@MoreiraJorge MoreiraJorge added this to Review in Development Jan 23, 2020
@MoreiraJorge MoreiraJorge added the Review Under review label Jan 23, 2020
Copy link
Collaborator

@MIGMLG MIGMLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • MUDA OS NOMES DAS CLASSES! XD
  • Rooms e Connections para lista

@MoreiraJorge MoreiraJorge moved this from Review to Doing in Development Jan 24, 2020
@MoreiraJorge MoreiraJorge moved this from Doing to Review in Development Jan 24, 2020
Copy link
Collaborator

@MIGMLG MIGMLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Implemtar hasGhost
  • Exceptions na ArrayList

Copy link
Collaborator

@MIGMLG MIGMLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Missing Exceptions
  • Simplify hasGhost

Copy link
Collaborator

@MIGMLG MIGMLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Missing Tests

Copy link
Collaborator

@MIGMLG MIGMLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved!

@MIGMLG MIGMLG merged commit e6b41b6 into Develop Jan 24, 2020
@MIGMLG MIGMLG deleted the RoomMapClassesV1 branch January 24, 2020 15:13
@MIGMLG MIGMLG moved this from Review to Done in Development Jan 24, 2020
@MoreiraJorge MoreiraJorge added the Done Done! label Jan 24, 2020
MIGMLG added a commit that referenced this pull request Jan 31, 2020
* Implemented LoadMap (#6)

* Add JsonSimple to Gradle

* Json Pulgin Update

* Maps Dir

* Implement loadMap

* Tests for loadMap

* Reviewed

* Surpressed pmd useless violation

* Add Map and Room Definitions Prototype (#8)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Fix

* Merge Added Comments to Develop Branch (#10)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Add comments on classes Menu, and test classes

* Fix v2

* Make ArrayList abstract

* Add orderedList

* Add BinaryTree Package

* Add Package Queues

* Add Stack Package

* Add PriorityQueue Package

* Add Graph Package

* Add Network Package

* Fix in Imports

* Change PMD Rules

* Review structures and add some comments

* Fix app

* Load Map Structure (#13)

* Change names of method to make it more clear

* Fix in Constructor of Map

* Missing Files for change of name in method

* Remove Debugging Prints

* Done with loadMapFile

* First Test for isMapLoaded Method

* Done with tests for isMapLoaded

* Changes to Map Structure

* Fix missing commit

* V1.0 of Map

* V1.0 of Room

* Fix problem in Testing

* Add MapExceptions

* Add MenuExceptions

* V1.0 of Menu

* Refactor Change

* Fix in comments

* Add List of Connections

* Add numberOfDoors Method

* Link Between Map and Room

* Refactored Map and Room Class

* Add tests

Co-authored-by: Jorge Moreira <32751407+MoreiraJorge@users.noreply.github.com>

* Add Game definitions

* Fix comment on Generated class

* Print Map (#16)

* Add PrintMap

* Add JavaDoc to new methods

* Add Player Class (#19)

* Player fix

* Simulation Mode Done (#21)

* Add Variable points to game

* Add Exceptions to Game Interface

* Final Version of Simulation Mode

* Change toString and PrintMap Methods

* Add Comments

* Add Main Menu (#22)

* Re-merge Game Menu  (#24)

* Add main menu

* Fix menu

* Fix menu with simulation

* Add comments to HauntedHouse package

* Add While Loops to Menus (#25)

* Fix build.gradle

* Fix in Simulation

* Manual mode (#28)

* Fix in comments

* ManualGame Constructor Done

* Access to player points variable

* First version of Manual Mode working on Menu

* Version 1.0 of Manual Game Mode

* Version 1.0 of the Definition of Player

* Change in printMap

* Change in Menu for Manual Game Mode

* Add Exceptions to Game Interface

* Add Exceptions to App

* Fix comment

* Ratings (#29)

* Add menu and ratings

* Fix menus comments and exceptions

* Fix manual

* Add addResult and remove list getter

* Add ratings to manual

* Fix for when player loses all points

* Fix

* Release Preparation Branch (#32)

* Fix (#31)

* Fix in End Game

* Fix comments in menu

* CleanUp of Menu

* Rename to MapFilesExceptions

* CleanUp in difficulty

* Remove Enum from jacocoReport

* Interface Game CleanUP

* CleanUP Manual Mode

* Identation done on MapExceptions

* CleanUP on Map

* CleanUP on Player

* CleanUP on Simulation

* Comments for MapFile

* Added Tests for getRoomFromName method

* Ignore Menu from Tests

* Remove Game Modes from tests

* Tests for Results

* CleanUP in Ratings

* Test for Player

* Fix in Menu

* Forgot to add Private prefix

* Investigation ongoing

* Leave it like this

* Fix XD

* Reverse write ratings and edit menu

* Fix in Map

Co-authored-by: DevMig <nerdxontheline@outlook.com>
MIGMLG added a commit that referenced this pull request Jan 31, 2020
* Implemented LoadMap (#6)

* Add JsonSimple to Gradle

* Json Pulgin Update

* Maps Dir

* Implement loadMap

* Tests for loadMap

* Reviewed

* Surpressed pmd useless violation

* Add Map and Room Definitions Prototype (#8)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Fix

* Merge Added Comments to Develop Branch (#10)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Add comments on classes Menu, and test classes

* Fix v2

* Make ArrayList abstract

* Add orderedList

* Add BinaryTree Package

* Add Package Queues

* Add Stack Package

* Add PriorityQueue Package

* Add Graph Package

* Add Network Package

* Fix in Imports

* Change PMD Rules

* Review structures and add some comments

* Fix app

* Load Map Structure (#13)

* Change names of method to make it more clear

* Fix in Constructor of Map

* Missing Files for change of name in method

* Remove Debugging Prints

* Done with loadMapFile

* First Test for isMapLoaded Method

* Done with tests for isMapLoaded

* Changes to Map Structure

* Fix missing commit

* V1.0 of Map

* V1.0 of Room

* Fix problem in Testing

* Add MapExceptions

* Add MenuExceptions

* V1.0 of Menu

* Refactor Change

* Fix in comments

* Add List of Connections

* Add numberOfDoors Method

* Link Between Map and Room

* Refactored Map and Room Class

* Add tests

Co-authored-by: Jorge Moreira <32751407+MoreiraJorge@users.noreply.github.com>

* Add Game definitions

* Fix comment on Generated class

* Print Map (#16)

* Add PrintMap

* Add JavaDoc to new methods

* Add Player Class (#19)

* Player fix

* Simulation Mode Done (#21)

* Add Variable points to game

* Add Exceptions to Game Interface

* Final Version of Simulation Mode

* Change toString and PrintMap Methods

* Add Comments

* Add Main Menu (#22)

* Re-merge Game Menu  (#24)

* Add main menu

* Fix menu

* Fix menu with simulation

* Add comments to HauntedHouse package

* Add While Loops to Menus (#25)

* Fix build.gradle

* Fix in Simulation

* Manual mode (#28)

* Fix in comments

* ManualGame Constructor Done

* Access to player points variable

* First version of Manual Mode working on Menu

* Version 1.0 of Manual Game Mode

* Version 1.0 of the Definition of Player

* Change in printMap

* Change in Menu for Manual Game Mode

* Add Exceptions to Game Interface

* Add Exceptions to App

* Fix comment

* Ratings (#29)

* Add menu and ratings

* Fix menus comments and exceptions

* Fix manual

* Add addResult and remove list getter

* Add ratings to manual

* Fix for when player loses all points

* Fix

* Release Preparation Branch (#32)

* Fix (#31)

* Fix in End Game

* Fix comments in menu

* CleanUp of Menu

* Rename to MapFilesExceptions

* CleanUp in difficulty

* Remove Enum from jacocoReport

* Interface Game CleanUP

* CleanUP Manual Mode

* Identation done on MapExceptions

* CleanUP on Map

* CleanUP on Player

* CleanUP on Simulation

* Comments for MapFile

* Added Tests for getRoomFromName method

* Ignore Menu from Tests

* Remove Game Modes from tests

* Tests for Results

* CleanUP in Ratings

* Test for Player

* Fix in Menu

* Forgot to add Private prefix

* Investigation ongoing

* Leave it like this

* Fix XD

* Reverse write ratings and edit menu

* Fix in Map

Co-authored-by: DevMig <nerdxontheline@outlook.com>
MIGMLG added a commit that referenced this pull request Feb 1, 2020
* Implemented LoadMap (#6)

* Add JsonSimple to Gradle

* Json Pulgin Update

* Maps Dir

* Implement loadMap

* Tests for loadMap

* Reviewed

* Surpressed pmd useless violation

* Add Map and Room Definitions Prototype (#8)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Fix

* Merge Added Comments to Develop Branch (#10)

* Added map and room definitions prototype

* Changed room and map names, and added Lists

* Added exceptions to ArrayList and added hasGHost

* Added exceptions and cleaned up

* Added hasGhost tests

* Add comments on classes Menu, and test classes

* Fix v2

* Make ArrayList abstract

* Add orderedList

* Add BinaryTree Package

* Add Package Queues

* Add Stack Package

* Add PriorityQueue Package

* Add Graph Package

* Add Network Package

* Fix in Imports

* Change PMD Rules

* Review structures and add some comments

* Fix app

* Load Map Structure (#13)

* Change names of method to make it more clear

* Fix in Constructor of Map

* Missing Files for change of name in method

* Remove Debugging Prints

* Done with loadMapFile

* First Test for isMapLoaded Method

* Done with tests for isMapLoaded

* Changes to Map Structure

* Fix missing commit

* V1.0 of Map

* V1.0 of Room

* Fix problem in Testing

* Add MapExceptions

* Add MenuExceptions

* V1.0 of Menu

* Refactor Change

* Fix in comments

* Add List of Connections

* Add numberOfDoors Method

* Link Between Map and Room

* Refactored Map and Room Class

* Add tests

Co-authored-by: Jorge Moreira <32751407+MoreiraJorge@users.noreply.github.com>

* Add Game definitions

* Fix comment on Generated class

* Print Map (#16)

* Add PrintMap

* Add JavaDoc to new methods

* Add Player Class (#19)

* Player fix

* Simulation Mode Done (#21)

* Add Variable points to game

* Add Exceptions to Game Interface

* Final Version of Simulation Mode

* Change toString and PrintMap Methods

* Add Comments

* Add Main Menu (#22)

* Re-merge Game Menu  (#24)

* Add main menu

* Fix menu

* Fix menu with simulation

* Add comments to HauntedHouse package

* Add While Loops to Menus (#25)

* Fix build.gradle

* Fix in Simulation

* Manual mode (#28)

* Fix in comments

* ManualGame Constructor Done

* Acess to player points variable

* First version of Manual Mode working on Menu

* Version 1.0 of Manual Game Mode

* Version 1.0 of the Definition of Player

* Change in printMap

* Change in Menu for Manual Game Mode

* Add Exceptions to Game Interface

* Add Exceptions to App

* Fix comment

* Ratings (#29)

* Add menu and ratings

* Fix menus comments and exceptions

* Fix manual

* Add addResult and remove list getter

* Add ratings to manual

* Fix for when player loses all points

* Fix

* HauntedHouse V1.0 (#32)

* Fix (#31)

* Fix in End Game

* Fix comments in menu

* CleanUp of Menu

* Rename to MapFilesExceptions

* CleanUp in difficulty

* Remove Enum from jacocoReport

* Interface Game CleanUP

* CleanUP Manual Mode

* Identation done on MapExceptions

* CleanUP on Map

* CleanUP on Player

* CleanUP on Simulation

* Comments for MapFile

* Added Tests for getRoomFromName method

* Ignore Menu from Tests

* Remove Game Modes from tests

* Tests for Results

* CleanUP in Ratings

* Test for Player

* Fix in Menu

* Forgot to add Private prefix

* Investigation ongoing

* Leave it like this

* Fix XD

* Reverse write ratings and editd menu

* Fix in Map

* Add FlashBack to Manual Game Mode

* Fix in Menu

* Commands to clean console

* Add Player Exceptions

* Menu V2.0

* Simulation V2.0

* Manual V2.0

* Ignore ConsoleCommands for Testing

* Ignore PlayerExceptions from Tests

* Add Tests for useFlashBack Method

* Fix in Player

* Add comments to useFlashbackTests

* Add option to see flashbacks

* Add javadoc to source and tests and modify build.gradle

Co-authored-by: Jorge Moreira <32751407+MoreiraJorge@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Done Done! Review Under review
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants