Merge branch 'dev' of https://github.com/gilnobag/client into dev

assets/units/Archer/include/Archer.h

@@ -0,0 +1,16 @@
+#pragma once
+#include <iostream>
+#include <cassert>
+#include "unit.h"
+
+class Archer : public Unit {
+	Archer() = delete;
+	Archer(std::string id);
+	~Archer();
+
+	bool canAttackForDistance(int distance);
+
+	bool canAttackToCell(Cell* destination);
+
+	bool canAttackUnit(Unit* target);
+};

assets/units/Archer/source/Archer.cpp

@@ -0,0 +1,25 @@
+#pragma once
+#include <iostream>
+#include <random>
+#include <ctime>
+#include "unit.h"
+#include "Archer.h"
+
+Archer::Archer(std::string id) {
+}
+
+Archer::~Archer() {}
+
+bool Archer::canAttackForDistance(int distance) { 
+	//this is a dummy
+	srand(time(0));
+	return rand() % 2;
+}
+
+bool Archer::canAttackToCell(Cell * destination) {
+	return canAttackForDistance(lenOfActualPath(destination) + getAttackCost() * getMovementSpeed());
+}
+
+bool Archer::canAttackUnit(Unit * target) {
+	return canAttackToCell(target->getLocation());
+}

assets/units/Mage/include/Mage.h

@@ -0,0 +1,17 @@
+#pragma once
+#pragma once
+#include <iostream>
+#include <cassert>
+#include "unit.h"
+
+class Mage : public Unit {
+	Mage() = delete;
+	Mage(std::string id);
+	~Mage();
+
+	bool canAttackForDistance(int distance);
+
+	bool canAttackToCell(Cell* destination);
+
+	bool canAttackUnit(Unit* target);
+};

assets/units/Mage/source/Mage.cpp

@@ -0,0 +1,24 @@
+#pragma once
+#include <iostream>
+#include <random>
+#include <ctime>
+#include "unit.h"
+#include "Mage.h"
+
+Mage::Mage(std::string id){
+}
+
+Mage::~Mage(){}
+
+bool Mage::canAttackForDistance(int distance){ //this is a dummy
+	srand(time(0));
+	return rand() % 2;
+}
+
+bool Mage::canAttackToCell(Cell * destination){
+	return canAttackForDistance(lenOfActualPath(destination) + getAttackCost() * getMovementSpeed());
+}
+
+bool Mage::canAttackUnit(Unit * target){
+	return canAttackToCell(target->getLocation());
+}

assets/units/Rider/include/Rider.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <iostream>
+#include <cassert>
+#include "unit.h"
+
+class Rider : public Unit {
+	Rider() = delete;
+	Rider(std::string id);
+	~Rider();
+
+	//increase dmg with len of movement path
+
+	bool canAttackForDistance(int distance);
+
+	bool canAttackToCell(Cell* destination);
+
+	bool canAttackUnit(Unit* target);
+};

assets/units/Rider/source/Rider.cpp

@@ -0,0 +1,24 @@
+#pragma once
+#include <iostream>
+#include <random>
+#include <ctime>
+#include "unit.h"
+#include "Rider.h"
+
+Rider::Rider(std::string id) {
+}
+
+Rider::~Rider(){}
+
+bool Rider::canAttackForDistance(int distance) {
+	return (canMoveForDistance(attack_cost_ * getMovementSpeed() + distance - attack_range_));
+}
+
+bool Rider::canAttackToCell(Cell * destination) {
+	return lenOfActualPath(destination) != 0 &&
+		canAttackForDistance(lenOfActualPath(destination));
+}
+
+bool Rider::canAttackUnit(Unit * target) {
+	return canAttackToCell(target->getLocation());
+}

assets/units/Rogue/include/Rogue.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <iostream>
+#include <cassert>
+#include "unit.h"
+
+class Rogue : public Unit {
+	Rogue() = delete;
+	Rogue(std::string id);
+	~Rogue();
+
+	//backstab
+
+	bool canAttackForDistance(int distance);
+
+	bool canAttackToCell(Cell* destination);
+
+	bool canAttackUnit(Unit* target);
+};

assets/units/Rogue/source/Rogue.cpp

@@ -0,0 +1,24 @@
+#pragma once
+#include <iostream>
+#include <random>
+#include <ctime>
+#include "unit.h"
+#include "Rogue.h"
+
+Rogue::Rogue(std::string id) {
+}
+
+Rogue::~Rogue() {}
+
+bool Rogue::canAttackForDistance(int distance) {
+	return (canMoveForDistance(attack_cost_ * getMovementSpeed() + distance - attack_range_));
+}
+
+bool Rogue::canAttackToCell(Cell * destination) {
+	return lenOfActualPath(destination) != 0 &&
+		canAttackForDistance(lenOfActualPath(destination));
+}
+
+bool Rogue::canAttackUnit(Unit * target) {
+	return canAttackToCell(target->getLocation());
+}

