Started adding timers and torches

src/projectzombie/display/DisplayLighting.java

@@ -324,7 +324,7 @@ public class DisplayLighting
 		float[] pixels = new float[width*height*3];
 		
 		for(int i=0;i<width*height;i++) {
-			pixels[i*3] = light[i];
+			pixels[i*3] = light[i*2];
 		}
 		
 		Lighting lighting = new Lighting();

src/projectzombie/entity/player/EntityPlayer.java

@@ -28,6 +28,7 @@ import projectzombie.inventory.Inventory;
 import projectzombie.inventory.InventoryArmor;
 import projectzombie.inventory.InventoryClothing;
 import projectzombie.items.ItemTool;
+import projectzombie.items.modifier.ItemModifierMeta;
 import projectzombie.model.Model;
 import projectzombie.model.ModelPlayer;
 import projectzombie.settings.Cheats;
@@ -102,6 +103,8 @@ public class EntityPlayer extends Entity implements
 		if(hydration > 1) {
 			hydration = 1;
 		}
+		
+		inventory.addItem(new ItemStack(Items.TORCH, 1));
 	}
 	
 	public int getAmmo() {

src/projectzombie/init/ItemModifiers.java

@@ -7,6 +7,7 @@ import projectzombie.items.modifier.ItemModifier;
 import projectzombie.items.modifier.ItemModifierDamage;
 import projectzombie.items.modifier.ItemModifierFluidStorage;
 import projectzombie.items.modifier.ItemModifierMeta;
+import projectzombie.items.modifier.ItemModifierTimer;
 import projectzombie.items.modifier.ItemModifierWater;
 
 public class ItemModifiers
@@ -31,5 +32,6 @@ public class ItemModifiers
 		register(ItemModifierDamage.class);
 		register(ItemModifierFluidStorage.class);
 		register(ItemModifierWater.class);
+		register(ItemModifierTimer.class);
 	}
 }

src/projectzombie/init/Items.java

@@ -29,6 +29,7 @@ import projectzombie.items.ItemStoneHatchet;
 import projectzombie.items.ItemStonePick;
 import projectzombie.items.ItemStoneShovel;
 import projectzombie.items.ItemTnt;
+import projectzombie.items.ItemTorch;
 import projectzombie.items.ItemWorkbench;
 import projectzombie.items.spawner.ItemSpawnDummy;
 import projectzombie.items.spawner.ItemSpawnZombie;
@@ -74,6 +75,7 @@ public class Items
 		register(BLAST_FURNACE);
 		register(CLAY_POT);
 		register(CLAY_POT_WET);
+		register(TORCH);
 	}
 	
 	public static final Item AMMO = new ItemAmmo();
@@ -105,4 +107,5 @@ public class Items
 	public static final Item BLAST_FURNACE = new ItemBlastFurnace();
 	public static final Item CLAY_POT = new ItemClayPot();
 	public static final Item CLAY_POT_WET = new ItemClayPotWet();
+	public static final Item TORCH = new ItemTorch();
 }

src/projectzombie/init/Models.java

@@ -153,6 +153,8 @@ public class Models
 	public static final ModelItem ITEM_TNT 				= new ModelItem(Resources.ATLAS.get("/entity/tnt.png"));
 	public static final ModelItem ITEM_FLARE 			= new ModelItem(Resources.ATLAS.get("/entity/flare.png"));
 	public static final ModelItem ITEM_LANTERN 			= new ModelItem(Resources.ATLAS.get("/tile/lantern.png"), 4, 5);
+	public static final ModelItem ITEM_TORCH_LIT 		= new ModelItem(Resources.ATLAS.get("/item/torch_lit.png"), 4, 50);
+	public static final ModelItem ITEM_TORCH_UNLIT		= new ModelItem(Resources.ATLAS.get("/item/torch_unlit.png"));
 	
 	public static final ModelItem ITEM_CLAY_POT_WET		= new ModelItem(Resources.ATLAS.get("/item/clay_pot_wet.png"));
 	public static final ModelItem ITEM_CLAY_POT_EMPTY	= new ModelItem(Resources.ATLAS.get("/item/clay_pot_empty.png"));

