alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-23 08:11:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

only hero and squid can pick up items

Browse source
This commit is contained in:
Corwin 2023-08-29 21:31:36 +01:00
parent 07c5afb990
commit df2f45797b
No known key found for this signature in database
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/the-dungeon-puzzlers-lament/src/game/simulation/entity.rs
View file

@ -453,7 +453,9 @@ fn resolve_spikes(switable: &Switchable) -> OverlapResolution {
fn resolve_overlap(me: &Entity, other: &Entity) -> OverlapResolution { fn resolve_overlap(me: &Entity, other: &Entity) -> OverlapResolution {
match (&me.entity, &other.entity) { match (&me.entity, &other.entity) {
(EntityType::Hero(_), EntityType::Stairs) => OverlapResolution::Win, (EntityType::Hero(_), EntityType::Stairs) => OverlapResolution::Win,
(_, EntityType::Item(_)) => OverlapResolution::Pickup, (EntityType::Hero(_) | EntityType::Enemy(Enemy::Squid(_)), EntityType::Item(_)) => {
OverlapResolution::Pickup
}
(EntityType::MovableBlock, EntityType::Spikes(_)) => OverlapResolution::CoExist, (EntityType::MovableBlock, EntityType::Spikes(_)) => OverlapResolution::CoExist,
(_, EntityType::Spikes(switch)) => resolve_spikes(switch), (_, EntityType::Spikes(switch)) => resolve_spikes(switch),
(_, EntityType::Switch(switch)) => OverlapResolution::ToggleSystem(switch.system), (_, EntityType::Switch(switch)) => OverlapResolution::ToggleSystem(switch.system),