nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

moves, monstermoves, wailmsg, migrating_objs and billobjs moved to g.

Browse Source
This commit is contained in:
Bart House
2018-12-24 20:22:33 -08:00
parent be5cdcf77a
commit 90547edb83
47 changed files with 224 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/artifact.c
View File

@@ -1422,7 +1422,7 @@ struct obj *obj;
if (oart->inv_prop > LAST_PROP) {
/* It's a special power, not "just" a property */
if (obj->age > monstermoves) {
if (obj->age > g.monstermoves) {
/* the artifact is tired :-) */
You_feel("that %s %s ignoring you.", the(xname(obj)),
otense(obj, "are"));
@@ -1430,7 +1430,7 @@ struct obj *obj;
obj->age += (long) d(3, 10);
return 1;
}
obj->age = monstermoves + rnz(100);
obj->age = g.monstermoves + rnz(100);
switch (oart->inv_prop) {
case TAMING: {
@@ -1597,7 +1597,7 @@ struct obj *obj;
iprop = u.uprops[oart->inv_prop].intrinsic;
boolean on = (eprop & W_ARTI) != 0; /* true if prop just set */
if (on && obj->age > monstermoves) {
if (on && obj->age > g.monstermoves) {
/* the artifact is tired :-) */
u.uprops[oart->inv_prop].extrinsic ^= W_ARTI;
You_feel("that %s %s ignoring you.", the(xname(obj)),
@@ -1608,7 +1608,7 @@ struct obj *obj;
} else if (!on) {
/* when turning off property, determine downtime */
/* arbitrary for now until we can tune this -dlc */
obj->age = monstermoves + rnz(100);
obj->age = g.monstermoves + rnz(100);
}
if ((eprop & ~W_ARTI) || iprop) {