merge; lights, xmls

30 files changed, 241 insertions, 116 deletions

diff --git a/assets/blankNormal.png b/assets/blankNormal.png
new file mode 100644
index 0000000..cff3ee7
--- /dev/null
+++ b/assets/blankNormal.png
diff --git a/assets/cat.png b/assets/cat.png
index 56821dd..c5b83c7 100644
--- a/assets/cat.png
+++ b/assets/cat.png
diff --git a/assets/cat_normal.png b/assets/cat_normal.png
new file mode 100644
index 0000000..59aaee8
--- /dev/null
+++ b/assets/cat_normal.png
diff --git a/assets/cat_normal_old.png b/assets/cat_normal_old.png
new file mode 100644
index 0000000..c3ed4aa
--- /dev/null
+++ b/assets/cat_normal_old.png
diff --git a/assets/items/basic_torch.png b/assets/items/basic_torch.png
new file mode 100644
index 0000000..fe6a994
--- /dev/null
+++ b/assets/items/basic_torch.png
diff --git a/assets/style/classic/bg/bgFarMountain.png b/assets/style/classic/bg/bgFarMountain.png
index eb703bb..dc4d682 100644
--- a/assets/style/classic/bg/bgFarMountain.png
+++ b/assets/style/classic/bg/bgFarMountain.png
diff --git a/assets/style/classic/bg/bgn.png b/assets/style/classic/bg/bgn.png
index 2aa3995..1ac3127 100644
--- a/assets/style/classic/bg/bgn.png
+++ b/assets/style/classic/bg/bgn.png
diff --git a/assets/style/classic/bg/bgnew.png b/assets/style/classic/bg/bgnew.png
new file mode 100644
index 0000000..05c352b
--- /dev/null
+++ b/assets/style/classic/bg/bgnew.png
diff --git a/assets/style/classic/bg/forestTileBack.png b/assets/style/classic/bg/forestTileBack.png
index 0ea6022..f43346c 100644
--- a/assets/style/classic/bg/forestTileBack.png
+++ b/assets/style/classic/bg/forestTileBack.png
diff --git a/assets/style/classic/bg/forestTileFar.png b/assets/style/classic/bg/forestTileFar.png
index 241e479..b7cb140 100644
--- a/assets/style/classic/bg/forestTileFar.png
+++ b/assets/style/classic/bg/forestTileFar.png
diff --git a/assets/style/classic/bg/forestTileFront.png b/assets/style/classic/bg/forestTileFront.png
index e54f631..d81b2c7 100644
--- a/assets/style/classic/bg/forestTileFront.png
+++ b/assets/style/classic/bg/forestTileFront.png
diff --git a/assets/style/classic/bg/forestTileMid.png b/assets/style/classic/bg/forestTileMid.png
index b23afd2..6c4c597 100644
--- a/assets/style/classic/bg/forestTileMid.png
+++ b/assets/style/classic/bg/forestTileMid.png
diff --git a/assets/style/classic/bg/star.png b/assets/style/classic/bg/star.png
new file mode 100644
index 0000000..6360d30
--- /dev/null
+++ b/assets/style/classic/bg/star.png
diff --git a/brice.dat b/brice.dat
index 61d57c2..4bfeac6 100644
--- a/brice.dat
+++ b/brice.dat
@@ -1,5 +1,5 @@
 2
 canJump
-0
+1
 canSprint
-0
+1
diff --git a/config/items.xml b/config/items.xml
index 1192842..0abd40d 100644
--- a/config/items.xml
+++ b/config/items.xml
@@ -12,7 +12,15 @@
 <item name="Flashlight"     type="Tool"         value="1"  maxStackSize="1"   width="4"  height="8"  sprite="assets/items/flashlight_off.png" />
 <item name="Fried Chicken"  type="Cooked Food"  value="10" maxStackSize="6" sprite="assets/items/FOOD_CHICKEN_FRIED.png" />
 
+<!--###########-->
 <!-- NEW ITEMS -->
+<!--##########-->
+
+<!-- WEAPONS -->
 <item name="Wood Sword"     type="Sword"    damage="3"  maxStackSize="1"    sprite="assets/items/SWORD_WOOD.png" />
 <item name="Hunters Bow"    type="Bow"      damage="2"  maxStackSize="1"    sprite="assets/items/bow.png"/>
 <item name="Crude Arrow"    type="Arrow"    damage="1"  maxStackSize="99"   sprite="assets/items/arrow_crude.png"/>
