Skip to content

Commit 5852ab9

Browse files
ZbizuZbizu
committed
sea/sand/grass border and more 8.0 stuff
1 parent 42afb54 commit 5852ab9

9 files changed

Lines changed: 108 additions & 145 deletions

File tree

‎data/760/borders.xml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -480,22 +480,20 @@
480480
</border>
481481

482482
<!-- beach -->
483-
<!--
484483
<border id="41">
485-
<borderitem edge="s" item="4632"/>
486-
<borderitem edge="n" item="4634"/>
487-
<borderitem edge="w" item="4635"/>
488-
<borderitem edge="e" item="4633"/>
489-
<borderitem edge="dnw" item="4640"/>
490-
<borderitem edge="dne" item="4641"/>
491-
<borderitem edge="dsw" item="4642"/>
492-
<borderitem edge="dse" item="4643"/>
493-
<borderitem edge="cne" item="4637"/>
494-
<borderitem edge="cnw" item="4636"/>
495-
<borderitem edge="cse" item="4639"/>
496-
<borderitem edge="csw" item="4638"/>
497-
</border>
498-
-->
484+
<borderitem edge="n" item="4632"/>
485+
<borderitem edge="s" item="4634"/>
486+
<borderitem edge="e" item="4635"/>
487+
<borderitem edge="w" item="4633"/>
488+
<borderitem edge="cse" item="4640"/>
489+
<borderitem edge="csw" item="4641"/>
490+
<borderitem edge="cne" item="4642"/>
491+
<borderitem edge="cnw" item="4643"/>
492+
<borderitem edge="dsw" item="4637"/>
493+
<borderitem edge="dse" item="4636"/>
494+
<borderitem edge="dnw" item="4639"/>
495+
<borderitem edge="dne" item="4638"/>
496+
</border>
499497

500498
<!-- sea -->
501499
<border id="42">

‎data/760/grounds.xml‎

Lines changed: 34 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -215,103 +215,88 @@
215215
<brush name="sand" type="ground" server_lookid="231" z-order="3000">
216216
<item id="231" chance="1"/>
217217

218-
<border align="outer" id="49">
219-
-- Handles for the 8 different specific cases which might occur with water/sand borders --
220-
<specific>
218+
<border align="outer" id="49"/>
219+
<border align="inner" to="sea" id="41" ground_equivalent="231" super="true">
220+
<specific keep_border="true">
221221
<conditions>
222-
<match_border id="49" edge="s"/>
223-
<match_border id="42" edge="e"/>
222+
<match_border id="41" edge="s"/>
223+
<match_border id="38" edge="e"/>
224224
</conditions>
225225
<actions>
226-
<replace_border id="42" edge="e" with="4659"/>
226+
<replace_border id="41" edge="s" with="4661"/>
227227
</actions>
228228
</specific>
229229

230-
<specific>
230+
<specific keep_border="true">
231231
<conditions>
232-
<match_border id="49" edge="n"/>
233-
<match_border id="42" edge="e"/>
232+
<match_border id="41" edge="n"/>
233+
<match_border id="38" edge="e"/>
234234
</conditions>
235235
<actions>
236-
<replace_border id="42" edge="e" with="4663"/>
236+
<replace_border id="41" edge="n" with="4660"/>
237237
</actions>
238238
</specific>
239239

240-
<specific>
240+
<specific keep_border="true">
241241
<conditions>
242-
<match_border id="49" edge="s"/>
243-
<match_border id="42" edge="w"/>
242+
<match_border id="41" edge="s"/>
243+
<match_border id="38" edge="w"/>
244244
</conditions>
245245
<actions>
246-
<replace_border id="42" edge="w" with="4658"/>
246+
<replace_border id="41" edge="s" with="4657"/>
247247
</actions>
248248
</specific>
249249

