Changes

9 files changed, 108 insertions, 85 deletions

diff --git a/brice.dat b/brice.dat
index 3b090ad..ee48d24 100644
--- a/brice.dat
+++ b/brice.dat
@@ -1,7 +1,7 @@
 3
-canSprint
+Slow
 0
 canJump
 0
-Slow
-1
+canSprint
+0
diff --git a/include/entities.hpp b/include/entities.hpp
index 7e68be3..2523364 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -109,6 +109,60 @@ extern const unsigned int NPC_INV_SIZE;
 class World;
 
 /**
+ * The light structure, used to store light coordinates and color.
+ */
+
+class Light{
+public:
+	vec2 loc;		/**< Light location */
+	Color color;	/**< Light color */
+	float radius;   /**< Light radius */
+
+	bool belongsTo;
+	Entity *following;
+
+	bool flame;
+	float fireFlicker;
+	vec2 fireLoc;
+	Light()
+	{
+		loc = vec2(0,0);
+		color = Color(1.0, 1.0, 1.0);
+		radius = 0;
+
+		belongsTo = false;
+		following = nullptr;
+
+		flame = false;	
+	}
+
+	Light(vec2 l, float r, Color c)
+	{
+		loc = l;
+		color = c;
+		radius = r;
+
+		belongsTo = false;
+		following = nullptr;
+
+		flame = false;
+	}
+
+	void follow(Entity *f)
+	{
+		following = f;
+		belongsTo = true;
+	}
+
+	void makeFlame(void)
+	{
+		flame = true;
+	}
+	
+	void createFromXML(XMLElement *e);
+};
+
+/**
  * The entity class.
  * This class contains common functions and variables for all types of
  * entities, i.e. a common structure.
@@ -174,6 +228,9 @@ public:
 	// the entity's inventory
 	Inventory *inv;
 
+	// the entity's light
+	Light light;
+
 	// the entity's health
 	float health;
 
@@ -349,49 +406,6 @@ public:
 };
 
 /**
- * The light structure, used to store light coordinates and color.
- */
-
-class Light{
-public:
-	vec2 loc;		/**< Light location */
-	Color color;	/**< Light color */
-	float radius;   /**< Light radius */
-
-	bool belongsTo;
-	Entity *following;
-
-	bool flame;
-	float fireFlicker;
-	vec2 fireLoc;
-
-	Light(vec2 l, float r, Color c)
-	{
-		loc = l;
-		color = c;
-		radius = r;
-
-		belongsTo = false;
-		following = nullptr;
-
-		flame = false;
-	}
-
-	void follow(Entity *f)
-	{
-		following = f;
-		belongsTo = true;
-	}
-
-	void makeFlame(void)
-	{
-		flame = true;
-	}
-	
-	void createFromXML(XMLElement *e);
-};
-
-/**
  * The particle class, handles a single particle.
  */
 class Particles{
diff --git a/include/world.hpp b/include/world.hpp
index cea79c1..34a597d 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -137,6 +137,7 @@ public:
  * drawing.
  */
 class World {
+friend class ItemLight;
 protected:
 
 	/**
diff --git a/src/items.cpp b/src/items.cpp
index eacf5a9..f0b2f84 100644
--- a/src/items.cpp
+++ b/src/items.cpp
@@ -74,28 +74,9 @@ int Sword::useItem()
 								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};
-
-					
-								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);
-
-								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);
+								//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);
 							}
 						}
 
@@ -160,7 +141,10 @@ int Food::useItem()
 
 int ItemLight::useItem()
 {
-	std::cout << "fsdfsdf" << std::endl;
+	if (player->light.radius > 0)
+		player->light.radius = 0;
+	else
+		player->light.radius = 500;
 	return 0;
 }
 
diff --git a/src/ui.cpp b/src/ui.cpp
index 8f234df..392cb13 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1093,7 +1093,7 @@ namespace ui {
 				drawNiceBox(vec2 {x, y}, vec2 {x + SCREEN_WIDTH - HLINES(16), y - SCREEN_HEIGHT / 4}, -7.0);
 
 				rtext = typeOut(dialogBoxText);
-				putString(x + game::HLINE, y - fontSize - game::HLINE, rtext);
+				putString(x + (2*game::HLINE), y - fontSize - game::HLINE, rtext);
 
 				for(i=0;i<dialogOptText.size();i++) {
 					setFontColor(255,255,255);
diff --git a/src/world.cpp b/src/world.cpp
index 450d956..8c6a548 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -524,12 +524,12 @@ void World::draw(Player *p)
 
 	uint ls = light.size();
 	
-	GLfloat *lightCoords = new GLfloat[light.size() * 4];
-	GLfloat *lightColors = new GLfloat[light.size() * 4];
-	
+	GLfloat *lightCoords = new GLfloat[ls * 4];
+	GLfloat *lightColors = new GLfloat[ls * 4];
+
 	uint lpIndex = 0;
 	uint lcIndex = 0;
-		
+
 	for (uint i = 0; i < ls; i++) {
        	auto &l = light[i];
  	   	if (l.belongsTo) {
@@ -1482,7 +1482,7 @@ addParticle(float x, float y, float w, float h, float vx, float vy, Color color,
 void World::
 addLight(vec2 loc, float radius, Color color)
 {
-	if (light.size() < 64)
+	if (light.size() < 128)
         light.emplace_back(loc, radius, color);
 }
 
diff --git a/xml/000.xml b/xml/000.xml
index 1806332..dc5d4e9 100644
--- a/xml/000.xml
+++ b/xml/000.xml
@@ -19,7 +19,7 @@
     </text>
     <text id="1">
         ...
-                                                                                                                                                                                                                                                                        <gotox>700</gotox>
+                                                                                                                                                                                                                                                                                                        <gotox>700</gotox>
         <set id="Slow" value="0"/>
     </text>
 </Dialog>
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index f997b4d..f5d8843 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -15,12 +15,36 @@
 
 <Dialog name="Guy">
     <text id="0" nextid="1">
-        <gotox>-600</gotox>
+		Hello there! My name is Ralph.
+		                                                                                                                                                                                                                                                                                                                                <gotox>300</gotox>
     </text>
-    <text id="1">
-		...
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <gotox>1000</gotox>
-        <set id="Slow" value="0"/>
-        <set id="canSprint" value="1"/>
+    <text id="1" nextid="2" call="Johnny" callid="0" pause="true">
+		You should go talk to my friend Johnny. He's a pretty chill dude.
+	</text>
+    <text id="2">
+		Niice.
+		                                                                                                                                                                                                                                                                                                                                <quest check="Your First Quest" fail="3"/></text>
+    <text id="3">
+		Go check out Johnny. He's cool.
+	</text>
+</Dialog>
+
+<Dialog name="Johnny">
+    <text id="0" nextid="1" pause="true">
+		Sup bro! Have a quest. To complete it, just go talk to Ralph again.
+		                                                                                                                                                                                                                                                                                                                                <quest assign="Your First Quest">
+			Dank MayMay,2
+			Wood Sword,1
+		</quest>
     </text>
+    <text id="1" nextid="1" pause="true">
+		Broooooooooooooo...
+	</text>
+</Dialog>
+
+<Dialog name="Big Dave">
+    <text id="0" stop="true">
+		Hey friend! It's dangerous out there, here take these!
+		Wait, promise you'll stop by my stand in the local market!
+		                                                                                                                                                                                                                                                                                                                                <give id="Wood Sword" count="1"/>        <give id="Hunters Bow" count="1"/>        <give id="Crude Arrow" count="110"/>        <give id="Fried Chicken" count="1"/>        <give id="Mossy Torch" count="1"/></text>
 </Dialog>
diff --git a/xml/playerSpawnHill1_Building1.xml b/xml/playerSpawnHill1_Building1.xml
index d5c07b3..b68bc7b 100644
--- a/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@ -9,18 +9,18 @@
 
 <Dialog name="Bob">
     <text id="0" nextid="1" pause="true">
-	Hey. Have a Dank MayMay :)
-	        <give id="Dank MayMay" count="1"/></text>
+		Hey. Have a Dank MayMay :)
+		                                <give id="Dank MayMay" count="1"/></text>
     <text id="1" nextid="2">
 	What? You want another Dank MayMay?
     </text>
     <text id="2" nextid="3" pause="true">
 		K.
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           <give id="Dank MayMay" count="1"/></text>
+		                                <give id="Dank MayMay" count="1"/></text>
     <text id="3" nextid="4">
 		Well... I'm out of Dank MayMays.
 	</text>
     <text id="4">
 		Have a sword though.
-		                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <give id="Wood Sword" count="1"/></text>
+		                                <give id="Wood Sword" count="1"/></text>
 </Dialog>