MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The great de-anon-ification

develop
Quietust 2022-06-29 08:27:37 -06:00 committed by Myk
parent 12958e15c6
commit 8a605e1903
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit ef5c180ff220e53ec6b51e01ca3594a5780b8b4b Subproject commit e803099f5d983055e4b5b00a6baf4bcc91c6f25d

12
plugins/building-hacks.cpp
Unescape Escape View File

@ -88,8 +88,8 @@ struct work_hook : df::building_workshopst{
df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
if (ref) if (ref)
{ {
info->produced = ref->anon_1; info->produced = ref->unk_1;
info->consumed = ref->anon_2; info->consumed = ref->unk_2;
return true; return true;
} }
else else
@ -118,14 +118,14 @@ struct work_hook : df::building_workshopst{
df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); df::general_ref_creaturest* ref = static_cast<df::general_ref_creaturest*>(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE));
if (ref) if (ref)
{ {
ref->anon_1 = produced; ref->unk_1 = produced;
ref->anon_2 = consumed; ref->unk_2 = consumed;
} }
else else
{ {
ref = df::allocate<df::general_ref_creaturest>(); ref = df::allocate<df::general_ref_creaturest>();
ref->anon_1 = produced; ref->unk_1 = produced;
ref->anon_2 = consumed; ref->unk_2 = consumed;
general_refs.push_back(ref); general_refs.push_back(ref);
} }
} }

8
plugins/orders.cpp
Unescape Escape View File

@ -467,7 +467,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri
condition["order"] = it2->order_id; condition["order"] = it2->order_id;
condition["condition"] = enum_item_key(it2->condition); condition["condition"] = enum_item_key(it2->condition);
// TODO: anon_1 // TODO: unk_1
conditions.append(condition); conditions.append(condition);
} }
@ -475,7 +475,7 @@ static command_result orders_export_command(color_ostream & out, const std::stri
order["order_conditions"] = conditions; order["order_conditions"] = conditions;
} }
// TODO: anon_1 // TODO: items
orders.append(order); orders.append(order);
} }
@ -873,13 +873,13 @@ static command_result orders_import(color_ostream &out, Json::Value &orders)
continue; continue;
} }
// TODO: anon_1 // TODO: unk_1
order->order_conditions.push_back(condition); order->order_conditions.push_back(condition);
} }
} }
// TODO: anon_1 // TODO: items
world->manager_orders.push_back(order); world->manager_orders.push_back(order);
} }

2
scripts

@ -1 +1 @@
Subproject commit dab8b22464cc81c7bc59e3e0f19ea3999676ffdf Subproject commit 274b81ded9c72bff23eca4f0c2a78cb6cb900f8e