Introduce a shop type enum and a shop class

- Shop scrollbar now only visible when needed
- Outdoor shop special node now supports junk shops
- Outdoor shop special node now uses correct title string
- Fix minor issue with framing rects

osx/classes/shop.cpp

@@ -0,0 +1,159 @@
+//
+//  shop.cpp
+//  BoE
+//
+//  Created by Celtic Minstrel on 14-12-27.
+//
+//
+
+#include "shop.hpp"
+#include <numeric>
+#include "mathutil.h"
+#include "graphtool.h" // for get_str
+
+static long cost_mult[7] = {5,7,10,13,16,20,25};
+
+cShop::cShop() {}
+
+cShop::cShop(eShopType type, int adj, std::string name) : type(type), cost_adj(adj), name(name) {}
+
+size_t cShop::firstEmpty() {
+	for(size_t i = 0; i < items.size(); i++) {
+		if(items[i].type == eShopItemType::EMPTY)
+			return i;
+	}
+	return items.size();
+}
+
+size_t cShop::size() {
+	return std::count_if(items.begin(), items.end(), [](cShopItem& item) {
+		return item.type != eShopItemType::EMPTY;
+	});
+}
+
+void cShop::addItem(cItemRec item) {
+	size_t i = firstEmpty();
+	if(i >= items.size()) return;
+	if(item.variety == eItemType::NO_ITEM) return;
+	items[i].type = eShopItemType::ITEM;
+	items[i].item = item;
+	items[i].item.ident = true;
+	items[i].cost = item.value;
+	if(item.charges > 0)
+		items[i].cost *= item.charges;
+	items[i].cost *= cost_mult[cost_adj];
+	items[i].cost /= 10;
+}
+
+static cItemRec store_mage_spells(short which_s) {
+	cItemRec spell('spel');
+	static const short cost[62] = {
+		// TODO: Costs for the level 1-3 spells
+		5,5,5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,5,5,
+		150,200,150,1000,1200,400,300,200,
+		200,250,500,1500,300,  250,125,150,
+		400,450, 800,600,700,600,7500, 500,
+		5000,3000,3500,4000,4000,4500,7000,5000
+	};
+	
+	if(which_s != minmax(0,61,which_s))
+		which_s = 0;
+	spell.item_level = which_s;
+	spell.value = cost[which_s];
+	spell.full_name = get_str("magic-names",which_s + 1);
+	return spell;
+}
+
+static cItemRec store_priest_spells(short which_s) {
+	cItemRec spell('spel');
+	static const short cost[62] = {
+		// TODO: Costs for the level 1-3 spells
+		5,5,5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,5,5,
+		5,5,5,5,5,5,5,5,5,5,
+		100,150,75,400,200, 100,80,250,
+		400,400,1200,600,300, 600,350,250,
+		500,500,600,800, 1000,900,400,600,
+		2500,2000,4500,4500,3000,3000,2000,2000
+	};
+	
+	if(which_s != minmax(0,61,which_s))
+		which_s = 0;
+	spell.item_level = which_s;
+	spell.value = cost[which_s];
+	spell.full_name = get_str("magic-names",which_s + 101);
+	return spell;
+}
+
+static cItemRec store_alchemy(short which_s) {
+	cItemRec spell('spel');
+	static const short val[20] = {
+		50,75,30,130,100,
+		150, 200,200,300,250,
+		300, 500,600,750,700,
+		1000,10000,5000,7000,12000
+	};
+	
+	if(which_s != minmax(0,19,which_s))
+		which_s = 0;
+	spell.item_level = which_s;
+	spell.value = val[which_s];
+	spell.full_name = get_str("magic-names",which_s + 200);
+	return spell;
+}
+
+void cShop::addSpecial(eShopItemType type, int n) {
+	// TODO: Make this a std::map instead
+	static const short heal_costs[9] = {50,30,80,100,250,500,1000,3000,100};
+	static const char*const heal_types[] = {
+		"Heal Damage","Cure Poison","Cure Disease","Cure Paralysis",
+		"Uncurse Items","Cure Stoned Character","Raise Dead","Resurrection","Cure Dumbfounding"
+	};
+	if(type == eShopItemType::EMPTY) return;
+	if(type == eShopItemType::ITEM) return;
+	size_t i = firstEmpty();
+	if(i >= items.size()) return;
+	items[i].type = type;
+	if(type == eShopItemType::MAGE_SPELL)
+		items[i].item = store_mage_spells(n);
+	else if(type == eShopItemType::PRIEST_SPELL)
+		items[i].item = store_priest_spells(n);
+	else if(type == eShopItemType::ALCHEMY)
+		items[i].item = store_alchemy(n);
+	else {
+		items[i].item.graphic_num = 109;
+		items[i].item.full_name = heal_types[int(type) - 700];
+	}
+	if(type == eShopItemType::MAGE_SPELL || type == eShopItemType::PRIEST_SPELL || type == eShopItemType::ALCHEMY)
+		items[i].cost = items[i].item.value;
+	else items[i].cost = heal_costs[int(type) - 700];
+	items[i].cost *= cost_mult[cost_adj];
+	items[i].cost /= 10;
+}
+
+cShopItem cShop::getItem(size_t i) const {
+	return items[i];
+}
+
+eShopType cShop::getType() const {
+	return type;
+}
+
+int cShop::getCostAdjust() const {
+	return cost_adj;
+}
+
+std::string cShop::getName() const {
+	return name;
+}
+
+void cShop::clearItem(size_t i) {
+	std::copy(items.begin() + i + 1, items.end(), items.begin() + i);
+	items.back().type = eShopItemType::EMPTY;
+}
+
+void cShop::clear() {
+	std::fill(items.begin(), items.end(), cShopItem());
+}