diff options
author | Wushin <pasekei@gmail.com> | 2015-01-24 13:33:21 -0600 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-01-24 13:33:21 -0600 |
commit | c37de3301fc33e2497fe620841c2f2df293bf169 (patch) | |
tree | 33da4e3fed8e70d3f082153aec42bce5390da9d3 | |
parent | 98b413d43cd1d20d20a4e54ec594abe3f2cd8c48 (diff) | |
parent | b4a3650f679b41e5e90c8a09fd95caa602a66f2a (diff) | |
download | serverdata-c37de3301fc33e2497fe620841c2f2df293bf169.tar.gz serverdata-c37de3301fc33e2497fe620841c2f2df293bf169.tar.bz2 serverdata-c37de3301fc33e2497fe620841c2f2df293bf169.tar.xz serverdata-c37de3301fc33e2497fe620841c2f2df293bf169.zip |
Merge pull request #251 from mekolat/jonanthan
fix some typos in xmas inn
-rw-r--r-- | world/map/npc/030-2/_import.txt | 4 | ||||
-rw-r--r-- | world/map/npc/030-2/guards.txt (renamed from world/map/npc/030-2/gaurds.txt) | 0 | ||||
-rw-r--r-- | world/map/npc/030-2/present_helper.txt | 5 | ||||
-rw-r--r-- | world/map/npc/030-2/roasted_acorns_helper.txt (renamed from world/map/npc/030-2/roasted_acrons_helper.txt) | 0 |
4 files changed, 4 insertions, 5 deletions
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt index c2c641aa..c3867abf 100644 --- a/world/map/npc/030-2/_import.txt +++ b/world/map/npc/030-2/_import.txt @@ -9,11 +9,11 @@ npc: npc/030-2/bedding_helper.txt npc: npc/030-2/chief_helper.txt npc: npc/030-2/eljas.txt npc: npc/030-2/empty_boxes_helper.txt -npc: npc/030-2/gaurds.txt npc: npc/030-2/glitter_helper.txt +npc: npc/030-2/guards.txt npc: npc/030-2/mapflags.txt npc: npc/030-2/present_helper.txt -npc: npc/030-2/roasted_acrons_helper.txt +npc: npc/030-2/roasted_acorns_helper.txt npc: npc/030-2/shipping_helper.txt npc: npc/030-2/storage_helper.txt npc: npc/030-2/wrapping_paper_helper.txt diff --git a/world/map/npc/030-2/gaurds.txt b/world/map/npc/030-2/guards.txt index 3fdc1ffa..3fdc1ffa 100644 --- a/world/map/npc/030-2/gaurds.txt +++ b/world/map/npc/030-2/guards.txt diff --git a/world/map/npc/030-2/present_helper.txt b/world/map/npc/030-2/present_helper.txt index 248c296a..0a027ca0 100644 --- a/world/map/npc/030-2/present_helper.txt +++ b/world/map/npc/030-2/present_helper.txt @@ -1,8 +1,8 @@ // Annual Xmas // Author: wushin -// Present Reclaimation +// Present Reclamation -030-2.gat,47,82,0|script|Jonanthan|328 +030-2.gat,47,82,0|script|Jonathan|328 { callfunc "XmasStates"; @@ -84,4 +84,3 @@ L_Close: set @present_name$, ""; close; } - diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acorns_helper.txt index f942c118..f942c118 100644 --- a/world/map/npc/030-2/roasted_acrons_helper.txt +++ b/world/map/npc/030-2/roasted_acorns_helper.txt |