提交: d9002f424c499e26beabf3757d7baf62ff2cacb9 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: d9002f424c499e26beabf3757d7baf62ff2cacb9 (tree)
• 时间: 2016-12-04 00:11:31
• 作者: SUEHIRO <supersuehiro@user...>
• Commiter: SUEHIRO

Log Message

キャラクターを選択する画面まで

更改概述

• modified: src/script.go
• modified: src/system.go

差异

--- a/src/script.go
+++ b/src/script.go
@@ -364,8 +364,8 @@ func systemScriptInit(l *lua.LState) {
 		return 0
 	})
 	luaRegister(l, "setSelColRow", func(*lua.LState) int {
-		sys.sel.columns = int32(numArg(l, 1))
-		sys.sel.rows = int32(numArg(l, 2))
+		sys.sel.columns = int(numArg(l, 1))
+		sys.sel.rows = int(numArg(l, 2))
 		return 0
 	})
 	luaRegister(l, "setSelCellSize", func(*lua.LState) int {
@@ -381,6 +381,59 @@ func systemScriptInit(l *lua.LState) {
 		l.Push(lua.LNumber(sys.sel.SetStageNo(int(numArg(l, 1)))))
 		return 1
 	})
+	luaRegister(l, "setTeamMode", func(*lua.LState) int {
+		pn := int(numArg(l, 1))
+		if pn < 1 || pn > 2 {
+			l.RaiseError("チーム番号(%v)が不正です。", pn)
+		}
+		tm := TeamMode(numArg(l, 2))
+		if tm < 0 || tm > TM_LAST {
+			l.RaiseError("モード番号(%v)が不正です。", tm)
+		}
+		nt := int(numArg(l, 3))
+		if nt < 1 || nt > MaxSimul {
+			l.RaiseError("チーム人数(%v)が不正です。", nt)
+		}
+		sys.sel.selected[pn-1] = nil
+		sys.tmode[pn-1] = tm
+		sys.numTurns[pn-1], sys.numSimul[pn-1] = nt, nt
+		if tm == TM_Simul && nt == 1 {
+			sys.tmode[pn-1] = TM_Single
+		}
+		return 0
+	})
+	luaRegister(l, "getCharName", func(*lua.LState) int {
+		c := sys.sel.GetChar(int(numArg(l, 1)))
+		l.Push(lua.LString(c.name))
+		return 1
+	})
+	luaRegister(l, "selectChar", func(*lua.LState) int {
+		pn := int(numArg(l, 1))
+		if pn < 1 || pn > 2 {
+			l.RaiseError("チーム番号(%v)が不正です。", pn)
+		}
+		cn, pl, ret := int(numArg(l, 2)), int(numArg(l, 3)), 0
+		if pl >= 1 && pl <= 12 && sys.sel.AddSelectedChar(pn-1, cn, pl) {
+			switch sys.tmode[pn-1] {
+			case TM_Single:
+				ret = 2
+			case TM_Simul:
+				if len(sys.sel.selected[pn-1]) >= sys.numSimul[pn-1] {
+					ret = 2
+				} else {
+					ret = 1
+				}
+			case TM_Turns:
+				if len(sys.sel.selected[pn-1]) >= sys.numTurns[pn-1] {
+					ret = 2
+				} else {
+					ret = 1
+				}
+			}
+		}
+		l.Push(lua.LNumber(ret))
+		return 1
+	})
 	luaRegister(l, "refresh", func(*lua.LState) int {
 		sys.await(60)
 		if sys.gameEnd {
@@ -388,6 +441,50 @@ func systemScriptInit(l *lua.LState) {
 		}
 		return 0
 	})
+	luaRegister(l, "drawPortrait", 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.lportrait != nil {
+				c.lportrait.Draw(x, y, xscl, yscl, c.lportrait.Pal)
+			}
+		}
+		return 0
+	})
+	luaRegister(l, "drawFace", func(l *lua.LState) int {
+		x, y := float32(numArg(l, 1)), float32(numArg(l, 2))
+		offset := 0
+		if l.GetTop() >= 3 {
+			offset = int(numArg(l, 3))
+		}
+		if !sys.frameSkip {
+			for j := 0; j < sys.sel.rows; j++ {
+				for i := 0; i < sys.sel.columns; i++ {
+					c := sys.sel.GetChar(offset)
+					offset++
+					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)
+						} 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)
+						}
+					}
+				}
+			}
+		}
+		return 0
+	})
 	luaRegister(l, "loadLifebar", func(l *lua.LState) int {
 		lb, err := LoadLifebar(strArg(l, 1))
 		if err != nil {

--- a/src/system.go
+++ b/src/system.go
@@ -7,6 +7,7 @@ import (
 	"github.com/yuin/gopher-lua"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -41,6 +42,7 @@ const (
 	TM_Single TeamMode = iota
 	TM_Simul
 	TM_Turns
+	TM_LAST = TM_Turns
 )
 
 type System struct {
@@ -88,6 +90,7 @@ type System struct {
 	numSimul                    [2]int
 	numTurns                    [2]int
 	esc                         bool
+	loadMutex                   sync.Mutex
 }
 
 func (s *System) init(w, h int32) *lua.LState {
@@ -178,7 +181,7 @@ type SelectStage struct {
 	def, name string
 }
 type Select struct {
-	columns, rows   int32
+	columns, rows   int
 	cellsize        [2]float32
 	cellscale       [2]float32
 	randomspr       *Sprite
@@ -195,6 +198,23 @@ func newSelect() *Select {
 		cellsize: [2]float32{29, 29}, cellscale: [2]float32{1, 1},
 		selectedStageNo: -1}
 }
+func (s *Select) GetCharNo(i int) int {
+	n := i
+	if len(s.charlist) > 0 {
+		n %= len(s.charlist)
+		if n < 0 {
+			n += len(s.charlist)
+		}
+	}
+	return n
+}
+func (s *Select) GetChar(i int) *SelectChar {
+	if len(s.charlist) == 0 {
+		return nil
+	}
+	n := s.GetCharNo(i)
+	return &s.charlist[n]
+}
 func (s *Select) SetStageNo(n int) int {
 	s.curStageNo = n % (len(s.stagelist) + 1)
 	if s.curStageNo < 0 {
@@ -232,8 +252,8 @@ func (s *Select) AddCahr(def string) {
 	if err != nil {
 		return
 	}
-	lines, i, info, files := SplitAndTrim(str, "\n"), 0, true, true
-	sprite := ""
+	sc.def = def
+	lines, i, info, files, sprite := SplitAndTrim(str, "\n"), 0, true, true, ""
 	for i < len(lines) {
 		is, name, _ := ReadIniSection(lines, &i)
 		switch name {
@@ -295,6 +315,24 @@ func (s *Select) AddStage(def string) error {
 	}
 	return nil
 }
+func (s *Select) AddSelectedChar(pn, cn, pl int) bool {
+	m, n := 0, s.GetCharNo(cn)
+	if len(s.charlist) == 0 || len(s.charlist[n].def) == 0 {
+		return false
+	}
+	for s.charlist[n].def == "randomselect" || len(s.charlist[n].def) == 0 {
+		m++
+		if m > 100000 {
+			return false
+		}
+		n = int(Rand(0, int32(len(s.charlist))-1))
+		pl = int(Rand(1, 12))
+	}
+	sys.loadMutex.Lock()
+	s.selected[pn] = append(s.selected[pn], [2]int{n, pl})
+	sys.loadMutex.Unlock()
+	return true
+}
 func (s *Select) ClearSelected() {
 	s.selected = [2][][2]int{}
 	s.selectedStageNo = -1