Prepare 4 new scroll types based on Guild skills.

Level C applies to all friendlies - covering homuns and mercs.
Otherwise, Level C and Level B have similar effects, unlike Magnus Heal C

3 files changed, 193 insertions, 13 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 91181b120..cc3d16010 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -19003,8 +19003,8 @@ item_db: (
 	AegisName: "ScrollMagnusHealA"
 	Name: "Scroll Magnus Heal"
 	Type: "IT_USABLE"
-	Buy: 25000
-	Sell: 250
+	Buy: 20000
+	Sell: 200
 	Weight: 10
 	Refine: false
 	Delay: 1500
@@ -19019,8 +19019,8 @@ item_db: (
 	AegisName: "ScrollMagnusHealB"
 	Name: "Scroll Magnus Heal+"
 	Type: "IT_USABLE"
-	Buy: 25000
-	Sell: 250
+	Buy: 40000
+	Sell: 400
 	Weight: 10
 	Refine: false
 	Delay: 1500
@@ -19035,8 +19035,8 @@ item_db: (
 	AegisName: "ScrollMagnusHealC"
 	Name: "Scroll Magnus Heal++"
 	Type: "IT_USABLE"
-	Buy: 25000
-	Sell: 250
+	Buy: 75000
+	Sell: 750
 	Weight: 10
 	Refine: false
 	Delay: 1500
@@ -19046,6 +19046,174 @@ item_db: (
 		callfunc "HUB_SkillInvoke";
 	">
 },
+{
+	Id: 8040
+	AegisName: "ScrollAngelLightA"
+	Name: "Scroll Angel Light"
+	Type: "IT_USABLE"
+	Buy: 20000
+	Sell: 200
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_regenerating", 1, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8041
+	AegisName: "ScrollAngelLightB"
+	Name: "Scroll Angel Light+"
+	Type: "IT_USABLE"
+	Buy: 40000
+	Sell: 400
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_regenerating", 5, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8042
+	AegisName: "ScrollAngelLightC"
+	Name: "Scroll Angel Light++"
+	Type: "IT_USABLE"
+	Buy: 75000
+	Sell: 750
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_regenerating", 5, "filter_friendly";
+	">
+},
+{
+	Id: 8043
+	AegisName: "ScrollBattlePlansA"
+	Name: "Scroll Battle Plans"
+	Type: "IT_USABLE"
+	Buy: 20000
+	Sell: 200
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_atkboost", 1, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8044
+	AegisName: "ScrollBattlePlansB"
+	Name: "Scroll Battle Plans+"
+	Type: "IT_USABLE"
+	Buy: 40000
+	Sell: 400
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_atkboost", 5, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8045
+	AegisName: "ScrollBattlePlansC"
+	Name: "Scroll Battle Plans++"
+	Type: "IT_USABLE"
+	Buy: 75000
+	Sell: 750
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_atkboost", 5, "filter_friendly";
+	">
+},
+{
+	Id: 8046
+	AegisName: "ScrollDefenseBlessA"
+	Name: "Scroll Defense Bless"
+	Type: "IT_USABLE"
+	Buy: 20000
+	Sell: 200
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_defboost", 1, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8047
+	AegisName: "ScrollDefenseBlessB"
+	Name: "Scroll Defense Bless+"
+	Type: "IT_USABLE"
+	Buy: 40000
+	Sell: 400
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_defboost", 5, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8048
+	AegisName: "ScrollDefenseBlessC"
+	Name: "Scroll Defense Bless++"
+	Type: "IT_USABLE"
+	Buy: 75000
+	Sell: 750
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_defboost", 5, "filter_friendly";
+	">
+},
+{
+	Id: 8049
+	AegisName: "ScrollCriticalFortuneA"
+	Name: "Scroll Critical Fortune"
+	Type: "IT_USABLE"
+	Buy: 20000
+	Sell: 200
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_critboost", 1, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8050
+	AegisName: "ScrollCriticalFortuneB"
+	Name: "Scroll Critical Fortune+"
+	Type: "IT_USABLE"
+	Buy: 40000
+	Sell: 400
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_critboost", 5, "filter_sameguildorparty";
+	">
+},
+{
+	Id: 8051
+	AegisName: "ScrollCriticalFortuneC"
+	Name: "Scroll Critical Fortune++"
+	Type: "IT_USABLE"
+	Buy: 75000
+	Sell: 750
+	Weight: 10
+	Refine: false
+	Delay: 1500
+	Script: <"
+		callfunc "GD_critboost", 5, "filter_friendly";
+	">
+},
 
 )
 
diff --git a/npc/craft/alchemy.txt b/npc/craft/alchemy.txt
index 11681847e..f55331841 100644
--- a/npc/craft/alchemy.txt
+++ b/npc/craft/alchemy.txt
@@ -123,6 +123,12 @@ For all Scrolls: Quill + ? (depends on scroll itself)
 	» Magnus Heal (Lifestone)
 	» Area Provoke? → Scent grenade?
 	» Guild Skills?
+		» ScrollAngelLightA
+		» ScrollBattlePlansA
+		» ScrollDefenseBlessA
+		» ScrollCriticalFortuneA
+	→ TODO: Kyrie Eleison (Absolute Shield)
+	→ With self-stun, makes you a temporary wall?
 
 		// Skills for Aegis Shield, all beyond maximum level
 		// Slimes, Snakes, Fairies, Darth Duck, Mr. Prickel
diff --git a/npc/magic/guild.txt b/npc/magic/guild.txt
index 6eed7c750..39da57092 100644
--- a/npc/magic/guild.txt
+++ b/npc/magic/guild.txt
@@ -53,12 +53,13 @@ Increase HIT of players in the area of effect by +2 per SkillLV. The accuracy ra
 
 */
 
-// GD_allboost ( lv )
+// GD_allboost ( lv{, target} )
 // Increases all stats
 function	script	GD_allboost	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, power, filter
-    areasc(3+.@lv, 40000+(5000*.@lv), SC_INCALLSTATUS, BL_PC, .@lv, "filter_sameguild");
+    areasc(3+.@lv, 40000+(5000*.@lv), SC_INCALLSTATUS, BL_PC, .@lv, .@t$);
     return;
 }
 
@@ -67,8 +68,9 @@ function	script	GD_allboost	{
 // 12x12 HP and MP recovery
 function	script	GD_regenerating	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, power, filter
-    areasc(12, 8000+(1000*.@lv), SC_GDSKILL_REGENERATION, BL_PC, 15+(5*.@lv), "filter_sameguild");
+    areasc(12, 8000+(1000*.@lv), SC_GDSKILL_REGENERATION, BL_PC, 15+(5*.@lv), .@t$);
     return;
 }
 
@@ -77,8 +79,9 @@ function	script	GD_regenerating	{
 // Places a temporary buff on the user and all party members in a 14x14 area around the user that increases Soft Defense. (VIT def)
 function	script	GD_defboost	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, power, filter
-    areasc(4+.@lv, 40000+(5000*.@lv), SC_ANGELUS, BL_PC, .@lv*4, "filter_sameguild");
+    areasc(4+.@lv, 40000+(5000*.@lv), SC_ANGELUS, BL_PC, .@lv*4, .@t$);
     return;
 }
 
@@ -87,8 +90,9 @@ function	script	GD_defboost	{
 // Places a temporary buff on a single target that increases STR, DEX and INT. (The damage dealing stats)
 function	script	GD_atkboost	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, power, filter
-    areasc(4+.@lv, 40000+(5000*.@lv), SC_BLESSING, BL_PC, .@lv, "filter_sameguild");
+    areasc(4+.@lv, 40000+(5000*.@lv), SC_BLESSING, BL_PC, .@lv, .@t$);
     return;
 }
 
@@ -97,8 +101,9 @@ function	script	GD_atkboost	{
 // Blesses a single target's weapon to increase its attack power
 function	script	GD_atkboost2	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, power, filter
-    areasc(4+.@lv, 40000+(5000*.@lv), SC_IMPOSITIO, BL_PC, 5+(5*.@lv), "filter_sameguild");
+    areasc(4+.@lv, 40000+(5000*.@lv), SC_IMPOSITIO, BL_PC, 5+(5*.@lv), .@t$);
     return;
 }
 
@@ -107,8 +112,9 @@ function	script	GD_atkboost2	{
 // Boost the critical hit rate
 function	script	GD_critboost	{
     .@lv=getarg(0, @skillLv);
+    .@t$=getarg(1, "filter_sameguild");
     // range, time, SC, BL, 1, power, filter
-    areasc(1+.@lv, 30000+(5000*.@lv), SC_FORTUNE, BL_PC, 8*.@lv, "filter_sameguild");
+    areasc(1+.@lv, 30000+(5000*.@lv), SC_FORTUNE, BL_PC, 8*.@lv, .@t$);
     return;
 }