+
+<!-- UTILITIES -->
+<item name="Rusty Lantern"	type="Light"			 radius="150" color="255|255|255" sprite="assets/items/rusty_lantern.png"/>
+<item name="Mossy Torch" 	type="Light" fire="true" radius="150" color="245|220|200" sprite="assets/items/basic_torch.png"/>
diff --git a/frig.frag b/frig.frag
index 8761efe..b291ddf 100644
--- a/frig.frag
+++ b/frig.frag
@@ -31,4 +31,4 @@ void main(){
 
 	color += vec4(amb,amb,amb,1.0f+amb);
 	gl_FragColor = tex * vec4(color)*tex.a;
-}
\ No newline at end of file
+}
diff --git a/include/common.hpp b/include/common.hpp
index 4fa74d7..f7507cb 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -238,6 +238,7 @@ extern GLint worldShader_uniform_light_color;
 extern GLint worldShader_uniform_light_impact;
 extern GLint worldShader_uniform_light_amt;
 
+extern Color ambient;
 /**
  *	Prints a formatted debug message to the console, along with the callee's file and line
  *	number.
diff --git a/include/entities.hpp b/include/entities.hpp
index b04705c..826b0f6 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -364,7 +364,8 @@ public:
 	float fireFlicker;
 	vec2 fireLoc;
 
-	Light(vec2 l, Color c, float r){
+	Light(vec2 l, float r, Color c)
+	{
 		loc = l;
 		color = c;
 		radius = r;
@@ -375,7 +376,14 @@ public:
 		flame = false;
 	}
 
-	void makeFlame(void){
+	void follow(Entity *f)
+	{
+		following = f;
+		belongsTo = true;
+	}
+
+	void makeFlame(void)
+	{
 		flame = true;
 	}
 	
diff --git a/include/inventory.hpp b/include/inventory.hpp
index 1431f42..a85e537 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -185,6 +185,18 @@ public:
 	Food* clone();
 };
 
+class ItemLight : public Item {
+private:
+	// the color of the light
+	Color color;
+public:
+	// turn on/off the light
+	// TODO
+	int useItem();
+
+	ItemLight* clone();
+};
+
 /**
  *	Currency class. Well, it's used for currency
  */
diff --git a/include/texture.hpp b/include/texture.hpp
index df2a83c..95bd73b 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -76,6 +76,9 @@ public:
 
 		return textures[index].second;
 	}
+	const dim2 getTextureDim(void) {
+		return Texture::imageDim((*position).second);
+	}
 };
 
 /**
diff --git a/include/world.hpp b/include/world.hpp
index c5730f8..fa8e4d8 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -457,7 +457,7 @@ public:
 	void addHill(ivec2 peak, unsigned int width);
 
 	// functions to add entities to the world
-	void addLight(vec2 xy, Color color);
+	void addLight(vec2 xy, float radius, Color color);
 
 	void addMerchant(float x, float y, bool housed);
 
diff --git a/main.cpp b/main.cpp
index dd6415c..fdecea9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -81,6 +81,9 @@ GLint worldShader_uniform_light_color;
 GLint worldShader_uniform_light_impact;
 GLint worldShader_uniform_light_amt;
 
+// the ambient light of the current world
+Color ambient;
+
 // keeps a simple palette of colors for single-color draws
 GLuint colorIndex;
 
@@ -405,6 +408,7 @@ void render() {
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 	// TODO add depth
     glEnable(GL_DEPTH_TEST);
+	//glEnable(GL_CULL_FACE);
 
 	glUseProgram(textShader);
 	glUniformMatrix4fv(textShader_uniform_transform, 1, GL_FALSE, glm::value_ptr(ortho));
@@ -414,9 +418,15 @@ void render() {
 	glUniformMatrix4fv(worldShader_uniform_transform, 1, GL_FALSE, glm::value_ptr(glm::mat4(1.0f)));
 	
 	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
-	glUniform4f(worldShader_uniform_ambient, 1.0, 1.0, 1.0, 1.0);
-	glUniform1i(worldShader_uniform_light_amt, 0);
+	glUniform4f(worldShader_uniform_ambient, ambient.red, ambient.green, ambient.blue, 1.0);
 	glUniform1f(worldShader_uniform_light_impact, 1.0);
+	
+	/*static GLfloat l[]  = {460.0, 100.0, 0.0, 300.0};
+	static GLfloat lc[] = {1.0, 1.0, 1.0, 1.0};
+	glUniform4fv(worldShader_uniform_light, 1, l); 
+	glUniform4fv(worldShader_uniform_light_color, 1, lc);
+	glUniform1i(worldShader_uniform_light_amt, 1);
+	*/
 	/**************************
 	**** RENDER STUFF HERE ****
 	**************************/