assets/units/Warrior/include/Warrior.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <iostream>
+#include <cassert>
+#include "unit.h"
+
+class Warrior : public Unit {
+	Warrior() = delete;
+	Warrior(std::string id);
+	~Warrior();
+
+	double reduceIncomingDamage(std::string damageType, int damage);
+
+	bool canAttackForDistance(int distance);
+
+	bool canAttackToCell(Cell* destination);
+
+	bool canAttackUnit(Unit* target);
+};

assets/units/Warrior/source/Warrior.cpp

@@ -0,0 +1,42 @@
+#pragma once
+#include <iostream>
+#include <random>
+#include <ctime>
+#include "unit.h"
+#include "Warrior.h"
+
+Warrior::Warrior(std::string id){
+}
+
+Warrior::~Warrior(){}
+
+double Warrior::reduceIncomingDamage(std::string damageType, int damage) {//returns damage after reducing by defence
+	assert("Incorrect damage type in call reduceIncomingDamage(), expected" &&
+		damageType[0] == 'p' || damageType[0] == 'P' || damageType[0] == 'm' || damageType[0] == 'M');
+	assert("Magic defence of unit is incorrectly high (>40), but must be" && magic_defence_ <= 40);
+	assert("Physic defence of unit is incorrectly high (>40), but must be" && physic_defence_ <= 40);
+	if (damageType[0] == 'p' || damageType[0] == 'P') {
+		srand(time(0));
+		double reduced = (1 - 2.5 * physic_defence_ / 100) * damage;
+		if (rand() % 10 == 0) {
+			reduced = reduced / 2.0;
+		}
+		return reduced;
+	}
+	else if (damageType[0] == 'm' || damageType[0] == 'M') {
+		return (1 - 2.5 * magic_defence_ / 100) * damage;
+	}
+}
+
+bool Warrior::canAttackForDistance(int distance){
+	return (canMoveForDistance(attack_cost_ * getMovementSpeed() + distance - attack_range_));
+}
+
+bool Warrior::canAttackToCell(Cell * destination){
+	return lenOfActualPath(destination) != 0 && 
+				canAttackForDistance(lenOfActualPath(destination));
+}
+
+bool Warrior::canAttackUnit(Unit * target){
+	return canAttackToCell(target->getLocation());
+}

assets/units/human/atraty-rider/baseclass.txt

@@ -0,0 +1 @@
+Rider

assets/units/human/atraty-rider/descr.txt

@@ -0,0 +1 @@
+Несколько вольных племён объединились под единым руководством верховного вождя. Этот стан получил название Атратия. Всадники, находящиеся под руководством верховного вождя используют серповидное оружие, чтобы на большой скорости ранить множество противников, ослабляя их обильными кровотечениями.

assets/units/human/atraty-rider/nextgrades.txt

@@ -0,0 +1 @@
+warlord

assets/units/human/atraty-rider/prevgrades.txt

@@ -0,0 +1 @@
+human-wild-rider

assets/units/human/atraty-rider/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/atraty-rider/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/atraty-rider/unitname.txt

@@ -0,0 +1 @@
+Всадник Атратии

assets/units/human/descr.txt

@@ -0,0 +1 @@
+Люди – одна из самых молодых рас в этом мире. Но на их долю уже выпало немало испытаний, и они выдержали их с честью. В течение многих поколений племена людей жили разрозненно, и только угроза со стороны набирающих силу империй других рас заставила их объединиться.

assets/units/human/holy-spirit/baseclass.txt

@@ -0,0 +1 @@
+Mage

assets/units/human/holy-spirit/descr.txt

@@ -0,0 +1 @@
+Жрецы, чья душа оказалась сильна и чиста, удостоились чести слиться с магией Света воедино. Святые души обладают способностью полностью сосредотачивать магию Света на определенном союзнике, исцеляя его раны или, что удивительно, возвращать его к жизни.

assets/units/human/holy-spirit/prevgrades.txt

@@ -0,0 +1 @@
+human-priest

assets/units/human/holy-spirit/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/holy-spirit/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/holy-spirit/unitname.txt

@@ -0,0 +1 @@
+�ג�עא� הףרא

assets/units/human/human-aerotheurger/baseclass.txt

@@ -0,0 +1 @@
+Mage

assets/units/human/human-aerotheurger/descr.txt

@@ -0,0 +1 @@
+Аэротургия даёт магу возможность сгущать и рассеивать воздух, а так же управлять его потоками.

assets/units/human/human-aerotheurger/nextgrades.txt

@@ -0,0 +1,2 @@
+human-lightning-mage
+human-frost-mage

assets/units/human/human-aerotheurger/prevgrades.txt

@@ -0,0 +1 @@
+human-battle-mage

assets/units/human/human-aerotheurger/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-aerotheurger/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-aerotheurger/unitname.txt

@@ -0,0 +1 @@
+ﾗ褄魵裲-����

assets/units/human/human-alchemist/baseclass.txt

@@ -0,0 +1 @@
+Mage

assets/units/human/human-alchemist/descr.txt

