plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@3676 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/NicerTiles.lua

@@ -79,7 +79,9 @@ function _M:replaceAll(level)
 
 	-- In-place entities edition, now this is becoming tricky, but powerful
 	for i, jj in pairs(self.edits) do for j, ee in pairs(jj) do
-		local id = {}
+		local g = level.map(i, j, Map.TERRAIN)
+
+		local id = {g.name or "???"}
 		for __, e in ipairs(ee) do
 			if not e.use_id then id = nil break end
 			id[#id+1] = e.use_id
@@ -91,7 +93,6 @@ function _M:replaceAll(level)
 			level.map(i, j, Map.TERRAIN, self.edit_entity_store[id])
 		-- Otherwise compute this new combo and store the entity
 		else
-			local g = level.map(i, j, Map.TERRAIN)
 			local cloned = false
 			if not g.force_clone then g = g:cloneFull() g.force_clone = true cloned = true end
 
@@ -387,7 +388,7 @@ gold_mountain = { method="borders", type="gold_mountain", forbid={}, use_type=tr
 	default1={add_mos={{image="terrain/golden_mountain9i.png", display_x=-1, display_y=1}}, min=1, max=1},
 	default3={add_mos={{image="terrain/golden_mountain7i.png", display_x=1, display_y=1}}, min=1, max=1},
 	default7={add_mos={{image="terrain/golden_mountain3i.png", display_x=-1, display_y=-1}}, min=1, max=1},
-	default9={add_mos={{image="terrain/vmountain1i.png", display_x=1, display_y=-1}}, min=1, max=1},
+	default9={add_mos={{image="terrain/golden_mountain1i.png", display_x=1, display_y=-1}}, min=1, max=1},
 
 	default1i={add_mos={{image="terrain/golden_mountain1.png", display_x=-1, display_y=1}}, min=1, max=1},
 	default3i={add_mos={{image="terrain/golden_mountain3.png", display_x=1, display_y=1}}, min=1, max=1},

game/modules/tome/data/zones/wilderness/grids.lua

@@ -110,7 +110,7 @@ newEntity{
 	block_sight = true,
 	nice_tiler = { method="replace", base={"BURNT_FOREST", 100, 1, 20}},
 }
-for i = 1, 20 do newEntity{ base="BURNT_FOREST", define_as = "BURNT_FOREST"..i, name = "burnt tree", image = "terrain/grass_burnt1.png", add_displays = class:makeTrees("terrain/burnttree_alpha")} end
+for i = 1, 20 do newEntity{ base="BURNT_FOREST", define_as = "BURNT_FOREST"..i, name = "burnt tree", image = "terrain/lava_floor.png", add_displays = class:makeTrees("terrain/burnttree_alpha")} end
 
 --------------------------------------------------------------------------------
 -- Iceland
@@ -396,7 +396,7 @@ newEntity{ base="ZONE_DESERT", define_as = "SANDWORM_LAIR",
 }
 
 newEntity{ base="CHARRED_SCAR", define_as = "CHARRED_SCAR_VOLCANO",
-	name="Charred Scar Volcano",
+	name="Charred Scar Volcano", nice_tiler=false,
 	color={r=200, g=255, b=55},
 	display='>', color=colors.RED, back_color=colors.LIGHT_DARK,
 	image="terrain/volcano1.png",