From 9314ac33c4b62874e20d124a18b5d62ab47956cb Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 5 Aug 2019 19:39:49 -0300 Subject: Reword recepcionist, @music update --- npc/003-0/recepcionist.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/003-0') diff --git a/npc/003-0/recepcionist.txt b/npc/003-0/recepcionist.txt index 7bd39ef0f..e2133a2ae 100644 --- a/npc/003-0/recepcionist.txt +++ b/npc/003-0/recepcionist.txt @@ -5,13 +5,13 @@ // Magic School recepcionist (TODO: Give S. Badge) 003-0,47,44,4 script Recepcionist#003-0 NPC_FEMALE,{ - if (getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0; + if (MGQUEST && getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0; mesn; mesq l("Hello, and welcome to the Magic School of Tulimshar."); next; mesn; - mesq l("Unfortunately, we're shutting down. This building is too old."); + mesq l("Thankfully, we'll be moving soon. This building is old and the roof is falling."); next; mesn; mesq l("I hope our new campus get built soon. It'll be much better than here."); -- cgit v1.2.3-60-g2f50 From 1416450971492d42e1f6ca072621315d77a8c815 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 12 Aug 2019 14:26:53 -0300 Subject: Enzo the Forgetful - Allows you to lose 1-MSP skills --- npc/003-0/_import.txt | 1 + npc/003-0/enzo.txt | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 npc/003-0/enzo.txt (limited to 'npc/003-0') diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt index 0ec5970cb..3ed596714 100644 --- a/npc/003-0/_import.txt +++ b/npc/003-0/_import.txt @@ -2,6 +2,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/003-0/_warps.txt", "npc/003-0/colin.txt", +"npc/003-0/enzo.txt", "npc/003-0/luca.txt", "npc/003-0/recepcionist.txt", "npc/003-0/saves.txt", diff --git a/npc/003-0/enzo.txt b/npc/003-0/enzo.txt new file mode 100644 index 000000000..a7dfe3173 --- /dev/null +++ b/npc/003-0/enzo.txt @@ -0,0 +1,57 @@ +// TMW2 Script +// Author: +// Jesusalva +// Description: +// Forgetful + +003-0,68,25,0 script Enzo NPC_BLACKWIZARD,{ + mesn l("Enzo, the Forgetful"); + mesq l("What was I doing before...? I forgot!"); + next; + mesc l("Teaching Enzo your skills will make you both forget them."), 1; + mesc l("Once your skill is forgotten, the Magic Skill Points used will be freed."), 1; + mesc l("But be careful: Only 1MSP-costed skills can be forgotten, and learning fees WON'T be given back!"), 1; + do + { + next; + mesc l("Which skill will you FORGET permanently today?"), 1; + menuint + l("Uhm... Bye?"), 0, + rif(getskilllv(AL_HEAL), l("Healing")), AL_HEAL, + rif(getskilllv(TMW2_SAGE), l("Mana Wisdom")), TMW2_SAGE, + rif(getskilllv(HW_MAGICPOWER), l("Accumulate Power")), HW_MAGICPOWER, + rif(getskilllv(SM_PROVOKE), l("Provoke")), SM_PROVOKE, + rif(getskilllv(SA_FREECAST), l("Free Casting")), SA_FREECAST, + rif(getskilllv(TF_BACKSLIDING), l("Tactical Retreat")), TF_BACKSLIDING, + rif(getskilllv(MG_FIREWALL), l("Nature Wall")), MG_FIREWALL, + rif(getskilllv(ALL_FULL_THROTTLE), l("Last Resort")), ALL_FULL_THROTTLE, + rif(getskilllv(SM_BASH), l("Falkon Punch!")), SM_BASH, + rif(getskilllv(MC_MAMMONITE), l("Supreme Attack")), MC_MAMMONITE, + rif(getskilllv(AC_SHOWER), l("Arrow Shower")), AC_SHOWER, + rif(getskilllv(MG_FIREBALL), l("Fireball")), MG_FIREBALL, + rif(getskilllv(AL_HOLYLIGHT), l("Holy Light")), AL_HOLYLIGHT, + rif(getskilllv(MG_SOULSTRIKE), l("Magic Strike")), MG_SOULSTRIKE, + l("None at the moment!"), 0; + mes ""; + mesc l("Skill @@ will be permanently lost!", @menuret), 1; + mesc l("Continue anyway?"), 1; + if (askyesno() == ASK_YES) { + .@lv=getskilllv(@menuret); + skill @menuret, 0, 0; + MAGIC_PTS-=.@lv; + mesc l("Skill @@ has been lost", @menuret), 3; + mesc l("You recovered @@ magic skill points", .@lv), 3; + } else { + mesn l("Enzo, the Forgetful"); + mesq l("Uh, what?"); + } + } while (@menuret); + close; + +OnInit: + .sex = G_MALE; + .distance = 5; + end; + +} + -- cgit v1.2.3-60-g2f50 From c4e4fb44739ff84256e71d1385c9c9abd00d7cd3 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 12 Aug 2019 14:49:10 -0300 Subject: Move some comments around --- npc/003-0/notes | 6 ++++-- npc/015-2/ben.txt | 6 ------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'npc/003-0') diff --git a/npc/003-0/notes b/npc/003-0/notes index e6a9a3193..f5ce8d630 100644 --- a/npc/003-0/notes +++ b/npc/003-0/notes @@ -85,9 +85,11 @@ UNUSED/SPECIAL GS_SNAKEEYE (→AC_VULTURE) THIEF/MERCHANT-POLICE - ALL_INCCARRY TF_STEAL - ...? + ALL_INCCARRY + TF_MISS / TF_DOUBLE ? + MC_DISCOUNT / MC_OVERCHARGE (FIXME) ? + TF_HIDING? MC_PUSHCART? MC_VENDING? diff --git a/npc/015-2/ben.txt b/npc/015-2/ben.txt index 838bd5cdd..2957b2e47 100644 --- a/npc/015-2/ben.txt +++ b/npc/015-2/ben.txt @@ -123,9 +123,3 @@ OnInit: end; } -// TF_STEAL -// ALL_INCCARRY -// -// -// - -- cgit v1.2.3-60-g2f50 From 45247642c4b530a5c4ba159d25b66471c8bf5265 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 17 Aug 2019 00:15:09 -0300 Subject: Make Fire Walk action slower, and fix a bug at Enzo. In future, leveling up Fire Walk should boost its effects duration. Maybe. --- db/re/skill_db.conf | 8 ++++---- npc/003-0/enzo.txt | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'npc/003-0') diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index de38f0b3c..8dd019385 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -11063,9 +11063,9 @@ skill_db: ( } Requirements: { SPCost: { - Lv1: 44 - Lv2: 58 - Lv3: 72 + Lv1: 24 + Lv2: 38 + Lv3: 52 Lv4: 86 Lv5: 100 Lv6: 114 @@ -28139,7 +28139,7 @@ skill_db: ( } Unit: { Id: 0xdc - Interval: 300 + Interval: 500 Target: "Enemy" Flag: { UF_NOREITERATION: true diff --git a/npc/003-0/enzo.txt b/npc/003-0/enzo.txt index a7dfe3173..6ebdefec6 100644 --- a/npc/003-0/enzo.txt +++ b/npc/003-0/enzo.txt @@ -32,6 +32,8 @@ rif(getskilllv(AL_HOLYLIGHT), l("Holy Light")), AL_HOLYLIGHT, rif(getskilllv(MG_SOULSTRIKE), l("Magic Strike")), MG_SOULSTRIKE, l("None at the moment!"), 0; + if (!@menuret) + close; mes ""; mesc l("Skill @@ will be permanently lost!", @menuret), 1; mesc l("Continue anyway?"), 1; -- cgit v1.2.3-60-g2f50 From ced07558ad91c741bbb28bbe2f86b105de59e4bb Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 17 Aug 2019 17:39:32 -0300 Subject: Lower Ground Strike MSP from 3 to 2. Now I wonder if I didn't accidentaly reuse MAGIC_PTS... Would be... awkward. Anyway. --- npc/003-0/luca.txt | 2 +- npc/functions/clientversion.txt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'npc/003-0') diff --git a/npc/003-0/luca.txt b/npc/003-0/luca.txt index b5a271f52..dc5720ebd 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, 3, FluoPowder, 3)) + if (!mlearn(ASC_METEORASSAULT, 5, 2, FluoPowder, 3)) mesc l("You do not meet all requisites for this skill."), 1; break; case SN_SHARPSHOOTING: diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt index 15300aaee..f7f2e2158 100644 --- a/npc/functions/clientversion.txt +++ b/npc/functions/clientversion.txt @@ -530,13 +530,20 @@ function script clientupdater { // sex ago 9 18:10:20 -03 201 if (UPDATE < 1565385020) { UPDATE=1565385020; + // PVP bugfix Karma=0; + // Allow to skip quest if you already have the Grimorium if (countitem(JesusalvaGrimorium) && getskilllv(TMW2_SKILLPERMIT) == 2) { skill TMW2_SKILLPERMIT, 3, 0; } + // This can't happen but anyway, just in case... if (getskilllv(TMW2_TRANSMIGRATION) > 10) { skill TMW2_TRANSMIGRATION, 10, 0; } + // Magic Skill Points for this skill went from 3 to 2 + if (getskilllv(ASC_METEORASSAULT)) + MAGIC_PTS-=1; + // Post-poned Referral Rewards if (#REFERRAL_PROG && BaseLevel >= 25 && #REFERRAL_CTRL < 1) { #REFERRAL_CTRL=1; -- cgit v1.2.3-60-g2f50