pf2e-sage-stats 0.2.2 → 0.2.3

package/dist/index.js

@@ -223,18 +223,49 @@ program.command('track')
             while (true) {
                 yield new Promise((resolve) => setTimeout(resolve, 500));
                 const input = yield new Promise((resolve) => (rl.question('>', resolve)));
-                const comm = input.match(/(\S+)\s*([+-]\d+)/);
-                if (!comm) {
-                    continue;
+                const hpmod = input.match(/([^\d+-]+)\s*([+-]?\d+)/);
+                if (hpmod) {
+                    const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
+                    const tracker = (0, app_1.parseTracker)(file);
+                    const index = tracker.findIndex((c) => c.alias === hpmod[1]);
+                    if (index >= 0) {
+                        let hp = tracker[index].hp;
+                        let thp = tracker[index].temphp;
+                        if (hpmod[2].match(/^[+-]/)) {
+                            const delta = parseInt(hpmod[2]);
+                            if (delta < 0) {
+                                thp += delta;
+                                hp += Math.min(thp, 0);
+                            }
+                            else {
+                                hp += delta;
+                            }
+                        }
+                        else {
+                            hp = parseInt(hpmod[2]);
+                        }
+                        tracker[index].temphp = Math.max(0, thp);
+                        tracker[index].hp = Math.min(tracker[index].maxhp, Math.max(0, hp));
+                        yield promises_1.default.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' });
+                    }
                 }
-                const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
-                const tracker = (0, app_1.parseTracker)(file);
-                const index = tracker.findIndex((c) => c.alias === comm[1]);
-                if (index < 0) {
-                    continue;
+                const thpmod = input.match(/(\S+)\s+[tT]\s*([+-]?\d+)/);
+                if (thpmod) {
+                    const file = yield promises_1.default.readFile(argument, { encoding: 'utf-8' });
+                    const tracker = (0, app_1.parseTracker)(file);
+                    const index = tracker.findIndex((c) => c.alias === thpmod[1]);
+                    if (index >= 0) {
+                        let thp = tracker[index].temphp;
+                        if (thpmod[2].match(/^[+-]/)) {
+                            thp += parseInt(thpmod[2]);
+                        }
+                        else {
+                            thp = parseInt(thpmod[2]);
+                        }
+                        tracker[index].temphp = Math.max(0, thp);
+                        yield promises_1.default.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' });
+                    }
                 }
-                tracker[index].hp += parseInt(comm[2]);
-                yield promises_1.default.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' });
             }
         }))(),
     ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pf2e-sage-stats",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "An RPG Sage's .tsv stat generation tool",
   "main": "dist/index.js",
   "author": "ikariott@gmail.com",

package/src/index.ts

@@ -218,25 +218,62 @@ program.command('track')
             rl.question('>', resolve)
           ));
 
-          const comm = input.match(/(\S+)\s*([+-]\d+)/);
+          const hpmod = input.match(/([^\d+-]+)\s*([+-]?\d+)/);
 
-          if (!comm) {
-            continue;
-          }
+          if (hpmod) {
+            const file = await fs.readFile(argument, { encoding: 'utf-8' });
+
+            const tracker = parseTracker(file);
+
+            const index = tracker.findIndex((c) => c.alias === hpmod[1])
 
-          const file = await fs.readFile(argument, { encoding: 'utf-8' });
+            if (index >= 0) {
+              let hp = tracker[index].hp;
+              let thp = tracker[index].temphp;
 
-          const tracker = parseTracker(file);
+              if (hpmod[2].match(/^[+-]/)) {
+                const delta = parseInt(hpmod[2])
 
-          const index = tracker.findIndex((c) => c.alias === comm[1])
+                if (delta < 0) {
+                  thp += delta;
+                  hp += Math.min(thp, 0)
+                } else {
+                  hp += delta;
+                }
+              } else {
+                hp = parseInt(hpmod[2]);
+              }
 
-          if (index < 0) {
-            continue;
+              tracker[index].temphp = Math.max(0, thp)
+              tracker[index].hp = Math.min(tracker[index].maxhp, Math.max(0, hp))
+
+              await fs.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' })
+            }
           }
 
-          tracker[index].hp += parseInt(comm[2]);
+          const thpmod = input.match(/(\S+)\s+[tT]\s*([+-]?\d+)/);
+
+          if (thpmod) {
+            const file = await fs.readFile(argument, { encoding: 'utf-8' });
+
+            const tracker = parseTracker(file);
 
-          await fs.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' })
+            const index = tracker.findIndex((c) => c.alias === thpmod[1])
+
+            if (index >= 0) {
+              let thp = tracker[index].temphp;
+
+              if (thpmod[2].match(/^[+-]/)) {
+                thp += parseInt(thpmod[2]);
+              } else {
+                thp = parseInt(thpmod[2]);
+              }
+
+              tracker[index].temphp = Math.max(0, thp)
+
+              await fs.writeFile(argument, JSON.stringify(tracker, undefined, 2), { encoding: 'utf-8' })
+            }
+          }
         }
       })(),
     ])