From e1babdef66780cd11ceac3a798699dd28cc06d39 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Thu, 5 Feb 2015 22:54:37 -0500 Subject: [PATCH] Tweak some proportions so that costs and info strings won't overlap in shops --- rsrc/graphics.exd/mac/invenbtns.png | Bin 1893 -> 1704 bytes src/boe.actions.cpp | 4 ++-- src/boe.newgraph.cpp | 27 +++++++++++++++++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/rsrc/graphics.exd/mac/invenbtns.png b/rsrc/graphics.exd/mac/invenbtns.png index 397894f96541cb654d6e22bd43e6a27354f31d15..e42bf231fab259bbf10d40408ac1540ac2dc2de8 100644 GIT binary patch delta 1688 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 diff --git a/src/boe.actions.cpp b/src/boe.actions.cpp index 711136ba..3773fe3f 100644 --- a/src/boe.actions.cpp +++ b/src/boe.actions.cpp @@ -139,8 +139,8 @@ void init_screen_locs() { shopping_rects[0][SHOPRECT_ITEM_NAME].top += 4; shopping_rects[0][SHOPRECT_ITEM_NAME].left += 28; shopping_rects[0][SHOPRECT_ITEM_COST].top += 20; - // TODO: Might need to put this back to what it was (I was trying to make more room for alchemy info) - shopping_rects[0][SHOPRECT_ITEM_COST].left += 170;//154; + shopping_rects[0][SHOPRECT_ITEM_COST].left += 154; + shopping_rects[0][SHOPRECT_ITEM_COST].right -= 20; shopping_rects[0][SHOPRECT_ITEM_EXTRA].top += 20; shopping_rects[0][SHOPRECT_ITEM_EXTRA].left += 34; shopping_rects[0][SHOPRECT_ITEM_HELP].top += 3; diff --git a/src/boe.newgraph.cpp b/src/boe.newgraph.cpp index bf5dadd3..e08f73ff 100644 --- a/src/boe.newgraph.cpp +++ b/src/boe.newgraph.cpp @@ -792,8 +792,14 @@ void draw_shop_graphics(bool pressed,rectangle clip_area_rect) { style.pointSize = 12; style.lineHeight = 12; win_draw_string(talk_gworld,shopping_rects[i][SHOPRECT_ITEM_NAME],cur_name,eTextMode::WRAP,style); - cur_name = "Cost: " + std::to_string(cur_cost); - win_draw_string(talk_gworld,shopping_rects[i][SHOPRECT_ITEM_COST],cur_name,eTextMode::WRAP,style); + cur_name = std::to_string(cur_cost); + rectangle cost_rect = shopping_rects[i][SHOPRECT_ITEM_COST]; + cost_rect.left = cost_rect.right - string_length(cur_name, style) - 10; + win_draw_string(talk_gworld,cost_rect,cur_name,eTextMode::WRAP,style); + cost_rect.left = cost_rect.right - 7; + cost_rect.top += 3; + cost_rect.height() = 7; + rect_draw_some_item(invenbtn_gworld, {0, 29, 7, 36}, talk_gworld, cost_rect, sf::BlendAlpha); style.pointSize = 10; win_draw_string(talk_gworld,shopping_rects[i][SHOPRECT_ITEM_EXTRA],cur_info_str,eTextMode::WRAP,style); rect_draw_some_item(invenbtn_gworld,item_info_from,talk_gworld,shopping_rects[i][SHOPRECT_ITEM_HELP],pressed ? sf::BlendNone : sf::BlendAlpha); @@ -886,8 +892,8 @@ std::string get_item_interesting_string(cItem item) { case eItemType::BOLTS: case eItemType::MISSILE_NO_AMMO: if(item.bonus != 0) - sout << "Damage: 1-" << item.item_level << " + " << item.bonus << '.'; - else sout << "Damage: 1-" << item.item_level << '.'; + sout << "Damage: 1-" << item.item_level << " + " << item.bonus; + else sout << "Damage: 1-" << item.item_level; break; case eItemType::SHIELD: case eItemType::ARMOR: @@ -895,31 +901,32 @@ std::string get_item_interesting_string(cItem item) { case eItemType::GLOVES: case eItemType::SHIELD_2: case eItemType::BOOTS: // TODO: Verify that this is displayed correctly - sout << "Blocks " << item.item_level + ((item.protection > 0) ? 1 : 0) << '-' << item.item_level + item.protection << " damage."; + sout << "Blocks " << item.item_level + ((item.protection > 0) ? 1 : 0) << '-' << item.item_level + item.protection << " damage"; break; case eItemType::BOW: case eItemType::CROSSBOW: - sout << "Bonus: +" << item.bonus << " to hit."; + sout << "Bonus: +" << item.bonus << " to hit"; break; case eItemType::GOLD: - sout << item.item_level << " gold pieces."; + sout << item.item_level << " gold pieces"; break; case eItemType::SPECIAL: sout << "Special"; break; case eItemType::FOOD: - sout << item.item_level << " food."; + sout << item.item_level << " food"; break; case eItemType::WEAPON_POISON: - sout << "Poison: Does " << item.item_level << '-' << item.item_level * 6 << " damage."; + sout << "Poison: " << item.item_level << '-' << item.item_level * 6 << " damage"; break; default: if(item.charges > 0) - sout << "Uses: " << item.charges; + sout << "Uses: " << item.charges << '.'; return sout.str(); } if(item.charges > 0) sout << "; Uses: " << item.charges; + sout << '.'; return sout.str(); }