Do some cleanup while I'm on it

9 files changed, 48 insertions, 44 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 76541432..f72f07c5 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4792,9 +4792,9 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	G_OTHER:        3
 
 	comment__: "races"
-	KaizeiViro:     0
-	ArgaesViro:     1
-	TonoriViro:     2
+	KaizeiTalpan:   0
+	ArgaesTalpan:   1
+	TonoriTalpan:   2
 	CaveUkar:       3
 	MountainUkar:   4
 	SeaTritan:      5
@@ -4806,7 +4806,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 
 	// DEPRECATED: Kept for compatibility
 	Human:      0
-	Viro:       0
+	Talpan:     0
 	Ukar:       3
 	Tritan:     5
 	Raijin:     7
diff --git a/db/job_db2.txt b/db/job_db2.txt
index cd75322e..955ca6aa 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -16,11 +16,11 @@
 //
 
 // .:: HUMANS ::.
-// Kaizei Viro
+// Kaizei Talpan
 0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
-// Argaes Viro
+// Argaes Talpan
 1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
-// Tonori Viro
+// Tonori Talpan
 2,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
 
 
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c0e71386..1244273c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -49,17 +49,17 @@ item_db: (
 	Slots: Slots                  (int, defaults to 0)
 	Job: {                        (defaults to all job)
 		All: true/false           (boolean, defaults to false)
-		Viro: true/false          (boolean, defaults to false)
+		KaizeiTalpan: true/false  (boolean, defaults to false)
+		ArgaesTalpan: true/false  (boolean, defaults to false)
+		TonoriTalpan: true/false  (boolean, defaults to false)
 		CaveUkar: true/false      (boolean, defaults to false)
-		FireKralog: true/false    (boolean, defaults to false)
-		LightRaijin: true/false   (boolean, defaults to false)
+		MountainUkar: true/false  (boolean, defaults to false)
 		SeaTritan: true/false     (boolean, defaults to false)
-		FrostKralog: true/false   (boolean, defaults to false)
-		DarkRaijin: true/false    (boolean, defaults to false)
-		ArgaesViro: true/false    (boolean, defaults to false)
-		TonoriViro: true/false    (boolean, defaults to false)
 		LakeTritan: true/false    (boolean, defaults to false)
-		MountainUkar: true/false  (boolean, defaults to false)
+		LightRaijin: true/false   (boolean, defaults to false)
+		DarkRaijin: true/false    (boolean, defaults to false)
+		FireKralog: true/false    (boolean, defaults to false)
+		FrostKralog: true/false   (boolean, defaults to false)
 	}
 	Job: Job mask                 (alternate format, int, defaults to all jobs = 0xFFFFFFFF)
 	Upper: Upper mask             (bitmask array, string or int, defaults to "ITEMUPPER_ALL")
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 58de235f..770da909 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -51,7 +51,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 }
 */
 //====================================================