@@ -0,0 +1 @@
+Добавляя в свои отвары частицы магии, алхимики начали получать гораздо более эффективные смеси - зелья, способные как помочь союзникам, так и навредить врагам.

assets/units/human/human-alchemist/prevgrades.txt

@@ -0,0 +1 @@
+human-witch-doctor

assets/units/human/human-alchemist/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-alchemist/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-alchemist/unitname.txt

@@ -0,0 +1 @@
+ﾗ褄魵裲-琿���

assets/units/human/human-archer/baseclass.txt

@@ -0,0 +1 @@
+Archer

assets/units/human/human-archer/descr.txt

@@ -0,0 +1 @@
+Для того, чтобы стать стрелком, нужна невероятная концентрация. Именно поэтому хорошие стрелки ценятся в войске не меньше магов или любых других бойцов.

assets/units/human/human-archer/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-archer/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-archer/unitname.txt

@@ -0,0 +1 @@
+طمًَقمي-ِّْمًَي

assets/units/human/human-arsonist/baseclass.txt

@@ -0,0 +1 @@
+Mage

assets/units/human/human-arsonist/descr.txt

@@ -0,0 +1 @@
+Отточенный до совершенства контроль магии огня позволяет поджигателям использовать её так изощренно, как только пожелает их фантазия. Это даёт им возможность умело справляться с особо опасными противниками.

assets/units/human/human-arsonist/prevgrades.txt

@@ -0,0 +1 @@
+human-pyromante

assets/units/human/human-arsonist/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-arsonist/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-arsonist/unitname.txt

@@ -0,0 +1 @@
+Человек-поджигатель

assets/units/human/human-avenger/baseclass.txt

@@ -0,0 +1 @@
+Warrior

assets/units/human/human-avenger/descr.txt

@@ -0,0 +1 @@
+Мстители в совершенстве овладели искусством контратаки, в следствие чего получили возможность быть опасной боевой единицей на поле брани независимо от их возможности атаковать.

assets/units/human/human-avenger/prevgrades.txt

@@ -0,0 +1 @@
+human-defender

assets/units/human/human-avenger/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-avenger/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-avenger/unitname.txt

@@ -0,0 +1 @@
+Человек-мститель

assets/units/human/human-battle-mage/baseclass.txt

@@ -0,0 +1 @@
+Mage

assets/units/human/human-battle-mage/descr.txt

@@ -0,0 +1 @@
+Нет ничего внушительнее и разрушительнее, чем способности боевых магов, обрушенные на их врагов.

assets/units/human/human-battle-mage/nextgrades.txt

@@ -0,0 +1,2 @@
+human-pyromante
+human-aerotheurger

assets/units/human/human-battle-mage/prevgrades.txt

@@ -0,0 +1 @@
+human-mage

assets/units/human/human-battle-mage/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-battle-mage/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-battle-mage/unitname.txt

@@ -0,0 +1 @@
+�‏הסךמי במוגמי לאד

assets/units/human/human-berserker/baseclass.txt

@@ -0,0 +1 @@
+Warrior

assets/units/human/human-berserker/descr.txt

@@ -0,0 +1 @@
+Берсерки по-настоящему наслаждаются сражениями. Каждая рана, полученная ими в бою, укрепляет их волю, делая берсерков сильнее.

assets/units/human/human-berserker/prevgrades.txt

@@ -0,0 +1 @@
+human-duelist

assets/units/human/human-berserker/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-berserker/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-berserker/unitname.txt

@@ -0,0 +1 @@
+ﾗ褄魵裲-砒�褞�

assets/units/human/human-cataphract/baseclass.txt

@@ -0,0 +1 @@
+Rider

assets/units/human/human-cataphract/descr.txt

@@ -0,0 +1 @@
+Катафракты - всадники в тяжелой броне, продавливающие ряды противников назад.

assets/units/human/human-cataphract/prevgrades.txt

@@ -0,0 +1 @@
+human-cavalryman

assets/units/human/human-cataphract/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-cataphract/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-cataphract/unitname.txt

@@ -0,0 +1 @@
+Катафракт

assets/units/human/human-cavalryman/baseclass.txt

@@ -0,0 +1 @@
+Rider

assets/units/human/human-cavalryman/descr.txt

@@ -0,0 +1 @@
+Кавалеристы - защищенные всадники авангарда, сеяющие хаос в рядах армии противника.

assets/units/human/human-cavalryman/nextgrades.txt

@@ -0,0 +1,2 @@
+human-clinicaria
+human-cataphract

assets/units/human/human-cavalryman/prevgrades.txt

@@ -0,0 +1 @@
+human-rider

assets/units/human/human-cavalryman/skills.txt

@@ -0,0 +1 @@
+This unit can nothing :(

assets/units/human/human-cavalryman/traits.txt

@@ -0,0 +1 @@
+This class is empty like ur soul!

assets/units/human/human-cavalryman/unitname.txt

@@ -0,0 +1 @@
+зхыютхъ-ъртрых№шёђ

assets/units/human/human-chastener/baseclass.txt

@@ -0,0 +1 @@
+Warrior