diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 3 | ||||
| -rw-r--r-- | npc/sample/npc_dynamic_shop.txt | 5 | ||||
| -rw-r--r-- | npc/warps/cities/geffen.txt | 6 | ||||
| -rw-r--r-- | npc/warps/cities/louyang.txt | 9 | ||||
| -rw-r--r-- | npc/warps/fields/mtmjolnir.txt | 5 |
5 files changed, 17 insertions, 11 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index d37579265..1cc4c9e2e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2007/11/27 + * Corrected some broken warp points. (bugreport:497) [Samuray22] + * Corrected a bug on Sample Dynamic Shop. (bugreport:421) [Samuray22] 2007/11/26 & Rev. 11815 Fixed a bad warp in ice dungeon. [L0ne_W0lf] * Rev. 11814 Updated the Soul Linker job quest. [L0ne_W0lf] diff --git a/npc/sample/npc_dynamic_shop.txt b/npc/sample/npc_dynamic_shop.txt index ddc39dceb..1a1f174c9 100644 --- a/npc/sample/npc_dynamic_shop.txt +++ b/npc/sample/npc_dynamic_shop.txt @@ -2,13 +2,14 @@ prontera,181,200,4 script Dynamic Shop 123,{ callshop "dyn_shop1",0; +npcshopattach "dyn_shop1"; end; OnSellItem: for(set @i, 0; @i < getarraysize(@sold_nameid); set @i, @i + 1){ - if(countitem(@sold_nameid[@i]) < @sold_quantity[@i] || @sold_quantity[@i] <= 0){ + if(countitem(@sold_nameid[@i]) < @sold_quantity[@i] && @sold_quantity[@i] <= 0){ mes "omgh4x!"; - end; + close; } if(@sold_nameid[@i] == 501){ set $@rpotsleft, $@rpotsleft + @sold_quantity[@i]; diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt index 08ed3490c..87022525b 100644 --- a/npc/warps/cities/geffen.txt +++ b/npc/warps/cities/geffen.txt @@ -4,13 +4,13 @@ //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.1a //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen //===== Additional Comments: ================================= -//= No Comment! +//= 1.1a Corrected a broken warp point. (bugreport:497) [Samuray22] //============================================================ //Geffen City @@ -45,6 +45,6 @@ geffen_in,70,83,0 warp gef15 3,2,geffen_in,72,101 geffen_in,72,98,0 warp gef15-1 3,2,geffen_in,70,80 geffen_in,163,94,0 warp gef05-1 4,2,geffen,65,176 geffen_in,70,132,0 warp gef04-1 3,1,geffen,46,88 -geffen_in,106,181,0 warp gef03-1 2,2,geffen,180,61 +geffen_in,106,181,0 warp gef03-1 2,2,geffen,179,59 geffen_in,28,106,0 warp gef01-1 1,3,geffen,136,136 geffen_in,70,48,0 warp gef02-1 3,2,geffen,168,170 diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt index c658f88be..94a9e22f6 100644 --- a/npc/warps/cities/louyang.txt +++ b/npc/warps/cities/louyang.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.4a //===== Compatible With: ===================================== //= Any Athena Version 6.0+ //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.2 Added a few missing warps [MasterOfMuppets] //= 1.3 Fixed a few warp-back [erKURITA] //= 1.4 Moved some quest-related warps to proper file. [SinSloth] +//= 1.4a Corrected some broken warp points. (bugreport:497) [Samuray22] //============================================================ //= Louyang Town ============================================= @@ -41,13 +42,13 @@ lou_in02,174,46,0 warp louwarp008a 3,3,lou_in02,206,94 lou_in02,197,158,0 warp louwarp009b 3,3,louyang,124,117 lou_in02,203,158,0 warp louwarp009c 3,3,louyang,129,117 lou_in02,125,164,0 warp louwarp010a 3,3,louyang,145,171 -lou_in02,251,175,0 warp louwarp011a 3,3,louyang,140,101 -lou_in02,242,59,0 warp louwarp018a 3,3,louyang,260,93 +lou_in02,247,171,0 warp louwarp011a 3,3,louyang,140,101 +lou_in02,242,59,0 warp louwarp018a 3,3,louyang,259,93 lou_in02,80,190,0 warp louwarp012 3,3,lou_in02,74,140 lou_in02,71,140,0 warp louwarp012a 3,3,lou_in02,77,190 lou_in02,35,190,0 warp louwarp013 3,3,lou_in02,37,138 lou_in02,43,138,0 warp louwarp013a 3,3,lou_in02,39,190 -lou_in02,121,32,0 warp louwarp014a 3,3,louyang,317,173 +lou_in02,118,36,0 warp louwarp014a 3,3,louyang,317,173 lou_in02,71,28,0 warp louwarp015a 3,3,louyang,130,57 lou_in02,189,74,0 warp louwarp007a 3,3,louyang,309,76 lou_fild01,232,357,0 warp louwarp001a 3,3,louyang,217,26 diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt index e95c0c97e..08bb6afa7 100644 --- a/npc/warps/fields/mtmjolnir.txt +++ b/npc/warps/fields/mtmjolnir.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.2a //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,11 +11,12 @@ //===== Additional Comments: ================================= //= 1.1 updating according to jA [Lupus] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.2a Corrected a broken warp point. (bugreport:497) [Samuray22] //============================================================ //= Mt. Mjolnir ============================================== mjolnir_01,284,18,0 warp mjol001 4,2,gef_fild04,261,359 -mjolnir_01,378,256,0 warp mjol01 2,2,mjolnir_02,30,258 +mjolnir_01,378,256,0 warp mjol01 2,2,mjolnir_02,31,258 mjolnir_02,28,258,0 warp mjol01-1 2,2,mjolnir_01,374,256 mjolnir_02,326,289,0 warp mjol02 1,1,mjolnir_03,24,258 mjolnir_02,361,18,0 warp mjol03 4,2,mjolnir_06,366,380 |