Commit 0c9b382498947471f224fe62f0f487a0cd3396cd

Authored by dg
1 parent 5c7b168e

revert

tiles


git-svn-id: http://svn.net-core.org/repos/t-engine4@2660 51575b47-30f0-44d4-a5cc-537603b46e54
... ... @@ -41,44 +41,84 @@ newEntity{
41 41 }
42 42 end
43 43
  44 +newEntity{
  45 + define_as = "UNDERGROUND_LADDER_DOWN",
  46 + type = "floor", subtype = "underground",
  47 + name = "ladder to the next level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
  48 + display = '>', color_r=255, color_g=255, color_b=0,
  49 + notice = true,
  50 + always_remember = true,
  51 + change_level = 1,
  52 +}
  53 +newEntity{
  54 + define_as = "UNDERGROUND_LADDER_UP",
  55 + type = "floor", subtype = "underground",
  56 + name = "ladder to the previous level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
  57 + display = '<', color_r=255, color_g=255, color_b=0,
  58 + notice = true,
  59 + always_remember = true,
  60 + change_level = -1,
  61 +}
  62 +
  63 +newEntity{
  64 + define_as = "UNDERGROUND_LADDER_UP_WILDERNESS",
  65 + type = "floor", subtype = "underground",
  66 + name = "ladder to worldmap", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
  67 + display = '<', color_r=255, color_g=255, color_b=0,
  68 + notice = true,
  69 + change_level = 1,
  70 + change_zone = "wilderness",
  71 +}
  72 +
44 73 for i = 1, 20 do
45 74 newEntity{
46 75 define_as = "CRYSTAL_WALL"..(i > 1 and i or ""),
47 76 type = "wall", subtype = "underground",
48 77 name = "crystals",
49   - image = "terrain/underground_floor.png",
  78 + image = "terrain/crystal_floor1.png",
50 79 add_displays = class:makeCrystals("terrain/crystal_alpha"),
51 80 display = '#', color=colors.LIGHT_BLUE, back_color=colors.UMBER,
52 81 always_remember = true,
53 82 can_pass = {pass_wall=1},
54 83 does_block_move = true,
55 84 block_sight = true,
56   - dig = "UNDERGROUND_FLOOR",
  85 + dig = "CRYSTAL_FLOOR",
57 86 }
58 87 end
59 88
60 89 newEntity{
61   - define_as = "UNDERGROUND_LADDER_DOWN",
  90 + define_as = "CRYSTAL_FLOOR",
62 91 type = "floor", subtype = "underground",
63   - name = "ladder to the next level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
  92 + name = "floor", image = "terrain/crystal_floor1.png",
  93 + display = '.', color=colors.LIGHT_UMBER, back_color=colors.UMBER,
  94 + grow = "CRYSTAL_WALL",
  95 + nice_tiler = { method="replace", base={"CRYSTAL_FLOOR", 100, 1, 8}},
  96 +}
  97 +for i = 1, 8 do newEntity{ base = "CRYSTAL_FLOOR", define_as = "CRYSTAL_FLOOR"..i, image = "terrain/crystal_floor"..i..".png"} end
  98 +
  99 +newEntity{
  100 + define_as = "CRYSTAL_LADDER_DOWN",
  101 + type = "floor", subtype = "underground",
  102 + name = "ladder to the next level", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_down.png"}},
64 103 display = '>', color_r=255, color_g=255, color_b=0,
65 104 notice = true,
66 105 always_remember = true,
67 106 change_level = 1,
68 107 }
69 108 newEntity{
70   - define_as = "UNDERGROUND_LADDER_UP",
  109 + define_as = "CRYSTAL_LADDER_UP",
71 110 type = "floor", subtype = "underground",
72   - name = "ladder to the previous level", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
  111 + name = "ladder to the previous level", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_up.png"}},
73 112 display = '<', color_r=255, color_g=255, color_b=0,
74 113 notice = true,
75 114 always_remember = true,
76 115 change_level = -1,
77 116 }
  117 +
78 118 newEntity{
79   - define_as = "UNDERGROUND_LADDER_UP_WILDERNESS",
  119 + define_as = "CRYSTAL_LADDER_UP_WILDERNESS",
80 120 type = "floor", subtype = "underground",
81   - name = "ladder to worldmap", image = "terrain/underground_floor.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
  121 + name = "ladder to worldmap", image = "terrain/crystal_floor1.png", add_displays = {class.new{image="terrain/ladder_up_wild.png"}},
82 122 display = '<', color_r=255, color_g=255, color_b=0,
83 123 notice = true,
84 124 change_level = 1,
... ...
... ... @@ -34,11 +34,11 @@ return {
34 34 class = "engine.generator.map.Cavern",
35 35 zoom = 14,
36 36 min_floor = 700,
37   - floor = "UNDERGROUND_FLOOR",
  37 + floor = "CRYSTAL_FLOOR",
38 38 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",},
39   - up = "UNDERGROUND_LADDER_UP",
40   - down = "UNDERGROUND_LADDER_DOWN",
41   - door = "UNDERGROUND_FLOOR",
  39 + up = "CRYSTAL_LADDER_UP",
  40 + down = "CRYSTAL_LADDER_DOWN",
  41 + door = "CRYSTAL_FLOOR",
42 42 },
43 43 actor = {
44 44 class = "engine.generator.actor.Random",
... ... @@ -59,7 +59,7 @@ return {
59 59 {
60 60 [1] = {
61 61 generator = { map = {
62   - up = "UNDERGROUND_LADDER_UP_WILDERNESS",
  62 + up = "CRYSTAL_LADDER_UP_WILDERNESS",
63 63 }, },
64 64 },
65 65 },
... ...
... ... @@ -57,7 +57,7 @@ function resolvers.calc.equip(t, e)
57 57 e:wearObject(o, true, false)
58 58
59 59 -- Do not drop it unless it is an ego or better
60   - if not o.unique then o.no_drop = true print(" * "..o.name.." => no drop") end
  60 + if not o.egoed and not o.unique then o.no_drop = true print(" * "..o.name.." => no drop") end
61 61 if filter.force_drop then o.no_drop = nil end
62 62 game.zone:addEntity(game.level, o, "object")
63 63
... ...