Dev

.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+files/
+*.json

app.js

@@ -111,7 +111,7 @@ const file = new statik.Server('./site'),
                     pos += data[i].length; 
                 } ;
 
-                if (postURL.pathname === "/format_and_store_army" || postURL.pathname === "/getFormattedArmy") {
+                if (postURL.pathname === "/getFormattedArmy") {
                     try {
                         let zip = new AdmZip(buf),
                             zipEntries = zip.getEntries();
@@ -121,31 +121,6 @@ const file = new statik.Server('./site'),
                                 fs.writeFile("output.json", JSON.stringify(result.roster.forces, null, 4), () =>{})
                                 //parseRos(result.roster.forces);
                                 let armyDataObj = Roster.parse(result.roster.forces);
-
-                                if (postURL.pathname === "/format_and_store_army") {
-                                    armyDataObj.uiHeight = postURL.searchParams.get('uiHeight');
-                                    armyDataObj.uiWidth = postURL.searchParams.get('uiWidth');
-                                    armyDataObj.baseScript = buildScript(postURL.searchParams.get("modules").split(","));
-
-                                    fs.writeFile(`${PATH_PREFIX}${uuid}.json`, 
-                                                JSON.stringify(armyDataObj, replacer)
-                                                    .replace(" & ", " and "), 
-                                                (err) => {
-                                                    let content,status;
-
-                                                    if (!err) {
-                                                        content = `{ "id": "${uuid}" }`;
-                                                        status = 200;
-                                                    }
-                                                    else {
-                                                        content = `{ "err": "${ERRORS.fileWrite}" }`;
-                                                        status = 500
-                                                    }
-
-                                                    sendHTTPResponse(res, content, status);
-                                                });
-                                }
-                                else
                                     sendHTTPResponse(res, JSON.stringify(armyDataObj, replacer), 200);
                             });
                     }
@@ -175,32 +150,7 @@ const file = new statik.Server('./site'),
                                             postURL.searchParams.get('decorativeNames'),
                                             buildScript(postURL.searchParams.get("modules").split(",")));
 
-                        /* if (postURL.pathname === "/format_and_store_army") {
-                            armyDataObj.uiHeight = postURL.searchParams.get('uiHeight');
-                            armyDataObj.uiWidth = postURL.searchParams.get('uiWidth');
-                            armyDataObj.baseScript = buildScript(postURL.searchParams.get("modules").split(","))
 
-                            fs.writeFile(`${PATH_PREFIX}${uuid}.json`, 
-                                        JSON.stringify(armyDataObj, replacer)
-                                            .replace(" & ", " and "), 
-                                        (err) => {
-                                            let content,status;
-
-                                            if (!err) {
-                                                content = `{ "id": "${uuid}" }`;
-                                                status = 200;
-                                            }
-                                            else {
-                                                content = `{ "err": "${ERRORS.fileWrite}" }`;
-                                                status = 500
-                                            }
-
-                                            sendHTTPResponse(res, content, status);
-                                        });
-                        }
-
-                        else
-                            sendHTTPResponse(res, JSON.stringify(armyDataObj, replacer).replace(" & ", " and "), 200); */
                     }
                     catch (err) {
                         sendHTTPResponse(res, `{ "err": "${ERRORS.unknown}" }`, 500);
@@ -282,8 +232,7 @@ setInterval(() => {
         }
     });
 
-    //let stats = fs.statSync("/dir/file.txt");
-    //let mtime = stats.mtime;
+
 }, ONE_MINUTE);
 
 
@@ -368,12 +317,6 @@ function formatAndStoreXML(id, order, armyData, uiHeight, uiWidth, decorativeNam
             .ele("VerticalLayout", { class: "unitContainer", childForceExpandHeight: "false", preferredHeight: unitData.height, spacing: "20" })
                 .import(unitData.fragment)
 
-        /*  <VerticalLayout class="transparent" childForceExpandHeight="false">
-                <Text class="unitName">${unitName}</Text>
-                <VerticalLayout class="unitContainer" childForceExpandHeight="false" preferredHeight="${height}" spacing="20">
-                    ${unitData}
-                </VerticalLayout>
-            </VerticalLayout> */
     }
 
     storeFormattedXML(id, xml.end({ prettyPrint: false }).slice(27, -7), totalHeight, armyData, uiHeight, uiWidth, baseScript);
