Allow all chars to make parties by default, and remove some older code.

4 files changed, 70 insertions, 12 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 87d42fc4..b64c041c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -5286,7 +5286,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	FSKILL_RAGING:          32
 	FSKILL_TOTAL:           6
 
-	AC_VULTURE:     43 // i.e. Mallard's Eye, compatibility purposes
+	AC_VULTURE:     44 // i.e. Mallard's Eye, compatibility purposes
 
 	comment__: "TMW Constants"
 	bDeaf:70
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 04a80ea7..ada2cd19 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -38489,6 +38489,70 @@ skill_db: (
 },
 {
 	Id: 20010
+	Name: "SKILL_MAGIC"
+	Description: "Basic Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20011
+	Name: "SKILL_MAGIC_LIFE"
+	Description: "Life Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20012
+	Name: "SKILL_MAGIC_WAR"
+	Description: "War Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20013
+	Name: "SKILL_MAGIC_TRANSMUTE"
+	Description: "Transmute Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20014
+	Name: "SKILL_MAGIC_NATURE"
+	Description: "Nature Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20015
+	Name: "SKILL_MAGIC_ASTRAL"
+	Description: "Astral Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20016
+	Name: "SKILL_MAGIC_DARK"
+	Description: "Dark Magic"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+// 20017~20020 reserved (expansion)
+{
+	Id: 20020
 	Name: "EVOL_AREA_PROVOKE"
 	Description: "Itenplz"
 	MaxLevel: 9
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index f14d1363..6aa0510d 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -53,9 +53,7 @@ L_ResetStatusPoints:
     goto L_Begin;
 
 L_BasicSkills:
-    skill SKILL_EMOTE, 6, 0;
-    //addtoskill SKILL_TRADE, 0;
-    //addtoskill SKILL_PARTY, 0;
+    adddefaultskills();
     goto L_Begin;
 
 L_FocusSkills:
@@ -572,9 +570,7 @@ L_ResetMagicSkills:
     goto L_MagicSkills;
 
 L_AddAll:
-    addtoskill SKILL_EMOTE, 1;
-    addtoskill SKILL_TRADE, 1;
-    addtoskill SKILL_PARTY, 2;
+    adddefaultskills();
     addtoskill SKILL_POOL, 1;
     addtoskill SKILL_MALLARDS_EYE, 9;
     addtoskill SKILL_BRAWLING, 9;
@@ -602,9 +598,7 @@ L_ResetAll:
     cleararray @skilllist_name$[0], "", 8;
     cleararray @skilllist_id[0], 0, 8;
     cleararray @skilllist_count[0], 0, 8;
-    addtoskill SKILL_EMOTE, 0;
-    addtoskill SKILL_TRADE, 0;
-    addtoskill SKILL_PARTY, 0;
+    //adddefaultskills();
     addtoskill SKILL_POOL, 0;
     addtoskill SKILL_MALLARDS_EYE, 0;
     addtoskill SKILL_BRAWLING, 0;
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 18441094..58d1bff0 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -81,8 +81,8 @@ function	script	col	{
 }
 
 function	script	adddefaultskills	{
-    if (getskilllv(NV_BASIC) < 6) {
-        skill NV_BASIC, 6, 0;
+    if (getskilllv(NV_BASIC) < 7) {
+        skill NV_BASIC, 7, 0;
     }
     if (getskilllv(TMW2_FAKESKILL) < 1) {
         skill TMW2_FAKESKILL, 1, 0;