コミット: 0eedec896d7f2966b8f6c3b816f8144a4b3c645c - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 0eedec896d7f2966b8f6c3b816f8144a4b3c645c (tree)
• 日時: 2019-09-26 23:21:46
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

Windblade氏の更新に対応

変更サマリ

• modified: script/main.lua
• modified: script/motif.lua
• modified: script/select.lua

差分

--- a/script/main.lua
+++ b/script/main.lua
@@ -82,6 +82,12 @@ function main.f_animPosDraw(a, x, y)
 	animDraw(a)
 end
 
+-- Check if files exists.
+function main.file_exists(name)
+   local f=io.open(name,"r")
+   if f~=nil then io.close(f) return true else return false end
+end
+
 --textImgDraw at specified coordinates
 function main.f_textImgPosDraw(ti, x, y, align)
 	align = align or 0
@@ -1227,7 +1233,7 @@ main.t_randomChars = {}
 for i = 1, #main.t_selChars do
 	if main.t_selChars[i].stage ~= nil then
 		for j = 1, #main.t_selChars[i].stage do
-			if main.t_stageDef[main.t_selChars[i].stage[j]] == nil then
+			if main.t_stageDef[main.t_selChars[i].stage[j]] == nil and main.file_exists(main.t_selChars[i].stage[j]) then
 				row = #main.t_selStages + 1
 				addStage(main.t_selChars[i].stage[j])
 				tmp = getStageName(row):match('^["%s]*(.-)["%s]*$') --needed for s-size ikemen

--- a/script/motif.lua
+++ b/script/motif.lua
@@ -1409,8 +1409,10 @@ for line in file:lines() do
 		if param ~= nil then
 			param = param:gsub('[%. ]', '_') --change param . and space to _
 			param = param:lower() --lowercase param
-			if value == '' and (type(def_pos[param]) == 'number' or type(def_pos[param]) == 'table') then --text should remain empty
-				value = '0'
+			if value ~= nil and def_pos ~= nil then -- Let's chech if it's even a valid param
+				if value == '' and (type(def_pos[param]) == 'number' or type(def_pos[param]) == 'table') then --text should remain empty
+					value = '0'
+				end
 			end
 		end
 		if param ~= nil and value ~= nil then --param = value pattern matched

--- a/script/select.lua
+++ b/script/select.lua
@@ -2464,7 +2464,8 @@ function select.f_selectVictory()
 				winnerNum,
 				motif.victory_screen.p1_offset[1],
 				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
+				motif.victory_screen.p1_facing,
+				motif.victory_screen.p1_scale[1],
 				motif.victory_screen.p1_scale[2]
 			)
 		else
@@ -2472,14 +2473,16 @@ function select.f_selectVictory()
 				p1Num,
 				motif.victory_screen.p1_offset[1],
 				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
+				motif.victory_screen.p1_facing,
+				motif.victory_screen.p1_scale[1],
 				motif.victory_screen.p1_scale[2]
 			)
 			drawVictoryPortrait(
 				p2Num,
 				motif.victory_screen.p2_offset[1],
 				motif.victory_screen.p2_offset[2],
-				motif.victory_screen.p2_facing * motif.victory_screen.p2_scale[1],
+				motif.victory_screen.p2_facing,
+				motif.victory_screen.p2_scale[1],
 				motif.victory_screen.p2_scale[2]
 			)
 		end