#42 [DEV => MASTER] 2-nd milestone reach

Merge realizado
Endevir mesclou 42 commits de GooseHouse/dev em GooseHouse/master 6 anos atrás
100 arquivos alterados com 9 adições e 271 exclusões
  1. 5 0
      .gitignore
  2. 0 201
      Cell.cpp
  3. 0 70
      Cell.h
  4. 0 0
      assets/effects/README.md
  5. 2 0
      assets/effects/effects.txt
  6. 1 0
      assets/effects/melledamage/descr.txt
  7. BIN
      assets/effects/melledamage/icon.png
  8. 1 0
      assets/effects/selfheal/descr.txt
  9. BIN
      assets/effects/selfheal/icon.png
  10. BIN
      assets/fonts/barocco-initial.ttf
  11. BIN
      assets/fonts/viking-cyr.ttf
  12. BIN
      assets/hotseatpvp/attack_state.png
  13. BIN
      assets/hotseatpvp/battle_bg/CmBkCF.png
  14. BIN
      assets/hotseatpvp/battle_bg/CmBkCur.png
  15. BIN
      assets/hotseatpvp/battle_bg/CmBkDeck.png
  16. BIN
      assets/hotseatpvp/battle_bg/CmBkDes.png
  17. BIN
      assets/hotseatpvp/battle_bg/CmBkDrDd.png
  18. BIN
      assets/hotseatpvp/battle_bg/CmBkDrMt.png
  19. BIN
      assets/hotseatpvp/battle_bg/CmBkDrTr.png
  20. BIN
      assets/hotseatpvp/battle_bg/CmBkGrMt.png
  21. BIN
      assets/hotseatpvp/battle_bg/CmBkGrTr.png
  22. BIN
      assets/hotseatpvp/battle_bg/CmBkHG.png
  23. BIN
      assets/hotseatpvp/battle_bg/CmBkLava.png
  24. BIN
      assets/hotseatpvp/battle_bg/CmBkMag.png
  25. BIN
      assets/hotseatpvp/battle_bg/CmBkRK.png
  26. BIN
      assets/hotseatpvp/battle_bg/CmBkRgh.png
  27. BIN
      assets/hotseatpvp/battle_bg/CmBkSnMt.png
  28. BIN
      assets/hotseatpvp/battle_bg/CmBkSnTr.png
  29. BIN
      assets/hotseatpvp/battle_bg/CmBkSub.png
  30. BIN
      assets/hotseatpvp/battle_bg/CmBkSwmp.png
  31. BIN
      assets/hotseatpvp/battle_bg/OBBHL02.png
  32. BIN
      assets/hotseatpvp/battle_bg/OBBHL03.png
  33. BIN
      assets/hotseatpvp/battle_bg/OBBHL05.png
  34. BIN
      assets/hotseatpvp/battle_bg/OBBHL06.png
  35. BIN
      assets/hotseatpvp/battle_bg/OBBHL14.png
  36. BIN
      assets/hotseatpvp/battle_bg/OBBHL16.png
  37. BIN
      assets/hotseatpvp/battle_bg/OBLvL02.png
  38. BIN
      assets/hotseatpvp/battle_bg/OBRGL01.png
  39. BIN
      assets/hotseatpvp/battle_bg/OBRGL02.png
  40. BIN
      assets/hotseatpvp/battle_bg/OBRGL03.png
  41. BIN
      assets/hotseatpvp/battle_bg/OBRGL04.png
  42. BIN
      assets/hotseatpvp/battle_bg/OBRGL05.png
  43. BIN
      assets/hotseatpvp/battle_bg/OBRGL06.png
  44. BIN
      assets/hotseatpvp/battle_bg/OBSNL01.png
  45. BIN
      assets/hotseatpvp/battle_bg/OBSNL14.png
  46. BIN
      assets/hotseatpvp/battle_bg/OBSWL22.png
  47. BIN
      assets/hotseatpvp/battle_bg/ObBhS02.png
  48. BIN
      assets/hotseatpvp/battle_bg/ObBhS03.png
  49. BIN
      assets/hotseatpvp/battle_bg/ObBhS04.png
  50. BIN
      assets/hotseatpvp/battle_bg/ObBhS11a.png
  51. BIN
      assets/hotseatpvp/battle_bg/ObBhS12b.png
  52. BIN
      assets/hotseatpvp/battle_bg/ObBhS14b.png
  53. BIN
      assets/hotseatpvp/battle_bg/ObBhS16a.png
  54. BIN
      assets/hotseatpvp/battle_bg/ObBtS04.png
  55. BIN
      assets/hotseatpvp/battle_bg/ObCFL00.png
  56. BIN
      assets/hotseatpvp/battle_bg/ObCFs00.png
  57. BIN
      assets/hotseatpvp/battle_bg/ObCFs01.png
  58. BIN
      assets/hotseatpvp/battle_bg/ObCFs02.png
  59. BIN
      assets/hotseatpvp/battle_bg/ObCFs03.png
  60. BIN
      assets/hotseatpvp/battle_bg/ObDRk01.png
  61. BIN
      assets/hotseatpvp/battle_bg/ObDRk02.png
  62. BIN
      assets/hotseatpvp/battle_bg/ObDRk03.png
  63. BIN
      assets/hotseatpvp/battle_bg/ObDRk04.png
  64. BIN
      assets/hotseatpvp/battle_bg/ObDSM01.png
  65. BIN
      assets/hotseatpvp/battle_bg/ObDSM02.png
  66. BIN
      assets/hotseatpvp/battle_bg/ObDSS17.png
  67. BIN
      assets/hotseatpvp/battle_bg/ObDSh01.png
  68. BIN
      assets/hotseatpvp/battle_bg/ObDSs02.png
  69. BIN
      assets/hotseatpvp/battle_bg/ObDTF03.png
  70. BIN
      assets/hotseatpvp/battle_bg/ObDino1.png
  71. BIN
      assets/hotseatpvp/battle_bg/ObDino2.png
  72. BIN
      assets/hotseatpvp/battle_bg/ObDino3.png
  73. BIN
      assets/hotseatpvp/battle_bg/ObDtL02.png
  74. BIN
      assets/hotseatpvp/battle_bg/ObDtL03.png
  75. BIN
      assets/hotseatpvp/battle_bg/ObDtL04.png
  76. BIN
      assets/hotseatpvp/battle_bg/ObDtL06.png
  77. BIN
      assets/hotseatpvp/battle_bg/ObDtL10.png
  78. BIN
      assets/hotseatpvp/battle_bg/ObDtS03.png
  79. BIN
      assets/hotseatpvp/battle_bg/ObDtS04.png
  80. BIN
      assets/hotseatpvp/battle_bg/ObDtS14.png
  81. BIN
      assets/hotseatpvp/battle_bg/ObDtS15.png
  82. BIN
      assets/hotseatpvp/battle_bg/ObEFs00.png
  83. BIN
      assets/hotseatpvp/battle_bg/ObEFs01.png
  84. BIN
      assets/hotseatpvp/battle_bg/ObEFs02.png
  85. BIN
      assets/hotseatpvp/battle_bg/ObEFs03.png
  86. BIN
      assets/hotseatpvp/battle_bg/ObEFs04.png
  87. BIN
      assets/hotseatpvp/battle_bg/ObFFL00.png
  88. BIN
      assets/hotseatpvp/battle_bg/ObFFs00.png
  89. BIN
      assets/hotseatpvp/battle_bg/ObFFs01.png
  90. BIN
      assets/hotseatpvp/battle_bg/ObFFs02.png
  91. BIN
      assets/hotseatpvp/battle_bg/ObFFs03.png
  92. BIN
      assets/hotseatpvp/battle_bg/ObFFs04.png
  93. BIN
      assets/hotseatpvp/battle_bg/ObGLg01.png
  94. BIN
      assets/hotseatpvp/battle_bg/ObGRk01.png
  95. BIN
      assets/hotseatpvp/battle_bg/ObGRk02.png
  96. BIN
      assets/hotseatpvp/battle_bg/ObGSt01.png
  97. BIN
      assets/hotseatpvp/battle_bg/ObGrS01.png
  98. BIN
      assets/hotseatpvp/battle_bg/ObGrS02.png
  99. BIN
      assets/hotseatpvp/battle_bg/ObGrS03.png
  100. BIN
      assets/hotseatpvp/battle_bg/ObHGs00.png

