merge

13 files changed, 126 insertions, 51 deletions

diff --git a/assets/items/coin1.png b/assets/items/coin1.png
new file mode 100644
index 0000000..6b8ba8c
--- /dev/null
+++ b/assets/items/coin1.png
diff --git a/assets/items/coin2.png b/assets/items/coin2.png
new file mode 100644
index 0000000..5bfd622
--- /dev/null
+++ b/assets/items/coin2.png
diff --git a/assets/items/coin3.png b/assets/items/coin3.png
new file mode 100644
index 0000000..61bf980
--- /dev/null
+++ b/assets/items/coin3.png
diff --git a/assets/style/classic/bg/moon.png b/assets/style/classic/bg/moon.png
new file mode 100644
index 0000000..d9a5ab7
--- /dev/null
+++ b/assets/style/classic/bg/moon.png
diff --git a/config/items.xml b/config/items.xml
index 02382d6..eddab3e 100644
--- a/config/items.xml
+++ b/config/items.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 
+<currency name="Abe Lincoln" value="1" sprite="assets/items/coin1.png"/>
+<currency name="George Washington" value="25" sprite="assets/items/coin2.png"/>
+<currency name="Barack Hussein Obama" value="100" sprite="assets/items/coin3.png"/>
+
 <item name="Debug"       type="Tool"  maxStackSize="1"   width="1"  height="1"  sprite="assets/items/ITEM_TEST.png" />
 <item name="Dank MayMay" type="Tool"  maxStackSize="420" width="10" height="10" sprite="assets/items/ITEM_TEST.png" />
 <item name="Your Bag"    type="Equip" maxStackSize="1"   width="5"  height="5"  sprite="assets/items/ITEM_TEST.png" />
diff --git a/include/entities.h b/include/entities.h
index c10bcd4..ef421f5 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -52,22 +52,20 @@ enum BUILD_SUB{
 	STALL_TRADER = 71
 };
 
