1 files changed, 33 insertions, 4 deletions
diff --git a/include/entities.h b/include/entities.h
index 926eeae..545f0a4 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -22,13 +22,13 @@ enum _TYPE {
 	STRUCTURET,
 	PLAYERT,
 	NPCT,
+	MERCHT,
 	MOBT
 };
 
 enum GENDER{
 	MALE,
-	FEMALE,
-	TRANSBULLSHIT
+	FEMALE
 };
 
 enum MOB_SUB {
@@ -47,7 +47,27 @@ enum BUILD_SUB{
 	HOUSE4 = 4,
 	FOUNTAIN = 5,
 	LAMP_POST = 6,
-	FIRE_PIT = 7
+	FIRE_PIT = 7,
+	STALL_MARKET = 70,
+	STALL_TRADER = 71
+};
+
+class BuySell{
+public:
+	int member;
+	union{
+		struct{
+			std::string item1;
+			std::string item2;
+		}trade;
+		struct{
+			enum type{BUY,SELL};
+			std::string item;
+			int price;
+		}cost;
+	};
+	BuySell(){}
+	~BuySell(){}
 };
 
 class World;
@@ -191,10 +211,19 @@ public:
 	
 	void addAIFunc(int (*func)(NPC *),bool preload);
 	void clearAIFunc(void);
-	void interact();
+	virtual void interact();
 	void wander(int);
 };
 
+class Merchant : public NPC{
+public:
+	std::vector<BuySell>bsinv;
+	void interact();
+
+	Merchant();
+	~Merchant();
+};
+
 class Structures : public Entity{
 public:
 	BUILD_SUB bsubtype;