moved swamp terrain into subfolder

data/terrain-graphics.cfg

@@ -359,7 +359,7 @@
 {TERRAIN_BASE Vhha      snow-hills}
 {TERRAIN_BASE Vht       flat/savanna}
 {TERRAIN_BASE Vwm       ater/coast}
-{TERRAIN_BASE Vs        swampwater}
+{TERRAIN_BASE Vs        swamp/water}
 #{TERRAIN_BASE b mountains}
 
 
@@ -478,13 +478,13 @@
 
 
 #8% 8% 8% 8% 23% 23% 23%
-{TERRAIN_BASE_PROB  Ss                swampwater-flowers1      8}
-{TERRAIN_BASE_PROB  Ss                swampwater-flowers2      9}
-{TERRAIN_BASE_PROB  (Ss,Bss*)         swampwater-plant1        10}
-{TERRAIN_BASE_PROB  (Ss,Bss*)         swampwater-plant2        11}
-{TERRAIN_BASE_PROB  (Ss,Bss*)         swampwater2              33}
-{TERRAIN_BASE_PROB  (Ss,Bss*)         swampwater3              50}
-{TERRAIN_BASE       (Ss,Bss*)         swampwater}
+{TERRAIN_BASE_PROB  Ss                swamp/water-flowers1      8}
+{TERRAIN_BASE_PROB  Ss                swamp/water-flowers2      9}
+{TERRAIN_BASE_PROB  (Ss,Bss*)         swamp/water-plant1        10}
+{TERRAIN_BASE_PROB  (Ss,Bss*)         swamp/water-plant2        11}
+{TERRAIN_BASE_PROB  (Ss,Bss*)         swamp/water2              33}
+{TERRAIN_BASE_PROB  (Ss,Bss*)         swamp/water3              50}
+{TERRAIN_BASE       (Ss,Bss*)         swamp/water}
 
 #10% 10% 10% 10% 25% 35%
 {TERRAIN_BASE_PROB  Ai                ice2                     10}
@@ -572,9 +572,9 @@
 {TERRAIN_BASE        Chr       castle/cobbles}
 {TERRAIN_BASE        Chw       castle/sunken-ruin}
 #30% 30% 40%
-{TERRAIN_BASE_PROB   Chs       swampwater2            30}
-{TERRAIN_BASE_PROB   Chs       swampwater3            43}
-{TERRAIN_BASE        Chs       swampwater}
+{TERRAIN_BASE_PROB   Chs       swamp/water2            30}
+{TERRAIN_BASE_PROB   Chs       swamp/water3            43}
+{TERRAIN_BASE        Chs       swamp/water}
 
 #{TERRAIN_BASE O orccastle}
 
@@ -910,7 +910,7 @@
 {TERRAIN_ADJACENT          -240    (Fa,Aa,Vha,Vea)  (!,Fa,Aa,Vha,Vea,Qxu)                snow}
 {TERRAIN_ADJACENT          -260    (Ft,Gs,Vht)      (W*,B*,Vwm)                          flat/savanna-to-water}
 
-{TERRAIN_ADJACENT          -250    (Ss,Vs,Chs,Bss*)      (!,Ss,Vss,Chs,H*,M*,Vhh*,Vhm,Xm,Bss*)     swampwater}
+{TERRAIN_ADJACENT          -250    (Ss,Vs,Chs,Bss*)      (!,Ss,Vss,Chs,H*,M*,Vhh*,Vhm,Xm,Bss*)     swamp/water}
 
 
 # These two work in conjunction with the mountain and hill transitions to create
@@ -944,7 +944,7 @@
 {TERRAIN_ADJACENT          -530    Wwf              (!,Wwf)                              water/ford}
 {TERRAIN_ADJACENT          -540    (Wo,Bwo*)        (!,Wo,Bwo*)                          water/ocean}
 {TERRAIN_ADJACENT_CUSTOM   -550    Chw              (Ch,Chr)             sunken-ruin     transition2}
-{TERRAIN_ADJACENT_CUSTOM   -550    Chs              (Ch,Chr)             swampwater      transition2}
+{TERRAIN_ADJACENT_CUSTOM   -550    Chs              (Ch,Chr)             swamp/water      transition2}
 {TERRAIN_ADJACENT          -560    Chw              (!,Chw,Chr)                          water/coast}
 {TERRAIN_ADJACENT          -570    (!,Chr,Chw)      Chr                                  flat/grass}
 

data/terrain.cfg

@@ -550,7 +550,7 @@ aliasof=Gg
 #
 
 [terrain]
-symbol_image=swampwater-tile
+symbol_image=swamp/water-tile
 id=swamp_water
 name= _ "Swamp"
 string=Ss