[adonthell-wastesedge-commits] Release_0-3-1 aa2d088 057/237: Added erek and fellnir.

[Kai Sterker]

tag: Release_0-3-1
commit aa2d0880196f7c99ea265e8f31d39d59d62780ea
Author: adondev <adondev>
Commit: adondev <adondev>

    Added erek and fellnir.
---
 gfx/mapcharacters/Makefile.am   |    3 ++-
 gfx/mapcharacters/erek.mchar    |  Bin 0 -> 10238 bytes
 gfx/mapcharacters/fellnir.mchar |  Bin 0 -> 12062 bytes
 scripts/init.py                 |    4 +---
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gfx/mapcharacters/Makefile.am b/gfx/mapcharacters/Makefile.am
index 415deea..7f22096 100755
--- a/gfx/mapcharacters/Makefile.am
+++ b/gfx/mapcharacters/Makefile.am
@@ -1,6 +1,7 @@
 pkgdatadir = $(gamedatadir)/gfx/mapcharacters
 
 pkgdata_DATA = frostbloom.mchar player.mchar servant1.mchar silverhair.mchar 
orloth.mchar \
-       bjarn.mchar oliver.mchar lucia.mchar servant2.mchar talan.mchar
+       bjarn.mchar oliver.mchar lucia.mchar servant2.mchar talan.mchar \
+       erek.mchar fellnir.mchar
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapcharacters/erek.mchar b/gfx/mapcharacters/erek.mchar
new file mode 100644
index 0000000..760b477
Binary files /dev/null and b/gfx/mapcharacters/erek.mchar differ
diff --git a/gfx/mapcharacters/fellnir.mchar b/gfx/mapcharacters/fellnir.mchar
new file mode 100644
index 0000000..884d482
Binary files /dev/null and b/gfx/mapcharacters/fellnir.mchar differ
diff --git a/scripts/init.py b/scripts/init.py
index 49994d0..c9c4df2 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -552,10 +552,9 @@ if retval < 5:
         orloth.stand_south ()
         orloth.set_schedule ("orloth")
 
-        # -- that's a clone for now
         erek = characters ["Erek Stonebreaker"]
         erek.set_dialogue ("dialogues/erek_start")
-        erek.load ("bjarn.mchar")
+        erek.load ("erek.mchar")
         erek.set_map (map_engine.get_landmap ())
         erek.jump_to (1, 5, 5)
         erek.set_action ("action_talk")
@@ -571,7 +570,6 @@ if retval < 5:
         talan.stand_north ()
         talan.set_schedule ("talan")
 
-        # -- that's a clone for now
         alek = characters ["Alek Endhelm"]
         alek.set_dialogue ("dialogues/alek_start")
         alek.load ("servant2.mchar")