@@ -502,44 +512,44 @@ void render() {
 	if (currentMenu)
 		ui::menu::draw();
 
-		glUseProgram(textShader);
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, mouseTex);
-		glUniform1i(textShader_uniform_texture, 0);
+	glUseProgram(textShader);
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, mouseTex);
+	glUniform1i(textShader_uniform_texture, 0);
 
-		glEnableVertexAttribArray(textShader_attribute_tex);
-		glEnableVertexAttribArray(textShader_attribute_coord);
+	glEnableVertexAttribArray(textShader_attribute_tex);
+	glEnableVertexAttribArray(textShader_attribute_coord);
 
-		glDisable(GL_DEPTH_TEST);
+	glDisable(GL_DEPTH_TEST);
 
-		GLfloat mouseCoords[] = {
-			ui::mouse.x			,ui::mouse.y, 	      1.0, //bottom left
-			ui::mouse.x+15		,ui::mouse.y, 		  1.0, //bottom right
-			ui::mouse.x+15		,ui::mouse.y-15,	  1.0, //top right
+	GLfloat mouseCoords[] = {
+		ui::mouse.x			,ui::mouse.y, 	      -9.9, //bottom left
+		ui::mouse.x+15		,ui::mouse.y, 		  -9.9, //bottom right
+		ui::mouse.x+15		,ui::mouse.y-15,	  -9.9, //top right
 
-			ui::mouse.x+15		,ui::mouse.y-15, 	  1.0, //top right
-			ui::mouse.x 		,ui::mouse.y-15, 	  1.0, //top left
-			ui::mouse.x			,ui::mouse.y, 		  1.0, //bottom left
-		};
+		ui::mouse.x+15		,ui::mouse.y-15, 	  -9.9, //top right
+		ui::mouse.x 		,ui::mouse.y-15, 	  -9.9, //top left
+		ui::mouse.x			,ui::mouse.y, 		  -9.9, //bottom left
+	};
 
-		GLfloat mouseTex[] = {
-			0.0f, 0.0f, //bottom left
-			1.0f, 0.0f, //bottom right
-			1.0f, 1.0f, //top right
+	GLfloat mouseTex[] = {
+		0.0f, 0.0f, //bottom left
+		1.0f, 0.0f, //bottom right
+		1.0f, 1.0f, //top right
 
-			1.0f, 1.0f, //top right
-			0.0f, 1.0f, //top left
-			0.0f, 0.0f, //bottom left
-		};
+		1.0f, 1.0f, //top right
+		0.0f, 1.0f, //top left
+		0.0f, 0.0f, //bottom left
+	};
 
-		glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, mouseCoords);
-		glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, mouseTex);
-		glDrawArrays(GL_TRIANGLES, 0, 6);
+	glVertexAttribPointer(textShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, mouseCoords);
+	glVertexAttribPointer(textShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, mouseTex);
+	glDrawArrays(GL_TRIANGLES, 0, 6);
 
-		glDisableVertexAttribArray(textShader_attribute_coord);
-		glDisableVertexAttribArray(textShader_attribute_tex);
+	glDisableVertexAttribArray(textShader_attribute_coord);
+	glDisableVertexAttribArray(textShader_attribute_tex);
 