+ 5 - 0
.gitignore

@@ -106,3 +106,8 @@ Makefile
 cmake_install.cmake
 install_manifest.txt
 
+test
+deploy
+build
+debug
+release

+ 0 - 201
Cell.cpp

@@ -1,201 +0,0 @@
-#include "Cell.h"
-#include "unit.h"
-#include <queue>
-#include <vector>
-
-Cell::Cell(Unit * character) {
-	leftUp_ = left_ = leftDown_ = nullptr;
-	rightUp_ = right_ = rightDown_ = nullptr;
-	character_ = &character;
-	clearCell_();
-	AddedToQuery_ = true;
-}
-
-Cell * Cell::getleftUp() {
-	return leftUp_;
-}
-void Cell::setleftUp(Cell * t) {
-	leftUp_ = t;
-}
-
-Cell * Cell::getleft() {
-	return left_;
-}
-void Cell::setleft(Cell * t) {
-	left_ = t;
-}
-
-Cell * Cell::getleftDown() {
-	return leftDown_;
-}
-void Cell::setleftDown(Cell * t) {
-	leftDown_ = t;
-}
-
-Cell * Cell::getrightUp() {
-	return rightUp_;
-}
-void Cell::setrightUp(Cell * t) {
-	rightUp_ = t;
-}
-
-Cell * Cell::getright() {
-	return right_;
-}
-void Cell::setright(Cell * t) {
-	right_ = t;
-}
-
-Cell * Cell::getrightDown() {
-	return rightDown_;
-}
-void Cell::setrightDown(Cell * t) {
-	rightDown_ = t;
-}
-
-Unit * Cell::getCharacter() {
-	return character_;
-}
-void Cell::setCharacter(Unit * t) {
-	character_ = t;
-}
-
-bool Cell::getisMoveable() {
-	return isMoveable_;
-}
-void Cell::setisMoveable(bool t) {
-	isMoveable_ = t;
-}
-
-bool Cell::getisAttackable() {
-	return isAttackable_;
-}
-void Cell::setisAttackable(bool t) {
-	isAttackable_ = t;
-}
-
-int Cell::getDistance() {
-	return distance_;
-}
-void Cell::setDistance(int t) {
-	distance_ = t;
-}
-
-bool Cell::isEmpty() {
-	return character_ == NULL;
-}
-
-void Cell::clearCell_() {
-	setisMoveable(false);
-	setisAttackable(false);
-	setDistance(-1);
-}
-
-void Cell::clearTable_() {
-	std::queue<Cell*> q;
-	q.push(this);
-	clearCell_();
-	this->AddedToQuery_ = false;
-	auto f = [&q](Cell * t) {
-		if (t && t->AddedToQuery_ == true) {
-			q.push(t);
-			t->AddedToQuery_ = false;
-		}
-	};
-	while (!q.empty()) {
-		Cell * Now = q.front();
-		q.pop();
-		Now->clearCell_();
-		f(Now->getleftUp());
-		f(Now->getleft());
-		f(Now->getleftDown());
-		f(Now->getrightUp());
-		f(Now->getright());
-		f(Now->getrightDown());
-	}
-}
-
-void Cell::handleAllMoveableCellsAndUnmoveableCells_(std::queue<Cell*> & Q) {
-	std::queue<Cell*> q;
-	q.push(this);
-	setDistance(0);
-	auto f = [&q, &Q](Cell * t, Cell * parent) {
-		if (t && !t->AddedToQuery_) {
-			t->AddedToQuery_ = true;
-			if (t->getCharacter() != NULL) {
-				t->setisMoveable(false);
-				Q.push(t);
-				return;
-			}
-			q.push(t);
-			t->setDistance(parent->getDistance() + 1);
-		}
-	};
-	while (!q.empty()) {
-		Cell * Now = q.front();
-		Now->setisMoveable(true);
-		if (getCharacter() != NULL && getCharacter()->СanAttack(Now->getDistance())) {
-			Now->setisAttackable(true);
-		}
-		else {
-			Now->setisAttackable(false);
-		}
-		q.pop();
-		f(Now->getleftUp(), Now);
-		f(Now->getleft(), Now);
-		f(Now->getleftDown(), Now);
-		f(Now->getrightUp(), Now);
-		f(Now->getright(), Now);
-		f(Now->getrightDown(), Now);
-	}
-}
-
-void Cell::handleAllUnmoveableCells_(std::queue<Cell*> & Q) {
-	auto f = [&Q](Cell * t, Cell * parent) {
-		if (t && !t->AddedToQuery_) {
-			t->AddedToQuery_ = true;
-			Q.push(t);
-		}
-	};
-	while (!Q.empty()) {
-		Cell * Now = Q.front();
-		Now->setisMoveable(false);
-		Now->setisAttackable(false);
-		Q.pop();
-		f(Now->getleftUp(), Now);
-		f(Now->getleft(), Now);
-		f(Now->getleftDown(), Now);
-		f(Now->getrightUp(), Now);
-		f(Now->getright(), Now);
-		f(Now->getrightDown(), Now);
-	}
-}
-
-void Cell::RecalculateTableWithCenterThisPoint() {
-	clearTable_();
-	std::queue<Cell*> qWithoutMoveable;
-	handleAllMoveableCellsAndUnmoveableCells_(qWithoutMoveable);
-	handleAllUnmoveableCells_(qWithoutMoveable);
-}
-
-std::vector <Cell*> Cell::actualPath(Cell* to) {//std::vector<Cell*> âêëþ÷àåòñÿ â ñåáÿ è this, è end
-	if (!to || !to->getisMoveable())return std::vector<Cell*>();
-	auto ret = std::vector<Cell*>(1, to);
-	while (to != this) {
-		Cell * parent = NULL;
-		auto f = [&parent](Cell * TestParent, Cell * Now) {
-			if (TestParent && TestParent->getDistance() + 1 == Now->getDistance() && TestParent->getisMoveable()) {
-				parent = TestParent;
-			}
-		};
-		f(to->getleftUp(), to);
-		f(to->getleft(), to);
-		f(to->getleftDown(), to);
-		f(to->getrightUp(), to);
-		f(to->getright(), to);
-		f(to->getrightDown(), to);
-		to = parent;
-		ret.push_back(to);
-	}
-	return ret;
-}

