diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-08-31 15:03:45 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-08-31 15:03:45 -0300 |
commit | 63256388cb5b9ef7bc1a4afbd0270c135882d622 (patch) | |
tree | 7519f7aa64fd56f71038ad59ee747ba2c761082f /npc/003-0 | |
parent | 5dab87b522e5ff18b6a62e86c369ac3295c1817f (diff) | |
parent | 4de339bf2c92af5f74cdb28b0eb62e8ca66993c4 (diff) | |
download | serverdata-testserver.tar.gz serverdata-testserver.tar.bz2 serverdata-testserver.tar.xz serverdata-testserver.zip |
Merge branch 'master' into testservertestserver
Diffstat (limited to 'npc/003-0')
-rw-r--r-- | npc/003-0/colin.txt | 8 | ||||
-rw-r--r-- | npc/003-0/luca.txt | 2 | ||||
-rw-r--r-- | npc/003-0/trickmaster.txt | 13 |
3 files changed, 12 insertions, 11 deletions
diff --git a/npc/003-0/colin.txt b/npc/003-0/colin.txt index 7d8bbf77b..720afcbc1 100644 --- a/npc/003-0/colin.txt +++ b/npc/003-0/colin.txt @@ -20,6 +20,7 @@ mesc l("Napalm Beat - Spammable AoE Skill"); mesc l("Frost Diver - Attempt to freeze an enemy, dealing damage"); + mesc l("Fire Walk - Creates a trail of fire, harming any pursuer"); mesc l("Frost Nova - Freeze everything in a range"); mesc l("Note: You can exchange 1 @@ for 3 @@", getitemlink(GemPowder), getitemlink(Quill)), 1; @@ -29,6 +30,7 @@ l("Magic Strike"), MG_SOULSTRIKE, l("Napalm Beat"), MG_NAPALMBEAT, l("Frost Diver"), MG_FROSTDIVER, + l("Fire Walk"), SO_FIREWALK, l("Frost Nova"), WZ_FROSTNOVA, rif(countitem(GemPowder), l("Exchange Gempowder for Quill")), -1, l("Cancel"), 0; @@ -60,8 +62,12 @@ if (!mlearn(MG_FROSTDIVER, 7, 2, Quill, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; + case SO_FIREWALK: + if (!mlearn(SO_FIREWALK, 2, 2, Lockpicks, 1)) + mesc l("You do not meet all requisites for this skill."), 1; + break; case WZ_FROSTNOVA: - if (!mlearn(WZ_FROSTNOVA, 7, 3, Quill, 1)) + if (!mlearn(WZ_FROSTNOVA, 4, 3, Quill, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; default: diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt index dc5720ebd..677f223c6 100644 --- a/npc/003-0/luca.txt +++ b/npc/003-0/luca.txt @@ -50,7 +50,7 @@ mesc l("You do not meet all requisites for this skill."), 1; break; case ASC_METEORASSAULT: - if (!mlearn(ASC_METEORASSAULT, 5, 2, FluoPowder, 3)) + if (!mlearn(ASC_METEORASSAULT, 3, 2, FluoPowder, 3)) mesc l("You do not meet all requisites for this skill."), 1; break; case SN_SHARPSHOOTING: diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt index e35312606..3a111e4a3 100644 --- a/npc/003-0/trickmaster.txt +++ b/npc/003-0/trickmaster.txt @@ -19,11 +19,10 @@ "freecast", SA_FREECAST, "backslide", TF_BACKSLIDING, "firewall", MG_FIREWALL, - //"inccarry", ALL_INCCARRY, + "vulture", AC_VULTURE, "fullthrottle", ALL_FULL_THROTTLE, "darkillusion", GC_DARKILLUSION, "trickdead", NV_TRICKDEAD, - "firewalk", SO_FIREWALK, "Cancel", 0; mes ""; setskin ""; @@ -41,8 +40,8 @@ if (!mlearn(MG_FIREWALL, 10, 1, Lockpicks, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; - case ALL_INCCARRY: - if (!mlearn(ALL_INCCARRY, 2, 1, Lockpicks, 1)) + case AC_VULTURE: + if (!mlearn(AC_VULTURE, 1, 1, Lockpicks, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; case ALL_FULL_THROTTLE: @@ -50,17 +49,13 @@ mesc l("You do not meet all requisites for this skill."), 1; break; case GC_DARKILLUSION: - if (!mlearn(GC_DARKILLUSION, 1, 2, Lockpicks, 1)) + if (!mlearn(GC_DARKILLUSION, 3, 2, Lockpicks, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; case NV_TRICKDEAD: if (!mlearn(NV_TRICKDEAD, 1, 2, Lockpicks, 1)) mesc l("You do not meet all requisites for this skill."), 1; break; - case SO_FIREWALK: - if (!mlearn(SO_FIREWALK, 2, 2, Lockpicks, 1)) - mesc l("You do not meet all requisites for this skill."), 1; - break; default: if (@menuret) Exception("ERROR skill not implemented", RB_DEFAULT|RB_SPEECH); |