Update genrules to not use Arules

This removes the rest of the specialized files classes.

Makefile

@@ -16,7 +16,7 @@ CFLAGS = -g -I. -I.. -Wall -Werror -std=c++20
 RULESET_OBJECTS = extra.o map.o monsters.o rules.o world.o 
 
 ENGINE_OBJECTS = alist.o aregion.o army.o astring.o battle.o economy.o \
-  edit.o faction.o fileio.o game.o gamedata.o gamedefs.o gameio.o \
+  edit.o faction.o game.o gamedata.o gamedefs.o gameio.o \
   genrules.o i_rand.o items.o main.o market.o modify.o monthorders.o \
   npc.o object.o orders.o parseorders.o production.o quests.o runorders.o \
   shields.o skills.o skillshows.o specials.o spells.o template.o unit.o \
@@ -31,7 +31,7 @@ OBJECTS =  $(patsubst %.o,obj/%.o,$(ENGINE_OBJECTS)) $(patsubst %.o,$(GAME)/obj/
 $(GAME)-m: objdir $(OBJECTS)
 	$(CPLUS) $(CFLAGS) -o $(GAME)/$(GAME) $(OBJECTS)
 
-all: basic standard fracas kingdoms havilah neworigins
+all: basic standard fracas kingdoms havilah neworigins unittest
 
 basic: FORCE
 	$(MAKE) GAME=basic
@@ -55,7 +55,7 @@ $(GAME)/$(GAME): FORCE
 	$(MAKE) GAME=$(GAME)
 
 all-clean: basic-clean standard-clean fracas-clean kingdoms-clean \
-	havilah-clean neworigins-clean
+	havilah-clean neworigins-clean unittest-clean
 
 basic-clean:
 	$(MAKE) GAME=basic clean

aregion.h

@@ -39,7 +39,6 @@ class ARegionArray;
 #include "faction.h"
 #include "alist.h"
 #include "unit.h"
-#include "fileio.h"
 #include "production.h"
 #include "market.h"
 #include "object.h"

astring.cpp

@@ -404,8 +404,8 @@ istream& operator>>(istream &is,AString &s)
 	return is;
 }
 
-const std::string plural(int count, const std::string &one, const std::string &many) {
-	return count > 1 ? many : one;
+const string plural(int count, const std::string &one, const std::string &many) {
+	return count != 1 ? many : one;
 }
 
 const std::string join(const std::string &delimeter, const std::vector<std::string>& items) {

battle.h

@@ -30,7 +30,6 @@ class Battle;
 
 #include "astring.h"
 #include "alist.h"
-#include "fileio.h"
 #include "army.h"
 #include "items.h"
 #include "events.h"

edit.cpp

@@ -6,7 +6,6 @@
 
 #include "game.h"
 #include "unit.h"
-#include "fileio.h"
 #include "astring.h"
 #include "gamedata.h"
 

faction.h

@@ -35,7 +35,6 @@ class Game;
 
 #include "gameio.h"
 #include "aregion.h"
-#include "fileio.h"
 #include "unit.h"
 #include "battle.h"
 #include "skills.h"