From 8151c7e679f5340d7d1b78f7269313cd7bf0d5ce Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 00:13:41 -0300 Subject: Add an option on Banker to open Mail --- npc/003-0/notes | 19 +++++++++++++++---- npc/functions/bank.txt | 11 ++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/npc/003-0/notes b/npc/003-0/notes index fda37bf5a..517f68d6d 100644 --- a/npc/003-0/notes +++ b/npc/003-0/notes @@ -106,8 +106,19 @@ USEFUL COMMANDS unitskilluseid(, , {, }) unitskillusepos(, , , , ) -*defpattern(, "", "") -*activatepset() -*deactivatepset() -*deletepset() + *defpattern(, "", "") + *activatepset() + *deactivatepset() + *deletepset() + Regex commands (iilia) + + *statusup2(, ) + Needs testing, said to be permanent but will it survive a status reset? + Actually, we could add an extra memory and re-cast this, if we control + usage correctly. + + *autobonus2(, , {, , {}}) + May cast a bonus when attacked :> + + diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt index 14690875c..03696dad2 100644 --- a/npc/functions/bank.txt +++ b/npc/functions/bank.txt @@ -205,19 +205,28 @@ function script Banker { select l("I would like to store some items."), l("I would like to perform money transactions."), + l("Did I received any mail?"), l("What is this guild for?"), l("Bye."); switch (@menu) { case 1: + closeclientdialog; openstorage; - closedialog; close; break; case 2: Banking; break; case 3: + mesc l("Note: Transfering items on mail cost 2500 GP/item"); + mesc l("Money transference by mail is, however, free."); + next; + closeclientdialog; + openmail(); + close; + break; + case 4: mes ""; BKInfo(); break; -- cgit v1.2.3-70-g09d2 From 8e5181e46ec09105397f6cee83ce66b64903125d Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 00:26:31 -0300 Subject: *hides* --- npc/003-0/notes | 12 ++++++++++++ npc/functions/bank.txt | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/npc/003-0/notes b/npc/003-0/notes index 517f68d6d..e6a9a3193 100644 --- a/npc/003-0/notes +++ b/npc/003-0/notes @@ -120,5 +120,17 @@ USEFUL COMMANDS *autobonus2(, , {, , {}}) May cast a bonus when attacked :> + SC_TENSIONRELAX + Tension relax allows the user to recover HP while overweight at 1x speed. + Also, looks like sitting _should_ allow you to regen even overweight, need + plugin check for possible overrides on this behavior. status_natural_heal + + SC_VITATA_500 + Apparently regens SP? Requires further studies. + + SC_NOEQUIPWEAPON [Evol] + Forces your opponent to fight without a weapon. + + diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt index 03696dad2..46550c3dd 100644 --- a/npc/functions/bank.txt +++ b/npc/functions/bank.txt @@ -219,7 +219,8 @@ function script Banker { Banking; break; case 3: - mesc l("Note: Transfering items on mail cost 2500 GP/item"); + // NOTE: This value is HARDCODED, do not try changing it! + mesc l("Note: Transfering items on mail cost @@ GP/item", 500); mesc l("Money transference by mail is, however, free."); next; closeclientdialog; -- cgit v1.2.3-70-g09d2 From e9be56057ca95daab9049b7f8dd977d010f093ea Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 00:27:11 -0300 Subject: Shouldn't cause severe errors but anyway. (Well, maybe Bye fails) --- npc/functions/bank.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt index 46550c3dd..cb7818334 100644 --- a/npc/functions/bank.txt +++ b/npc/functions/bank.txt @@ -216,7 +216,7 @@ function script Banker { close; break; case 2: - Banking; + Banking(); break; case 3: // NOTE: This value is HARDCODED, do not try changing it! @@ -232,11 +232,11 @@ function script Banker { BKInfo(); break; } - if (@menu != 4) { + if (@menu != 5) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT | S_NO_NPC_NAME, l("Something else?"); } - } while (@menu != 4); + } while (@menu != 5); } closedialog; goodbye; -- cgit v1.2.3-70-g09d2 From 057c595824a5ef93f4461054987c6cc8afdd2a7b Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 00:37:04 -0300 Subject: Stop handling beta patch with beta.patch and merge it upstream. Original value was "20", but looks like "stable" server will have something closer to "100" instead >_> --- conf/map/battle/drops.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf index 91fc4e63e..aff592dc5 100644 --- a/conf/map/battle/drops.conf +++ b/conf/map/battle/drops.conf @@ -142,7 +142,9 @@ drops_by_luk: 0 // At current value (20), each luck point will boost 0.2% drop rates. // For the average drop (4% drop rate), this means 4*1,02=4.08% with 10 luck // A full build (100 luck) and 4% drop rate will give 4.8% drop rate. -drops_by_luk2: 20 +// BETA PATCH: 100 luck and 4% drop rate (Std): 12% Drop Rate (3x more) +// BETA PATCH: With only 50 luck you'll have double drop rates for everything +drops_by_luk2: 200 // Whether or not Marine Spheres and Floras summoned by Alchemist drop items? // This setting has three available values: -- cgit v1.2.3-70-g09d2 From 94588ed14f0c6491bb1af0877cd1506f836b2c86 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 00:58:15 -0300 Subject: Apply beta.patch2 --- .tools/beta.patch2 | 32 ++++++++++++++++++++++++++++++++ .tools/scripts/init.sh | 10 ++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .tools/beta.patch2 diff --git a/.tools/beta.patch2 b/.tools/beta.patch2 new file mode 100644 index 000000000..67c10bb32 --- /dev/null +++ b/.tools/beta.patch2 @@ -0,0 +1,32 @@ +diff --git a/src/map/rodex.c b/src/map/rodex.c +index 766fdc5ea..996576fd3 100644 +--- a/src/map/rodex.c ++++ b/src/map/rodex.c +@@ -34,11 +34,11 @@ + + // NOTE : These values are hardcoded into the client + // Cost of each Attached Item +-#define ATTACHITEM_COST 2500 ++#define ATTACHITEM_COST 500 + // Percent of Attached Zeny that will be paid as Tax +-#define ATTACHZENY_TAX 2 ++#define ATTACHZENY_TAX 0 + // Maximun number of messages that can be sent in one day +-#define DAILY_MAX_MAILS 100 ++#define DAILY_MAX_MAILS 3 + + static struct rodex_interface rodex_s; + struct rodex_interface *rodex; +diff --git a/src/map/status.c b/src/map/status.c +index f06bb0330..2fd295dc0 100644 +--- a/src/map/status.c ++++ b/src/map/status.c +@@ -3552,7 +3552,7 @@ static void status_calc_regen(struct block_list *bl, struct status_data *st, str + + regen->hp = cap_value(val, reg_flag, SHRT_MAX); + +- val = 1 + (st->int_/6) + (st->max_sp/100); ++ val = 1 + (st->int_/5) + (st->max_sp/100); + if( st->int_ >= 120 ) + val += ((st->int_-120)>>1) + 4; + diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index 2bdeebc42..8fb823781 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -110,6 +110,12 @@ function aptget_install { function make_server { ls -la ../server-data ls -la ../server-data/plugins + if [ -e "../server-data/.tools/beta.patch2" ] + then + echo "Apply beta.patch2 ........" + git apply ../server-data/.tools/beta.patch2 + echo "........ Done." + fi echo source src/evol/tools/vars.sh source ./src/evol/tools/vars.sh check_error $? @@ -175,14 +181,14 @@ function do_init { cd server-code/src ; git checkout master # v2018.09.23 # 2018-09-24 # s20180713? check_error $? #: ' #Use this to force an old version. You need s20190422 for this. - echo "Begin diff experiment" + echo "Rolling server back to correct version" cd .. git diff master 41b5d5e9b6f14fd26197958aec29a02858dff299 > x.diff ls head -n 25 x.diff tail -n 40 x.diff git apply --reject --whitespace=nowarn x.diff - echo "====================================== DIFFED" + echo "====================================== CHANGES APPLIED" git status ls --recursive|grep ".rej" echo "====================================== Continuing..." -- cgit v1.2.3-70-g09d2 From ffc20f531e6e6a43f3f6368b512c48e177bfe479 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 30 Jul 2019 17:31:45 -0300 Subject: Change Professor Cycle to run each 3 seconds (min. idle time from 3 to 2 sec.) --- npc/003-0-1/professor.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/npc/003-0-1/professor.txt b/npc/003-0-1/professor.txt index bc37efbf7..e454e1805 100644 --- a/npc/003-0-1/professor.txt +++ b/npc/003-0-1/professor.txt @@ -26,15 +26,15 @@ OnInit: initnpctimer; end; -OnTimer5000: +OnTimer3000: areatimer2("003-0-1", 29, 34, 41, 38, 10, .name$+"::OnSpeeching"); initnpctimer; end; OnSpeeching: - // If you have been IDLE for at least 3 seconds (max AFK 15 minutes) + // If you have been IDLE for at least 2 seconds (max AFK 15 minutes) // You'll get the EXP. Note you don't need to sit, only be idle. - if (is_between(3, 900, checkidle())) { + if (is_between(2, 900, checkidle())) { getexp 1+getskilllv(TMW2_SPEECH),1; // dispbottom l("It is a boring speech..."); -- cgit v1.2.3-70-g09d2 From 946eb13947237b399e169610edb6acf8376b2910 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 31 Jul 2019 14:11:02 -0300 Subject: Fix bug --- npc/boss/throne.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/npc/boss/throne.txt b/npc/boss/throne.txt index c34cbf6cd..e9c82a488 100644 --- a/npc/boss/throne.txt +++ b/npc/boss/throne.txt @@ -31,11 +31,12 @@ OnBegin: monster("boss", 40, 50, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death"); monster("boss", 50, 40, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death"); + mapannounce("boss", "Begin!", bc_map|bc_npc); initnpctimer; end; function CheckFinalAssault { - if (!siege_calcdiff(5)) { + if (!siege_calcdiff("boss", 5)) { kamibroadcast("You noobs, you all deserve to die!", "Monster King"); stopnpctimer; $@MK_CHALLENGE=false; -- cgit v1.2.3-70-g09d2