+ 0 - 70
Cell.h

@@ -1,70 +0,0 @@
-#pragma once
-#include <queue>
-#include <vector>
-
-class Unit;
-
-class Cell {
-
-private:
-	Cell * leftUp_;
-	Cell *left_;
-	Cell * leftDown_;
-
-	Cell *rightUp_;
-	Cell *right_;
-	Cell *rightDown_;
-
-	Unit *character_;
-
-	bool isMoveable_;
-	bool  isAttackable_;
-
-	int distance_;
-	bool AddedToQuery_;
-
-	void clearTable_();
-	void clearCell_();
-
-	void handleAllMoveableCellsAndUnmoveableCells_(std::queue<Cell*> & Q);
-	void handleAllUnmoveableCells_(std::queue<Cell*> & Q);
-
-public:
-
-	explicit Cell(Unit * character);
-
-	Cell * getleftUp();
-	void setleftUp(Cell *);
-
-	Cell * getleft();
-	void setleft(Cell *);
-	
-	Cell * getleftDown();
-	void setleftDown(Cell *);
-	
-	Cell * getrightUp();
-	void setrightUp(Cell *);
-	
-	Cell * getright();
-	void setright(Cell *);
-	
-	Cell * getrightDown();
-	void setrightDown(Cell *);
-	
-	Unit * getCharacter();
-	void setCharacter(Unit *);
-	
-	bool getisMoveable();
-	void setisMoveable(bool);
-	
-	bool getisAttackable();
-	void setisAttackable(bool);
-	
-	int getDistance();
-	void setDistance(int);
-	
-	bool isEmpty();
-
-	void RecalculateTableWithCenterThisPoint();
-	std::vector <Cell*> actualPath(Cell*);
-};

