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

Merge remote-tracking branch 'dfhack/develop' into 0.40.08-r2

develop
expwnent 2014-08-15 09:17:54 -04:00
parent dbd4460e50 ebda2d8472
commit d2ef9fcc11
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/xml

@ -1 +1 @@
Subproject commit 8bad0805fdb3d2429a2c2f120d23b53ae0bad5ec Subproject commit 79039faae62c88e59898264d4f50672995e83ed6

12
plugins/tweak.cpp
Unescape Escape View File

@ -1010,18 +1010,18 @@ IMPLEMENT_VMETHOD_INTERPOSE(military_training_id_hook, process);
struct craft_age_wear_hook : df::item_crafted { struct craft_age_wear_hook : df::item_crafted {
typedef df::item_crafted interpose_base; typedef df::item_crafted interpose_base;
DEFINE_VMETHOD_INTERPOSE(void, ageItem, (int amount)) DEFINE_VMETHOD_INTERPOSE(bool, ageItem, (int amount))
{ {
int orig_age = age; int orig_age = age;
age += amount; age += amount;
if (age > 200000000) if (age > 200000000)
age = 200000000; age = 200000000;
if (age == orig_age) if (age == orig_age)
return; return false;
MaterialInfo mat(mat_type, mat_index); MaterialInfo mat(mat_type, mat_index);
if (!mat.isValid()) if (!mat.isValid())
return; return false;
int wear = 0; int wear = 0;
if (mat.material->flags.is_set(material_flags::WOOD)) if (mat.material->flags.is_set(material_flags::WOOD))
@ -1032,10 +1032,12 @@ struct craft_age_wear_hook : df::item_crafted {
mat.material->flags.is_set(material_flags::YARN)) mat.material->flags.is_set(material_flags::YARN))
wear = 1; wear = 1;
else else
return; return false;
wear = ((orig_age % wear) + (age - orig_age)) / wear; wear = ((orig_age % wear) + (age - orig_age)) / wear;
if (wear > 0) if (wear > 0)
addWear(wear, false, false); return incWearTimer(wear);
else
return false;
} }
}; };
IMPLEMENT_VMETHOD_INTERPOSE(craft_age_wear_hook, ageItem); IMPLEMENT_VMETHOD_INTERPOSE(craft_age_wear_hook, ageItem);