@@ -392,16 +335,7 @@ function getUnitXMLData(unit) {
 
     return { fragment, height: maxHeight };
 
-    /*  <HorizontalLayout class="groupingContainer">
-            <VerticalLayout preferredWidth="500" childForceExpandHeight="false" class="modelContainer" id="${unitID}|${modelID}" preferredHeight="${height}">
-                <Text class="modelDataName">${numberString}${modelName}</Text>
-                ${weapons}
-                ${abilities}
-            </VerticalLayout> 
-            .
-            .
-            .
-        </HorizontalLayout>*/
+
 }
 
 function getModelXMLData(model, modelID, unit) {
@@ -435,19 +369,7 @@ function getModelXMLData(model, modelID, unit) {
     container.att("preferredHeight", height);
 
     return { fragment, height };
-    /*  <VerticalLayout preferredWidth="500" childForceExpandHeight="false" class="modelContainer" id="${unitID}|${modelID}" preferredHeight="${height}">
-            <Text class="modelDataName">${numberString}${modelName}</Text>
-            <VerticalLayout childForceExpandHeight="false" childForceExpandWidth="false">
-                <Text height="15"><!-- spacer --></Text>
-                <Text class="modelDataTitle">${weapons?}</Text>
-                <Text class="modelData" preferredHeight="${height}">${data}</Text>
-            </VerticalLayout>
-            <VerticalLayout childForceExpandHeight="false" childForceExpandWidth="false">
-                <Text height="15"><!-- spacer --></Text>
-                <Text class="modelDataTitle">${abilities?}</Text>
-                <Text class="modelData" preferredHeight="${height}">${data}</Text>
-            </VerticalLayout>
-        </VerticalLayout> */
+
 }
 
 function getModelSectionData (name, dataList) {
@@ -462,12 +384,7 @@ function getModelSectionData (name, dataList) {
 
     return { fragment, height };
 
-    /*  <VerticalLayout childForceExpandHeight="false" childForceExpandWidth="false">
-            <Text height="15"><!-- spacer --></Text>
-            <Text class="modelDataTitle">${title}</Text>
-            <Text class="modelData" preferredHeight="${height}">${data}</Text>
-        </VerticalLayout>
-    */
+
 }
 
 function combineAndSortWeapons(model, characteristicProfiles) {

bin/Roster.js

@@ -16,12 +16,18 @@ module.exports.parse = (data) => {
 
             return false;
         });
-    
+
         for (let unitData of armyUnitData) {
             let unit = new Unit(unitData.$.name, unitData.$.customName, unitData.$.type === "model");
-
+
+            if (data[0].force[0].rules) {
+                let forceRules = data[0].force[0].rules[0].rule;
+                for (let forceRule of forceRules) {
+                    unit.addFormattedRule(forceRule);
+                };
+            }
+
             unit.handleSelectionDataRecursive(unitData, null, true);
-
             units.set(unit.uuid, unit.update());
         }
     }
@@ -30,6 +36,6 @@ module.exports.parse = (data) => {
 
     for (const uuid of units.keys())
         order.push(uuid);
-    
+
     return { units, order }
 }

bin/Unit.js

@@ -26,6 +26,7 @@ module.exports = class Unit {
     weapons = {};
     //weapons  = [];
     rules = [];
+    formattedrules = {};
     uuid = crypto.randomBytes(4).toString("hex"); 
     unassignedWeapons = [];
     pl = 0;
@@ -71,6 +72,16 @@ module.exports = class Unit {
                 desc: profileData.characteristics[0].characteristic[0]._.replace(/[\[\]"]/g, m => dangerousReplace[m])
             };
     }
+    addFormattedRule (rule) {
+        const trimmedName = rule.$.name.match(abilityTrimRegex).groups.ability,
+            dangerousReplace = { "[": "(", "]": ")", '"': '\\"' };
+
+        if (!this.formattedrules[trimmedName])
+            this.formattedrules[trimmedName] = { 
+                name: trimmedName.replace(/[\[\]"]/g, m => dangerousReplace[m]), 
+                desc: rule.description[0].replace(/[\[\]"]/g, m => dangerousReplace[m])
+            };
+    }
 
     /**
      * Adds the given data as an ability to the unit.
@@ -87,6 +98,8 @@ module.exports = class Unit {
             };
     }
 
+
+
     addRule (ruleData) {
         let trimmedName = ruleData.$.name.match(abilityTrimRegex).groups.ability;
 
@@ -352,8 +365,10 @@ module.exports = class Unit {
         }
 
         if (selectionData.rules && selectionData.rules[0] !== "")
-            for (const rule of selectionData.rules[0].rule)
-                this.addRule(rule);
+            for (const rule of selectionData.rules[0].rule){
+                this.addRule(rule)
+                this.addFormattedRule(rule)
+            };
 
         if (selectionData.selections && selectionData.selections[0] !== "")
             for (const selection of selectionData.selections[0].selection)

lua_modules/DataCard_Constants.lua

@@ -7,6 +7,10 @@ local uiTemplates = {
                     <Cell><Text class="ym-resizingSmallBold">${name}</Text></Cell>
                     <Cell><Text class="ym-resizingText">${desc}</Text></Cell>
                 </Row>]],
+    formattedrules = [[<Row class="${rowParity}" preferredHeight="80">
+                    <Cell><Text class="ym-resizingSmallBold">${name}</Text></Cell>
+                    <Cell><Text class="ym-resizingText">${desc}</Text></Cell>
+                </Row>]],                
     models = [[ <Row class="${rowParity}" preferredHeight="60">
                     <Cell><Text class="ym-resizingSmallBold">${name}</Text></Cell>
                     <Cell><Text class="ym-smallText">${m}</Text></Cell>

lua_modules/MatchedPlay.lua

@@ -200,7 +200,6 @@ function onScriptingButtonDown(index, playerColor)
     if isHoveringValidTarget then scriptingFunctions[index](playerColor, hoveredObject, player) end
 end
 
-
 function onObjectDrop(playerColor, droppedObject)
     if not self.hasTag("leaderModel") then return end -- prevents firing on objects we don't want firing
     if isCurrentlyCheckingCoherency and
@@ -423,7 +422,8 @@ function buildUI()
     buildXMLForSection("abilities")
     buildXMLForSection("models")
     buildXMLForSection("weapons")
-
+    buildXMLForSection("formattedrules")
+
     if unitData.psykerProfiles ~= nil then
         buildXMLForSection("powersKnown")
         buildXMLForSection("psykerProfiles")

lua_modules/MatchedPlay_Constants.lua

@@ -71,6 +71,10 @@ local uiTemplates = {
                     <Cell><Text resizeTextForBestFit="true" resizeTextMinSize="6" resizeTextMaxSize="20" preferredHeight="20" fontStyle="Bold" alignment="MiddleCenter">${name}</Text></Cell>
                     <Cell><Text fontStyle="Normal" resizeTextForBestFit="true" resizeTextMinSize="6" resizeTextMaxSize="20" alignment="MiddleCenter">${desc}</Text></Cell>
                 </Row>]],
+    formattedrules = [[<Row color="${rowParity}" dontUseTableRowBackground="true" preferredHeight="250">
+                    <Cell><Text resizeTextForBestFit="true" resizeTextMinSize="6" resizeTextMaxSize="20" preferredHeight="20" fontStyle="Bold" alignment="MiddleCenter">${name}</Text></Cell>
+                    <Cell><Text fontStyle="Normal" fontSize="14" alignment="UpperLeft">${desc}</Text></Cell>
+                </Row>]],
     models = [[ <Row color="${rowParity}" dontUseTableRowBackground="true" preferredHeight="60">
                     <Cell><Text resizeTextForBestFit="true" resizeTextMinSize="6" resizeTextMaxSize="20" preferredHeight="20" fontStyle="Bold" alignment="MiddleCenter">${name}</Text></Cell>
                     <Cell><Text fontStyle="Normal" fontSize="18" alignment="MiddleCenter">${m}</Text></Cell>