diff --git a/CHANGES b/CHANGES index 35a26ddf7..5842b8b50 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,16 @@ Changes for SVN top of tree: ============================================================================== +Removed hyphen in woodlarge-vertical archetype as it was causing overlap with woodlarge +archetype. +floor/woodlargevertical.arc +floor/woodlargevertical.base.111.png +Deleted: +floor/woodlarge-vertical.arc +floor/woodlarge-vertical.base.111.png +floor/woodlarge-vertical.face +RJT 2012-09-07 + New woodfloor tile running in vertical pattern, based on woodfloor.arc floor/woodfloorvert.base.111.png floor/woodfloorvert.arc diff --git a/floor/woodlarge-vertical.arc b/floor/woodlarge-vertical.arc deleted file mode 100644 index 04cf4b0e7..000000000 --- a/floor/woodlarge-vertical.arc +++ /dev/null @@ -1,9 +0,0 @@ -Object woodlarge -name wood floor vertical -face woodlarge-vertical.111 -no_pick 1 -is_floor 1 -smoothlevel 30 -smoothface woodlarge-vertical.111 empty_S.111 -move_block boat swim -end diff --git a/floor/woodlarge-vertical.face b/floor/woodlarge-vertical.face deleted file mode 100644 index 19b794b19..000000000 --- a/floor/woodlarge-vertical.face +++ /dev/null @@ -1,3 +0,0 @@ -face woodlarge-vertical.111 -magicmap yellow -end diff --git a/floor/woodlargevertical.arc b/floor/woodlargevertical.arc new file mode 100644 index 000000000..81a0250fc --- /dev/null +++ b/floor/woodlargevertical.arc @@ -0,0 +1,9 @@ +Object woodlgvertical +name wood floor vertical +face woodlargevertical.111 +no_pick 1 +is_floor 1 +smoothlevel 30 +smoothface woodlargevertical.111 empty_S.111 +move_block boat swim +end diff --git a/floor/woodlarge-vertical.base.111.png b/floor/woodlargevertical.base.111.png similarity index 100% rename from floor/woodlarge-vertical.base.111.png rename to floor/woodlargevertical.base.111.png