diff --git a/README.md b/README.md index de931539f2919f65d13864b725b19b2ce2130787..3b405b10896f973c3238a7bb7ba5e07e0b8b0641 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,13 @@ These config files make the BIND RPG books look and act the way they do. # Usage -To make a book, put this config folder into the same directory. +To make a book, start a git, then do: -> git subtree add -P config git@gitlab.com:bindrpg/config.git master +> git submodule add https://gitlab.com/bindrpg/config config -Then copy main.tex into your main folder and make a symbolic link to the `.gitignore` file. +> git commit -m"add config submodule" -> cp config/main.tex . - -> cp config/.gitignore . +> cp config/main.tex config/.gitignore . Edit 'main.tex', and input your tex files by writing `\include{my_file.tex}. @@ -44,11 +42,22 @@ This would make a heading called **Rincewind** in bold with a male symbol, and p For a complete list of all the creatures and characters which can be used, see the 'monsters.tex' file. For more details on the syntax, have a look at examples in *Adventures in Fenestra*, or read the git's wiki. +# Docs + +You can create the documentation with + +> make docs + +Test your changes before committing with + +> make test + # TeXnical Details -This thing's handled as a subtree in the other documments, so changing it will change all BIND books. +This thing's handled as a submodule in the other documments, so changing it will change all BIND books. +Any changes to the master branch should be tested in the `core` and `aif` projects first. -Personally, I keep it in a directory by the others. This allows you to do: +And when pulling, remember to do: -> git subtree -P config pull ../config master +> git pull --recurse-submodules diff --git a/layout.sty b/layout.sty index 1747ee72bd93b749a7856acee18c76c64c3ed087..2b55afa7ac234addfe3ccaceb6cec5af6ba3f1c9 100644 --- a/layout.sty +++ b/layout.sty @@ -296,7 +296,7 @@ bookmarks=true]% \fi \ifnum\value{mp}>1 \addtocounter{mp}{7} - \includesvg[angle=-20,width=\themp pt]{config/config/images/b1} + \includesvg[angle=-20,width=\themp pt]{config/images/b1} \hspace{-20pt} \fi \ifnum\value{attb}>10 @@ -623,7 +623,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) }% \newcommand{\spelllevel}{% - \needspace{10em} + \needspace{12em} \addtocounter{spelllevel}{1}% \subsection{\currentsphere~ Level \arabic{spelllevel}}% } diff --git a/monsters.sty b/monsters.sty index 97675b76c630fe737575205e304035ad8132e803..a447ba74592b65edb97601c115caf5c6d8d4027a 100644 --- a/monsters.sty +++ b/monsters.sty @@ -349,9 +349,11 @@ \newcommand{\gnome}[1][\npc{\M}{Wandering Gnome}]{ #1 \randomtwo + \randomtwoC \addtocounter{enc}{-2} \randomtwoB \randomthreeB + \randomthreeC \person{-2}% STRENGTH {\arabic{r2}}% DEXTERITY {\arabic{enc}}% SPEED @@ -360,7 +362,8 @@ {\arabic{r2}}}% CHARISMA {0}% DR {0}% COMBAT -{Academics~\arabic{r3}, \ifodd\value{page} Crafts~\arabic{r2}, \else \fi Empathy~\arabic{r2b}, \ifodd\value{page} \else Larceny~1, Stealth~1 \fi +{Academics~\arabic{r3}, Caving \arabic{r3c}, \ifodd\value{page} Crafts~\arabic{r2}, \else Deceit \arabic{age}, \fi Empathy~\arabic{r2b}, \ifodd\value{page} \else Larceny~1, Stealth~1 \fi +\ifodd\value{r12} Vigilance~\arabic{r2c}\fi \ifodd\value{page} \knacks{\alchemist} \Path{\illusion~\arabic{r2}}