250-
<specific>
250+
<specific keep_border="true">
251251
<conditions>
252-
<match_border id="49" edge="n"/>
253-
<match_border id="42" edge="w"/>
252+
<match_border id="41" edge="n"/>
253+
<match_border id="38" edge="w"/>
254254
</conditions>
255255
<actions>
256-
<replace_border id="42" edge="w" with="4662"/>
256+
<replace_border id="41" edge="n" with="4656"/>
257257
</actions>
258258
</specific>
259259

260-
<specific>
260+
<specific keep_border="true">
261261
<conditions>
262-
<match_border id="49" edge="e"/>
263-
<match_border id="42" edge="s"/>
262+
<match_border id="41" edge="e"/>
263+
<match_border id="38" edge="s"/>
264264
</conditions>
265265
<actions>
266-
<replace_border id="42" edge="s" with="4657"/>
266+
<replace_border id="41" edge="e" with="4663"/>
267267
</actions>
268268
</specific>
269269

270-
<specific>
270+
<specific keep_border="true">
271271
<conditions>
272-
<match_border id="49" edge="w"/>
273-
<match_border id="42" edge="s"/>
272+
<match_border id="41" edge="w"/>
273+
<match_border id="38" edge="s"/>
274274
</conditions>
275275
<actions>
276-
<replace_border id="42" edge="s" with="4661"/>
276+
<replace_border id="41" edge="w" with="4662"/>
277277
</actions>
278278
</specific>
279279

280-
<specific>
280+
<specific keep_border="true">
281281
<conditions>
282-
<match_border id="49" edge="e"/>
283-
<match_border id="42" edge="n"/>
282+
<match_border id="41" edge="e"/>
283+
<match_border id="38" edge="n"/>
284284
</conditions>
285285
<actions>
286-
<replace_border id="42" edge="n" with="4656"/>
286+
<replace_border id="41" edge="e" with="4659"/>
287287
</actions>
288288
</specific>
289289

290-
<specific>
290+
<specific keep_border="true">
291291
<conditions>
292-
<match_border id="49" edge="w"/>
293-
<match_border id="42" edge="n"/>
292+
<match_border id="41" edge="w"/>
293+
<match_border id="38" edge="n"/>
294294
</conditions>
295295
<actions>
296-
<replace_border id="42" edge="n" with="4660"/>
296+
<replace_border id="41" edge="w" with="4658"/>
297297
</actions>
298298
</specific>
299299
</border>
300-
301-
<border align="inner" to="sea" ground_equivalent="231">
302-
<borderitem edge="n" item="4632"/>
303-
<borderitem edge="e" item="4635"/>
304-
<borderitem edge="s" item="4634"/>
305-
<borderitem edge="w" item="4633"/>
306-
<borderitem edge="cnw" item="4643"/>
307-
<borderitem edge="cne" item="4642"/>
308-
<borderitem edge="csw" item="4641"/>
309-
<borderitem edge="cse" item="4640"/>
310-
<borderitem edge="dnw" item="4639"/>
311-
<borderitem edge="dne" item="4638"/>
312-
<borderitem edge="dsw" item="4637"/>
313-
<borderitem edge="dse" item="4636"/>
314-
</border>
315300
<border align="inner" to="none" id="7"/>
316301
</brush>
317302

‎data/800/borders.xml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -484,23 +484,21 @@
484484
</border>
485485