+ 0 - 0
assets/effects/README.md


+ 2 - 0
assets/effects/effects.txt

@@ -0,0 +1,2 @@
+melledamage
+selfheal

+ 1 - 0
assets/effects/melledamage/descr.txt

@@ -0,0 +1 @@
+Effect of instance damage to Unit.

BIN
assets/effects/melledamage/icon.png


+ 1 - 0
assets/effects/selfheal/descr.txt

@@ -0,0 +1 @@
+Effect of instance damage to Unit.

BIN
assets/effects/selfheal/icon.png


BIN
assets/fonts/barocco-initial.ttf


BIN
assets/fonts/viking-cyr.ttf


BIN
assets/hotseatpvp/attack_state.png


BIN
assets/hotseatpvp/battle_bg/CmBkCF.png


BIN
assets/hotseatpvp/battle_bg/CmBkCur.png


BIN
assets/hotseatpvp/battle_bg/CmBkDeck.png


BIN
assets/hotseatpvp/battle_bg/CmBkDes.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrDd.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkHG.png


BIN
assets/hotseatpvp/battle_bg/CmBkLava.png


BIN
assets/hotseatpvp/battle_bg/CmBkMag.png


BIN
assets/hotseatpvp/battle_bg/CmBkRK.png


BIN
assets/hotseatpvp/battle_bg/CmBkRgh.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkSub.png


