Merge remote-tracking branch 'origin/upgrade_balance'
This commit is contained in:
commit
8a019c6c36
@ -2155,7 +2155,7 @@ void FP_Update(TELY_Platform *platform, FP_Game *game, TELY_PlatformInput *input
|
|||||||
mob->waypoints = FP_SentinelList_Init<FP_GameWaypoint>(game->play.chunk_pool);
|
mob->waypoints = FP_SentinelList_Init<FP_GameWaypoint>(game->play.chunk_pool);
|
||||||
mob->flags |= FP_GameEntityFlag_Aggros;
|
mob->flags |= FP_GameEntityFlag_Aggros;
|
||||||
mob->flags |= FP_GameEntityFlag_RespondsToBuildings;
|
mob->flags |= FP_GameEntityFlag_RespondsToBuildings;
|
||||||
mob->hp_cap += hp_adjustment;
|
mob->hp_cap *= hp_adjustment;
|
||||||
mob->hp = mob->hp_cap;
|
mob->hp = mob->hp_cap;
|
||||||
|
|
||||||
for (FP_GameEntity *waypoint_entity = entity->first_child; waypoint_entity; waypoint_entity = waypoint_entity->next) {
|
for (FP_GameEntity *waypoint_entity = entity->first_child; waypoint_entity; waypoint_entity = waypoint_entity->next) {
|
||||||
@ -2786,7 +2786,7 @@ void FP_Render(FP_Game *game, TELY_Platform *platform, TELY_Renderer *renderer,
|
|||||||
|
|
||||||
if (mapping.merchant == game->play.merchant_terry) {
|
if (mapping.merchant == game->play.merchant_terry) {
|
||||||
// TODO(doyle): Attack damage? Or increase attack range?
|
// TODO(doyle): Attack damage? Or increase attack range?
|
||||||
player->base_attack += DQN_CAST(uint32_t)(FP_DEFAULT_DAMAGE * .3f);
|
player->base_attack += DQN_CAST(uint32_t)(FP_DEFAULT_DAMAGE * 1.2f);
|
||||||
} else if (mapping.merchant == game->play.merchant_graveyard) {
|
} else if (mapping.merchant == game->play.merchant_graveyard) {
|
||||||
player->stamina_cap += DQN_CAST(uint32_t)(FP_TERRY_DASH_STAMINA_COST * .5f);
|
player->stamina_cap += DQN_CAST(uint32_t)(FP_TERRY_DASH_STAMINA_COST * .5f);
|
||||||
} else if (mapping.merchant == game->play.merchant_gym) {
|
} else if (mapping.merchant == game->play.merchant_gym) {
|
||||||
|
Loading…
Reference in New Issue
Block a user