Skip to content

Some work on scripts internal/caravan/* #1498

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

Open
SilasD wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Some work on scripts internal/caravan/* #1498

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e3c7ed
internal/caravan/* allow searching for items with CP417 names.
SilasD Aug 26, 2025
dbd125b
internal/caravan/common.lua obfuscate_value() API change
SilasD Aug 26, 2025
761a677
internal/caravan/movegoods.lua use new obfuscate_value() API
SilasD Aug 27, 2025
de12a18
internal/caravan/pedestal.lua use new obfuscate_value() API
SilasD Aug 27, 2025
76b0f7e
internal/caravan/trade.lua use new obfuscate_value() API
SilasD Aug 27, 2025
4e93bee
internal/caravan/common.lua use trader over broker
SilasD Aug 28, 2025
ce03fb6
Merge branch 'DFHack:master' into caravan-work
SilasD Sep 17, 2025
a5c1294
update changelog
SilasD Sep 17, 2025
c28c7c3
Merge branch 'DFHack:master' into caravan-work
SilasD Nov 4, 2025
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
Prev Previous commit
Next Next commit
internal/caravan/movegoods.lua use new obfuscate_value() API 
Verified that this gives identical results to the unmodified code,
with the exception of some icon closures that could not be verified.
  • Loading branch information
@SilasD
SilasD committed Aug 27, 2025
commit 761a677c9843f0450e349b20a69483c79257bf29
10 changes: 6 additions & 4 deletions internal/caravan/movegoods.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@ local function get_entry_icon(data, item_id)
return common.SOME_PEN
end

local function make_choice_text(at_depot, dist, value, quantity, desc)
local function make_choice_text(at_depot, dist, value, quantity, desc, cache_threshold)
return {
{width=DIST_COL_WIDTH-2, rjustify=true, text=at_depot and 'depot' or tostring(dist)},
{gap=2, width=VALUE_COL_WIDTH, rjustify=true, text=common.obfuscate_value(value)},
{gap=2, width=VALUE_COL_WIDTH, rjustify=true, text=common.obfuscate_value(value, cache_threshold)},
{gap=2, width=QTY_COL_WIDTH, rjustify=true, text=quantity},
{gap=2, text=desc},
}
Expand Down Expand Up @@ -559,18 +559,20 @@ function MoveGoods:cache_choices()
end

local group_choices, nogroup_choices = {}, {}
local cache_threshold = common.get_threshold(common.get_broker_skill())
for _, group in pairs(groups) do
local data = group.data
for item_id, item_data in pairs(data.items) do
local nogroup_choice = copyall(group)
nogroup_choice.icon = curry(get_entry_icon, data, item_id)
nogroup_choice.text = make_choice_text(item_data.item.flags.in_building,
data.dist, data.per_item_value, 1, data.desc)
data.dist, data.per_item_value, 1, data.desc, cache_threshold)
nogroup_choice.item_id = item_id
table.insert(nogroup_choices, nogroup_choice)
end
data.total_value = data.per_item_value * data.quantity
group.text = make_choice_text(data.num_at_depot == data.quantity, data.dist, data.total_value, data.quantity, data.desc)
group.text = make_choice_text(data.num_at_depot == data.quantity, data.dist,
data.total_value, data.quantity, data.desc, cache_threshold)
table.insert(group_choices, group)
self.value_pending = self.value_pending + (data.per_item_value * data.selected)
end
Expand Down