diff options
| -rw-r--r-- | conf/battle/player.conf | 2 | ||||
| -rw-r--r-- | db/const.txt | 4 | ||||
| -rw-r--r-- | db/re/map_cache.dat | bin | 7488 -> 9422 bytes | |||
| -rw-r--r-- | npc/001-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-1/merlin.txt | 18 | ||||
| -rw-r--r-- | npc/001-2-19/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-2-19/lloyd.txt | 18 | ||||
| -rw-r--r-- | npc/001-2-26/_import.txt | 3 | ||||
| -rw-r--r-- | npc/001-2-26/ivan.txt | 18 |
9 files changed, 63 insertions, 2 deletions
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 diff --git a/db/const.txt b/db/const.txt index 3d75cc13..76ebd3a1 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3395,8 +3395,10 @@ 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_MERLIN 129 NPC_ALIGE 401 NPC_ORC_SAILOR 402 NPC_RATTO_SAILOR 403 diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat Binary files differindex 451539ab..e950fded 100644 --- a/db/re/map_cache.dat +++ b/db/re/map_cache.dat 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; +} 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..04b427a7 --- /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 = 4; + end; +} 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; +} |