heart-of-gold

commit 2ab5773795bbe873df0859ae78394d8c48789956
parent 91c8d8a461ce9713583cfa7918eef28870db0bcd
Author: Erik Letson <hmagellan@hmagellan.com>
Date:   Mon, 28 Dec 2020 17:35:56 -0600

Added jisella proper portrait and fix dialog line length error

Diffstat:
M
data/img/actors/jisella/portrait.png
 | 
0

M
data/json/scenes/testdia.json
 | 
4
++--
M
data/json/scenes/testscene.json
 | 
2
+-
M
src/scene.py
 | 
1
+

4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/data/img/actors/jisella/portrait.png b/data/img/actors/jisella/portrait.png
Binary files differ.
diff --git a/data/json/scenes/testdia.json b/data/json/scenes/testdia.json
@@ -11,9 +11,9 @@
 			"name_font" : "A",
 			"name_pos" : [20, 480],
 			"line_font" : "A",
-			"voice" : null,
+			"voice" : "Voice2",
 			"portrait" : "jisella_actor_portrait",
-			"line" : "Hello there. How are you doing today? I'm fine, thanks for asking.",
+			"line" : "Hello there. How are you doing today? I'm fine, thanks for asking. This is a really long line for testing purposes, so excuse me for that.",
 			"characters" : [ ],
 			"effects" : [ ]
 		},
diff --git a/data/json/scenes/testscene.json b/data/json/scenes/testscene.json
@@ -12,7 +12,7 @@
 			"name_pos" : [20, 480],
 			"line_font" : "A",
 			"voice" : "Voice2",
-			"portrait" : "jisella_actor_portrait",
+			"portrait" : null,
 			"line" : "Hello there. How are you doing today? I'm fine, thanks for asking.",
 			"characters" : [
 				{
diff --git a/src/scene.py b/src/scene.py
@@ -189,6 +189,7 @@ class StillScene(object):
             self.current_portrait = sh[self.script[self.script_index]["portrait"]].sprites[(0, 0)]
             self.current_portrait_rect = self.current_portrait.get_rect()
             self.current_portrait_rect.topleft = self.text_area_topleft
+            self.max_line -= 4 + (self.current_portrait_rect.width // self.current_font_height)
 
         # Handle effects
         self.manager.trigger_effects(self.script[self.script_index]["effects"])