From da35f632796d0e5494aa358161acc0b89c505fde Mon Sep 17 00:00:00 2001 From: s0600204 Date: Thu, 21 May 2020 04:34:13 +0000 Subject: [PATCH] Add help comments to WallPiece component schema Also resolves whitespace issue in WallSet component breaking structree and rmgen wallbuilder when wall curve pieces are listed separated with newlines (& tabs) instead of single spaces. Requested by: Nescio Refs: #2944, D900 This was SVN commit r23684. --- binaries/data/mods/public/globalscripts/Templates.js | 2 +- .../data/mods/public/simulation/components/WallPiece.js | 8 ++++---- .../data/mods/public/simulation/components/WallSet.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/binaries/data/mods/public/globalscripts/Templates.js b/binaries/data/mods/public/globalscripts/Templates.js index 02c7984fd0..0e5e5ef35f 100644 --- a/binaries/data/mods/public/globalscripts/Templates.js +++ b/binaries/data/mods/public/globalscripts/Templates.js @@ -467,7 +467,7 @@ function GetTemplateDataHelper(template, player, auraTemplates, modifiers = {}) if (template.WallSet.Templates.WallEnd) ret.wallSet.templates.end = template.WallSet.Templates.WallEnd; if (template.WallSet.Templates.WallCurves) - ret.wallSet.templates.curves = template.WallSet.Templates.WallCurves.split(" "); + ret.wallSet.templates.curves = template.WallSet.Templates.WallCurves.split(/\s+/); } if (template.WallPiece) diff --git a/binaries/data/mods/public/simulation/components/WallPiece.js b/binaries/data/mods/public/simulation/components/WallPiece.js index 6d26ac382a..b5754c3bbb 100644 --- a/binaries/data/mods/public/simulation/components/WallPiece.js +++ b/binaries/data/mods/public/simulation/components/WallPiece.js @@ -4,21 +4,21 @@ WallPiece.prototype.Schema = "" + "" + "" + - "" + + "" + "" + "" + "" + - "" + + "" + "" + "" + "" + "" + - "" + + "" + "" + "" + "" + "" + - "" + + "" + "" + "" + ""; diff --git a/binaries/data/mods/public/simulation/components/WallSet.js b/binaries/data/mods/public/simulation/components/WallSet.js index f112ea6897..63035e58a6 100644 --- a/binaries/data/mods/public/simulation/components/WallSet.js +++ b/binaries/data/mods/public/simulation/components/WallSet.js @@ -22,7 +22,7 @@ WallSet.prototype.Schema = "" + "" + "" + - "" + + "" + "" + "" + "" +