Commit: d94f7e3f632e50a80e45bb027386cffdfad4074c - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: d94f7e3f632e50a80e45bb027386cffdfad4074c (tree)
• Time: 2019-10-26 21:11:56
• Author: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

アーケードのステージ選択のミスを修正
Helperのownpalの処理を少し修正

Change Summary

• modified: script/select.lua
• modified: src/char.go

Incremental Difference

--- a/script/select.lua
+++ b/script/select.lua
@@ -409,6 +409,8 @@ function select.f_selectStage()
 	elseif main.t_selChars[t_p2Selected[1].cel + 1].stage ~= nil then
 		stageNo = math.random(1, #main.t_selChars[t_p2Selected[1].cel + 1].stage)
 		stageNo = main.t_selChars[t_p2Selected[1].cel + 1].stage[stageNo]
+	else
+		stageNo = main.t_includeStage[math.random(1, #main.t_includeStage)]
 	end
 	if stageNo == 0 then
 		stageNo = main.t_includeStage[math.random(1, #main.t_includeStage)]

--- a/src/char.go
+++ b/src/char.go
@@ -2945,13 +2945,13 @@ func (c *Char) helperInit(h *Char, st int32, pt PosType, x, y float32,
 	h.vel = [2]float32{}
 	if ownpal {
 		h.palfx = newPalFX()
+		tmp := c.getPalfx().remap
+		h.palfx.remap = make([]int, len(tmp))
+		copy(h.palfx.remap, tmp)
+		c.forceRemapPal(h.palfx, rp)
 	} else {
 		h.palfx = c.palfx
 	}
-	tmp := c.getPalfx().remap
-	h.palfx.remap = make([]int, len(tmp))
-	copy(h.palfx.remap, tmp)
-	c.forceRemapPal(h.palfx, rp)
 	if extmap {
 		for key, value := range c.mapArray {
 			h.mapArray[key] = value