Replace "money" in in-game texts with "gold"
When GOLDOBJ was activated unconditionally, several texts started referencing "money" instead of "gold". As we don't have the intention to introduce a complex coin system with different denominations, change it back and also some other places that reference "money".
This commit is contained in:
@@ -66,6 +66,7 @@ some altars are displayed in different colors (for tty and curses at least)
|
|||||||
add 'quick_farsight' option to provide some control over random clairvoyance
|
add 'quick_farsight' option to provide some control over random clairvoyance
|
||||||
where pausing to be able to browse temporarily visible aspects of the
|
where pausing to be able to browse temporarily visible aspects of the
|
||||||
revealed map can seem intrusive; doesn't affect clairvoyance spell
|
revealed map can seem intrusive; doesn't affect clairvoyance spell
|
||||||
|
replace "money" in in-game texts with "gold"
|
||||||
|
|
||||||
|
|
||||||
Platform- and/or Interface-Specific New Features
|
Platform- and/or Interface-Specific New Features
|
||||||
|
|||||||
@@ -56,11 +56,11 @@ int shotlimit;
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Throwing money is usually for getting rid of it when
|
* Throwing gold is usually for getting rid of it when
|
||||||
* a leprechaun approaches, or for bribing an oncoming
|
* a leprechaun approaches, or for bribing an oncoming
|
||||||
* angry monster. So throw the whole object.
|
* angry monster. So throw the whole object.
|
||||||
*
|
*
|
||||||
* If the money is in quiver, throw one coin at a time,
|
* If the gold is in quiver, throw one coin at a time,
|
||||||
* possibly using a sling.
|
* possibly using a sling.
|
||||||
*/
|
*/
|
||||||
if (obj->oclass == COIN_CLASS && obj != uquiver)
|
if (obj->oclass == COIN_CLASS && obj != uquiver)
|
||||||
@@ -2127,7 +2127,7 @@ struct obj *obj;
|
|||||||
if (u.uswallow) {
|
if (u.uswallow) {
|
||||||
pline(is_animal(u.ustuck->data) ? "%s in the %s's entrails."
|
pline(is_animal(u.ustuck->data) ? "%s in the %s's entrails."
|
||||||
: "%s into %s.",
|
: "%s into %s.",
|
||||||
"The money disappears", mon_nam(u.ustuck));
|
"The gold disappears", mon_nam(u.ustuck));
|
||||||
add_to_minv(u.ustuck, obj);
|
add_to_minv(u.ustuck, obj);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ register struct obj *obj;
|
|||||||
if (!otmp->quan)
|
if (!otmp->quan)
|
||||||
delobj(otmp);
|
delobj(otmp);
|
||||||
}
|
}
|
||||||
You("lost some of your money in the fountain!");
|
You("lost some of your gold in the fountain!");
|
||||||
CLEAR_FOUNTAIN_LOOTED(u.ux, u.uy);
|
CLEAR_FOUNTAIN_LOOTED(u.ux, u.uy);
|
||||||
exercise(A_WIS, FALSE);
|
exercise(A_WIS, FALSE);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3159,7 +3159,6 @@ money_cnt(otmp)
|
|||||||
struct obj *otmp;
|
struct obj *otmp;
|
||||||
{
|
{
|
||||||
while (otmp) {
|
while (otmp) {
|
||||||
/* Must change when silver & copper is implemented: */
|
|
||||||
if (otmp->oclass == COIN_CLASS)
|
if (otmp->oclass == COIN_CLASS)
|
||||||
return otmp->quan;
|
return otmp->quan;
|
||||||
otmp = otmp->nobj;
|
otmp = otmp->nobj;
|
||||||
|
|||||||
@@ -559,7 +559,6 @@ register struct monst *mtmp;
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Makes up money for monster's inventory.
|
* Makes up money for monster's inventory.
|
||||||
* This will change with silver & copper coins
|
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
mkmonmoney(mtmp, amount)
|
mkmonmoney(mtmp, amount)
|
||||||
|
|||||||
@@ -2688,7 +2688,7 @@ struct monst *mon;
|
|||||||
pline("%s demands that you pay %s, but you refuse...",
|
pline("%s demands that you pay %s, but you refuse...",
|
||||||
noit_Monnam(mon), noit_mhim(mon));
|
noit_Monnam(mon), noit_mhim(mon));
|
||||||
} else if (u.umonnum == PM_LEPRECHAUN) {
|
} else if (u.umonnum == PM_LEPRECHAUN) {
|
||||||
pline("%s tries to take your money, but fails...", noit_Monnam(mon));
|
pline("%s tries to take your gold, but fails...", noit_Monnam(mon));
|
||||||
} else {
|
} else {
|
||||||
long cost;
|
long cost;
|
||||||
long umoney = money_cnt(g.invent);
|
long umoney = money_cnt(g.invent);
|
||||||
|
|||||||
@@ -455,7 +455,7 @@ boolean delphi;
|
|||||||
if (delphi)
|
if (delphi)
|
||||||
putstr(tmpwin, 0,
|
putstr(tmpwin, 0,
|
||||||
special
|
special
|
||||||
? "The Oracle scornfully takes all your money and says:"
|
? "The Oracle scornfully takes all your gold and says:"
|
||||||
: "The Oracle meditates for a moment and then intones:");
|
: "The Oracle meditates for a moment and then intones:");
|
||||||
else
|
else
|
||||||
putstr(tmpwin, 0, "The message reads:");
|
putstr(tmpwin, 0, "The message reads:");
|
||||||
@@ -495,7 +495,7 @@ struct monst *oracl;
|
|||||||
pline("%s is in no mood for consultations.", Monnam(oracl));
|
pline("%s is in no mood for consultations.", Monnam(oracl));
|
||||||
return 0;
|
return 0;
|
||||||
} else if (!umoney) {
|
} else if (!umoney) {
|
||||||
You("have no money.");
|
You("have no gold.");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -507,7 +507,7 @@ struct monst *oracl;
|
|||||||
return 0;
|
return 0;
|
||||||
case 'y':
|
case 'y':
|
||||||
if (umoney < (long) minor_cost) {
|
if (umoney < (long) minor_cost) {
|
||||||
You("don't even have enough money for that!");
|
You("don't even have enough gold for that!");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
u_pay = minor_cost;
|
u_pay = minor_cost;
|
||||||
|
|||||||
26
src/shk.c
26
src/shk.c
@@ -108,7 +108,7 @@ long amount;
|
|||||||
return 0L;
|
return 0L;
|
||||||
}
|
}
|
||||||
if (!ygold || ygold->quan < amount) {
|
if (!ygold || ygold->quan < amount) {
|
||||||
impossible("Paying without %s money?", ygold ? "enough" : "");
|
impossible("Paying without %s gold?", ygold ? "enough" : "");
|
||||||
return 0L;
|
return 0L;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,7 +139,7 @@ long amount;
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!mongold || mongold->quan < amount) {
|
if (!mongold || mongold->quan < amount) {
|
||||||
impossible("%s paying without %s money?", a_monnam(mon),
|
impossible("%s paying without %s gold?", a_monnam(mon),
|
||||||
mongold ? "enough" : "");
|
mongold ? "enough" : "");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -149,7 +149,7 @@ long amount;
|
|||||||
obj_extract_self(mongold);
|
obj_extract_self(mongold);
|
||||||
|
|
||||||
if (!merge_choice(g.invent, mongold) && inv_cnt(FALSE) >= 52) {
|
if (!merge_choice(g.invent, mongold) && inv_cnt(FALSE) >= 52) {
|
||||||
You("have no room for the money!");
|
You("have no room for the gold!");
|
||||||
dropy(mongold);
|
dropy(mongold);
|
||||||
} else {
|
} else {
|
||||||
addinv(mongold);
|
addinv(mongold);
|
||||||
@@ -793,7 +793,7 @@ shopper_financial_report()
|
|||||||
if ((amt = shop_debt(eshkp)) != 0)
|
if ((amt = shop_debt(eshkp)) != 0)
|
||||||
You("owe %s %ld %s.", shkname(shkp), amt, currency(amt));
|
You("owe %s %ld %s.", shkname(shkp), amt, currency(amt));
|
||||||
else if (shkp == this_shkp)
|
else if (shkp == this_shkp)
|
||||||
You("don't owe any money here.");
|
You("don't owe any gold here.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1208,7 +1208,7 @@ xchar oy UNUSED;
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const char
|
static const char
|
||||||
no_money[] = "Moreover, you%s have no money.",
|
no_money[] = "Moreover, you%s have no gold.",
|
||||||
not_enough_money[] = "Besides, you don't have enough to interest %s.";
|
not_enough_money[] = "Besides, you don't have enough to interest %s.";
|
||||||
|
|
||||||
/* delivers the cheapest item on the list */
|
/* delivers the cheapest item on the list */
|
||||||
@@ -1352,7 +1352,7 @@ dopay()
|
|||||||
if (!ltmp)
|
if (!ltmp)
|
||||||
You("do not owe %s anything.", shkname(shkp));
|
You("do not owe %s anything.", shkname(shkp));
|
||||||
else if (!umoney) {
|
else if (!umoney) {
|
||||||
You("%shave no money.", stashed_gold ? "seem to " : "");
|
You("%shave no gold.", stashed_gold ? "seem to " : "");
|
||||||
if (stashed_gold)
|
if (stashed_gold)
|
||||||
pline("But you have some gold stashed away.");
|
pline("But you have some gold stashed away.");
|
||||||
} else {
|
} else {
|
||||||
@@ -1384,7 +1384,7 @@ dopay()
|
|||||||
if (!umoney)
|
if (!umoney)
|
||||||
pline(no_money, stashed_gold ? " seem to" : "");
|
pline(no_money, stashed_gold ? " seem to" : "");
|
||||||
} else if (ltmp) {
|
} else if (ltmp) {
|
||||||
pline("%s is after blood, not money!", shkname(shkp));
|
pline("%s is after blood, not gold!", shkname(shkp));
|
||||||
if (umoney < ltmp / 2L || (umoney < ltmp && stashed_gold)) {
|
if (umoney < ltmp / 2L || (umoney < ltmp && stashed_gold)) {
|
||||||
if (!umoney)
|
if (!umoney)
|
||||||
pline(no_money, stashed_gold ? " seem to" : "");
|
pline(no_money, stashed_gold ? " seem to" : "");
|
||||||
@@ -1402,7 +1402,7 @@ dopay()
|
|||||||
} else {
|
} else {
|
||||||
/* shopkeeper is angry, but has not been robbed --
|
/* shopkeeper is angry, but has not been robbed --
|
||||||
* door broken, attacked, etc. */
|
* door broken, attacked, etc. */
|
||||||
pline("%s is after your hide, not your money!", Shknam(shkp));
|
pline("%s is after your hide, not your gold!", Shknam(shkp));
|
||||||
if (umoney < 1000L) {
|
if (umoney < 1000L) {
|
||||||
if (!umoney)
|
if (!umoney)
|
||||||
pline(no_money, stashed_gold ? " seem to" : "");
|
pline(no_money, stashed_gold ? " seem to" : "");
|
||||||
@@ -1484,12 +1484,12 @@ dopay()
|
|||||||
|
|
||||||
umoney = money_cnt(g.invent);
|
umoney = money_cnt(g.invent);
|
||||||
if (!umoney && !eshkp->credit) {
|
if (!umoney && !eshkp->credit) {
|
||||||
You("%shave no money or credit%s.",
|
You("%shave no gold or credit%s.",
|
||||||
stashed_gold ? "seem to " : "", paid ? " left" : "");
|
stashed_gold ? "seem to " : "", paid ? " left" : "");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if ((umoney + eshkp->credit) < cheapest_item(shkp)) {
|
if ((umoney + eshkp->credit) < cheapest_item(shkp)) {
|
||||||
You("don't have enough money to buy%s the item%s you picked.",
|
You("don't have enough gold to buy%s the item%s you picked.",
|
||||||
eshkp->billct > 1 ? " any of" : "", plur(eshkp->billct));
|
eshkp->billct > 1 ? " any of" : "", plur(eshkp->billct));
|
||||||
if (stashed_gold)
|
if (stashed_gold)
|
||||||
pline("Maybe you have some gold stashed away?");
|
pline("Maybe you have some gold stashed away?");
|
||||||
@@ -1594,7 +1594,7 @@ boolean itemize;
|
|||||||
return PAY_BUY;
|
return PAY_BUY;
|
||||||
}
|
}
|
||||||
if (itemize && umoney + ESHK(shkp)->credit == 0L) {
|
if (itemize && umoney + ESHK(shkp)->credit == 0L) {
|
||||||
You("%shave no money or credit left.",
|
You("%shave no gold or credit left.",
|
||||||
stashed_gold ? "seem to " : "");
|
stashed_gold ? "seem to " : "");
|
||||||
return PAY_BROKE;
|
return PAY_BROKE;
|
||||||
}
|
}
|
||||||
@@ -4885,7 +4885,7 @@ struct obj *obj_absorber, *obj_absorbed;
|
|||||||
|
|
||||||
if (bp_absorber) {
|
if (bp_absorber) {
|
||||||
/* the absorber has a billing record */
|
/* the absorber has a billing record */
|
||||||
bp_absorber->price += amount;
|
bp_absorber->price += amount;
|
||||||
} else {
|
} else {
|
||||||
/* the absorber has no billing record */
|
/* the absorber has no billing record */
|
||||||
;
|
;
|
||||||
@@ -4893,7 +4893,7 @@ struct obj *obj_absorber, *obj_absorbed;
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/**************************************************************
|
/**************************************************************
|
||||||
* Scenario 2. Player-owned glob absorbing into shop-owned glob
|
* Scenario 2. Player-owned glob absorbing into shop-owned glob
|
||||||
**************************************************************/
|
**************************************************************/
|
||||||
if (!bp_absorber && !bp && !obj_absorber->no_charge) {
|
if (!bp_absorber && !bp && !obj_absorber->no_charge) {
|
||||||
/* there are no billing records */
|
/* there are no billing records */
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ take_gold()
|
|||||||
if (!lost_money) {
|
if (!lost_money) {
|
||||||
You_feel("a strange sensation.");
|
You_feel("a strange sensation.");
|
||||||
} else {
|
} else {
|
||||||
You("notice you have no money!");
|
You("notice you have no gold!");
|
||||||
g.context.botl = 1;
|
g.context.botl = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ dosounds()
|
|||||||
{
|
{
|
||||||
if (gold_in_vault)
|
if (gold_in_vault)
|
||||||
You_hear(!hallu
|
You_hear(!hallu
|
||||||
? "someone counting money."
|
? "someone counting gold coins."
|
||||||
: "the quarterback calling the play.");
|
: "the quarterback calling the play.");
|
||||||
else
|
else
|
||||||
You_hear("someone searching.");
|
You_hear("someone searching.");
|
||||||
|
|||||||
@@ -804,8 +804,8 @@ register struct monst *grd;
|
|||||||
if (egrd->warncnt == 3 && !Deaf)
|
if (egrd->warncnt == 3 && !Deaf)
|
||||||
verbalize("I repeat, %sfollow me!",
|
verbalize("I repeat, %sfollow me!",
|
||||||
u_carry_gold
|
u_carry_gold
|
||||||
? (!umoney ? "drop that hidden money and "
|
? (!umoney ? "drop that hidden gold and "
|
||||||
: "drop that money and ")
|
: "drop that gold and ")
|
||||||
: "");
|
: "");
|
||||||
if (egrd->warncnt == 7) {
|
if (egrd->warncnt == 7) {
|
||||||
m = grd->mx;
|
m = grd->mx;
|
||||||
|
|||||||
Reference in New Issue
Block a user