Revert "Make mushrooms hide base terrain (#4185) - graphics change only"

This reverts commit 17ba285. If this is applied, it should not be a in a stable branch.
wesnoth · Aug 16, 2019 · fb4fd54 · fb4fd54 · CelticMinstrel · Aug 17, 2019
1 parent cb08f4e
commit fb4fd54
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 5 deletions.
diff --git a/data/core/images/terrain/forest/mushroom-base-n-ne.png b/data/core/images/terrain/forest/mushroom-base-n-ne.png
diff --git a/data/core/images/terrain/forest/mushroom-base-n.png b/data/core/images/terrain/forest/mushroom-base-n.png
diff --git a/data/core/images/terrain/forest/mushroom-base-ne-se.png b/data/core/images/terrain/forest/mushroom-base-ne-se.png
diff --git a/data/core/images/terrain/forest/mushroom-base-ne.png b/data/core/images/terrain/forest/mushroom-base-ne.png
diff --git a/data/core/images/terrain/forest/mushroom-base-nw.png b/data/core/images/terrain/forest/mushroom-base-nw.png
diff --git a/data/core/images/terrain/forest/mushroom-base-s-sw.png b/data/core/images/terrain/forest/mushroom-base-s-sw.png
diff --git a/data/core/images/terrain/forest/mushroom-base-s.png b/data/core/images/terrain/forest/mushroom-base-s.png
diff --git a/data/core/images/terrain/forest/mushroom-base-se.png b/data/core/images/terrain/forest/mushroom-base-se.png
diff --git a/data/core/images/terrain/forest/mushroom-base-sw-nw.png b/data/core/images/terrain/forest/mushroom-base-sw-nw.png
diff --git a/data/core/images/terrain/forest/mushroom-base-sw.png b/data/core/images/terrain/forest/mushroom-base-sw.png
diff --git a/data/core/images/terrain/forest/mushroom-base.png b/data/core/images/terrain/forest/mushroom-base.png
diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
@@ -439,8 +439,6 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 #
 
 # Flat base terrains
-# we want this base image to show up no matter what the underlying terrain is, because mushroom terrain is just odd for historical reasons
-{NEW:BASE                (*^Uf*)                                forest/mushroom-base LAYER=-319}
 
 # The first grass tile of each kind is the most standard and generic one, thus it appears more frequently to space out the rest
 {NEW:BASE_P              Gg                                     20                 grass/green}
@@ -843,9 +841,6 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION            (Ms,Ha)          (W*,S*)                     -171               hills/snow-to-water}
 {NEW:TRANSITION            (Ms,Ha)          (!,Ha,Qx*,Mm,Ms,Md)         -172               hills/snow}
 
-{NEW:TRANSITION            (*^Uf*)          (!,M*,*^Uf*)                -184     forest/mushroom-base}
-{NEW:DISABLE_TRANSITION    (R*,G*,H*,U*,A*)	    (*^Uf*)	}
-{NEW:DISABLE_TRANSITION    (R*,G*,H*,U*,A*)	    (*^Uf*)	FLAG=inside}
 {NEW:TRANSITION            (Mm,Hh)          (!,M*,Hh,Ai,W*,S*)          -180               hills/regular}
 {NEW:TRANSITION            (Md,Hhd)         (!,M*,Hhd,Ai,W*,S*)         -183               hills/dry}
 {NEW:TRANSITION            Hd               (!,Hd,Qx*,W*)               -184               hills/desert}