removal of more obsolete terrain leftovers.

data/core/terrain-graphics.cfg

@@ -654,9 +654,7 @@
 {TRANSITION_COMPLETE_L     (Ms,Ha)          (!,Ha,Qx*,Mm,Ms,Md)         -172               hills/snow}
 
 {TRANSITION_COMPLETE_L     (Mm,Hh)          (!,Hh,W*,S*)                -180               hills/regular}
-#{TRANSITION_COMPLETE_LF    (Mm,Hh)          (W*,S*)                     -181  transition2  hills/regular}
 {TRANSITION_COMPLETE_L     (Hhd)            (!,Hhd,W*,S*)               -183               hills/dry}
-#{TRANSITION_COMPLETE_LF    (Hhd)            (W*,S*)                     -184  transition2  hills/dry}
 
 {TRANSITION_COMPLETE_L     Uh               (!,Uh,W*,Ai)                -200               cave/hills}
 
@@ -671,7 +669,6 @@
 {TRANSITION_COMPLETE_LB     (Ss,Chs)         (!,S*,W*,H*,M*,A*)         -230    ANIMATION_01    swamp/water-to-land}
 
 
-
 # Crazy Test Terrains
 
 #{TRANSITION_COMPLETE_LF    Jm              Jb,Jy                               -240     inside     test/m}  # inside
@@ -725,15 +722,10 @@
 {TRANSITION_COMPLETE_L     Ds               R*                                 -510                 sand/beach}
 {TRANSITION_COMPLETE_L     Hd               R*                                 -510                 hills/desert}
 
-# To test the new beach macro, uncomment this and then comment out the other
-# ones underneath it...
+# Special sand to water transitions
 {NEW:BEACH                 D*,Hd               W*                                                      sand/shore}
 
-# Special sand to water transitions
-#{TRANSITION_COMPLETE_LF       D*,Hd              (W*,Ss)                    -490   double           sand/sand-out}
-#{TRANSITION_COMPLETE_LF       (W*,Ss)            (Dd,Ds,Hd)                 -491   double           sand/sand-in}
-#{TRANSITION_COMPLETE_L        (W*,Ss)            (Dd,Ds,Hd)                 -492                    sand/sand-in}
-#{TRANSITION_COMPLETE_L        D*,Hd              (W*,Ss)                    -493                    sand/sand-out}
+
 {TRANSITION_COMPLETE_L        Hd                 (!,Hd,Qx*,W*,Ss)           -510                    hills/desert}
 
 # A rule for corner-based beach waves...
@@ -774,23 +766,15 @@
 
 
 
-
 {TRANSITION_COMPLETE_LF    Aa,Ha,Ms,Ai                   (W*,S*,D*)          -485  non_submerged  frozen/ice}
 {TRANSITION_COMPLETE_LF    Aa,Ha,Ms,Ai                   (W*,S*)             -505  submerged      frozen/ice-to-water}
 
 # we just draw this again (invisible below the base layer) to set the transition flags
 {TRANSITION_COMPLETE_L     Aa,Ha,Ms,Ai                        (W*,Ss)     -1001                     frozen/ice-to-water}
 
-#{TRANSITION_COMPLETE_LF    (!,Chw,Khw,Khs,!,C*,K*)          W*            -510  submerged      castle/castle-to-water}
-
-# The same transition is repeated here because the non-submerged parts are different, so multiple lines are needed to make the submerged part line up
-{NEW:BEACH                  (R*,G*,U*,M*,H*,Xu*,Ql*,!,Chw,Khw,Khs,!,C*,K*)               W*                                                      flat/shore}
-#{TRANSITION_COMPLETE_LF    (Mm,Hh)                          W*            -511   submerged     flat/bank-to-water}
-#{TRANSITION_COMPLETE_LF    (Md,Hhd,Mv)                      W*            -511   submerged     flat/bank-to-water}
-#{TRANSITION_COMPLETE_LF    (R*,G*)                          W*            -511   submerged     flat/bank-to-water}
-#{TRANSITION_COMPLETE_LF    (R*,G*,Mm,Md,Mv,H*)              W*            -511   deeper-submerged     flat/bank-out}
-#{TRANSITION_COMPLETE_LF    (U*,Xu*,Ql*)                     W*            -512   submerged     cave/bank-to-water}
 
+# The dark, submerged water-to-land transition used for about everything but sand
+{NEW:BEACH                  (R*,G*,U*,M*,H*,Xu*,Ql*,!,Chw,Khw,Khs,!,C*,K*)               W*         flat/shore}
 
 
 # Water Transitions below everything else