Commit: 0c2d7a0cac53c4212b40d2988feb9714fa82b8cb - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: 0c2d7a0cac53c4212b40d2988feb9714fa82b8cb (tree)
• Time: 2019-12-05 22:25:27
• Author: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

Windblade氏の更新に対応

Change Summary

• modified: get.sh
• delete: script/Icons/16x16.png
• delete: script/Icons/24x24.png
• delete: script/Icons/256x256.png
• delete: script/Icons/32x32.png
• delete: script/Icons/384x384.png
• delete: script/Icons/48x48.png
• delete: script/Icons/96x96.png
• add: script/Icons/IkemenCylia.png
• modified: script/motif.lua
• modified: script/select.lua
• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/font.go
• modified: src/input.go
• modified: src/main.go
• modified: src/script.go
• modified: src/sound.go
• modified: src/system.go

Incremental Difference

--- a/get.sh
+++ b/get.sh
@@ -1,15 +1,13 @@
 #!/bin/sh
 export GOPATH=$PWD/go
 go get -u github.com/yuin/gopher-lua
-go get -u github.com/go-gl/glfw/v3.2/glfw
+go get -u github.com/go-gl/glfw/v3.3/glfw
 go get -u github.com/go-gl/gl/v2.1/gl
-go get -u github.com/jfreymuth/go-vorbis/ogg/vorbis
 go get -u github.com/timshannon/go-openal/openal
-go get -u github.com/K4thos/glfont
+go get -u github.com/Windblade-GR01/glfont
 go get -u github.com/flopp/go-findfont
 go get -u github.com/faiface/beep
 go get -u github.com/hajimehoshi/oto
 go get -u github.com/hajimehoshi/go-mp3
 go get -u github.com/pkg/errors
-go get -u github.com/jfreymuth/oggvorbis
-go get -u github.com/mewkiz/flac
+go get -u github.com/jfreymuth/oggvorbis
\ No newline at end of file

Binary files a/script/Icons/16x16.png and /dev/null differ

Binary files a/script/Icons/24x24.png and /dev/null differ

Binary files a/script/Icons/256x256.png and /dev/null differ

Binary files a/script/Icons/32x32.png and /dev/null differ

Binary files a/script/Icons/384x384.png and /dev/null differ

Binary files a/script/Icons/48x48.png and /dev/null differ

Binary files a/script/Icons/96x96.png and /dev/null differ

Binary files /dev/null and b/script/Icons/IkemenCylia.png differ

--- a/script/motif.lua
+++ b/script/motif.lua
@@ -1622,7 +1622,7 @@ for i = 1, #t_dir do
 			animSetAlpha(anim, 1, 255)
 		end
 		animAddPos(anim, 160, 0) --for some reason needed in ikemen
-		if t_bgdef[k].window ~= nil then
+		if t_bgdef[k].window ~= nil and t_bgdef[k].window[1] ~= nil and t_bgdef[k].window[2] ~= nil and t_bgdef[k].window[3] ~= nil and t_bgdef[k].window[4] ~= nil then
 			animSetWindow(
 				anim,
 				t_bgdef[k].window[1],

--- a/script/select.lua
+++ b/script/select.lua
@@ -8,7 +8,13 @@ setSelColRow(motif.select_info.columns, motif.select_info.rows)
 --setRandomSpr(motif.selectbgdef.spr_data, motif.select_info.cell_random_spr[1], motif.select_info.cell_random_spr[2], motif.select_info.cell_random_scale[1], motif.select_info.cell_random_scale[2])
 --setCellSpr(motif.selectbgdef.spr_data, motif.select_info.cell_bg_spr[1], motif.select_info.cell_bg_spr[2], motif.select_info.cell_bg_scale[1], motif.select_info.cell_bg_scale[2])
 
-setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing, motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+-- cell.size type check
+if type(motif.select_info.cell_spacing) == "table" then
+	setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1], motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
+else
+	setSelCellSize(motif.select_info.cell_size[1] + motif.select_info.cell_spacing, motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+end
+
 setSelCellScale(motif.select_info.portrait_scale[1], motif.select_info.portrait_scale[2])
 
 --default team count after starting the game
@@ -88,7 +94,14 @@ for i = 1, (motif.select_info.rows + motif.select_info.rows_scrolling) * motif.s
 		t_grid[row] = {}
 	end
 	col = #t_grid[row] + 1
-	t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)}
+	
+	-- cell.spacing type check
+	if type(motif.select_info.cell_spacing) == "table" then
+		t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1]), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])}
+	else
+		t_grid[row][col] = {num = i - 1, x = (col - 1) * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing), y = (row - 1) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)}
+	end
+	
 	if main.t_selChars[i].char ~= nil then
 		t_grid[row][col].char = main.t_selChars[i].char
 		t_grid[row][col].hidden = main.t_selChars[i].hidden
