better mob combat stuff

6 files changed, 95 insertions, 22 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index ff8dd5d..c3c580c 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -117,7 +117,7 @@ void Entity::spawn(float x, float y)
 	// generate a name
 	name = new char[32];
 	if (type == MOBT)
-		name[0] = '\0';
+		strncpy(name, "mob", 3);
 	else
 		randGetomName(this);
 
@@ -127,7 +127,6 @@ void Entity::spawn(float x, float y)
 void Entity::takeHit(unsigned int _health, unsigned int cooldown)
 {
 	if (hitCooldown <= 1) {
-		std::cout << "Taking hit " << std::endl;
 		// modify variables
 		health = fmax(health - _health, 0);
 		forcedMove = true;
diff --git a/src/items.cpp b/src/items.cpp
index 99c143b..6c65b59 100644
--- a/src/items.cpp
+++ b/src/items.cpp
@@ -69,29 +69,30 @@ int Sword::useItem()
 
 						if (hitbox.end.x > e->loc.x && hitbox.end.x < e->loc.x + e->width) {
 							if (hitbox.end.y > e->loc.y && hitbox.end.y < e->loc.y + e->height) {
-								e->takeHit(damage, 600);
+								if (e->type == MOBT)
+									Mobp(e)->onHit(damage);
+								else
+									e->takeHit(damage, 600);
 
-						static GLuint sColor = Texture::genColor(Color(255,0,0));
-
-						GLfloat t[] = {0.0, 0.0,
-									   1.0, 1.0};
-
-						GLfloat v[] = {hitbox.start.x, 	hitbox.start.y, 1.0,
-									   hitbox.end.x,	hitbox.end.y,	1.0};
+								static GLuint sColor = Texture::genColor(Color(255,0,0));
+								GLfloat t[] = {0.0, 0.0,
+											   1.0, 1.0};
+								GLfloat v[] = {hitbox.start.x, 	hitbox.start.y, 1.0,
+											   hitbox.end.x,	hitbox.end.y,	1.0};
 
 					
-						glBindTexture(GL_TEXTURE_2D, sColor);
-						glUseProgram(worldShader);
-						glEnableVertexAttribArray(worldShader_attribute_coord);
-						glEnableVertexAttribArray(worldShader_attribute_tex);
+								glBindTexture(GL_TEXTURE_2D, sColor);
+								glUseProgram(worldShader);
+								glEnableVertexAttribArray(worldShader_attribute_coord);
+								glEnableVertexAttribArray(worldShader_attribute_tex);
 						
-						glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, v);
-						glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, t);
-						glDrawArrays(GL_LINES, 0, 2);
+								glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, v);
+								glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, t);
+								glDrawArrays(GL_LINES, 0, 2);
 
-						glDisableVertexAttribArray(worldShader_attribute_coord);
-						glDisableVertexAttribArray(worldShader_attribute_tex);
-						glUseProgram(0);
+								glDisableVertexAttribArray(worldShader_attribute_coord);
+								glDisableVertexAttribArray(worldShader_attribute_tex);
+								glUseProgram(0);
 								// add some blood
 								// for(int r = 0; r < (rand()%5);r++)
 								// 	currentWorld->addParticle(rand()%game::HLINE*3 + e->loc.x - .05f,e->loc.y + e->height*.5, game::HLINE,game::HLINE, -(rand()%10)*.01,((rand()%4)*.001-.002), {(rand()%75+10)/100.0f,0,0}, 10000);
diff --git a/src/mob.cpp b/src/mob.cpp
index db0b88a..1f998f7 100644
--- a/src/mob.cpp
+++ b/src/mob.cpp
@@ -39,6 +39,12 @@ void Page::act(void)
     }
 }
 
+void Page::onHit(unsigned int _health)
+{
+	(void)_health;
+	act();
+}
+
 bool Page::bindTex(void)
 {
     glActiveTexture(GL_TEXTURE0);
@@ -72,6 +78,11 @@ void Door::act(void)
 {
 }
 
+void Door::onHit(unsigned int _health)
+{
+	(void)_health;
+}
+
 bool Door::bindTex(void)
 {
     glActiveTexture(GL_TEXTURE0);
@@ -124,6 +135,11 @@ void Cat::act(void)
     }
 }
 
+void Cat::onHit(unsigned int _health)
+{
+	health += _health;
+}
+
 bool Cat::bindTex(void)
 {
     glActiveTexture(GL_TEXTURE0);
@@ -148,6 +164,10 @@ Rabbit::Rabbit(void) : Mob()
     tex = TextureIterator({"assets/rabbit.png", "assets/rabbit1.png"});
     actCounterInitial = randGet() % 240 + 15;
     actCounter = 1;
+
+	drop = {
+		std::make_tuple("Dank MayMay", 5, 1.00f)
+	};
 }
 
 void Rabbit::act(void)
