Skip to content

Commit

Permalink
Allow warehouses stockpiling resources to get them from other warehouses
Browse files Browse the repository at this point in the history
  • Loading branch information
@crudelios
crudelios committed Aug 1, 2023
1 parent e449412 commit f03705e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 37 deletions.
29 changes: 14 additions & 15 deletions src/building/warehouse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ int building_warehouses_add_resource(int resource, int amount, int respect_setti
if (amount <= 0) {
return 0;
}

for (building *b = building_first_of_type(BUILDING_WAREHOUSE); b; b = b->next_of_type) {
if (b->state != BUILDING_STATE_IN_USE) {
continue;
Expand Down Expand Up @@ -279,9 +279,9 @@ int building_warehouse_is_accepting(int resource, building *b)
int amount = building_warehouse_get_amount(b, resource);
if (!b->has_plague &&
((s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_3QUARTERS && amount < THREEQ_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_HALF && amount < HALF_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_QUARTER && amount < QUARTER_WAREHOUSE))) {
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_3QUARTERS && amount < THREEQ_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_HALF && amount < HALF_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_ACCEPTING_QUARTER && amount < QUARTER_WAREHOUSE))) {
return 1;
} else {
return 0;
Expand All @@ -292,11 +292,11 @@ int building_warehouse_is_getting(int resource, building *b)
{
const building_storage *s = building_storage_get(b->storage_id);
int amount = building_warehouse_get_amount(b, resource);
if (!b->has_plague &&
if (!b->has_plague &&
((s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_3QUARTERS && amount < THREEQ_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_HALF && amount < HALF_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_QUARTER && amount < QUARTER_WAREHOUSE))) {
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_3QUARTERS && amount < THREEQ_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_HALF && amount < HALF_WAREHOUSE) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_QUARTER && amount < QUARTER_WAREHOUSE))) {
return 1;
} else {
return 0;
Expand All @@ -308,9 +308,9 @@ static int warehouse_is_gettable(int resource, building *b)
const building_storage *s = building_storage_get(b->storage_id);
if (!b->has_plague &&
((s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_HALF) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_3QUARTERS) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_QUARTER))) {
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_HALF) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_3QUARTERS) ||
(s->resource_state[resource] == BUILDING_STORAGE_STATE_GETTING_QUARTER))) {
return 1;
} else {
return 0;
Expand Down Expand Up @@ -688,9 +688,6 @@ static int contains_non_stockpiled_food(building *space, const int *resources)

int building_warehouse_determine_worker_task(building *warehouse, int *resource)
{
if (!building_storage_get_permission(BUILDING_STORAGE_PERMISSION_WORKER, warehouse)) {
return WAREHOUSE_TASK_NONE; // Disabled by player
}
int pct_workers = calc_percentage(warehouse->num_workers, model_get_building(warehouse->type)->laborers);
if (pct_workers < 50) {
return WAREHOUSE_TASK_NONE;
Expand Down Expand Up @@ -733,7 +730,9 @@ int building_warehouse_determine_worker_task(building *warehouse, int *resource)
return WAREHOUSE_TASK_GETTING;
}
}

if (!building_storage_get_permission(BUILDING_STORAGE_PERMISSION_WORKER, warehouse)) {
return WAREHOUSE_TASK_NONE;
}
// deliver weapons to barracks
if ((building_count_active(BUILDING_BARRACKS) || building_count_active(BUILDING_GRAND_TEMPLE_MARS)) &&
!city_resource_is_stockpiled(RESOURCE_WEAPONS)) {
Expand Down
43 changes: 21 additions & 22 deletions src/window/building/distribution.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ static void draw_permissions_buttons(int x, int y, int buttons, building_info_co
};
int offsets[] = { 96, 132, 96, 96 };
int dx = x;
for (int i = 0; i < buttons; i++)
{
for (int i = 0; i < buttons; i++) {
int rule_id = rules[i];
button_border_draw(dx, y, 20, 20, data.permission_focus_button_id == i + 1 ? 1 : 0);
if (building_storage_get_permission(rule_id, building_get(data.building_id))) {
Expand Down Expand Up @@ -490,7 +489,7 @@ void window_building_draw_distributor_orders(building_info_context *c, const uin
}

int scrollbar_shown = scrollbar.max_scroll_position > 0;

inner_panel_draw(c->x_offset + 16, y_offset + 42, c->width_blocks - (scrollbar_shown ? 4 : 2), 21);
}

Expand Down Expand Up @@ -624,7 +623,7 @@ void window_building_draw_granary(building_info_context *c)
generate_granary_resource_list(b);
y_offset_blocks = ((data.stored_resources.size - 1) / 2 - 3) * 2 + 2;
}
c->height_blocks = 22 + y_offset_blocks;
c->height_blocks = 22 + y_offset_blocks;
outer_panel_draw(c->x_offset, c->y_offset, c->width_blocks, c->height_blocks);

text_draw_label_and_number_centered(lang_get_string(28, b->type), b->storage_id, "",
Expand Down Expand Up @@ -768,21 +767,21 @@ static void draw_button_from_state(int state, int x, int y, building_type type,
case BUILDING_STORAGE_STATE_GETTING_3QUARTERS:
case BUILDING_STORAGE_STATE_GETTING_HALF:
case BUILDING_STORAGE_STATE_GETTING_QUARTER:
{
int image_width = image_get(image_group(GROUP_CONTEXT_ICONS) + 12)->width + 15;
int group_number;
if (resource_is_food(resource)) {
// Check whether to use "getting goods" or "getting food"
group_number = 10;
} else {
group_number = 9;
}
int text_width = lang_text_get_width(99, group_number, FONT_NORMAL_WHITE);
int start_x = x + (210 - image_width - text_width) / 2;
image_draw(image_group(GROUP_CONTEXT_ICONS) + 12, start_x, y - 2, COLOR_MASK_NONE, SCALE_NONE);
lang_text_draw(99, group_number, start_x + image_width, y, FONT_NORMAL_WHITE);
break;
{
int image_width = image_get(image_group(GROUP_CONTEXT_ICONS) + 12)->width + 15;
int group_number;
if (resource_is_food(resource)) {
// Check whether to use "getting goods" or "getting food"
group_number = 10;
} else {
group_number = 9;
}
int text_width = lang_text_get_width(99, group_number, FONT_NORMAL_WHITE);
int start_x = x + (210 - image_width - text_width) / 2;
image_draw(image_group(GROUP_CONTEXT_ICONS) + 12, start_x, y - 2, COLOR_MASK_NONE, SCALE_NONE);
lang_text_draw(99, group_number, start_x + image_width, y, FONT_NORMAL_WHITE);
break;
}
case BUILDING_STORAGE_STATE_NOT_ACCEPTING:
case BUILDING_STORAGE_STATE_NOT_ACCEPTING_3QUARTERS:
case BUILDING_STORAGE_STATE_NOT_ACCEPTING_HALF:
Expand Down Expand Up @@ -872,7 +871,7 @@ int window_building_handle_mouse_granary_orders(const mouse *m, building_info_co

int buttons_to_show = city_resource_get_potential_foods()->size < scrollbar.elements_in_view ?
city_resource_get_potential_foods()->size : scrollbar.elements_in_view;

return scrollbar_handle_mouse(&scrollbar, m, 1) ||
generic_buttons_handle_mouse(m, c->x_offset + 172, y_offset + 46, orders_resource_buttons, buttons_to_show,
&data.resource_focus_button_id) ||
Expand Down Expand Up @@ -1102,7 +1101,7 @@ int window_building_handle_mouse_warehouse_orders(const mouse *m, building_info_

int buttons_to_show = city_resource_get_potential()->size < scrollbar.elements_in_view ?
city_resource_get_potential()->size : scrollbar.elements_in_view;

return scrollbar_handle_mouse(&scrollbar, m, 1) ||
generic_buttons_handle_mouse(m, c->x_offset + 172, y_offset + 46, orders_resource_buttons, buttons_to_show,
&data.resource_focus_button_id) ||
Expand Down Expand Up @@ -1130,7 +1129,7 @@ void window_building_warehouse_get_tooltip_distribution_permissions(int *transla
if (data.image_button_focus_id) {
building *b = building_get(data.building_id);
if (building_storage_get_permission(BUILDING_STORAGE_PERMISSION_WORKER, b)) {
*translation = TR_TOOLTIP_BUTTON_ACCEPT_WORKERS;
*translation = TR_TOOLTIP_BUTTON_ACCEPT_WORKERS;
} else {
*translation = TR_TOOLTIP_BUTTON_REJECT_WORKERS;
}
Expand Down Expand Up @@ -1191,7 +1190,7 @@ const uint8_t *window_building_dock_get_tooltip(building_info_context *c)
continue;
}
if (traded > 0) {
cursor = string_copy(string_from_ascii(", "), cursor, 400 - (int) (cursor - text));
cursor = string_copy(string_from_ascii(", "), cursor, 400 - (int) (cursor - text));
}
traded++;
cursor = string_copy(resource_get_data(resource)->text, cursor, 400 - (int) (cursor - text));
Expand Down

0 comments on commit f03705e

Please sign in to comment.