diff --git a/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg b/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg index 2f2fa49c39a..3e0c6079cc2 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg @@ -18,29 +18,17 @@ {TERRAIN_BASE % dark_tile3} # the sand crater terrain - [terrain] - symbol_image=desert_crater - id=Crater - name= _ "Crater" - char=x - aliasof=d +char=x +string=Dc [/terrain] -{TERRAIN_BASE x desert_crater} - # the sand rubble terrain - [terrain] - symbol_image=new_sand_rubble - id=Rubble - name= _ "Rubble" - char=z - aliasof=h +char=z +string=Dr [/terrain] -{TERRAIN_BASE z new_sand_rubble} - # the oasis terrain [terrain] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg b/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg index 5c56e1b3369..6a35262c890 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/terrain_graphics.cfg @@ -98,7 +98,5 @@ {TERRAIN_ADJACENT_CUSTOM -400 y !yW lava custom_lava} -{TERRAIN_ADJACENT_PREC -150 z !zCNhKx desert} -{TERRAIN_ADJACENT_PREC -150 x !xCNhKz desert} {TERRAIN_ADJACENT_PREC -182 ^ !^&ur cave-floor1} {TERRAIN_ADJACENT_PREC -150 % !%ur cave-floor1} diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics.cfg index 28ba8e0f22b..64d45ebdfb6 100644 --- a/data/terrain-graphics.cfg +++ b/data/terrain-graphics.cfg @@ -411,6 +411,8 @@ {TERRAIN_BASE Rd desert-road} +{TERRAIN_BASE Dc desert_crater} + #2% 2% 2% 24% 24% 3% 3% 3% 3% 36% {TERRAIN_BASE_PROB Dd desert-plant 2} {TERRAIN_BASE_PROB Dd desert-plant2 2} @@ -423,6 +425,8 @@ {TERRAIN_BASE_PROB Dd desert7 7} {TERRAIN_BASE Dd desert} +{TERRAIN_BASE Dr sand_rubble} + #33% 33% 33% {TERRAIN_BASE_PROB Hd desert-hills2 33} {TERRAIN_BASE_PROB Hd desert-hills3 50} @@ -914,13 +918,13 @@ {TERRAIN_ADJACENT -270 (Ff,Gg,Veg,Vhg,Fet,Qxu) (!,Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Xm,Hh,Vha,W*,Bww*,Vwm,Vss,Ss) grassland} {TERRAIN_ADJACENT -319 (Ff,Gg,Veg,Vhg,Fet,Qxu,Mm,Vhm,Hh,Vhh,Xm) (W*,Bww*,Vwm) grassland-to-water} -{TERRAIN_ADJACENT -280 (Gs,Ft,Vht) (!,Gs,Ft,Vht,Qxu) savanna} -{TERRAIN_ADJACENT -290 Rr (!,Rr) road} -{TERRAIN_ADJACENT -259 Re (!,Re) dirt} -{TERRAIN_ADJACENT -310 Rd (!,Rd) desert-road} -{TERRAIN_ADJACENT -320 (Dd,Do,Vda) (!,Dd,Do,Vda) desert-oasis} -{TERRAIN_ADJACENT -330 (Dd,Do,Vd*) (!,Dd,Do,Vd*) desert} -{TERRAIN_ADJACENT -340 Ds (!,Ds) sand} +{TERRAIN_ADJACENT -280 (Gs,Ft,Vht) (!,Gs,Ft,Vht,Qxu) savanna} +{TERRAIN_ADJACENT -290 Rr (!,Rr) road} +{TERRAIN_ADJACENT -259 Re (!,Re) dirt} +{TERRAIN_ADJACENT -310 Rd (!,Rd) desert-road} +{TERRAIN_ADJACENT -320 (Dd,Do,Vda) (!,Dd,Do,Vda) desert-oasis} +{TERRAIN_ADJACENT -330 (Dc,Dd,Dr,Do,Vd*) (!,Dc,Dd,Dr,Do,Vd*) desert} +{TERRAIN_ADJACENT -340 Ds (!,Ds) sand} #{SET_ADJACENT_FLAG (Chs,Chr) _K Ai transition2} diff --git a/data/terrain.cfg b/data/terrain.cfg index 50a7b61bfd4..4410c5c0cfb 100644 --- a/data/terrain.cfg +++ b/data/terrain.cfg @@ -257,6 +257,15 @@ recruit_onto=true # Desert # +#UtbS desert crater +[terrain] +symbol_image=desert_crater +id=crater +name= _ "Crater" +string=Dc +aliasof=Ds +[/terrain] + #New desert [terrain] symbol_image=desert @@ -267,6 +276,15 @@ char=I aliasof=Ds [/terrain] +#UtbS sand rubble +[terrain] +symbol_image=sand_rubble +id=sand_rubble +name= _ "Rubble" +string=Dr +aliasof=Hh +[/terrain] + #Old desert [terrain] symbol_image=sand diff --git a/data/campaigns/Under_the_Burning_Suns/images/terrain/desert_crater.png b/images/terrain/desert_crater.png similarity index 100% rename from data/campaigns/Under_the_Burning_Suns/images/terrain/desert_crater.png rename to images/terrain/desert_crater.png diff --git a/data/campaigns/Under_the_Burning_Suns/images/terrain/new_sand_rubble.png b/images/terrain/sand_rubble.png similarity index 100% rename from data/campaigns/Under_the_Burning_Suns/images/terrain/new_sand_rubble.png rename to images/terrain/sand_rubble.png