Fix boss text display for longer names. Add in GameEvent handling class. Finish second boss AI. Release build 6380.
parent
f4700dc31d
commit
fed07eddd6
@ -0,0 +1,73 @@ |
||||
#pragma region License |
||||
/*
|
||||
License (OLC-3) |
||||
~~~~~~~~~~~~~~~ |
||||
|
||||
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
1. Redistributions or derivations of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
|
||||
2. Redistributions or derivative works in binary form must reproduce the above |
||||
copyright notice. This list of conditions and the following disclaimer must be |
||||
reproduced in the documentation and/or other materials provided with the distribution. |
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may |
||||
be used to endorse or promote products derived from this software without specific |
||||
prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGE. |
||||
|
||||
Portions of this software are copyright © 2023 The FreeType |
||||
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||
All rights reserved. |
||||
*/ |
||||
#pragma endregion |
||||
|
||||
#include "GameEvent.h" |
||||
#include "Monster.h" |
||||
#include <map> |
||||
|
||||
std::vector<std::unique_ptr<GameEvent>>GameEvent::events; |
||||
|
||||
GameEvent::GameEvent(){} |
||||
|
||||
GameEvent::~GameEvent(){} |
||||
|
||||
GameEvent::GameEvent(std::function<bool(GameEvent&)>func) |
||||
:runFunc(func){} |
||||
|
||||
void GameEvent::Update(){ |
||||
isActive=runFunc(*this); |
||||
} |
||||
|
||||
void GameEvent::UpdateEvents(){ |
||||
for(const std::unique_ptr<GameEvent>&event:events){ |
||||
event->Update(); |
||||
} |
||||
std::erase_if(events,[](const std::unique_ptr<GameEvent>&ev){return !ev->isActive;}); |
||||
} |
||||
|
||||
void GameEvent::AddEvent(std::unique_ptr<GameEvent>event){ |
||||
events.push_back(std::move(event)); |
||||
} |
||||
|
||||
MonsterStrategyGameEvent::MonsterStrategyGameEvent(std::function<bool(GameEvent&,Monster&,const std::string&)>func,Monster&m,const std::string&strategy) |
||||
:runFunc(func),m(m),strategy(strategy){} |
||||
|
||||
void MonsterStrategyGameEvent::Update(){ |
||||
INCLUDE_MONSTER_DATA |
||||
isActive=runFunc(*this,this->m,this->strategy); |
||||
} |
||||
@ -0,0 +1,70 @@ |
||||
#pragma region License |
||||
/*
|
||||
License (OLC-3) |
||||
~~~~~~~~~~~~~~~ |
||||
|
||||
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, |
||||
are permitted provided that the following conditions are met: |
||||
|
||||
1. Redistributions or derivations of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
|
||||
2. Redistributions or derivative works in binary form must reproduce the above |
||||
copyright notice. This list of conditions and the following disclaimer must be |
||||
reproduced in the documentation and/or other materials provided with the distribution. |
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors may |
||||
be used to endorse or promote products derived from this software without specific |
||||
prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY |
||||
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED |
||||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR |
||||
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
||||
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
||||
SUCH DAMAGE. |
||||
|
||||
Portions of this software are copyright © 2023 The FreeType |
||||
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||
All rights reserved. |
||||
*/ |
||||
#pragma endregion |
||||
#pragma once |
||||
|
||||
#include <functional> |
||||
#include <memory> |
||||
#include <string> |
||||
|
||||
class GameEvent{ |
||||
friend class AiL; |
||||
std::function<bool(GameEvent&)>runFunc; |
||||
static std::vector<std::unique_ptr<GameEvent>>events; |
||||
protected: |
||||
bool isActive=true; |
||||
virtual void Update(); |
||||
public: |
||||
GameEvent(); |
||||
GameEvent(std::function<bool(GameEvent&)>func); |
||||
virtual ~GameEvent(); |
||||
static void UpdateEvents(); |
||||
static void AddEvent(std::unique_ptr<GameEvent>event); |
||||
}; |
||||
|
||||
class Monster; |
||||
|
||||
class MonsterStrategyGameEvent:public GameEvent{ |
||||
friend class AiL; |
||||
protected: |
||||
Monster&m; |
||||
const std::string&strategy; |
||||
std::function<bool(GameEvent&,Monster&,const std::string&)>runFunc; |
||||
virtual void Update()final; |
||||
public: |
||||
MonsterStrategyGameEvent(std::function<bool(GameEvent&,Monster&,const std::string&)>func,Monster&m,const std::string&strategy); |
||||
}; |
||||
Binary file not shown.
Loading…
Reference in new issue