From 0876c5d1d18b8cc9f4a5fc7fb0240e494771f10d Mon Sep 17 00:00:00 2001
From: Jon Meschino <jam2707@rit.edu>
Date: Fri, 05 Nov 2010 20:28:48 +0000
Subject: Fortune Hunter update:

-reintegrated lose condition into game. You will now be transported back to the start of the current dungeon if you are defeated.
-added Merchant.py (not functional)
---
diff --git a/MAFH2/Merchant.py b/MAFH2/Merchant.py
new file mode 100755
index 0000000..01500b1
--- /dev/null
+++ b/MAFH2/Merchant.py
@@ -0,0 +1,31 @@
+from Items import get_item
+from random import *
+import pygame
+from pygame.locals import *
+from constants import MENU_PATH, CHAR_PATH
+
+############################################################################
+#Merchant class
+############################################################################
+class Merchant:
+    def __init__(self,player):
+	    self.player = player
+        self.itemList=[get_item('l'),get_item('m')]
+        self.selItem=0
+        self.numItem=[0,0]
+        self.totalPrice=0
+        self.selDigit=3
+        self.enteredDigits=[0,0,0,0]
+        self.buyScreen=False
+        self.buyMode=True
+        self.sellMode=False
+        self.yes=True
+        self.shopKeeperVariable=0
+        self.message=[]
+        
+        if self.player.shopTutorial = False:
+            self.message.append("WELCOME TO SHOP - TUTORIAL MESSAGE")
+        else:
+            self.message.append("NORMAL SHOP MESSAGE")
+			
+			#tickets - win screen missing, hold+flash amulet search missing, scan does damage, when you die you restart dungeon w current inventory, fast clicking through battle crashes game
\ No newline at end of file
--
cgit v0.9.1