[adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters.

[Kai Sterker]

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

    Added the final mapcharacters.
---
 gfx/mapcharacters/Makefile.am  |    2 +-
 gfx/mapcharacters/illig.mchar  |  Bin 0 -> 9698 bytes
 gfx/mapcharacters/player.mchar |  Bin 10318 -> 13800 bytes
 scripts/init.py                |    3 +--
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gfx/mapcharacters/Makefile.am b/gfx/mapcharacters/Makefile.am
index 12dbf99..8b52068 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 jelom.mchar alek.mchar
+       erek.mchar fellnir.mchar jelom.mchar alek.mchar illig.mchar
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapcharacters/illig.mchar b/gfx/mapcharacters/illig.mchar
new file mode 100644
index 0000000..13f59ee
Binary files /dev/null and b/gfx/mapcharacters/illig.mchar differ
diff --git a/gfx/mapcharacters/player.mchar b/gfx/mapcharacters/player.mchar
index a415310..b27b06d 100755
Binary files a/gfx/mapcharacters/player.mchar and 
b/gfx/mapcharacters/player.mchar differ
diff --git a/scripts/init.py b/scripts/init.py
index ab4a277..92dde70 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -894,10 +894,9 @@ class title_screen:
                 fellnir.stand_south ()
                 fellnir.set_schedule ("fellnir")
 
-                # -- A clone for now
                 tristan = gamedata_get_character ("Tristan Illig")
                 tristan.set_dialogue ("dialogues/tristan_start")
-                tristan.load ("servant2.mchar")
+                tristan.load ("illig.mchar")
                 tristan.set_map (map_engine.get_landmap ())
                 tristan.jump_to (1, 4, 6)
                 tristan.set_action ("talk")