Falcon22 · Falcon22 · Apr 8, 2018 · Apr 12, 2018 · Apr 12, 2018 · Apr 12, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
-.idea/**/workspace.xml
-.idea/**/tasks.xml
+.idea/**
 /cmake-build-*/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,20 +1,55 @@
 cmake_minimum_required(VERSION 3.6)
+
 project(TowerDefense)
+project(server)
 
 set(CMAKE_CXX_STANDARD 17)
 
-add_executable(${PROJECT_NAME} src/main.cpp src/Game.cpp src/Game.h src/ResourceManager/ResourcesHolder.h
+add_executable(server src/server_main.cpp
+        src/GameOverState.h src/GameOverState.cpp src/WinState.cpp src/WinState.h
+        src/Game.cpp src/Game.h src/ResourceManager/ResourcesHolder.h
+        src/ResourceManager/ResourcesIdentifier.h src/Graphics/Button.cpp src/Graphics/Button.h src/GameContext.h
+        src/GameState.cpp src/GameState.h src/GameStates.h src/Graphics/Gui.cpp src/Graphics/Gui.h src/Graphics/HUD.cpp src/Graphics/HUD.h
+        src/Graphics/Icon.h src/Graphics/Icon.cpp src/Graphics/Label.cpp src/Graphics/Label.h src/MenuState.cpp src/MenuState.h
+        src/PauseState.cpp src/PauseState.h src/State.cpp src/State.h src/StateManager.cpp
+        src/StateManager.h src/Graphics/Widget.h src/Map.h src/Map.cpp src/Constants.h src/Tile.h src/Tile.cpp
+        src/Units/Warrior/Warrior.cpp src/Units/Warrior/Warrior.h src/Units/Warrior/WarriorLvlOne.cpp
+        src/Units/Warrior/WarriorLvlOne.h
+        src/Units/Warrior/WarriorLvlTwo.cpp src/Units/Warrior/WarriorLvlTwo.h src/Units/Tower/Tower.cpp src/Units/Tower/Tower.h
+        src/Units/GameUnit.cpp src/Units/GameUnit.h src/Units/Tower/TowerLvlZero.cpp src/Units/Tower/TowerLvlZero.h
+        src/Units/Tower/TowerLvlOne.cpp src/Units/Tower/TowerLvlOne.h src/Units/Tower/TowerLvlTwo.cpp src/Units/Tower/TowerLvlTwo.h
+        src/Units/Bullet/Bullet.cpp src/Units/Bullet/Bullet.h src/Units/Bullet/BulletLvlOne.cpp src/Units/Bullet/BulletLvlOne.h
+        src/Units/Bullet/BulletLvlTwo.h src/Units/Bullet/BulletLvlTwo.cpp src/Units/Tower/TowerLvlThree.cpp src/Units/Tower/TowerLvlThree.h
+        src/Graphics/TextBox.h src/Graphics/TextBox.cpp src/ConnectGameState.h src/ConnectGameState.cpp
+        src/Units/Bullet/BulletLvlTwo.h src/Units/Bullet/BulletLvlTwo.cpp src/Units/Tower/TowerLvlThree.cpp src/Units/Tower/TowerLvlThree.h src/Castle/Castle.cpp src/Castle/Castle.h src/Castle/Building/Building.cpp src/Castle/Building/Building.h src/Castle/Building/Farm.cpp src/Castle/Building/Farm.h src/Castle/Building/Barracks.cpp src/Castle/Building/Barracks.h src/Castle/Building/Weapons.cpp src/Castle/Building/Weapons.h
+        src/Graphics/GraphicsUnits/GraphicsCastle.cpp src/Graphics/GraphicsUnits/GraphicsCastle.h src/Graphics/GraphicsUnits/GraphicsTower.cpp src/Graphics/GraphicsUnits/GraphicsTower.h src/Graphics/GraphicsUnits/GraphicsWarrior.cpp src/Graphics/GraphicsUnits/GraphicsWarrior.h src/Graphics/GraphicsUnits/GraphicsBullet.cpp src/Graphics/GraphicsUnits/GraphicsBullet.h src/Units/Bullet/BulletLvlThree.cpp src/Units/Bullet/BulletLvlThree.h src/Graphics/GraphicsUnits/GraphicsUnitManager.cpp src/Graphics/GraphicsUnits/GraphicsUnitManager.h src/Units/LogicUnitsManager.cpp src/Units/LogicUnitsManager.h src/GameConstants.cpp src/GameConstants.h
+        src/Multiplayer/MultiplayerFacade/AbstractMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/AbstractMultiplayerFacade.h src/Multiplayer/MultiplayerFacade/ClientMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/ClientMultiplayerFacade.h src/Multiplayer/MultiplayerFacade/ServerMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/ServerMultiplayerFacade.h src/Multiplayer/ConnectionFacade/AbstractConnectionFacade.cpp src/Multiplayer/ConnectionFacade/AbstractConnectionFacade.h src/Multiplayer/ConnectionFacade/ServerConnectionFacade.cpp src/Multiplayer/ConnectionFacade/ServerConnectionFacade.h src/Multiplayer/ConnectionFacade/ClientConnectionFacade.cpp src/Multiplayer/ConnectionFacade/ClientConnectionFacade.h src/Multiplayer/Entities/Event.cpp src/Multiplayer/Entities/Event.h src/Multiplayer/Entities/Entity.cpp src/Multiplayer/Entities/Entity.h src/Multiplayer/Entities/Player.cpp src/Multiplayer/Entities/Player.h src/Multiplayer/Entities/Game.cpp src/Multiplayer/Entities/Game.h src/Multiplayer/Manager/Manager.cpp src/Multiplayer/Manager/Manager.h src/Multiplayer/Manager/PlayerManager.cpp src/Multiplayer/Manager/PlayerManager.h src/Multiplayer/Worker.cpp src/Multiplayer/Worker.h src/Multiplayer/Master.cpp src/Multiplayer/Master.h)
+
+
+add_executable(TowerDefense src/main.cpp src/GameOverState.h src/GameOverState.cpp src/WinState.cpp src/WinState.h src/Game.cpp src/Game.h src/ResourceManager/ResourcesHolder.h
         src/ResourceManager/ResourcesIdentifier.h src/Graphics/Button.cpp src/Graphics/Button.h src/GameContext.h
         src/GameState.cpp src/GameState.h src/GameStates.h src/Graphics/Gui.cpp src/Graphics/Gui.h src/Graphics/HUD.cpp src/Graphics/HUD.h
         src/Graphics/Icon.h src/Graphics/Icon.cpp src/Graphics/Label.cpp src/Graphics/Label.h src/MenuState.cpp src/MenuState.h
         src/PauseState.cpp src/PauseState.h src/State.cpp src/State.h src/StateManager.cpp
-        src/StateManager.h src/Graphics/Widget.h)
+        src/StateManager.h src/Graphics/Widget.h src/Map.h src/Map.cpp src/Constants.h src/Tile.h src/Tile.cpp
+        src/Units/Warrior/Warrior.cpp src/Units/Warrior/Warrior.h src/Units/Warrior/WarriorLvlOne.cpp
+        src/Units/Warrior/WarriorLvlOne.h
+        src/Units/Warrior/WarriorLvlTwo.cpp src/Units/Warrior/WarriorLvlTwo.h src/Units/Tower/Tower.cpp src/Units/Tower/Tower.h
+        src/Units/GameUnit.cpp src/Units/GameUnit.h src/Units/Tower/TowerLvlZero.cpp src/Units/Tower/TowerLvlZero.h
+        src/Units/Tower/TowerLvlOne.cpp src/Units/Tower/TowerLvlOne.h src/Units/Tower/TowerLvlTwo.cpp src/Units/Tower/TowerLvlTwo.h
+        src/Units/Bullet/Bullet.cpp src/Units/Bullet/Bullet.h src/Units/Bullet/BulletLvlOne.cpp src/Units/Bullet/BulletLvlOne.h
+        src/Units/Bullet/BulletLvlTwo.h src/Units/Bullet/BulletLvlTwo.cpp src/Units/Tower/TowerLvlThree.cpp src/Units/Tower/TowerLvlThree.h
+        src/Graphics/TextBox.h src/Graphics/TextBox.cpp src/ConnectGameState.h src/ConnectGameState.cpp
+        src/Units/Bullet/BulletLvlTwo.h src/Units/Bullet/BulletLvlTwo.cpp src/Units/Tower/TowerLvlThree.cpp src/Units/Tower/TowerLvlThree.h src/Castle/Castle.cpp src/Castle/Castle.h src/Castle/Building/Building.cpp src/Castle/Building/Building.h src/Castle/Building/Farm.cpp src/Castle/Building/Farm.h src/Castle/Building/Barracks.cpp src/Castle/Building/Barracks.h src/Castle/Building/Weapons.cpp src/Castle/Building/Weapons.h
+        src/Graphics/GraphicsUnits/GraphicsCastle.cpp src/Graphics/GraphicsUnits/GraphicsCastle.h src/Graphics/GraphicsUnits/GraphicsTower.cpp src/Graphics/GraphicsUnits/GraphicsTower.h src/Graphics/GraphicsUnits/GraphicsWarrior.cpp src/Graphics/GraphicsUnits/GraphicsWarrior.h src/Graphics/GraphicsUnits/GraphicsBullet.cpp src/Graphics/GraphicsUnits/GraphicsBullet.h src/Units/Bullet/BulletLvlThree.cpp src/Units/Bullet/BulletLvlThree.h src/Graphics/GraphicsUnits/GraphicsUnitManager.cpp src/Graphics/GraphicsUnits/GraphicsUnitManager.h src/Units/LogicUnitsManager.cpp src/Units/LogicUnitsManager.h src/GameConstants.cpp src/GameConstants.h
+        src/Multiplayer/MultiplayerFacade/AbstractMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/AbstractMultiplayerFacade.h src/Multiplayer/MultiplayerFacade/ClientMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/ClientMultiplayerFacade.h src/Multiplayer/MultiplayerFacade/ServerMultiplayerFacade.cpp src/Multiplayer/MultiplayerFacade/ServerMultiplayerFacade.h src/Multiplayer/ConnectionFacade/AbstractConnectionFacade.cpp src/Multiplayer/ConnectionFacade/AbstractConnectionFacade.h src/Multiplayer/ConnectionFacade/ServerConnectionFacade.cpp src/Multiplayer/ConnectionFacade/ServerConnectionFacade.h src/Multiplayer/ConnectionFacade/ClientConnectionFacade.cpp src/Multiplayer/ConnectionFacade/ClientConnectionFacade.h src/Multiplayer/Entities/Event.cpp src/Multiplayer/Entities/Event.h src/Multiplayer/Entities/Entity.cpp src/Multiplayer/Entities/Entity.h src/Multiplayer/Entities/Player.cpp src/Multiplayer/Entities/Player.h src/Multiplayer/Entities/Game.cpp src/Multiplayer/Entities/Game.h src/Multiplayer/Manager/Manager.cpp src/Multiplayer/Manager/Manager.h src/Multiplayer/Manager/PlayerManager.cpp src/Multiplayer/Manager/PlayerManager.h src/Multiplayer/Worker.cpp src/Multiplayer/Worker.h src/Multiplayer/Master.cpp src/Multiplayer/Master.h)
 
-SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 FIND_PACKAGE(SFML 2 REQUIRED system window graphics network audio)
 
 #INCLUDE(FindPkgConfig)
 #PKG_SEARCH_MODULE(SFML REQUIRED sfml)
 INCLUDE_DIRECTORIES(${SFML_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${SFML_LIBRARIES})
+TARGET_LINK_LIBRARIES(server ${SFML_LIBRARIES})
+TARGET_LINK_LIBRARIES(TowerDefense ${SFML_LIBRARIES})
 file(COPY Resources DESTINATION .)
diff --git a/README.md b/README.md
@@ -10,15 +10,3 @@
 Константин Митраков github.com/ConstaConst
 
 Сергей Ломачев github.com/Silvman
-
-Илья Тюнькин github.com/tyunkinilya
-
-<div><p><b>Напоминание команде:</b></p>
-
-<b>Создайте свои ветки! </b>
-
-Если кто-то раньше с этим не сталкивался, то вот неплохая шпаргалка:
-https://git-scm.com/book/ru/v1/Ветвление-в-Git-Основы-ветвления-и-слияния
-Если пользуетесь GitHub Desktop, то там это делается достаточно просто:
-сверху есть кнопочка с разветвлением, нажимаем на неё и называем ветку своей фамилией.
-</div>
diff --git a/Resources/BlueCastle.png b/Resources/BlueCastle.png
diff --git a/Resources/RedCastle.png b/Resources/RedCastle.png
diff --git a/Resources/addBarraks.png b/Resources/addBarraks.png
diff --git a/Resources/addFarm.png b/Resources/addFarm.png
diff --git a/Resources/addWarrior.png b/Resources/addWarrior.png
diff --git a/Resources/addWarriorOne.png b/Resources/addWarriorOne.png
diff --git a/Resources/addWeapons.png b/Resources/addWeapons.png
diff --git a/Resources/audioOff.png b/Resources/audioOff.png
diff --git a/Resources/audioOn.png b/Resources/audioOn.png
diff --git a/Resources/barraks.png b/Resources/barraks.png
diff --git a/Resources/blood.png b/Resources/blood.png
diff --git a/Resources/blueTarget.png b/Resources/blueTarget.png
diff --git a/Resources/bulletThree.png b/Resources/bulletThree.png
diff --git a/Resources/bulletTwo.png b/Resources/bulletTwo.png
diff --git a/Resources/button.png b/Resources/button.png
diff --git a/Resources/click4.wav b/Resources/click4.wav
diff --git a/Resources/cursor.png b/Resources/cursor.png
diff --git a/Resources/decoration.csv b/Resources/decoration.csv
@@ -1,12 +1,12 @@
-3,2,1,3,4,2,0,6,0,0,0,0,0,0,0,
-1,1,4,2,4,2,0,0,0,1,0,4,0,0,0,
-3,2,2,4,1,0,0,2,0,0,0,0,0,0,0,
-3,2,3,1,0,0,0,0,0,0,0,2,0,0,0,
-1,3,4,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,2,0,0,0,0,0,5,0,4,0,0,0,0,
-4,3,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
-0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,
-0,0,0,2,2,0,6,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,1,0,7,0,4,0,0,0,0,0,0,4,
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/Resources/diamond.png b/Resources/diamond.png
diff --git a/Resources/exit.png b/Resources/exit.png
diff --git a/Resources/explosionOne.png b/Resources/explosionOne.png
diff --git a/Resources/explosion.png → Resources/explosionThree.png b/Resources/explosion.png → Resources/explosionThree.png
diff --git a/Resources/explosionTwo.png b/Resources/explosionTwo.png
diff --git a/Resources/farm.png b/Resources/farm.png
diff --git a/Resources/fastForward.mp3 b/Resources/fastForward.mp3
diff --git a/Resources/fastForward.wav b/Resources/fastForward.wav
diff --git a/Resources/fastForwardOff.png b/Resources/fastForwardOff.png
diff --git a/Resources/fastForwardOn.png b/Resources/fastForwardOn.png
diff --git a/Resources/fight.png b/Resources/fight.png
diff --git a/Resources/forwardOff.png b/Resources/forwardOff.png
diff --git a/Resources/forwardOn.png b/Resources/forwardOn.png
diff --git a/Resources/grey_panel.png b/Resources/grey_panel.png
diff --git a/Resources/heart.png b/Resources/heart.png