This reverts commit 8035eae5.

Schlütter Yannik authored 1 year ago and Gehrung Jonas committed 1 year ago

# Conflicts:
#	src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java
#	src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java

Update: GameSceneController.java (selected map will now be loaded for game)
Update: Persistence.java (added call of "resetGameStats()" method from RuntimeInfo.java at end of updateStats method)
Update: RuntimeInfo.java (added method to reset game-stats)

Issue: #89

Update DDL_Script_AzureDB.sql (added new map "Outpost")
Update DDL_Script_Oracle.sql (added new map "Outpost")
Update Persistence.java (added new map "Outpost" to "resetCoreMaps" method)

Issue: #89

Update: DDL_Script_Oracle.sql (added final mapdata to Arena1)
Update: DDL_Script_AzureDB.sql (added final mapdata to Arena1)
Update: ParserTest.java (added final mapdata of Arena1 to test)
Update: Persistence.java (added final mapdata of Arena1 to reset method; added "synchronized" to all methods)

Issues: #89

update(splashscreen): update loading screen responsive layout and styling, move StartupThread.start() from IntroController to LoadingScreenController, move loadingData() into seperate class #17

update: TileManager.java, RuntimeInfo.java, GameSceneController.java texture and world generation update #85

Player.java: Fix: Small addition of test so that explosions shouldnt go out of the map (Some still do), Add: Check of new Non_Destructible Tile in checkTileNOon_destructible Method
TileManager.java: Add: 2 new Tiles + png's

Update: Persistence.java (added method for saving settings to json; added method for resetting playerAccount.json; removed unnecessary fields and methods for creating list of mapNames; commented out method to get chosen map, is now obsolet)
Update: Parser.java (fixed Exception message for sha1hashhex method)
Update: Parser.java (fixed Exception message for sha1hashhex method and renamed these methods)
Update: DDL_Script_Oracle.sql (changed test-player password to hashed password)
Update: DDL_Script_AzureDB.sql (changed test-player password to hashed password)
Update: RuntimeInfo.java (changed method to set selected map; removed reference to Persistence.java Singleton from fields)

Add: StartupThread.java (new class for loading some startup methods in separate thread)

TileManager.java: Changed: tileMap to public static, Added: new Tile and 1 new TileType from TileFactory.java
TileFactory.java: Added: new Tiletype "destructible"
TileType.java: Added 2 new enumTypes
GameSceneController.java: Changed: diffTileCount to 6, Added checkHealTile in renderContent Method
Player.java: Added TileManager import, checkHealTile Method, Added new Code in attack Method to make a heart spawn when attacking an enemy, started using healPlayer Method
NetworkPlayerTwo.java: Added checkHealTile Method and healPlayerMethod
ITile.java: Added getDestruction Method
IEntity.java: Added checkHealTile and healPlayer
BackgroundTile.java: Added Methods for destruction type

Update: ParserTest.java (change text of an exception)
Update: AzureDB.java (rephrased some exceptions; fixed SQL statement of "uploadCommunityMap" method)
Update: OracleDB.java (rephrased some exceptions; fixed SQL statement of "uploadCommunityMap" method)
Update: GsonHandler.java (rephrased some exceptions)
Update: DDL_Script_Oracle.sql (added second community map)
Update: DDL_Script_AzureDB.sql (added second community map)
Update: Persistence.java (added method to verify core maps and community maps; moved methods from RuntimeInfo.java for creating RemoteMapsList and setting map for next game round)
Update: RuntimeInfo.java (moved methods from RuntimeInfo.java for creating RemoteMapsList and setting map for next game round; added method to calculate game time)
Update: log4j2.xml (enabled logging to file)

Update: ParserTest.java (change text of an exception)
Update: AzureDB.java (added method to reset stats)
Update: OracleDB.java (added method to reset stats)
Update: ISQLDataBase.java (added method to reset stats)
Update: DDL_Script_Oracle.sql (changed max length for mapData; added new test maps)
Update: DDL_Script_AzureDB.sql (changed max length for mapData; added new test maps)
Update: Persistence.java (added method to reset locally stored mapData if corrupted)