Merge 2006-07-21T08:47:03Z!haskjold@pvv.org

data/terrain-graphics.cfg

@@ -417,31 +417,21 @@
 {TERRAIN_ADJACENT_CORNER_PROB  !NQqCK   N     NQqC     56,68 ruin1-concave 50}
 {TERRAIN_ADJACENT_CORNER_PROB  !NQqCK   N     NQqC     56,68 castle-concave 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      N     NQqC      54,72 ruinkeep3-inside 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      N     NQqC      54,72 ruinkeep2-inside 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      N     NQqC      54,72 ruinkeep1-inside 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      N     NQqC      54,72 ruinkeep1-inside 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      N     NQqC      54,72 keep-inside 100}
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     54,72 keep-of-N ruinkeep3-wall 25}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     54,72 keep-of-N ruinkeep2-wall 33}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     54,72 keep-of-N ruinkeep1-wall 50}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     54,72 keep-of-N ruinkeep1-wall 75}
 {TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-N keep-wall 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   N       54,72 ruinkeep3-wall-0 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   N       54,72 ruinkeep2-wall-0 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   N       54,72 ruinkeep1-wall-0 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   N       54,72 ruinkeep1-wall-0 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   N       52,72 keep-wall-0 100}
 
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      N      !NQqCK    54,72 ruinkeep3-wall-1 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      N      !NQqCK    54,72 ruinkeep2-wall-1 34}
-{TERRAIN_ADJACENT_CORNER_PROB  K      N      !NQqCK    54,72 ruinkeep1-wall-1 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      N      !NQqCK    54,72 ruinkeep1-wall-1 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      N      !NQqCK    56,76 keep-wall-1 100}
 
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      54,72 keep-of-N ruinkeep3-keep 34}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      54,72 keep-of-N ruinkeep2-keep 34}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      54,72 keep-of-N ruinkeep1-keep 50}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      54,72 keep-of-N ruinkeep1-keep 75}
 {TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-N keep-keep 100}
 
 
@@ -476,47 +466,37 @@
 {TERRAIN_ADJACENT_CORNER_PROB  !qQNCK   Q      qQNC      56,68 ruin1-concave 50}
 {TERRAIN_ADJACENT_CORNER_PROB  !qQNCK   Q      qQNC      56,68 castle-concave 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q     NQqC      54,72 sunken-ruinkeep3-inside 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q     NQqC      54,72 sunken-ruinkeep2-inside 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q     NQqC      54,72 sunken-ruinkeep1-inside 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      Q     NQqC      54,72 sunken-ruinkeep1-inside 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      Q     NQqC      54,72 sunkenkeep-inside 100}
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-Q sunken-ruinkeep3-wall 25}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-Q sunken-ruinkeep2-wall 33}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-Q sunken-ruinkeep1-wall 50}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-Q sunken-ruinkeep1-wall 75}
 {TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-Q sunkenkeep-wall 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   Q       52,72 sunken-ruinkeep3-wall-0 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   Q       52,72 sunken-ruinkeep2-wall-0 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   Q       52,72 sunken-ruinkeep1-wall-0 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   Q       52,72 sunken-ruinkeep1-wall-0 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   Q       52,72 sunkenkeep-wall-0 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q      !NQqCK    56,76 sunken-ruinkeep3-wall-1 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q      !NQqCK    56,76 sunken-ruinkeep2-wall-1 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      Q      !NQqCK    56,76 sunken-ruinkeep1-wall-1 50}
+{TERRAIN_ADJACENT_CORNER_PROB  K      Q      !NQqCK    56,76 sunken-ruinkeep1-wall-1 75}
 {TERRAIN_ADJACENT_CORNER_PROB  K      Q      !NQqCK    56,76 sunkenkeep-wall-1 100}
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-Q sunken-ruinkeep3-keep 25}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-Q sunken-ruinkeep2-keep 33}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-Q sunken-ruinkeep1-keep 50}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-Q sunken-ruinkeep1-keep 75}
 {TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-Q sunkenkeep-keep 100}
 
 # swamp ruined castle
 #{DISABLE_TRANSITIONS q}
 
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin5-convex 17}
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin4-convex 20}
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin3-convex 25}
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin2-convex 33}
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin1-convex 50}
-{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 sunken-ruin-convex 100}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin5-convex 17}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin4-convex 20}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin3-convex 25}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin2-convex 33}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin1-convex 50}
+{TERRAIN_ADJACENT_CORNER_PROB  q      wcs   wcs     52,76 ruin-convex 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin5-concave 17}
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin4-concave 20}
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin3-concave 25}
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin2-concave 33}
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin1-concave 50}
-{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 sunken-ruin-concave 100}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin5-concave 17}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin4-concave 20}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin3-concave 25}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin2-concave 33}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin1-concave 50}
+{TERRAIN_ADJACENT_CORNER_PROB  wcs   q      qQNC      56,68 ruin-concave 100}
 
 
 {TERRAIN_ADJACENT_CORNER_PROB  q      !qQNCK   !qQNCK     52,76 ruin5-convex 17}
@@ -533,30 +513,20 @@
 {TERRAIN_ADJACENT_CORNER_PROB  !qQNCK   q      qQNC      56,68 ruin1-concave 50}
 {TERRAIN_ADJACENT_CORNER_PROB  !qQNCK   q      qQNC      56,68 castle-concave 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 sunken-ruinkeep3-inside 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 sunken-ruinkeep2-inside 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 sunken-ruinkeep1-inside 50}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 sunkenkeep-inside 100}
+{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 ruinkeep1-inside 75}
+{TERRAIN_ADJACENT_CORNER_PROB  K      q     NQqC      54,72 keep-inside 100}
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q sunken-ruinkeep3-wall 25}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q sunken-ruinkeep2-wall 33}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q sunken-ruinkeep1-wall 50}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q sunkenkeep-wall 100}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q ruinkeep1-wall 75}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K     !NQqCK   !NQqCK     52,76 keep-of-q keep-wall 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 sunken-ruinkeep3-wall-0 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 sunken-ruinkeep2-wall-0 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 sunken-ruinkeep1-wall-0 50}
-{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 sunkenkeep-wall-0 100}
+{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 ruinkeep1-wall-0 75}
+{TERRAIN_ADJACENT_CORNER_PROB  K      !NQqCK   q       52,72 keep-wall-0 100}
 
-{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 sunken-ruinkeep3-wall-1 25}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 sunken-ruinkeep2-wall-1 33}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 sunken-ruinkeep1-wall-1 50}
-{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 sunkenkeep-wall-1 100}
+{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 ruinkeep1-wall-1 75}
+{TERRAIN_ADJACENT_CORNER_PROB  K      q      !NQqCK    56,76 keep-wall-1 100}
 
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q sunken-ruinkeep3-keep 25}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q sunken-ruinkeep2-keep 33}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q sunken-ruinkeep1-keep 50}
-{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q sunkenkeep-keep 100}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q ruinkeep1-keep 75}
+{TERRAIN_ADJACENT_CORNER_FLAG1_PROB  K      K      !K      56,76 keep-of-q keep-keep 100}
 
 # Encampments
 {DISABLE_TRANSITIONS n}