[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 aa2d088 057/237: Added erek
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 aa2d088 057/237: Added erek and fellnir. |
Date: |
Mon, 25 Jul 2016 18:14:56 +0000 (UTC) |
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")
- [adonthell-wastesedge-commits] Release_0-3-1 d304dc6 069/237: Updated Orloth's and Erek's dialogue, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 d304dc6 069/237: Updated Orloth's and Erek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 842c4b9 076/237: Oops! Forgot this file., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4bcc0dd 066/237: FIXED bugs in automake, silverhair's room connection script and, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5719e8c 078/237: Updated Silverhair's bed., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 aad3c95 098/237: Fixed missing installation target, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 feeadbf 099/237: FIXED data installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4330c0d 053/237: Removed in-game imports, which are now done at init time., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 177b48f 060/237: Changed map - it now has a member to prevent NPCs to be accidentally, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0f70295 082/237: Added some events., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 52a5f4c 038/237: Completed map and connections., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 aa2d088 057/237: Added erek and fellnir.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 eccdffa 095/237: FIXED installation of follow_character.py, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0df9cb7 084/237: Continued map forest, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 835df8f 083/237: ADDED Janesta's schedule, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ee9fc6d 107/237: ADDED remaining portraits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 836cc1a 077/237: Updated Orloth, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8461ce1 108/237: FIXED a bug in Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9da31d1 085/237: OOpps!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2b67b8c 096/237: Reorganized the schedules structure, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11972d6 094/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cfd3652 065/237: Adapted schedules and init scripts to the theme and font manager., Kai Sterker, 2016/07/25