-		SDL_GL_SwapWindow(window);
+	SDL_GL_SwapWindow(window);
 }
 
 void logic(){
@@ -602,6 +612,13 @@ void logic(){
 	// calculate the world shading value
 	worldShade = 50 * sin((game::time::getTickCount() + (DAY_CYCLE / 2)) / (DAY_CYCLE / PI));
 
+	float ws = 75 * sin((game::time::getTickCount() + (DAY_CYCLE / 2)) / (DAY_CYCLE / PI));	
+	
+	float ambRG = std::clamp(.5f + (-ws / 100.0f), 0.01f, .9f);
+	float ambB =	std::clamp(.5f + (-ws / 80.0f), 0.03f, .9f);
+		
+	ambient = Color(ambRG, ambRG, ambB, 1.0f);
+
 	// update fades
 	ui::fadeUpdate();
 
diff --git a/shaders/world.frag b/shaders/world.frag
index 3177795..bde5fa5 100644
--- a/shaders/world.frag
+++ b/shaders/world.frag
@@ -3,7 +3,7 @@ uniform sampler2D normalTex;
 
 varying vec2 texCoord;
 varying vec4 color;
-varying vec3 fragCoord;
+varying vec4 fragCoord;
 
 uniform vec4 ambientLight;
 uniform vec4 light[128];
@@ -11,26 +11,25 @@ uniform vec4 lightColor[128];
 uniform float lightImpact;
 uniform int lightSize;
 
-float b = .0005f;
-float minLight = .05f;
-float radius = sqrt(1.0f / (b * minLight));
-
 void main()
 {
-	vec4 pixTex = texture2D(texture, vec2(texCoord.x, 1-texCoord.y));
+	vec2 texLoc = vec2(texCoord.x, 1-texCoord.y);
+	vec4 pixTex = texture2D(texture, texLoc);
     if (pixTex.a < 0.1f) 
 		discard;
- 
+  
 	vec4 shadeColor = vec4(0.0f, 0.0f, 0.0f, 0.0f);
-	for (int i = 0; i < lightSize; i++) {
-		vec2 loc = light[i].xy;
-		float dist = length(loc - fragCoord.xy);
-		float attenuation = clamp(1.0f - dist*dist/(radius*radius), 0.0f, 1.0f);
-		attenuation *= attenuation;
-		
-		shadeColor += vec4(attenuation, attenuation, attenuation, 1.0f) * vec4(lightColor[i]);		
+	if (lightImpact > 0.0f) {
+		for (int i = 0; i < lightSize; i++) {
+			vec2 loc = light[i].xy;
+			float dist = length(loc - fragCoord.xy);
+			float attenuation = clamp(1.0f - dist*dist/(light[i].w*light[i].w), 0.0f, 1.0f);
+			attenuation *= attenuation;
+
+			shadeColor += (vec4(attenuation, attenuation, attenuation, 0.0f) * vec4(lightColor[i])) * lightImpact;		
+		}
 	}
-	shadeColor += ambientLight;	
+	shadeColor += ambientLight;
 
 	gl_FragColor = pixTex * color * shadeColor;
 }
diff --git a/shaders/world.vert b/shaders/world.vert
index df814e6..0d5e65e 100644
--- a/shaders/world.vert
+++ b/shaders/world.vert
@@ -7,11 +7,11 @@ uniform mat4 transform;
 
 varying vec2 texCoord;
 varying vec4 color;
-varying vec3 fragCoord;
+varying vec4 fragCoord;
 
 void main(){
 	color = tex_color;
     texCoord = tex_coord;
-    gl_Position = ortho * transform * vec4(coord2d.xyz, 1.0);
-	fragCoord = vec3(gl_Position.xyz);
+    fragCoord = vec4(coord2d.xyz, 1.0);
+	gl_Position = ortho * transform * fragCoord;
 }
diff --git a/src/inventory.cpp b/src/inventory.cpp
index e235f51..ede5eeb 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -91,6 +91,11 @@ void items(void)
 
 			ItemMap.push_back(new Food());
 
+		// light
+		} else if (strCaseCmp(name, "light")) {
+				
+			ItemMap.push_back(new ItemLight());
+
 		// if type was not specified make it a base item
 		} else {
 
@@ -98,7 +103,9 @@ void items(void)
 		}
 
 		// set how much of the item we can stack
-		ItemMap.back()->maxStackSize = exml->UnsignedAttribute("maxStackSize");
+		if(exml->QueryUnsignedAttribute("maxStackSize", &ItemMap.back()->maxStackSize) != XML_NO_ERROR) {
+			ItemMap.back()->maxStackSize = 1;
+		}
 
 		// set all of the texture frames we can use
 		ItemMap.back()->tex = new Texturec(1, exml->Attribute("sprite"));
diff --git a/src/items.cpp b/src/items.cpp
index 6c65b59..eacf5a9 100644
--- a/src/items.cpp
+++ b/src/items.cpp
@@ -158,6 +158,11 @@ int Food::useItem()
 	return 0;
 }
 
+int ItemLight::useItem()
+{
+	std::cout << "fsdfsdf" << std::endl;
+	return 0;
+}
 
 /**************************************************
 *                       CLONE                     *
@@ -193,6 +198,10 @@ RawFood* RawFood::clone()
 	return new RawFood(*this);
 }
 
+ItemLight* ItemLight::clone()
+{
+	return new ItemLight(*this);
+}
 /************************************************************************************
 *                                    ITEM SPECIFIC                                  *
 ************************************************************************************/
diff --git a/src/mob.cpp b/src/mob.cpp
index 4cafa09..ed9fbf4 100644
--- a/src/mob.cpp
+++ b/src/mob.cpp
@@ -154,9 +154,9 @@ void Cat::onHit(unsigned int _health)
 
 bool Cat::bindTex(void)
 {
-    glActiveTexture(GL_TEXTURE0);
+	glActiveTexture(GL_TEXTURE0);
     tex(0);
-    return true;
+	return true;
 }
 
 void Cat::createFromXML(XMLElement *e, World *w=nullptr)
diff --git a/src/ui.cpp b/src/ui.cpp
index ae47234..f32bc79 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1397,12 +1397,12 @@ EXIT:
 					heyOhLetsGo = 0;
 					break;
 				case SDLK_l:
-					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
-					//currentWorld->getLastLight()->follow(player);
+					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y}, 300.0f, {1.0f,1.0f,1.0f});
+					currentWorld->getLastLight()->follow(player);
 					currentWorld->getLastLight()->makeFlame();
 					break;
 				case SDLK_f:
-					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+					currentWorld->addLight({player->loc.x, player->loc.y}, 300.0f, {1.0f,1.0f,1.0f});
 					break;
 				case SDLK_b:
 					if (debug)
@@ -1411,7 +1411,7 @@ EXIT:
 						auto s = new Structures();
 						s->spawn(FIRE_PIT, player->loc.x, player->loc.y);
 						currentWorld->addStructure(s);
-						currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+						currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y}, 400.0f, {1.0f,1.0f,1.0f});
 						//currentWorld->getLastLight()->follow(currentWorld->build.back());
 						currentWorld->getLastLight()->makeFlame();
 					}
diff --git a/src/world.cpp b/src/world.cpp
index 64dbfe0..5809ab8 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -271,7 +271,25 @@ void World::drawBackgrounds(void)
                             0.0f, 0.0f,
                             0.0f, 1.0f,};
 
-    vec2 bg_tex_coord[] = { vec2(0.0f, 0.0f),
+	// TODO scroll backdrop
+	GLfloat bgOff = game::time::getTickCount()/24000.0f;
+	
+	GLfloat topS = .125f + bgOff;
+	GLfloat bottomS = 0.0f + bgOff;
+
+	if (topS < 0.0f) topS += 1.0f;
+	if (bottomS < 0.0f) bottomS += 1.0f;
+	if(bgOff < 0)std::cout << bottomS << "," << topS << std::endl;
+
+	GLfloat scrolling_tex_coord[] = {0.0f,  bottomS,
+									 1.0f,  bottomS,
+									 1.0f,  bottomS,
+									 
+									 1.0f,  bottomS,
+									 0.0f,  bottomS,
+									 0.0f,  bottomS};
+   
+   	vec2 bg_tex_coord[] = { vec2(0.0f, 0.0f),
                             vec2(1.0f, 0.0f),
                             vec2(1.0f, 1.0f),
 
@@ -279,13 +297,13 @@ void World::drawBackgrounds(void)
                             vec2(0.0f, 1.0f),
                             vec2(0.0f, 0.0f)};
 
-    GLfloat back_tex_coord[] = {offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.9f,
-                                offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 9.9f,
+    GLfloat back_tex_coord[] = {offset.x - backgroundOffset.x - 5, offset.y - backgroundOffset.y, 9.9f,
                                 offset.x + backgroundOffset.x + 5, offset.y - backgroundOffset.y, 9.9f,
+                                offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 9.9f,
 
-                                offset.x + backgroundOffset.x + 5, offset.y - backgroundOffset.y, 9.9f,
-                                offset.x - backgroundOffset.x - 5, offset.y - backgroundOffset.y, 9.9f,
-                                offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.9f};
+                                offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 9.9f,
+                                offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.9f,
+                                offset.x - backgroundOffset.x - 5, offset.y - backgroundOffset.y, 9.9f};
 
     GLfloat fron_tex_coord[] = {offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.8f,
                                 offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 9.8f,
@@ -296,25 +314,32 @@ void World::drawBackgrounds(void)
                                 offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.8f};
     
 	glUseProgram(worldShader);
+	glUniform1f(worldShader_uniform_light_impact, 0.0f);
+	glUniform4f(worldShader_uniform_ambient, 1.0, 1.0, 1.0, 1.0);
 
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
 
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
     bgTex(0);
 	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
-    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, back_tex_coord);
-    glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
+	glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, back_tex_coord);
+    glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, scrolling_tex_coord);
     glDrawArrays(GL_TRIANGLES, 0 , 6);
 
 	bgTex++;
