revert

tiles


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

game/modules/tome/data/general/grids/underground.lua

@@ -41,44 +41,84 @@ newEntity{
 }
 end
 
+newEntity{
+	define_as = "UNDERGROUND_LADDER_DOWN",
+	type = "floor", subtype = "underground",
+	name = "ladder to the next level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+}
+newEntity{
+	define_as = "UNDERGROUND_LADDER_UP",
+	type = "floor", subtype = "underground",
+	name = "ladder to the previous level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+}
+
+newEntity{
+	define_as = "UNDERGROUND_LADDER_UP_WILDERNESS",
+	type = "floor", subtype = "underground",
+	name = "ladder to worldmap", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	change_level = 1,
+	change_zone = "wilderness",
+}
+
 for i = 1, 20 do
 newEntity{
 	define_as = "CRYSTAL_WALL"..(i > 1 and i or ""),
 	type = "wall", subtype = "underground",
 	name = "crystals",
-	image = "terrain/underground_floor.png",
+	image = "terrain/crystal_floor1.png",
 	add_displays = class:makeCrystals("terrain/crystal_alpha"),
 	display = '#', color=colors.LIGHT_BLUE, back_color=colors.UMBER,
 	always_remember = true,
 	can_pass = {pass_wall=1},
 	does_block_move = true,
 	block_sight = true,
-	dig = "UNDERGROUND_FLOOR",
+	dig = "CRYSTAL_FLOOR",
 }
 end
 
 newEntity{
-	define_as = "UNDERGROUND_LADDER_DOWN",
+	define_as = "CRYSTAL_FLOOR",
 	type = "floor", subtype = "underground",
-	name = "ladder to the next level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
+	name = "floor", image = "terrain/crystal_floor1.png",
+	display = '.', color=colors.LIGHT_UMBER, back_color=colors.UMBER,
+	grow = "CRYSTAL_WALL",
+	nice_tiler = { method="replace", base={"CRYSTAL_FLOOR", 100, 1, 8}},
+}
+for i = 1, 8 do newEntity{ base = "CRYSTAL_FLOOR", define_as = "CRYSTAL_FLOOR"..i, image = "terrain/crystal_floor"..i..".png"} end
+
+newEntity{
+	define_as = "CRYSTAL_LADDER_DOWN",
+	type = "floor", subtype = "underground",
+	name = "ladder to the next level", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
 	display = '>', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
 	change_level = 1,
 }
 newEntity{
-	define_as = "UNDERGROUND_LADDER_UP",
+	define_as = "CRYSTAL_LADDER_UP",
 	type = "floor", subtype = "underground",
-	name = "ladder to the previous level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
+	name = "ladder to the previous level", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
 	change_level = -1,
 }
+
 newEntity{
-	define_as = "UNDERGROUND_LADDER_UP_WILDERNESS",
+	define_as = "CRYSTAL_LADDER_UP_WILDERNESS",
 	type = "floor", subtype = "underground",
-	name = "ladder to worldmap", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
+	name = "ladder to worldmap", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	change_level = 1,

game/modules/tome/data/zones/scintillating-caves/zone.lua

@@ -34,11 +34,11 @@ return {
 			class = "engine.generator.map.Cavern",
 			zoom = 14,
 			min_floor = 700,
-			floor = "UNDERGROUND_FLOOR",
+			floor = "CRYSTAL_FLOOR",
 			wall = {"CRYSTAL_WALL","CRYSTAL_WALL2","CRYSTAL_WALL3","CRYSTAL_WALL4","CRYSTAL_WALL5","CRYSTAL_WALL6","CRYSTAL_WALL7","CRYSTAL_WALL8","CRYSTAL_WALL9","CRYSTAL_WALL10","CRYSTAL_WALL11","CRYSTAL_WALL12","CRYSTAL_WALL13","CRYSTAL_WALL14","CRYSTAL_WALL15","CRYSTAL_WALL16","CRYSTAL_WALL17","CRYSTAL_WALL18","CRYSTAL_WALL19","CRYSTAL_WALL20",},
-			up = "UNDERGROUND_LADDER_UP",
-			down = "UNDERGROUND_LADDER_DOWN",
-			door = "UNDERGROUND_FLOOR",
+			up = "CRYSTAL_LADDER_UP",
+			down = "CRYSTAL_LADDER_DOWN",
+			door = "CRYSTAL_FLOOR",
 		},
 		actor = {
 			class = "engine.generator.actor.Random",
@@ -59,7 +59,7 @@ return {
 	{
 		[1] = {
 			generator = { map = {
-				up = "UNDERGROUND_LADDER_UP_WILDERNESS",
+				up = "CRYSTAL_LADDER_UP_WILDERNESS",
 			}, },
 		},
 	},

game/modules/tome/resolvers.lua

@@ -57,7 +57,7 @@ function resolvers.calc.equip(t, e)
 			e:wearObject(o, true, false)
 
 			-- Do not drop it unless it is an ego or better
-			if not o.unique then o.no_drop = true print(" * "..o.name.." => no drop") end
+			if not o.egoed and not o.unique then o.no_drop = true print(" * "..o.name.." => no drop") end
 			if filter.force_drop then o.no_drop = nil end
 			game.zone:addEntity(game.level, o, "object")