src/projectzombie/items/Item.java

@@ -69,4 +69,8 @@ public abstract class Item
 		
 		return (double)damage_modifier.getDamage() / (double)damage_modifier.getMaxDamage();
 	}
+	
+	public boolean isEmpty(ItemStack stack) {
+		return false;
+	}
 }

src/projectzombie/items/ItemTorch.java

@@ -0,0 +1,79 @@
+package projectzombie.items;
+
+import gl_engine.vec.Vec2d;
+import projectzombie.entity.player.EntityPlayer;
+import projectzombie.init.Models;
+import projectzombie.items.modifier.ItemModifier;
+import projectzombie.items.modifier.ItemModifierDamage;
+import projectzombie.items.modifier.ItemModifierMeta;
+import projectzombie.items.modifier.ItemModifierTimer;
+import projectzombie.model.ModelItem;
+import projectzombie.util.math.ItemStack;
+import projectzombie.world.layer.Layer;
+
+public class ItemTorch extends Item
+{
+
+	@Override
+	public ModelItem getModel(ItemStack stack)
+	{
+		if(ItemModifierMeta.getStackMeta(stack) == 1) {
+			return Models.ITEM_TORCH_LIT;
+		}
+		
+		else {
+			return Models.ITEM_TORCH_UNLIT;
+		}
+	}
+	
+	@Override
+	public double getDamage(ItemStack stack)
+	{
+		ItemModifierTimer timer = (ItemModifierTimer)stack.getModifier(ItemModifierTimer.class);
+		
+		if(timer == null) {
+			return 0;
+		}
+		
+		return timer.getDamage();
+	}
+	
+	@Override
+	public boolean onPlayerRightClick(ItemStack stack, Layer layer, EntityPlayer player, Vec2d place_pos)
+	{
+		if(ItemModifierMeta.getStackMeta(stack) == 1) {
+			return false;
+		}
+		
+		stack.modifiers = new ItemModifier[] {
+				new ItemModifierMeta(1),
+				new ItemModifierTimer(1000),
+		};
+		
+		return true;
+	}
+	
+	@Override
+	public boolean isEmpty(ItemStack stack)
+	{
+		if(ItemModifierMeta.getStackMeta(stack) != 1) {
+			return false;
+		}
+		
+		ItemModifierTimer timer = (ItemModifierTimer)stack.getModifier(ItemModifierTimer.class);
+		
+		if(timer == null) {
+			return false;
+		}
+		
+		System.out.println(timer.getDamage());
+		
+		return timer.getDamage() <= 0;
+	}
+
+	@Override
+	public String getName(ItemStack stack) {
+		return "Torch";
+	}
+
+}

src/projectzombie/items/modifier/ItemModifierTimer.java

@@ -0,0 +1,60 @@
+package projectzombie.items.modifier;
+
+import bdf.types.BdfNamedList;
+import bdf.types.BdfObject;
+import gl_engine.MathHelpers;
+import projectzombie.time.GameTimer;
+
+public class ItemModifierTimer extends ItemModifier
+{
+	private long end;
+	private long start;
+	
+	public long getLeft() {
+		return GameTimer.getTime() - timer;
+	}
+	
+	public double getDamage() {
+		return 1 - (double)(timer - GameTimer.getTime()) / (double)timer;
+	}
+	
+	public ItemModifierTimer(long time) {
+		start = GameTimer.getTime();
+		end = start + time;
+	}
+	
+	public ItemModifierTimer(BdfObject bdf) {
+		BdfClassLoad(bdf);
+	}
+
+	@Override
+	public void BdfClassLoad(BdfObject bdf)
+	{
+		BdfNamedList nl = bdf.getNamedList();
+		start = nl.get("start").getLong();
+		end = nl.get("end").getLong();
+	}
+
+	@Override
+	public void BdfClassSave(BdfObject bdf)
+	{
+		BdfNamedList nl = bdf.getNamedList();
+		nl.set("start", bdf.newObject().setLong(start));
+		nl.set("end", bdf.newObject().setLong(end));
+	}
+
+	@Override
+	public boolean isEqual(ItemModifier other) {
+		return ((ItemModifierTimer)other).start == start &&
+				((ItemModifierTimer)other).end == end;
+	}
+
+	@Override
+	public ItemModifier copy() {
+		ItemModifierTimer timer = new ItemModifierTimer(0);
+		timer.start = this.start;
+		timer.end = this.end;
+		return timer;
+	}
+	
+}

