mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-23 10:51:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Define constants for max energy and happiness, cap energy to 128 instead of 255

Browse source
This commit is contained in:
Gymnasiast 2017-07-26 17:11:58 +02:00 committed by Michael Steenbeek
parent 2b540b9da1
commit 38c504685e
5 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/openrct2/network/network.h
View file

@ -55,7 +55,7 @@ extern "C" {
// This define specifies which version of network stream current build uses. // This define specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "9" #define NETWORK_STREAM_VERSION "10"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
#ifdef __cplusplus #ifdef __cplusplus

26
src/openrct2/peep/peep.c
View file

@ -684,7 +684,8 @@ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 c
static void peep_update_hunger(rct_peep *peep){ static void peep_update_hunger(rct_peep *peep){
if (peep->hunger >= 3){ if (peep->hunger >= 3){
peep->hunger -= 2; peep->hunger -= 2;
peep->energy_target = min(peep->energy_target + 2, 255); // Originally capped at 255 instead of 128 (the actual max value), like a mistake since most other values do max out at 255.
peep->energy_target = min(peep->energy_target + 2, PEEP_MAX_ENERGY);
peep->bathroom = min(peep->bathroom + 1, 255); peep->bathroom = min(peep->bathroom + 1, 255);
} }
} }
@ -982,7 +983,7 @@ static void sub_68F41A(rct_peep *peep, sint32 index)
if (thought_type != PEEP_THOUGHT_TYPE_NONE) { if (thought_type != PEEP_THOUGHT_TYPE_NONE) {
peep_insert_new_thought(peep, thought_type, 0xFF); peep_insert_new_thought(peep, thought_type, 0xFF);
peep->happiness_target = min(255, peep->happiness_target + 45); peep->happiness_target = min(PEEP_MAX_HAPPINESS, peep->happiness_target + 45);
} }
} }
} }
@ -1313,9 +1314,8 @@ static void sub_68F41A(rct_peep *peep, sint32 index)
if (energy < 32) if (energy < 32)
energy = 32; energy = 32;
/* This suggests 100% energy is 128. */ /* Previous code here suggested maximum energy is 128. */
if (energy > 128) energy = max(PEEP_MAX_ENERGY, energy);
energy = 128;
if (energy != peep->energy){ if (energy != peep->energy){
peep->energy = energy; peep->energy = energy;
@ -4071,7 +4071,7 @@ static void peep_update_ride_sub_state_20(rct_peep* peep){
peep->destination_x = x; peep->destination_x = x;
peep->destination_y = y; peep->destination_y = y;
peep->destination_tolerence = 3; peep->destination_tolerence = 3;
peep->happiness_target = min(peep->happiness_target + 30, 255); peep->happiness_target = min(peep->happiness_target + 30, PEEP_MAX_HAPPINESS);
peep->happiness = peep->happiness_target; peep->happiness = peep->happiness_target;
} }
else{ else{
@ -4099,7 +4099,7 @@ static void peep_update_ride_sub_state_20(rct_peep* peep){
peep->destination_y = y; peep->destination_y = y;
peep->destination_tolerence = 3; peep->destination_tolerence = 3;
peep->happiness_target = min(peep->happiness_target + 30, 255); peep->happiness_target = min(peep->happiness_target + 30, PEEP_MAX_HAPPINESS);
peep->happiness = peep->happiness_target; peep->happiness = peep->happiness_target;
peep_stop_purchase_thought(peep, ride->type); peep_stop_purchase_thought(peep, ride->type);
@ -7209,7 +7209,7 @@ rct_peep *peep_generate(sint32 x, sint32 y, sint32 z)
/* Initial value will vary by -15..16 */ /* Initial value will vary by -15..16 */
sint8 happiness_delta = (peep_rand() & 0x1F) - 15; sint8 happiness_delta = (peep_rand() & 0x1F) - 15;
/* Adjust by the delta, clamping at min=0 and max=255. */ /* Adjust by the delta, clamping at min=0 and max=255. */
peep->happiness = clamp(0, peep->happiness + happiness_delta, 255); peep->happiness = clamp(0, peep->happiness + happiness_delta, PEEP_MAX_HAPPINESS);
peep->happiness_target = peep->happiness; peep->happiness_target = peep->happiness;
peep->nausea = 0; peep->nausea = 0;
peep->nausea_target = 0; peep->nausea_target = 0;
@ -7288,7 +7288,7 @@ rct_peep *peep_generate(sint32 x, sint32 y, sint32 z)
peep->trousers_colour = trouser_colours[trousers_colour]; peep->trousers_colour = trouser_colours[trousers_colour];
/* It looks like 65 is about 50% energy level, so this initialises /* It looks like 65 is about 50% energy level, so this initialises
* a peep with approx 50%-100% energy. */ * a peep with approx 50%-100% energy (0x3F = 63, 63 + 65 = 128). */
uint8 energy = (peep_rand() & 0x3F) + 65; uint8 energy = (peep_rand() & 0x3F) + 65;
peep->energy = energy; peep->energy = energy;
peep->energy_target = energy; peep->energy_target = energy;
@ -10634,7 +10634,7 @@ static void peep_on_enter_ride(rct_peep *peep, sint32 rideIndex)
peep_set_has_ridden(peep, peep->current_ride); peep_set_has_ridden(peep, peep->current_ride);
peep_update_favourite_ride(peep, ride); peep_update_favourite_ride(peep, ride);
peep->happiness_target = clamp(0, peep->happiness_target + satisfaction, 255); peep->happiness_target = clamp(0, peep->happiness_target + satisfaction, PEEP_MAX_HAPPINESS);
peep_update_ride_nausea_growth(peep, ride); peep_update_ride_nausea_growth(peep, ride);
} }
@ -10651,7 +10651,7 @@ static void peep_on_enter_ride(rct_peep *peep, sint32 rideIndex)
static void peep_update_favourite_ride(rct_peep *peep, rct_ride *ride) static void peep_update_favourite_ride(rct_peep *peep, rct_ride *ride)
{ {
peep->peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE; peep->peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
uint8 peepRideRating = clamp(0, (ride->excitement / 4) + peep->happiness, 255); uint8 peepRideRating = clamp(0, (ride->excitement / 4) + peep->happiness, PEEP_MAX_HAPPINESS);
if (peepRideRating >= peep->favourite_ride_rating) { if (peepRideRating >= peep->favourite_ride_rating) {
if (peep->happiness >= 160 && peep->happiness_target >= 160) { if (peep->happiness >= 160 && peep->happiness_target >= 160) {
peep->favourite_ride_rating = peepRideRating; peep->favourite_ride_rating = peepRideRating;
@ -11042,8 +11042,8 @@ loc_69B119:
} }
sint32 happinessGrowth = value * 4; sint32 happinessGrowth = value * 4;
peep->happiness_target = min((peep->happiness_target + happinessGrowth), 255); peep->happiness_target = min((peep->happiness_target + happinessGrowth), PEEP_MAX_HAPPINESS);
peep->happiness = min((peep->happiness + happinessGrowth), 255); peep->happiness = min((peep->happiness + happinessGrowth), PEEP_MAX_HAPPINESS);
} }
} }

3
src/openrct2/peep/peep.h
View file

@ -31,6 +31,9 @@
#define PEEP_NOEXIT_WARNING_THRESHOLD 8 #define PEEP_NOEXIT_WARNING_THRESHOLD 8
#define PEEP_LOST_WARNING_THRESHOLD 8 #define PEEP_LOST_WARNING_THRESHOLD 8
#define PEEP_MAX_HAPPINESS 255
#define PEEP_MAX_ENERGY 128
enum PEEP_TYPE { enum PEEP_TYPE {
PEEP_TYPE_GUEST, PEEP_TYPE_GUEST,
PEEP_TYPE_STAFF PEEP_TYPE_STAFF

4
src/openrct2/peep/staff.c
View file

@ -1455,7 +1455,7 @@ static void staff_entertainer_update_nearby_peeps(rct_peep* peep) {
continue; continue;
if (peep->state == PEEP_STATE_WALKING) { if (peep->state == PEEP_STATE_WALKING) {
peep->happiness_target = min(peep->happiness_target + 4, 255); peep->happiness_target = min(peep->happiness_target + 4, PEEP_MAX_HAPPINESS);
} }
else if (peep->state == PEEP_STATE_QUEUING) { else if (peep->state == PEEP_STATE_QUEUING) {
if(peep->time_in_queue > 200) { if(peep->time_in_queue > 200) {
@ -1464,7 +1464,7 @@ static void staff_entertainer_update_nearby_peeps(rct_peep* peep) {
else { else {
peep->time_in_queue = 0; peep->time_in_queue = 0;
} }
peep->happiness_target = min(peep->happiness_target + 3, 255); peep->happiness_target = min(peep->happiness_target + 3, PEEP_MAX_HAPPINESS);
} }
} }
} }

4
src/openrct2/windows/cheats.c
View file

@ -609,13 +609,13 @@ static void window_cheats_guests_mouseup(rct_window *w, rct_widgetindex widgetIn
window_cheats_set_page(w, widgetIndex - WIDX_TAB_1); window_cheats_set_page(w, widgetIndex - WIDX_TAB_1);
break; break;
case WIDX_GUEST_HAPPINESS_MAX: case WIDX_GUEST_HAPPINESS_MAX:
game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_HAPPINESS, GAME_COMMAND_CHEAT, 255, 0); game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_HAPPINESS, GAME_COMMAND_CHEAT, PEEP_MAX_HAPPINESS, 0);
break; break;
case WIDX_GUEST_HAPPINESS_MIN: case WIDX_GUEST_HAPPINESS_MIN:
game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_HAPPINESS, GAME_COMMAND_CHEAT, 0, 0); game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_HAPPINESS, GAME_COMMAND_CHEAT, 0, 0);
break; break;
case WIDX_GUEST_ENERGY_MAX: case WIDX_GUEST_ENERGY_MAX:
game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT, 127, 0); game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT, PEEP_MAX_ENERGY, 0);
break; break;
case WIDX_GUEST_ENERGY_MIN: case WIDX_GUEST_ENERGY_MIN:
game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT, 0, 0); game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT, 0, 0);