486486
<!-- beach -->
487-
<!--
488487
<border id="41">
489-
<borderitem edge="s" item="4632"/>
490-
<borderitem edge="n" item="4634"/>
491-
<borderitem edge="w" item="4635"/>
492-
<borderitem edge="e" item="4633"/>
493-
<borderitem edge="dnw" item="4640"/>
494-
<borderitem edge="dne" item="4641"/>
495-
<borderitem edge="dsw" item="4642"/>
496-
<borderitem edge="dse" item="4643"/>
497-
<borderitem edge="cne" item="4637"/>
498-
<borderitem edge="cnw" item="4636"/>
499-
<borderitem edge="cse" item="4639"/>
500-
<borderitem edge="csw" item="4638"/>
488+
<borderitem edge="n" item="4632"/>
489+
<borderitem edge="s" item="4634"/>
490+
<borderitem edge="e" item="4635"/>
491+
<borderitem edge="w" item="4633"/>
492+
<borderitem edge="cse" item="4640"/>
493+
<borderitem edge="csw" item="4641"/>
494+
<borderitem edge="cne" item="4642"/>
495+
<borderitem edge="cnw" item="4643"/>
496+
<borderitem edge="dsw" item="4637"/>
497+
<borderitem edge="dse" item="4636"/>
498+
<borderitem edge="dnw" item="4639"/>
499+
<borderitem edge="dne" item="4638"/>
501500
</border>
502-
-->
503-
501+
504502
<!-- sea -->
505503
<border id="42">
506504
<borderitem edge="n" item="4644"/>

‎data/800/collections.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
<brush name="sand"/>
123123
<brush name="sand closed stone pile"/>
124124
<brush name="sandstone"/>
125+
<brush name="dark sandstone"/>
125126
<brush name="dark tiled sandstone"/>
126127
<brush name="tiled sandstone floor"/>
127128
<brush name="light tiled stone floor"/>

‎data/800/grounds.xml‎

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -215,103 +215,88 @@
215215
<brush name="sand" type="ground" server_lookid="231" z-order="3000">
216216
<item id="231" chance="1"/>
217217

218-
<border align="outer" id="49">
219-
-- Handles for the 8 different specific cases which might occur with water/sand borders --
220-
<specific>
218+
<border align="outer" id="49"/>
219+
<border align="inner" to="sea" id="41" ground_equivalent="231" super="true">
220+
<specific keep_border="true">
221221
<conditions>
222-
<match_border id="49" edge="s"/>
223-
<match_border id="42" edge="e"/>
222+
<match_border id="41" edge="s"/>
223+
<match_border id="38" edge="e"/>
224224
</conditions>
225225
<actions>
226-
<replace_border id="42" edge="e" with="4659"/>
226+
<replace_border id="41" edge="s" with="4661"/>
227227
</actions>
228228
</specific>
229229

230-
<specific>
230+
<specific keep_border="true">
231231
<conditions>
232-
<match_border id="49" edge="n"/>
233-
<match_border id="42" edge="e"/>
232+
<match_border id="41" edge="n"/>
233+
<match_border id="38" edge="e"/>
234234
</conditions>
235235
<actions>
236-
<replace_border id="42" edge="e" with="4663"/>
236+
<replace_border id="41" edge="n" with="4660"/>
237237
</actions>
238238
</specific>
239239

240-
<specific>
240+
<specific keep_border="true">
241241
<conditions>
242-
<match_border id="49" edge="s"/>
243-
<match_border id="42" edge="w"/>
242+
<match_border id="41" edge="s"/>
243+
<match_border id="38" edge="w"/>
244244
</conditions>
245245
<actions>
246-
<replace_border id="42" edge="w" with="4658"/>
246+
<replace_border id="41" edge="s" with="4657"/>
247247
</actions>
248248
</specific>
249249

250-
<specific>
250+
<specific keep_border="true">
251251
<conditions>
252-
<match_border id="49" edge="n"/>
253-
<match_border id="42" edge="w"/>
252+
<match_border id="41" edge="n"/>
253+
<match_border id="38" edge="w"/>
254254
</conditions>
255255
<actions>
256-
<replace_border id="42" edge="w" with="4662"/>
256+
<replace_border id="41" edge="n" with="4656"/>
257257
</actions>
258258
</specific>
259259

