From fef73210e9fa1fb5a39d79a8d593083730e566ce Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Fri, 7 Oct 2016 04:10:01 -0400
Subject: [PATCH] v0.4.3: plants and traps are now on a terrain tilemap pt.1

Still needs some cleaning up, but everything works
---
 core/src/main/assets/plants.png               | Bin 1602 -> 0 bytes
 core/src/main/assets/terrain_features.png     | Bin 0 -> 13170 bytes
 core/src/main/assets/traps.png                | Bin 8620 -> 0 bytes
 .../shatteredpixeldungeon/Assets.java         |   5 +-
 .../shatteredpixeldungeon/levels/Level.java   |   6 +-
 .../levels/PrisonBossLevel.java               |   4 -
 .../levels/traps/Trap.java                    |   3 +
 .../shatteredpixeldungeon/plants/Plant.java   |   8 +-
 .../scenes/GameScene.java                     |  30 ++--
 .../sprites/PlantSprite.java                  |   2 +-
 .../sprites/TrapSprite.java                   |   2 +-
 .../ui/TerrainFeaturesTilemap.java            | 140 ++++++++++++++++++
 .../windows/WndInfoPlant.java                 |   7 +-
 .../windows/WndInfoTrap.java                  |   5 +-
 14 files changed, 171 insertions(+), 41 deletions(-)
 delete mode 100644 core/src/main/assets/plants.png
 create mode 100644 core/src/main/assets/terrain_features.png
 delete mode 100644 core/src/main/assets/traps.png
 create mode 100644 core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TerrainFeaturesTilemap.java

diff --git a/core/src/main/assets/plants.png b/core/src/main/assets/plants.png
deleted file mode 100644
index 3ca895faab35b7bc4487c25ce90f77722ced5a40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1602
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

diff --git a/core/src/main/assets/terrain_features.png b/core/src/main/assets/terrain_features.png
new file mode 100644
index 0000000000000000000000000000000000000000..a70872c7a6af56a09d087f1df624a662804e3376
GIT binary patch
literal 13170
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

literal 0
HcmV?d00001