@@ -170,6 +190,11 @@ void Rabbit::act(void)
     }
 }
 
+void Rabbit::onHit(unsigned int _health)
+{
+	takeHit(_health, 600);
+}
+
 bool Rabbit::bindTex(void)
 {
     glActiveTexture(GL_TEXTURE0);
@@ -219,6 +244,11 @@ void Bird::act(void)
     vel.x = direction ? -0.3f : 0.3f;
 }
 
+void Bird::onHit(unsigned int _health)
+{
+	takeHit(_health, 1000);
+}
+
 bool Bird::bindTex(void)
 {
     glActiveTexture(GL_TEXTURE0);
@@ -292,6 +322,11 @@ void Trigger::act(void)
     }
 }
 
+void Trigger::onHit(unsigned int _health)
+{
+	(void)_health;
+}
+
 bool Trigger::bindTex(void)
 {
     return false;
@@ -347,3 +382,18 @@ void Mob::ride(Entity *e)
     else
         rider = e;
 }
+
+void Mob::onDeath(void)
+{
+	vec2 q = vec2 {player->loc.x, game::SCREEN_HEIGHT - 100.0f};
+
+	ui::putTextL(q, "Player got: ");
+
+	for (const auto &d : drop) {
+		if ((randGet() % 100) < std::get<float>(d) * 100.0f) {
+			q.y -= 20;
+			ui::putTextL(q, "%d x %s", std::get<unsigned int>(d), std::get<std::string>(d).c_str());
+			player->inv->addItem(std::get<std::string>(d), std::get<unsigned int>(d));
+		}
+	}
+}
diff --git a/src/ui.cpp b/src/ui.cpp
index a5bc2d7..f9c52bc 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -58,6 +58,8 @@ static unsigned char fontColor[4] = {255,255,255,255};
  *	Variables for dialog boxes / options.
  */
 
+static std::vector<std::pair<vec2, std::string>> textToDraw;
+
 static std::vector<std::pair<std::string,vec3>> dialogOptText;
 static std::string dialogBoxText;
 static std::vector<vec3> merchArrowLoc (2, vec3 { 0, 0, 0 });
@@ -511,6 +513,18 @@ namespace ui {
 		return putString(x, y, buf.get());
 	}
 
+	void putTextL(vec2 c, const char *str, ...) {
+		va_list args;
+		std::unique_ptr<char[]> buf (new char[512]);
+		memset(buf.get(), 0, 512 * sizeof(char));
+		
+		va_start(args, str);
+		vsnprintf(buf.get(), 512, str, args);
+		va_end(args);
+
+		textToDraw.push_back(std::make_pair(c, buf.get()));
+	}
+
 	void dialogBox(std::string name, std::string opt, bool passive, std::string text, ...) {
 		va_list dialogArgs;
 		std::unique_ptr<char[]> printfbuf (new char[512]);
@@ -940,7 +954,11 @@ namespace ui {
 					Mix_PlayChannel(1, dialogClick, 0);
 			}
 
+		} else {
+			for (const auto &s : textToDraw)
+				putString(s.first.x, s.first.y, s.second);
 		}
+
 		if (!fadeIntensity) {
 			vec2 hub = {
 				(SCREEN_WIDTH/2+offset.x)-fontSize*10,
@@ -1154,7 +1172,9 @@ EXIT:
 				if ((action::make = e.button.button & SDL_BUTTON_RIGHT))
 					/*player->inv->invHover =*/ edown = false;
 
-			if (dialogBoxExists || pageTexReady) {
+				textToDraw.clear();
+
+				if (dialogBoxExists || pageTexReady) {
 					// right click advances dialog
 					if ((e.button.button & SDL_BUTTON_RIGHT))
 						dialogAdvance();
diff --git a/src/ui_menu.cpp b/src/ui_menu.cpp
index e766b61..309d16a 100644
--- a/src/ui_menu.cpp
+++ b/src/ui_menu.cpp
@@ -153,7 +153,8 @@ namespace ui {
 			glUseProgram(textShader);
 			
 			glBindTexture(GL_TEXTURE_2D, backTex);
-			drawRect(vec2(offset.x - SCREEN_WIDTH / 2, offset.y - (SCREEN_HEIGHT / 2)), vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)));
+			drawRect(vec2(offset.x - SCREEN_WIDTH / 2 - 1, offset.y - (SCREEN_HEIGHT / 2)),
+			         vec2(offset.x + SCREEN_WIDTH / 2, offset.y + (SCREEN_HEIGHT / 2)));
 
 			glUseProgram(0);
 
diff --git a/src/world.cpp b/src/world.cpp
index 70ba967..b6e46bf 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -747,6 +747,8 @@ singleDetect(Entity *e)
     } else if (e->health <= 0) {
         // die
         e->die();
+		if (inBattle && e->type == MOBT)
+			Mobp(e)->onDeath();
 
         // delete the entity
 		for (i = 0; i < entity.size(); i++) {