summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/re/skill_db.conf90
-rw-r--r--db/re/skill_tree.conf10
-rw-r--r--npc/003-3/malindou.txt2
-rw-r--r--npc/027-1/saves.txt12
-rw-r--r--npc/functions/hub.txt33
5 files changed, 122 insertions, 25 deletions
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 972fa3dba..86bb822a5 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38767,6 +38767,7 @@ skill_db: (
Name: "TMW2_MANABOMB"
Description: "Mana Bomb"
MaxLevel: 10
+ Range: 9
SkillType: {
Enemy: true
}
@@ -39542,4 +39543,93 @@ skill_db: (
}
}
},
+{
+ Id: 20050
+ Name: "TMW2_FIRSTAID"
+ Description: "First Aid"
+ MaxLevel: 10
+ SkillType: {
+ Self: true
+ }
+ InterruptCast: true
+ CoolDown: {
+ Lv1: 5000
+ Lv2: 4500
+ Lv3: 4000
+ Lv4: 3500
+ Lv5: 3000
+ Lv6: 2500
+ Lv7: 2000
+ Lv8: 1500
+ Lv9: 1000
+ Lv10: 500
+ }
+ CastTime: 300
+ FixedCastTime: 300
+ //AfterCastActDelay: 100
+ Requirements: {
+ SPCost: 50
+ }
+},
+{
+ Id: 20051
+ Name: "TMW2_HEALING"
+ Description: "Healing"
+ MaxLevel: 10
+ Range: 9
+ SkillType: {
+ Friend: true
+ }
+ InterruptCast: true
+ CoolDown: {
+ Lv1: 5000
+ Lv2: 4500
+ Lv3: 4000
+ Lv4: 3500
+ Lv5: 3000
+ Lv6: 2500
+ Lv7: 2000
+ Lv8: 1500
+ Lv9: 1000
+ Lv10: 500
+ }
+ CastTime: 300
+ FixedCastTime: 300
+ AfterCastActDelay: 100
+ Requirements: {
+ SPCost: 75
+ }
+},
+{
+ Id: 20052
+ Name: "TMW2_MAGNUSHEAL"
+ Description: "Magnus Healing"
+ MaxLevel: 10
+ Range: 6
+ SkillType: {
+ Friend: true
+ }
+ InterruptCast: true
+ CoolDown: {
+ Lv1: 10000
+ Lv2: 9000
+ Lv3: 8000
+ Lv4: 7000
+ Lv5: 6000
+ Lv6: 5000
+ Lv7: 4000
+ Lv8: 3000
+ Lv9: 2000
+ Lv10: 1000
+ }
+ CastTime: 500
+ FixedCastTime: 200
+ AfterCastActDelay: 300
+ Requirements: {
+ SPCost: 150
+ Items: {
+ Lifestone: 1
+ }
+ }
+},
)
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 23522862a..3f24bd9a9 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -76,11 +76,17 @@ Human: {
MC_DISCOUNT: 0
MC_OVERCHARGE: 0
- ///////////////// Magic v3 (Custom)
+ ///////////////// Magic v3 (Custom/Trickmaster)
TMW2_MANABOMB: 0
+
+ ///////////////// Magic v3 (Custom/Scholarship)
+ EVOL_AREA_PROVOKE: 0
+
+ ///////////////// Magic v3 (Custom/Destructive)
TMW2_JUDGMENT: 0
TMW2_NILFHEIM: 0
- EVOL_AREA_PROVOKE: 0
+
+ ///////////////// Magic v3 (Custom/Physical)
///////////////// Magic v3 (Builtin)
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 0b185ebeb..f8ce13909 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -583,9 +583,9 @@ OnInit:
ReplaceSkillFromEveryPlayer(MG_FROSTDIVER, TMW2_FROSTNOVA);
ReplaceSkillFromEveryPlayer(WZ_FROSTNOVA, TMW2_NILFHEIM);
+ */
ReplaceSkillFromEveryPlayer(AL_HEAL, TMW2_FIRSTAID);
ReplaceSkillFromEveryPlayer(AB_HIGHNESSHEAL, TMW2_HEALING);
- */
debugmes "";
debugmes "* Tolchi mess cleanup";
diff --git a/npc/027-1/saves.txt b/npc/027-1/saves.txt
index 13f70d9df..4cb146f4f 100644
--- a/npc/027-1/saves.txt
+++ b/npc/027-1/saves.txt
@@ -24,20 +24,20 @@
mesc l("Windwalker - Increase walk speed and flee rate.");
mesc l("Last Standing Man - Passive - Raise Max HP and Holy Defense");
menuint
- l("Healing"), AL_HEAL,
+ l("Healing"), TMW2_FIRSTAID,
l("Mana Wisdom"), TMW2_SAGE,
l("Accumulate Power"), HW_MAGICPOWER,
l("Provoke"), SM_PROVOKE,
l("Area Provoke"), EVOL_AREA_PROVOKE,
- l("High Healing"), AB_HIGHNESSHEAL,
+ l("High Healing"), TMW2_HEALING,
l("Windwalker"), SN_WINDWALK,
l("Last Standing Man"), CR_TRUST,
l("Cancel"), 0;
mes "";
switch (@menuret) {
- case AL_HEAL:
- if (!mlearn(AL_HEAL, 4, 1, SpellBookPage, 1))
+ case TMW2_FIRSTAID:
+ if (!mlearn(TMW2_FIRSTAID, 4, 1, SpellBookPage, 1))
mesc l("You do not meet all requisites for this skill."), 1;
break;
case TMW2_SAGE:
@@ -56,8 +56,8 @@
if (!mlearn(EVOL_AREA_PROVOKE, 10, 2, SpellBookPage, 1))
mesc l("You do not meet all requisites for this skill."), 1;
break;
- case AB_HIGHNESSHEAL:
- if (!mlearn(AB_HIGHNESSHEAL, 1, 2, SpellBookPage, 1))
+ case TMW2_HEALING:
+ if (!mlearn(TMW2_HEALING, 1, 2, SpellBookPage, 1))
mesc l("You do not meet all requisites for this skill."), 1;
break;
case SN_WINDWALK:
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 66158458f..9e95e0e87 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -317,22 +317,7 @@ function script HUB_SkillInvoke {
Sp=0;
GetManaExp(@skillId, 1);
break;
- case TMW2_NILFHEIM:
- // Nilfheim cast on self?
- .@PW=80+(10*@skillLv);
- areaharm(getcharid(3), 8, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Water);
- areasc(8, 15000, SC_FREEZE, BL_PC | BL_MOB | BL_MER | BL_HOM, "filter_hostile");
- // Maybe filter_notme() would work better, indeed
- GetManaExp(@skillId, rand2(1,3));
- break;
- /*
-
- // TODO: Ultimate Skills (T5/0)
-
- // Support magic
- // TODO: Debuffs
- // TODO: Buffs
-
+ ////////////////////////////////
// XXX: Healing Class
case TMW2_FIRSTAID:
.@PW=90+(10*@skillLv);
@@ -349,6 +334,22 @@ function script HUB_SkillInvoke {
.@PW=200+(20*@skillLv);
areaharm(@skillTarget, 4, -AdjustSpellpower(.@PW), HARM_MISC, "filter_friendly");
break;
+ ////////////////////////////////
+ case TMW2_NILFHEIM:
+ // Nilfheim cast on self?
+ .@PW=80+(10*@skillLv);
+ areaharm(getcharid(3), 8, AdjustSpellpower(.@PW), HARM_MAGI, Ele_Water);
+ areasc(8, 15000, SC_FREEZE, BL_PC | BL_MOB | BL_MER | BL_HOM, "filter_hostile");
+ // Maybe filter_notme() would work better, indeed
+ GetManaExp(@skillId, rand2(1,3));
+ break;
+ /*
+
+ // TODO: Ultimate Skills (T5/0)
+
+ // Support magic
+ // TODO: Debuffs
+ // TODO: Buffs
// FIXME: Windwalker (1MSP?), Last Standing Man (2 MSP?)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 07:48:24 +0000