Commit: e03685647fc0b754ff2213a5b59d31e86d81b195 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: e03685647fc0b754ff2213a5b59d31e86d81b195 (tree)
• Time: 2019-10-09 17:39:52
• Author: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

Afterimageのalphaの数値が範囲外になる場合があるのを修正
Afterimageをヒットポーズで停止しないように、ignorehitpause=0で停止できるようにした
ProjectileのAfterimageの初期値を修正
コンテニュー後にステージやパレットが変わらないようにした

Change Summary

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

Incremental Difference

--- a/script/select.lua
+++ b/script/select.lua
@@ -404,12 +404,15 @@ function select.f_assignMusic()
 end
 
 function select.f_selectStage()
-	if main.t_selChars[t_p2Selected[1].cel + 1].stage ~= nil then
+	if t_p2Selected[1].stageno ~= nil then
+		stageNo = t_p2Selected[1].stageno
+	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
+	t_p2Selected[1].stageno = stageNo
 	setStage(stageNo)
 	selectStage(stageNo)
 end
@@ -760,7 +763,9 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 	looseCnt = 0
 	main.f_cmdInput()
 	select.f_selectReset()
+	t_p2Selected = {}
 	stageEnd = true
+	local t_enemySelected = {}
 	while true do
 		main.f_resetBG(motif.select_info, motif.selectbgdef, motif.music.select_bgm, motif.music.select_bgm_loop, motif.music.select_bgm_volume, motif.music.select_bgm_loopstart, motif.music.select_bgm_loopend)
 		selectStart()
@@ -780,6 +785,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				p1NumChars = 2
 				setTeamMode(1, p1TeamMode, p1NumChars)
 				t_p1Selected[2] = {cel = t_p2Selected[1].cel, pal = t_p2Selected[1].pal}
+				t_p2Selected = t_enemySelected
 			end
 			--generate roster
 			select.f_makeRoster()
@@ -824,6 +830,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 					select.f_selectVictory()
 				end
 			end
+			t_p2Selected = {}
 			--no more matches left
 			if matchNo == lastMatch then
 				--ending
@@ -931,28 +938,32 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 				p1NumChars = 2
 				p2NumChars = numChars
 				t_p1Selected[2] = {cel = t_p2Selected[1].cel, pal = t_p2Selected[1].pal}
+				t_p2Selected = t_enemySelected
 			end
 		end
 		--assign enemy team
