From 1cff9232d1468bab9fa11db1f17d9c87fca20f9e Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 00:00:14 +0100 Subject: Add Lloyd and Ivan on const.txt. --- db/const.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db/const.txt b/db/const.txt index 3d75cc13..b7c19341 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3395,8 +3395,9 @@ NPC_HUMAN_MALE_OLD 122 NPC_RAIJIN_GIRL 123 NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION 124 NPC_SALEM 125 +NPC_LLOYD 126 +NPC_IVAN 127 NPC_ALIGE_OUTSIDE_BARREL 128 -NPC_SALEM 125 NPC_ALIGE 401 NPC_ORC_SAILOR 402 NPC_RATTO_SAILOR 403 -- cgit v1.2.3-70-g09d2 From 99e5e37d08b1c262e6293200e8c2fb1c37549cd7 Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 00:06:50 +0100 Subject: Add Ivan on #26. --- npc/001-2-26/_import.txt | 3 ++- npc/001-2-26/ivan.txt | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 npc/001-2-26/ivan.txt diff --git a/npc/001-2-26/_import.txt b/npc/001-2-26/_import.txt index 618a5e6e..35d2343b 100644 --- a/npc/001-2-26/_import.txt +++ b/npc/001-2-26/_import.txt @@ -1,4 +1,5 @@ // Map 001-2-26 +npc: npc/001-2-26/flask.txt +npc: npc/001-2-26/ivan.txt npc: npc/001-2-26/mapflags.txt npc: npc/001-2-26/_warps.txt -npc: npc/001-2-26/flask.txt diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt new file mode 100644 index 00000000..d52843d1 --- /dev/null +++ b/npc/001-2-26/ivan.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Alchemist NPC + +001-2-26,28,30,0 script Ivan NPC_IVAN,{ + + speech + l("Croc."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} -- cgit v1.2.3-70-g09d2 From aa7d95f35c4da3674d93943c1012b8eaf6fa6dad Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 01:29:22 +0100 Subject: Add Merlin on const.txt. --- db/const.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/db/const.txt b/db/const.txt index b7c19341..76ebd3a1 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3398,6 +3398,7 @@ NPC_SALEM 125 NPC_LLOYD 126 NPC_IVAN 127 NPC_ALIGE_OUTSIDE_BARREL 128 +NPC_MERLIN 129 NPC_ALIGE 401 NPC_ORC_SAILOR 402 NPC_RATTO_SAILOR 403 -- cgit v1.2.3-70-g09d2 From 010c33a15f7c81a2fa4db1f6c689cc5ed608fe51 Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 01:29:30 +0100 Subject: Add Merlin on Artis's market. --- npc/001-1/_import.txt | 1 + npc/001-1/merlin.txt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 npc/001-1/merlin.txt diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index b429f46a..5d509830 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -15,6 +15,7 @@ npc: npc/001-1/harbours.txt npc: npc/001-1/juscare.txt npc: npc/001-1/katja.txt npc: npc/001-1/lozerk.txt +npc: npc/001-1/merlin.txt npc: npc/001-1/nalkri.txt npc: npc/001-1/panels.txt npc: npc/001-1/qonan.txt diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt new file mode 100644 index 00000000..0223e3ce --- /dev/null +++ b/npc/001-1/merlin.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Fishmonger NPC + +001-1,72,128,0 script Merlin NPC_MERLIN,{ + + speech + l("Fish is good for the brain!"); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} -- cgit v1.2.3-70-g09d2 From d5d5ec7904aa6cfa909ec70a7814566990df7a8c Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 01:31:25 +0100 Subject: Add Lloyd on the merchant guild building. --- npc/001-2-19/_import.txt | 1 + npc/001-2-19/lloyd.txt | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 npc/001-2-19/lloyd.txt diff --git a/npc/001-2-19/_import.txt b/npc/001-2-19/_import.txt index f5348802..2bbc8082 100644 --- a/npc/001-2-19/_import.txt +++ b/npc/001-2-19/_import.txt @@ -1,3 +1,4 @@ npc: npc/001-2-19/mapflags.txt npc: npc/001-2-19/_warps.txt npc: npc/001-2-19/doors.txt +npc: npc/001-2-19/lloyd.txt diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt new file mode 100644 index 00000000..db28465d --- /dev/null +++ b/npc/001-2-19/lloyd.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Lloyd the banker NPC + +001-2-19,31,25,0 script Lloyd the banker NPC_LLOYD,{ + + speech + l("The bank is not open yet."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} -- cgit v1.2.3-70-g09d2 From eca7b6b373dce1a43cbd1cf4ba23969ca8186bb0 Mon Sep 17 00:00:00 2001 From: Reid Date: Thu, 5 Nov 2015 18:29:38 -0500 Subject: Update map cache. --- db/re/map_cache.dat | Bin 7488 -> 9422 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat index 451539ab..e950fded 100644 Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ -- cgit v1.2.3-70-g09d2 From c1c367c00c3b3f701db9ed177ff0e07b62f73124 Mon Sep 17 00:00:00 2001 From: Reid Date: Mon, 9 Nov 2015 01:41:17 +0100 Subject: Change the distance parameter of Lloyd. --- npc/001-2-19/lloyd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt index db28465d..04b427a7 100644 --- a/npc/001-2-19/lloyd.txt +++ b/npc/001-2-19/lloyd.txt @@ -13,6 +13,6 @@ OnInit: .sex = G_MALE; - .distance = 2; + .distance = 4; end; } -- cgit v1.2.3-70-g09d2 From cfa5239a9561c584a8b3c8b7c8c361ea990631e1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 9 Nov 2015 18:40:27 +0300 Subject: Enable fix for warp hit issue. --- conf/battle/player.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/battle/player.conf b/conf/battle/player.conf index cdfcece8..0b39b757 100644 --- a/conf/battle/player.conf +++ b/conf/battle/player.conf @@ -51,6 +51,8 @@ basic_skill_check: yes // Value is also affected by 'invincible_time_inc' mapflag player_invincible_time: 5000 +fix_warp_hit_delay_abuse: 1 + // The time interval for HP to restore naturally. (in milliseconds) natural_healhp_interval: 6000 -- cgit v1.2.3-70-g09d2