-Viro: {
+Talpan: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
@@ -329,18 +329,18 @@ DarkRaijin: {
 	Inherit: ( "LightRaijin" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
 }
 
-ArgaesViro: {
+ArgaesTalpan: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Inherit: ( "Viro" );
+	Inherit: ( "Talpan" );
 }
 
-TonoriViro: {
+TonoriTalpan: {
 	BaseExpGroup: "EvolClasses"
 	JobExpGroup: "EvolClasses"
 	MoveSpeed: 150
-	Inherit: ( "Viro" );
+	Inherit: ( "Talpan" );
 }
 
 LakeTritan: {
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 8f26f66c..3ccf91ff 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -25,7 +25,7 @@ Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so
 */
 //====================================================
 
-Viro: {
+Talpan: {
 	skills: {
 		EVOL_CRAFTING: 0
 		SM_SWORD: 0
@@ -557,10 +557,10 @@ MountainUkar: {
 	inherit: ( "CaveUkar" );
 }
 
-ArgaesViro: {
-	inherit: ( "Viro" );
+ArgaesTalpan: {
+	inherit: ( "Talpan" );
 }
 
-TonoriViro: {
-	inherit: ( "Viro" );
+TonoriTalpan: {
+	inherit: ( "Talpan" );
 }
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index e95d59eb..fed8d21c 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -4,6 +4,7 @@
 //    Qwerty Dragon
 //    Reid
 //    Vasily_Makarov
+//    Jesusalva
 // Description:
 //    Starting script of Evol Online.
 
@@ -14,7 +15,7 @@ OnTouch:
     .@lang = requestlang();
     if (.@lang >= 0 && .@lang <= MAX_LANG) Lang = .@lang;
 
-    mesn "Narrator";
+    mesn l("Narrator");
     mesc(l("You are on a raft, adrift in the sea."), 9);
     next;
     mesc(l("With hunger, thirst, and sleep as your only companions, you have the disturbing realization that you can't remember anything of your former life or identity."), 9);
@@ -29,22 +30,22 @@ OnTouch:
     next;
 
     setcamnpc "Sailors", -64, -32;
-    mesn "Kralog Voice";
+    mesn l("Kralog Voice");
     mesq lg("Hey Frenchy!");
     next;
 
     setcamnpc "Sailors", 0, -32;
-    mesn "Viro Voice";
+    mesn l("Human Voice");
     mesq lg("I think he's from the East...");
     next;
 
     setcamnpc "Sailors", 144, -80;
-    mesn "Tritan Voice";
+    mesn l("Tritan Voice");
     mesq lg("What are you guys saying ? It's a Yoiis!");
     next;
 
     setcamnpc;
-    mesn "Raijin Voice";
+    mesn l("Raijin Voice");
     mesq lg("You think she's from the East? As in... Ancea?", "You think he's from the East? As in... Ancea?");
     next;
     mesq l("Hey you! Can you hear us? Are you okay?");
@@ -74,7 +75,7 @@ OnTouch:
     next;
     restorecam;
 
-    mesn "Narrator";
+    mesn l("Narrator");
     mesc(l("The sailors take you aboard their ship."), 9);
     next;
     mesc(l("Click on the NPCs (Non-Player Characters) around you to continue the introduction."), 9);
diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt
index f8eb231b..ea5868c9 100644
--- a/npc/001-2-6/books.txt
+++ b/npc/001-2-6/books.txt
@@ -151,7 +151,7 @@ OnInit:
         narrator(S_FIRST_BLANK_LINE,
             l("Aemil was once a magnificent land unknown to us all."),
             l("Before the end of the Mana War, a band of adventurers formed in the Ancean region of Argaes from those who had lost their homes and families."),
-            l("They sailed from Hurnscald to Tulimshar and then Nivalis, the last permanent settlements of viros."),
+            l("They sailed from Hurnscald to Tulimshar and then Nivalis, the last permanent settlements of talpans."),
             l("There, they gathered merchants and warriors to join them in a journey to find a new land on which to live."),
             l("The group found the support of Tulimshar's merchant lords and was given ships to sail east."),
             l("They sailed past the Clear Sea and towards the Long Ocean which nobody had explored before."),
@@ -218,10 +218,10 @@ OnInit:
             l("World Story For Dummies, Vol I - Ancean Era: From Keshlam to an Empire"),
             l("The collection of four books entitled “World Story For Dummies” is based on the uncessable work from the Ukar scholars, thanks to whom this wouldn't be possible."),
             l("The “Ancean Era” is a term used to defined the time period between the beginning of recorded history and the events at the Mana Tree, and thanks to Ukar scholars, this is widely accepted as year 1 on all Gasaron."),
-            l("The first viro settlement to develop an advanced political structure and to become a city-state was Keshlam."),
+            l("The first talpan settlement to develop an advanced political structure and to become a city-state was Keshlam."),
             l("Keshlam expanded rapidly under the rule of King Janeb the Founder, and soon annexed the whole Ancea continent - excluding solely the Land Of Fire - to its domains, creating the Platinum Kingdom."),
             l("Three cities developed on the eastern side of Ancea: Tulimshar, Hurnscald and Nivalis."),
-            l("The Platinum Kingdom grew and prospered, and drew most of the viro population to the safety of the walls of Keshlam, Tulimshar, Hurnscald and Nivalis."),
+            l("The Platinum Kingdom grew and prospered, and drew most of the talpan population to the safety of the walls of Keshlam, Tulimshar, Hurnscald and Nivalis."),
 
             l("-- Continues on Volume II --"));
     }
@@ -252,7 +252,7 @@ OnInit:
             l("World Story For Dummies, Vol II - Ancean Era: Revolutions and Independence"),
             l("On the year 206CCE, after a long crisis of succession, a minor noble only known as Queen Platyna the Red came to inherit the Platinum Crown."),
             l("Due to neglect with day-to-day administration, which she delegated to her council, and uncontrolled expenses, the kingdom faced its first economic crisis."),
-            l("With the growth of the Kingdom halted, slow maintenance, and two great famines which killed over half the viro population, the council decided to seize power and depose Platyna the Red."),
+            l("With the growth of the Kingdom halted, slow maintenance, and two great famines which killed over half the talpan population, the council decided to seize power and depose Platyna the Red."),
             l("On March 213CCE, Chancellor Benjamin Frost, with support of the council, proclaimed the Republic of Ancea. This event would become known as the Blue Revolution."),
             l("Frost held the title of Lord Prince of the Republic for eighteen months, when the council deposed him and declared itself head of the state."),
             l("The Republic of Ancea ceased to exist officially in August 216CCE, when the cities of Tulimshar, Hurnscald and Nivalis installed their own independent governments."),
@@ -287,15 +287,15 @@ OnInit:
         narrator(S_FIRST_BLANK_LINE | S_NO_NPC_NAME,
             l("World Story For Dummies, Vol III - Aemilean Era: The Mana Tree and The Mana War"),
             l("Aemilean Era. Tulimshar, Hurnscald and Nivalis held power of their surrounding lands, except for the Land Of Fire and Keshlam City."),
-            l("All races were in peace until the Viros set forth to discover the Source of Magic, based on Ukar scholars studies."),
+            l("All races were in peace until the talpans set forth to discover the Source of Magic, based on Ukar scholars studies."),
             l("Free Mana travels in many directions, and this search took several years before the expedition finally found the right direction to follow."),
             l("A large tree was found in a deep cave underneath the island of Candor. Despise the darkness of the cave and absence of leaves, the tree grew strong. It gave light off itself and its energy empowered the wizards."),
             l("The tree was entitled The Mana Tree, and the Wizard Order took control over Candor Island. They learnt to control the mana flow, and limited its use, claiming Magic to be too dangerous for public use."),
             l("This action was met with widespread opposition from all races, and a war broke. The tritans led the offensive, in attempts to keep the tree untouched and mana available for all."),
-            l("Unable to win, the tritans attacked Hurnscald. While viro troops moved in attempts to avoid its fall, the Kralog and Ukar joined the tritans and they took the city."),
+            l("Unable to win, the tritans attacked Hurnscald. While talpan troops moved in attempts to avoid its fall, the Kralog and Ukar joined the tritans and they took the city."),
             l("The next and final battle happened at Candor. Wizards attacks from both sides near the Mana Tree provoked a Mana Storm. A Great Quake shook the earth of Ancea and the land began to split. Geography changed, and Keshlan vanished from the map."),
             l("The Mana Tree was lost, the caves entrances destroyed, and the Wizard Order was split in two: One part was on Candor, and other at the Magic Tower."),
-            l("After this war, the Raijin race was born. A race born of Magic. Viros encapsulated in a Mana storm and altered forever."),
+            l("After this war, the Raijin race was born. A race born of Magic. Talpans encapsulated in a Mana storm and altered forever."),
 
             l("-- Continues on Volume IV --"));
     }
@@ -325,7 +325,7 @@ OnInit:
         narrator(S_FIRST_BLANK_LINE | S_NO_NPC_NAME,
             l("World Story For Dummies, Vol IV - Aemilean Era: The Fleet of Ancea"),
             l("After the Mana War, the Ancea continent was mostly destroyed. It would take years to nature start repairing the damage of the event."),
-            l("A band of adventurers formed in Argaes from those who had lost their homes and families. They visited the three permanent viro settlements: Tulimshar, Hurnscald and Nivalis."),
+            l("A band of adventurers formed in Argaes from those who had lost their homes and families. They visited the three permanent talpan settlements: Tulimshar, Hurnscald and Nivalis."),
             l("They gathered merchants and warriors to join them in a journey to find new lands to live in. Tulimshar's merchant lords gave them ships to sail east."),
             l("The newly created Fleet of Ancea travelled so far that they were never heard from again. They found a continent, present on legends of explorers who never came back."),
             l("They named this continent as Aemil, in honour of one of such explorers. The area they docked in was called Aurora, after its beautiful sunrise."),
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 3d2e3014..9f695af5 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -138,9 +138,9 @@ function	script	BarberChangeRace	{
 
     mes l("What's your race?");
     menuint
-        get_race(GETRACE_FULL, KaizeiViro), KaizeiViro,
-        get_race(GETRACE_FULL, ArgaesViro), ArgaesViro,
-        get_race(GETRACE_FULL, TonoriViro), TonoriViro,
+        get_race(GETRACE_FULL, KaizeiTalpan), KaizeiTalpan,
+        get_race(GETRACE_FULL, ArgaesTalpan), ArgaesTalpan,
+        get_race(GETRACE_FULL, TonoriTalpan), TonoriTalpan,
         get_race(GETRACE_FULL, CaveUkar), CaveUkar,
         get_race(GETRACE_FULL, MountainUkar), MountainUkar,
         get_race(GETRACE_FULL, SeaTritan), SeaTritan,
@@ -163,3 +163,6 @@ function	script	BarberChangeRace	{
     jobchange(@menuret); // STUPID idea, but imposed by Hercules
     return;
 }
+
+
+
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 3be6b6fb..92c06739 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -289,7 +289,7 @@ function	script	get_race	{
     // We also allow this to run without player attached for... science.
     if (playerattached())
     {
-        setarray .@allraces$, l("Viro"), l("Viro"), l("Viro"),
+        setarray .@allraces$, l("Human"), l("Human"), l("Human"),
                               l("Ukar"), l("Ukar"),
                               l("Tritan"), l("Tritan"),
                               l("Raijin"), l("Raijin"),
@@ -302,7 +302,7 @@ function	script	get_race	{
     }
     else
     {
-        setarray .@allraces$, ("Viro"), ("Viro"), ("Viro"),
+        setarray .@allraces$, ("Human"), ("Human"), ("Human"),
                               ("Ukar"), ("Ukar"),
                               ("Tritan"), ("Tritan"),
                               ("Raijin"), ("Raijin"),