diff options
author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-14 16:11:50 +0000 |
---|---|---|
committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-14 16:11:50 +0000 |
commit | a4795646cf4a042cd21a982f0d85e16abc6cc1da (patch) | |
tree | 5114f1615f65c69db7c138b249f5744498b6102e /npc | |
parent | d2b18c292a3a59f785a1eb27208f7379065f6317 (diff) | |
download | hercules-a4795646cf4a042cd21a982f0d85e16abc6cc1da.tar.gz hercules-a4795646cf4a042cd21a982f0d85e16abc6cc1da.tar.bz2 hercules-a4795646cf4a042cd21a982f0d85e16abc6cc1da.tar.xz hercules-a4795646cf4a042cd21a982f0d85e16abc6cc1da.zip |
* Fixed error in bg_common, and duplicate warp names.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14375 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r-- | npc/Changelog.txt | 1 | ||||
-rw-r--r-- | npc/battleground/bg_common.txt | 2 | ||||
-rw-r--r-- | npc/battleground/flavius/flavius01.txt | 4 | ||||
-rw-r--r-- | npc/battleground/tierra/tierra01.txt | 4 | ||||
-rw-r--r-- | npc/battleground/tierra/tierra02.txt | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 8806c17d2..38050e34d 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,7 @@ Date Added ====== 2010/08/11 + * Rev. 14375 Fixed error in bg_common, and duplicate warp names. [L0ne_W0lf] * Rev. 14374 More battleground editing, and some bug fixes. [L0ne_W0lf] - * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING * - Rewrote the Badge Exchange NPC in bg_common.txt, is official now. diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index cf6a85bc1..c092b5145 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -580,7 +580,7 @@ bat_room,160,150,3 script Erundek 109,{ if (.@cost[0] == 7829) set .@type$,"(VB)"; else -v set .@type$,"(BB)"; + set .@type$,"(BB)"; mes "[Erundek]"; mes "You chose ^3131FF"+getitemname(.@item[0])+""+.@type$+"^000000."; mes "You can exchange for this item with ^FF0000"+.@cost[1]+" "+getitemname(.@cost[0])+"^000000."; diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index 66e6db86d..f501a9fce 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -37,8 +37,8 @@ OnEnterBG: end; } -bat_room,85,220,0 warp back_bgroomb02a 1,1,bat_room,154,150 -bat_room,85,211,0 warp back_bgroomb02b 1,1,bat_room,154,150 +bat_room,85,220,0 warp back_bgroomb01a 1,1,bat_room,154,150 +bat_room,85,211,0 warp back_bgroomb01b 1,1,bat_room,154,150 bat_room,2,151,3 script #bat_b01_timer 844,{ end; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 6795a2300..bd351b7ea 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -84,8 +84,8 @@ OnTouch: end; } -bat_room,57,220,0 warp back_bgroom01a 1,1,bat_room,154,150 -bat_room,57,211,0 warp back_bgroom01b 1,1,bat_room,154,150 +bat_room,57,220,0 warp back_bgrooma01a 1,1,bat_room,154,150 +bat_room,57,211,0 warp back_bgrooma01b 1,1,bat_room,154,150 // Tierra Gorge Battleground Engine //============================================================ diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index fad2e1266..d09aa492f 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -84,8 +84,8 @@ OnTouch: end; } -bat_room,113,220,0 warp back_bgroom02a 1,1,bat_room,154,150 -bat_room,113,211,0 warp back_bgroom02b 1,1,bat_room,154,150 +bat_room,113,220,0 warp back_bgrooma02a 1,1,bat_room,154,150 +bat_room,113,211,0 warp back_bgrooma02b 1,1,bat_room,154,150 // Tierra Gorge Battleground Engine //============================================================ |