[adonthell-wastesedge-commits] Release_0-3-1 365c99f 100/237: Added Alek and Jelom

[Kai Sterker]

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

    Added Alek and Jelom
---
 gfx/mapcharacters/Makefile.am |    2 +-
 gfx/mapcharacters/alek.mchar  |  Bin 0 -> 15449 bytes
 gfx/mapcharacters/jelom.mchar |  Bin 0 -> 17260 bytes
 scripts/init.py               |    6 ++----
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gfx/mapcharacters/Makefile.am b/gfx/mapcharacters/Makefile.am
index 7f22096..12dbf99 100755
--- a/gfx/mapcharacters/Makefile.am
+++ b/gfx/mapcharacters/Makefile.am
@@ -2,6 +2,6 @@ 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 \
-       erek.mchar fellnir.mchar
+       erek.mchar fellnir.mchar jelom.mchar alek.mchar
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapcharacters/alek.mchar b/gfx/mapcharacters/alek.mchar
new file mode 100644
index 0000000..d3ac1e5
Binary files /dev/null and b/gfx/mapcharacters/alek.mchar differ
diff --git a/gfx/mapcharacters/jelom.mchar b/gfx/mapcharacters/jelom.mchar
new file mode 100644
index 0000000..5ee0f66
Binary files /dev/null and b/gfx/mapcharacters/jelom.mchar differ
diff --git a/scripts/init.py b/scripts/init.py
index 34d9643..c5c816e 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -814,10 +814,9 @@ class title_screen:
                 talan.set_schedule ("talan")
                 talan.set_portrait ("talan.pnm")
 
-                # -- that's a clone for now
                 jelom = characters ["Jelom Rasgar"]
                 jelom.set_dialogue ("dialogues/jelom_start")
-                jelom.load ("talan.mchar")
+                jelom.load ("jelom.mchar")
                 jelom.set_map (map_engine.get_landmap ())
                 jelom.jump_to (9, 2, 6)
                 jelom.set_action ("talk")
@@ -825,10 +824,9 @@ class title_screen:
                 jelom.set_schedule ("jelom")
                 jelom.set_portrait ("jelom.pnm")
 
-                # -- that's a clone for now
                 alek = characters ["Alek Endhelm"]
                 alek.set_dialogue ("dialogues/alek_start")
-                alek.load ("servant2.mchar")
+                alek.load ("alek.mchar")
                 alek.set_map (map_engine.get_landmap ())
                 alek.jump_to (1, 1, 3)
                 alek.set_action ("talk")