コミット: 05da12163c8dd8500acbb65f9ef94c3e0af3f5bf - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 05da12163c8dd8500acbb65f9ef94c3e0af3f5bf (tree)
• 日時: 2019-05-27 21:16:52
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

roundstateが3になるタイミングを修正
winkoがtrueになるタイミングを修正
KO時のスローになるタイミングを修正
試合終了時のKO等の表示タイミングを修正
コンボカウンターで存在しないフォントを指定すると落ちるのを修正

変更サマリ

• modified: src/char.go
• modified: src/common.go
• modified: src/lifebar.go
• modified: src/script.go
• modified: src/system.go

差分

--- a/src/char.go
+++ b/src/char.go
@@ -2552,7 +2552,7 @@ func (c *Char) roundState() int32 {
 		return 0
 	case sys.lifebar.ro.cur == 0:
 		return 1
-	case !sys.roundEnd():
+	case sys.intro >= 0:
 		return 2
 	case sys.intro < -(sys.lifebar.ro.over_hittime+
 		sys.lifebar.ro.over_waittime) && (sys.chars[c.playerNo][0].scf(SCF_over) ||

--- a/src/common.go
+++ b/src/common.go
@@ -730,7 +730,8 @@ func (ats *AnimTextSnd) NoDisplay() bool {
 }
 func (ats *AnimTextSnd) End(dt int32) bool {
 	if ats.displaytime < 0 {
-		return len(ats.anim.anim.frames) == 0 || ats.anim.anim.loopend
+		return len(ats.anim.anim.frames) == 0 || ats.anim.anim.loopend ||
+			(ats.anim.anim.frames[ats.anim.anim.current].Time == -1 && ats.anim.anim.current == int32(len(ats.anim.anim.frames)-1))
 	}
 	return dt >= ats.displaytime
 }

--- a/src/lifebar.go
+++ b/src/lifebar.go
@@ -651,14 +651,13 @@ func (c *LifeBarCombo) reset() {
 func (c *LifeBarCombo) draw(layerno int16, f []*Fnt) {
 	for i := range c.cur {
 		haba := func(n int32) float32 {
-			if c.counter_font[i][0] < 0 || int(c.counter_font[i][0]) >= len(f) {
+			if f[c.counter_font[i][0]] == nil || c.counter_font[i][0] < 0 || int(c.counter_font[i][0]) >= len(f) {
 				return 0
 			}
 			return float32(f[c.counter_font[i][0]].TextWidth(fmt.Sprintf("%v", n))) *
 				c.text_lay[i].scale[0]
 		}
-
-		if c.resttime[i] <= 0 && c.counterX[i] == c.start_x[i]*2 {
+		if c.counter_font[i][0] < 0 || c.resttime[i] <= 0 && c.counterX[i] == c.start_x[i]*2 {
 			continue
 		}
 		var x float32
@@ -695,7 +694,7 @@ func (c *LifeBarCombo) draw(layerno int16, f []*Fnt) {
 			c.text_lay[i].DrawText(x+sys.lifebarOffsetX, float32(c.pos[i][1]), sys.lifebarScale, layerno,
 				text, f[c.text_font[i][0]], c.text_font[i][1], 1)
 		}
-		if c.counter_font[i][0] >= 0 && int(c.counter_font[i][0]) < len(f) {
+		if c.counter_font[i][0] >= 0 && f[c.counter_font[i][0]] != nil && int(c.counter_font[i][0]) < len(f) {
 			z := 1 + float32(c.shaketime[i])*(1.0/20)*
 				float32(math.Sin(float64(c.shaketime[i])*(math.Pi/2.5)))
 			c.counter_lay[i].DrawText((x+sys.lifebarOffsetX)/z, float32(c.pos[i][1])/z, z*sys.lifebarScale, layerno,
@@ -851,7 +850,7 @@ func (r *LifeBarRound) act() bool {
 			}
 			r.wt[0]--
 		}
-	} else if r.cur == 2 && (sys.finish != FT_NotYet || sys.time == 0) {
+	} else if r.cur == 2 && (sys.intro < 0) && (sys.finish != FT_NotYet || sys.time == 0) {
 		if r.timerActive {
 			if sys.gameTime-sys.timerCount[sys.round-1] > 0 {
 				sys.timerCount[sys.round-1] = sys.gameTime - sys.timerCount[sys.round-1]
@@ -861,14 +860,17 @@ func (r *LifeBarRound) act() bool {
 			r.timerActive = false
 		}
 		f := func(ats *AnimTextSnd, t int) {
-			if r.swt[t] == 0 {
+			if -r.swt[t]-10 == 0 {
 				r.snd.play(ats.snd)
+				r.swt[t]--
+			}
+			if sys.tickNextFrame() {
+				r.swt[t]--
 			}
-			r.swt[t]--
 			if ats.End(r.dt[t]) {
 				r.wt[t] = 2
 			}
-			if r.wt[t] <= 0 {
+			if sys.intro < -r.ko_time-10 {
 				r.dt[t]++
 				ats.Action()
 			}
@@ -932,7 +934,7 @@ func (r *LifeBarRound) draw(layerno int16) {
 			r.fight.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
 		}
 	case 2:
-		if r.wt[0] < 0 {
+		if r.wt[0] < 0 && sys.intro < -r.ko_time-10 {
 			switch sys.finish {
 			case FT_KO:
 				r.ko.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)

--- a/src/script.go
+++ b/src/script.go
@@ -2099,7 +2099,7 @@ func triggerScriptInit(l *lua.LState) {
 		return 1
 	})
 	luaRegister(l, "teamside", func(*lua.LState) int {
-		l.Push(lua.LNumber(int32(sys.debugWC.playerNo)&1 + 1))
+		l.Push(lua.LNumber(int32(sys.debugWC.teamside) + 1))
 		return 1
 	})
 	luaRegister(l, "tickspersecond", func(*lua.LState) int {

--- a/src/system.go
+++ b/src/system.go
@@ -250,8 +250,8 @@ type System struct {
 	luaBigPortraitScale   float32
 	luaSpriteOffsetX      float64
 
-	lifebarScale   float32
-	lifebarOffsetX float32
+	lifebarScale          float32
+	lifebarOffsetX        float32
 	LocalcoordScalingType int32
 
 	PostProcessingShader int32
@@ -988,12 +988,12 @@ func (s *System) action(x, y *float32, scl float32) (leftest, rightest,
 				}
 			}
 			if s.time == 0 {
-				s.intro = -s.lifebar.ro.over_hittime
+				//s.intro = -s.lifebar.ro.over_hittime
 				if !(ko[0] || ko[1]) {
 					s.winType[0], s.winType[1] = WT_T, WT_T
 				}
 			}
-			if s.intro == -s.lifebar.ro.over_hittime && (ko[0] || ko[1]) {
+			if s.intro == -1 && (ko[0] || ko[1]) {
 				if ko[0] && ko[1] {
 					s.finish, s.winTeam = FT_DKO, -1
 				} else {
@@ -1140,7 +1140,7 @@ func (s *System) action(x, y *float32, scl float32) (leftest, rightest,
 		_else := s.sf(GSF_nokoslow) || s.time == 0
 		if !_else {
 			slowt := -(s.lifebar.ro.over_hittime + (s.lifebar.ro.slow_time+3)>>2)
-			if s.intro >= slowt && s.intro < -s.lifebar.ro.over_hittime {
+			if s.intro >= slowt && s.intro < 0 {
 				s.turbo = spd * 0.25
 			} else {
 				slowfade := s.lifebar.ro.slow_time * 2 / 5
@@ -2137,6 +2137,7 @@ func (l *Loader) loadStage() bool {
 		if sys.sel.selectedStageNo == 0 {
 			randomstageno := Rand(0, int32(len(sys.sel.stagelist))-1)
 			def = sys.sel.stagelist[randomstageno].def
+			l.loadAttachedChar(0, sys.sel.stagelist[randomstageno].attachedchardef)
 		} else {
 			def = sys.sel.stagelist[sys.sel.selectedStageNo-1].def
 			l.loadAttachedChar(0, sys.sel.stagelist[sys.sel.selectedStageNo-1].attachedchardef)