Skip to content

Commit

Permalink
acutally fix the vlad_flying
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mr-Auto
Mr-Auto committed Oct 16, 2023
1 parent ac7cc6a commit 38dc6f7
Showing 1 changed file with 44 additions and 53 deletions.
97 changes: 44 additions & 53 deletions src/game_api/level_api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,16 @@ std::array g_community_tile_codes{
CommunityTileCode{"firebug", "ENT_TYPE_MONS_FIREBUG"},
CommunityTileCode{"vampire", "ENT_TYPE_MONS_VAMPIRE", g_spawn_not_snapped_to_floor},
CommunityTileCode{"vampire_flying", "ENT_TYPE_MONS_VAMPIRE"},
CommunityTileCode{"vlad_flying", "ENT_TYPE_MONS_VLAD", g_spawn_not_snapped_to_floor},
CommunityTileCode{
"vlad_flying",
"ENT_TYPE_MONS_VLAD",
[](const CommunityTileCode& self, float x, float y, Layer* layer)
{
if (Movable* vlad = (Movable*)layer->spawn_entity(self.entity_id, x, y, false, 0.0f, 0.0f, true))
{
vlad->move_state = 9;
}
}},
CommunityTileCode{"osiris", "ENT_TYPE_MONS_OSIRIS_HEAD"},
CommunityTileCode{"anubis2", "ENT_TYPE_MONS_ANUBIS2"},
CommunityTileCode{"assassin", "ENT_TYPE_MONS_FEMALE_JIANGSHI"},
Expand Down Expand Up @@ -420,20 +429,14 @@ std::array g_community_tile_codes{
},
CommunityTileCode{"boulder", "ENT_TYPE_ACTIVEFLOOR_BOULDER"},
CommunityTileCode{"apep", "ENT_TYPE_MONS_APEP_HEAD"},
CommunityTileCode{
"apep_left",
"ENT_TYPE_MONS_APEP_HEAD",
[]([[maybe_unused]] const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_apep(x, y, is_room_flipped(x, y));
}},
CommunityTileCode{
"apep_right",
"ENT_TYPE_MONS_APEP_HEAD",
[]([[maybe_unused]] const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_apep(x, y, !is_room_flipped(x, y));
}},
CommunityTileCode{"apep_left", "ENT_TYPE_MONS_APEP_HEAD", []([[maybe_unused]] const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_apep(x, y, is_room_flipped(x, y));
}},
CommunityTileCode{"apep_right", "ENT_TYPE_MONS_APEP_HEAD", []([[maybe_unused]] const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_apep(x, y, !is_room_flipped(x, y));
}},
CommunityTileCode{"olmite_naked", "ENT_TYPE_MONS_OLMITE_NAKED"},
CommunityTileCode{"olmite_helmet", "ENT_TYPE_MONS_OLMITE_HELMET"},
CommunityTileCode{
Expand Down Expand Up @@ -471,46 +474,34 @@ std::array g_community_tile_codes{
CommunityTileCode{"punishball_attach_bottom", "ENT_TYPE_ITEM_PUNISHBALL", g_spawn_punishball_attach<0, -1>},
CommunityTileCode{"critter_slime", "ENT_TYPE_MONS_CRITTERSLIME"},
CommunityTileCode{"skull", "ENT_TYPE_ITEM_SKULL"},
CommunityTileCode{
"venom",
"ENT_TYPE_ITEM_ACIDSPIT",
[](const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_entity(self.entity_id, x, y - 1, false, 0, 0, false);
}},
CommunityTileCode{"venom", "ENT_TYPE_ITEM_ACIDSPIT", [](const CommunityTileCode& self, float x, float y, Layer* layer)
{
layer->spawn_entity(self.entity_id, x, y - 1, false, 0, 0, false);
}},
CommunityTileCode{"arrow_wooden", "ENT_TYPE_ITEM_WOODEN_ARROW"},
CommunityTileCode{"arrow_metal", "ENT_TYPE_ITEM_METAL_ARROW"},
CommunityTileCode{
"arrow_wooden_poison",
"ENT_TYPE_ITEM_WOODEN_ARROW",
[](const CommunityTileCode& self, float x, float y, Layer* layer)
{
Arrow* arrow = layer->spawn_entity_snap_to_floor(self.entity_id, x, y)->as<Arrow>();
arrow->poison_arrow(true);
}},
CommunityTileCode{
"arrow_metal_poison",
"ENT_TYPE_ITEM_METAL_ARROW",
[](const CommunityTileCode& self, float x, float y, Layer* layer)
{
Arrow* arrow = layer->spawn_entity_snap_to_floor(self.entity_id, x, y)->as<Arrow>();
arrow->poison_arrow(true);
}},
CommunityTileCode{
"movable_spikes",
"ENT_TYPE_ITEM_SPIKES",
[](const CommunityTileCode& self, float x, float y, Layer* layer)
{
auto do_spawn = [=]()
{
std::vector<uint32_t> entities_neighbour = get_entities_overlapping_by_pointer({}, 0, x - 0.5f, y - 1.5f, x + 0.5f, y - 0.5f, layer);
if (!entities_neighbour.empty())
{
layer->spawn_entity_over(self.entity_id, get_entity_ptr(entities_neighbour.front()), 0.0f, 1.0f);
}
};
g_attachee_requiring_entities.push_back({{{x, y - 1}}, do_spawn});
}},
CommunityTileCode{"arrow_wooden_poison", "ENT_TYPE_ITEM_WOODEN_ARROW", [](const CommunityTileCode& self, float x, float y, Layer* layer)
{
Arrow* arrow = layer->spawn_entity_snap_to_floor(self.entity_id, x, y)->as<Arrow>();
arrow->poison_arrow(true);
}},
CommunityTileCode{"arrow_metal_poison", "ENT_TYPE_ITEM_METAL_ARROW", [](const CommunityTileCode& self, float x, float y, Layer* layer)
{
Arrow* arrow = layer->spawn_entity_snap_to_floor(self.entity_id, x, y)->as<Arrow>();
arrow->poison_arrow(true);
}},
CommunityTileCode{"movable_spikes", "ENT_TYPE_ITEM_SPIKES", [](const CommunityTileCode& self, float x, float y, Layer* layer)
{
auto do_spawn = [=]()
{
std::vector<uint32_t> entities_neighbour = get_entities_overlapping_by_pointer({}, 0, x - 0.5f, y - 1.5f, x + 0.5f, y - 0.5f, layer);
if (!entities_neighbour.empty())
{
layer->spawn_entity_over(self.entity_id, get_entity_ptr(entities_neighbour.front()), 0.0f, 1.0f);
}
};
g_attachee_requiring_entities.push_back({{{x, y - 1}}, do_spawn});
}},
CommunityTileCode{"boombox", "ENT_TYPE_ITEM_BOOMBOX"},
// CommunityTileCode{
// "lake_imposter",
Expand Down

0 comments on commit 38dc6f7

Please sign in to comment.