From 0dfc744413275805d983f859067d43c124293e56 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Sun, 29 Oct 2017 13:51:45 +0200 Subject: [PATCH] highlighted prices --- src/game/humans/humanoid_assassin.cpp | 2 +- src/game/humans/humanoid_doctor.cpp | 12 ++++++------ src/game/humans/humanoid_priest.cpp | 14 +++++++------- src/game/humans/humanoid_smith.cpp | 4 ++-- src/game/humans/humanoid_tailor.cpp | 4 ++-- src/game/humans/playerkind_slave.cpp | 4 ++-- src/game/items/item_moneybag.cpp | 2 +- src/game/rooms/room_library.cpp | 14 +++++++------- src/game/rooms/room_shop.cpp | 14 +++++++------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/game/humans/humanoid_assassin.cpp b/src/game/humans/humanoid_assassin.cpp index e9b7c66..e80cf5b 100644 --- a/src/game/humans/humanoid_assassin.cpp +++ b/src/game/humans/humanoid_assassin.cpp @@ -13,7 +13,7 @@ public: void assassin::BeTalkedTo () { if (GetRelation(PLAYER) == HOSTILE) { if (PLAYER->GetMoney() >= 1500) { - ADD_MESSAGE("%s talks: \"If you shell out 1500 gold pieces I'll join your side\"", CHAR_DESCRIPTION(DEFINITE)); + ADD_MESSAGE("%s talks: \"If you shell out \1Y1500\2 gold pieces I'll join your side\"", CHAR_DESCRIPTION(DEFINITE)); if (game::TruthQuestion(CONST_S("Do you want to bribe him?"))) { PLAYER->SetMoney(PLAYER->GetMoney()-1500); ChangeTeam(PLAYER->GetTeam()); diff --git a/src/game/humans/humanoid_doctor.cpp b/src/game/humans/humanoid_doctor.cpp index 31055ec..01be0d8 100644 --- a/src/game/humans/humanoid_doctor.cpp +++ b/src/game/humans/humanoid_doctor.cpp @@ -28,7 +28,7 @@ void doctor::BeTalkedTo () { if (GetAttribute(INTELLIGENCE) < OldBodyPart->GetMainMaterial()->GetIntelligenceRequirement() && !OldBodyPart->CanRegenerate()) { ADD_MESSAGE("\"I no smart enough to put back bodyparts made of %s, especially not your severed %s.\"", OldBodyPart->GetMainMaterial()->GetName(false, false).CStr(), PLAYER->GetBodyPartName(c).CStr()); } else { - ADD_MESSAGE("\"I could put your old %s back in exchange for %d gold pieces, yes yes.\"", PLAYER->GetBodyPartName(c).CStr(), Price); + ADD_MESSAGE("\"I could put your old %s back in exchange for \1Y%d\2 gold pieces, yes yes.\"", PLAYER->GetBodyPartName(c).CStr(), Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { OldBodyPart->SetHP(1); PLAYER->SetMoney(PLAYER->GetMoney()-Price); @@ -57,7 +57,7 @@ void doctor::BeTalkedTo () { // if state confused is activated, then no scream, no panic (makes vodka handy) // hand over 5 gold if (PLAYER->GetMoney() >= 5) { - ADD_MESSAGE("\"I can surgically remove one of your limbs in exchange for 5 gold. Flat rate, genuine bargain!\""); + ADD_MESSAGE("\"I can surgically remove one of your limbs in exchange for \1Y5\2 gold. Flat rate, genuine bargain!\""); if (game::TruthQuestion(CONST_S("Do you agree?"))) { PLAYER->SetMoney(PLAYER->GetMoney()-5); SetMoney(GetMoney()+5); @@ -73,7 +73,7 @@ void doctor::BeTalkedTo () { if (PLAYER->TemporaryStateIsActivated(POISONED)) { sLong Price = GetAttribute(CHARISMA) < PLAYER->GetAttribute(CHARISMA) ? 5 : (GetAttribute(CHARISMA)-PLAYER->GetAttribute(CHARISMA)); if (PLAYER->GetMoney() >= Price) { - ADD_MESSAGE("\"You seem to be rather ill, yes yes. I give you small dose of antidote for %d gold pieces.\"", Price); + ADD_MESSAGE("\"You seem to be rather ill, yes yes. I give you small dose of antidote for \1Y%d\2 gold pieces.\"", Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { ADD_MESSAGE("You feel better."); PLAYER->DeActivateTemporaryState(POISONED); @@ -82,14 +82,14 @@ void doctor::BeTalkedTo () { return; } } else { - ADD_MESSAGE("\"You seem to be rather ill. Get %d gold pieces and I fix that.\"", Price); + ADD_MESSAGE("\"You seem to be rather ill. Get \1Y%d\2 gold pieces and I fix that.\"", Price); } } // cure leprosy if (PLAYER->TemporaryStateIsActivated(LEPROSY)) { sLong Price = GetAttribute(CHARISMA) < PLAYER->GetAttribute(CHARISMA) ? 5 : (GetAttribute(CHARISMA)-PLAYER->GetAttribute(CHARISMA)); if (PLAYER->GetMoney() >= Price) { - ADD_MESSAGE("\"You seem to have contracted vile disease of leprosy, yes yes. I can give you small dose of medicince for %d gold pieces.\"", Price); + ADD_MESSAGE("\"You seem to have contracted vile disease of leprosy, yes yes. I can give you small dose of medicince for \1Y%d\2 gold pieces.\"", Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { ADD_MESSAGE("You feel better."); PLAYER->DeActivateTemporaryState(LEPROSY); @@ -98,7 +98,7 @@ void doctor::BeTalkedTo () { return; } } else { - ADD_MESSAGE("\"You seem to be falling apart. Get %d gold pieces and I fix that.\"", Price); + ADD_MESSAGE("\"You seem to be falling apart. Get \1Y%d\2 gold pieces and I fix that.\"", Price); } } // cure lycanthropy diff --git a/src/game/humans/humanoid_priest.cpp b/src/game/humans/humanoid_priest.cpp index b4d4e0f..d1ff687 100644 --- a/src/game/humans/humanoid_priest.cpp +++ b/src/game/humans/humanoid_priest.cpp @@ -27,7 +27,7 @@ void priest::BeTalkedTo () { if (!OldBodyPart->CanRegenerate()) ADD_MESSAGE("\"Sorry, I cannot put back bodyparts made of %s, not even your severed %s.\"", OldBodyPart->GetMainMaterial()->GetName(false, false).CStr(), PLAYER->GetBodyPartName(c).CStr()); else { - ADD_MESSAGE("\"I could put your old %s back in exchange for %d gold.\"", PLAYER->GetBodyPartName(c).CStr(), Price); + ADD_MESSAGE("\"I could put your old %s back in exchange for \1Y%d\2 gold.\"", PLAYER->GetBodyPartName(c).CStr(), Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { OldBodyPart->SetHP(1); PLAYER->SetMoney(PLAYER->GetMoney()-Price); @@ -45,9 +45,9 @@ void priest::BeTalkedTo () { sLong Price = GetConfig() == VALPURUS ? 100 : 20; if (PLAYER->GetMoney() >= Price) { if (HasOld) - ADD_MESSAGE("\"I could still summon up a new one for %d gold.\"", Price); + ADD_MESSAGE("\"I could still summon up a new one for \1Y%d\2 gold.\"", Price); else - ADD_MESSAGE("\"Since you don't seem to have your original %s with you, I could summon up a new one for %d gold.\"", PLAYER->GetBodyPartName(c).CStr(), Price); + ADD_MESSAGE("\"Since you don't seem to have your original %s with you, I could summon up a new one for \1Y%d\2 gold.\"", PLAYER->GetBodyPartName(c).CStr(), Price); if (game::TruthQuestion(CONST_S("Agreed?"))) { PLAYER->SetMoney(PLAYER->GetMoney()-Price); SetMoney(GetMoney()+Price); @@ -63,7 +63,7 @@ void priest::BeTalkedTo () { if (PLAYER->TemporaryStateIsActivated(POISONED)) { sLong Price = GetConfig() == VALPURUS ? 25 : 5; if (PLAYER->GetMoney() >= Price) { - ADD_MESSAGE("\"You seem to be rather ill. I could give you a small dose of antidote for %d gold pieces.\"", Price); + ADD_MESSAGE("\"You seem to be rather ill. I could give you a small dose of antidote for \1Y%d\2 gold pieces.\"", Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { ADD_MESSAGE("You feel better."); PLAYER->DeActivateTemporaryState(POISONED); @@ -72,13 +72,13 @@ void priest::BeTalkedTo () { return; } } else { - ADD_MESSAGE("\"You seem to be rather ill. Get %d gold pieces and I'll fix that.\"", Price); + ADD_MESSAGE("\"You seem to be rather ill. Get \1Y%d\2 gold pieces and I'll fix that.\"", Price); } } if (PLAYER->TemporaryStateIsActivated(LEPROSY)) { sLong Price = GetConfig() == VALPURUS ? 100 : 20; if (PLAYER->GetMoney() >= Price) { - ADD_MESSAGE("\"You seem to have contracted the vile disease of leprosy. I could give you a small dose of medicince for %d gold pieces.\"", Price); + ADD_MESSAGE("\"You seem to have contracted the vile disease of leprosy. I could give you a small dose of medicince for \1Y%d\2 gold pieces.\"", Price); if (game::TruthQuestion(CONST_S("Do you agree?"))) { ADD_MESSAGE("You feel better."); PLAYER->DeActivateTemporaryState(LEPROSY); @@ -87,7 +87,7 @@ void priest::BeTalkedTo () { return; } } else { - ADD_MESSAGE("\"You seem to be falling apart. Get %d gold pieces and I'll fix that.\"", Price); + ADD_MESSAGE("\"You seem to be falling apart. Get \1Y%d\2 gold pieces and I'll fix that.\"", Price); } } if (PLAYER->TemporaryStateIsActivated(LYCANTHROPY)) { diff --git a/src/game/humans/humanoid_smith.cpp b/src/game/humans/humanoid_smith.cpp index 9ef3f70..6da1491 100644 --- a/src/game/humans/humanoid_smith.cpp +++ b/src/game/humans/humanoid_smith.cpp @@ -44,11 +44,11 @@ void smith::BeTalkedTo() if(PLAYER->GetMoney() < FixPrice) { - ADD_MESSAGE("\"Getting that fixed costs you %d gold pieces. Get the money and we'll talk.\"", FixPrice); + ADD_MESSAGE("\"Getting that fixed costs you \1Y%d\2 gold pieces. Get the money and we'll talk.\"", FixPrice); return; } - ADD_MESSAGE("\"I can fix your %s, but it'll cost you %d gold pieces.\"", Item->CHAR_NAME(UNARTICLED), FixPrice); + ADD_MESSAGE("\"I can fix your %s, but it'll cost you \1Y%d\2 gold pieces.\"", Item->CHAR_NAME(UNARTICLED), FixPrice); if(game::TruthQuestion(CONST_S("Do you accept this deal?"))) { diff --git a/src/game/humans/humanoid_tailor.cpp b/src/game/humans/humanoid_tailor.cpp index afe7783..faa57c8 100644 --- a/src/game/humans/humanoid_tailor.cpp +++ b/src/game/humans/humanoid_tailor.cpp @@ -38,11 +38,11 @@ void tailor::BeTalkedTo() if(PLAYER->GetMoney() < FixPrice) { - ADD_MESSAGE("\"Getting that fixed costs you %d gold pieces. Get the money and we'll talk.\"", FixPrice); + ADD_MESSAGE("\"Getting that fixed costs you \1Y%d\2 gold pieces. Get the money and we'll talk.\"", FixPrice); return; } - ADD_MESSAGE("\"I can fix your %s, but it'll cost you %d gold pieces.\"", Item->CHAR_NAME(UNARTICLED), FixPrice); + ADD_MESSAGE("\"I can fix your \1Y%s\2, but it'll cost you %d gold pieces.\"", Item->CHAR_NAME(UNARTICLED), FixPrice); if(game::TruthQuestion(CONST_S("Do you accept this deal?"))) { diff --git a/src/game/humans/playerkind_slave.cpp b/src/game/humans/playerkind_slave.cpp index 77a9204..de4a0a1 100644 --- a/src/game/humans/playerkind_slave.cpp +++ b/src/game/humans/playerkind_slave.cpp @@ -31,7 +31,7 @@ void slave::BeTalkedTo() if(PLAYER->GetMoney() >= 50) { - ADD_MESSAGE("%s talks: \"Do you want to buy me? 50 gold pieces. I work very hard.\"", CHAR_DESCRIPTION(DEFINITE)); + ADD_MESSAGE("%s talks: \"Do you want to buy me? \1Y50\2 gold pieces. I work very hard.\"", CHAR_DESCRIPTION(DEFINITE)); if(game::TruthQuestion(CONST_S("Do you want to buy him?"))) { @@ -42,7 +42,7 @@ void slave::BeTalkedTo() } } else - ADD_MESSAGE("\"Don't touch me! Master doesn't want people to touch sale items. I'm worth 50 gold pieces, you know!\""); + ADD_MESSAGE("\"Don't touch me! Master doesn't want people to touch sale items. I'm worth \1YT50\2 gold pieces, you know!\""); return; } diff --git a/src/game/items/item_moneybag.cpp b/src/game/items/item_moneybag.cpp index 6c83ac3..11a76ab 100644 --- a/src/game/items/item_moneybag.cpp +++ b/src/game/items/item_moneybag.cpp @@ -33,7 +33,7 @@ truth moneybag::IsAppliable (ccharacter *beggar) const { truth moneybag::Apply (character *beggar) { if (!beggar->IsPlayer()) return false; if (!game::TruthQuestion(CONST_S("Are you sure you want to open ")+GetName(DEFINITE)+"?")) return false; - ADD_MESSAGE("You opens %s and found %i gold coins", CHAR_NAME(DEFINITE), moneyAmount); + ADD_MESSAGE("You opens %s and found \1Y%i\2 gold coins", CHAR_NAME(DEFINITE), moneyAmount); beggar->EditMoney(moneyAmount); RemoveFromSlot(); SendToHell(); diff --git a/src/game/rooms/room_library.cpp b/src/game/rooms/room_library.cpp index 410ae77..29c7c9e 100644 --- a/src/game/rooms/room_library.cpp +++ b/src/game/rooms/room_library.cpp @@ -70,9 +70,9 @@ truth library::PickupItem (character *Customer, item *ForSale, int Amount) { if (Customer->GetMoney() >= Price) { if (Amount == 1) - ADD_MESSAGE("\"Ah! That %s costs %d gold pieces. No haggling, please.\"", ForSale->CHAR_NAME(UNARTICLED), Price); + ADD_MESSAGE("\"Ah! That %s costs \1Y%d\2 gold pieces. No haggling, please.\"", ForSale->CHAR_NAME(UNARTICLED), Price); else - ADD_MESSAGE("\"Ah! Those %d %s cost %d gold pieces. No haggling, please.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); + ADD_MESSAGE("\"Ah! Those %d %s cost \1Y%d\2 gold pieces. No haggling, please.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); if (game::TruthQuestion(CONST_S("Do you accept this deal?"))) { Customer->EditMoney(-Price); GetMaster()->EditMoney(Price); @@ -82,9 +82,9 @@ truth library::PickupItem (character *Customer, item *ForSale, int Amount) { return false; } else { if (Amount == 1) - ADD_MESSAGE("\"Don't touch that %s, beggar! It is worth %d gold pieces!\"", ForSale->CHAR_NAME(UNARTICLED), Price); + ADD_MESSAGE("\"Don't touch that %s, beggar! It is worth \1Y%d\2 gold pieces!\"", ForSale->CHAR_NAME(UNARTICLED), Price); else - ADD_MESSAGE("\"Don't touch those %s, beggar! They are worth %d gold pieces!\"", ForSale->CHAR_NAME(PLURAL), Price); + ADD_MESSAGE("\"Don't touch those %s, beggar! They are worth \1Y%d\2 gold pieces!\"", ForSale->CHAR_NAME(PLURAL), Price); return false; } } @@ -129,9 +129,9 @@ truth library::DropItem (character *Customer, item *ForSale, int Amount) { if (GetMaster()->GetMoney()) { if (GetMaster()->GetMoney() < Price) Price = GetMaster()->GetMoney(); if (Amount == 1) - ADD_MESSAGE("\"What an interesting %s. I'll pay %d gold pieces for it.\"", ForSale->CHAR_NAME(UNARTICLED), Price); + ADD_MESSAGE("\"What an interesting %s. I'll pay \1Y%d\2 gold pieces for it.\"", ForSale->CHAR_NAME(UNARTICLED), Price); else - ADD_MESSAGE("\"What an interesting collection of %d %s. I'll pay %d gold pieces for it.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); + ADD_MESSAGE("\"What an interesting collection of %d %s. I'll pay \1Y%d\2 gold pieces for it.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); if (game::TruthQuestion(CONST_S("Do you want to sell ")+(Amount == 1 ? "this item" : "these items")+"?")) { Customer->EditMoney(Price); GetMaster()->EditMoney(-Price); @@ -140,7 +140,7 @@ truth library::DropItem (character *Customer, item *ForSale, int Amount) { } return false; } else { - ADD_MESSAGE("\"I would pay you %d gold pieces for %s, but I'm temporarily short of cash. Sorry.\"", + ADD_MESSAGE("\"I would pay you \1Y%d\2 gold pieces for %s, but I'm temporarily short of cash. Sorry.\"", Price, Amount == 1 ? "it" : "them"); return false; } diff --git a/src/game/rooms/room_shop.cpp b/src/game/rooms/room_shop.cpp index 9a1c2df..2bd394c 100644 --- a/src/game/rooms/room_shop.cpp +++ b/src/game/rooms/room_shop.cpp @@ -81,9 +81,9 @@ truth shop::PickupItem (character *Customer, item *ForSale, int Amount) { // if (Customer->GetMoney() >= Price) { if (Amount == 1) { - ADD_MESSAGE("\"Ah! That %s costs %d gold pieces. No haggling, please.\"", ForSale->CHAR_NAME(UNARTICLED), Price); + ADD_MESSAGE("\"Ah! That %s costs \1Y%d\2 gold pieces. No haggling, please.\"", ForSale->CHAR_NAME(UNARTICLED), Price); } else { - ADD_MESSAGE("\"Ah! Those %d %s cost %d gold pieces. No haggling, please.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); + ADD_MESSAGE("\"Ah! Those %d %s cost \1Y%d\2 gold pieces. No haggling, please.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); } if (game::TruthQuestion(CONST_S("Do you accept this deal?"))) { Customer->EditMoney(-Price); @@ -94,9 +94,9 @@ truth shop::PickupItem (character *Customer, item *ForSale, int Amount) { return false; } else { if (Amount == 1) { - ADD_MESSAGE("\"Don't touch that %s, beggar! It is worth %d gold pieces!\"", ForSale->CHAR_NAME(UNARTICLED), Price); + ADD_MESSAGE("\"Don't touch that %s, beggar! It is worth \1Y%d\2 gold pieces!\"", ForSale->CHAR_NAME(UNARTICLED), Price); } else { - ADD_MESSAGE("\"Don't touch those %s, beggar! They are worth %d gold pieces!\"", ForSale->CHAR_NAME(PLURAL), Price); + ADD_MESSAGE("\"Don't touch those %s, beggar! They are worth \1Y%d\2 gold pieces!\"", ForSale->CHAR_NAME(PLURAL), Price); } return false; } @@ -174,8 +174,8 @@ truth shop::DropItem (character *Customer, item *ForSale, int Amount) { // if (GetMaster()->GetMoney()) { if (GetMaster()->GetMoney() < Price) Price = GetMaster()->GetMoney(); - if (Amount == 1) ADD_MESSAGE("\"What a fine %s. I'll pay %d gold pieces for it.\"", ForSale->CHAR_NAME(UNARTICLED), Price); - else ADD_MESSAGE("\"What a fine pile of %d %s. I'll pay %d gold pieces for them.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); + if (Amount == 1) ADD_MESSAGE("\"What a fine %s. I'll pay \1Y%d\2 gold pieces for it.\"", ForSale->CHAR_NAME(UNARTICLED), Price); + else ADD_MESSAGE("\"What a fine pile of %d %s. I'll pay \1Y%d\2 gold pieces for them.\"", Amount, ForSale->CHAR_NAME(PLURAL), Price); if (game::TruthQuestion(CONST_S("Do you accept this deal?"))) { Customer->SetMoney(Customer->GetMoney() + Price); GetMaster()->SetMoney(GetMaster()->GetMoney() - Price); @@ -184,7 +184,7 @@ truth shop::DropItem (character *Customer, item *ForSale, int Amount) { } return false; } - ADD_MESSAGE("\"I would pay you %d gold pieces for %s, but I'm temporarily short of cash. Sorry.\"", Price, Amount == 1 ? "it" : "them"); + ADD_MESSAGE("\"I would pay you \1Y%d\2 gold pieces for %s, but I'm temporarily short of cash. Sorry.\"", Price, Amount == 1 ? "it" : "them"); return false; } ADD_MESSAGE("The shopkeeper doesn't see you, so you cannot trade with him."); -- 2.11.4.GIT