1 files changed, 21 insertions, 15 deletions

diff --git a/inc/shop.inc b/inc/shop.inc
index 11cf97b..6e30923 100644
--- a/inc/shop.inc
+++ b/inc/shop.inc
@@ -5,19 +5,26 @@ require_once("account.inc");
 require_once("Item.inc");
 require_once("Inventory.inc");
 
-$shop = array(
-	"cost" => 3,
-	"items" => array(
-		new Item("cat", 6, "🐈", "Nyan!"),
-		new Item("torch", 3, "🔦", "Electric torch"),
-	),
-);
+function loadShop(){
+	$items = simplexml_load_file('data/items.xml');
+	$shop = array("cost"=>(string)$items["cost"],"items"=>array());
+	foreach($items as $cat){
+		$category = (string)$cat["name"];
+		$shop["items"][$category] = array();
+		foreach($cat as $item){
+			$shop["items"][$category][] = new Item((string)$item->name,intval($item->cost),(string)$item->icon,(string)$item->description);
+		}
+	}
+	return $shop;
+}
 
 function getItem($name) {
-	global $shop;
-	foreach($shop["items"] as $item) {
-		if($name == $item->name) {
-			return $item;
+	$shop=loadShop();
+	foreach($shop["items"] as $cat) {
+		foreach($cat as $item){
+			if($name == $item->name) {
+				return $item;
+			}
 		}
 	}
 	sendError("shop_missing_item");
@@ -29,21 +36,20 @@ function initShop() {
 }
 
 function sendShop() {
-	global $shop;
 	if(!empty($_SESSION["shop"]))
-		return $shop;
+		return loadShop();
 	else return false;
 }
 
 function buildShop() {
-	global $shop;
+	$shop=loadShop();
 	if(!empty($_SESSION["shop"])) {
 		sendError("shop_already_built");
 	}
 	elseif(debitAccount($shop["cost"])) {
 		initShop();
 		$_SESSION["mine"]["gold"] -= $shop["cost"];
-		echo json_encode(sendShop());
+		echo json_encode($shop);
 	}
 }