Register the new guild skills, so they become operational

4 files changed, 185 insertions, 4 deletions

diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 1089b428a..d45045c78 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38575,6 +38575,7 @@ skill_db: (
 	SkillType: {
 		Self: true
 	}
+	CoolDown: 1000
 	Requirements: {
 		SPCost: 35
 	}
@@ -38588,6 +38589,150 @@ skill_db: (
 		Passive: true
 	}
 },
+{
+	Id: 20011
+	Name: "TMW2_GD_INCALL"
+	Description: "Guild Increase All"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20012
+	Name: "TMW2_GD_REGEN"
+	Description: "Guild Skill Regeneration"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20013
+	Name: "TMW2_GD_DEFUP"
+	Description: "Guild Skill DEF UP"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20014
+	Name: "TMW2_GD_BATTLEPLAN"
+	Description: "Guild Skill Battle Plan"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20015
+	Name: "TMW2_GD_ATKUP"
+	Description: "Guild Skill ATK UP"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20016
+	Name: "TMW2_GD_CRITUP"
+	Description: "Guild Skill CRIT UP"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20017
+	Name: "TMW2_GD_AUTOREVIVE"
+	Description: "Guild Skill Autorevive"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20018
+	Name: "TMW2_GDP_MAXPOWER"
+	Description: "Group Skill Maximum Damage"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
+{
+	Id: 20019
+	Name: "TMW2_GDP_SPREGEN"
+	Description: "Group Skill MP Regen"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	CoolDown: 30000
+	Requirements: {
+		SPCost: 35
+		Items: {
+			GuildCoin: 1
+		}
+	}
+},
 // 20021 end of Evol Reserved Space
 {
 	Id: 20022
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 590f139ed..f545379cf 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -168,6 +168,15 @@ Human: {
 		GD_EMERGENCYCALL: 0
 
 		// Guild Skills (beta)
+		TMW2_GD_INCALL: 0
+		TMW2_GD_REGEN: 0
+		TMW2_GD_DEFUP: 0
+		TMW2_GD_BATTLEPLAN: 0
+		TMW2_GD_ATKUP: 0
+		TMW2_GD_CRITUP: 0
+		TMW2_GD_AUTOREVIVE: 0
+		TMW2_GDP_MAXPOWER: 0
+		TMW2_GDP_SPREGEN: 0
 
 		/*
 		WZ_STORMGUST: 3
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 454560554..8ab0802a3 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -218,6 +218,33 @@ function	script	HUB_SkillInvoke	{
         case EVOL_AREA_PROVOKE:
             massprovoke(@skillLv);
             break;
+        case TMW2_GD_INCALL:
+            GD_allboost();
+            break;
+        case TMW2_GD_REGEN:
+            GD_regeneration();
+            break;
+        case TMW2_GD_DEFUP:
+            GD_defboost();
+            break;
+        case TMW2_GD_BATTLEPLAN:
+            GD_atkboost();
+            break;
+        case TMW2_GD_ATKUP:
+            GD_atkboost2();
+            break;
+        case TMW2_GD_CRITUP:
+            GD_critboost();
+            break;
+        case TMW2_GD_AUTOREVIVE:
+            GD_autorevive();
+            break;
+        case TMW2_GDP_MAXPOWER:
+            SK_maximizepower();
+            break;
+        case TMW2_GDP_SPREGEN:
+            SK_spregen();
+            break;
         case TMW2_FAKESKILL2:
             //CMD_lang(); next; closeclientdialog;
             CMD_toevent();
diff --git a/npc/magic/guild.txt b/npc/magic/guild.txt
index dcb7400e7..151a95154 100644
--- a/npc/magic/guild.txt
+++ b/npc/magic/guild.txt
@@ -139,9 +139,9 @@ function	script	GD_autorevive	{
 
 
 
-// maximizepower ( lv )
+// SK_maximizepower ( lv )
 // Damage always at max
-function	script	maximizepower	{
+function	script	SK_maximizepower	{
     .@lv=getarg(0, @skillLv);
     // range, time, SC, BL, power, filter
     areasc(1+.@lv, 60000*.@lv, SC_MAXIMIZEPOWER, BL_PC, 1, "filter_sameguildorparty");
@@ -149,9 +149,9 @@ function	script	maximizepower	{
 }
 
 
-// GD_spregen ( lv )
+// SK_spregen ( lv )
 // Temporarily doubles the SP Recovery rate of the user.
-function	script	GD_spregen	{
+function	script	SK_spregen	{
     .@lv=getarg(0, @skillLv);
     // range, time, SC, BL, 1, power, filter
     areasc(.@lv, 20000*.@lv, SC_MAGNIFICAT, BL_PC, 1, "filter_sameguildorparty");