summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-06-12 21:36:08 -0300
committerJesusaves <cpntb1@ymail.com>2018-06-12 21:36:08 -0300
commit786b513adac0fa83da1dbcdfc93b3024d2dfddb9 (patch)
treeee728f7ea48ddcfed21c1fde9c13a696a6a45afc /npc
parenta5506ed12914cffd08ed82db1d385218c96a719c (diff)
downloadserverdata-786b513adac0fa83da1dbcdfc93b3024d2dfddb9.tar.gz
serverdata-786b513adac0fa83da1dbcdfc93b3024d2dfddb9.tar.bz2
serverdata-786b513adac0fa83da1dbcdfc93b3024d2dfddb9.tar.xz
serverdata-786b513adac0fa83da1dbcdfc93b3024d2dfddb9.zip
Correct bugs
Diffstat (limited to 'npc')
-rw-r--r--npc/016-1/marine.txt4
-rw-r--r--npc/functions/util.txt10
2 files changed, 11 insertions, 3 deletions
diff --git a/npc/016-1/marine.txt b/npc/016-1/marine.txt
index 3aadf003b..78d1d11e6 100644
--- a/npc/016-1/marine.txt
+++ b/npc/016-1/marine.txt
@@ -62,7 +62,7 @@ L_THurns:
// Each level INCREASES this in 0.1%.
// So for a level 40 player, chances are 14%.
if (rand(1, 10000) < 1000+(BaseLevel*10))
- addtimer rand(3000,6000), "#MarineShip::OnEvent";
+ addtimer rand(3000,6000), "#MarineShipAttack::OnEvent";
end;
@@ -118,7 +118,7 @@ L_TTulim:
// Each level INCREASES this in 0.1%.
// So for a level 40 player, chances are 14%.
if (rand(1, 10000) < 1000+(BaseLevel*10))
- addtimer rand(3000,6000), "#MarineShip::OnEvent";
+ addtimer rand(3000,6000), "#MarineShipAttack::OnEvent";
end;
L_TooWeak:
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index dfdd763af..5ff544f17 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -218,7 +218,15 @@ function script nard_time {
if (getarg(0) == "Candor")
return 22000;
if (getarg(0) == "Hurns")
- return 19000;
+ return 24000;
+
+ }
+ // From Hurnscald
+ if (LOCATION$ == "Hurns") {
+ if (getarg(0) == "Candor")
+ return 22000;
+ if (getarg(0) == "Tulim")
+ return 24000;
}