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

If training ammo is forbidden for all use, don't move it to combat chests.

develop
Alexander Gavrilov 2012-12-06 12:00:18 +04:00
parent 74ebe7d207
commit cd6eb9edd3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/fix-armory.cpp
Unescape Escape View File

@ -110,7 +110,8 @@ DFhackCExport command_result plugin_shutdown (color_ostream &out)
* 1. Combat ammo and ammo without any allowed use can be stored * 1. Combat ammo and ammo without any allowed use can be stored
* in BOXes marked for Squad Equipment, either directly or via * in BOXes marked for Squad Equipment, either directly or via
* containing room. No-allowed-use ammo is assumed to be reserved * containing room. No-allowed-use ammo is assumed to be reserved
* for emergency combat use, or something like that. * for emergency combat use, or something like that; however if
* it is already stored in a training chest, it won't be moved.
* 1a. If assigned to a squad position, that box can be used _only_ * 1a. If assigned to a squad position, that box can be used _only_
* for ammo assigned to that specific _squad_. Otherwise, if * for ammo assigned to that specific _squad_. Otherwise, if
* multiple squads can use this room, they will store their * multiple squads can use this room, they will store their
@ -158,8 +159,8 @@ static bool is_squad_ammo(df::item *item, df::squad *squad, bool combat, bool tr
bool cs = spec->flags.bits.use_combat; bool cs = spec->flags.bits.use_combat;
bool ts = spec->flags.bits.use_training; bool ts = spec->flags.bits.use_training;
// no-use ammo assumed to be combat // no-use ammo assumed to fit any category
if (((cs || !ts) && combat) || (ts && train)) if (((cs || !ts) && combat) || ((ts || !cs) && train))
{ {
if (binsearch_index(spec->assigned, item->id) >= 0) if (binsearch_index(spec->assigned, item->id) >= 0)
return true; return true;