Skip to content

Commit

Permalink
v1.1.3 and fixed #214
Browse files Browse the repository at this point in the history
  • Loading branch information
Ironbell committed Sep 10, 2018
1 parent 49ac6ed commit 2fd5a41
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 4 deletions.
21 changes: 21 additions & 0 deletions cendric_guide.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions include/Global/global_definitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions include/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.h
Original file line number Diff line number Diff line change
@@ -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;
};
Binary file added saves/1533579848buggybuggy.sav
Binary file not shown.
4 changes: 2 additions & 2 deletions src/Level/Enemies/VeliusVictim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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;
Expand Down
14 changes: 14 additions & 0 deletions src/Level/MOBBehavior/AttackingBehaviors/AllyVoidBehavior.cpp
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 2fd5a41

Please sign in to comment.