Add new Betsanc and Asorm

5 files changed, 97 insertions, 2 deletions

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 50d4e6a7..d8b1323a 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -38955,6 +38955,44 @@ skill_db: (
 		}
 	}
 },
+{
+	Id: 20038
+	Name: "SKILL_BETSANC"
+	Description: "Betsanc"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	CoolDown: 3500
+	Requirements: {
+		SPCost: 14
+		Items: {
+			HardSpike: 0
+		}
+	}
+},
+{
+	Id: 20039
+	Name: "SKILL_ASORM"
+	Description: "Asorm"
+	MaxLevel: 9
+	SkillType: {
+		Self: true
+	}
+	SkillInfo: {
+		Quest: true
+	}
+	CoolDown: 3000
+	Requirements: {
+		SPCost: 15
+		Items: {
+			SmallMushroom: 0
+		}
+	}
+},
 // MakeSulphur Parum EnchantLifestone MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop
 // Kalmurk MagicBlade ToxicDart Ingrav Knuclkes ArrowHail Joyplim Barrier(OK?) FlyingBackpack(?) Hide(?) Protect Shear Detsanc
 )
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 67f6dc41..0c78fef9 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -77,7 +77,6 @@ Talpan: {
 		SKILL_LUM: 9
 
 		// Level 2
-		EVOL_PHYSICAL_SHIELD: 5
 		SKILL_INMA: 9
 		SKILL_KALAKARENK: 9
 		SKILL_KALBOO: 9
@@ -86,6 +85,8 @@ Talpan: {
 		SKILL_HALHISS: 9
 		SKILL_HELORP: 9
 		SKILL_KAFLOSH: 9
+		SKILL_BETSANC: 9
+		SKILL_ASORM: 9
 
 		// Level 3
 		// Level 4
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index e6f17617..a60f51ad 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -64,6 +64,10 @@ function	script	HUB_SkillInvoke	{
              SK_SummonLv2(); break;
         case SKILL_KAFLOSH:
              SK_Kaflosh(); break;
+        case SKILL_BETSANC:
+             SK_Betsanc(); break;
+        case SKILL_ASORM:
+             SK_Asorm(); break;
         // Level 3
         // Level 4
         // Level 5
diff --git a/npc/magic/level2-protect.txt b/npc/magic/level2-protect.txt
new file mode 100644
index 00000000..19682245
--- /dev/null
+++ b/npc/magic/level2-protect.txt
@@ -0,0 +1,51 @@
+// The Mana World script
+// Author: Jesusalva <jesusalva@themanaworld.org>
+//
+// Magic Script: Betsanc and Asorm (Level 1)
+// School: Nature/Astral 2
+
+function	script	SK_Betsanc	{
+    // party-guild filter
+    if (!filter_sameguildorparty(@skillTarget)) {
+        dispbottom b("Betsanc: ")+l("Skill can only be cast on party or guild members!");
+        return;
+    }
+    // no GM Hat/Bots? Not needed due filter?
+    delitem HardSpike, 1;
+    // Same duration as Kaflosh
+    .@PW=80+(20*@skillLv);
+    .@dmg=AdjustSpellpower(.@PW);
+    .@time=5+.@dmg/11;
+    .@PX=10+cap_value(.@dmg/33, 0, 20);
+    // SC, Time, DEF+, ASPD-
+    sc_start2(SC_PHYSICAL_SHIELD, .@time, .@PX*2, .@PX, 10000,
+             SCFLAG_NOAVOID|SCFLAG_FIXEDTICK|SCFLAG_FIXEDRATE, @skillTarget);
+    specialeffect FX_MAGIC_SHIELD_CAST, AREA, @skillTarget;
+    GetManaExp(@skillId, 2);
+    return;
+}
+
+function	script	SK_Asorm	{
+    // party-guild filter
+    if (!filter_sameguildorparty(@skillTarget)) {
+        dispbottom b("Betsanc: ")+l("Skill can only be cast on party or guild members!");
+        return;
+    }
+    // no GM Hat/Bots? Not needed due filter?
+    delitem SmallMushroom, 1;
+    // Same duration as Kaflosh
+    .@PW=80+(20*@skillLv);
+    .@dmg=AdjustSpellpower(.@PW);
+    .@time=5+.@dmg/11;
+    .@PX=10+cap_value(.@dmg/33, 0, 20);
+    // SC_STONESKIN(??, def, mdef); Usually for mobs. Skill NPC_ANTIMAGIC
+    // SC_FREYJASCROLL(MDEF, PerfectFlee)
+    // SC_MDEFSET(MDEF)
+    // SC, Time, MDEF+
+    sc_start(SC_MDEFSET, .@time, .@PX*2, 10000,
+             SCFLAG_NOAVOID|SCFLAG_FIXEDTICK|SCFLAG_FIXEDRATE, @skillTarget);
+    specialeffect FX_MAGIC_BARRIER_HIT, AREA, @skillTarget;
+    GetManaExp(@skillId, 2);
+    return;
+}
+
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 95ff9137..a41f2967 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -18,6 +18,7 @@
 "npc/functions/random-talk.txt",
 "npc/functions/inc_sc_bonus.txt",
 "npc/commands/kami.txt",
+"npc/functions/filters.txt",
 
 // Main Functions
 "npc/functions/banker.txt",
@@ -75,6 +76,7 @@
 "npc/magic/level1-grow-plants.txt",
 "npc/magic/level1-lesser-heal.txt",
 "npc/magic/level2-lay-on-hands.txt",
+"npc/magic/level2-protect.txt",
 "npc/magic/level2-rain.txt",
 "npc/magic/level2-summon-monsters.txt",
 "npc/magic/final.txt",
@@ -111,7 +113,6 @@
 "npc/annuals/halloween/trick_or_treat.txt",
 
 // Post Loading Functions
-"npc/functions/filters.txt",
 "npc/functions/scoreboards.txt",
 "npc/functions/global_event_handler.txt",