@@ -1830,8 +1843,17 @@ function select.f_p1SelectMenu()
 		p1SelX, p1SelY, p1FaceOffset, p1RowOffset = select.f_cellMovement(p1SelX, p1SelY, main.p1Cmd, p1FaceOffset, p1RowOffset, motif.select_info.p1_cursor_move_snd)
 		p1Cell = p1SelX + motif.select_info.columns * p1SelY
 		--draw active cursor
-		local cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
-		local cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+		-- cell.spacing type check
+		local cursorX = 0
+		local cursorY = 0
+		if type(motif.select_info.cell_spacing) == "table" then
+			cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
+			cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
+		else
+			cursorX = p1FaceX + p1SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
+			cursorY = p1FaceY + (p1SelY - p1RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+		end
+		
 		if resetgrid == true then
 			select.f_resetGrid()
 		end
@@ -1885,8 +1907,16 @@ function select.f_p2SelectMenu()
 		p2SelX, p2SelY, p2FaceOffset, p2RowOffset = select.f_cellMovement(p2SelX, p2SelY, main.p2Cmd, p2FaceOffset, p2RowOffset, motif.select_info.p2_cursor_move_snd)
 		p2Cell = p2SelX + motif.select_info.columns * p2SelY
 		--draw active cursor
-		local cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
-		local cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+		-- cell.spacing type check
+		local cursorX = 0
+		local cursorY = 0
+		if type(motif.select_info.cell_spacing) == "table" then
+			cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing[1])
+			cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing[2])
+		else
+			cursorX = p2FaceX + p2SelX * (motif.select_info.cell_size[1] + motif.select_info.cell_spacing)
+			cursorY = p2FaceY + (p2SelY - p2RowOffset) * (motif.select_info.cell_size[2] + motif.select_info.cell_spacing)
+		end
 		if resetgrid == true then
 			select.f_resetGrid()
 		end

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -367,9 +367,6 @@ const (
 	OC_ex_groundangle
 	OC_ex_stagefrontedge
 	OC_ex_stagebackedge
-	OC_ex_const240p
-	OC_ex_const480p
-	OC_ex_const720p
 	OC_ex_gethitvar_animtype
 	OC_ex_gethitvar_airtype
 	OC_ex_gethitvar_groundtype
@@ -403,6 +400,12 @@ const (
 	OC_ex_gethitvar_fall_envshake_phase
 )
 const (
+	OC_ex_const240p OpCode = iota + 100
+	OC_ex_const480p
+	OC_ex_const720p
+	OC_ailevelf // float version of AILevel
+)
+const (
 	NumVar     = OC_sysvar0 - OC_var0
 	NumSysVar  = OC_fvar0 - OC_sysvar0
 	NumFvar    = OC_sysfvar0 - OC_fvar0
@@ -975,7 +978,9 @@ func (be BytecodeExp) run(c *Char) BytecodeValue {
 		case OC_swap:
 			sys.bcStack.Swap()
 		case OC_ailevel:
-			sys.bcStack.PushI(c.aiLevel())
+			sys.bcStack.PushI(int32(c.aiLevel()))
+		case OC_ailevelf:
+			sys.bcStack.PushF(c.aiLevel())
 		case OC_alive:
 			sys.bcStack.PushB(c.alive())
 		case OC_anim:

--- a/src/char.go
+++ b/src/char.go
@@ -2270,7 +2270,7 @@ func (c *Char) p2() *Char {
 	}
 	return p2
 }
-func (c *Char) aiLevel() int32 {
+func (c *Char) aiLevel() float32 {
 	if c.helperIndex != 0 && c.gi().ver[0] == 1 {
 		return 0
 	}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -691,8 +691,9 @@ func (c *Compiler) kyuushikiSuperDX(out *BytecodeExp, in *string,
 		default:
 			if hissu && !comma {
 				return Error("比較演算子がありません" +
-					" / " +
-					"No comparison operator")
+					"\n" +
+					"No comparison operator" +
+					"\n[ECID 1]\n")
 			}
 			hikaku = false
 		}
@@ -736,8 +737,9 @@ func (c *Compiler) kyuushikiSuperDX(out *BytecodeExp, in *string,
 	if err != nil {
 		if hissu && !hikaku {
 			return Error("比較演算子がありません" +
-				" / " +
-				"No comparison operator")
+				"\n" +
+				"No comparison operator" +
+				"\n[ECID 2]\n")
 		}
 		if hikaku {
 			return err
@@ -1148,6 +1150,8 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 		}
 	case "ailevel":
 		out.append(OC_ailevel)
+	case "ailevelf":
+		out.append(OC_ailevelf)
 	case "alive":
 		out.append(OC_alive)
 	case "anim":
@@ -2169,7 +2173,12 @@ func (c *Compiler) expPostNot(out *BytecodeExp, in *string) (BytecodeValue,
 	if len(c.maeOp) == 0 {
 		if opp := c.isOperator(c.token); opp == 0 {
 			if !sys.ignoreMostErrors || !c.usiroOp && c.token == "(" {
-				return bvNone(), Error("演算子がありません")
+				return bvNone(), Error("演算子がありません" +
+				"\n" +
+				"No comparison operator" +
+				"\n" + 
+				"Token = '" + c.token + "' String = '" + *in + "'" +
+				"\n[ECID 3]\n")
 			}
 			oldtoken, oldin := c.token, *in
 			var dummyout BytecodeExp
@@ -2178,7 +2187,10 @@ func (c *Compiler) expPostNot(out *BytecodeExp, in *string) (BytecodeValue,
 			}
 			if c.usiroOp {
 				if c.isOperator(c.token) <= 0 {
-					return bvNone(), Error("演算子がありません")
+					return bvNone(), Error("演算子がありません" +
+					"\n" +
+					"No comparison operator" +
+					"\n[ECID 4]\n")
 				}
 				if err := c.renzokuEnzansihaError(in); err != nil {
 					return bvNone(), err

--- a/src/font.go
+++ b/src/font.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/K4thos/glfont"
+	"github.com/Windblade-GR01/glfont"
 	findfont "github.com/flopp/go-findfont"
 )
 
@@ -351,8 +351,8 @@ func loadFntTtf(f *Fnt, fontfile string, filename string) {
 		panic(err)
 	}
 	f.ttf = ttf
-
-	//Create Ttf palettes
+	
+	//Create Ttf dummy palettes
 	f.palettes = make([][256]uint32, 1)
 	for i := 0; i < 256; i++ {
 		f.palettes[0][i] = 0
@@ -595,7 +595,7 @@ func (ts *TextSprite) SetColor(r, g, b, alphaSrc, alphaDst float32) {
 func (ts *TextSprite) Draw() {
 	if !sys.frameSkip && ts.fnt != nil {
 		if ts.fnt.Type == "truetype" {
-			ts.fnt.ttf.Printf(ts.x, ts.y, ts.yscl, ts.align, false, ts.text) //x, y, scale, align, string, printf args
+			ts.fnt.ttf.Printf(ts.x, ts.y, (ts.xscl + ts.yscl) / 2, ts.align, true, ts.text) //x, y, scale, align, blend ,string, printf args
 		} else {
 			ts.fnt.DrawText(ts.text, ts.x, ts.y, ts.xscl, ts.yscl, ts.bank, ts.align)
 		}

--- a/src/input.go
+++ b/src/input.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 )
 
 type CommandKey byte
@@ -618,19 +618,22 @@ func JoystickState(joy, button int) bool {
 	if joy >= len(joystick) {
 		return false
 	}
-	btns := glfw.GetJoystickButtons(joystick[joy])
+	btns := joystick[joy].GetButtons()
 	if button < 0 {
 		button = -button - 1
-		axes := glfw.GetJoystickAxes(joystick[joy])
+		axes := joystick[joy].GetAxes()
+		
 		if len(axes)*2 <= button {
 			return false
 		}
-		if (button == 8 || button == 10) && glfw.GetJoystickName(joystick[joy]) == "Xbox 360 Controller" { //Xbox360コントローラーのLRトリガー判定
+
+		//Xbox360コントローラーのLRトリガー判定
+		if (button == 9 || button == 11) && (joystick[joy].GetGamepadName() == "Xbox 360 Controller" || strings.Contains(joystick[joy].GetGamepadName(), "XInput")) {
 			return axes[button/2] > sys.xinputTriggerSensitivity
 		}
 
 		// Ignore trigger axis on PS4 (We already have buttons)
-		if (button >= 6 && button <= 9) && glfw.GetJoystickName(joystick[joy]) == "Wireless Controller" {
+		if (button >= 6 && button <= 9) && joystick[joy].GetGamepadName() == "Wireless Controller" {
 			return false
 		}
 
@@ -1368,7 +1371,7 @@ func (__ *AiInput) Update(level float32) {
 	if dec(&__.dt) {
 		__.dir = Rand(0, 7)
 	}
-	osu, hanasu = int32(-11.25*level+165), 30
+	osu, hanasu = int32((-11.25*level+165)*7), 30
 	dec(&__.at)
 	dec(&__.bt)
 	dec(&__.ct)

--- a/src/main.go
+++ b/src/main.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	lua "github.com/yuin/gopher-lua"
 )
 
@@ -78,6 +78,7 @@ func main() {
 	defer glfw.Terminate()
 	defcfg := []byte(strings.Join(strings.Split(
 `{
+	"WindowTitle": "Ikemen GO",
 	"HelperMax": 56,
 	"PlayerProjectileMax": 256,
 	"ExplodMax": 512,
@@ -104,12 +105,12 @@ func main() {
 	],
 	"JoystickConfig": [
 		{
-			"Joystick": 1,
-			"Buttons": ["-7", "-8", "-5", "-6", "0", "1", "4", "2", "3", "5", "7", "6", "8"]
+			"Joystick": 0,
+			"Buttons": ["-3", "-4", "-1", "-2", "0", "1", "4", "2", "3", "5", "7", "-10", "-12"]
 		},
 		{
 			"Joystick": 1,
-			"Buttons": ["-7", "-8", "-5", "-6", "0", "1", "4", "2", "3", "5", "7", "6", "8"]
+			"Buttons": ["-3", "-4", "-1", "-2", "0", "1", "4", "2", "3", "5", "7", "-10", "-12"]
 		}
 	],
 	"ControllerStickSensitivity": 0.4,
@@ -151,8 +152,7 @@ func main() {
 	"LocalcoordScalingType": 1,
 	"MSAA": false,
 	"WindowMainIconLocation": [
-		"script/Icons/16x16.png",
-		"script/Icons/24x24.png"
+		"script/Icons/IkemenCylia.png"
 	]
 }
 `, "\n"), "\r\n"))
@@ -195,6 +195,7 @@ func main() {
 		ControllerStickSensitivity float32
 		XinputTriggerSensitivity   float32
 		WindowMainIconLocation     []string
+		WindowTitle                string
 	}{}
 	chk(json.Unmarshal(defcfg, &tmp))
 	const configFile = "save/config.json"
@@ -212,6 +213,7 @@ func main() {
 	}
 	sys.controllerStickSensitivity = tmp.ControllerStickSensitivity
 	sys.xinputTriggerSensitivity = tmp.XinputTriggerSensitivity
+	sys.windowTitle = tmp.WindowTitle
 	sys.helperMax = tmp.HelperMax
 	sys.playerProjectileMax = tmp.PlayerProjectileMax
 	sys.explodMax = tmp.ExplodMax

--- a/src/script.go
+++ b/src/script.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	lua "github.com/yuin/gopher-lua"
 )
 
@@ -285,6 +285,12 @@ func scriptCommonInit(l *lua.LState) {
 		sys.lifebarOffsetX = float32(numArg(l, 1))
 		return 0
 	})
+
+	luaRegister(l, "setWindowTitle", func(*lua.LState) int {
+		sys.windowTitle = string(strArg(l, 1))
+		sys.window.SetTitle(sys.windowTitle)
+		return 0
+	})
 }
 
 // System Script
@@ -504,10 +510,16 @@ func systemScriptInit(l *lua.LState) {
 	})
 	luaRegister(l, "setCom", func(*lua.LState) int {
 		pn := int(numArg(l, 1))
+		ailv := float32(numArg(l, 2))
 		if pn < 1 || pn > MaxSimul*2+MaxAttachedChar {
 			l.RaiseError("プレイヤー番号(%v)が不正です。", pn)
 		}
-		sys.com[pn-1] = Max(0, int32(numArg(l, 2)))
+		if ailv > 0 {
+			sys.com[pn-1] = ailv
+		} else {
+			sys.com[pn-1] = 0
+		}
+	
 		return 0
 	})
 	luaRegister(l, "setAutoLevel", func(*lua.LState) int {
@@ -1212,23 +1224,29 @@ func systemScriptInit(l *lua.LState) {
 		l.Push(lua.LString(f))
 		return 6
 	})
+	luaRegister(l, "getGamepadName", func(*lua.LState) int {
+		l.Push(lua.LString(joystick[int(numArg(l, 1))].GetGamepadName()))
+		return 1
+	})
 	luaRegister(l, "getKey", func(*lua.LState) int {
 		s := ""
 		if sys.keyInput != glfw.KeyUnknown {
 			s = KeyToString(sys.keyInput)
 		}
-		for j := 0; j < 2; j++ {
-			if glfw.JoystickPresent(joystick[j]) {
-				axes := glfw.GetJoystickAxes(joystick[j])
-				btns := glfw.GetJoystickButtons(joystick[j])
+		for j := 0; j < 1; j++ {
+			if joystick[j].GetGamepadState != nil {
+				axes := joystick[j].GetAxes()
+				btns := joystick[j].GetButtons()
 				for i := range axes {
-					if glfw.GetJoystickName(joystick[j]) == "Xbox 360 Controller" { //Xbox360コントローラー判定
-						if axes[i] > 0 {
+					if joystick[j].GetGamepadName() == "Xbox 360 Controller" || strings.Contains(joystick[j].GetGamepadName(), "XInput") { //Xbox360コントローラー判定
+						if axes[i] > 0.5 {
+							s = strconv.Itoa(-i*2 - 2)
+						} else if axes[i] < -0.5 && i < 4 {
 							s = strconv.Itoa(-i*2 - 1)
 						}
 					} else {
 						// PS4 Controller support
-						if glfw.GetJoystickName(joystick[j]) != "Wireless Controller" || !(i == 3 || i == 4) {
+						if joystick[j].GetGamepadName() != "Wireless Controller" || !(i == 3 || i == 4) {
 							if axes[i] < -0.2 {
 								s = strconv.Itoa(-i*2 - 1)
 							} else if axes[i] > 0.2 {
@@ -1252,7 +1270,7 @@ func systemScriptInit(l *lua.LState) {
 		s := ""
 		if sys.keyInput != glfw.KeyUnknown {
 			if sys.keyInput == glfw.KeyInsert {
-				s, _ = sys.window.GetClipboardString()
+				s = sys.window.GetClipboardString()
 			} else {
 				s = sys.keyString
 			}
@@ -2251,7 +2269,7 @@ func debugScriptInit(l *lua.LState, file string) error {
 	})
 	luaRegister(l, "setAILevel", func(*lua.LState) int {
 		if sys.netInput == nil && sys.fileInput == nil {
-			level := int32(numArg(l, 1))
+			level := float32(numArg(l, 1))
 			sys.com[sys.debugWC.playerNo] = level
 			for _, c := range sys.chars[sys.debugWC.playerNo] {
 				if level == 0 {

--- a/src/sound.go
+++ b/src/sound.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/faiface/beep"
 	"github.com/faiface/beep/effects"
-	"github.com/faiface/beep/flac"
+	//"github.com/faiface/beep/flac"
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
 	"github.com/faiface/beep/vorbis"
@@ -268,9 +268,9 @@ func (bgm *Bgm) IsMp3() bool {
 	return bgm.IsFormat(".mp3")
 }
 
-func (bgm *Bgm) IsFLAC() bool {
-	return bgm.IsFormat(".flac")
-}
+//func (bgm *Bgm) IsFLAC() bool {
+//	return bgm.IsFormat(".flac")
+//}
 
 func (bgm *Bgm) IsWAVE() bool {
 	return bgm.IsFormat(".wav")
@@ -301,8 +301,8 @@ func (bgm *Bgm) Open(filename string, isDefaultBGM bool, loop, bgmVolume, bgmLoo
 		bgm.ReadVorbis(loop, bgmVolume)
 	} else if bgm.IsMp3() {
 		bgm.ReadMp3(loop, bgmVolume)
-	} else if bgm.IsFLAC() {
-		bgm.ConvertFLAC(loop, bgmVolume)
+	//} else if bgm.IsFLAC() {
+	//	bgm.ConvertFLAC(loop, bgmVolume)
 	} else if bgm.IsWAVE() {
 		bgm.ReadWav(loop, bgmVolume)
 	}
@@ -320,6 +320,7 @@ func (bgm *Bgm) ReadMp3(loop int, bgmVolume int) {
 	bgm.ReadFormat(format, loop, bgmVolume)
 }
 
+/*
 func (bgm *Bgm) ReadFLAC(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := flac.Decode(f)
@@ -333,6 +334,7 @@ func (bgm *Bgm) ReadFLAC(loop int, bgmVolume int) {
 }
 
 // SCREW THE FLAC.SEEK FUNCTION, IT DOES NOT WORK SO WE ARE GOING TO CONVERT THIS TO WAV
+// Update: Now the flac dependecy broke. (-_-)
 func (bgm *Bgm) ConvertFLAC(loop int, bgmVolume int) {
 	// We open the flac
 	f1, _ := os.Open(bgm.filename)
@@ -355,6 +357,7 @@ func (bgm *Bgm) ConvertFLAC(loop int, bgmVolume int) {
 
 	sys.FLAC_FrameWait = 120
 }
+*/
 
 func (bgm *Bgm) PlayMemAudio(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)

--- a/src/system.go
+++ b/src/system.go
@@ -17,13 +17,13 @@ import (
 	"github.com/faiface/beep"
 	"github.com/faiface/beep/speaker"
 	"github.com/go-gl/gl/v2.1/gl"
-	"github.com/go-gl/glfw/v3.2/glfw"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/timshannon/go-openal/openal"
 	lua "github.com/yuin/gopher-lua"
 )
 
 const (
-	MaxSimul        = 8
+	MaxSimul        = 32
 	MaxAttachedChar = 2
 	FPS             = 60
 	P1P3Dist        = 25
@@ -66,7 +66,7 @@ var sys = System {
 	keyInput:              glfw.KeyUnknown,
 	keyString:             "",
 	comboExtraFrameWindow: 1,
-	FLAC_FrameWait:       -1,
+	//FLAC_FrameWait:       -1,
 	// Localcoord sceenpack
 	luaSpriteScale:        1,
 	luaSmallPortraitScale: 1,
@@ -119,7 +119,7 @@ type System struct {
 	aiInput                 [MaxSimul*2 + MaxAttachedChar]AiInput
 	keyConfig               []KeyConfig
 	JoystickConfig          []KeyConfig
-	com                     [MaxSimul*2 + MaxAttachedChar]int32
+	com                     [MaxSimul*2 + MaxAttachedChar]float32
 	autolevel               bool
 	home                    int
 	gameTime                int32
@@ -251,7 +251,8 @@ type System struct {
 	wavVolume               int
 	bgmVolume               int
 	AudioDucking            bool
-	FLAC_FrameWait          int
+	windowTitle             string
+	//FLAC_FrameWait          int
 
 	controllerStickSensitivity float32
 	xinputTriggerSensitivity   float32
@@ -284,10 +285,10 @@ func (s *System) init(w, h int32) *lua.LState {
 	var err error
 	if s.fullscreen {
 		s.window, err = glfw.CreateWindow(int(s.scrrect[2]), int(s.scrrect[3]),
-			"Ikemen GO", glfw.GetPrimaryMonitor(), nil)
+			s.windowTitle, glfw.GetPrimaryMonitor(), nil)
 	} else {
 		s.window, err = glfw.CreateWindow(int(s.scrrect[2]), int(s.scrrect[3]),
-			"Ikemen GO", nil, nil)
+			s.windowTitle, nil, nil)
 	}
 	chk(err)
 	s.window.MakeContextCurrent()
@@ -473,12 +474,12 @@ func (s *System) soundWrite() {
 			}
 		}
 
-		if s.FLAC_FrameWait >= 0 {
-			if s.FLAC_FrameWait == 0 {
-				s.bgm.PlayMemAudio(s.bgm.loop, s.bgm.bgmVolume)
-			}
-			s.FLAC_FrameWait--
-		}
+		//if s.FLAC_FrameWait >= 0 {
+		//	if s.FLAC_FrameWait == 0 {
+		//		s.bgm.PlayMemAudio(s.bgm.loop, s.bgm.bgmVolume)
+		//	}
+		//	s.FLAC_FrameWait--
+		//}
 	}
 	src.Delete()
 	openal.NullContext.Activate()
@@ -765,7 +766,7 @@ func (s *System) commandUpdate() {
 			for _, c := range p {
 				if (c.helperIndex == 0 ||
 					c.helperIndex > 0 && &c.cmd[0] != &r.cmd[0]) &&
-					c.cmd[0].Input(c.key, int32(c.facing), float32(sys.com[i])) {
+					c.cmd[0].Input(c.key, int32(c.facing), sys.com[i]) {
 					hp := c.hitPause()
 					buftime := Btoi(hp && c.gi().ver[0] != 1)
 					if s.super > 0 {
@@ -786,7 +787,7 @@ func (s *System) commandUpdate() {
 				cc := int32(-1)
 				// AI Scaling
 				// TODO: Balance AI Scaling
-				if r.roundState() == 2 && RandF32(0, float32(sys.com[i])/2+32) > 32 {
+				if r.roundState() == 2 && RandF32(0, sys.com[i]/2+32) > 32 {
 					cc = Rand(0, int32(len(r.cmd[r.ss.sb.playerNo].Commands))-1)
 				} else {
 					cc = -1