learn-code-the-hard-way
/
raycaster
1
0
Fork 0
Code Issues 40 Pull Requests Packages Projects Releases 2 Wiki Activity

Now the loot UI can work with any container and only uses an ECS id to work, not have its own contents.

Browse Source
master
Zed A. Shaw 5 days ago
parent a0eff927b6
commit 812407c3df
6 changed files with 70 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      gui/fsm.cpp
  2. 1
      gui/fsm.hpp
  3. 18
      gui/loot_ui.cpp
  4. 8
      gui/loot_ui.hpp
  5. 45
      systems.cpp
  6. 23
      systems.hpp

9
gui/fsm.cpp
Unescape View File

@ -27,7 +27,8 @@ namespace gui {
$mini_map($level), $mini_map($level),
$loot_ui($level), $loot_ui($level),
$font{FONT_FILE_NAME}, $font{FONT_FILE_NAME},
$dnd_loot($status_ui, $loot_ui, $window, $router) $dnd_loot($status_ui, $loot_ui, $window, $router),
$temp_loot($level.world->entity())
{ {
$window.setPosition({0,0}); $window.setPosition({0,0});
} }
@ -66,6 +67,8 @@ namespace gui {
$map_ui.log(L"Welcome to the game!"); $map_ui.log(L"Welcome to the game!");
$mini_map.init($main_ui.$overlay_ui.$gui); $mini_map.init($main_ui.$overlay_ui.$gui);
$level.world->set<inventory::Model>($temp_loot, {});
run_systems(); run_systems();
state(State::IDLE); state(State::IDLE);
@ -458,8 +461,8 @@ namespace gui {
case eGUI::LOOT_ITEM: { case eGUI::LOOT_ITEM: {
dbc::check(world.has<components::InventoryItem>(entity), dbc::check(world.has<components::InventoryItem>(entity),
"INVALID LOOT_ITEM, that entity has no InventoryItem"); "INVALID LOOT_ITEM, that entity has no InventoryItem");
dbc::log("@@@@ SENDING LOOT_ITEM"); System::place_in_container(*$level.world, $temp_loot, "item_0", entity);
$loot_ui.contents.add("item_0", entity); $loot_ui.set_target($temp_loot);
$loot_ui.update(); $loot_ui.update();
event(Event::LOOT_ITEM); event(Event::LOOT_ITEM);
} break; } break;

1
gui/fsm.hpp
Unescape View File

@ -49,6 +49,7 @@ namespace gui {
sf::Font $font; sf::Font $font;
gui::routing::Router $router; gui::routing::Router $router;
DNDLoot $dnd_loot; DNDLoot $dnd_loot;
DinkyECS::Entity $temp_loot;
FSM(); FSM();

18
gui/loot_ui.cpp
Unescape View File

@ -1,6 +1,7 @@
#include "gui/loot_ui.hpp" #include "gui/loot_ui.hpp"
#include "constants.hpp" #include "constants.hpp"
#include <fmt/xchar.h> #include <fmt/xchar.h>
#include "systems.hpp"
namespace gui { namespace gui {
using namespace guecs; using namespace guecs;
@ -57,6 +58,10 @@ namespace gui {
} }
void LootUI::update() { void LootUI::update() {
if(!$level.world->has<inventory::Model>($target)) return;
auto& contents = $level.world->get<inventory::Model>($target);
for(size_t i = 0; i < INV_SLOTS; i++) { for(size_t i = 0; i < INV_SLOTS; i++) {
auto id = $gui.entity("item_", int(i)); auto id = $gui.entity("item_", int(i));
auto& slot_name = $slot_to_name.at(id); auto& slot_name = $slot_to_name.at(id);
@ -88,20 +93,15 @@ namespace gui {
void LootUI::remove_slot(DinkyECS::Entity slot_id) { void LootUI::remove_slot(DinkyECS::Entity slot_id) {
auto& name = $slot_to_name.at(slot_id); auto& name = $slot_to_name.at(slot_id);
contents.remove(name); System::remove_from_container(*$level.world, $target, name);
update(); update();
} }
bool LootUI::place_slot(guecs::Entity id, DinkyECS::Entity world_entity) { bool LootUI::place_slot(guecs::Entity id, DinkyECS::Entity world_entity) {
auto& name = $slot_to_name.at(id); auto& name = $slot_to_name.at(id);
bool worked = System::place_in_container(*$level.world, $target, name, world_entity);
if(!contents.has(name)) { if(worked) update();
contents.add(name, world_entity); return worked;
update();
return true;
} else {
return false;
}
} }
void LootUI::render(sf::RenderWindow& window) { void LootUI::render(sf::RenderWindow& window) {

8
gui/loot_ui.hpp
Unescape View File

@ -14,10 +14,14 @@ namespace gui {
guecs::UI $gui; guecs::UI $gui;
GameLevel $level; GameLevel $level;
std::unordered_map<guecs::Entity, std::string> $slot_to_name; std::unordered_map<guecs::Entity, std::string> $slot_to_name;
// NOTE: this should then become just an ECS id for a container DinkyECS::Entity $target;
inventory::Model contents;
LootUI(GameLevel level); LootUI(GameLevel level);
void set_target(DinkyECS::Entity entity) {
$target = entity;
}
void init(); void init();
void update(); void update();
void render(sf::RenderWindow& window); void render(sf::RenderWindow& window);

45
systems.cpp
Unescape View File

@ -20,6 +20,7 @@
using std::string; using std::string;
using namespace fmt; using namespace fmt;
using namespace components; using namespace components;
using namespace DinkyECS;
using lighting::LightSource; using lighting::LightSource;
void System::lighting(GameLevel &level) { void System::lighting(GameLevel &level) {
@ -100,7 +101,7 @@ void System::enemy_pathing(GameLevel &level) {
map.clear_target(player_position.location); map.clear_target(player_position.location);
} }
void System::init_positions(DinkyECS::World &world, SpatialMap &collider) { void System::init_positions(World &world, SpatialMap &collider) {
world.query<Position>([&](auto ent, auto &pos) { world.query<Position>([&](auto ent, auto &pos) {
if(world.has<Combat>(ent)) { if(world.has<Combat>(ent)) {
const auto& combat = world.get<Combat>(ent); const auto& combat = world.get<Combat>(ent);
@ -113,7 +114,7 @@ void System::init_positions(DinkyECS::World &world, SpatialMap &collider) {
}); });
} }
inline void move_entity(SpatialMap &collider, Map &game_map, Position &position, Motion &motion, DinkyECS::Entity ent) { inline void move_entity(SpatialMap &collider, Map &game_map, Position &position, Motion &motion, Entity ent) {
Point move_to = { Point move_to = {
position.location.x + motion.dx, position.location.x + motion.dx,
position.location.y + motion.dy position.location.y + motion.dy
@ -140,7 +141,7 @@ void System::motion(GameLevel &level) {
}); });
} }
void System::distribute_loot(DinkyECS::World &world, DinkyECS::Entity& ent, nlohmann::json& entity_data) { void System::distribute_loot(World &world, Entity& ent, nlohmann::json& entity_data) {
dbc::log("!!!!!!!!!!!!! THIS is where you update the dead body contents"); dbc::log("!!!!!!!!!!!!! THIS is where you update the dead body contents");
int inventory_count = entity_data["inventory_count"]; int inventory_count = entity_data["inventory_count"];
world.set<InventoryItem>(ent, {inventory_count, entity_data}); world.set<InventoryItem>(ent, {inventory_count, entity_data});
@ -168,7 +169,7 @@ void System::death(GameLevel &level) {
auto &world = *level.world; auto &world = *level.world;
auto player = world.get_the<Player>(); auto player = world.get_the<Player>();
auto& config = world.get_the<GameConfig>(); auto& config = world.get_the<GameConfig>();
std::vector<DinkyECS::Entity> dead_things; std::vector<Entity> dead_things;
world.query<Combat>([&](auto ent, auto &combat) { world.query<Combat>([&](auto ent, auto &combat) {
// bring out yer dead // bring out yer dead
@ -217,7 +218,7 @@ void System::death(GameLevel &level) {
} }
} }
inline void animate_entity(DinkyECS::World &world, DinkyECS::Entity entity) { inline void animate_entity(World &world, Entity entity) {
if(world.has<Animation>(entity)) { if(world.has<Animation>(entity)) {
auto& animation = world.get<Animation>(entity); auto& animation = world.get<Animation>(entity);
animation.play(); animation.play();
@ -315,7 +316,7 @@ void System::collision(GameLevel &level) {
} }
} }
void System::pickup(GameLevel &level, DinkyECS::Entity entity) { void System::pickup(GameLevel &level, Entity entity) {
auto &world = *level.world; auto &world = *level.world;
auto player = world.get_the<Player>(); auto player = world.get_the<Player>();
@ -346,7 +347,7 @@ void System::pickup(GameLevel &level, DinkyECS::Entity entity) {
} }
void System::device(DinkyECS::World &world, DinkyECS::Entity actor, DinkyECS::Entity item) { void System::device(World &world, Entity actor, Entity item) {
auto& device = world.get<Device>(item); auto& device = world.get<Device>(item);
dbc::log(fmt::format("entity {} INTERACTED WITH DEVICE {}", actor, item)); dbc::log(fmt::format("entity {} INTERACTED WITH DEVICE {}", actor, item));
@ -367,7 +368,7 @@ void System::device(DinkyECS::World &world, DinkyECS::Entity actor, DinkyECS::En
} }
} }
void System::plan_motion(DinkyECS::World& world, Point move_to) { void System::plan_motion(World& world, Point move_to) {
auto& player = world.get_the<Player>(); auto& player = world.get_the<Player>();
auto& player_position = world.get<Position>(player.entity); auto& player_position = world.get<Position>(player.entity);
auto& motion = world.get<Motion>(player.entity); auto& motion = world.get<Motion>(player.entity);
@ -380,7 +381,7 @@ void System::plan_motion(DinkyECS::World& world, Point move_to) {
* just avoid GameMap unlike the others. * just avoid GameMap unlike the others.
*/ */
std::wstring System::draw_map(GameLevel level, size_t view_x, size_t view_y, int compass_dir) { std::wstring System::draw_map(GameLevel level, size_t view_x, size_t view_y, int compass_dir) {
DinkyECS::World &world = *level.world; World &world = *level.world;
Map &map = *level.map; Map &map = *level.map;
auto player_pos = world.get<Position>(level.player).location; auto player_pos = world.get<Position>(level.player).location;
@ -446,7 +447,7 @@ void System::player_status(GameLevel &level) {
} }
} }
std::shared_ptr<sf::Shader> System::sprite_effect(GameLevel &level, DinkyECS::Entity entity) { std::shared_ptr<sf::Shader> System::sprite_effect(GameLevel &level, Entity entity) {
if(level.world->has<SpriteEffect>(entity)) { if(level.world->has<SpriteEffect>(entity)) {
auto& se = level.world->get<SpriteEffect>(entity); auto& se = level.world->get<SpriteEffect>(entity);
@ -462,7 +463,7 @@ std::shared_ptr<sf::Shader> System::sprite_effect(GameLevel &level, DinkyECS::En
} }
} }
DinkyECS::Entity System::spawn_item(DinkyECS::World& world, const std::string& name) { Entity System::spawn_item(World& world, const std::string& name) {
Config config("assets/items.json"); Config config("assets/items.json");
auto& item_config = config[name]; auto& item_config = config[name];
auto item_id = world.entity(); auto item_id = world.entity();
@ -472,7 +473,7 @@ DinkyECS::Entity System::spawn_item(DinkyECS::World& world, const std::string& n
return item_id; return item_id;
} }
bool System::drop_item(GameLevel& level, DinkyECS::Entity item) { bool System::drop_item(GameLevel& level, Entity item) {
auto& world = *level.world; auto& world = *level.world;
auto& map = *level.map; auto& map = *level.map;
auto& collision = *level.collision; auto& collision = *level.collision;
@ -497,3 +498,23 @@ bool System::drop_item(GameLevel& level, DinkyECS::Entity item) {
return false; return false;
} }
bool System::place_in_container(World& world, Entity cont_id, const std::string& name, Entity world_entity) {
auto& container = world.get<inventory::Model>(cont_id);
if(container.has(world_entity)) {
// NOTE: I think this would be a move?!
return false;
} else if(container.has(name)) {
// this is an already occupied slot
return false;
} else {
container.add(name, world_entity);
return true;
}
}
void System::remove_from_container(World& world, Entity cont_id, const std::string& name) {
auto& container = world.get<inventory::Model>(cont_id);
container.remove(name);
}

23
systems.hpp
Unescape View File

@ -5,6 +5,8 @@
namespace System { namespace System {
using namespace components; using namespace components;
using namespace DinkyECS;
using std::string;
void lighting(GameLevel &level); void lighting(GameLevel &level);
void motion(GameLevel &level); void motion(GameLevel &level);
@ -14,19 +16,24 @@ namespace System {
void enemy_pathing(GameLevel &level); void enemy_pathing(GameLevel &level);
void enemy_ai_initialize(GameLevel &level); void enemy_ai_initialize(GameLevel &level);
void init_positions(DinkyECS::World &world, SpatialMap &collider); void init_positions(World &world, SpatialMap &collider);
void device(DinkyECS::World &world, DinkyECS::Entity actor, DinkyECS::Entity item); void device(World &world, Entity actor, Entity item);
void plan_motion(DinkyECS::World& world, Point move_to); void plan_motion(World& world, Point move_to);
std::wstring draw_map(GameLevel level, size_t view_x, size_t view_y, int compass_dir); std::wstring draw_map(GameLevel level, size_t view_x, size_t view_y, int compass_dir);
DinkyECS::Entity spawn_item(DinkyECS::World& world, const std::string& name); Entity spawn_item(World& world, const string& name);
bool drop_item(GameLevel& level, DinkyECS::Entity item); bool drop_item(GameLevel& level, Entity item);
void enemy_ai(GameLevel &level); void enemy_ai(GameLevel &level);
void combat(GameLevel &level, int attack_id); void combat(GameLevel &level, int attack_id);
std::shared_ptr<sf::Shader> sprite_effect(GameLevel &level, DinkyECS::Entity entity); std::shared_ptr<sf::Shader> sprite_effect(GameLevel &level, Entity entity);
void player_status(GameLevel &level); void player_status(GameLevel &level);
void distribute_loot(DinkyECS::World &world, DinkyECS::Entity& ent, nlohmann::json& entity_data); void distribute_loot(World &world, Entity& ent, nlohmann::json& entity_data);
void pickup(GameLevel &level, Entity entity);
bool place_in_container(World& world, Entity cont_id, const string& name, Entity world_entity);
void remove_from_container(World& world, Entity cont_id, const string& name);
void pickup(GameLevel &level, DinkyECS::Entity entity);
} }

Write Preview
Loading…
Cancel
Save