diff --git a/changelog b/changelog index e0f693466aa..2c4d0d7ea5c 100644 --- a/changelog +++ b/changelog @@ -36,6 +36,7 @@ Version 1.9.0-svn: * fix for dwarven castle to cave wall alignment issue by Alarantalara * improved "desert road" based off the dirt terrain * made encampment use normal dirt rather than a custom dirt base + * added new Òdark dirtÓ terrain * User interface: * Added dialog for installation of add-on dependencies * Removed the unused gui2 menu bar diff --git a/data/core/images/terrain/flat/dirt-dark-n-ne-se.png b/data/core/images/terrain/flat/dirt-dark-n-ne-se.png new file mode 100644 index 00000000000..6df69ed1a53 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-n-ne-se.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-n-ne.png b/data/core/images/terrain/flat/dirt-dark-n-ne.png new file mode 100644 index 00000000000..aeb887dc4b2 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-n-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-n.png b/data/core/images/terrain/flat/dirt-dark-n.png new file mode 100644 index 00000000000..6aa28e69c40 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-n.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-ne-se-s.png b/data/core/images/terrain/flat/dirt-dark-ne-se-s.png new file mode 100644 index 00000000000..634c817f7ec Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-ne-se-s.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-ne-se.png b/data/core/images/terrain/flat/dirt-dark-ne-se.png new file mode 100644 index 00000000000..737a354a82d Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-ne-se.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-ne.png b/data/core/images/terrain/flat/dirt-dark-ne.png new file mode 100644 index 00000000000..3a2d89d62c4 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-nw-n-ne.png b/data/core/images/terrain/flat/dirt-dark-nw-n-ne.png new file mode 100644 index 00000000000..543cb0905ea Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-nw-n-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-nw-n.png b/data/core/images/terrain/flat/dirt-dark-nw-n.png new file mode 100644 index 00000000000..a0e4c6ad9b4 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-nw-n.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-nw.png b/data/core/images/terrain/flat/dirt-dark-nw.png new file mode 100644 index 00000000000..3124fe5668e Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-s-sw-nw.png b/data/core/images/terrain/flat/dirt-dark-s-sw-nw.png new file mode 100644 index 00000000000..0267339b6eb Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-s-sw-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-s-sw.png b/data/core/images/terrain/flat/dirt-dark-s-sw.png new file mode 100644 index 00000000000..1c76914d7fc Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-s-sw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-s.png b/data/core/images/terrain/flat/dirt-dark-s.png new file mode 100644 index 00000000000..04cbfc5b83d Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-s.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-se-s-sw.png b/data/core/images/terrain/flat/dirt-dark-se-s-sw.png new file mode 100644 index 00000000000..d06510bd7d3 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-se-s-sw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-se-s.png b/data/core/images/terrain/flat/dirt-dark-se-s.png new file mode 100644 index 00000000000..38e343aa5c5 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-se-s.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-se.png b/data/core/images/terrain/flat/dirt-dark-se.png new file mode 100644 index 00000000000..fd20ceedaed Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-se.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-sw-nw-n.png b/data/core/images/terrain/flat/dirt-dark-sw-nw-n.png new file mode 100644 index 00000000000..af1a9116dee Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-sw-nw-n.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-sw-nw.png b/data/core/images/terrain/flat/dirt-dark-sw-nw.png new file mode 100644 index 00000000000..202aa8c7caf Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-sw-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark-sw.png b/data/core/images/terrain/flat/dirt-dark-sw.png new file mode 100644 index 00000000000..7fb89940480 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark-sw.png differ diff --git a/data/core/images/terrain/flat/dirt-dark.png b/data/core/images/terrain/flat/dirt-dark.png new file mode 100644 index 00000000000..9fde5b21c13 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark.png differ diff --git a/data/core/images/terrain/flat/dirt-dark2.png b/data/core/images/terrain/flat/dirt-dark2.png new file mode 100644 index 00000000000..ad71fbf0b64 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark2.png differ diff --git a/data/core/images/terrain/flat/dirt-dark3.png b/data/core/images/terrain/flat/dirt-dark3.png new file mode 100644 index 00000000000..eba633f781d Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark3.png differ diff --git a/data/core/images/terrain/flat/dirt-dark4.png b/data/core/images/terrain/flat/dirt-dark4.png new file mode 100644 index 00000000000..a92dae63de0 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark4.png differ diff --git a/data/core/images/terrain/flat/dirt-dark5.png b/data/core/images/terrain/flat/dirt-dark5.png new file mode 100644 index 00000000000..c4ced134c27 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark5.png differ diff --git a/data/core/images/terrain/flat/dirt-dark6.png b/data/core/images/terrain/flat/dirt-dark6.png new file mode 100644 index 00000000000..46d6c0355bb Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark6.png differ diff --git a/data/core/images/terrain/flat/dirt-dark7.png b/data/core/images/terrain/flat/dirt-dark7.png new file mode 100644 index 00000000000..43602e8ca77 Binary files /dev/null and b/data/core/images/terrain/flat/dirt-dark7.png differ diff --git a/data/core/images/terrain/flat/dirt-n-ne-se.png b/data/core/images/terrain/flat/dirt-n-ne-se.png index 709c422a925..f237206ddcb 100644 Binary files a/data/core/images/terrain/flat/dirt-n-ne-se.png and b/data/core/images/terrain/flat/dirt-n-ne-se.png differ diff --git a/data/core/images/terrain/flat/dirt-n-ne.png b/data/core/images/terrain/flat/dirt-n-ne.png index 5795816b47f..4afa6783324 100644 Binary files a/data/core/images/terrain/flat/dirt-n-ne.png and b/data/core/images/terrain/flat/dirt-n-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-n.png b/data/core/images/terrain/flat/dirt-n.png index 91e2b77146c..7d25d710f7c 100644 Binary files a/data/core/images/terrain/flat/dirt-n.png and b/data/core/images/terrain/flat/dirt-n.png differ diff --git a/data/core/images/terrain/flat/dirt-ne-se-s.png b/data/core/images/terrain/flat/dirt-ne-se-s.png index ab4766f7066..bfe32c06467 100644 Binary files a/data/core/images/terrain/flat/dirt-ne-se-s.png and b/data/core/images/terrain/flat/dirt-ne-se-s.png differ diff --git a/data/core/images/terrain/flat/dirt-ne-se.png b/data/core/images/terrain/flat/dirt-ne-se.png index 95ac7796d34..67ba3a35603 100644 Binary files a/data/core/images/terrain/flat/dirt-ne-se.png and b/data/core/images/terrain/flat/dirt-ne-se.png differ diff --git a/data/core/images/terrain/flat/dirt-ne.png b/data/core/images/terrain/flat/dirt-ne.png index e6b54f44097..7abf285c9cd 100644 Binary files a/data/core/images/terrain/flat/dirt-ne.png and b/data/core/images/terrain/flat/dirt-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-nw-n-ne.png b/data/core/images/terrain/flat/dirt-nw-n-ne.png index acee0507419..aab845c23b1 100644 Binary files a/data/core/images/terrain/flat/dirt-nw-n-ne.png and b/data/core/images/terrain/flat/dirt-nw-n-ne.png differ diff --git a/data/core/images/terrain/flat/dirt-nw-n.png b/data/core/images/terrain/flat/dirt-nw-n.png index edc1851ccd3..bc77f8c1cc4 100644 Binary files a/data/core/images/terrain/flat/dirt-nw-n.png and b/data/core/images/terrain/flat/dirt-nw-n.png differ diff --git a/data/core/images/terrain/flat/dirt-nw.png b/data/core/images/terrain/flat/dirt-nw.png index 143084d0d1b..3d783f02af7 100644 Binary files a/data/core/images/terrain/flat/dirt-nw.png and b/data/core/images/terrain/flat/dirt-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-s-sw-nw.png b/data/core/images/terrain/flat/dirt-s-sw-nw.png index a93f3aa0b11..8ebeaf79223 100644 Binary files a/data/core/images/terrain/flat/dirt-s-sw-nw.png and b/data/core/images/terrain/flat/dirt-s-sw-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-s-sw.png b/data/core/images/terrain/flat/dirt-s-sw.png index 35a1b12f94d..f983a1195bb 100644 Binary files a/data/core/images/terrain/flat/dirt-s-sw.png and b/data/core/images/terrain/flat/dirt-s-sw.png differ diff --git a/data/core/images/terrain/flat/dirt-s.png b/data/core/images/terrain/flat/dirt-s.png index a542b4ff20b..99ade06aec1 100644 Binary files a/data/core/images/terrain/flat/dirt-s.png and b/data/core/images/terrain/flat/dirt-s.png differ diff --git a/data/core/images/terrain/flat/dirt-se-s-sw.png b/data/core/images/terrain/flat/dirt-se-s-sw.png index 0120608d6e4..72f8e8c3fd8 100644 Binary files a/data/core/images/terrain/flat/dirt-se-s-sw.png and b/data/core/images/terrain/flat/dirt-se-s-sw.png differ diff --git a/data/core/images/terrain/flat/dirt-se-s.png b/data/core/images/terrain/flat/dirt-se-s.png index 9a2951aa4f5..aa7692f5d4c 100644 Binary files a/data/core/images/terrain/flat/dirt-se-s.png and b/data/core/images/terrain/flat/dirt-se-s.png differ diff --git a/data/core/images/terrain/flat/dirt-se.png b/data/core/images/terrain/flat/dirt-se.png index cf4a3bd77b0..65867260684 100644 Binary files a/data/core/images/terrain/flat/dirt-se.png and b/data/core/images/terrain/flat/dirt-se.png differ diff --git a/data/core/images/terrain/flat/dirt-sw-nw-n.png b/data/core/images/terrain/flat/dirt-sw-nw-n.png index 35f26cc6363..93ad1baa4b5 100644 Binary files a/data/core/images/terrain/flat/dirt-sw-nw-n.png and b/data/core/images/terrain/flat/dirt-sw-nw-n.png differ diff --git a/data/core/images/terrain/flat/dirt-sw-nw.png b/data/core/images/terrain/flat/dirt-sw-nw.png index d5a8a91a4e9..1fb8228fa42 100644 Binary files a/data/core/images/terrain/flat/dirt-sw-nw.png and b/data/core/images/terrain/flat/dirt-sw-nw.png differ diff --git a/data/core/images/terrain/flat/dirt-sw.png b/data/core/images/terrain/flat/dirt-sw.png index ae77ee592f8..6588e39fd57 100644 Binary files a/data/core/images/terrain/flat/dirt-sw.png and b/data/core/images/terrain/flat/dirt-sw.png differ diff --git a/data/core/images/terrain/flat/dirt.png b/data/core/images/terrain/flat/dirt.png index 70e0244e928..3791f6c2044 100644 Binary files a/data/core/images/terrain/flat/dirt.png and b/data/core/images/terrain/flat/dirt.png differ diff --git a/data/core/images/terrain/flat/dirt2.png b/data/core/images/terrain/flat/dirt2.png index dd79dc2dab1..5d899a5f263 100644 Binary files a/data/core/images/terrain/flat/dirt2.png and b/data/core/images/terrain/flat/dirt2.png differ diff --git a/data/core/images/terrain/flat/dirt3.png b/data/core/images/terrain/flat/dirt3.png index 70d9dda90f6..09607662079 100644 Binary files a/data/core/images/terrain/flat/dirt3.png and b/data/core/images/terrain/flat/dirt3.png differ diff --git a/data/core/images/terrain/flat/dirt4.png b/data/core/images/terrain/flat/dirt4.png index 9ed4aad927b..e47bfbd594e 100644 Binary files a/data/core/images/terrain/flat/dirt4.png and b/data/core/images/terrain/flat/dirt4.png differ diff --git a/data/core/images/terrain/flat/dirt5.png b/data/core/images/terrain/flat/dirt5.png index f22956aea22..341c7d40042 100644 Binary files a/data/core/images/terrain/flat/dirt5.png and b/data/core/images/terrain/flat/dirt5.png differ diff --git a/data/core/images/terrain/flat/dirt6.png b/data/core/images/terrain/flat/dirt6.png index 9cb2d22361d..17fd2b444c4 100644 Binary files a/data/core/images/terrain/flat/dirt6.png and b/data/core/images/terrain/flat/dirt6.png differ diff --git a/data/core/images/terrain/flat/dirt7.png b/data/core/images/terrain/flat/dirt7.png index c663dc99195..423d5231334 100644 Binary files a/data/core/images/terrain/flat/dirt7.png and b/data/core/images/terrain/flat/dirt7.png differ diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg index d54b221d69f..48d73b45774 100644 --- a/data/core/terrain-graphics.cfg +++ b/data/core/terrain-graphics.cfg @@ -255,6 +255,7 @@ {TERRAIN_BASE_RANDOM Gs flat/savanna} {TERRAIN_BASE_RANDOM Re,Ce,Ke flat/dirt} +{TERRAIN_BASE_RANDOM Rb flat/dirt-dark} {TERRAIN_BASE_RANDOM Rr flat/road} {TERRAIN_BASE_RANDOM Rp flat/stone-path} @@ -554,6 +555,9 @@ {TRANSITION_BASE_LF (!,Re) Re -379 transition3 flat/dirt} {TRANSITION_BASE_L Re (!,Re) -380 flat/dirt} +{TRANSITION_BASE_LF (!,Rb) Rb -384 transition3 flat/dirt-dark} +{TRANSITION_BASE_L Rb (!,Rb) -388 flat/dirt-dark} + {TRANSITION_BASE_LF (!,Chw,Khw,Khs,!,C*,K*) (Ai,W*) -480 non_submerged_part castle/castle-to-ice} {TRANSITION_BASE_LF Aa,Ha,Ms,Ai (W*,Ss) -490 non_submerged_part ice} {TRANSITION_BASE_LF Aa,Ha,Ms,Ai (W*,Ss) -505 submerged_part ice-to-water} diff --git a/data/core/terrain.cfg b/data/core/terrain.cfg index 1e373af73a8..72f6ff22032 100644 --- a/data/core/terrain.cfg +++ b/data/core/terrain.cfg @@ -906,6 +906,15 @@ editor_group=flat [/terrain_type] +[terrain_type] + symbol_image=flat/dirt-dark + id=dirt_dark + name= _ "Dirt" + string=Rb + aliasof=Gt + editor_group=flat +[/terrain_type] + [terrain_type] symbol_image=flat/dirt id=dirt @@ -918,7 +927,7 @@ [terrain_type] symbol_image=flat/desert-road id=road - name= _ "Road" + name= _ "Dirt" string=Rd aliasof=Gt editor_group=desert, flat @@ -927,7 +936,7 @@ [terrain_type] symbol_image=flat/road id=road - name= _ "Road" + name= _ "Cobbles" string=Rr aliasof=Gt editor_group=flat @@ -936,7 +945,7 @@ [terrain_type] symbol_image=flat/stone-path id=stone_path - name= _ "Road" + name= _ "Cobbles" string=Rp aliasof=Gt editor_group=flat