Depositing resources increases player resources
This commit is contained in:
@@ -154,7 +154,8 @@ BzBTStatus aiHarvestRes(AIBlackboard *data, f32 dt) {
|
|||||||
i32 spareCapacity = worker->carryCapacity - worker->carry;
|
i32 spareCapacity = worker->carryCapacity - worker->carry;
|
||||||
BZ_ASSERT(spareCapacity >= 0);
|
BZ_ASSERT(spareCapacity >= 0);
|
||||||
i32 collected = harvestEvent(harvestTarget, (HarvestEvent) {
|
i32 collected = harvestEvent(harvestTarget, (HarvestEvent) {
|
||||||
.amount = BZ_MIN(1, spareCapacity)
|
.amount = BZ_MIN(1, spareCapacity),
|
||||||
|
.type = worker->carryRes
|
||||||
});
|
});
|
||||||
worker->carry += collected;
|
worker->carry += collected;
|
||||||
|
|
||||||
@@ -178,7 +179,8 @@ BzBTStatus aiDepositRes(AIBlackboard *data, f32 dt) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
depositEvent(depositTarget, (DepositEvent) {
|
depositEvent(depositTarget, (DepositEvent) {
|
||||||
.amount = worker->carry
|
.amount = worker->carry,
|
||||||
|
.type = worker->carryRes
|
||||||
});
|
});
|
||||||
worker->carry = 0;
|
worker->carry = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ void igResource(ecs_world_t *ecs,
|
|||||||
void igOwner(ecs_world_t *ecs,
|
void igOwner(ecs_world_t *ecs,
|
||||||
ecs_entity_t entity, ecs_entity_t comp) {
|
ecs_entity_t entity, ecs_entity_t comp) {
|
||||||
Owner *owner = ecs_get_mut_id(ecs, entity, comp);
|
Owner *owner = ecs_get_mut_id(ecs, entity, comp);
|
||||||
igInputInt("PlayerID", &owner->player, 0, 0, 0);
|
igText("PlayerID: %d", owner->player);
|
||||||
}
|
}
|
||||||
|
|
||||||
void igSpatialGridID(ecs_world_t *ecs,
|
void igSpatialGridID(ecs_world_t *ecs,
|
||||||
|
|||||||
@@ -124,9 +124,11 @@ extern ECS_COMPONENT_DECLARE(Easing);
|
|||||||
* Event components
|
* Event components
|
||||||
*********************************************************/
|
*********************************************************/
|
||||||
typedef struct HarvestEvent {
|
typedef struct HarvestEvent {
|
||||||
|
ResourceType type;
|
||||||
i32 amount;
|
i32 amount;
|
||||||
} HarvestEvent;
|
} HarvestEvent;
|
||||||
typedef struct DepositEvent {
|
typedef struct DepositEvent {
|
||||||
|
ResourceType type;
|
||||||
i32 amount;
|
i32 amount;
|
||||||
} DepositEvent;
|
} DepositEvent;
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ i32 harvestEvent(ecs_entity_t entity, HarvestEvent event) {
|
|||||||
soundsPlay(sounds, SOUND_WOOD_PUNCH);
|
soundsPlay(sounds, SOUND_WOOD_PUNCH);
|
||||||
|
|
||||||
Resource *res = ecs_get_mut(ECS, entity, Resource);
|
Resource *res = ecs_get_mut(ECS, entity, Resource);
|
||||||
|
BZ_ASSERT(res->type == event.type);
|
||||||
event.amount = BZ_MIN(event.amount, res->amount);
|
event.amount = BZ_MIN(event.amount, res->amount);
|
||||||
res->amount -= event.amount;
|
res->amount -= event.amount;
|
||||||
|
|
||||||
@@ -32,4 +33,24 @@ i32 harvestEvent(ecs_entity_t entity, HarvestEvent event) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void depositEvent(ecs_entity_t entity, DepositEvent event) {
|
void depositEvent(ecs_entity_t entity, DepositEvent event) {
|
||||||
|
BZ_ASSERT(ecs_has(ECS, entity, Storage));
|
||||||
|
BZ_ASSERT(ecs_has(ECS, entity, Owner));
|
||||||
|
|
||||||
|
Owner owner = *ecs_get(ECS, entity, Owner);
|
||||||
|
Game *game = ecs_singleton_get_mut(ECS, Game);
|
||||||
|
PlayerResources *res = &game->playerResources[owner.player];
|
||||||
|
switch (event.type) {
|
||||||
|
case RES_WOOD:
|
||||||
|
res->wood += event.amount;
|
||||||
|
break;
|
||||||
|
case RES_GOLD:
|
||||||
|
res->gold += event.amount;
|
||||||
|
break;
|
||||||
|
case RES_FOOD:
|
||||||
|
res->food += event.amount;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
BZ_ASSERT(false);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user