-	glUniform4f(worldShader_uniform_color, .8, .8, .8, 1.3 - static_cast<float>(alpha)/255.0f);
-    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, fron_tex_coord);
+	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.3 - static_cast<float>(alpha)/255.0f);
+	
+	glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, fron_tex_coord);
     glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
     glDrawArrays(GL_TRIANGLES, 0 , 6);
 
-		
-	static GLuint starTex = Texture::genColor(Color(255, 255, 255));
-	constexpr const static float stardim = 2;
+	// TODO make stars dynamic
+	//static GLuint starTex = Texture::genColor(Color(255, 255, 255));
+	static GLuint starTex = Texture::loadTexture("assets/style/classic/bg/star.png");
+	const static float stardim = 24;
 	GLfloat star_coord[star.size() * 5 * 6 + 1];
     GLfloat *si = &star_coord[0];		
 
@@ -325,72 +350,77 @@ void World::drawBackgrounds(void)
 		for (auto &s : star) {
 			*(si++) = s.x + xcoord;
 			*(si++) = s.y,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 
 			*(si++) = 0.0;
 			*(si++) = 0.0;
 			
 			*(si++) = s.x + xcoord + stardim;
 			*(si++) = s.y,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 			
 			*(si++) = 1.0;
 			*(si++) = 0.0;
 			
 			*(si++) = s.x + xcoord + stardim;
 			*(si++) = s.y + stardim,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 			
 			*(si++) = 1.0;
 			*(si++) = 1.0;
 			
 			*(si++) = s.x + xcoord + stardim;
 			*(si++) = s.y + stardim,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 			
 			*(si++) = 1.0;
 			*(si++) = 1.0;
 			
 			*(si++) = s.x + xcoord;
 			*(si++) = s.y + stardim,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 			
 			*(si++) = 0.0;
 			*(si++) = 1.0;
 			
 			*(si++) = s.x + xcoord;
 			*(si++) = s.y,
-			*(si++) = 9.8;
+			*(si++) = 9.7f;
 			
 			*(si++) = 0.0;
 			*(si++) = 0.0;
 		}
 		glBindTexture(GL_TEXTURE_2D, starTex);
-		glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, (255.0f - (randGet() % 200 - 100)) / 255.0f);
-	
+		//glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, (255.0f - (randGet() % 200 - 100)) / 255.0f);
+		glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.3 - static_cast<float>(alpha)/255.0f);
+
 		glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &star_coord[0]);
 		glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &star_coord[3]);
 		glDrawArrays(GL_TRIANGLES, 0, star.size() * 6);
+		
 	}
-    glDisableVertexAttribArray(worldShader_attribute_coord);
+    
+	glDisableVertexAttribArray(worldShader_attribute_coord);
     glDisableVertexAttribArray(worldShader_attribute_tex);
 
 	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
+	glUniform4f(worldShader_uniform_ambient, ambient.red, ambient.green, ambient.blue, 1.0);
     glUseProgram(0);
 
 
     std::vector<vec3> bg_items;
 
 	bgTex++;
+	dim2 mountainDim = bgTex.getTextureDim();
     auto xcoord = width / 2 * -1 + offset.x * 0.85f;
