Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve f_consume_item_sum and f_has_items_sum, use it more #77791

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Improve f_consume_item_sum and f_has_items_sum, use it more #77791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d11ae1a
Improve f_consume_item_sum and f_has_items_sum, use it more
GuardianDll Nov 12, 2024
7a2b8cb
add missing quilts to lumbermill quest
GuardianDll Nov 13, 2024
01a9455
rename vector
GuardianDll Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 0 additions & 96 deletions data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,102 +132,6 @@
"effect": [ { "u_sell_item": "drivebelt", "count": 3 } ],
"false_effect": [ { "u_sell_item": "drivebelt_makeshift", "count": 3 } ]
},
{
"type": "effect_on_condition",
"id": "EOC_MISSION_LUMBERMILL_GET_6_BLANKETS_done",
"global": true,
"condition": {
"or": [
{ "u_has_items": { "item": "blanket", "count": 6 } },
{ "u_has_items": { "item": "fur_blanket", "count": 6 } },
{ "u_has_items": { "item": "electric_blanket", "count": 6 } },
{ "u_has_items": { "item": "quilt", "count": 6 } },
{ "u_has_items": { "item": "quilt_patchwork", "count": 6 } }
]
},
"effect": [
{
"run_eocs": [
{
"id": "sell_blanket",
"condition": { "u_has_items": { "item": "blanket", "count": 6 } },
"effect": { "u_sell_item": "blanket", "count": 6 }
},
{
"id": "sell_fur_blanket",
"condition": { "u_has_items": { "item": "fur_blanket", "count": 6 } },
"effect": { "u_sell_item": "fur_blanket", "count": 6 }
},
{
"id": "sell_electric_blanket",
"condition": { "u_has_items": { "item": "electric_blanket", "count": 6 } },
"effect": { "u_sell_item": "electric_blanket", "count": 6 }
},
{
"id": "sell_quilt",
"condition": { "u_has_items": { "item": "quilt", "count": 6 } },
"effect": { "u_sell_item": "quilt", "count": 6 }
},
{
"id": "sell_quilt_patchwork",
"condition": { "u_has_items": { "item": "quilt_patchwork", "count": 6 } },
"effect": { "u_sell_item": "quilt_patchwork", "count": 6 }
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_MISSION_GODCO_TROPHY2_done",
"global": true,
"condition": {
"or": [
{ "u_has_items": { "item": "egg_spider_cellar", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_jumping", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_trapdoor", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_web", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_widow", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_wolf", "count": 1 } }
]
},
"effect": [
{
"run_eocs": [
{
"id": "sell_egg_spider_cellar",
"condition": { "u_has_items": { "item": "egg_spider_cellar", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_cellar", "count": 1 }
},
{
"id": "sell_egg_spider_jumping",
"condition": { "u_has_items": { "item": "egg_spider_jumping", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_jumping", "count": 1 }
},
{
"id": "sell_egg_spider_trapdoor",
"condition": { "u_has_items": { "item": "egg_spider_trapdoor", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_trapdoor", "count": 1 }
},
{
"id": "sell_egg_spider_web",
"condition": { "u_has_items": { "item": "egg_spider_web", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_web", "count": 1 }
},
{
"id": "sell_egg_spider_widow",
"condition": { "u_has_items": { "item": "egg_spider_widow", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_widow", "count": 1 }
},
{
"id": "sell_egg_spider_wolf",
"condition": { "u_has_items": { "item": "egg_spider_wolf", "count": 1 } },
"effect": { "u_sell_item": "egg_spider_wolf", "count": 1 }
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_BANDIT_ASSASSIN",
Expand Down
25 changes: 17 additions & 8 deletions data/json/npcs/godco/godco_missions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@
"value": 0,
"count": 1,
"goal_condition": {
"or": [
{ "u_has_items": { "item": "egg_spider_cellar", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_jumping", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_trapdoor", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_web", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_widow", "count": 1 } },
{ "u_has_items": { "item": "egg_spider_wolf", "count": 1 } }
"u_has_items_sum": [
{ "item": "egg_spider_cellar", "amount": 1 },
{ "item": "egg_spider_jumping", "amount": 1 },
{ "item": "egg_spider_trapdoor", "amount": 1 },
{ "item": "egg_spider_web", "amount": 1 },
{ "item": "egg_spider_widow", "amount": 1 },
{ "item": "egg_spider_wolf", "amount": 1 }
]
},
"origins": [ "ORIGIN_SECONDARY" ],
Expand All @@ -397,7 +397,16 @@
"effect": [
{ "u_spawn_item": "270win_jsp", "count": 4 },
{ "u_spawn_item": "icon", "count": 5 },
{ "run_eocs": "EOC_MISSION_GODCO_TROPHY2_done" }
{
"u_consume_item_sum": [
{ "item": "egg_spider_cellar", "amount": 1 },
{ "item": "egg_spider_jumping", "amount": 1 },
{ "item": "egg_spider_trapdoor", "amount": 1 },
{ "item": "egg_spider_web", "amount": 1 },
{ "item": "egg_spider_widow", "amount": 1 },
{ "item": "egg_spider_wolf", "amount": 1 }
]
}
],
"opinion": { "trust": 2, "value": 2 }
},
Expand Down
24 changes: 17 additions & 7 deletions data/json/npcs/lumbermill_employees/lumbermill_missions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,28 @@
"value": 4000,
"//": "Dynamic response dialogs would be more natural to accept so many alternate items here.",
"goal_condition": {
"or": [
{ "u_has_items": { "item": "blanket", "count": 6 } },
{ "u_has_items": { "item": "fur_blanket", "count": 6 } },
{ "u_has_items": { "item": "electric_blanket", "count": 6 } },
{ "u_has_items": { "item": "quilt", "count": 6 } },
{ "u_has_items": { "item": "quilt_patchwork", "count": 6 } }
"u_has_items_sum": [
{ "item": "blanket", "amount": 6 },
{ "item": "fur_blanket", "amount": 6 },
{ "item": "down_blanket", "amount": 6 },
{ "item": "blanket_weighted", "amount": 6 },
{ "item": "quilt", "amount": 6 },
{ "item": "quilt_patchwork", "amount": 6 },
{ "item": "electric_blanket", "amount": 6 }
]
},
"origins": [ "ORIGIN_SECONDARY" ],
"end": {
"update_mapgen": { "om_terrain": "lumbermill_1_1_ocu", "place_nested": [ { "chunks": [ "occupied_lum_hotel_1_1" ], "x": 0, "y": 0 } ] },
"effect": { "run_eocs": "EOC_MISSION_LUMBERMILL_GET_6_BLANKETS_done" }
"effect": {
"u_consume_item_sum": [
{ "item": "blanket", "amount": 6 },
{ "item": "fur_blanket", "amount": 6 },
{ "item": "down_blanket", "amount": 6 },
{ "item": "blanket_weighted", "amount": 6 },
{ "item": "electric_blanket", "amount": 6 }
]
GuardianDll marked this conversation as resolved.
Show resolved Hide resolved
}
},
"followup": "MISSION_LUMBERMILL_SET_TRADE_ROUTE",
"has_generic_rewards": true,
Expand Down
7 changes: 5 additions & 2 deletions src/condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,11 +938,14 @@ conditional_t::func f_has_items_sum( const JsonObject &jo, const std::string_vie
double count_present;
double charges_present;
double total_present;
const Character *you = d.const_actor( is_npc )->get_const_character();
inventory inventory_and_around = you->crafting_inventory( you->pos(), PICKUP_RANGE );

for( const auto &pair : item_and_amount ) {
item_to_find = itype_id( pair.first.evaluate( d ) );
count_desired = pair.second.evaluate( d );
count_present = d.const_actor( is_npc )->get_amount( item_to_find );
charges_present = d.const_actor( is_npc )->charges_of( item_to_find );
count_present = inventory_and_around.amount_of( item_to_find );
charges_present = inventory_and_around.charges_of( item_to_find );
total_present = std::max( count_present, charges_present );
percent += total_present / count_desired;

Expand Down
72 changes: 30 additions & 42 deletions src/npctalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3866,53 +3866,41 @@ talk_effect_fun_t::func f_consume_item_sum( const JsonObject &jo, std::string_vi

itype_id item_to_remove;
double percent = 0.0f;
double count_desired;
double count_present;
double charges_present;
double ratio = 0.0f;
double amount_desired = 0.0f;
int count_present = 0;
Character *you = d.actor( is_npc )->get_character();
inventory inventory_and_around = you->crafting_inventory( you->pos(), PICKUP_RANGE );
std::vector<item_comp> writing_tools;
GuardianDll marked this conversation as resolved.
Show resolved Hide resolved

for( const auto &pair : item_and_amount ) {
int amount_to_remove = 0;
item_to_remove = itype_id( pair.first.evaluate( d ) );
count_desired = pair.second.evaluate( d );
count_present = d.actor( is_npc )->get_amount( item_to_remove );
charges_present = d.actor( is_npc )->charges_of( item_to_remove );
if( charges_present > count_present ) {
percent += charges_present / count_desired;
// if percent is equal or less than 1, it is safe to remove all charges_present
// otherwise loop to remove charges one by one
if( percent <= 1 ) {
d.actor( is_npc )->use_charges( item_to_remove, charges_present, true );

add_msg_debug( debugmode::DF_TALKER,
"removing item: %s, count_desired: %f, charges_present: %f, percent: %f, removing all",
item_to_remove.c_str(), count_desired, charges_present, percent );
} else {
percent -= charges_present / count_desired;
while( percent < 1.0f ) {
percent += 1 / count_desired;
d.actor( is_npc )->use_charges( item_to_remove, 1, true );
add_msg_debug( debugmode::DF_TALKER,
"removing item: %s, count_desired: %f, charges_present: %f, percent: %f, removing one by one",
item_to_remove.c_str(), count_desired, charges_present, percent );
}
}
amount_desired = pair.second.evaluate( d );
count_present = inventory_and_around.count_item( item_to_remove );

if( count_present == 0 ) {
continue;
}

percent += count_present / amount_desired;

if( percent <= 1.0 ) {
GuardianDll marked this conversation as resolved.
Show resolved Hide resolved
// either lack or just right amount of items to consume
writing_tools = { { item_to_remove, static_cast<int>( count_present ) } };
you->consume_items( writing_tools );

} else {
percent += count_present / count_desired;
if( percent <= 1 ) {
d.actor( is_npc )->use_amount( item_to_remove, count_present );
add_msg_debug( debugmode::DF_TALKER,
"removing item: %s, count_desired: %f, count_present: %f, percent: %f, removing all",
item_to_remove.c_str(), count_desired, count_present, percent );
} else {
percent -= count_present / count_desired;
while( percent < 1.0f ) {
percent += 1 / count_desired;
d.actor( is_npc )->use_amount( item_to_remove, 1 );

add_msg_debug( debugmode::DF_TALKER,
"removing item: %s, count_desired: %f, count_present: %f, percent: %f, removing one by one",
item_to_remove.c_str(), count_desired, count_present, percent );
}
// too much items to consume, consuming only to hit 1.00 percent
percent -= count_present / amount_desired;
ratio = count_present / amount_desired;

while( percent < 1.0 ) {
percent += ratio / count_present;
++amount_to_remove;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here you could just set amount_to_remove = amount_desired.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because if you have desired item A be 10, and desired item B to be 10, and happen to have item A of 5 and item B of 7, instead of consuming item A of 5 and item B of 5, the code would instead consume item A of 5 and item B of 7

}
writing_tools = { { item_to_remove, amount_to_remove } };
you->consume_items( writing_tools );
}
}
};
Expand Down
Loading