From 45b85e7e6f3cfc1d3c5405506b595cb35b5c942c Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Thu, 15 Nov 2018 22:08:40 +0100
Subject: ID as strings.

---
 armor/global.m4.conf        |  6 +++---
 tile/global.m4.conf         | 10 +++++-----
 tile/pattern/global.m4.conf |  2 +-
 weapon/global.m4.conf       |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/armor/global.m4.conf b/armor/global.m4.conf
index c327e1b..dfdde38 100644
--- a/armor/global.m4.conf
+++ b/armor/global.m4.conf
@@ -7,10 +7,10 @@ m4_define(`__ARMOR_CHOOSE_STYLE',
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__ARMOR_ERLANG_STYLE',`from_id (`$1') ->
+m4_define(`__ARMOR_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
    #armor
    {
-      id = $1,
+      id = <<"$1">>,
       name = <<"$2">>,
       omnimods = __OMNIMODS($3, $4, $5, $6)
    };
@@ -22,7 +22,7 @@ m4_dnl
 m4_dnl
 m4_define(`__ARMOR_JSON_STYLE',`   {
       "msg": "add_armor",
-      "id": $1,
+      "id": "$1",
       "nam": "$2",
       "omni": __OMNIMODS($3, $4, $5, $6)
    },
diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index 619de8b..eaa0250 100644
--- a/tile/global.m4.conf
+++ b/tile/global.m4.conf
@@ -13,14 +13,14 @@ m4_define(`__TILE_CATEGORY',`m4_define(`__TILE_CATEGORY_NAME', `$1')m4_define(`_
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') ->
+m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (<<"`$1'">>) ->
    #tile
    {
-      id = $1,
+      id = <<"$1">>,
       name = <<"[__TILE_CATEGORY_NAME] $2">>,
       cost = $3,
       omnimods = __OMNIMODS($4, $5, $6, $7),
-      family = __TILE_CATEGORY_FAMILY,
+      family = <<"__TILE_CATEGORY_FAMILY">>,
       depth = __TILE_CATEGORY_DEPTH
    };')m4_dnl
 m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',
@@ -30,11 +30,11 @@ m4_dnl
 m4_dnl
 m4_define(`__TILE_CLASS_JSON_STYLE',`   {
       "msg": "add_tile",
-      "id": $1,
+      "id": "$1",
       "nam": "[__TILE_CATEGORY_NAME] $2",
       "ct": $3,
       "omni": __OMNIMODS($4, $5, $6, $7),
-      "fa": __TILE_CATEGORY_FAMILY,
+      "fa": "__TILE_CATEGORY_FAMILY",
       "de": __TILE_CATEGORY_DEPTH
    },')m4_dnl
 m4_define(`__TILE_CLASS_USE_JSON_STYLE',
diff --git a/tile/pattern/global.m4.conf b/tile/pattern/global.m4.conf
index 97cafd1..5cfdf54 100644
--- a/tile/pattern/global.m4.conf
+++ b/tile/pattern/global.m4.conf
@@ -11,7 +11,7 @@ m4_dnl
 m4_dnl
 m4_define(`__TILE_PATTERN_JSON_STYLE',`   {
       "msg": "add_tile_pattern",
-      "v": `$10',
+      "v": "`$10'",
       "w" : `$11',
       "p": "`$1'`$2'`$3'`$4'`$6'`$7'`$8'`$9'"
    },')m4_dnl
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index 2bd8bcc..d70589c 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -7,10 +7,10 @@ m4_define(`__WEAPON_CHOOSE_STYLE',
 m4_dnl
 m4_dnl
 m4_dnl
-m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') ->
+m4_define(`__WEAPON_ERLANG_STYLE',`from_id (<<"`$1'">>) ->
    #weapon
    {
-      id = $1,
+      id = <<"$1">>,
       name = <<"$2">>,
       range_min = $3,
       range_max = $4,
@@ -24,7 +24,7 @@ m4_dnl
 m4_dnl
 m4_define(`__WEAPON_JSON_STYLE',`   {
       "msg": "add_weapon",
-      "id": $1,
+      "id": "$1",
       "nam": "$2",
       "rmi": $3,
       "rma": $4,
-- 
cgit v1.2.3-70-g09d2