Skip to content

Commit 88d7128

Browse files
committed
くろしまくんセリフが細切れになる件に対応
1 parent 510b52b commit 88d7128

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

model/message.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,14 @@ def calc_message_start(self, messages):
8080
max_message_len = len(max(messages, key=lambda mes : len(mes)))
8181
start_x = (const.L_WIDTH - max_message_len * const.FONT_SIZE) / 2 - 1
8282
start_y = (const.L_HEIGHT - len(messages) * const.FONT_SIZE) / 2- 1
83-
return start_x, start_y
83+
return start_x, start_y
84+
85+
def デバッグ(self):
86+
if(self.messanger == "くろしまくん"):
87+
print("counter:" + str(self.counter))
88+
print("message_line:" + str(self.message_line))
89+
print("message_idx:" + str(self.message_idx))
90+
print("messages:" + str(self.messages))
91+
print("complete:" + str(self.complete))
92+
print("cnt:" + str(self.cnt))
93+
print(pyxel.frame_count)

story/play.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ def __init__(self, rpg):
7777
self.ボーナスメッセージ配置 = self.X軸センタリング(self.ボーナスメッセージ, const.FONT_SIZE)
7878

7979
self.きあら = Character(const.TILE * 40, const.FIELD + const.TILE * 6,"きあら")
80+
self.くろしまくん = Character(const.TILE * 7, const.FIELD * 2 + const.TILE * 6,"くろしまくん")
81+
self.くろしまくん.向き = const.向き.
8082

8183
def start(self):
8284
pyxel.stop()
@@ -92,13 +94,13 @@ def update(self):
9294
if ("さなつん" in self.舞香ちゃん.会話済メンバー and self.舞香ちゃん.global_x // const.CELL, self.舞香ちゃん.global_y // const.CELL) in const.くろしままえ and not self.くろしまトーク and self.舞香ちゃん.向き == const.向き.:
9395
self.message.話す(const.M_TYPE.WINDOW,
9496
"くろしまくん", self.くろしまセリフ)
95-
const.キャラ歩幅 = 8
96-
97-
if self.message.complete and (pyxel.btnp(pyxel.GAMEPAD1_BUTTON_A) or pyxel.btnp(pyxel.GAMEPAD1_BUTTON_B) or pyxel.btn(pyxel.KEY_RETURN)):
97+
98+
if self.message.messanger == "くろしまくん" and self.message.complete and (pyxel.btnp(pyxel.GAMEPAD1_BUTTON_A) or pyxel.btnp(pyxel.GAMEPAD1_BUTTON_B) or pyxel.btn(pyxel.KEY_RETURN)):
9899
self.message.complete = False
99100
self.message.messages.clear()
100101
self.くろしまトーク = True
101102
self.message.messanger = "まいか"
103+
const.キャラ歩幅 = 8
102104

103105
if self.舞香ちゃん.部屋の場所() == const.最後の部屋:
104106
if self.message.messanger == "まいか" and len(self.舞香ちゃん.持ってるアイテム()) == 0 or const.アイテム.さいりうむ.value not in self.舞香ちゃん.持ってるアイテム():

0 commit comments

Comments
 (0)