summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-31 14:11:47 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-31 14:11:47 -0300
commitce905bed9c0cb995bb7d481b2e1eeaaeb2363aa9 (patch)
tree8573c31803c3976032a485fd5f09cff5569ce380
parent35cadcae01ce2601804e7ab4da213ae548b5c4c1 (diff)
parent946eb13947237b399e169610edb6acf8376b2910 (diff)
downloadserverdata-ce905bed9c0cb995bb7d481b2e1eeaaeb2363aa9.tar.gz
serverdata-ce905bed9c0cb995bb7d481b2e1eeaaeb2363aa9.tar.bz2
serverdata-ce905bed9c0cb995bb7d481b2e1eeaaeb2363aa9.tar.xz
serverdata-ce905bed9c0cb995bb7d481b2e1eeaaeb2363aa9.zip
MehMerge branch 'master' into testserver
Diffstat
-rw-r--r--.tools/beta.patch232
-rwxr-xr-x.tools/scripts/init.sh10
-rw-r--r--npc/003-0-1/professor.txt6
-rw-r--r--npc/003-0/notes31
-rw-r--r--npc/boss/throne.txt3
-rw-r--r--npc/functions/bank.txt18
6 files changed, 86 insertions, 14 deletions
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..."
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...");
diff --git a/npc/003-0/notes b/npc/003-0/notes
index fda37bf5a..e6a9a3193 100644
--- a/npc/003-0/notes
+++ b/npc/003-0/notes
@@ -106,8 +106,31 @@ USEFUL COMMANDS
unitskilluseid(<GID>, <skill id>, <skill lvl>{, <target id>})
unitskillusepos(<GID>, <skill id>, <skill lvl>, <x>, <y>)
-*defpattern(<set number>, "<regular expression pattern>", "<event label>")
-*activatepset(<set number>)
-*deactivatepset(<set number>)
-*deletepset(<set number>)
+ *defpattern(<set number>, "<regular expression pattern>", "<event label>")
+ *activatepset(<set number>)
+ *deactivatepset(<set number>)
+ *deletepset(<set number>)
+ Regex commands (iilia)
+
+ *statusup2(<stat>, <amount>)
+ 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(<bonus script>, <rate>, <duration>{, <flag>, {<other script>}})
+ 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/boss/throne.txt b/npc/boss/throne.txt
index 7f58af31b..d6f1a7add 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;
diff --git a/npc/functions/bank.txt b/npc/functions/bank.txt
index 14690875c..cb7818334 100644
--- a/npc/functions/bank.txt
+++ b/npc/functions/bank.txt
@@ -205,28 +205,38 @@ 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;
+ Banking();
break;
case 3:
+ // 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;
+ openmail();
+ close;
+ break;
+ case 4:
mes "";
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-14 16:00:47 +0000