-class BuySell{
+class Trade{
 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(){}
+	std::string item[2];
+	int quantity[2];
+	Trade(int qo, const char* o, int qt, const char* t){
+		item[0] = o;
+		item[1] = t;
+
+		quantity[0] = qo;
+		quantity[1] = qt;
+
+		std::cout << "Trading: " << quantity[0] << " " << item[0] << " for " << quantity[1] << " " << item[1] << std::endl;
+	}
+	Trade(){}
 };
 
 class World;
@@ -220,7 +218,8 @@ public:
 
 class Merchant : public NPC{
 public:
-	std::vector<BuySell>bsinv;
+	std::vector<Trade>trade;
+
 	void interact();
 
 	Merchant();
diff --git a/include/inventory.h b/include/inventory.h
index 8225ab2..69cf073 100644
--- a/include/inventory.h
+++ b/include/inventory.h
@@ -62,6 +62,7 @@ void initInventorySprites(void);
 void destroyInventory(void);
 
 const char *getItemTexturePath(std::string name);
+GLuint getItemTexture(std::string name);
 float getItemWidth(std::string name);
 float getItemHeight(std::string name);
 
diff --git a/include/ui.h b/include/ui.h
index 667a581..ed9fb94 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -146,7 +146,7 @@ namespace ui {
 	*/
 	
 	void dialogBox(const char *name,const char *opt,bool passive,const char *text,...);
-	void merchantBox(const char *name, std::vector<BuySell> *items, const char *opt,bool passive,const char *text,...);
+	void merchantBox(const char *name,Trade trade,const char *opt,bool passive,const char *text,...);
 	void merchantBox();
 	void waitForDialog(void);
 	
diff --git a/src/entities.cpp b/src/entities.cpp
index 73105f1..329af63 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -166,6 +166,8 @@ Merchant::Merchant(){	//sets all of the Merchant specific traits on object creat
 	
 	maxHealth = health = 100;
 	canMove = true;
+
+	trade.reserve(100);
 	
 	//tex = new Texturec(1,"assets/NPC.png");
 	//inv = new Inventory(NPC_INV_SIZE);
@@ -447,9 +449,15 @@ void NPC::interact(){ //have the npc's interact back to the player
 }
 
 void Merchant::interact(){
-	ui::merchantBox(name, &bsinv, ":Accept:Good-Bye", false, "Welcome to Smithy\'s. Buy your sausages here you freaking meme lording screw-face");
-	//ui::merchantBox();
+	ui::merchantBox(name, trade.back(), ":Accept:Good-Bye", false, "Welcome to Smithy\'s. Buy your sausages here you freaking meme lording screw-face");
 	ui::waitForDialog();
+	if(ui::dialogOptChosen == 1){
+		std::cout << "Gimme ye' munny" << std::endl;
+		if(player->inv->takeItem(trade.back().item[1],trade.back().quantity[1]) >= 0)
+			player->inv->addItem(trade.back().item[0],trade.back().quantity[0]);
+	}else{
+		std::cout << "See ye!" << std::endl;
+	}
 }
 
 void Object::interact(void){
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 7400f89..e82d99e 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -68,7 +68,7 @@ int Inventory::takeItem(std::string name,uint count){
 	}
 	
 	if(id == 999999)
-		return -1;
+		return -1; //if no such item exists
 	
 	/*
 	 * Inventory lookup
@@ -141,6 +141,15 @@ const char *getItemTexturePath(std::string name){
 	return NULL;
 }
 
+GLuint getItemTexture(std::string name){
+	for(auto &i : itemMap){
+		if(i->name == name)
+			return Texture::loadTexture(i->texloc);
+	}
+
+	return Texture::loadTexture("assets/items/ITEM_TEST.png");
+}
+
 float getItemWidth(std::string name){
 	for(auto &i : itemMap){
 		if(i->name == name)
diff --git a/src/ui.cpp b/src/ui.cpp
index 7333fc4..f0cc507 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -120,8 +120,8 @@ namespace ui {
 	bool posFlag=false;
 	bool dialogPassive = false;
 	bool dialogMerchant = false;
-	std::vector<BuySell> *minv;
 	int dialogPassiveTime = 0;
+	Trade merchTrade;
 
 	
 	/*
@@ -131,6 +131,7 @@ namespace ui {
 	bool dialogBoxExists = false;
 	bool dialogImportant = false;
 	unsigned char dialogOptChosen = 0;
+	unsigned char merchOptChosen = 0;
 	
 	unsigned int textWrapLimit = 110;
 	
@@ -313,6 +314,7 @@ namespace ui {
 		unsigned int i=0;
 		float xo=x,yo=y;
 		vec2 add;
+		//vec2 off = { (float)floor(x), (float)floor(y) };
 		
 		/*
 		 *	Loop on each character:
@@ -325,6 +327,14 @@ namespace ui {
 				if(s[i] == ' ')
 					i++;
 			}
+			if(i && (i / (float)textWrapLimit == i / textWrapLimit)){
+ 				yo -= fontSize * 1.05;
+ 				xo = x;
+ 				
+				// skip a space if it's there since we just newline'd
+  				if(s[i] == ' ')
+  					i++;
+  			}
 			if(s[i] == '\n'){
 				yo-=fontSize*1.05;
 				xo=x;
@@ -523,13 +533,17 @@ namespace ui {
 			ret[0] = '\0';
 	}
 
-	void merchantBox(const char *name,std::vector<BuySell> *bsinv,const char *opt,bool passive,const char *text,...){
+
+	void merchantBox(const char *name,Trade trade,const char *opt,bool passive,const char *text,...){
 		std::cout << "Buying and selling on the bi-weekly!" << std::endl;
 		va_list dialogArgs;
 		size_t len;
 		
-		minv = bsinv;
 		dialogPassive = passive;
+
+		std::cout << "Market Trading: " << trade.quantity[0] << " " << trade.item[0] << " for " << trade.quantity[1] << " " << trade.item[1] << std::endl;
+
+		merchTrade = trade;
 		
 		// clear the buffer
 		memset(dialogBoxText, '\0', 512);
@@ -665,6 +679,8 @@ namespace ui {
 					setFontSize(16);
 				}
 			}else if(dialogMerchant){
+				//static int dispItem;
+
 				x=offset.x-SCREEN_WIDTH/6;
 				y=(offset.y+SCREEN_HEIGHT/2)-HLINE*8;
 			
@@ -683,31 +699,62 @@ namespace ui {
 				
 				// draw typeOut'd text
 				putString(x + HLINE, y - fontSize - HLINE, (rtext = typeOut(dialogBoxText)));
-				merchAOptLoc[0][0] = offset.x - (SCREEN_WIDTH / 6.5) - 16;
-				merchAOptLoc[0][1] = offset.x + (SCREEN_WIDTH / 6.5);
-				merchAOptLoc[1][0] = offset.y + (SCREEN_HEIGHT *.25);
-				merchAOptLoc[1][1] = offset.y + (SCREEN_HEIGHT *.25);
-				merchAOptLoc[2][0] = offset.x - (SCREEN_WIDTH / 6.5);
-				merchAOptLoc[2][1] = offset.x + (SCREEN_WIDTH / 6.5) + 16;
+
+				std::string itemString1 = std::to_string(merchTrade.quantity[0]);
+				itemString1 += "x";
+
+				std::string itemString2 = std::to_string(merchTrade.quantity[1]);
+				itemString2 += "x";
+
+				putStringCentered(offset.x - (SCREEN_WIDTH / 10) + 20, offset.y + (SCREEN_HEIGHT / 5) + 40 + (fontSize*2), itemString1.c_str());
+				putStringCentered(offset.x - (SCREEN_WIDTH / 10) + 20, offset.y + (SCREEN_HEIGHT / 5) + 40 + fontSize, merchTrade.item[0].c_str());
+
+				putStringCentered(offset.x + (SCREEN_WIDTH / 10) - 20, offset.y + (SCREEN_HEIGHT / 5) + 40 + (fontSize*2), itemString2.c_str());
+				putStringCentered(offset.x + (SCREEN_WIDTH / 10) - 20, offset.y + (SCREEN_HEIGHT / 5) + 40 + fontSize, merchTrade.item[1].c_str());
+
+				putStringCentered(offset.x,offset.y + (SCREEN_HEIGHT / 5) + 60, "for");
+
+				glEnable(GL_TEXTURE_2D);
+				glBindTexture(GL_TEXTURE_2D, getItemTexture(merchTrade.item[0]));
+				glBegin(GL_QUADS);
+					glTexCoord2d(0,1);glVertex2f(offset.x - (SCREEN_WIDTH / 10)     ,offset.y + (SCREEN_HEIGHT/5));
+					glTexCoord2d(1,1);glVertex2f(offset.x - (SCREEN_WIDTH / 10) + 40,offset.y + (SCREEN_HEIGHT/5));
+					glTexCoord2d(1,0);glVertex2f(offset.x - (SCREEN_WIDTH / 10) + 40,offset.y + (SCREEN_HEIGHT/5) + 40);
+					glTexCoord2d(0,0);glVertex2f(offset.x - (SCREEN_WIDTH / 10)     ,offset.y + (SCREEN_HEIGHT/5) + 40);
+				glEnd();
+
+				glBindTexture(GL_TEXTURE_2D, getItemTexture(merchTrade.item[1]));
+				glBegin(GL_QUADS);
+					glTexCoord2d(0,1);glVertex2f(offset.x + (SCREEN_WIDTH / 10) - 40,offset.y + (SCREEN_HEIGHT/5));
+					glTexCoord2d(1,1);glVertex2f(offset.x + (SCREEN_WIDTH / 10)     ,offset.y + (SCREEN_HEIGHT/5));
+					glTexCoord2d(1,0);glVertex2f(offset.x + (SCREEN_WIDTH / 10)     ,offset.y + (SCREEN_HEIGHT/5) + 40);
+					glTexCoord2d(0,0);glVertex2f(offset.x + (SCREEN_WIDTH / 10) - 40,offset.y + (SCREEN_HEIGHT/5) + 40);
+				glEnd();
+				glDisable(GL_TEXTURE_2D);
+
+				merchAOptLoc[0][0] = offset.x - (SCREEN_WIDTH / 8.5) - 16;
+				merchAOptLoc[1][0] = offset.x + (SCREEN_WIDTH / 8.5) + 16;
+				merchAOptLoc[0][1] = offset.y + (SCREEN_HEIGHT *.2);
+				merchAOptLoc[1][1] = offset.y + (SCREEN_HEIGHT *.2);
+				merchAOptLoc[0][2] = offset.x - (SCREEN_WIDTH / 8.5);
+				merchAOptLoc[1][2] = offset.x + (SCREEN_WIDTH / 8.5);
 
 				for(i = 0; i < 2; i++){
-					if(mouse.x > merchAOptLoc[0][i] && mouse.x < merchAOptLoc[2][i] &&
-					   mouse.y > merchAOptLoc[1][i] - 8 && mouse.y < merchAOptLoc[1][i] + 8){
-						glColor3ub(255, 255, 0);
+					if(((merchAOptLoc[i][0] < merchAOptLoc[i][2]) ? 
+						(mouse.x > merchAOptLoc[i][0] && mouse.x < merchAOptLoc[i][2]) : 
+						 (mouse.x < merchAOptLoc[i][0] && mouse.x > merchAOptLoc[i][2])) &&
+					   mouse.y > merchAOptLoc[i][1] - 8 && mouse.y < merchAOptLoc[i][1] + 8){
+						glColor3ub(255,255, 0);
 					}else{
 						glColor3ub(255,255,255);
 					}
+					glBegin(GL_TRIANGLES);
+						glVertex2f(merchAOptLoc[i][0],merchAOptLoc[i][1]);
+						glVertex2f(merchAOptLoc[i][2],merchAOptLoc[i][1]-8);
+						glVertex2f(merchAOptLoc[i][2],merchAOptLoc[i][1]+8);
+					glEnd();
 				}
 
-				glBegin(GL_TRIANGLES);
-					glVertex2f(merchAOptLoc[0][0],merchAOptLoc[1][0]);
-					glVertex2f(merchAOptLoc[2][0],merchAOptLoc[1][0]-8);
-					glVertex2f(merchAOptLoc[2][0],merchAOptLoc[1][0]+8);
-
-					glVertex2f(merchAOptLoc[2][1],merchAOptLoc[1][1]);
-					glVertex2f(merchAOptLoc[0][1],merchAOptLoc[1][1]-8);
-					glVertex2f(merchAOptLoc[0][1],merchAOptLoc[1][1]+8);
-				glEnd();
 			
 				// draw / handle dialog options if they exist
 				for(i = 0; i < dialogOptCount; i++){
@@ -1407,7 +1454,7 @@ DONE:
 					//currentWorld->addVillage(player->loc.x, player->loc.y, 5, 10, 100, NULL);
 					break;
 				case SDLK_b:
-					currentWorld->addStructure(FIRE_PIT, player->loc.x, player->loc.y, NULL, NULL);
+					currentWorld->addStructure(FIRE_PIT, player->loc.x, player->loc.y, "", "");
 					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
 					break;
 				case SDLK_F12:
diff --git a/src/world.cpp b/src/world.cpp
index 5dbbe21..a0ae0f3 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -325,7 +325,7 @@ update( Player *p, unsigned int delta )
 	}
 
     // iterate through particles
-    particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles part){ return part.kill( delta ); }), particles.end());
+    particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles &part){return part.kill(delta);}), particles.end());
     for ( auto part = particles.begin(); part != particles.end(); part++ ) {
 		if ( (*part).canMove ) {
 			(*part).loc.y += (*part).vely * delta;
@@ -1411,6 +1411,7 @@ loadWorldFromXMLNoSave( std::string path ) {
 	while(vil){
 		name = vil->Name();
 		randx = 0;
+		//static BuySell bs;
 
 		/**
 		 * 	READS DATA ABOUT STRUCTURE CONTAINED IN VILLAGE
@@ -1432,10 +1433,18 @@ loadWorldFromXMLNoSave( std::string path ) {
 							   vil->StrAttribute("texture"),
 							   vil->StrAttribute("inside"));
 				tmp->addMerchant(0,100);
-				if(!strcmp(name,"buy")){
-					std::cout << "Buying";
-				}else if(!strcmp(name,"sell")){
-					std::cout << "Selling";
+				if(vil->FirstChildElement("buy")){
+					std::cout << "Buy" << std::endl;
+					//Trade goodMeme(1,"Dank MayMay",1,"Sword");
+					//tmp->merchant.back()->trade.push_back(Trade());
+				}if(vil->FirstChildElement("sell")){
+					std::cout << "Sell" << std::endl;
+				}if(vil->FirstChildElement("trade")){
+					std::cout << "Trade" << std::endl;
+					tmp->merchant.back()->trade.push_back(Trade(vil->FirstChildElement("trade")->IntAttribute("quantity"),
+																vil->FirstChildElement("trade")->Attribute("item"),
+																vil->FirstChildElement("trade")->IntAttribute("quantity1"),
+																vil->FirstChildElement("trade")->Attribute("item1")));
 				}
 				strcpy(tmp->merchant.back()->name,"meme");
 
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index c770e0f..2e8b2aa 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -10,16 +10,14 @@
 	
 	<npc name="Ralph" hasDialog="true" />
 	<npc name="Johnny" hasDialog="false" />
-	<!-- <structure type="5" inside="playerSpawnHill1_Building1.xml" /> -->
 	<village name="the Cranmore Tubing Park">
 		<structure type="0" x="-300" inside="playerSpawnHill1_Building1.xml"/>
 		<structure type="5" x="-500" inside="playerSpawnHill1_Building1.xml"/>
 		<stall type="market" texture="assets/style/classic/stall.png">
 			<buy item="Dank MayMay" cost="420"/>
 			<sell item="Dank MayMay" cost="666"/>
-		</stall>
-		<stall type="trader" texture="assets/style/classic/stall.png">
-			<trade item="Dank MayMay" item1="Sword"/>
+			<trade quantity="420" item="Dank MayMay" quantity1="1" item1="Wood Sword"/>
+			<trade quantity="666" item="Wood Sword" quantity1="420" item1="Dank MayMay"/>
 		</stall>
 	</village>