-		t_p2Selected = {}
-		local shuffle = true
-		for i = 1, p2NumChars do
-			if i == 1 and (main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop') and main.t_selChars[t_p1Selected[1].cel + 1][matchNo] ~= nil then
-				p2Cell = main.t_charDef[main.t_selChars[t_p1Selected[1].cel + 1][matchNo]]
-				shuffle = false
-			else
-				p2Cell = t_roster[matchNo * p2NumChars - i + 1]
-			end
-			local updateAnim = true
-			for j = 1, #t_p2Selected do
-				if t_p2Selected[j].cel == p2Cell then
-					updateAnim = false
+		--t_p2Selected = {}
+		if #t_p2Selected == 0 then
+			local shuffle = true
+			for i = 1, p2NumChars do
+				if i == 1 and (main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop') and main.t_selChars[t_p1Selected[1].cel + 1][matchNo] ~= nil then
+					p2Cell = main.t_charDef[main.t_selChars[t_p1Selected[1].cel + 1][matchNo]]
+					shuffle = false
+				else
+					p2Cell = t_roster[matchNo * p2NumChars - i + 1]
+				end
+				local updateAnim = true
+				for j = 1, #t_p2Selected do
+					if t_p2Selected[j].cel == p2Cell then
+						updateAnim = false
+					end
+				end
+				t_p2Selected[#t_p2Selected + 1] = {cel = p2Cell, pal = select.f_randomPal(p2Cell), up = updateAnim}
+				if shuffle then
+					main.f_shuffleTable(t_p2Selected)
 				end
 			end
-			t_p2Selected[#t_p2Selected + 1] = {cel = p2Cell, pal = select.f_randomPal(p2Cell), up = updateAnim}
-			if shuffle then
-				main.f_shuffleTable(t_p2Selected)
-			end
+			t_enemySelected = t_p2Selected
 		end
 		--Team conversion to Single match if bonus paramvalue on any opponents is detected
 		if p2NumChars > 1 then

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -3062,6 +3062,7 @@ const (
 	afterImage_palpostbright
 	afterImage_paladd
 	afterImage_palmul
+	afterImage_ignorehitpause
 	afterImage_last = iota + palFX_last + 1 - 1
 	afterImage_redirectid
 )
@@ -3070,7 +3071,7 @@ func (sc afterImage) runSub(c *Char, ai *AfterImage,
 	id byte, exp []BytecodeExp) {
 	switch id {
 	case afterImage_trans:
-		ai.alpha = [...]int32{exp[0].evalI(c), exp[1].evalI(c)}
+		ai.alpha = [...]int32{Max(-256, Min(255, exp[0].evalI(c))), Max(-256, Min(255, exp[1].evalI(c)))}
 	case afterImage_time:
 		ai.time = exp[0].evalI(c)
 	case afterImage_length:
@@ -3123,6 +3124,8 @@ func (sc afterImage) runSub(c *Char, ai *AfterImage,
 				ai.mul[2] = exp[2].evalF(c)
 			}
 		}
+	case afterImage_ignorehitpause:
+		ai.ignorehitpause = exp[0].evalB(c)
 	}
 }
 func (sc afterImage) Run(c *Char, _ []int32) bool {
@@ -3771,6 +3774,7 @@ func (sc projectile) Run(c *Char, _ []int32) bool {
 			p.platformFence = exp[0].evalB(c)
 		default:
 			if !hitDef(sc).runSub(c, &p.hitdef, id, exp) {
+				p.aimg.clear()
 				afterImage(sc).runSub(c, &p.aimg, id, exp)
 			}
 		}

--- a/src/char.go
+++ b/src/char.go
@@ -663,19 +663,20 @@ type aimgImage struct {
 }
 
 type AfterImage struct {
-	time       int32
-	length     int32
-	postbright [3]int32
-	add        [3]int32
-	mul        [3]float32
-	timegap    int32
-	framegap   int32
-	alpha      [2]int32
-	palfx      []PalFX
-	imgs       [64]aimgImage
-	imgidx     int32
-	restgap    int32
-	reccount   int32
+	time           int32
+	length         int32
+	postbright     [3]int32
+	add            [3]int32
+	mul            [3]float32
+	timegap        int32
+	framegap       int32
+	alpha          [2]int32
+	palfx          []PalFX
+	imgs           [64]aimgImage
+	imgidx         int32
+	restgap        int32
+	reccount       int32
+	ignorehitpause bool
 }
 
 func newAfterImage() *AfterImage {
@@ -700,11 +701,12 @@ func (ai *AfterImage) clear() {
 	ai.add = [...]int32{10, 10, 25}
 	ai.mul = [...]float32{0.65, 0.65, 0.75}
 	ai.timegap = 1
-	ai.framegap = 6
+	ai.framegap = 4
 	ai.alpha = [...]int32{-1, 0}
 	ai.imgidx = 0
 	ai.restgap = 0
 	ai.reccount = 0
+	ai.ignorehitpause = true
 }
 func (ai *AfterImage) setPalColor(color int32) {
 	if len(ai.palfx) > 0 {
@@ -758,12 +760,12 @@ func (ai *AfterImage) setupPalFX() {
 		pb = [3]int32{}
 	}
 }
-func (ai *AfterImage) recAfterImg(sd *SprData) {
+func (ai *AfterImage) recAfterImg(sd *SprData, hitpause bool) {
 	if ai.time == 0 {
 		ai.reccount, ai.timegap = 0, 0
 		return
 	}
-	if ai.time > 0 {
+	if ai.time > 0 && !hitpause {
 		ai.time--
 	}
 	if ai.restgap <= 0 {
@@ -791,7 +793,7 @@ func (ai *AfterImage) recAfterImg(sd *SprData) {
 	}
 	ai.restgap--
 }
-func (ai *AfterImage) recAndCue(sd *SprData, rec bool) {
+func (ai *AfterImage) recAndCue(sd *SprData, rec bool, hitpause bool) {
 	if ai.time == 0 || ai.timegap < 1 || ai.timegap > 32767 ||
 		ai.framegap < 1 || ai.framegap > 32767 {
 		ai.time = 0
@@ -807,8 +809,8 @@ func (ai *AfterImage) recAndCue(sd *SprData, rec bool) {
 			img.scl, ai.alpha, sd.priority - 2, img.angle, img.yangle, img.xangle, img.ascl,
 			false, sd.bright, sd.oldVer, sd.facing, sd.posLocalscl}, 0, 0, 0, 0)
 	}
-	if rec {
-		ai.recAfterImg(sd)
+	if rec || hitpause && ai.ignorehitpause {
+		ai.recAfterImg(sd, hitpause)
 	}
 }
 
@@ -1345,7 +1347,7 @@ func (p *Projectile) cueDraw(oldVer bool, playerNo int) {
 			[...]float32{p.facing * p.scale[0] * p.localscl, p.scale[1] * p.localscl}, [2]int32{-1},
 			p.sprpriority, p.facing * p.angle, 0, 0, [...]float32{1, 1}, false, playerNo == sys.superplayer,
 			sys.cgi[playerNo].ver[0] != 1, p.facing, 1}
-		p.aimg.recAndCue(sd, sys.tickNextFrame() && notpause)
+		p.aimg.recAndCue(sd, sys.tickNextFrame() && notpause, false)
 		sys.sprites.add(sd,
 			p.shadow[0]<<16|p.shadow[1]&255<<8|p.shadow[2]&255, 256, 0, 0)
 	}
@@ -4768,7 +4770,7 @@ func (c *Char) cueDraw() {
 		}
 		if c.sf(CSF_invisible) || c.scf(SCF_standby) {
 			if rec {
-				c.aimg.recAfterImg(sdf())
+				c.aimg.recAfterImg(sdf(), c.hitPause())
 			}
 		} else {
 			//if c.gi().ver[0] != 1 && c.sf(CSF_angledraw) && !c.sf(CSF_trans) {
@@ -4776,7 +4778,7 @@ func (c *Char) cueDraw() {
 			//	c.alpha = [...]int32{255, 0}
 			//}
 			sd := sdf()
-			c.aimg.recAndCue(sd, rec)
+			c.aimg.recAndCue(sd, rec, sys.tickNextFrame() && c.hitPause())
 			if c.ghv.hitshaketime > 0 && c.ss.time&1 != 0 {
 				sd.pos[0] -= c.facing
 			}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -3920,7 +3920,7 @@ func (c *Compiler) bgPalFX(is IniSection, sc *StateControllerBase,
 	return *ret, err
 }
 func (c *Compiler) afterImageSub(is IniSection,
-	sc *StateControllerBase, prefix string) error {
+	sc *StateControllerBase, ihp int8, prefix string) error {
 	if err := c.paramValue(is, sc, "redirectid",
 		afterImage_redirectid, VT_Int, 1, false); err != nil {
 		return err
@@ -3973,12 +3973,15 @@ func (c *Compiler) afterImageSub(is IniSection,
 		afterImage_palmul, VT_Float, 3, false); err != nil {
 		return err
 	}
+	if ihp == 0 {
+		sc.add(afterImage_ignorehitpause, sc.iToExp(0))
+	}
 	return nil
 }
 func (c *Compiler) afterImage(is IniSection, sc *StateControllerBase,
-	_ int8) (StateController, error) {
+	ihp int8) (StateController, error) {
 	ret, err := (*afterImage)(sc), c.stateSec(is, func() error {
-		return c.afterImageSub(is, sc, "")
+		return c.afterImageSub(is, sc, ihp, "")
 	})
 	return *ret, err
 }
@@ -4552,7 +4555,7 @@ func (c *Compiler) reversalDef(is IniSection, sc *StateControllerBase,
 	return *ret, err
 }
 func (c *Compiler) projectile(is IniSection, sc *StateControllerBase,
-	_ int8) (StateController, error) {
+	ihp int8) (StateController, error) {
 	ret, err := (*projectile)(sc), c.stateSec(is, func() error {
 		if err := c.paramValue(is, sc, "redirectid",
 			projectile_redirectid, VT_Int, 1, false); err != nil {
@@ -4671,7 +4674,7 @@ func (c *Compiler) projectile(is IniSection, sc *StateControllerBase,
 			projectile_remappal, VT_Int, 2, false); err != nil {
 			return err
 		}
-		if err := c.afterImageSub(is, sc, "afterimage."); err != nil {
+		if err := c.afterImageSub(is, sc, ihp, "afterimage."); err != nil {
 			return err
 		}
 		if err := c.paramValue(is, sc, "platform",