260-
<specific>
260+
<specific keep_border="true">
261261
<conditions>
262-
<match_border id="49" edge="e"/>
263-
<match_border id="42" edge="s"/>
262+
<match_border id="41" edge="e"/>
263+
<match_border id="38" edge="s"/>
264264
</conditions>
265265
<actions>
266-
<replace_border id="42" edge="s" with="4657"/>
266+
<replace_border id="41" edge="e" with="4663"/>
267267
</actions>
268268
</specific>
269269

270-
<specific>
270+
<specific keep_border="true">
271271
<conditions>
272-
<match_border id="49" edge="w"/>
273-
<match_border id="42" edge="s"/>
272+
<match_border id="41" edge="w"/>
273+
<match_border id="38" edge="s"/>
274274
</conditions>
275275
<actions>
276-
<replace_border id="42" edge="s" with="4661"/>
276+
<replace_border id="41" edge="w" with="4662"/>
277277
</actions>
278278
</specific>
279279

280-
<specific>
280+
<specific keep_border="true">
281281
<conditions>
282-
<match_border id="49" edge="e"/>
283-
<match_border id="42" edge="n"/>
282+
<match_border id="41" edge="e"/>
283+
<match_border id="38" edge="n"/>
284284
</conditions>
285285
<actions>
286-
<replace_border id="42" edge="n" with="4656"/>
286+
<replace_border id="41" edge="e" with="4659"/>
287287
</actions>
288288
</specific>
289289

290-
<specific>
290+
<specific keep_border="true">
291291
<conditions>
292-
<match_border id="49" edge="w"/>
293-
<match_border id="42" edge="n"/>
292+
<match_border id="41" edge="w"/>
293+
<match_border id="38" edge="n"/>
294294
</conditions>
295295
<actions>
296-
<replace_border id="42" edge="n" with="4660"/>
296+
<replace_border id="41" edge="w" with="4658"/>
297297
</actions>
298298
</specific>
299299
</border>
300-
301-
<border align="inner" to="sea" ground_equivalent="231">
302-
<borderitem edge="n" item="4632"/>
303-
<borderitem edge="e" item="4635"/>
304-
<borderitem edge="s" item="4634"/>
305-
<borderitem edge="w" item="4633"/>
306-
<borderitem edge="cnw" item="4643"/>
307-
<borderitem edge="cne" item="4642"/>
308-
<borderitem edge="csw" item="4641"/>
309-
<borderitem edge="cse" item="4640"/>
310-
<borderitem edge="dnw" item="4639"/>
311-
<borderitem edge="dne" item="4638"/>
312-
<borderitem edge="dsw" item="4637"/>
313-
<borderitem edge="dse" item="4636"/>
314-
</border>
315300
<border align="inner" to="none" id="7"/>
316301
</brush>
317302

@@ -355,7 +340,6 @@
355340
<brush name="earth (hard)" type="ground" server_lookid="5711" z-order="9040">
356341
<item id="5711" chance="1"/>
357342

358-
359343
<border align="outer" id="74">
360344
<!-- border directly above SOFT tile -->
361345
<specific>

‎data/800/materials.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
<materials>
2-
<metaitem id="80"/>
3-
<metaitem id="81"/>
4-
<metaitem id="82"/>
5-
<metaitem id="83"/>
6-
<metaitem id="84"/>
7-
<metaitem id="85"/>
8-
<metaitem id="86"/>
9-
<metaitem id="87"/>
10-
<metaitem id="88"/> <!-- Steel rebar pole -->
11-
<metaitem id="89"/> <!-- Steel bar pole -->
12-
132
<include file="creature_palette.xml"/>
143
<include file="borders.xml"/>
154
<include file="grounds.xml"/>

‎data/800/tilesets.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@
264264
<brush name="lawn"/>
265265
<brush name="cobblestone"/>
266266
<brush name="sandstone"/>
267+
<brush name="dark sandstone"/>
267268
<brush name="grassy cobblestone"/>
268269
<brush name="drawbridge"/>
269270
<brush name="dark wooden floor"/>

0 commit comments

Comments
 (0)