[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 ee9fc6d 107/237: ADDED rema
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 ee9fc6d 107/237: ADDED remaining portraits |
Date: |
Mon, 25 Jul 2016 18:15:00 +0000 (UTC) |
tag: Release_0-3-1
commit ee9fc6d625994732f7c8b29ab397e441c3275b83
Author: adondev <adondev>
Commit: adondev <adondev>
ADDED remaining portraits
---
gfx/portraits/Makefile.am | 4 +++-
gfx/portraits/alek.pnm | Bin 0 -> 12346 bytes
gfx/portraits/bjarn.pnm | Bin 0 -> 12346 bytes
gfx/portraits/erek.pnm | Bin 12346 -> 12346 bytes
gfx/portraits/fellnir.pnm | Bin 0 -> 12346 bytes
gfx/portraits/frostbloom.pnm | Bin 0 -> 12346 bytes
gfx/portraits/illig.pnm | Bin 0 -> 12346 bytes
gfx/portraits/janesta.pnm | Bin 0 -> 12346 bytes
gfx/portraits/jelom.pnm | Bin 12346 -> 12346 bytes
gfx/portraits/lucia.pnm | Bin 0 -> 12346 bytes
gfx/portraits/oliver.pnm | Bin 0 -> 12346 bytes
gfx/portraits/orloth.pnm | Bin 0 -> 12346 bytes
gfx/portraits/player.pnm | Bin 12346 -> 12346 bytes
gfx/portraits/sarin.pnm | Bin 0 -> 12346 bytes
gfx/portraits/silverhair.pnm | Bin 0 -> 12346 bytes
gfx/portraits/talan.pnm | Bin 12346 -> 12346 bytes
scripts/init.py | 11 +++++++++++
17 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/gfx/portraits/Makefile.am b/gfx/portraits/Makefile.am
index cee5cbc..72d3835 100644
--- a/gfx/portraits/Makefile.am
+++ b/gfx/portraits/Makefile.am
@@ -1,5 +1,7 @@
pkgdatadir = $(gamedatadir)/gfx/portraits
-pkgdata_DATA = erek.pnm jelom.pnm talan.pnm player.pnm
+pkgdata_DATA = erek.pnm jelom.pnm talan.pnm player.pnm alek.pnm \
+ frostbloom.pnm lucia.pnm sarin.pnm bjarn.pnm illig.pnm oliver.pnm \
+ silverhair.pnm janesta.pnm orloth.pnm fellnir.pnm
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/portraits/alek.pnm b/gfx/portraits/alek.pnm
new file mode 100644
index 0000000..2c0a91d
Binary files /dev/null and b/gfx/portraits/alek.pnm differ
diff --git a/gfx/portraits/bjarn.pnm b/gfx/portraits/bjarn.pnm
new file mode 100644
index 0000000..ffada59
Binary files /dev/null and b/gfx/portraits/bjarn.pnm differ
diff --git a/gfx/portraits/erek.pnm b/gfx/portraits/erek.pnm
index 8f4be7c..71e9c66 100644
Binary files a/gfx/portraits/erek.pnm and b/gfx/portraits/erek.pnm differ
diff --git a/gfx/portraits/fellnir.pnm b/gfx/portraits/fellnir.pnm
new file mode 100644
index 0000000..d994266
Binary files /dev/null and b/gfx/portraits/fellnir.pnm differ
diff --git a/gfx/portraits/frostbloom.pnm b/gfx/portraits/frostbloom.pnm
new file mode 100644
index 0000000..cae67bd
Binary files /dev/null and b/gfx/portraits/frostbloom.pnm differ
diff --git a/gfx/portraits/illig.pnm b/gfx/portraits/illig.pnm
new file mode 100644
index 0000000..b4dbd3c
Binary files /dev/null and b/gfx/portraits/illig.pnm differ
diff --git a/gfx/portraits/janesta.pnm b/gfx/portraits/janesta.pnm
new file mode 100644
index 0000000..303bf51
Binary files /dev/null and b/gfx/portraits/janesta.pnm differ
diff --git a/gfx/portraits/jelom.pnm b/gfx/portraits/jelom.pnm
index 4ba53bc..295e40f 100644
Binary files a/gfx/portraits/jelom.pnm and b/gfx/portraits/jelom.pnm differ
diff --git a/gfx/portraits/lucia.pnm b/gfx/portraits/lucia.pnm
new file mode 100644
index 0000000..752c7cf
Binary files /dev/null and b/gfx/portraits/lucia.pnm differ
diff --git a/gfx/portraits/oliver.pnm b/gfx/portraits/oliver.pnm
new file mode 100644
index 0000000..20f6f8e
Binary files /dev/null and b/gfx/portraits/oliver.pnm differ
diff --git a/gfx/portraits/orloth.pnm b/gfx/portraits/orloth.pnm
new file mode 100644
index 0000000..25d4417
Binary files /dev/null and b/gfx/portraits/orloth.pnm differ
diff --git a/gfx/portraits/player.pnm b/gfx/portraits/player.pnm
index 6cb8a59..f5c940c 100644
Binary files a/gfx/portraits/player.pnm and b/gfx/portraits/player.pnm differ
diff --git a/gfx/portraits/sarin.pnm b/gfx/portraits/sarin.pnm
new file mode 100644
index 0000000..a321fcb
Binary files /dev/null and b/gfx/portraits/sarin.pnm differ
diff --git a/gfx/portraits/silverhair.pnm b/gfx/portraits/silverhair.pnm
new file mode 100644
index 0000000..3210924
Binary files /dev/null and b/gfx/portraits/silverhair.pnm differ
diff --git a/gfx/portraits/talan.pnm b/gfx/portraits/talan.pnm
index e4a4fa2..5efc8ef 100644
Binary files a/gfx/portraits/talan.pnm and b/gfx/portraits/talan.pnm differ
diff --git a/scripts/init.py b/scripts/init.py
index 92dde70..86a5b14 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -782,6 +782,7 @@ class title_screen:
lucia.jump_to (3, 4, 2)
lucia.set_action ("talk")
lucia.stand_south ()
+ lucia.set_portrait ("lucia.pnm")
orloth = gamedata_get_character ("Orloth Redwyne")
orloth.set_dialogue ("dialogues/orloth_start")
@@ -791,6 +792,7 @@ class title_screen:
orloth.set_action ("talk")
orloth.stand_south ()
orloth.set_schedule ("orloth")
+ orloth.set_portrait ("orloth.pnm")
erek = gamedata_get_character ("Erek Stonebreaker")
erek.set_dialogue ("dialogues/erek_start")
@@ -832,6 +834,7 @@ class title_screen:
alek.set_action ("talk")
alek.stand_south ()
alek.set_schedule ("alek")
+ alek.set_portrait ("alek.pnm")
oliver = gamedata_get_character ("Oliver Redwyne")
oliver.set_dialogue ("dialogues/oliver_start")
@@ -841,6 +844,7 @@ class title_screen:
oliver.set_action ("talk")
oliver.stand_west ()
oliver.set_schedule ("oliver")
+ oliver.set_portrait ("oliver.pnm")
frostbloom = gamedata_get_character ("Rhayne Frostbloom")
frostbloom.set_dialogue ("dialogues/frostbloom_start")
@@ -850,6 +854,7 @@ class title_screen:
frostbloom.set_action ("talk")
frostbloom.stand_north ()
frostbloom.set_schedule ("frostbloom")
+ frostbloom.set_portrait ("frostbloom.pnm")
bjarn = gamedata_get_character ("Bjarn Fingolson")
bjarn.set_dialogue ("dialogues/bjarn_start")
@@ -858,6 +863,7 @@ class title_screen:
bjarn.jump_to (7, 3, 6)
bjarn.set_action ("talk")
bjarn.stand_west ()
+ bjarn.set_portrait ("bjarn.pnm")
silverhair = gamedata_get_character ("Imoen Silverhair")
silverhair.load ("silverhair.mchar")
@@ -866,6 +872,7 @@ class title_screen:
silverhair.set_action ("talk")
silverhair.stand_south ()
silverhair.set_schedule ("silverhair")
+ silverhair.set_portrait ("silverhair.pnm")
sarin = gamedata_get_character ("Sarin Trailfollower")
sarin.set_dialogue ("dialogues/sarin_start")
@@ -875,6 +882,7 @@ class title_screen:
sarin.set_action ("talk")
sarin.stand_west ()
sarin.set_schedule ("sarin")
+ sarin.set_portrait ("sarin.pnm")
janesta = gamedata_get_character ("Janesta Skywind")
janesta.set_dialogue ("dialogues/janesta_start")
@@ -884,6 +892,7 @@ class title_screen:
janesta.set_action ("talk")
janesta.stand_north ()
janesta.set_schedule ("janesta")
+ janesta.set_portrait ("janesta.pnm")
fellnir = gamedata_get_character ("Fellnir Kezular")
fellnir.set_dialogue ("dialogues/fellnir_start")
@@ -893,6 +902,7 @@ class title_screen:
fellnir.set_action ("talk")
fellnir.stand_south ()
fellnir.set_schedule ("fellnir")
+ fellnir.set_portrait ("fellnir.pnm")
tristan = gamedata_get_character ("Tristan Illig")
tristan.set_dialogue ("dialogues/tristan_start")
@@ -902,6 +912,7 @@ class title_screen:
tristan.set_action ("talk")
tristan.stand_west ()
tristan.set_schedule ("tristan")
+ tristan.set_portrait ("illig.pnm")
# Once we want to generate the data context files,
# just call gamedata::save (1) and copy the .data files
- [adonthell-wastesedge-commits] Release_0-3-1 aad3c95 098/237: Fixed missing installation target, (continued)
- [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, 2016/07/25
- [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 <=
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 7b03aa9 081/237: Done some map work., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a49adb1 102/237: Now getting the_player, characters and quests via the proper API functions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 53eb6ab 113/237: The player is now saved in character.data too, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ef12728 074/237: Added transition tiles, Kai Sterker, 2016/07/25