[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added char
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added characters portraits |
Date: |
Mon, 25 Jul 2016 18:14:57 +0000 (UTC) |
tag: Release_0-3-1
commit d6dfa6e17641d3016b0d2d21d6e01cda1b6f8c57
Author: adondev <adondev>
Commit: adondev <adondev>
Added characters portraits
---
character.data | Bin 511 -> 680 bytes
gfx/Makefile.am | 2 +-
gfx/mapcharacters/bjarn.mchar | Bin 8652 -> 12916 bytes
gfx/mapcharacters/erek.mchar | Bin 10238 -> 10235 bytes
gfx/mapcharacters/oliver.mchar | Bin 7434 -> 9877 bytes
gfx/portraits/Makefile.am | 5 +++++
gfx/portraits/erek.pnm | Bin 0 -> 12346 bytes
gfx/portraits/jelom.pnm | Bin 0 -> 12346 bytes
scripts/init.py | 4 ++++
scripts/modules/console.py | 1 +
scripts/schedules/oliver.py | 2 +-
11 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/character.data b/character.data
index 0481912..ea8170f 100755
Binary files a/character.data and b/character.data differ
diff --git a/gfx/Makefile.am b/gfx/Makefile.am
index 30fbadf..7e76256 100755
--- a/gfx/Makefile.am
+++ b/gfx/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cutscene mapcharacters mapobjects window
+SUBDIRS = cutscene mapcharacters mapobjects window portraits
pkgdatadir = $(gamedatadir)/gfx
diff --git a/gfx/mapcharacters/bjarn.mchar b/gfx/mapcharacters/bjarn.mchar
index 2b3ebed..494b00a 100755
Binary files a/gfx/mapcharacters/bjarn.mchar and
b/gfx/mapcharacters/bjarn.mchar differ
diff --git a/gfx/mapcharacters/erek.mchar b/gfx/mapcharacters/erek.mchar
index 760b477..28bdf17 100644
Binary files a/gfx/mapcharacters/erek.mchar and b/gfx/mapcharacters/erek.mchar
differ
diff --git a/gfx/mapcharacters/oliver.mchar b/gfx/mapcharacters/oliver.mchar
index 43932e4..1a47782 100755
Binary files a/gfx/mapcharacters/oliver.mchar and
b/gfx/mapcharacters/oliver.mchar differ
diff --git a/gfx/portraits/Makefile.am b/gfx/portraits/Makefile.am
new file mode 100644
index 0000000..143ae24
--- /dev/null
+++ b/gfx/portraits/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = $(gamedatadir)/gfx/portraits
+
+pkgdata_DATA = erek.pnm jelom.pnm
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/portraits/erek.pnm b/gfx/portraits/erek.pnm
new file mode 100644
index 0000000..8f4be7c
Binary files /dev/null and b/gfx/portraits/erek.pnm differ
diff --git a/gfx/portraits/jelom.pnm b/gfx/portraits/jelom.pnm
new file mode 100644
index 0000000..4ba53bc
Binary files /dev/null and b/gfx/portraits/jelom.pnm differ
diff --git a/scripts/init.py b/scripts/init.py
index 42463f8..ac0e4ea 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -141,6 +141,8 @@ del bag_o
audio_pause_music ()
+##retval = 1
+
if retval < 5:
if retval == 1:
gamedata_load (0)
@@ -563,6 +565,7 @@ if retval < 5:
# changed Erek's text color to violet
erek.set_color (3)
erek.set_schedule ("erek")
+ erek.set_portrait ("erek.pnm")
talan = characters ["Talan Wendth"]
talan.set_dialogue ("dialogues/talan_start")
@@ -582,6 +585,7 @@ if retval < 5:
jelom.set_action ("action_talk")
jelom.stand_north ()
jelom.set_schedule ("jelom")
+ jelom.set_portrait ("jelom.pnm")
# -- that's a clone for now
alek = characters ["Alek Endhelm"]
diff --git a/scripts/modules/console.py b/scripts/modules/console.py
index 2b7a66d..336bb7e 100755
--- a/scripts/modules/console.py
+++ b/scripts/modules/console.py
@@ -32,6 +32,7 @@ class console (win_container):
self.entry = win_write ()
self.entry.thisown = 0
+
self.entry.py_signal_connect (self.on_execute, win_event_ACTIVATE_KEY)
self.entry.move (5, 5)
self.entry.resize (290, 70)
diff --git a/scripts/schedules/oliver.py b/scripts/schedules/oliver.py
index 630c9e7..2dc97b2 100755
--- a/scripts/schedules/oliver.py
+++ b/scripts/schedules/oliver.py
@@ -46,7 +46,7 @@ if myself.get_val ("goto_players_room") == 1:
elif myself.get_val ("goto_players_room") == 3:
# -- start talking to the player
myself.launch_action (the_player)
-
+
# -- leave the player's room and goto the barn
elif myself.get_val ("goto_barn") == 1:
location = myself.submap ()
- [adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior., (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 be10dec 068/237: Added guards house interior., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9d5c3db 072/237: Continued furniturizing, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a51967 079/237: Continued map., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved transition files to their real place., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 91abdcd 136/237: FIXED Makefile.am (intro.py was missing), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 30316f6 132/237: ADDED initial dialogue with Talan to get into the inn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a0f9fe 050/237: Minor changes to the map., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 21f36d0 059/237: Slight fix., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b40a92e 134/237: ADDED Lucia's schedule and furnitures, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 64e91d5 033/237: UPDATE to some schedules and dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d6dfa6e 064/237: Added characters portraits,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 0933dbf 063/237: How could I forget them ... ? ; ), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 18d2266 131/237: FIXED installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b028da 127/237: UPDATED intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 290bfde 086/237: ADDED portraits of Talan and Player, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 398bec8 143/237: IMPROVED Bjarn's dialogue and text bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a1e51e2 061/237: ADDED Jelom, Kai Sterker, 2016/07/25