-	for (unsigned int i = 0; i <= worldData.size() * HLINE / 1920; i++) {
-        bg_items.push_back(vec3(1920 * i       + xcoord, GROUND_HEIGHT_MINIMUM, 8.0f));
-        bg_items.push_back(vec3(1920 * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM, 8.0f));
-        bg_items.push_back(vec3(1920 * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM + 1080, 8.0f));
-
-        bg_items.push_back(vec3(1920 * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM + 1080, 8.0f));
-        bg_items.push_back(vec3(1920 * i       + xcoord, GROUND_HEIGHT_MINIMUM + 1080, 8.0f));
-        bg_items.push_back(vec3(1920 * i       + xcoord, GROUND_HEIGHT_MINIMUM, 8.0f));
+	for (unsigned int i = 0; i <= worldData.size() * HLINE / mountainDim.x; i++) {
+        bg_items.push_back(vec3(mountainDim.x * i       + xcoord, GROUND_HEIGHT_MINIMUM, 				 8.0f));
+        bg_items.push_back(vec3(mountainDim.x * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM, 				 8.0f));
+        bg_items.push_back(vec3(mountainDim.x * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM + mountainDim.y, 8.0f));
+
+        bg_items.push_back(vec3(mountainDim.x * (i + 1) + xcoord, GROUND_HEIGHT_MINIMUM + mountainDim.y, 8.0f));
+        bg_items.push_back(vec3(mountainDim.x * i       + xcoord, GROUND_HEIGHT_MINIMUM + mountainDim.y, 8.0f));
+        bg_items.push_back(vec3(mountainDim.x * i       + xcoord, GROUND_HEIGHT_MINIMUM, 				 8.0f));
 	}
 
     std::vector<GLfloat> bg_i;
@@ -410,6 +440,7 @@ void World::drawBackgrounds(void)
     }
 
     glUseProgram(worldShader);
+	glUniform1f(worldShader_uniform_light_impact, 0.01);
 
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
@@ -427,15 +458,16 @@ void World::drawBackgrounds(void)
 	for (unsigned int i = 0; i < 4; i++) {
         std::vector<vec3>c;
 		bgTex++;
-        auto xcoord = offset.x * bgDraw[i][2];
-		for (int j = worldStart; j <= -worldStart; j += 600) {
-            c.push_back(vec3(j       + xcoord, GROUND_HEIGHT_MINIMUM, 7-(i*.1)));
-            c.push_back(vec3(j + 600 + xcoord, GROUND_HEIGHT_MINIMUM, 7-(i*.1)));
-            c.push_back(vec3(j + 600 + xcoord, GROUND_HEIGHT_MINIMUM + 400, 7-(i*.1)));
-
-            c.push_back(vec3(j + 600 + xcoord, GROUND_HEIGHT_MINIMUM + 400, 7-(i*.1)));
-            c.push_back(vec3(j       + xcoord, GROUND_HEIGHT_MINIMUM + 400, 7-(i*.1)));
-            c.push_back(vec3(j       + xcoord, GROUND_HEIGHT_MINIMUM, 7-(i*.1)));
+        dim2 dim = bgTex.getTextureDim();
+		auto xcoord = offset.x * bgDraw[i][2];
+		for (int j = worldStart; j <= -worldStart; j += dim.x) {
+            c.push_back(vec3(j         + xcoord, GROUND_HEIGHT_MINIMUM, 		7-(i*.1)));
+            c.push_back(vec3(j + dim.x + xcoord, GROUND_HEIGHT_MINIMUM, 		7-(i*.1)));
+            c.push_back(vec3(j + dim.x + xcoord, GROUND_HEIGHT_MINIMUM + dim.y, 7-(i*.1)));
+
+            c.push_back(vec3(j + dim.x + xcoord, GROUND_HEIGHT_MINIMUM + dim.y, 7-(i*.1)));
+            c.push_back(vec3(j         + xcoord, GROUND_HEIGHT_MINIMUM + dim.y, 7-(i*.1)));
+            c.push_back(vec3(j         + xcoord, GROUND_HEIGHT_MINIMUM, 		7-(i*.1)));
 		}
 
         bg_i.clear();
@@ -455,6 +487,7 @@ void World::drawBackgrounds(void)
         }
 
         glUseProgram(worldShader);
+		glUniform1f(worldShader_uniform_light_impact, 0.075f + (0.2f*i));
 
         glEnableVertexAttribArray(worldShader_attribute_coord);
         glEnableVertexAttribArray(worldShader_attribute_tex);
@@ -479,10 +512,18 @@ void World::draw(Player *p)
 
 	drawBackgrounds();
 
-
-    for (auto &l : light) {
-        if (l.belongsTo) {
-            l.loc.x = l.following->loc.x + SCREEN_WIDTH / 2;
+	uint ls = light.size();
+	
+	GLfloat *lightCoords = new GLfloat[light.size() * 4];
+	GLfloat *lightColors = new GLfloat[light.size() * 4];
+	
+	uint lpIndex = 0;
+	uint lcIndex = 0;
+		
+	for (uint i = 0; i < ls; i++) {
+       	auto &l = light[i];
+ 	   	if (l.belongsTo) {
+            l.loc.x = l.following->loc.x;
             l.loc.y = l.following->loc.y;
         }
         if (l.flame) {
@@ -492,7 +533,25 @@ void World::draw(Player *p)
         } else {
             l.fireFlicker = 1;
         }
-    }
+
+		lightCoords[lpIndex++] = l.loc.x;
+		lightCoords[lpIndex++] = l.loc.y;
+		lightCoords[lpIndex++] = 0.0;
+		lightCoords[lpIndex++] = l.radius; 
+    
+		lightColors[lcIndex++] = l.color.red;
+		lightColors[lcIndex++] = l.color.green;
+		lightColors[lcIndex++] = l.color.blue;
+		lightColors[lcIndex++] = 1.0;
+	}
+
+	glUseProgram(worldShader);
+	
+	glUniform4fv(worldShader_uniform_light, ls, lightCoords);
+	glUniform4fv(worldShader_uniform_light_color, ls, lightColors);
+	glUniform1i(worldShader_uniform_light_amt, ls);
+
+	glUseProgram(0);
 
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
@@ -549,6 +608,7 @@ void World::draw(Player *p)
     }
 
     glUseProgram(worldShader);
+	glUniform1f(worldShader_uniform_light_impact, 0.45f);
 
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
@@ -633,6 +693,7 @@ void World::draw(Player *p)
     }
 
     glUseProgram(worldShader);
