From 29822b549f6388523ec0535ccf29846a27d12ddb Mon Sep 17 00:00:00 2001
From: nonoesimposible72 <nonoesimposible72@gmail.com>
Date: Thu, 11 Feb 2021 23:21:24 -0700
Subject: [PATCH] change strings to aliases in heightmap.cfg for #18

---
 config/heightmap.cfg | 22 +++++++++++-----------
 config/lang_en.cfg   | 10 +++++++++-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/config/heightmap.cfg b/config/heightmap.cfg
index 40ba865c..ca4eaa06 100644
--- a/config/heightmap.cfg
+++ b/config/heightmap.cfg
@@ -41,7 +41,7 @@ hbrushverts = [
 
 newhbrush = [
    hbrushmax = (+ $hbrushmax 1)
-   do [ 
+   do [
         hbrush_@hbrushmax = [
             hbrushname = [@@@arg1]
             clearhbrush
@@ -50,34 +50,34 @@ newhbrush = [
    ]
 ]
 
-newhbrush "Circle 1-0" 0 0 [
+newhbrush (concat $uistr_heightmap_0 "1-0") 0 0 [
     "1"
 ]
-newhbrush "Circle 2-1" 1 1 [
+newhbrush (concat $uistr_heightmap_0 "2-1") 1 1 [
     "0 1 0"
     "1 2 1"
     "0 1 0"
 ]
-newhbrush "Circle 4-2-1" 2 2 [
+newhbrush (concat $uistr_heightmap_0 "4-2-1") 2 2 [
     "0 0 1 0 0"
     "0 1 2 1 0"
     "1 2 4 2 1"
     "0 1 2 1 0"
     "0 0 1 0 0"
 ]
-newhbrush "Square 3x3" 1 1 [
+newhbrush (concat $uistr_heightmap_1 "3x3") 1 1 [
     "1 1 1"
     "1 1 1"
     "1 1 1"
 ]
-newhbrush "Square 5x5" 2 2 [
+newhbrush (concat $uistr_heightmap_1 "5x5") 2 2 [
    "1 1 1 1 1"
    "1 1 1 1 1"
    "1 1 1 1 1"
    "1 1 1 1 1"
    "1 1 1 1 1"
 ]
-newhbrush "Square 7x7" 3 3 [
+newhbrush (concat $uistr_heightmap_1 "7x7") 3 3 [
     "1 1 1 1 1 1 1"
     "1 1 1 1 1 1 1"
     "1 1 1 1 1 1 1"
@@ -87,19 +87,19 @@ newhbrush "Square 7x7" 3 3 [
     "1 1 1 1 1 1 1"
 ]
 
-newhbrush "Smooth 3x3" 1 1 [
+newhbrush (concat $uistr_heightmap_2 "3x3") 1 1 [
     "0 0 0"
     "0 0 0"
     "0 0 0"
 ]
-newhbrush "Smooth 5x5" 2 2 [
+newhbrush (concat $uistr_heightmap_2 "5x5") 2 2 [
     "0 0 0 0 0"
     "0 0 0 0 0"
     "0 0 0 0 0"
     "0 0 0 0 0"
     "0 0 0 0 0"
 ]
-newhbrush "Smooth 7x7" 3 3 [
+newhbrush (concat $uistr_heightmap_2 "7x7") 3 3 [
     "0 0 0 0 0 0 0"
     "0 0 0 0 0 0 0"
     "0 0 0 0 0 0 0"
@@ -109,7 +109,7 @@ newhbrush "Smooth 7x7" 3 3 [
     "0 0 0 0 0 0 0"
 ]
 
-newhbrush "Noise 25x25" 12 12 [
+newhbrush (concat $uistr_heightmap_3 25x25) 12 12 [
     "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0"
     "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"
     "0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0 1 1 0 1 0"
diff --git a/config/lang_en.cfg b/config/lang_en.cfg
index 44b783a5..b95e5f38 100644
--- a/config/lang_en.cfg
+++ b/config/lang_en.cfg
@@ -4,6 +4,14 @@
 uistr_game_0 = "team"
 uistr_game_1 = "chat"
 
+////////////////////////////////////////////////////////////////////////////////////////
+//                                   heightmap.cfg                                    //
+////////////////////////////////////////////////////////////////////////////////////////
+uistr_heightmap_0 = "Circle"
+uistr_heightmap_1 = "Square"
+uistr_heightmap_2 = "Smooth"
+uistr_heightmap_3 = "Noise"
+
 ////////////////////////////////////////////////////////////////////////////////////////
 //                                    options.cfg                                     //
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -200,4 +208,4 @@ uistr_copymapcfg_1 = "does not exist!"
 //cmc_confirm (copy map config confirmation dialog)
 uistr_cmc_confirm_0 = "Copy map config:"
 uistr_cmc_confirm_1 = "Proceed"
-uistr_cmc_confirm_2 = "Cancel"
\ No newline at end of file
+uistr_cmc_confirm_2 = "Cancel"