diff options
| author | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
| commit | 0e990045fc308ca58421eda25838d3b9e7a10afa (patch) | |
| tree | 7966898e283b6759f226bd8222de161fb64772c2 /doc/sample | |
| parent | e95c473c694f4fccb40584f3e6a00323f91e36ee (diff) | |
| parent | 32a42eeee18b16d9f904a409974dda575f3966c2 (diff) | |
| download | hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.gz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.bz2 hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.xz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.zip | |
Merge branch 'AnnieRuru-request_29' into hercules
Closes #1000 as merged
Diffstat (limited to 'doc/sample')
| -rw-r--r-- | doc/sample/npc_dynamic_shop.txt | 2 | ||||
| -rw-r--r-- | doc/sample/npc_test_duplicate.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/sample/npc_dynamic_shop.txt b/doc/sample/npc_dynamic_shop.txt index 1e4ac77e4..9b1315ba7 100644 --- a/doc/sample/npc_dynamic_shop.txt +++ b/doc/sample/npc_dynamic_shop.txt @@ -9,7 +9,7 @@ //============================================================ // Dummy shop to insert items into: -- shop dyn_shop1 -1,501:50. +- shop dyn_shop1 FAKE_NPC,501:50. prontera,181,200,4 script Dynamic Shop 2_F_MAGICMASTER,{ callshop "dyn_shop1",0; diff --git a/doc/sample/npc_test_duplicate.txt b/doc/sample/npc_test_duplicate.txt index 55d64bc7b..4e07e38c4 100644 --- a/doc/sample/npc_test_duplicate.txt +++ b/doc/sample/npc_test_duplicate.txt @@ -12,7 +12,7 @@ //= 'OnInit' loads the main npc last, for some reason. (check with debugmes) //============================================================ -- script Test Script -1,1,1,{ +- script Test Script FAKE_NPC,1,1,{ mes "Hi."; mes "My coords are "+ .map$ +", "+ .x +"/" +.y ; close; |