+	glUniform1f(worldShader_uniform_light_impact, 1.0f);
 
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
@@ -1418,10 +1479,10 @@ addParticle(float x, float y, float w, float h, float vx, float vy, Color color,
 }
 
 void World::
-addLight(vec2 loc, Color color)
+addLight(vec2 loc, float radius, Color color)
 {
 	if (light.size() < 64)
-        light.emplace_back(loc, color, 1);
+        light.emplace_back(loc, radius, color);
 }
 
 void World::
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index fef154b..c5d88d6 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -6,12 +6,12 @@
     <time>12000</time>
     <hill peakx="0" peaky="1000" width="50"/>
     <rabbit spawnx="300" aggressive="false" maxHealth="100" health="32"/>
-    <bird spawny="500" x="379.1998" y="254.95029" health="1"/>
-    <cat x="0" y="67.996956" alive="1"/>
+    <bird spawny="500" x="808.80286" y="295.4079" health="1"/>
+    <cat x="0" y="64.496956" alive="1"/>
     <!--<trigger x="-300" id="Test"/>-->
-    <npc name="Ralph" hasDialog="true" spawnx="300" health="1" x="-96.279839" y="66.496941" dindex="2"/>
+    <npc name="Ralph" hasDialog="true" spawnx="300" health="1" x="-10.007523" y="65.396942" dindex="2"/>
     <npc name="Johnny" hasDialog="false" spawnx="300" health="1" x="824.5191" y="71.996918" dindex="0"/>
-    <npc name="Big Dave" hasDialog="true" spawnx="300" health="1" x="235.77779" y="63.396919" dindex="9999"/>
+    <npc name="Big Dave" hasDialog="true" spawnx="300" health="1" x="377.85727" y="62.197029" dindex="9999"/>
     <page spawnx="-200" id="assets/pages/gootaGoFast.png" cid="canSprint" cvalue="1"/>
     <page spawnx="-500" id="assets/pages/gootaJump.png" cid="canJump" cvalue="1"/>
     <village name="Big Dave&apos;s bagel emporium! The greatest place on earth!">
@@ -38,14 +38,14 @@ And it wasn't stormy.
 <Dialog name="Ralph">
     <text id="0" nextid="1">
 		Hello there! My name is Ralph.
-		                                                                                                                                <gotox>300</gotox>
+		                                                                                                                                                <gotox>300</gotox>
     </text>
     <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>
+		                                                                                                                                                <quest check="Your First Quest" fail="3"/></text>
     <text id="3">
 		Go check out Johnny. He's cool.
 	</text>
@@ -54,7 +54,7 @@ And it wasn't stormy.
 <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">
+		                                                                                                                                                <quest assign="Your First Quest">
 		Dank MayMay,2
 		Wood Sword,1
 		</quest>
@@ -68,5 +68,5 @@ And it wasn't stormy.
     <text id="0" pause="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"/></text>
+		                <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>