Merge branch 'jesusalva/faction' into 'master'

Factions Utils - For Future Use

See merge request evol/serverdata!245

3 files changed, 30 insertions, 34 deletions

diff --git a/db/clans.conf b/db/clans.conf
index 3167ce6b..0c73ca41 100644
--- a/db/clans.conf
+++ b/db/clans.conf
@@ -56,86 +56,82 @@ clans: (
 	**************************************************************************/
 	{
 		Id: 1
-		Const: "SWORDCLAN"
-		Name: "Sword Clan"
-		Leader: "Raffam Oranpere"
-		Map: "001-1"
+		Const: "FACTION_LEGION"
+		Name: "Legion of Aemil"
+		Leader: "Q'Anon"
+		Map: "001-2-39"
 		Buff: {
 			Icon: "SI_SWORDCLAN"
 			Script: <"
-				bonus(bStr, 1);
+				bonus(bStr, 2);
 				bonus(bVit, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
+		Antagonists: [
+			"FACTION_BROTHERHOOD",
 		]
 	},
 	{
 		Id: 2
-		Const: "ARCWANDCLAN"
-		Name: "Arc Wand Clan"
-		Leader: "Devon Aire"
+		Const: "FACTION_BROTHERHOOD"
+		Name: "Brotherhood of Argaes"
+		Leader: "Jonatas"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_ARCWANDCLAN"
 			Script: <"
-				bonus(bInt, 1);
-				bonus(bDex, 1);
+				bonus(bDex, 2);
+				bonus(bAgi, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
-		]
 		Antagonists: [
-			"CROSSBOWCLAN",
+			"FACTION_LEGION",
 		]
 	},
 	{
 		Id: 3
-		Const: "GOLDENMACECLAN"
-		Name: "Golden Mace Clan"
-		Leader: "Berman Aire"
+		Const: "FACTION_THIEF"
+		Name: "The Thieves"
+		Leader: "Tanveer"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_GOLDENMACECLAN"
 			Script: <"
-				bonus(bInt, 1);
-				bonus(bLuk, 1);
+				bonus(bLuk, 2);
+				bonus(bDex, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
 		Allies: [
-			"SWORDCLAN",
-			"ARCWANDCLAN",
-			"CROSSBOWCLAN",
+			"FACTION_LEGION",
+			"FACTION_BROTHERHOOD",
+		]
+		Antagonists: [
+			"FACTION_MAGES",
 		]
 	},
 	{
 		Id: 4
-		Const: "CROSSBOWCLAN"
-		Name: "Crossbow Clan"
-		Leader: "Shaam Rumi"
+		Const: "FACTION_MAGES"
+		Name: "The Magic Guild"
+		Leader: "Hocus Pocus Fidibus"
 		Map: "001-1"
 		Buff: {
 			Icon: "SI_CROSSBOWCLAN"
 			Script: <"
-				bonus(bDex, 1);
+				bonus(bInt, 2);
 				bonus(bAgi, 1);
 				bonus(bMaxHP, 30);
 				bonus(bMaxSP, 10);
 			">
 		}
-		Allies: [
-			"GOLDENMACECLAN",
-		]
 		Antagonists: [
-			"ARCWANDCLAN",
+			"FACTION_THIEF",
 		]
 	},
 )
diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt
index 427a97ca..e2273850 100644
--- a/npc/001-2-39/qanon.txt
+++ b/npc/001-2-39/qanon.txt
@@ -85,7 +85,7 @@ function legionState {
     // minor guilds: Merchants, Thieves and Mages.
 
     // It would be the commands below:
-    // join_clan(CLAN_LEGION);
+    // join_clan(FACTION_LEGION);
     // clan_leave();
     return;
 }
diff --git a/npc/008-3-5/nunia.txt b/npc/008-3-5/nunia.txt
index f87a32d9..b2234dff 100644
--- a/npc/008-3-5/nunia.txt
+++ b/npc/008-3-5/nunia.txt
@@ -71,7 +71,7 @@ function nuniaBegin {
         l("At least, you look peaceful. And I see by your fingers that you can deal with lockpicks."),
         l("I am going to teach you all what a thief needs to know, later"),
         l("Call for Micksha and Jesusalva to implement all this, please."),
-        l("And Tezer, our president in Tulimshar, should be able to give you even more training.");
+        l("And Tanveer, our president in Tulimshar, should be able to give you even more training.");
     return;
 }