[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters. |
Date: |
Mon, 25 Jul 2016 18:15:00 +0000 (UTC) |
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")
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b770dc8 111/237: ADDED 'name your character' dialog that pops up when starting a new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5f31f05 215/237: Small fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8fca18 186/237: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters.,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 bfb1042 180/237: IMPROVED chest-owners, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b239465 152/237: CHANGED scripts to new character handling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb644d3 229/237: FIXED Audio should now be in sync with the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4c2c7ff 214/237: Finished entrance for veranda effect., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 148ae8b 012/237: This module has nothing to do here and may crash everything! (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ecf6760 220/237: ADDED Initial Game Data, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 623d0fc 190/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b27fa89 169/237: FIXED Erek's dialogue (I hope), Kai Sterker, 2016/07/25