BIN
assets/hotseatpvp/battle_bg/CmBkSwmp.png


BIN
assets/hotseatpvp/battle_bg/OBBHL02.png


BIN
assets/hotseatpvp/battle_bg/OBBHL03.png


BIN
assets/hotseatpvp/battle_bg/OBBHL05.png


BIN
assets/hotseatpvp/battle_bg/OBBHL06.png


BIN
assets/hotseatpvp/battle_bg/OBBHL14.png


BIN
assets/hotseatpvp/battle_bg/OBBHL16.png


BIN
assets/hotseatpvp/battle_bg/OBLvL02.png


BIN
assets/hotseatpvp/battle_bg/OBRGL01.png


BIN
assets/hotseatpvp/battle_bg/OBRGL02.png


BIN
assets/hotseatpvp/battle_bg/OBRGL03.png


BIN
assets/hotseatpvp/battle_bg/OBRGL04.png


BIN
assets/hotseatpvp/battle_bg/OBRGL05.png


BIN
assets/hotseatpvp/battle_bg/OBRGL06.png


BIN
assets/hotseatpvp/battle_bg/OBSNL01.png


BIN
assets/hotseatpvp/battle_bg/OBSNL14.png


BIN
assets/hotseatpvp/battle_bg/OBSWL22.png


BIN
assets/hotseatpvp/battle_bg/ObBhS02.png


BIN
assets/hotseatpvp/battle_bg/ObBhS03.png


BIN
assets/hotseatpvp/battle_bg/ObBhS04.png


