mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2055 from ccfreak2k/develop

Browse Source 
Implement sub_69AF1E
This commit is contained in:
Duncan
2015-10-16 06:47:09 +01:00
parent 6068b361bc b959d13c65
commit 700cb3976d
5 changed files with 343 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/localisation/string_ids.h
View File

@@ -868,6 +868,8 @@ enum {
STR_EXIT = 1924,
STR_RIDE_HAS_CRASHED = 1928,
STR_PEEP_TRACKING_NOTIFICATION_BOUGHT_X = 1936,
STR_SHOW_SUBJECT_TIP = 1937,
STR_STAFF_OVERVIEW_TIP = 1939,
@@ -1044,6 +1046,9 @@ enum {
STR_SHOP_ITEM_PLURAL_ROAST_SAUSAGE = 2164,
STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_BLUE = 2165,
STR_SHOP_ITEM_INDEFINITE_PHOTO2 = 2166,
STR_SHOP_ITEM_INDEFINITE_PHOTO3 = 2167,
STR_SHOP_ITEM_INDEFINITE_PHOTO4 = 2168,
STR_SHOP_ITEM_INDEFINITE_PRETZEL = 2169,
STR_SHOP_ITEM_INDEFINITE_HOT_CHOCOLATE = 2170,
STR_SHOP_ITEM_INDEFINITE_ICED_TEA = 2171,

245
src/peep/peep.c
View File

@@ -7785,13 +7785,254 @@ static void peep_on_enter_or_exit_ride(rct_peep *peep, int rideIndex, int flags)
}
}
/**
/** Main logic to decide whether a peep should buy an item in question
*
* Also handles the purchase as well, so once it returns, the peep will have the
* item and the money will have been deducted.
*
* eax: shopItem | (rideIndex << 8)
* ecx: price
* esi: *peep
*
* Returns 0 or 1 depending on if the peep decided to buy the item
*
* rct2: 0x0069AF1E
*/
static bool sub_69AF1E(rct_peep *peep, int rideIndex, int shopItem, money32 price)
{
return !(RCT2_CALLPROC_X(0x0069AF1E, shopItem | (rideIndex << 8), 0, price, 0, (int)peep, 0, 0) & 0x100);
rct_ride* ride = GET_RIDE(rideIndex);
money16 value;
bool has_voucher = false;
if ((peep->item_standard_flags & PEEP_ITEM_VOUCHER) &&
(peep->voucher_type == VOUCHER_TYPE_FOOD_OR_DRINK_FREE) &&
(peep->voucher_arguments == shopItem)) {
has_voucher = true;
}
if (peep_has_item(peep, shopItem)) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_ALREADY_GOT, shopItem);
return 0;
}
if (shop_item_is_food_or_drink(shopItem)) {
int food = -1;
if (food = peep_has_food_standard_flag(peep)) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_HAVENT_FINISHED, bitscanforward(food));
return 0;
} else if (food = peep_has_food_extra_flag(peep)) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_HAVENT_FINISHED, bitscanforward(food) + 32);
return 0;
} else if (peep->nausea >= 145)
return 0;
}
if ((shopItem == SHOP_ITEM_BALLOON) || (shopItem == SHOP_ITEM_ICE_CREAM)
|| (shopItem == SHOP_ITEM_COTTON_CANDY) || (shopItem == SHOP_ITEM_SUNGLASSES)) {
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, sint8) != 0)
return 0;
}
if ((shopItem == SHOP_ITEM_SUNGLASSES) || (shopItem == SHOP_ITEM_ICE_CREAM)) {
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, sint8) < 12)
return 0;
}
if (shop_item_is_food(shopItem) && (peep->hunger > 75)) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_NOT_HUNGRY, 0xFF);
return 0;
}
if (shop_item_is_drink(shopItem) && (peep->thirst > 75)) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_NOT_THIRSTY, 0xFF);
return 0;
}
if ((shopItem == SHOP_ITEM_UMBRELLA) && (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, sint8) != 0))
goto loc_69B119;
if ((shopItem != SHOP_ITEM_MAP) && shop_item_is_souvenir(shopItem) && !has_voucher) {
if (((scenario_rand() & 0x7F) + 0x73) > peep->happiness)
return 0;
else if (peep->no_of_rides < 3)
return 0;
}
loc_69B119:
if (!has_voucher) {
if (price != 0) {
if (peep->cash_in_pocket == 0) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_SPENT_MONEY, 0xFF);
return 0;
}
if (price > peep->cash_in_pocket) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_CANT_AFFORD, shopItem);
return 0;
}
}
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, uint16) >= 21)
value = get_shop_hot_value(shopItem);
else if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, uint16) <= 11)
value = get_shop_cold_value(shopItem);
else
value = get_shop_base_value(shopItem);
if (value < price) {
value -= price;
if (shopItem == SHOP_ITEM_UMBRELLA) {
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, sint8) != 0)
goto loc_69B221;
}
value = -value;
if (peep->happiness >= 128)
value /= 2;
if (peep->happiness >= 180)
value /= 2;
if (value > ((money16)(scenario_rand() & 0x07))) {
// "I'm not paying that much for x"
uint8 thought_type = (shopItem >= 32 ? (PEEP_THOUGHT_TYPE_PHOTO2_MUCH + (shopItem - 32)) : (PEEP_THOUGHT_TYPE_BALLOON_MUCH + shopItem));
peep_insert_new_thought(peep, shopItem, rideIndex);
return 0;
}
}
else {
value -= price;
value = max(8, value);
sint8 dl = value;
if ((dl >= (scenario_rand() & 0x07)) && !(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY)) {
// "This x is a really good value"
uint8 thought_item = (shopItem >= 32 ? (PEEP_THOUGHT_TYPE_PHOTO2 + (shopItem - 32)) : (PEEP_THOUGHT_TYPE_BALLOON + shopItem));
peep_insert_new_thought(peep, thought_item, rideIndex);
}
dl *= 4;
peep->happiness_growth_rate = min((peep->happiness_growth_rate + dl), 255);
peep->happiness = min((peep->happiness + dl), 255);
}
}
loc_69B221:
if (!has_voucher) {
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, uint16) >= 21)
value = get_shop_hot_value(shopItem);
else if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, uint16) <= 11)
value = get_shop_cold_value(shopItem);
else
value = get_shop_base_value(shopItem);
value -= price;
uint8 satisfaction = 0;
if (value > -8) {
satisfaction++;
if (value > -3) {
satisfaction++;
if (value > 3)
satisfaction++;
}
}
ride_update_satisfaction(ride, satisfaction);
}
// The peep has now decided to buy the item (or, specifically, has not been
// dissuaded so far).
if (shopItem >= 32)
peep->item_extra_flags |= (1 << (shopItem - 32));
else
peep->item_standard_flags |= (1 << shopItem);
if (shopItem == SHOP_ITEM_TSHIRT)
peep->tshirt_colour = ride->track_colour_main[0];
if (shopItem == SHOP_ITEM_HAT)
peep->hat_colour = ride->track_colour_main[0];
if (shopItem == SHOP_ITEM_BALLOON)
peep->balloon_colour = ride->track_colour_main[0];
if (shopItem == SHOP_ITEM_UMBRELLA)
peep->umbrella_colour = ride->track_colour_main[0];
if (shopItem == SHOP_ITEM_MAP)
sub_69A98C(peep);
uint16 dl;
if (shopItem >= 32)
dl = RCT2_ADDRESS(0x982310, uint8)[shopItem - 32];
else
dl = RCT2_ADDRESS(0x9822F4, uint8)[shopItem];
peep->var_42 = min((peep->var_42 + dl), 255);
if (shopItem == SHOP_ITEM_PHOTO)
peep->photo1_ride_ref = rideIndex;
if (shopItem == SHOP_ITEM_PHOTO2)
peep->photo2_ride_ref = rideIndex;
if (shopItem == SHOP_ITEM_PHOTO3)
peep->photo3_ride_ref = rideIndex;
if (shopItem == SHOP_ITEM_PHOTO4)
peep->photo4_ride_ref = rideIndex;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep_update_sprite_type(peep);
if (peep->flags & PEEP_FLAGS_TRACKING) {
RCT2_GLOBAL(0x13CE952,uint16) = peep->name_string_idx;
RCT2_GLOBAL((0x13CE952 + 2), uint32) = peep->id;
RCT2_GLOBAL((0x13CE956 + 2), uint16) = (shopItem >= 32 ? STR_SHOP_ITEM_INDEFINITE_PHOTO2 + (shopItem - 32) : STR_SHOP_ITEM_INDEFINITE_BALLOON + shopItem);
news_item_add_to_queue(2, STR_PEEP_TRACKING_NOTIFICATION_BOUGHT_X, peep->sprite_index);
}
if (shop_item_is_food(shopItem))
peep->no_of_food++;
if (shop_item_is_drink(shopItem))
peep->no_of_drinks++;
if (shop_item_is_souvenir(shopItem))
peep->no_of_souvenirs++;
money16* expend_type = &peep->paid_on_souvenirs;
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_SHOP_STOCK * 4;
if (shop_item_is_food(shopItem)) {
expend_type = &peep->paid_on_food;
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_FOODDRINK_STOCK * 4;
}
if (shop_item_is_drink(shopItem)) {
expend_type = &peep->paid_on_drink;
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) = RCT_EXPENDITURE_TYPE_FOODDRINK_STOCK * 4;
}
if (!(RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_NO_MONEY))
finance_payment(get_shop_item_cost(shopItem), (RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) / 4));
// Sets the expenditure type to *_FOODDRINK_SALES or *_SHOP_SALES appropriately.
RCT2_GLOBAL(RCT2_ADDRESS_NEXT_EXPENDITURE_TYPE, uint8) -= 4;
if (!has_voucher)
peep_spend_money(peep, expend_type, price);
else {
peep->item_standard_flags &= ~PEEP_ITEM_VOUCHER;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
ride->total_profit += (price - get_shop_item_cost(shopItem));
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->var_120++;
ride->total_customers++;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;
return 1;
}
/**

2
src/peep/peep.h
View File

@@ -443,7 +443,7 @@ typedef struct {
uint8 photo2_ride_ref; // 0x5C
uint8 photo3_ride_ref; // 0x5D
uint8 photo4_ride_ref; // 0x5E
uint8 pad_5F[0x09]; // 0x5C
uint8 pad_5F[0x09]; // 0x5F
uint8 current_ride; // 0x68
uint8 current_ride_station; // 0x69
uint8 current_train; // 0x6A

88
src/ride/ride.c
View File

@@ -239,6 +239,27 @@ money32 get_shop_item_cost(int shopItem)
RCT2_GLOBAL(0x00982144 + (shopItem * 8), uint16);
}
money16 get_shop_base_value(int shopItem)
{
return shopItem < 32 ?
RCT2_GLOBAL((0x00982164 + 2) + (shopItem * 8), uint16) :
RCT2_GLOBAL((0x00982144 + 2) + (shopItem * 8), uint16);
}
money16 get_shop_cold_value(int shopItem)
{
return shopItem < 32 ?
RCT2_GLOBAL((0x00982164 + 4) + (shopItem * 8), uint16) :
RCT2_GLOBAL((0x00982144 + 4) + (shopItem * 8), uint16);
}
money16 get_shop_hot_value(int shopItem)
{
return shopItem < 32 ?
RCT2_GLOBAL((0x00982164 + 6) + (shopItem * 8), uint16) :
RCT2_GLOBAL((0x00982144 + 6) + (shopItem * 8), uint16);
}
/**
*
* rct2: 0x006AC3AB
@@ -7001,7 +7022,6 @@ bool shop_item_is_food_or_drink(int shopItem)
case SHOP_ITEM_CHOCOLATE:
case SHOP_ITEM_ICED_TEA:
case SHOP_ITEM_FUNNEL_CAKE:
case SHOP_ITEM_SUNGLASSES:
case SHOP_ITEM_BEEF_NOODLES:
case SHOP_ITEM_FRIED_RICE_NOODLES:
case SHOP_ITEM_WONTON_SOUP:
@@ -7018,6 +7038,72 @@ bool shop_item_is_food_or_drink(int shopItem)
}
}
bool shop_item_is_food(int shopItem)
{
switch (shopItem) {
case SHOP_ITEM_BURGER:
case SHOP_ITEM_FRIES:
case SHOP_ITEM_ICE_CREAM:
case SHOP_ITEM_COTTON_CANDY:
case SHOP_ITEM_PIZZA:
case SHOP_ITEM_POPCORN:
case SHOP_ITEM_HOT_DOG:
case SHOP_ITEM_TENTACLE:
case SHOP_ITEM_CANDY_APPLE:
case SHOP_ITEM_DONUT:
case SHOP_ITEM_CHICKEN:
case SHOP_ITEM_PRETZEL:
case SHOP_ITEM_FUNNEL_CAKE:
case SHOP_ITEM_BEEF_NOODLES:
case SHOP_ITEM_FRIED_RICE_NOODLES:
case SHOP_ITEM_WONTON_SOUP:
case SHOP_ITEM_MEATBALL_SOUP:
case SHOP_ITEM_SUB_SANDWICH:
case SHOP_ITEM_COOKIE:
case SHOP_ITEM_ROAST_SAUSAGE:
return true;
default:
return false;
}
}
bool shop_item_is_drink(int shopItem)
{
switch (shopItem) {
case SHOP_ITEM_DRINK:
case SHOP_ITEM_COFFEE:
case SHOP_ITEM_LEMONADE:
case SHOP_ITEM_CHOCOLATE:
case SHOP_ITEM_ICED_TEA:
case SHOP_ITEM_FRUIT_JUICE:
case SHOP_ITEM_SOYBEAN_MILK:
case SHOP_ITEM_SU_JONGKWA:
return true;
default:
return false;
}
}
bool shop_item_is_souvenir(int shopItem)
{
switch (shopItem) {
case SHOP_ITEM_BALLOON:
case SHOP_ITEM_TOY:
case SHOP_ITEM_MAP:
case SHOP_ITEM_PHOTO:
case SHOP_ITEM_UMBRELLA:
case SHOP_ITEM_HAT:
case SHOP_ITEM_TSHIRT:
case SHOP_ITEM_PHOTO2:
case SHOP_ITEM_PHOTO3:
case SHOP_ITEM_PHOTO4:
case SHOP_ITEM_SUNGLASSES:
return true;
default:
return false;
}
}
void ride_reset_all_names()
{
int i;

7
src/ride/ride.h
View File

@@ -932,6 +932,10 @@ void ride_update_all();
void ride_check_all_reachable();
void ride_update_satisfaction(rct_ride* ride, uint8 happiness);
void ride_update_popularity(rct_ride* ride, uint8 pop_amount);
money32 get_shop_item_cost(int shopItem);
money16 get_shop_base_value(int shopItem);
money16 get_shop_hot_value(int shopItem);
money16 get_shop_cold_value(int shopItem);
int sub_6CAF80(int rideIndex, rct_xy_element *output);
int ride_find_track_gap(rct_xy_element *input, rct_xy_element *output);
void ride_construct_new(ride_list_item listItem);
@@ -1045,6 +1049,9 @@ bool ride_type_is_intamin(int rideType);
void sub_6C94D8();
bool shop_item_is_food_or_drink(int shopItem);
bool shop_item_is_food(int shopItem);
bool shop_item_is_drink(int shopItem);
bool shop_item_is_souvenir(int shopItem);
void ride_reset_all_names();
const uint8* ride_seek_available_modes(rct_ride *ride);