summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-04 22:45:55 -0200
committershennetsind <ind@henn.et>2013-11-04 22:45:55 -0200
commit5b5618f072a6aaa7a32aae516809bd0671580631 (patch)
treedd9371afbbd0cfca71673dece4d3352f33ba41a7 /npc/other
parent0a965aafde882e905ea71f3bcef8f4ff81c1c327 (diff)
parentba5ca9e100564cecb4a1fb1edabca1c042c10204 (diff)
downloadhercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.gz
hercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.bz2
hercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.xz
hercules-5b5618f072a6aaa7a32aae516809bd0671580631.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/hugel_bingo.txt2
-rw-r--r--npc/other/turbo_track.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 2bd8f1d55..0a47b4f00 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -276,7 +276,7 @@ OnTimer460000:
end;
}
-que_bingo,49,125,0 script 1a#bingo 139,1,1,{
+que_bingo,49,125,0 script 1a#bingo HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index b135cd093..dea910aa3 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -1918,7 +1918,7 @@ turbo_n_1,222,45,0 duplicate(TurboHint_4#tt_main) #n1NoWayOut5 -1,1,1
turbo_n_1,222,61,0 duplicate(TurboHint_4#tt_main) #n1NoWayOut6 -1,1,1
turbo_n_1,222,65,0 duplicate(TurboHint_4#tt_main) #n1NoWayOut7 -1,1,1
-- script cos_end#tt_main 01,{
+- script cos_end#tt_main -1,{
function GetNumber;
OnTouch:
set .@w$,callfunc("F_tt");