提交: c280b2034f8c088f8b3e0691631a03d4132767a5 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: c280b2034f8c088f8b3e0691631a03d4132767a5 (tree)
• 时间: 2018-12-14 20:33:57
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

SFFのバージョンが2.0だとパレットのアルファ透明度を反映させないようにした
ポートレイトのサイズをlocalcoordに合わせるようにした
ついでにポートレイトのサイズを指定できるようにした

更改概述

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

差异

--- a/src/char.go
+++ b/src/char.go
@@ -1367,6 +1367,7 @@ type CharGlobalInfo struct {
 	pctime, pcid     int32
 	unhittable       int32
 	quotes           [MaxQuotes]string
+	portraitscale    float32
 }
 
 func (cgi *CharGlobalInfo) clearPCTime() {
@@ -1657,6 +1658,8 @@ func (c *Char) load(def string) error {
 				gi.nameLow = strings.ToLower(c.name)
 				is.ReadI32("localcoord", &c.localcoord)
 				c.localscl = 320 / float32(c.localcoord)
+				gi.portraitscale = c.localscl
+				is.ReadF32("portraitscale", &gi.portraitscale)
 			}
 		case "files":
 			if files {

--- a/src/common.go
+++ b/src/common.go
@@ -562,7 +562,7 @@ func (l *Layout) Read(pre string, is IniSection) {
 	l.layerno = I32ToI16(Min(2, ln))
 	is.ReadF32(pre+"scale", &l.scale[0], &l.scale[1])
 }
-func (l *Layout) DrawSprite(x, y float32, ln int16, s *Sprite, fx *PalFX) {
+func (l *Layout) DrawSprite(x, y float32, ln int16, s *Sprite, fx *PalFX, fscale float32) {
 	if l.layerno == ln && s != nil {
 		if l.facing < 0 {
 			x += sys.lifebarFontScale
@@ -575,7 +575,7 @@ func (l *Layout) DrawSprite(x, y float32, ln int16, s *Sprite, fx *PalFX) {
 			pal = fx.getFxPal(pal, false)
 		}
 		s.Draw(x+l.offset[0], y+l.offset[1],
-			l.scale[0]*float32(l.facing), l.scale[1]*float32(l.vfacing), pal)
+			l.scale[0]*float32(l.facing)*fscale, l.scale[1]*float32(l.vfacing)*fscale, pal)
 	}
 }
 func (l *Layout) DrawAnim(r *[4]int32, x, y, scl float32, ln int16,

--- a/src/image.go
+++ b/src/image.go
@@ -1077,6 +1077,9 @@ func loadSff(filename string, char bool) (*Sff, error) {
 					if err := read(rgba[:]); err != nil {
 						return nil, err
 					}
+					if s.header.Ver2 == 0 {
+						rgba[3] = 255
+					}
 					pal[i] = uint32(rgba[3])<<24 | uint32(rgba[2])<<16 | uint32(rgba[1])<<8 | uint32(rgba[0])
 				}
 				idx = i

--- a/src/lifebar.go
+++ b/src/lifebar.go
@@ -268,10 +268,12 @@ type LifeBarFace struct {
 	teammate_face     []*Sprite
 	teammate_face_lay Layout
 	numko             int32
+	scale             float32
+	teammate_scale    []float32
 }
 
 func newLifeBarFace() *LifeBarFace {
-	return &LifeBarFace{face_spr: [2]int32{-1}, teammate_face_spr: [2]int32{-1}}
+	return &LifeBarFace{face_spr: [2]int32{-1}, teammate_face_spr: [2]int32{-1}, scale: 1}
 }
 func readLifeBarFace(pre string, is IniSection,
 	sff *Sff, at AnimationTable) *LifeBarFace {
@@ -309,7 +311,7 @@ func (f *LifeBarFace) draw(layerno int16, fx *PalFX, superplayer bool) {
 		sys.brightness = 256
 	}
 	f.face_lay.DrawSprite(float32(f.pos[0]), float32(f.pos[1]), layerno,
-		f.face, fx)
+		f.face, fx, f.scale)
 	sys.brightness = ob
 	i := int32(len(f.teammate_face)) - 1
 	x := float32(f.teammate_pos[0] + f.teammate_spacing[0]*(i-1))
@@ -317,7 +319,7 @@ func (f *LifeBarFace) draw(layerno int16, fx *PalFX, superplayer bool) {
 	for ; i >= 0; i-- {
 		if i != f.numko {
 			f.teammate_bg.Draw(x, y, layerno)
-			f.teammate_face_lay.DrawSprite(x, y, layerno, f.teammate_face[i], nil)
+			f.teammate_face_lay.DrawSprite(x, y, layerno, f.teammate_face[i], nil, f.teammate_scale[i])
 			if i < f.numko {
 				f.teammate_ko.Draw(x, y, layerno)
 			}
@@ -653,6 +655,7 @@ type LifeBarRound struct {
 	cur                int32
 	wt, swt, dt        [2]int32
 	fnt                []*Fnt
+	timerActive        bool
 }
 
 func newLifeBarRound(snd *Snd, fnt []*Fnt) *LifeBarRound {
@@ -666,7 +669,12 @@ func readLifeBarRound(is IniSection,
 	r := newLifeBarRound(snd, fnt)
 	var tmp int32
 	is.ReadI32("pos", &r.pos[0], &r.pos[1])
-	is.ReadI32("match.wins", &r.match_wins)
+	tmp = Atoi(sys.cmdFlags["-rounds"])
+	if tmp > 0 {
+		r.match_wins = tmp
+	} else {
+		is.ReadI32("match.wins", &r.match_wins)
+	}
 	is.ReadI32("match.maxdrawgames", &r.match_maxdrawgames)
 	if is.ReadI32("start.waittime", &tmp) {
 		r.start_waittime = Max(1, tmp)
@@ -712,6 +720,8 @@ func readLifeBarRound(is IniSection,
 func (r *LifeBarRound) callFight() {
 	r.fight.Reset()
 	r.cur, r.wt[0], r.swt[0], r.dt[0] = 1, r.fight_time, r.fight_sndtime, 0
+	sys.timerCount = append(sys.timerCount, sys.gameTime)
+	r.timerActive = true
 }
 func (r *LifeBarRound) act() bool {
 	if sys.intro > r.ctrl_time {
@@ -764,6 +774,14 @@ func (r *LifeBarRound) act() bool {
 			r.wt[0]--
 		}
 	} else if r.cur == 2 && (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]
+			} else {
+				sys.timerCount[sys.round-1] = 0
+			}
+			r.timerActive = false
+		}
 		f := func(ats *AnimTextSnd, t int) {
 			if r.swt[t] == 0 {
 				r.snd.play(ats.snd)
@@ -965,6 +983,8 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 					}
 				}
 			}
+		case "fonts":
+			is.ReadF32("scale", &sys.lifebarFontScale)
 		case "lifebar":
 			if l.hb[0][0] == nil {
 				l.hb[0][0] = readHealthBar("p1.", is, sff, at)

--- a/src/script.go
+++ b/src/script.go
@@ -5,6 +5,8 @@ import (
 	"runtime"
 	"strings"
 
+	"math/rand"
+
 	"github.com/go-gl/glfw/v3.2/glfw"
 	"github.com/yuin/gopher-lua"
 )
@@ -239,6 +241,10 @@ func scriptCommonInit(l *lua.LState) {
 		sys.match = int32(numArg(l, 1))
 		return 0
 	})
+	luaRegister(l, "setLifeShare", func(l *lua.LState) int {
+		sys.teamLifeShare = boolArg(l, 1)
+		return 0
+	})
 }
 
 // System Script
@@ -343,7 +349,16 @@ func systemScriptInit(l *lua.LState) {
 		if !ok {
 			userDataError(l, 1, a)
 		}
-		a.SetTile(int32(numArg(l, 2)), int32(numArg(l, 3)))
+		var sx, sy int32 = 0, 0
+		if l.GetTop() >= 4 {
+			sx = int32(numArg(l, 4))
+			if l.GetTop() >= 5 {
+				sy = int32(numArg(l, 5))
+			} else {
+				sy = sx
+			}
+		}
+		a.SetTile(int32(numArg(l, 2)), int32(numArg(l, 3)), sx, sy)
 		return 0
 	})
 	luaRegister(l, "animSetColorKey", func(*lua.LState) int {
@@ -395,6 +410,14 @@ func systemScriptInit(l *lua.LState) {
 		a.Draw()
 		return 0
 	})
+	luaRegister(l, "animReset", func(*lua.LState) int {
+		a, ok := toUserData(l, 1).(*Anim)
+		if !ok {
+			userDataError(l, 1, a)
+		}
+		a.ResetFrames()
+		return 0
+	})
 	luaRegister(l, "enterNetPlay", func(*lua.LState) int {
 		if sys.netInput != nil {
 			l.RaiseError("すでに通信中です。")
@@ -594,6 +617,10 @@ func systemScriptInit(l *lua.LState) {
 		if !sys.frameSkip {
 			c := sys.sel.GetChar(n)
 			if c != nil && c.lportrait != nil {
+				if c.portrait_scale != 1 {
+					xscl *= c.portrait_scale
+					yscl *= c.portrait_scale
+				}
 				c.lportrait.Draw(x, y, xscl, yscl, c.lportrait.Pal)
 			}
 		}
@@ -613,8 +640,8 @@ func systemScriptInit(l *lua.LState) {
 					if c != nil {
 						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],
-								sys.sel.cellscale[1], c.sportrait.Pal)
+								y+float32(j)*sys.sel.cellsize[1], sys.sel.cellscale[0]*c.portrait_scale,
+								sys.sel.cellscale[1]*c.portrait_scale, c.sportrait.Pal)
 						} 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],
@@ -697,6 +724,8 @@ func systemScriptInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "game", func(l *lua.LState) int {
+		tbl := l.NewTable()
+		tbl_chars := l.NewTable()
 		load := func() error {
 			sys.loader.runTread()
 			for sys.loader.state != LS_Complete {
@@ -712,7 +741,10 @@ func systemScriptInit(l *lua.LState) {
 					fa := sys.lifebar.fa[sys.tmode[i&1]][i]
 					fa.face = sys.cgi[i].sff.getOwnPalSprite(
 						int16(fa.face_spr[0]), int16(fa.face_spr[1]))
+
+					fa.scale = sys.cgi[i].portraitscale
 				}
+
 			}
 			runtime.GC()
 			return nil
@@ -791,6 +823,29 @@ func systemScriptInit(l *lua.LState) {
 					if w1 != w2 {
 						winp = Btoi(w1) + Btoi(w2)*2
 					}
+					tbl_roundNo := l.NewTable()
+					for _, p := range sys.chars {
+						if len(p) > 0 {
+							tmp := l.NewTable()
+							tmp.RawSetString("name", lua.LString(p[0].name))
+							tmp.RawSetString("memberNo", lua.LNumber(p[0].memberNo))
+							tmp.RawSetString("selectNo", lua.LNumber(p[0].selectNo))
+							tmp.RawSetString("life", lua.LNumber(p[0].life))
+							tmp.RawSetString("lifeMax", lua.LNumber(p[0].lifeMax))
+							tmp.RawSetString("winquote", lua.LNumber(p[0].winquote))
+							tmp.RawSetString("aiLevel", lua.LNumber(p[0].aiLevel()))
+							tmp.RawSetString("palno", lua.LNumber(p[0].palno()))
+							tmp.RawSetString("win", lua.LBool(p[0].win()))
+							tmp.RawSetString("winKO", lua.LBool(p[0].winKO()))
+							tmp.RawSetString("winTime", lua.LBool(p[0].winTime()))
+							tmp.RawSetString("winPerfect", lua.LBool(p[0].winPerfect()))
+							tmp.RawSetString("drawgame", lua.LBool(p[0].drawgame()))
+							tmp.RawSetString("ko", lua.LBool(p[0].scf(SCF_ko)))
+							tmp.RawSetString("ko_round_middle", lua.LBool(p[0].scf(SCF_ko_round_middle)))
+							tbl_roundNo.RawSetInt(p[0].playerNo+1, tmp)
+						}
+					}
+					tbl_chars.RawSetInt(int(sys.round-1), tbl_roundNo)
 				}
 				return winp, nil
 			}
@@ -817,10 +872,259 @@ func systemScriptInit(l *lua.LState) {
 				sys.loader.reset()
 			}
 			if winp != -2 {
+				time := int32(0)
+				tbl_time := l.NewTable()
+				for k, v := range sys.timerCount {
+					tbl_time.RawSetInt(k+1, lua.LNumber(v))
+					time = time + v
+				}
+				tbl.RawSetString("chars", tbl_chars)
+				tbl.RawSetString("time_rounds", tbl_time)
+				tbl.RawSetString("time", lua.LNumber(time))
+				tbl.RawSetString("roundTime", lua.LNumber(sys.roundTime))
+				tbl.RawSetString("winTeam", lua.LNumber(sys.winTeam))
+				tbl.RawSetString("lastRound", lua.LNumber(sys.round-1))
+				tbl.RawSetString("draws", lua.LNumber(sys.draws))
+				tbl.RawSetString("P1wins", lua.LNumber(sys.wins[0]))
+				tbl.RawSetString("P2wins", lua.LNumber(sys.wins[1]))
+				tbl.RawSetString("P1tmode", lua.LNumber(sys.tmode[0]))
+				tbl.RawSetString("P2tmode", lua.LNumber(sys.tmode[1]))
+				sys.timerCount = []int32{}
 				l.Push(lua.LNumber(winp))
-				return 1
+				l.Push(tbl)
+				return 2
+			}
+		}
+	})
+	luaRegister(l, "getCharVar", func(*lua.LState) int {
+		for _, p := range sys.chars {
+			if len(p) > 0 && p[0].playerNo+1 == int(numArg(l, 1)) {
+				if strArg(l, 2) == "varGet" {
+					l.Push(lua.LNumber(p[0].varGet(int32(numArg(l, 3))).ToI()))
+				} else if strArg(l, 2) == "fvarGet" {
+					l.Push(lua.LNumber(p[0].fvarGet(int32(numArg(l, 3))).ToI()))
+				} else if strArg(l, 2) == "sysVarGet" {
+					l.Push(lua.LNumber(p[0].sysVarGet(int32(numArg(l, 3))).ToI()))
+				} else if strArg(l, 2) == "sysFvarGet" {
+					l.Push(lua.LNumber(p[0].sysFvarGet(int32(numArg(l, 3))).ToI()))
+				}
+				break
+			}
+		}
+		return 1
+	})
+	luaRegister(l, "getCharVictoryQuote", func(*lua.LState) int {
+		v := int(-1)
+		for _, p := range sys.chars {
+			if len(p) > 0 && p[0].playerNo+1 == int(numArg(l, 1)) {
+				if l.GetTop() >= 2 {
+					v = int(numArg(l, 2))
+				} else {
+					v = int(p[0].winquote)
+				}
+				if v < 0 || v >= MaxQuotes {
+					t := []string{}
+					for i, q := range sys.cgi[p[0].playerNo].quotes {
+						if sys.cgi[p[0].playerNo].quotes[i] != "" {
+							t = append(t, q)
+						}
+					}
+					if len(t) > 0 {
+						v = rand.Int() % len(t)
+					} else {
+						v = -1
+					}
+				}
+				if len(sys.cgi[p[0].playerNo].quotes) == MaxQuotes && v != -1 {
+					l.Push(lua.LString(sys.cgi[p[0].playerNo].quotes[v]))
+				} else {
+					l.Push(lua.LString(""))
+				}
+				break
+			}
+		}
+		return 1
+	})
+	luaRegister(l, "getCommandLineFlags", func(*lua.LState) int {
+		tbl := l.NewTable()
+		for k, v := range sys.cmdFlags {
+			tbl.RawSetString(k, lua.LString(v))
+		}
+		l.Push(tbl)
+		return 1
+	})
+	luaRegister(l, "getCommandLineValue", func(*lua.LState) int {
+		l.Push(lua.LString(sys.cmdFlags[strArg(l, 1)]))
+		return 1
+	})
+	luaRegister(l, "setPortrait", func(*lua.LState) int {
+		p := int(numArg(l, 3))
+		if p == 1 {
+			sys.sel.lportrait = [...]int16{int16(numArg(l, 1)), int16(numArg(l, 2))}
+		} else if p == 2 {
+			sys.sel.sportrait = [...]int16{int16(numArg(l, 1)), int16(numArg(l, 2))}
+		} else if p == 3 {
+			sys.sel.vsportrait = [...]int16{int16(numArg(l, 1)), int16(numArg(l, 2))}
+		} else if p == 4 {
+			sys.sel.vportrait = [...]int16{int16(numArg(l, 1)), int16(numArg(l, 2))}
+		}
+		return 0
+	})
+	luaRegister(l, "drawSmallPortrait", func(l *lua.LState) int {
+		n, x, y := int(numArg(l, 1)), float32(numArg(l, 2)), float32(numArg(l, 3))
+		var xscl, yscl float32 = 1, 1
+		if l.GetTop() >= 4 {
+			xscl = float32(numArg(l, 4))
+			if l.GetTop() >= 5 {
+				yscl = float32(numArg(l, 5))
+			}
+		}
+		if !sys.frameSkip {
+			c := sys.sel.GetChar(n)
+			if c != nil && c.sportrait != nil {
+				if c.portrait_scale != 1 {
+					xscl *= c.portrait_scale
+					yscl *= c.portrait_scale
+				}
+				c.sportrait.Draw(x, y, xscl, yscl, c.sportrait.Pal)
+			}
+		}
+		return 0
+	})
+	luaRegister(l, "drawVersusPortrait", func(l *lua.LState) int {
+		n, x, y := int(numArg(l, 1)), float32(numArg(l, 2)), float32(numArg(l, 3))
+		var xscl, yscl float32 = 1, 1
+		if l.GetTop() >= 4 {
+			xscl = float32(numArg(l, 4))
+			if l.GetTop() >= 5 {
+				yscl = float32(numArg(l, 5))
+			}
+		}
+		if !sys.frameSkip {
+			c := sys.sel.GetChar(n)
+			if c != nil && c.vsportrait != nil {
+				if c.portrait_scale != 1 {
+					xscl *= c.portrait_scale
+					yscl *= c.portrait_scale
+				}
+				c.vsportrait.Draw(x, y, xscl, yscl, c.vsportrait.Pal)
+			}
+		}
+		return 0
+	})
+	luaRegister(l, "drawVictoryPortrait", func(l *lua.LState) int {
+		n, x, y := int(numArg(l, 1)), float32(numArg(l, 2)), float32(numArg(l, 3))
+		var xscl, yscl float32 = 1, 1
+		if l.GetTop() >= 4 {
+			xscl = float32(numArg(l, 4))
+			if l.GetTop() >= 5 {
+				yscl = float32(numArg(l, 5))
+			}
+		}
+		if !sys.frameSkip {
+			c := sys.sel.GetChar(n)
+			if c != nil && c.vportrait != nil {
+				if c.portrait_scale != 1 {
+					xscl *= c.portrait_scale
+					yscl *= c.portrait_scale
+				}
+				c.vportrait.Draw(x, y, xscl, yscl, c.vportrait.Pal)
 			}
 		}
+		return 0
+	})
+	luaRegister(l, "getCharIntro", func(*lua.LState) int {
+		c := sys.sel.GetChar(int(numArg(l, 1)))
+		l.Push(lua.LString(c.intro_storyboard))
+		return 1
+	})
+	luaRegister(l, "getCharEnding", func(*lua.LState) int {
+		c := sys.sel.GetChar(int(numArg(l, 1)))
+		l.Push(lua.LString(c.ending_storyboard))
+		return 1
+	})
+	luaRegister(l, "getCharPalettes", func(*lua.LState) int {
+		c := sys.sel.GetChar(int(numArg(l, 1)))
+		tbl := l.NewTable()
+		var pal []int32
+		if sys.aiRandomColor {
+			pal = c.pal
+		} else {
+			pal = c.pal_defaults
+		}
+		if len(pal) > 0 {
+			for k, v := range pal {
+				tbl.RawSetInt(k+1, lua.LNumber(v))
+			}
+		} else {
+			tbl.RawSetInt(1, lua.LNumber(1))
+		}
+		l.Push(tbl)
+		return 1
+	})
+	luaRegister(l, "getCharRandomPalette", func(*lua.LState) int {
+		c := sys.sel.GetChar(int(numArg(l, 1)))
+		if len(c.pal) > 0 {
+			n := rand.Int() % len(c.pal)
+			l.Push(lua.LNumber(c.pal[n]))
+		} else {
+			l.Push(lua.LNumber(1))
+		}
+		return 1
+	})
+	luaRegister(l, "getStageInfo", func(*lua.LState) int {
+		a, b, c, d := sys.sel.GetStageInfo(int(numArg(l, 1)))
+		l.Push(lua.LString(a))
+		l.Push(lua.LString(b))
+		l.Push(lua.LString(c))
+		l.Push(lua.LString(d))
+		return 4
+	})
+	luaRegister(l, "getKey", func(*lua.LState) int {
+		s := ""
+		if sys.keyInput != glfw.KeyUnknown {
+			s = KeyToString(sys.keyInput)
+		}
+		l.Push(lua.LString(s))
+		return 1
+	})
+	luaRegister(l, "getKeyText", func(*lua.LState) int {
+		s := ""
+		if sys.keyInput != glfw.KeyUnknown {
+			if sys.keyInput == glfw.KeyInsert {
+				s, _ = sys.window.GetClipboardString()
+			} else {
+				s = sys.keyString
+			}
+		}
+		l.Push(lua.LString(s))
+		return 1
+	})
+	luaRegister(l, "resetKey", func(*lua.LState) int {
+		sys.keyInput = glfw.KeyUnknown
+		sys.keyString = ""
+		return 0
+	})
+	luaRegister(l, "getSpriteInfo", func(*lua.LState) int {
+		var s *Sprite
+		var err error
+		def := strArg(l, 1)
+		err = LoadFile(&def, "", func(file string) error {
+			s, err = loadFromSff(file, int16(numArg(l, 2)), int16(numArg(l, 3)))
+			return err
+		})
+		if err != nil {
+			l.Push(lua.LNumber(0))
+			l.Push(lua.LNumber(0))
+			l.Push(lua.LNumber(0))
+			l.Push(lua.LNumber(0))
+			return 4
+		}
+		l.Push(lua.LNumber(s.Size[0]))
+		l.Push(lua.LNumber(s.Size[1]))
+		l.Push(lua.LNumber(s.Offset[0]))
+		l.Push(lua.LNumber(s.Offset[1]))
+		return 4
 	})
 }
 
@@ -1806,5 +2110,9 @@ func debugScriptInit(l *lua.LState, file string) error {
 		}
 		return 0
 	})
+	luaRegister(l, "getAllowDebugKeys", func(*lua.LState) int {
+		l.Push(lua.LBool(sys.allowDebugKeys))
+		return 1
+	})
 	return l.DoFile(file)
 }

--- a/src/system.go
+++ b/src/system.go
@@ -1668,6 +1668,7 @@ type SelectChar struct {
 	def, name, sprite, intro_storyboard, ending_storyboard string
 	pal_defaults                                           []int32
 	pal                                                    []int32
+	portrait_scale                                         float32
 	sportrait, lportrait, vsportrait, vportrait            *Sprite
 }
 type SelectStage struct {
@@ -1781,6 +1782,13 @@ func (s *Select) addCahr(def string) {
 					sc.name, _, _ = is.getText("name")
 				}
 				sc.pal_defaults = is.readI32CsvForStage("pal.defaults")
+				ok = is.ReadF32("localcoord", &sc.portrait_scale)
+				if !ok {
+					sc.portrait_scale = 1
+				} else {
+					sc.portrait_scale = (320 / sc.portrait_scale)
+				}
+				is.ReadF32("portraitscale", &sc.portrait_scale)
 			}
 		case "files":
 			if files {
@@ -1989,13 +1997,14 @@ func (l *Loader) loadChar(pn int) int {
 	if pn < len(sys.lifebar.fa[sys.tmode[pn&1]]) &&
 		sys.tmode[pn&1] == TM_Turns && sys.round == 1 {
 		fa := sys.lifebar.fa[sys.tmode[pn&1]][pn]
-		fa.numko, fa.teammate_face = 0, make([]*Sprite, nsel)
+		fa.numko, fa.teammate_face, fa.teammate_scale = 0, make([]*Sprite, nsel), make([]float32, nsel)
 		for i, ci := range idx {
 			sprite := sys.sel.charlist[ci].sprite
 			LoadFile(&sprite, sys.sel.charlist[ci].def, func(file string) error {
 				var err error
 				fa.teammate_face[i], err = loadFromSff(file,
 					int16(fa.teammate_face_spr[0]), int16(fa.teammate_face_spr[1]))
+				fa.teammate_scale[i] = sys.sel.charlist[ci].portrait_scale
 				return err
 			})
 		}