Commit: 51300d189cd17b3cac1152af43c9d14668c9d563 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Révision: 51300d189cd17b3cac1152af43c9d14668c9d563 (tree)
• l'heure: 2018-12-25 21:31:44
• Auteur: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Message de Log

palfxでライフバーのポトレが消えていたのを修正
P3以降のキャラでP2以前のキャラが死んでるとP2系トリガーが機能しない場合があったのを修正
チーム戦でゲージを持ち越すようにした

Change Summary

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

Modification

--- a/src/char.go
+++ b/src/char.go
@@ -5448,12 +5448,14 @@ func (cl *CharList) enemyNear(c *Char, n int32, p2 bool) *Char {
 	var add func(*Char, int)
 	add = func(e *Char, idx int) {
 		for i := idx; i <= int(n); i++ {
+			if p2 && e.scf(SCF_ko_round_middle) || !p2 && e.helperIndex > 0 {
+				return
+			}
 			if i >= len(*cache) {
 				*cache = append(*cache, e)
 				return
 			}
-			if (p2 && !e.scf(SCF_ko_round_middle) || !p2 && e.helperIndex == 0) &&
-				AbsF(c.distX(e, c)) < AbsF(c.distX((*cache)[i], c)) {
+			if AbsF(c.distX(e, c)) < AbsF(c.distX((*cache)[i], c)) {
 				add((*cache)[i], i+1)
 				(*cache)[i] = e
 			}

--- a/src/common.go
+++ b/src/common.go
@@ -571,11 +571,9 @@ func (l *Layout) DrawSprite(x, y float32, ln int16, s *Sprite, fx *PalFX, fscale
 			y += sys.lifebarFontScale
 		}
 		pal := s.Pal
-		if pal != nil {
-			pal = fx.getFxPal(pal, false)
-		}
+
 		s.Draw(x+l.offset[0], y+l.offset[1],
-			l.scale[0]*float32(l.facing)*fscale, l.scale[1]*float32(l.vfacing)*fscale, pal)
+			l.scale[0]*float32(l.facing)*fscale, l.scale[1]*float32(l.vfacing)*fscale, pal, fx)
 	}
 }
 func (l *Layout) DrawAnim(r *[4]int32, x, y, scl float32, ln int16,

--- a/src/image.go
+++ b/src/image.go
@@ -1004,7 +1004,7 @@ func (s *Sprite) glDraw(pal []uint32, mask int32, x, y float32, tile *[4]int32,
 		}
 	}
 }
-func (s *Sprite) Draw(x, y, xscale, yscale float32, pal []uint32) {
+func (s *Sprite) Draw(x, y, xscale, yscale float32, pal []uint32, fx *PalFX) {
 	x += float32(sys.gameWidth-320)/2 - xscale*float32(s.Offset[0])
 	y += float32(sys.gameHeight-240) - yscale*float32(s.Offset[1])
 	if xscale < 0 {
@@ -1015,7 +1015,7 @@ func (s *Sprite) Draw(x, y, xscale, yscale float32, pal []uint32) {
 	}
 	s.glDraw(pal, 0, -x*sys.widthScale, -y*sys.heightScale, &notiling,
 		xscale*sys.widthScale, xscale*sys.widthScale, yscale*sys.heightScale, 0, 0, 0, 0,
-		sys.brightness*255>>8|1<<9, &sys.scrrect, 0, 0, nil)
+		sys.brightness*255>>8|1<<9, &sys.scrrect, 0, 0, fx)
 }
 
 type Sff struct {

--- a/src/script.go
+++ b/src/script.go
@@ -621,7 +621,7 @@ func systemScriptInit(l *lua.LState) {
 					xscl *= c.portrait_scale
 					yscl *= c.portrait_scale
 				}
-				c.lportrait.Draw(x, y, xscl, yscl, c.lportrait.Pal)
+				c.lportrait.Draw(x, y, xscl, yscl, c.lportrait.Pal, nil)
 			}
 		}
 		return 0
@@ -641,11 +641,11 @@ func systemScriptInit(l *lua.LState) {
 						if c.sportrait != nil {
 							c.sportrait.Draw(x+float32(i)*sys.sel.cellsize[0],
 								y+float32(j)*sys.sel.cellsize[1], sys.sel.cellscale[0]*c.portrait_scale,
-								sys.sel.cellscale[1]*c.portrait_scale, c.sportrait.Pal)
+								sys.sel.cellscale[1]*c.portrait_scale, c.sportrait.Pal, nil)
 						} else if c.def == "randomselect" && sys.sel.randomspr != nil {
 							sys.sel.randomspr.Draw(x+float32(i)*sys.sel.cellsize[0],
 								y+float32(j)*sys.sel.cellsize[1], sys.sel.randomscl[0],
-								sys.sel.randomscl[1], sys.sel.randomspr.Pal)
+								sys.sel.randomscl[1], sys.sel.randomspr.Pal, nil)
 						}
 					}
 				}
@@ -986,7 +986,7 @@ func systemScriptInit(l *lua.LState) {
 					xscl *= c.portrait_scale
 					yscl *= c.portrait_scale
 				}
-				c.sportrait.Draw(x, y, xscl, yscl, c.sportrait.Pal)
+				c.sportrait.Draw(x, y, xscl, yscl, c.sportrait.Pal, nil)
 			}
 		}
 		return 0
@@ -1007,7 +1007,7 @@ func systemScriptInit(l *lua.LState) {
 					xscl *= c.portrait_scale
 					yscl *= c.portrait_scale
 				}
-				c.vsportrait.Draw(x, y, xscl, yscl, c.vsportrait.Pal)
+				c.vsportrait.Draw(x, y, xscl, yscl, c.vsportrait.Pal, nil)
 			}
 		}
 		return 0
@@ -1028,7 +1028,7 @@ func systemScriptInit(l *lua.LState) {
 					xscl *= c.portrait_scale
 					yscl *= c.portrait_scale
 				}
-				c.vportrait.Draw(x, y, xscl, yscl, c.vportrait.Pal)
+				c.vportrait.Draw(x, y, xscl, yscl, c.vportrait.Pal, nil)
 			}
 		}
 		return 0

--- a/src/system.go
+++ b/src/system.go
@@ -1981,6 +1981,9 @@ func (l *Loader) loadChar(pn int) int {
 	} else {
 		p = newChar(pn, 0)
 		sys.cgi[pn].sff = nil
+		if len(sys.chars[pn]) > 0 {
+			p.power = sys.chars[pn][0].power
+		}
 	}
 	p.memberNo = memberNo
 	p.selectNo = sys.sel.selected[pn&1][memberNo][0]