sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Update to geom2d 2.0 util

Browse Source
This commit is contained in:
sigonasr2 2024-01-10 17:49:24 -06:00
parent 8e58607fb9
commit 6d11eb5048
43 changed files with 1661 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Adventures in Lestoria/Ability.h
View File

@ -36,8 +36,8 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "Key.h"
#include "olcPixelGameEngine.h"
class Player;

5
Adventures in Lestoria/AdventuresInLestoria.cpp
View File

@ -35,9 +35,9 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved.
*/
#pragma endregion
#include "olcUTIL_Camera2D.h"
#include "olcPGEX_TransformedView.h"
#include "AdventuresInLestoria.h"
#include "olcUTIL_Camera2D.h"
#include "DamageNumber.h"
#include "Bullet.h"
#include "Ability.h"
@ -1461,7 +1461,7 @@ void AiL::RenderCooldowns(){
for(Ability&a:cooldowns){
if(a.name!="???"){
DrawCooldown(iconPos,a);
iconPos+={32,0};
iconPos+=vf2d{32,0};
}
}
@ -2201,7 +2201,6 @@ bool AiL::OnUserDestroy(){
for(auto&[key,value]:GameState::states){
delete value;
}
delete[]pathfinder.nodes;
Menu::CleanupAllMenus();
for(auto&[key,value]:MonsterData::imgs){
delete value;

4
Adventures in Lestoria/AdventuresInLestoria.h
View File

@ -36,13 +36,12 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Camera2D.h"
#include "Animation.h"
#include "olcUTIL_Animate2D.h"
#include "Monster.h"
#include "olcPGEX_TransformedView.h"
#include "Player.h"
#include "olcUTIL_Camera2D.h"
#include "Bullet.h"
#include "Effect.h"
#include "Map.h"
@ -55,6 +54,7 @@ All rights reserved.
#endif
#include "Audio.h"
#include "olcPGEX_SplashScreen.h"
#include "olcPixelGameEngine.h"
class AiL : public olc::PixelGameEngine
{

1
Adventures in Lestoria/Attributable.h
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "MonsterAttribute.h"
#include "DEFINES.h"
#include <variant>

2
Adventures in Lestoria/AttributableStat.h
View File

@ -36,9 +36,9 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "safemap.h"
#include <variant>
#include <optional>
using namespace std::string_view_literals;

1
Adventures in Lestoria/Bullet.h
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h"
#include "olcUTIL_Animate2D.h"
#include "Monster.h"

1
Adventures in Lestoria/BulletTypes.h
View File

@ -37,7 +37,6 @@ All rights reserved.
#pragma endregion
#pragma once
#include "Bullet.h"
#include "olcPixelGameEngine.h"
struct EnergyBolt:public Bullet{
float lastParticleSpawn=0;

1
Adventures in Lestoria/Class.h
View File

@ -38,7 +38,6 @@ All rights reserved.
#pragma once
#include "Ability.h"
#include "Animation.h"
#include "olcPixelGameEngine.h"
#undef GetClassInfo

1
Adventures in Lestoria/ConnectionPoint.h
View File

@ -37,6 +37,7 @@ All rights reserved.
#pragma endregion
#pragma once
#include "olcUTIL_Geometry2D.h"
#include <array>
struct ConnectionPoint{
friend class State_OverworldMap;

2
Adventures in Lestoria/DamageNumber.h
View File

@ -36,7 +36,7 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
enum DamageNumberType{
HEALTH_LOSS,

2
Adventures in Lestoria/Effect.h
View File

@ -36,9 +36,7 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h"
#include "olcUTIL_Animate2D.h"
struct Effect{
friend class AiL;

1
Adventures in Lestoria/Emitter.cpp
View File

@ -36,6 +36,7 @@ All rights reserved.
*/
#pragma endregion
#include "Emitter.h"
#include <memory>
std::vector<std::unique_ptr<Emitter>>EMITTER_LIST;

2
Adventures in Lestoria/Emitter.h
View File

@ -36,7 +36,7 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
struct Emitter{
friend class AiL;

3
Adventures in Lestoria/EnvironmentalAudio.h
View File

@ -36,7 +36,8 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
#include <map>
using EnvironmentalAudioSoundName=std::string;
using FileName=std::string;

1
Adventures in Lestoria/InventoryConsumableWindow.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "AdventuresInLestoria.h"
#include "olcPixelGameEngine.h"
#include "safemap.h"
#include "Item.h"
#include "MenuItemButton.h"

1
Adventures in Lestoria/Item.h
View File

@ -39,7 +39,6 @@ All rights reserved.
#include <string>
#include <functional>
#include <map>
#include "olcPixelGameEngine.h"
#include "olcUTIL_DataFile.h"
#include "AttributableStat.h"
#include "BitwiseEnum.h"

1
Adventures in Lestoria/ItemDrop.h
View File

@ -35,7 +35,6 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved.
*/
#pragma endregion
#include "olcPixelGameEngine.h"
#include "Item.h"
#include "util.h"
#include "AdventuresInLestoria.h"

3
Adventures in Lestoria/Key.h
View File

@ -36,8 +36,9 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include <set>
#include <string>
#include <map>
//Future-proof game controller support.
enum InputType{

2
Adventures in Lestoria/Menu.cpp
View File

@ -81,7 +81,7 @@ INCLUDE_WINDOW_SIZE
using A=Attribute;
Menu::Menu(vf2d pos,vf2d size)
:pos(pos==CENTERED?WINDOW_SIZE/2-size/2:vi2d{pos}),size(size){
:pos(pos==CENTERED?vi2d{WINDOW_SIZE/2-size/2}:vi2d{pos}),size(size){
this->window=ViewPort::rectViewPort({-24,-24},this->size+vi2d{48,48},this->pos);
}

1
Adventures in Lestoria/Merchant.h
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "FunctionPriming.h"
class Item;

1
Adventures in Lestoria/Monster.h
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "Animation.h"
#include "State.h"
#include "Buff.h"

1
Adventures in Lestoria/MonsterData.cpp
View File

@ -35,7 +35,6 @@ Project (www.freetype.org). Please see LICENSE_FT.txt for more information.
All rights reserved.
*/
#pragma endregion
#include "olcPixelGameEngine.h"
#include "Monster.h"
#include "Animation.h"
#include "config.h"

4
Adventures in Lestoria/Pathfinding.h
View File

@ -36,8 +36,10 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
#include <set>
#include <vector>
#include <map>
struct Pathfinding{
struct sNode

1
Adventures in Lestoria/Ranger.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

2
Adventures in Lestoria/TMXParser.h
View File

@ -36,8 +36,8 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
#include <sstream>
#include <set>
#include "EnvironmentalAudio.h"

2
Adventures in Lestoria/TSXParser.h
View File

@ -36,11 +36,9 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include <sstream>
#include "TMXParser.h"
#include "Map.h"
#include "olcUTIL_Geometry2D.h"
#include "olcUTIL_DataFile.h"
#include "Error.h"

1
Adventures in Lestoria/Thief.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

1
Adventures in Lestoria/TitleScreen.h
View File

@ -37,6 +37,7 @@ All rights reserved.
#pragma endregion
#pragma once
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
class TitleScreen{

1
Adventures in Lestoria/Trapper.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#define VERSION_PATCH 1
#define VERSION_BUILD 5583
#define VERSION_BUILD 5618
#define stringify(a) stringify_(a)
#define stringify_(a) #a

1
Adventures in Lestoria/Warrior.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

1
Adventures in Lestoria/Witch.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

1
Adventures in Lestoria/Wizard.cpp
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#include "Class.h"
#include "olcPixelGameEngine.h"
#include "DEFINES.h"
#include "Player.h"
#include "Effect.h"

1
Adventures in Lestoria/config.h
View File

@ -36,7 +36,6 @@ All rights reserved.
*/
#pragma endregion
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_DataFile.h"
using namespace olc;

1
Adventures in Lestoria/olcPGEX_TTF.h
View File

@ -38,6 +38,7 @@ All rights reserved.
#ifndef OLC_PGEX_TTF_H
#define OLC_PGEX_TTF_H
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
#ifdef WIN32

1
Adventures in Lestoria/olcPGEX_ViewPort.h
View File

@ -1,6 +1,5 @@
#pragma once
#include "olcPixelGameEngine.h"
#include "olcPGEX_TTF.h"
#include "olcUTIL_Geometry2D.h"

5
Adventures in Lestoria/olcPixelGameEngine.h
View File

@ -401,6 +401,7 @@ return 0;
#include <array>
#include <cstring>
#include "Error.h"
#include "olcUTIL_Geometry2D.h"
#pragma endregion
#define PGE_VER 223
@ -669,7 +670,7 @@ namespace olc
};
#define OLC_IGNORE_VEC2D
// O------------------------------------------------------------------------------O
// | olc::vX2d - A generic 2D vector type |
@ -7547,4 +7548,4 @@ using namespace olc;
#define PI 3.14159f
using Color=PixelGameEngine;
using Color=olc::PixelGameEngine;

2
Adventures in Lestoria/olcUTIL_Animate2D.h
View File

@ -54,8 +54,8 @@ David Barr, aka javidx9, <20>OneLoneCoder 2019, 2020, 2021, 2022
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
#include "olcPixelGameEngine.h"
namespace olc::utils::Animate2D
{

4
Adventures in Lestoria/olcUTIL_Camera2D.h
View File

@ -51,10 +51,8 @@ Author
David Barr, aka javidx9, <EFBFBD>OneLoneCoder 2019, 2020, 2021, 2022
*/
#pragma once
#include "olcPixelGameEngine.h"
#include "olcUTIL_Geometry2D.h"
namespace olc::utils
{

3
Adventures in Lestoria/olcUTIL_DataFile.h
View File

@ -53,7 +53,7 @@ David Barr, aka javidx9, <20>OneLoneCoder 2019, 2020, 2021, 2022
*/
#pragma once
#include "olcPixelGameEngine.h"
#include <iostream>
#include <string>
#include <unordered_map>
@ -63,7 +63,6 @@ David Barr, aka javidx9, <20>OneLoneCoder 2019, 2020, 2021, 2022
#include <sstream>
#include <numeric>
#include "Error.h"
#include "olcPixelGameEngine.h"
using namespace std::literals;

1925
Adventures in Lestoria/olcUTIL_Geometry2D.h
View File

File diff suppressed because it is too large Load Diff

1
Adventures in Lestoria/pixelGameEngine.cpp
View File

@ -41,6 +41,7 @@ All rights reserved.
#include "olcPGEX_TTF.h"
#define OLC_PGEX_VIEWPORT
#include "olcPGEX_ViewPort.h"
#include "olcUTIL_Geometry2D.h"
#define OLC_PGE_APPLICATION
#include "olcPixelGameEngine.h"
#define OLC_PGEX_TRANSFORMEDVIEW

1
Adventures in Lestoria/util.h
View File

@ -38,6 +38,7 @@ All rights reserved.
#pragma once
#include <stdlib.h>
#include "olcUTIL_Geometry2D.h"
#include "olcPGEX_TTF.h"
#include <random>
namespace olc::util{