From 2fd5a41e327295a75454a82980e41f484ea83c7c Mon Sep 17 00:00:00 2001
From: Ironbell <isabelleroesch@msn.com>
Date: Mon, 10 Sep 2018 19:15:15 +0200
Subject: [PATCH] v1.1.3 and fixed #214

---
 cendric_guide.txt                             |  21 ++++++++++++++++++
 include/Global/global_definitions.h           |   4 ++--
 .../AttackingBehaviors/AllyVoidBehavior.h     |  15 +++++++++++++
 saves/1533579848buggybuggy.sav                | Bin 0 -> 7820 bytes
 src/Level/Enemies/VeliusVictim.cpp            |   4 ++--
 .../AttackingBehaviors/AllyVoidBehavior.cpp   |  14 ++++++++++++
 6 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 cendric_guide.txt
 create mode 100644 include/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h
 create mode 100644 saves/1533579848buggybuggy.sav
 create mode 100644 src/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.cpp

diff --git a/cendric_guide.txt b/cendric_guide.txt
new file mode 100644
index 00000000..1a019ba2
--- /dev/null
+++ b/cendric_guide.txt
@@ -0,0 +1,21 @@
+Cendric Spielanleitung
+----------------------
+Steuerung auf der Karte (Top-Down)
+- Laufen mit WASD oder Pfeiltasten
+- Interagieren (Sprechen, Lesen, Feuerstelle benutzen, etc.) mit E
+- Dialog-Optionen auswählen mit Pfeiltasten
+- Dialog-Option bestätigen mit Enter/Space oder E
+
+Steuerung im Level (Side-Scroller)
+- Laufen mit A und D oder Pfeiltasten
+- Angreifen (ausgewählter Zauber) mit linkem Mausklick oder mit F
+- Zauber auswählen mit 1-5
+- Interagieren (Gegenstand aufnehmen, Lesen, Hebel umschalten, etc.) mit E
+- Aus dem Level gehen mit W oder Pfeiltaste gegen oben 
+
+Steuerung auf der Oberfläche (Interface)
+- Inventar (Gegenstände ausrüsten) mit I
+- Mini-Karte mit M
+- Questlog/Tagebuch mit J
+- Charakter Info (Ruf, Statuswerte, Tipps) mit C
+- Zauberbuch (Zauber ausrüsten) mit K
\ No newline at end of file
diff --git a/include/Global/global_definitions.h b/include/Global/global_definitions.h
index a32ebb87..bd76f62d 100644
--- a/include/Global/global_definitions.h
+++ b/include/Global/global_definitions.h
@@ -17,12 +17,12 @@
 // #define STEAM
 
 // versioning
-#define CENDRIC_VERSION_NR_RAW "1.1.1"
+#define CENDRIC_VERSION_NR_RAW "1.1.3"
 #define ENVIRONMENT "64bit"
 #ifdef STEAM
     #define CENDRIC_VERSION_NR CENDRIC_VERSION_NR_RAW " " ENVIRONMENT
 #else
-    #define CENDRIC_VERSION_NR CENDRIC_VERSION_NR_RAW " - GitHub - " ENVIRONMENT
+    #define CENDRIC_VERSION_NR CENDRIC_VERSION_NR_RAW " - Github - " ENVIRONMENT
 #endif
 
 // Debug version
diff --git a/include/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h b/include/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h
new file mode 100644
index 00000000..a2a9929f
--- /dev/null
+++ b/include/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "global.h"
+#include "Level/MOBBehavior/AttackingBehaviors/EnemyAttackingBehavior.h"
+
+// An ally that cannot attack at all
+class AllyVoidBehavior final : public EnemyAttackingBehavior {
+public:
+	AllyVoidBehavior(Enemy* enemy);
+	~AllyVoidBehavior() {};
+	
+	sf::Color getConfiguredHealthColor() const override;
+
+	void updateAggro() override;
+};
\ No newline at end of file
diff --git a/saves/1533579848buggybuggy.sav b/saves/1533579848buggybuggy.sav
new file mode 100644
index 0000000000000000000000000000000000000000..edba32bc5dc2b38f211548b89f15ab2a0e79c1be
GIT binary patch
literal 7820
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
E56sIj>Hq)$

literal 0
HcmV?d00001

diff --git a/src/Level/Enemies/VeliusVictim.cpp b/src/Level/Enemies/VeliusVictim.cpp
index 3285dd48..0ed2849c 100644
--- a/src/Level/Enemies/VeliusVictim.cpp
+++ b/src/Level/Enemies/VeliusVictim.cpp
@@ -2,7 +2,7 @@
 #include "Screens/LevelScreen.h"
 #include "Registrar.h"
 #include "Level/MOBBehavior/MovingBehaviors/VeliusVictimMovingBehavior.h"
-#include "Level/MOBBehavior/AttackingBehaviors/AllyBehavior.h"
+#include "Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h"
 #include "GameObjectComponents/ParticleComponent.h"
 #include "Level/DamageNumbers.h"
 
@@ -144,7 +144,7 @@ MovingBehavior* VeliusVictim::createMovingBehavior(bool asAlly) {
 
 AttackingBehavior* VeliusVictim::createAttackingBehavior(bool asAlly) {
 	EnemyAttackingBehavior* behavior;
-	behavior = new AllyBehavior(this);
+	behavior = new AllyVoidBehavior(this);
 	behavior->setAggroRange(10000.f);
 	behavior->setAttackInput(std::bind(&VeliusVictim::handleAttackInput, this));
 	return behavior;
diff --git a/src/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.cpp b/src/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.cpp
new file mode 100644
index 00000000..51c275d0
--- /dev/null
+++ b/src/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.cpp
@@ -0,0 +1,14 @@
+#include "Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h"
+
+AllyVoidBehavior::AllyVoidBehavior(Enemy* enemy) :
+	AttackingBehavior(enemy),
+	EnemyAttackingBehavior(enemy) {
+}
+
+sf::Color AllyVoidBehavior::getConfiguredHealthColor() const {
+	return COLOR_GOOD;
+}
+
+void AllyVoidBehavior::updateAggro() {
+	// nop
+}
\ No newline at end of file