diff --git a/core/src/main/assets/traps.png b/core/src/main/assets/traps.png
deleted file mode 100644
index 3cfda13768dbdc2b5080624a02992d7f5799dedb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8620
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
a_Vinw(>1<%;qRX@oE^^ESD(0i>wf_L@a!1?

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java
index 79dcae763..9ad977ae9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java
@@ -97,9 +97,8 @@ public class Assets {
 	public static final String ROT_HEART= "rot_heart.png";
 	public static final String GUARD    = "guard.png";
 
-	public static final String ITEMS	= "items.png";
-	public static final String PLANTS	= "plants.png";
-	public static final String TRAPS    = "traps.png";
+	public static final String ITEMS	        = "items.png";
+	public static final String TERRAIN_FEATURES	= "terrain_features.png";
 	
 	public static final String TILES_SEWERS	= "tiles0.png";
 	public static final String TILES_PRISON	= "tiles1.png";
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
index 5aacac451..0287bb614 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
@@ -734,19 +734,19 @@ public abstract class Level implements Bundlable {
 				map[pos] == Terrain.EMPTY_DECO) {
 			map[pos] = Terrain.GRASS;
 			flamable[pos] = true;
-			GameScene.updateMap( pos );
 		}
 		
 		plant = seed.couch( pos );
 		plants.put( pos, plant );
 		
-		GameScene.add( plant );
+		GameScene.updateMap( pos );
 		
 		return plant;
 	}
 	
 	public void uproot( int pos ) {
 		plants.remove(pos);
+		GameScene.updateMap( pos );
 	}
 
 	public Trap setTrap( Trap trap, int pos ){
@@ -757,7 +757,7 @@ public abstract class Level implements Bundlable {
 		}
 		trap.set( pos );
 		traps.put( pos, trap );
-		GameScene.add(trap);
+		GameScene.updateMap( pos );
 		return trap;
 	}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
index b632ef82a..dacab602f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
@@ -216,9 +216,6 @@ public class PrisonBossLevel extends Level {
 	}
 
 	private void resetTraps(){
-		for (Trap trap : traps.values()){
-			trap.sprite.kill();
-		}
 		traps.clear();
 
 		for (int i = 0; i < length(); i++){
@@ -273,7 +270,6 @@ public class PrisonBossLevel extends Level {
 		for (Plant plant : plants.values()){
 			if (safeArea == null || !safeArea.inside(cellToPoint(plant.pos))){
 				plants.remove(plant.pos);
-				plant.sprite.kill();
 			}
 		}
 	}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
index 8eb923a5d..1c6a51903 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.traps;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.TrapSprite;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.tweeners.AlphaTweener;
@@ -54,6 +55,7 @@ public abstract class Trap implements Bundlable {
 			sprite.alpha( 0 );
 			sprite.parent.add( new AlphaTweener( sprite, 1, 0.6f));
 		}
+		GameScene.updateMap(pos);
 		return this;
 	}
 
@@ -61,6 +63,7 @@ public abstract class Trap implements Bundlable {
 		visible = false;
 		if (sprite != null)
 			sprite.visible = false;
+		GameScene.updateMap(pos);
 		return this;
 	}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
index 5d7b51d36..0d5cb2738 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
@@ -38,7 +38,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.SandalsOfNature;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
-import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
@@ -52,8 +51,6 @@ public abstract class Plant implements Bundlable {
 	
 	public int image;
 	public int pos;
-	
-	public PlantSprite sprite;
 
 	public void trigger(){
 
@@ -71,8 +68,7 @@ public abstract class Plant implements Bundlable {
 	
 	public void wither() {
 		Dungeon.level.uproot( pos );
-		
-		sprite.kill();
+
 		if (Dungeon.visible[pos]) {
 			CellEmitter.get( pos ).burst( LeafParticle.GENERAL, 6 );
 		}
@@ -142,7 +138,7 @@ public abstract class Plant implements Bundlable {
 		
 		@Override
 		protected void onThrow( int cell ) {
-			if (Dungeon.level.map[cell] == Terrain.ALCHEMY || Level.pit[cell]) {
+			if (Dungeon.level.map[cell] == Terrain.ALCHEMY || Level.pit[cell] || Dungeon.level.traps.get(cell) != null) {
 				super.onThrow( cell );
 			} else {
 				Dungeon.level.plant( this, cell );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index fb0dbf519..727cc5bb8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -71,6 +71,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.LootIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
 import com.shatteredpixel.shatteredpixeldungeon.ui.ResumeIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.StatusPane;
+import com.shatteredpixel.shatteredpixeldungeon.ui.TerrainFeaturesTilemap;
 import com.shatteredpixel.shatteredpixeldungeon.ui.Toast;
 import com.shatteredpixel.shatteredpixeldungeon.ui.Toolbar;
 import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
@@ -111,6 +112,7 @@ public class GameScene extends PixelScene {
 
 	private SkinnedBlock water;
 	private DungeonTilemap tiles;
+	private TerrainFeaturesTilemap terrainFeatures;
 	private FogOfWar fog;
 	private HeroSprite hero;
 
@@ -193,30 +195,17 @@ public class GameScene extends PixelScene {
 		for( CustomTileVisual visual : Dungeon.level.customTiles){
 			addCustomTile(visual.create());
 		}
+
+		terrainFeatures = new TerrainFeaturesTilemap(Dungeon.level.plants, Dungeon.level.traps);
+		terrain.add(terrainFeatures);
 		
 		levelVisuals = Dungeon.level.addVisuals();
 		add(levelVisuals);
-
-		traps = new Group();
-		add(traps);
-
-		int size = Dungeon.level.traps.size();
-		for (int i=0; i < size; i++) {
-			addTrapSprite( Dungeon.level.traps.valueAt( i ) );
-		}
-		
-		plants = new Group();
-		add( plants );
-		
-		size = Dungeon.level.plants.size();
-		for (int i=0; i < size; i++) {
-			addPlantSprite( Dungeon.level.plants.valueAt( i ) );
-		}
 		
 		heaps = new Group();
 		add( heaps );
 		
-		size = Dungeon.level.heaps.size();
+		int size = Dungeon.level.heaps.size();
 		for (int i=0; i < size; i++) {
 			addHeapSprite( Dungeon.level.heaps.valueAt( i ) );
 		}
@@ -541,12 +530,11 @@ public class GameScene extends PixelScene {
 	}
 	
 	private void addPlantSprite( Plant plant ) {
-		(plant.sprite = (PlantSprite)plants.recycle( PlantSprite.class )).reset( plant );
+
 	}
 
 	private void addTrapSprite( Trap trap ) {
-		(trap.sprite = (TrapSprite)traps.recycle( TrapSprite.class )).reset( trap );
-		trap.sprite.visible = trap.visible;
+
 	}
 	
 	private void addBlobSprite( final Blob gas ) {
@@ -689,12 +677,14 @@ public class GameScene extends PixelScene {
 	public static void updateMap() {
 		if (scene != null) {
 			scene.tiles.updateMap();
+			scene.terrainFeatures.updateMap();
 		}
 	}
 	
 	public static void updateMap( int cell ) {
 		if (scene != null) {
 			scene.tiles.updateMapCell( cell );
+			scene.terrainFeatures.updateMapCell( cell );
 		}
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java
index 1128f0b8c..a05e17ed7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/PlantSprite.java
@@ -44,7 +44,7 @@ public class PlantSprite extends Image {
 	private int pos = -1;
 	
 	public PlantSprite() {
-		super( Assets.PLANTS );
+		super( Assets.TERRAIN_FEATURES );
 		
 		if (frames == null) {
 			frames = new TextureFilm( texture, 16, 16 );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TrapSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TrapSprite.java
index 72295d197..c9086b333 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TrapSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/TrapSprite.java
@@ -56,7 +56,7 @@ public class TrapSprite extends Image {
 
 
 	public TrapSprite() {
-		super( Assets.TRAPS );
+		super( Assets.TERRAIN_FEATURES );
 
 		if (frames == null) {
 			frames = new TextureFilm( texture, 16, 16 );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TerrainFeaturesTilemap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TerrainFeaturesTilemap.java
new file mode 100644
index 000000000..ca359c06f
--- /dev/null
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TerrainFeaturesTilemap.java
@@ -0,0 +1,140 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2016 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.ui;
+
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
+import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
+import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.TrapSprite;
+import com.watabou.noosa.Image;
+import com.watabou.noosa.TextureFilm;
+import com.watabou.noosa.Tilemap;
+import com.watabou.utils.PathFinder;
+import com.watabou.utils.Random;
+import com.watabou.utils.SparseArray;
+
+public class TerrainFeaturesTilemap extends Tilemap {
+
+	public static final int SIZE = 16;
+
+	private static TerrainFeaturesTilemap instance;
+
+	private int[] map;
+	private float[] tileVariance;
+
+	private SparseArray<Plant> plants;
+	private SparseArray<Trap> traps;
+
+	public TerrainFeaturesTilemap(SparseArray<Plant> plants, SparseArray<Trap> traps) {
+		super(Assets.TERRAIN_FEATURES, new TextureFilm( Assets.TERRAIN_FEATURES, SIZE, SIZE ));
+
+		this.plants = plants;
+		this.traps = traps;
+
+		Random.seed( Dungeon.seedCurDepth());
+		tileVariance = new float[Dungeon.level.map.length];
+		for (int i = 0; i < tileVariance.length; i++)
+			tileVariance[i] = Random.Float();
+		Random.seed();
+
+		map( Dungeon.level.map, Dungeon.level.width() );
+
+		instance = this;
+	}
+
+	@Override
+	//we need to retain two arrays, map is the dungeon tilemap which we can reference.
+	// Data is our own internal image representation of the tiles, which may differ.
+	public void map(int[] data, int cols) {
+		map = data;
+		super.map(new int[data.length], cols);
+	}
+
+	@Override
+	public synchronized void updateMap() {
+		super.updateMap();
+		for (int i = 0; i < data.length; i++)
+			data[i] = getTileVisual(i ,map[i]);
+	}
+
+	@Override
+	public synchronized void updateMapCell(int cell) {
+		//update in a 3x3 grid to account for neighbours which might also be affected
+		if (Dungeon.level.insideMap(cell)) {
+			super.updateMapCell(cell - mapWidth - 1);
+			super.updateMapCell(cell + mapWidth + 1);
+			for (int i : PathFinder.NEIGHBOURS9)
+				data[cell + i] = getTileVisual(cell + i, map[cell + i]);
+
+			//unless we're at the level's edge, then just do the one tile.
+		} else {
+			super.updateMapCell(cell);
+			data[cell] = getTileVisual(cell, map[cell]);
+		}
+	}
+
+	private int getTileVisual(int pos, int tile){
+		if (traps.get(pos) != null){
+			Trap trap = traps.get(pos);
+			if (!trap.visible)
+				return -1;
+			else
+				return (trap.active ? trap.color : TrapSprite.BLACK) + (trap.shape * 16);
+		}
+
+		if (plants.get(pos) != null){
+			return plants.get(pos).image + 7*16;
+		}
+
+		if (tile == Terrain.HIGH_GRASS){
+			return 9 + 16*((Dungeon.depth-1)/5) + (tileVariance[pos] > 0.5f ? 1 : 0);
+		} else if (tile == Terrain.GRASS) {
+			return 11 + 16*((Dungeon.depth-1)/5) + (tileVariance[pos] > 0.5f ? 1 : 0);
+		} else if (tile == Terrain.EMBERS) {
+			return 13 + (tileVariance[pos] > 0.5f ? 1 : 0);
+		}
+
+		return -1;
+	}
+
+	public static Image tile(int pos, int tile ) {
+		Image img = new Image( instance.texture );
+		img.frame( instance.tileset.get( instance.getTileVisual( pos, tile ) ) );
+		return img;
+	}
+
+	@Override
+	public boolean overlapsPoint( float x, float y ) {
+		return true;
+	}
+
+	@Override
+	public boolean overlapsScreenPoint( int x, int y ) {
+		return true;
+	}
+
+	@Override
+	protected boolean needsRender(int pos) {
+		return data[pos] != -1;
+	}
+}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java
index c822b03d6..670ceae66 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java
@@ -20,14 +20,19 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.windows;
 
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.PlantSprite;
+import com.shatteredpixel.shatteredpixeldungeon.ui.TerrainFeaturesTilemap;
 
 public class WndInfoPlant extends WndTitledMessage {
 	
 	public WndInfoPlant( Plant plant ) {
 		
-		super(new PlantSprite( plant.image ), plant.plantName, plant.desc());
+		super(TerrainFeaturesTilemap.tile( plant.pos, Dungeon.level.map[plant.pos]),
+				plant.plantName, plant.desc());
 
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTrap.java
index df2dc4cf1..bc8f6947f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoTrap.java
@@ -20,15 +20,16 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.windows;
 
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
-import com.shatteredpixel.shatteredpixeldungeon.sprites.TrapSprite;
+import com.shatteredpixel.shatteredpixeldungeon.ui.TerrainFeaturesTilemap;
 
 public class WndInfoTrap extends WndTitledMessage {
 
 	public WndInfoTrap(Trap trap) {
 
-		super(new TrapSprite( trap.color + (trap.shape * 16) ),
+		super(TerrainFeaturesTilemap.tile( trap.pos, Dungeon.level.map[trap.pos]),
 				trap.name,
 				(!trap.active ? Messages.get(WndInfoTrap.class, "inactive") + "\n\n" : "") + trap.desc());