yutio888 / Tales of MajEyal · Commits

Commit f618d408601f99e9f71d0e6166ffd3869a237f62

Authored by DarkGod
1 parent 34d7a11c

Added tile transition from marble floor to water (mainly for Last Hope)

Inline Side-by-side
Showing 11 changed files with 45 additions and 0 deletions
... ... @@ -735,6 +735,37 @@ function _M:niceTileOuterSpace(level, i, j, g, nt)
735 735 end
736 736
737 737 local defs = {
  738 +marble_floor = { method="borders", type="marble", forbid={grass=true},
  739 + -- default8={add_mos={{image="terrain/grass/grass_2_%02d.png", display_y=-1}}, min=1, max=2},
  740 + -- default2={add_mos={{image="terrain/grass/grass_8_%02d.png", display_y=1}}, min=1, max=2},
  741 + -- default4={add_mos={{image="terrain/grass/grass_6_%02d.png", display_x=-1}}, min=1, max=2},
  742 + -- default6={add_mos={{image="terrain/grass/grass_4_%02d.png", display_x=1}}, min=1, max=2},
  743 +
  744 + -- default1={add_mos={{image="terrain/grass/grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
  745 + -- default3={add_mos={{image="terrain/grass/grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
  746 + -- default7={add_mos={{image="terrain/grass/grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
  747 + -- default9={add_mos={{image="terrain/grass/grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
  748 +
  749 + -- default1i={add_mos={{image="terrain/grass/grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
  750 + -- default3i={add_mos={{image="terrain/grass/grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
  751 + -- default7i={add_mos={{image="terrain/grass/grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
  752 + -- default9i={add_mos={{image="terrain/grass/grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
  753 +
  754 + water8={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_8.png", display_y=-1}}, min=1, max=1},
  755 + water2={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_2.png", display_y=1}}, min=1, max=1},
  756 + water4={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_4.png", display_x=-1}}, min=1, max=1},
  757 + water6={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_6.png", display_x=1}}, min=1, max=1},
  758 +
  759 + water1={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_1.png", display_x=-1, display_y=1}}, min=1, max=1},
  760 + water3={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_3.png", display_x=1, display_y=1}}, min=1, max=1},
  761 + water7={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_7.png", display_x=-1, display_y=-1}}, min=1, max=1},
  762 + water9={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_9.png", display_x=1, display_y=-1}}, min=1, max=1},
  763 +
  764 + water1i={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_1.png", display_x=-1, display_y=1}}, min=1, max=1},
  765 + water3i={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_3.png", display_x=1, display_y=1}}, min=1, max=1},
  766 + water7i={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_7.png", display_x=-1, display_y=-1}}, min=1, max=1},
  767 + water9i={add_mos={{image="terrain/marble_water/marble_floor_2_to_water_outer_9.png", display_x=1, display_y=-1}}, min=1, max=1},
  768 +},
738 769 grass = { method="borders", type="grass", forbid={lava=true, rock=true, dark_grass=true},
739 770 default8={add_mos={{image="terrain/grass/grass_2_%02d.png", display_y=-1}}, min=1, max=2},
740 771 default2={add_mos={{image="terrain/grass/grass_8_%02d.png", display_y=1}}, min=1, max=2},
... ...
... ... @@ -29,6 +29,7 @@ newEntity{
29 29 notice = true,
30 30 change_level = 1,
31 31 change_zone = "wilderness",
  32 + nice_editer = { method="borders_def", def="marble_floor"},
32 33 }
33 34
34 35 newEntity{
... ... @@ -39,6 +40,7 @@ newEntity{
39 40 notice = true,
40 41 always_remember = true,
41 42 change_level = -1,
  43 + nice_editer = { method="borders_def", def="marble_floor"},
42 44 }
43 45
44 46 newEntity{
... ... @@ -49,6 +51,7 @@ newEntity{
49 51 notice = true,
50 52 always_remember = true,
51 53 change_level = 1,
  54 + nice_editer = { method="borders_def", def="marble_floor"},
52 55 }
53 56
54 57 -----------------------------------------
... ... @@ -63,6 +66,7 @@ newEntity{
63 66 notice = true,
64 67 change_level = 1,
65 68 change_zone = "wilderness",
  69 + nice_editer = { method="borders_def", def="marble_floor"},
66 70 }
67 71
68 72 newEntity{
... ... @@ -73,6 +77,7 @@ newEntity{
73 77 notice = true,
74 78 always_remember = true,
75 79 change_level = -1,
  80 + nice_editer = { method="borders_def", def="marble_floor"},
76 81 }
77 82 newEntity{
78 83 define_as = "FLAT_UP2",
... ... @@ -82,6 +87,7 @@ newEntity{
82 87 notice = true,
83 88 always_remember = true,
84 89 change_level = -1,
  90 + nice_editer = { method="borders_def", def="marble_floor"},
85 91 }
86 92 newEntity{
87 93 define_as = "FLAT_UP4",
... ... @@ -91,6 +97,7 @@ newEntity{
91 97 notice = true,
92 98 always_remember = true,
93 99 change_level = -1,
  100 + nice_editer = { method="borders_def", def="marble_floor"},
94 101 }
95 102 newEntity{
96 103 define_as = "FLAT_UP6",
... ... @@ -100,6 +107,7 @@ newEntity{
100 107 notice = true,
101 108 always_remember = true,
102 109 change_level = -1,
  110 + nice_editer = { method="borders_def", def="marble_floor"},
103 111 }
104 112
105 113 newEntity{
... ... @@ -110,6 +118,7 @@ newEntity{
110 118 notice = true,
111 119 always_remember = true,
112 120 change_level = 1,
  121 + nice_editer = { method="borders_def", def="marble_floor"},
113 122 }
114 123 newEntity{
115 124 define_as = "FLAT_DOWN2",
... ... @@ -119,6 +128,7 @@ newEntity{
119 128 notice = true,
120 129 always_remember = true,
121 130 change_level = 1,
  131 + nice_editer = { method="borders_def", def="marble_floor"},
122 132 }
123 133 newEntity{
124 134 define_as = "FLAT_DOWN4",
... ... @@ -128,6 +138,7 @@ newEntity{
128 138 notice = true,
129 139 always_remember = true,
130 140 change_level = 1,
  141 + nice_editer = { method="borders_def", def="marble_floor"},
131 142 }
132 143 newEntity{
133 144 define_as = "FLAT_DOWN6",
... ... @@ -137,6 +148,7 @@ newEntity{
137 148 notice = true,
138 149 always_remember = true,
139 150 change_level = 1,
  151 + nice_editer = { method="borders_def", def="marble_floor"},
140 152 }
141 153
142 154 -----------------------------------------
... ... @@ -148,6 +160,7 @@ newEntity{
148 160 name = "floor", image = "terrain/marble_floor.png",
149 161 display = '.', color_r=255, color_g=255, color_b=255, back_color=colors.DARK_GREY,
150 162 grow = "WALL",
  163 + nice_editer = { method="borders_def", def="marble_floor"},
151 164 }
152 165
153 166 -----------------------------------------
... ...
... ... @@ -27,6 +27,7 @@ newEntity{
27 27 name = "old road", image = "terrain/marble_floor.png",
28 28 display = '=', color=colors.DARK_GREY,
29 29 always_remember = true,
  30 + nice_editer = { method="borders_def", def="marble_floor"},
30 31 nice_editer2 = { method="roads_def", def="oldstone" },
31 32 }
32 33
... ...