BIN
assets/hotseatpvp/battle_bg/ObBhS11a.png


BIN
assets/hotseatpvp/battle_bg/ObBhS12b.png


BIN
assets/hotseatpvp/battle_bg/ObBhS14b.png


BIN
assets/hotseatpvp/battle_bg/ObBhS16a.png


BIN
assets/hotseatpvp/battle_bg/ObBtS04.png


BIN
assets/hotseatpvp/battle_bg/ObCFL00.png


BIN
assets/hotseatpvp/battle_bg/ObCFs00.png


BIN
assets/hotseatpvp/battle_bg/ObCFs01.png


BIN
assets/hotseatpvp/battle_bg/ObCFs02.png


BIN
assets/hotseatpvp/battle_bg/ObCFs03.png


BIN
assets/hotseatpvp/battle_bg/ObDRk01.png


BIN
assets/hotseatpvp/battle_bg/ObDRk02.png


BIN
assets/hotseatpvp/battle_bg/ObDRk03.png


BIN
assets/hotseatpvp/battle_bg/ObDRk04.png


BIN
assets/hotseatpvp/battle_bg/ObDSM01.png


BIN
assets/hotseatpvp/battle_bg/ObDSM02.png


BIN
assets/hotseatpvp/battle_bg/ObDSS17.png


BIN
assets/hotseatpvp/battle_bg/ObDSh01.png


BIN
assets/hotseatpvp/battle_bg/ObDSs02.png


BIN
assets/hotseatpvp/battle_bg/ObDTF03.png


BIN
assets/hotseatpvp/battle_bg/ObDino1.png


BIN
assets/hotseatpvp/battle_bg/ObDino2.png


BIN
assets/hotseatpvp/battle_bg/ObDino3.png


BIN
assets/hotseatpvp/battle_bg/ObDtL02.png


BIN
assets/hotseatpvp/battle_bg/ObDtL03.png


BIN
assets/hotseatpvp/battle_bg/ObDtL04.png


BIN
assets/hotseatpvp/battle_bg/ObDtL06.png


BIN
assets/hotseatpvp/battle_bg/ObDtL10.png


BIN
assets/hotseatpvp/battle_bg/ObDtS03.png


BIN
assets/hotseatpvp/battle_bg/ObDtS04.png


BIN
assets/hotseatpvp/battle_bg/ObDtS14.png


BIN
assets/hotseatpvp/battle_bg/ObDtS15.png


BIN
assets/hotseatpvp/battle_bg/ObEFs00.png


BIN
assets/hotseatpvp/battle_bg/ObEFs01.png


BIN
assets/hotseatpvp/battle_bg/ObEFs02.png


BIN
assets/hotseatpvp/battle_bg/ObEFs03.png


BIN
assets/hotseatpvp/battle_bg/ObEFs04.png


BIN
assets/hotseatpvp/battle_bg/ObFFL00.png


BIN
assets/hotseatpvp/battle_bg/ObFFs00.png


BIN
assets/hotseatpvp/battle_bg/ObFFs01.png


BIN
assets/hotseatpvp/battle_bg/ObFFs02.png


BIN
assets/hotseatpvp/battle_bg/ObFFs03.png


BIN
assets/hotseatpvp/battle_bg/ObFFs04.png


BIN
assets/hotseatpvp/battle_bg/ObGLg01.png


BIN
assets/hotseatpvp/battle_bg/ObGRk01.png


BIN
assets/hotseatpvp/battle_bg/ObGRk02.png


BIN
assets/hotseatpvp/battle_bg/ObGSt01.png


BIN
assets/hotseatpvp/battle_bg/ObGrS01.png


BIN
assets/hotseatpvp/battle_bg/ObGrS02.png


BIN
assets/hotseatpvp/battle_bg/ObGrS03.png


BIN
assets/hotseatpvp/battle_bg/ObHGs00.png


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff