Changed Makefile to renger PNG's using imagemagick.

2023-07-13 18:19:53 -06:00 · 2023-07-13 18:19:53 -06:00 · 451d4cdaa1
parent 6b8dbfff18
commit 451d4cdaa1
8 changed files with 667 additions and 281 deletions
--- a/Assets/Art/Botan_Map.svg
+++ b/Assets/Art/Botan_Map.svg
@ -1,3 +1,5 @@
+<?xml version="1.0" ?>
+
 <!-- 
     This file is part of LibreWands.

@ -8,6 +10,7 @@
    You should have received a copy of the GNU General Public License along with LibreWands. If not, see https://www.gnu.org/licenses/.
 -->

+
 <svg width="1200" height="1400">
 	<rect y="0%" x="0%" width="100%" height="100%" fill="white" stroke="black" />

--- a/Documentation/Articles/MonsterEncyclopedia.tex
+++ b/Documentation/Articles/MonsterEncyclopedia.tex
@ -9,11 +9,8 @@
 %   You should have received a copy of the GNU General Public License along with LibreWands. If not, see https://www.gnu.org/licenses/. 

 \begin{comment}
-
-We cannot begin the monster encyclopedia before finishing our moves and abilities. 
-
 \chapter{Monster Encyclopedia}
-\section{Light Monsters}
+\section{Light Monsters (Watch Spirited Away for inspiration)}

 \MonMonA{}{Light}{Flying}{}{}{}{}
 \MonMonB
@ -149,4 +146,233 @@ A giant snail.
 {
 }

+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Goldfish Monster
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Reptile water Monster. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Seaweed Monster. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Half horse half fish.
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Giant Water snake.
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Tenticle monster
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Giant insect snake water creature
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Giant turtle
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Giant pike-like dragon. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+A water snake with many heads. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+A giant worm that inhabits water. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+A creature resembling a van submerged in water. 
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+Giant Mermaid
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
+\MonMonA{}{Water}{}{}{}{}{}
+\MonMonB
+{
+
+}
+{
+}
+{
+}
+{
+}
+
 \end{comment}
+
--- a/Documentation/Articles/MoveEncyclopedia.tex
+++ b/Documentation/Articles/MoveEncyclopedia.tex
@ -11,6 +11,376 @@
 \begin{comment}

 \chapter{Move Encyclopedia}
+
+\section{Neutral (100)}
+
+\subsection{Attacks}
+
+\MonMove{Bite}{Neutral}
+{
+}
+
+\MonMove{Scratch}{Neutral}
+{
+}
+
+\MonMove{High Kick}{Neutral}
+{
+}
+
+\MonMove{Low Kick}{Neutral}
+{
+}
+
+\MonMove{High Punch}{Neutral}
+{
+}
+
+\MonMove{Low Punch}{Neutral}
+{
+}
+
+\MonMove{Sucker Punch}{Neutral}
+{
+}
+
+\MonMove{Gut Punch}{Neutral}
+{
+}
+
+\MonMove{Body Slam}{Neutral}
+{
+}
+
+\MonMove{Tackle}{Neutral}
+{
+}
+
+\MonMove{Slap}{Neutral}
+{
+}
+
+\MonMove{Head Butt}{Neutral}
+{
+}
+
+\MonMove{Pound}{Neutral}
+{
+}
+
+\MonMove{Quick Attack}{Neutral}
+{
+}
+
+\MonMove{Skull Bash}{Neutral}
+{
+}
+
+\MonMove{Slam}{Neutral}
+{
+}
+
+\MonMove{Slash}{Neutral}
+{
+}
+
+\MonMove{Poke}{Neutral}
+{
+}
+
+\MonMove{Paper cut}{Neutral}
+{
+}
+
+\MonMove{Bam}{Neutral}
+{
+}
+
+\MonMove{Stomp}{Neutral}
+{
+}
+
+\MonMove{Bash}{Neutral}
+{
+}
+
+\MonMove{Rock Throw}{Neutral}
+{
+}
+
+\MonMove{Take down}{Neutral}
+{
+}
+
+\MonMove{Thrash}{Neutral}
+{
+}
+
+\MonMove{Squeeze}{Neutral}
+{
+}
+
+\MonMove{Rock Bash}{Neutral}
+{
+}
+
+\MonMove{Smash}{Neutral}
+{
+}
+
+\MonMove{Squish}{Neutral}
+{
+}
+
+\MonMove{Grip}{Neutral}
+{
+}
+
+\MonMove{Vice Grip}{Neutral}
+{
+}
+
+\MonMove{Death Grip}{Neutral}
+{
+}
+
+\MonMove{Bide}{Neutral}
+{
+}
+
+\MonMove{Horn Stab}{Neutral}
+{
+}
+
+\MonMove{Horn Smash}{Neutral}
+{
+}
+
+\MonMove{Rage}{Neutral}
+{
+}
+
+\MonMove{Fang attack}{Neutral}
+{
+}
+
+\MonMove{Speed Attack}{Neutral}
+{
+}
+
+\MonMove{Claw Attack}{Neutral}
+{
+}
+
+\MonMove{Claw Crush}{Neutral}
+{
+}
+
+\MonMove{Fake out}{Neutral}
+{
+}
+
+\MonMove{Crush}{Neutral}
+{
+}
+
+\MonMove{Double Slap}{Neutral}
+{
+}
+
+\MonMove{Double Hit}{Neutral}
+{
+}
+
+\MonMove{Hold Back}{Neutral}
+{
+}
+
+\MonMove{Shell Smash}{Neutral}
+{
+}
+
+\MonMove{Shell Slam}{Neutral}
+{
+}
+
+\MonMove{Spike Attack}{Neutral}
+{
+}
+
+\MonMove{Spike Smash}{Neutral}
+{
+}
+
+\MonMove{Spike Slam}{Neutral}
+{
+}
+
+
+\MonMove{Claw Cut}{Neutral}
+{
+}
+
+\MonMove{Sonic Attack}{Neutral}
+{
+}
+
+\MonMove{Shell Crush}{Neutral}
+{
+}
+
+\MonMove{Super Bite}{Neutral}
+{
+}
+
+\MonMove{Nasty Cut}{Neutral}
+{
+}
+
+\MonMove{Fury Attack}{Neutral}
+{
+}
+
+\MonMove{Fury Swipes}{Neutral}
+{
+}
+
+
+\subsection{Special (33)}
+
+\MonMove{Pocket Sand}{Neutral}
+{
+}
+
+\MonMove{Defence Curl}{Neutral}
+{
+}
+
+\MonMove{Disable}{Neutral}
+{
+}
+
+\MonMove{Flash}{Neutral}
+{
+}
+
+\MonMove{Glare}{Neutral}
+{
+}
+
+\MonMove{Leer}{Neutral}
+{
+}
+
+\MonMove{Growl}{Neutral}
+{
+}
+
+\MonMove{Snarl}{Neutral}
+{
+}
+
+\MonMove{Harden}{Neutral}
+{
+}
+
+\MonMove{Kiss}{Neutral}
+{
+}
+
+\MonMove{Mimic}{Neutral}
+{
+}
+
+\MonMove{Recover}{Neutral}
+{
+}
+
+\MonMove{Roar}{Neutral}
+{
+}
+
+\MonMove{Screech}{Neutral}
+{
+}
+
+\MonMove{Sharpen}{Neutral}
+{
+}
+
+\MonMove{Sing}{Neutral}
+{
+}
+
+\MonMove{Ink}{Neutral}
+{
+}
+
+\MonMove{Heal}{Neutral}
+{
+}
+
+\MonMove{Tail Whip}{Neutral}
+{
+}
+
+\MonMove{Attract}{Neutral}
+{
+}
+
+\MonMove{Mean Look}{Neutral}
+{
+}
+
+\MonMove{Scary Face}{Neutral}
+{
+}
+
+\MonMove{Sweet Scent}{Neutral}
+{
+}
+
+\MonMove{Howl}{Neutral}
+{
+}
+
+\MonMove{Tickle}{Neutral}
+{
+}
+
+\MonMove{Attention}{Neutral}
+{
+}
+
+\MonMove{Shell Retreat}{Neutral}
+{
+}
+
+\MonMove{Hard Focus}{Neutral}
+{
+}
+
+\MonMove{Shed Skin}{Neutral}
+{
+}
+
+\MonMove{Hunt}{Neutral}
+{
+}
+
+\MonMove{Camouflage}{Neutral}
+{
+}
+
+\MonMove{Odour Spray}{Neutral}
+{
+}
+
+\MonMove{Yawn}{Neutral}
+{
+}
+
+
 \section{Plant}

 \MonMove{Bind}{Plant}
@ -98,210 +468,5 @@ Produce energy using the power of the sun.
 {
 }

-\MonMove{Nectar}{Plant}
-{
-}
-
-\MonMove{Nectar}{Plant}
-{
-}
-
-\section{Water}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Fire}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Air}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Light}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Dark}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Electric}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Ice}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Earth}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
-\section{Radio}
-\MonMove{Water Gun}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-\MonMove{Splash}{}{}
-
 \end{comment}
+
--- a/Documentation/Articles/WorkTimeline.tex
+++ b/Documentation/Articles/WorkTimeline.tex
@ -38,11 +38,10 @@ On Mondays, plan out our week in the newly created monthly kanban project descri

 \begin{description}
 \item[14 Cities and Towns] 1 per month.  
-\item[31 Routes] 2 per month. 
-\item[100 Abilities] 6 per month. 2 per day. 
-\item[200 Monsters] 11 per month. 3 per day. (Can't do until abilities, routes and moves complete)
+\item[31 Routes] 2 per month.  
+\item[200 Monsters] 11 per month. 3 per day.
 \item[200 Moves] 11 per month. 3 per day. 
-\item[300 Items] 17 per month. 4 per day. 2 per hour. 
-\item[845 Total] 47 per month. 9 per day. 2 per hour. 
+\item[300 Items] 17 per month. 4 per day. 1 per hour. 
+\item[745 Total] 42 per month. 9 per day. 2 per hour. 
 \end{description}

--- a/Documentation/Articles/WorldEncyclopedia.tex
+++ b/Documentation/Articles/WorldEncyclopedia.tex
@ -11,7 +11,7 @@
 \chapter{World Regions Encyclopedia}

 \begin{center}
-\includegraphics[scale=1.4]{../Build/Art/World Map.png}\\
+\includegraphics[scale=1.0]{../Build/Art/World Map.png}\\
 Map of the World 
 \end{center}

@ -47,7 +47,7 @@ Region \# & Name & Associated Tarot Card \\
 \section{Region of Botan}

 \begin{center}
-\includegraphics[scale=0.4]{../Build/Art/Botan Map.png}\\
+\includegraphics[scale=0.3]{../Build/Art/Botan Map.png}\\
 Map of Botan
 \end{center}

@ -57,44 +57,43 @@ An old culture mostly left to itself to develop on its own. Through many past wa

 \subsection{Geography}

-A mostly warm and humid, tropical place with exceptions. The Mount Cardamom is known to be very hot nearby due to geothermic heat, but is also known to be very cold and dry at the top during the winter. Very few things grow due to the rocky and alkaline soil. 
+A mostly cold and dry place with exceptions. The Mount Cardamom is known to be very hot nearby due to geothermic heat, but is also known to be very cold and dry at the top during the winter. Very few things grow due to the rocky and alkaline soil. 

 \subsection{Demographics}

 \begin{description}
 \item[90\% Botanese] The native locals of Botan. While technically a blend of many historic warring national identities, people have generally come together under one national identity. 
 \item[ 9\% Gibberish] Foreigners from the nearby region of Gibber. 
-\item[ 1\% Other] All kinds of foreigners from all over the world, usually migrating in from the port city of (can't remember the name). 
+\item[ 1\% Other] All kinds of foreigners from all over the world, usually migrating in from the port city of Nutmeg. 
 \end{description}

 \subsection{Economy}

-Botan has a strong, independent economy consisting of wind, geothermic power and logistics. Food is imported from the nearby farming region of Gibber in exchange for clean energy. Some rare stones are exported from here as well. 
+Botan has a strong, but interdependent economy consisting of wind, geothermic power, logistics and farming. Some rare stones are exported from here as well. 

 \subsection{Arts and Culture}

-The acoustic guitar, guitalele, ukulele are extremely popular instruments, with folk music being the most commonly played music. Oil painting and pottery are popular here. The most commonly played sport is football, due to the accessible nature of the sport. 
+The acoustic guitar, guitalele, ukulele are extremely popular instruments, with folk music being the most commonly played music. Oil painting and pottery are popular here. The most commonly played sport is hockey, due to the accessible nature of the sport. 

 \subsection{Government}

-A small democracy. Truly, the region is almost entirely governed by the municipal governments rather than the national government. This is due to being an overall more impoverished region.
-
+A large democracy. The government is split into two levels, the regional and municipal governments. The regional government can be further divided into the legislative, executive and judicial branches. 

 \newpage
 \subsection{Places}

 \MonCity{Dill City}{Ice}{$42km^2$}
 {
-This was the first place I visited in Botan, around 6 AM in March. It was a cold 7 degrees Celsius, as I was not dressed for that temperature. I had a wonderful garlic mashed potatoes and pork sausage for breakfast at the local inn. I was expecting it to be the last time I get to have wine during my trip. I was pleasantly surprised. After a few hours, I took off on my bicycle to Coffee City. 
+This was the first place I visited in Botan, around 6 AM in March. It was a cold negative 7 degrees Celsius, as I was not dressed for that temperature. I had a wonderful garlic mashed potatoes and steak for breakfast at the local inn. After a few hours, I took off on my bicycle to Coffee City. 
 }
 {
-A relatively cold place in the North with a dry climate. It's known to snow here in the winter. This city sits snugly before a mountainous ridge that divides Botan from Gibber. Power cables run through the city over the mountains. 
+A relatively cold place in the North with a dry climate. This city sits snugly before a mountainous ridge that divides Botan from Gibber. Power cables run through the city over the mountains. 
 }
 {
-The economy is largely run by logistics and power companies. The food here is cheaper than elsewhere. 
+The economy is largely run by logistics and power companies. A large tourist destination, everything tends to be more expensive than everywhere else.
 }
 {
-There's an annual summer bonfire festival here. Most people spend much of their time indoors, away from the cold. Painting is a popular hobby. The food is rich and excellent. Milk, cheese of varying ages, wine, vegetables, poultry, beef, pork, potatoes, peas, carrots, celery, whatever. All imported from the nearby Gibber. Football is the most common sport here. Clothes are much thicker and made with wool, as opposed to the far more popular cotton. Music typically consists of chromatic harmonica, guitar, guitalele, ukulele, drum kits, fiddle, and banjo. The buildings are made of thick logs and the paths are paved with cobblestone and dirt. 
+There's an annual summer bonfire festival here. Most people spend much of their time indoors, away from the cold. Painting is a popular hobby. Hiking is the most common sport here, with skiing and hockey being slightly less popular. Clothes are much thicker and made with wool and fur, as opposed to the far more popular cotton. Music typically consists of chromatic harmonica, guitar, guitalele, ukulele, drum kits, fiddle, and banjo. The buildings are made of thick logs and the paths are paved with cobblestone, dirt and gravel.  
 }
 {
 The government here focuses on social services and regulating trade between Botan and Gibber. They crack down on counterfeit goods and illegal immigration. 
@ -103,32 +102,32 @@ The government here focuses on social services and regulating trade between Bota
 \begin{description}
 \item [Heal Centre] The Dill Heal Centre offers to heal domestic monsters free of charge. A public computer terminal can be used inside. 
 \item [Wand Centre] The Wand Centre of Dill is the official Wand Centre of Dill city. It is based on ice monsters. The Wand Master is Coach Fred. Monster coaches who defeat him receive the ice wand. 
-\item [Shop Centre] A special shop to serve the needs of monster coaches. 
-\item [Inn  Centre] The Dill Inn. Provides a place to sleep through the night. 
-\item [Bank Centre] The National Bank of Botan. Come here to make a variety of investments.
-\item [City Centre] The City Centre of Dill. 
-\item [Library] The Library of Dill. Provides computer and library services to the public. 
-\item [Cafe] Dill Cafe. 
-\item [Pub] Pub Dill. 
-\item [Baker] Dill Bakery. 
+\item [Monster Shop] A special shop to serve the needs of monster coaches. 
+\item [Inn] The Dill Inn. Provides a place to sleep through the night. 
+\item [Bank] The National Bank of Botan. Come here to make a variety of investments.
+\item [City Centre] The City Centre of Dill. Home of the municipal government.
+\item [Library] The Library of Dill. Provides computer and library services to the public. Home of the monster storage system.
+\item [Cafe] Dill Cafe. A nice place to relax, offering tea and pastries for sale.
+\item [Pub] Pub Dill. A nice, age restricted place to relax and hang out. Food and recreation is often sold here.
+\item [Ice Tunnel] A secret tunnel made of ice. One of many bases where The Continental Company operates. 
 \end{description}
 }

 \MonCity{Cumin City}{Electric}{$33km^2$}
 {
-I try not to arrive late to a city, but I arrived here at 10 PM. I had a beef stew with potatoes and carrots for dinner at the local inn. I had cream of wheat for breakfast in the morning. The city is full of electrical equipment owned and serviced by the Botan Electric Company. The city made an annoying buzzing sound. I'm guessing others have tuned it out. 
+I try not to arrive late to a city, but I arrived here at 10 PM. I had a beef stew with potatoes and carrots for dinner at the local inn. I had cream of wheat for breakfast in the morning. The city is full of electrical equipment owned and serviced by the Botan Electric Company. The city is built upon the Cumin Hydroelectric Dam, an amazing feat.
 }
 {
-A small city overall. Hilly fields full of windmills surround the city.
+Despite being a small city, it takes great advantage of the huge natural waterfall between the Kneecap River and the Kneecap Reservoir. Hilly fields full of windmills, cattle and canola surround the city.
 }
 {
-The economy is highly driven by the Botan Electric Company. Small shops do exist all around however. 
+The economy is highly driven by the Botan Electric Company here, with a thriving dairy and canola industry. It's also home of the LibreTech Electronics and Computing Company, which produces all kinds of advanced electronic equipment. 
 }
 {
-Like most cities, an annual bonfire takes place every summer. The local cuisine consists of beef, game meat and garden vegetables. The architecture is wooden, with gravel roads. Guitar, guitalele and ukulele are popular here. 
+Like most cities, an annual bonfire takes place every summer. The local cuisine consists of beef, chicken and garden vegetables. The architecture is wooden, with gravel roads. Guitar, guitalele and ukulele are popular here. 
 }
 {
-The government focuses mainly on providing social services, cracking down on poaching. 
+The government focuses mainly on providing social services, while cracking down on theft and vandalism.
 }
 {
 \begin{itemize}
@ -141,7 +140,7 @@ The government focuses mainly on providing social services, cracking down on poa
 \item [Pharmacy]
 \item [Grill]
 \item [Mall]
-\item [Baker]
+\item [Abandoned Train Station]
 \end{itemize}
 }

@ -150,7 +149,7 @@ The government focuses mainly on providing social services, cracking down on poa
 I arrived here around noon. I was surprised how quickly the forest cleared up into a grassy field.  A rather quiet city overall. The roads are paved with gravel. and the sidewalks are made of wood. It has a strange, sleepy aesthetic. The city has an overall dreary and nostalgic feel to it. Everywhere you go, when you're alone, you feel like you're being watched. I got to see the monastery from the outside. I had buttered toast for lunch before leaving for Oregano Town. 
 }
 {
-Rolling grassy hills. Too hilly for large farms. Surrounded by Rolling hills out in an otherwise grassy field. A small city made from wooden buildings, paved with gravel. 
+Surrounded by Rolling hills out in an otherwise grassy field. A small city made from wooden buildings, paved with gravel. 
 }
 {
 Small shops drive the economy here. 
@ -159,7 +158,7 @@ Small shops drive the economy here.
 A highly superstitious culture. There's a festival which honours the dead through dance and music. The food mostly consists of chicken, root and green vegetables, and grain. The architecture is wooden, and the roads are paved with gravel. The guitar is a common instrument here. 
 }
 {
-The main focus of government here is the maintenance of social services, like the post office and hospital. 
+The main focus of government here is the maintenance of social services, like the hospital. 
 }
 {
 \begin{itemize}
@ -173,6 +172,7 @@ The main focus of government here is the maintenance of social services, like th
 \item [Grill]
 \item [Cafe]
 \item [Hospital]
+\item [Giant Cathedral]
 \end{itemize}
 }

@ -187,7 +187,7 @@ The geography is very mountainous. It's literally set atop a mountain. One needs
 It's mostly very independent, relying on wholesale transactions when the caves are cleared up. 
 }
 {
-Instead of an annual bonfire, there is an annual potluck instead. The food consists of game meat, mostly goat, and potatoes. Football is a common sport here. Music typically consists of chromatic harmonics, tin whistle and jaw harp. The building are made of wood and the roads are made of stone. 
+Instead of an annual bonfire, there is an annual potluck instead. The food consists of game meat, mostly deer, and potatoes. Cycling is a common sport here. Music typically consists of chromatic harmonica, tin whistle and jaw harp. The building are made of wood and the roads are made of stone. 
 }
 {
 The government primarily focuses on social services here and keeping the public safe from the caves.
@ -205,23 +205,22 @@ The government primarily focuses on social services here and keeping the public
 \item [Cafe]
 \item [Pub]
 \item [School]
+\item [Volcano Base]
 \end{itemize}
 }

 \MonCity{Bay City}{Grass}{$42km^2$}
 {
-I arrived here around 5 PM. I was exhausted. I immediately went for the local inn. Massive overgrowth surrounds the city. I could hear birds chirping, but from no discernible direction. I had game meat for dinner with peas. In the morning, I had leftovers for breakfast. I left for Rosemary City. 
-
-(inspired by Violet City, Eterna City)
+I arrived here around 5 PM. I was exhausted. I immediately went for the local inn. A massive overgrowth of pine trees and other foliage surrounds the city. I could hear birds chirping, but from no discernible direction. I had deer for dinner with peas. In the morning, I had leftovers for breakfast. I left for Rosemary City. 
 }
 {
-Largely forested overall. Very fresh smelling air. It's humid, but not too hot. The paths are paved with cobblestone. Rolling hills make it difficult to farm here. Trees surround the city in all directions. 
+Largely forested overall. Very fresh smelling air. It's dry, but not too cold. The paths are paved with gravel and dirt. The lack of space makes it difficult to farm here. Dense pine trees surround the city in all directions. 
 }
 {
 Logging is a popular career out here. The local shops drive much of the economy. A more impoverished area overall due to the lack of work. 
 }
 {
-There's an annual bonfire festival that showcases excellent food and music. Large feasts of root vegetables and game meat. The recorder, guitar, guitalele, ukulele and fiddle are often played during the festival, though the latter instruments are more rare. Football is the most common sport out here. Wooden buildings dominate the architecture style.
+There's an annual bonfire festival that showcases excellent food and music. Large feasts of garden vegetables and game meat. The recorder, guitar, guitalele, ukulele and fiddle are often played during the festival, though the latter instruments are more rare. Football is the most common sport out here. Wooden buildings dominate the architecture style.
 }
 {
 The local government works hard on providing social services to those who need it. They also crack down on poaching. 
@ -239,21 +238,22 @@ The local government works hard on providing social services to those who need i
 \item [Cafe]
 \item [Pub]
 \item [Hospital]
+\item [Trailer Base]
 \end{itemize}
 }

 \MonCity{Cardamom City}{Earth}{$48km^2$}
 {
-I arrived at Cardamom City at about 8 PM. This is the last unique city stop before I explore the remainder of the routes. It's a mining city. It's overall quite flat, but full of mud, dirt and stone. The architecture here is wooden and gravel paved roads. I had goat for dinner with potatoes. Before leaving in the morning, I had cream of wheat for breakfast. I do miss wine and pork. 
+I arrived at Cardamom City at about 8 PM. This is the last unique city stop before I explore the remainder of the routes. It's a mining city. It's overall quite flat, but full of mud, dirt and stone. The architecture here is wooden and gravel paved roads. I had deer for dinner with potatoes. Before leaving in the morning, I had oatmeal for breakfast.
 }
 {
-Flat and dirty. It must be an absolute mess here during the rainy season. This city site before the Vanilla mountains. 
+Flat and dirty. It must be an absolute mess here during the rainy season. This city sits before the Vanilla mountains. 
 }
 {
 The economy is largely run by the mining industry out here. They export rare and valuable stones that are worth quite a hefty price on their own. 
 }
 {
-There is not much to burn for the usual annual bonfire had in most cities. Instead, they use fireworks. These are though to scare away the monsters, along with most creatures. Food is hard to import here, so game meat is quite popular with goat being the animal of choice. Cottage cheese is a delicacy. Football is the sport of choice. Clothes tend to be made of either plaid or jean. Musical instruments typically consist of the harmonica, tin whistle and jaw harp.  
+There is not much to burn for the usual annual bonfire had in most cities. Instead, they use fireworks. These are thought to scare away the monsters, along with most creatures. Football is the sport of choice. Clothes tend to be made of either plaid or jean. Musical instruments typically consist of the harmonica, tin whistle and jaw harp.  
 }
 {
 The local government here focuses on social services, and cracking down on counterfeit goods. 
@ -272,6 +272,7 @@ The local government here focuses on social services, and cracking down on count
 \item [Hospital]
 \item [Butcher]
 \item [Mall]
+\item [Trainer House]
 \end{itemize}
 }

@ -280,10 +281,10 @@ The local government here focuses on social services, and cracking down on count
 After the seventeen hour long trip, I finally arrived in Coffee City at about midnight. I was able to get a room at the local inn. I slept until about 9 AM, but I decided to stay at the inn all day to relax. Throughout my stay, I could not shake the feeling that I was being watched. In the morning, I had cottage cheese and milk for breakfast. In the evening, broccoli and chicken. Cream of wheat the next morning. The city had a strange, dreary feeling to it, despite being full of people. The architecture was notably poorly cared for, and people generally seemed sickly. I left for Chili Town. 
 }
 {
-A hilly, desolate environment. Would make for excellent farming land if it were flat. The city is surrounded by windmills. It's very quiet, unlike other cities I have visited. Quiet enough to be peculiar. 
+A hilly, desolate environment. Farmland and windmills surround this small city. It's very quiet, unlike other cities I have visited. Quiet enough to be peculiar. 
 }
 {
-The economy is heavily influenced by the Botan Electric Company. 
+The economy is heavily influenced by the Botan Electric Company and the dairy industry.
 }
 {
 The people here seem highly superstitious. While most cities have a summer festival, this city does not. Reading and gardening seem especially popular pastimes here. The large library I'm sure helps with this. The food, besides the cottage cheese and milk, seemed oddly bland. It seemed that the demographics here consist of older individuals. The guitar appears to be popular here. 
@ -299,19 +300,18 @@ The government strives to provide good nutrition and social services. The nation
 \item [Inn  Centre]
 \item [Bank Centre]
 \item [City Centre]
-\item [Trainer House]
 \item [Pub]
-\item [Baker]
 \item [Mall]
+\item [mausoleum]
 \end{itemize}
 }

 \MonCity{Paprika City}{Flying}{$104km^2$}
 {
-I arrived at Paprika City just before sundown. I was stunned by the sheer scale of the city, both tall and wide. I chose to rest at one of the many inns. The city was very busy and highly populated. It's gets very hot here, and the humidity makes it uncomfortable, unlike in other areas. I ate well, pulled pork with mashed potatoes and roasted broccoli, with wine of course. I found it difficult to sleep. I left for Pepper Town around 6 AM the day after.
+I arrived at Paprika City just before sundown. I was stunned by the sheer scale of the city, both tall and wide. I chose to rest at one of the many inns. The city was very busy and highly populated. It's gets very hot here, and the lack of humidity makes it very uncomfortable. I ate well, steak with mashed potatoes and roasted broccoli, with whisky. I found it difficult to sleep. I left for Pepper Town around 6 AM the day after.
 }
 {
-Artificially flattened to help support the development of more buildings. Many of the previously surrounding trees have been removed. 
+Many of the previously surrounding trees have been removed. 
 }
 {
 A huge shopping centre with all kinds of imported goods from all over the world. Logistics also plays a very large role overall in the economy. 
@ -330,7 +330,6 @@ The government largely focuses on reducing the amount of counterfeit goods that
 \item [Inn  Centre]
 \item [Bank Centre]
 \item [City Centre]
-\item [Museum]
 \item [Library]
 \item [Cafe]
 \item [Pub]
@ -338,15 +337,15 @@ The government largely focuses on reducing the amount of counterfeit goods that
 \item [Hospital]
 \item [School]
 \item [Butcher]
-\item [Baker]
 \item [Mall]
 \item [Grocer]
+\item [Sewer dungeon]
 \end{itemize}
 }

 \MonCity{Basil City}{Radio}{$112km^2$}
 {
-It was raining by the time I arrived in Basil City around 3PM. I could not believe the scope of this place. Even bigger than Paprika City. It rained very hard. I spent three nights at the inn, as I had a long ride ahead of me. At least it will be a long decline. Chicken and mashed potatoes for lunch, roasted broccoli with pulled pork and wine for dinner, and cottage cheese for breakfast, same thing every day. 
+It was raining by the time I arrived in Basil City around 3 PM. I could not believe the scope of this place. Even bigger than Paprika City. It rained very hard. I spent three nights at the inn, as I had a long ride ahead of me. At least it will be a long decline. Chicken and mashed potatoes for lunch, roasted broccoli with salmon for dinner, and oatmeal for breakfast.  
 }
 {
 The biggest city in Botan. A huge city on the rocky border. Very similar to Paprika City. 
@ -368,7 +367,6 @@ The government works hard to provide social services to the people, while cracki
 \item [Inn  Centre]
 \item [Bank Centre]
 \item [City Centre]
-\item [Museum]
 \item [Library]
 \item [Cafe]
 \item [Pub]
@ -377,15 +375,15 @@ The government works hard to provide social services to the people, while cracki
 \item [Hospital]
 \item [School]
 \item [Butcher]
-\item [Baker]
 \item [Mall]
 \item [Grocer]
+\item [Museum]
 \end{itemize}
 }

 \MonCity{Nutmeg City}{Water}{$84km^2$}
 {
-The hot and humid climate, fresh salty air. Blue skies and blue water, contrasted by the orange-copper ceramic roof tiles and white house bodies. Overall, a very silent place, aside from the crashing waves near the shore and chirping birds. I arrived around midnight, after a brutal bike ride. I had sweet pastries and coffee for breakfast, a delicacy. Pork sausage and aged cheese for lunch. A delicious chicken, roasted potatoes and carrots for dinner. With wine. 
+The hot but humid climate, fresh salty air. Blue skies and blue water, contrasted by the orange-copper ceramic roof tiles and white house bodies. Overall, a very silent place, aside from the crashing waves near the shore and chirping birds. I arrived around midnight, after a brutal bike ride. I had toast and coffee for breakfast. a lemon dill salmon fillet for lunch with roast carrots and potatoes. I had leftovers for dinner.  
 }
 {
 Sweeping hills and sandy beaches. Hot and humid. Very densely populated overall with a large diversity of people. 
@ -394,7 +392,7 @@ Sweeping hills and sandy beaches. Hot and humid. Very densely populated overall
 Very largely run by the logistics industry. Lots of shops selling all kinds of goods. The densest city in Botan by population. 
 }
 {
-The guitar, guitalele and ukulele are very common instruments here, often used to play folk music. An annual festival once a year takes place on the beaches, mostly featuring the folk music, delicious food, mostly pork and chicken, bread and sweets. Volleyball is by far the most popular sport. The fashion is peculiar, lots of striped cotton shirts tucked into slim straight jeans. A highly superstitious culture. 
+The guitar, guitalele and ukulele are very common instruments here, often used to play folk music. An annual festival once a year takes place on the beaches, mostly featuring the folk music and delicious food. Volleyball is by far the most popular sport. The fashion is peculiar, lots of striped cotton shirts tucked into slim straight jeans. A highly superstitious culture. 
 }
 {
 The municipal government is largely focused on providing social services and cracking down on illegal immigration and illegally imported goods. 
@ -413,8 +411,8 @@ The municipal government is largely focused on providing social services and cra
 \item [School]
 \item [Mall]
 \item [Grocer]
-\item [Baker]
 \item [Grill]
+\item [Lighthouse]
 \end{itemize}
 }

--- a/Documentation/macros.tex
+++ b/Documentation/macros.tex
@ -113,6 +113,7 @@
 	\paragraph{Government}
 	#8
 	\newpage
+	
 }

 % - name, area, description, History, Geography, Economy, 
--- a/21
+++ b/21
@ -31,21 +31,14 @@ uninstall-pdf:

 pdf:
 	cd Build/;mkdir -p "Art"
-	inkscape "./Assets/Art/Botan_Map.svg" \
-	--export-width=1920 -o "Build/Art/Botan Map.png"
-	inkscape "./Assets/Art/Botan_Map_Old.svg" \
-	--export-width=1920 -o "Build/Art/Botan Map Old.png"
+	convert "./Assets/Art/Botan_Map.svg" "Build/Art/Botan Map.png"
+	convert "./Assets/Art/Botan_Map_Old.svg" "Build/Art/Botan Map Old.png"
 	convert "./Assets/Art/Botan_Map_Old_2.bmp" "Build/Art/Botan Map Old 2.png"
-	inkscape "./Assets/Art/World_Map.svg" \
-	--export-width=1920 -o "Build/Art/World Map.png"
-	inkscape "./Assets/Art/Controller.svg" \
-	--export-width=1920 -o "Build/Art/Controller.png"
-	inkscape "./Assets/Art/commons.wikimedia.org_wiki_File:QWERTY_keyboard_diagram.svg" \
-	--export-width=1920 -o "Build/Art/commons.wikimedia.org_wiki_File:QWERTY_keyboard_diagram.png"
-	inkscape "./Assets/Art/commons.wikimedia.org_wiki_File:Regular_truncation_10_1000.svg" \
-	--export-width=1920 -o "Build/Art/commons.wikimedia.org_wiki_File:Regular_truncation_10_1000.png"
-	inkscape "./Assets/Art/upload.wikimedia.org_wikipedia_commons_3_3f_Placeholder_view_vector.svg" \
-	--export-width=1920 -o "Build/Art/upload.wikimedia.org_wikipedia_commons_3_3f_Placeholder_view_vector.png"
+	convert "./Assets/Art/World_Map.svg" "Build/Art/World Map.png"
+	convert "./Assets/Art/Controller.svg" "Build/Art/Controller.png"
+	convert "./Assets/Art/commons.wikimedia.org_wiki_File:QWERTY_keyboard_diagram.svg" "Build/Art/commons.wikimedia.org_wiki_File:QWERTY_keyboard_diagram.png"
+	convert "./Assets/Art/commons.wikimedia.org_wiki_File:Regular_truncation_10_1000.svg" "Build/Art/commons.wikimedia.org_wiki_File:Regular_truncation_10_1000.png"
+	convert "./Assets/Art/upload.wikimedia.org_wikipedia_commons_3_3f_Placeholder_view_vector.svg" "Build/Art/upload.wikimedia.org_wikipedia_commons_3_3f_Placeholder_view_vector.png"
 	cd Build/;pdflatex ../Documentation/LibreWands.tex

 clean:
--- a/README.md
+++ b/README.md
@ -17,7 +17,8 @@ To collaboratively create a unique and high quality ncurses RPG that takes cultu
 * make
 * gcc
 * libncurses-dev
-* inkscape (optional, for documentation)
+* imagemagick (optional, for documentation)
+* librsvg2-bin (optional, for documentation)
 * texlive-latex-base (optional, for documentation)

 Documentation is installed to the /usr/doc/librewands/ directory.