Rewrite Skill Tree to fit better, add the two class "skills" server-side

2 files changed, 27 insertions, 325 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 17974a80e..3a36ab782 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38293,4 +38293,22 @@ skill_db: (
         Self: true
     }
 },
+{
+    Id: 20010
+    Name: "MAGIC_WARRIOR"
+    Description: "Magic Warrior"
+    MaxLevel: 1
+    SkillType: {
+        Self: true
+    }
+},
+{
+    Id: 20011
+    Name: "WIZARD_MAGE"
+    Description: "Wizard Mage"
+    MaxLevel: 1
+    SkillType: {
+        Self: true
+    }
+},
 )
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 5120553cb..1c0b95d44 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -81,347 +81,31 @@ Human: {
 		WE_CALLPARTNER: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		MAGIC_WARRIOR: 0
+		WIZARD_MAGE: 0
 	}
 }
 
 Ukar: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+	inherit: ( "Human" );
 }
 
-Demon: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+Redy: {
+	inherit: ( "Human" );
 }
 
 Elven: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+	inherit: ( "Human" );
 }
 
 Orc: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+	inherit: ( "Human" );
 }
 
 Raijin: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+	inherit: ( "Human" );
 }
 
 Tritan: {
-	skills: {
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-	}
+	inherit: ( "Human" );
 }