From 8e0a4eaf1f27462824b5984ec8e6888c4db705d4 Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@posteo.net>
Date: Sun, 3 Sep 2023 18:23:02 +0200
Subject: [PATCH] remove old locked mana commands

---
 monsters.sty |  9 +++------
 stats.sty    | 17 +----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/monsters.sty b/monsters.sty
index 56c3f1db..8cf3e493 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -327,7 +327,7 @@
       \fi%
     }}% SKILLS
 	{\ifodd\thepage\Dagger, \lootJewellery\else\spear\fi}% EQUIPMENT
-	{\lockedmana{5}}
+	{}
 	}
 
 \newcommand{\elf}[1][\npc{\T[\arabic{r2c}]\El\F}{\arabic{r2c} Elves}]{
@@ -869,7 +869,7 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
   }
 }% SKILLS
 {\lootMedium, \ifodd\thepage\lootMagic\else mana stone with 4 mp\fi}% EQUIPMENT
-{\lockedmana{\value{r2}}}
+{}
 }
 
 \newcommand{\gnollhunter}[1][\npc{\T[\arabic{r12}]\Nl}{\arabic{r12} Gnoll Hunters}]{
@@ -1478,7 +1478,7 @@ Academics~1, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\v
 \fi%
 , \multiply\value{track} by 2%
 mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIPMENT
-{\lockedmana{\value{r4}}}
+{}
 }
 
 \newcommand{\demilich}[1][\npc{\D\E}{Demilich}]{
@@ -1515,7 +1515,6 @@ mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIP
 \multiply\value{track} by 2%
 , mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
 {%
-  \lockedmana{\value{r4}}
   \setcounter{Air}{\value{r3}}%
   \setcounter{Fate}{\value{r3b}}%
   \setcounter{Water}{\value{r3c}}%
@@ -1568,7 +1567,6 @@ mana stone holding \arabic{track} MP, \ifodd\thechapter\lootJewellery\fi}% EQUIP
 \fi, \addtocounter{track}{3}\multiply\value{track} by 2%
 mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \lootMagic}% EQUIPMENT
 {
-  \lockedmana{\value{r4}}
   \renewcommand\abilities{\undead}
 }
 }
@@ -1788,7 +1786,6 @@ mana stone with \arabic{track} mana, \lootJewellery, \randomtwo\lootJewellery, \
 {None}% ABILITIES
 {
   \setcounter{gold}{\value{age}}\multiply\value{gold} by 3\addtocounter{gold}{\value{Intelligence}}\setcounter{sp}{\value{gold}}%
-  \lockedmana{\value{age}}
   \knacks{\snapcaster}
 }
 }
diff --git a/stats.sty b/stats.sty
index 20cb7b4a..c8c865cd 100644
--- a/stats.sty
+++ b/stats.sty
@@ -239,8 +239,6 @@
 % Extras: MP hp fp
 % Derived: dicenumber, dicebonus,
 \newcounter{mp}
-\newcounter{mpLocked}
-\newcounter{mpFree}
 \newcounter{sp}
 \newcounter{hp}
 \newcounter{fp}
@@ -277,8 +275,6 @@
 % magic
 \newcommand{\magicPath}{}
 
-\newcommand{\lockedmana}[1]{\setcounter{mpLocked}{#1}}
-
 \newcommand{\knacks}[1]{\gdef\showKnacks{#1}}
 
 \newcommand\showKnacks{}
@@ -573,7 +569,6 @@
   \setcounter{damage}{0}
   \setcounter{knacks}{0}
   \setcounter{mp}{0}
-  \setcounter{mpLocked}{0}
   \setcounter{xpbonus}{0}
 }
 
@@ -704,20 +699,10 @@
       \mbox{DR \arabic{dr} (\arabic{enc}!)}, %
     }{}%
   \addtocounter{hp}{6}%
-  \ifnum\value{mp}>0%
-    \addtocounter{mp}{\value{Intelligence}}%
-    \setcounter{mpFree}{\value{mp}}
-    \addtocounter{mpFree}{-\value{mpLocked}}%
-  \fi%
   \iftoggle{genExamples}{%
     HP~\arabic{hp},
     \ifnum\value{mp}>0%
-      MP
-      \ifnum\value{mpLocked}>0%
-        \arabic{mpFree} / \arabic{mp},
-      \else%
-        \arabic{mp},
-      \fi%
+      MP \arabic{mp},
     \fi%
     \ifnum\value{sp}>0%
     SP \arabic{sp},
-- 
GitLab