src/projectzombie/tiles/TileBlastFurnace.java

@@ -30,7 +30,7 @@ public class TileBlastFurnace extends Tile
 	
 	@Override
 	public double getLightLevel(TileState state, Vec2i pos) {
-		return 1 - MathHelpers.squared(1 - state.meta / 16.0);
+		return (1 - MathHelpers.squared(1 - state.meta / 16.0)) / 2.0;
 	}
 	
 	@Override

src/projectzombie/util/math/ItemStack.java

@@ -52,7 +52,7 @@ public class ItemStack implements IBdfClassManager
 		if(count < 1) return true;
 		if(item == null) return true;
 		if(item == Items.EMPTY) return true;
-		return false;
+		return item.isEmpty(this);
 	}
 	
 	public boolean hasModifier(Class<? extends ItemModifier> modifier) {

src/resources/texture/list.txt

@@ -1,239 +1,241 @@
-./text/char_question.png
+./tile/hemp6.png
-./text/char_l_a.png
+./tile/hemp7.png
-./text/char_u_j.png
+./tile/hemp1.png
-./text/char_l_u.png
+./tile/rock.png
-./text/char_u_s.png
+./tile/rock_ice.png
-./text/char_l_s.png
+./tile/sapling3.png
-./text/char_apostrophe.png
+./tile/ladder.png
-./text/char_plus.png
+./tile/tree_leaves_snow.png
-./text/char_l_e.png
+./tile/ice_wall.png
-./text/char_7.png
+./tile/water.png
-./text/char_minus.png
+./tile/sandstone_wall.png
-./text/char_u_r.png
+./tile/ladder_up.png
-./text/char_u_l.png
+./tile/cactus4.png
-./text/char_obracket.png
+./tile/tall_grass.png
-./text/char_pow.png
+./tile/cactus2.png
-./text/char_u_m.png
+./tile/grass_infested.png
-./text/char_l_t.png
+./tile/tree_branch_leaves.png
-./text/char_percent.png
+./tile/dirt.png
-./text/char_l_y.png
+./tile/wall.png
-./text/char_0.png
+./tile/tree_base.png
-./text/char_4.png
+./tile/cactus1.png
-./text/char_l_r.png
+./tile/sapling4.png
-./text/char_l_m.png
+./tile/hemp3.png
-./text/char_cbracket.png
+./tile/cactus_top.png
-./text/char_u_g.png
+./tile/tunnel_down.png
-./text/char_u_q.png
+./tile/stone.png
-./text/char_u_i.png
+./tile/snow.png
-./text/char_tilde.png
+./tile/boss_portal.png
-./text/char_l_w.png
+./tile/hemp4.png
-./text/char_l_v.png
+./tile/sand.png
-./text/char_fslash.png
+./tile/campfire.png
-./text/char_u_p.png
+./tile/lantern.png
-./text/char_gthan.png
+./tile/ice.png
-./text/char_8.png
+./tile/sapling1.png
-./text/char_unknown.png
+./tile/grass_burnt.png
-./text/char_and.png
+./tile/chest.png
-./text/char_osbracket.png
+./tile/hemp2.png
-./text/char_u_n.png
+./tile/hemp8.png
-./text/char_l_i.png
+./tile/cactus3.png
-./text/char_u_y.png
+./tile/lava.png
-./text/char_l_p.png
+./tile/tree_leaves.png
-./text/char_lthan.png
+./tile/hemp5.png
-./text/char_l_g.png
+./tile/lava_flow.png
-./text/char_bslash.png
+./tile/grass.png
-./text/char_1.png
+./tile/tree_branch.png
-./text/char_u_z.png
+./tile/sandstone.png
-./text/char_l_f.png
+./tile/tree_branch_leaves_snow.png
-./text/char_u_w.png
+./tile/rock_sandstone.png
-./text/char_9.png
+./tile/sapling2.png
-./text/char_l_x.png
-./text/char_ccbracket.png
-./text/char_l_o.png
-./text/char_equals.png
-./text/char_l_d.png
-./text/char_dollar.png
-./text/char_hashtag.png
-./text/char_l_q.png
-./text/char_u_o.png
-./text/char_6.png
-./text/char_u_d.png
-./text/char_u_e.png
-./text/char_exclamation.png
-./text/char_vertical.png
-./text/char_ocbracket.png
-./text/char_u_k.png
-./text/char_u_c.png
-./text/char_l_n.png
-./text/char_semicolon.png
-./text/char_u_b.png
-./text/char_u_f.png
-./text/char_l_h.png
-./text/char_l_k.png
-./text/char_u_t.png
-./text/char_3.png
-./text/char_u_v.png
-./text/char_u_h.png
-./text/char_quotation.png
-./text/char_u_a.png
-./text/char_l_b.png
-./text/char_underscore.png
-./text/char_u_x.png
-./text/char_comma.png
-./text/char_csbracket.png
-./text/char_l_l.png
-./text/char_5.png
-./text/char_star.png
-./text/char_colon.png
-./text/char_l_z.png
-./text/char_space.png
-./text/char_2.png
-./text/char_at.png
-./text/char_grave.png
-./text/char_l_j.png
-./text/char_fullstop.png
-./text/char_l_c.png
-./text/char_u_u.png
 ./list.txt
-./player/player_white_front_moving.png
+./item/log.png
-./player/player_white_back_moving.png
+./item/rock.png
-./player/player_black_back_moving.png
+./item/acorn.png
-./player/player_black_back_still.png
+./item/clay.png
+./item/ammo_box.png
+./item/plant_fibre.png
+./item/torch_lit.png
+./item/flint_hatchet.png
+./item/hemp_seed.png
+./item/shield_upgrade.png
+./item/grappling_hook.png
+./item/log_snow.png
+./item/health_potion.png
+./item/snow_pile.png
+./item/torch_unlit.png
+./item/gun_upgrade.png
+./item/sandstone.png
+./item/flint.png
 ./player/player_white_back_still.png
 ./player/player_white_front_still.png
 ./player/player_black_front_moving.png
 ./player/player_black_front_still.png
-./particle/smoke_trail.png
+./player/player_black_back_moving.png
-./particle/water.png
+./player/player_black_back_still.png
-./particle/smoke_0.png
+./player/player_white_back_moving.png
-./particle/smoke_1.png
+./player/player_white_front_moving.png
-./particle/blood.png
+./gui/selection_box_wide.png
-./particle/lava.png
-./particle/bullet.png
-./particle/smoke_2.png
-./particle/snow.png
-./particle/rain.png
-./particle/smoke_4.png
-./particle/smoke_3.png
-./particle/smoke_5.png
-./gui/temperature.png
-./gui/slot_armor_chest.png
-./gui/health_empty.png
-./gui/button_hover.png
 ./gui/item_slot_storage.png
+./gui/text_box.png
+./gui/pixel_white.png
 ./gui/water.png
+./gui/gun.png
+./gui/selection_box_storage.png
+./gui/button_delete.png
+./gui/button_delete_hover.png
+./gui/slot_armor_chest.png
+./gui/pixel_black.png
+./gui/slot_clothing_shirt.png
+./gui/button_play.png
 ./gui/slot_armor_legs.png
-./gui/button_normal.png
+./gui/inventory.png
 ./gui/label.png
-./gui/hotbar.png
+./gui/slot_clothing_pants.png
+./gui/health_empty.png
+./gui/label_recipe.png
+./gui/hotbar_selected.png
+./gui/health_full.png
+./gui/temperature.png
+./gui/button_play_hover.png
+./gui/text_cursor.png
 ./gui/slot_armor_helmet.png
 ./gui/selection_box_crafting.png
-./gui/button_delete.png
-./gui/text_cursor.png
-./gui/inventory.png
-./gui/button_delete_hover.png
-./gui/button_play_hover.png
-./gui/health_full.png
-./gui/hotbar_selected.png
-./gui/slot_clothing_shirt.png
-./gui/selection_box_storage.png
-./gui/pixel_white.png
-./gui/pixel_black.png
-./gui/slot_clothing_pants.png
-./gui/text_box.png
-./gui/shield.png
-./gui/label_recipe.png
 ./gui/slot_clothing_boots.png
-./gui/selection_box_wide.png
+./gui/hotbar.png
-./gui/gun.png
+./gui/button_normal.png
-./gui/button_play.png
+./gui/shield.png
-./tile/cactus4.png
+./gui/button_hover.png
-./tile/hemp1.png
+./text/char_bslash.png
-./tile/dirt.png
+./text/char_dollar.png
-./tile/lantern.png
+./text/char_l_w.png
-./tile/hemp8.png
+./text/char_u_d.png
-./tile/wall.png
+./text/char_u_t.png
-./tile/cactus_top.png
+./text/char_space.png
-./tile/cactus2.png
+./text/char_l_x.png
-./tile/rock.png
+./text/char_l_k.png
-./tile/water.png
+./text/char_6.png
-./tile/hemp4.png
+./text/char_unknown.png
-./tile/stone.png
+./text/char_comma.png
-./tile/tree_leaves.png
+./text/char_obracket.png
-./tile/sapling2.png
+./text/char_u_w.png
-./tile/ladder_up.png
+./text/char_7.png
-./tile/sapling3.png
+./text/char_l_f.png
-./tile/lava_flow.png
+./text/char_vertical.png
-./tile/ice_wall.png
+./text/char_plus.png
-./tile/grass.png
+./text/char_u_a.png
-./tile/chest.png
+./text/char_star.png
-./tile/sapling4.png
+./text/char_9.png
-./tile/lava.png
+./text/char_u_k.png
-./tile/tall_grass.png
+./text/char_grave.png
-./tile/hemp5.png
+./text/char_u_n.png
-./tile/sapling1.png
+./text/char_percent.png
-./tile/snow.png
+./text/char_u_m.png
-./tile/sandstone_wall.png
+./text/char_exclamation.png
-./tile/rock_sandstone.png
+./text/char_1.png
-./tile/hemp6.png
+./text/char_l_q.png
-./tile/cactus1.png
+./text/char_l_z.png
-./tile/campfire.png
+./text/char_l_h.png
-./tile/tree_branch_leaves.png
+./text/char_u_c.png
-./tile/tunnel_down.png
+./text/char_l_g.png
-./tile/tree_branch_leaves_snow.png
+./text/char_l_s.png
-./tile/tree_leaves_snow.png
+./text/char_fullstop.png
-./tile/rock_ice.png
+./text/char_u_j.png
-./tile/boss_portal.png
+./text/char_l_m.png
-./tile/ladder.png
+./text/char_l_t.png
-./tile/grass_burnt.png
+./text/char_u_v.png
-./tile/hemp7.png
+./text/char_colon.png
-./tile/grass_infested.png
+./text/char_l_i.png
-./tile/tree_branch.png
+./text/char_l_y.png
-./tile/sand.png
+./text/char_semicolon.png
-./tile/tree_base.png
+./text/char_u_l.png
-./tile/cactus3.png
+./text/char_apostrophe.png
-./tile/sandstone.png
+./text/char_u_e.png
-./tile/hemp3.png
+./text/char_5.png
-./tile/hemp2.png
+./text/char_2.png
-./tile/ice.png
+./text/char_3.png
-./entity/flare.png
+./text/char_l_p.png
-./entity/grappling_hook.png
+./text/char_and.png
-./entity/zombie_back_moving.png
+./text/char_fslash.png
-./entity/tnt.png
+./text/char_l_u.png
+./text/char_u_f.png
+./text/char_u_u.png
+./text/char_at.png
+./text/char_l_e.png
+./text/char_l_l.png
+./text/char_u_g.png
+./text/char_u_q.png
+./text/char_u_b.png
+./text/char_l_o.png
+./text/char_csbracket.png
+./text/char_osbracket.png
+./text/char_minus.png
+./text/char_l_v.png
+./text/char_lthan.png
+./text/char_u_s.png
+./text/char_equals.png
+./text/char_8.png
+./text/char_ccbracket.png
+./text/char_underscore.png
+./text/char_u_x.png
+./text/char_0.png
+./text/char_l_d.png
+./text/char_l_c.png
+./text/char_l_j.png
+./text/char_u_z.png
+./text/char_u_h.png
+./text/char_pow.png
+./text/char_hashtag.png
+./text/char_gthan.png
+./text/char_cbracket.png
+./text/char_u_i.png
+./text/char_question.png
+./text/char_u_o.png
+./text/char_u_y.png
+./text/char_l_r.png
+./text/char_l_b.png
+./text/char_ocbracket.png
+./text/char_l_a.png
+./text/char_quotation.png
+./text/char_l_n.png
+./text/char_u_p.png
+./text/char_tilde.png
+./text/char_u_r.png
+./text/char_4.png
 ./entity/armored_zombie_back_moving.png
-./entity/armored_zombie_front_moving.png
+./entity/zombie_front_still.png
-./entity/player/hair_side.png
+./entity/tnt.png
-./entity/player/head_top.png
+./entity/flare.png
-./entity/player/head_side.png
+./entity/boss1/boss_walking.png
-./entity/player/head_back.png
-./entity/player/head_bottom.png
-./entity/player/hair_front.png
-./entity/player/head_front.png
-./entity/player/hair_back.png
-./entity/player/hair_top.png
-./entity/dummy.png
-./entity/armored_zombie_front_still.png
-./entity/armored_zombie_back_still.png
-./entity/zombie_front_moving.png
-./entity/boss1/boss_walking_firing.png
 ./entity/boss1/boss_firing.png
 ./entity/boss1/boss_still.png
-./entity/boss1/boss_walking.png
+./entity/boss1/boss_walking_firing.png
+./entity/armored_zombie_back_still.png
+./entity/armored_zombie_front_moving.png
+./entity/player/head_back.png
+./entity/player/hair_top.png
+./entity/player/head_front.png
+./entity/player/head_top.png
+./entity/player/hair_side.png
+./entity/player/head_side.png
+./entity/player/hair_back.png
+./entity/player/hair_front.png
+./entity/player/head_bottom.png
+./entity/grappling_hook.png
 ./entity/zombie_back_still.png
-./entity/zombie_front_still.png
+./entity/dummy.png
-./item/acorn.png
+./entity/zombie_back_moving.png
-./item/clay.png
+./entity/armored_zombie_front_still.png
-./item/grappling_hook.png
+./entity/zombie_front_moving.png
-./item/gun_upgrade.png
+./particle/smoke_1.png
-./item/shield_upgrade.png
+./particle/water.png
-./item/rock.png
+./particle/rain.png
-./item/flint_hatchet.png
+./particle/blood.png
-./item/log.png
+./particle/snow.png
-./item/log_snow.png
+./particle/smoke_3.png
-./item/hemp_seed.png
+./particle/smoke_4.png
-./item/ammo_box.png
+./particle/smoke_2.png
-./item/plant_fibre.png
+./particle/smoke_0.png
-./item/health_potion.png
+./particle/bullet.png
-./item/snow_pile.png
+./particle/lava.png
-./item/flint.png
+./particle/smoke_trail.png
-./item/sandstone.png
+./particle/smoke_5.png