summaryrefslogtreecommitdiff
path: root/example/serverdata/scripts/npcs
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-01-27 01:31:17 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-01-27 01:31:17 +0100
commit0b10fd63ad74a5c1fad4e1cc59e2b623e7049e44 (patch)
tree98e1839741f977d0fbcf1ec558359c0427728a01 /example/serverdata/scripts/npcs
parentf8cde72ad21ea16f129203a5740db02da7a24f0a (diff)
downloadmanaserv-0b10fd63ad74a5c1fad4e1cc59e2b623e7049e44.tar.gz
manaserv-0b10fd63ad74a5c1fad4e1cc59e2b623e7049e44.tar.bz2
manaserv-0b10fd63ad74a5c1fad4e1cc59e2b623e7049e44.tar.xz
manaserv-0b10fd63ad74a5c1fad4e1cc59e2b623e7049e44.zip
Updates to the example data.
- Fixed monsters Id. - Added collision layer to the desert map. - Added a few simple NPCs on the map (They still need a sprite.) - Added player and hairstyles sprites files and definition in items.xml.
Diffstat (limited to 'example/serverdata/scripts/npcs')
-rw-r--r--example/serverdata/scripts/npcs/barber.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/example/serverdata/scripts/npcs/barber.lua b/example/serverdata/scripts/npcs/barber.lua
index 24ad8c9b..bf872a0c 100644
--- a/example/serverdata/scripts/npcs/barber.lua
+++ b/example/serverdata/scripts/npcs/barber.lua
@@ -92,7 +92,7 @@ function Barber(npc, ch, data)
-- Repeat until the user selects nothing
repeat
if (result == 1) then -- Do styles
- result = do_choice(npc, ch, "Bald", styles, "Supprise me", "Never mind")
+ result = do_choice(npc, ch, "Bald", styles, "Surprise me", "Never mind")
result = result -1
@@ -114,7 +114,7 @@ function Barber(npc, ch, data)
result = 3
end
elseif (result == 2) then -- Do colors
- result = do_choice(npc, ch, colors, "Supprise me", "Never mind")
+ result = do_choice(npc, ch, colors, "Surprise me", "Never mind")
--Random
if (result == #colors + 1) then