提交: c7bd9fbcd7a217b524fc7c326075c2262f0d07aa - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: c7bd9fbcd7a217b524fc7c326075c2262f0d07aa (tree)
• 时间: 2020-01-15 01:50:37
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

ishelperで-1を指定すると無指定と同じ挙動になっていたのを修正
QuickLaunchの設定が無かったのを修正
QuickLaunchモードでVS画面ポトレが表示されないのを修正
KOが表示されないのを修正
ScreenPackのBGdefにlocalcoordが反映されるようにした(暫定)

更改概述

• modified: script/motif.lua
• modified: script/options.lua
• modified: script/select.lua
• modified: src/bgdef.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/lifebar.go

差异

--- a/script/motif.lua
+++ b/script/motif.lua
@@ -827,7 +827,6 @@ local motif =
 		menu_itemname_main_video = 'Video Settings', --Ikemen feature
 		menu_itemname_main_audio = 'Audio Settings', --Ikemen feature
 		menu_itemname_main_input = 'Input Settings', --Ikemen feature
-		menu_itemname_main_quicklaunch = 'Quick Launch', --Ikemen feature
 		menu_itemname_main_port = 'Port Change', --Ikemen feature
 		menu_itemname_main_default = 'Default Values', --Ikemen feature
 		menu_itemname_main_save = 'Save and Return', --Ikemen feature
@@ -888,6 +887,7 @@ local motif =
 		menu_itemname_gameplay_advanced = 'Advanced Settings', --Ikemen feature
 		menu_itemname_gameplay_back = 'Back', --Ikemen feature
 		menu_itemname_engine_allowdebugkeys = 'Debug Keys', --Ikemen feature
+		menu_itemname_engine_quicklaunch = 'Quick Launch', --Ikemen feature
 		menu_itemname_engine_simulmode = 'Legacy Tag Mode', --Ikemen feature
 		menu_itemname_engine_helpermax = 'HelperMax', --Ikemen feature
 		menu_itemname_engine_playerprojectilemax = 'PlayerProjectileMax', --Ikemen feature

--- a/script/options.lua
+++ b/script/options.lua
@@ -1271,8 +1271,14 @@ end
 --;===========================================================
 --; ENGINE SETTINGS
 --;===========================================================
+local t_quicklaunchNames = {}
+t_quicklaunchNames[0] = "Disabled"
+t_quicklaunchNames[1] = "Level1"
+t_quicklaunchNames[2] = "Level2"
+
 options.t_engineCfg = {
 	{data = textImgNew(), itemname = 'allowdebugkeys', displayname = motif.option_info.menu_itemname_engine_allowdebugkeys, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)},
+	{data = textImgNew(), itemname = 'quicklaunch', displayname = motif.option_info.menu_itemname_engine_quicklaunch, vardata = textImgNew(), vardisplay = t_quicklaunchNames[config.QuickLaunch]},
 	{data = textImgNew(), itemname = 'simulmode', displayname = motif.option_info.menu_itemname_engine_simulmode, vardata = textImgNew(), vardisplay = options.f_boolDisplay(config.SimulMode, motif.option_info.menu_itemname_disabled, motif.option_info.menu_itemname_enabled)},
 	{data = textImgNew(), itemname = 'lifebarfontscale', displayname = motif.option_info.menu_itemname_engine_lifebarfontscale, vardata = textImgNew(), vardisplay = config.LifebarFontScale},
 	{data = textImgNew(), itemname = 'empty', displayname = ' '},
@@ -1314,6 +1320,16 @@ function options.f_engineCfg()
 			t[item].vardisplay = options.f_boolDisplay(config.AllowDebugKeys, motif.option_info.menu_itemname_enabled, motif.option_info.menu_itemname_disabled)
 			setAllowDebugKeys(config.AllowDebugKeys)
 			modified = 1
+		-- Quick Launch
+		elseif t[item].itemname == 'quicklaunch' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
+			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])
+			if commandGetState(main.p1Cmd, 'r') and config.QuickLaunch < #t_quicklaunchNames then
+				config.QuickLaunch = config.QuickLaunch + 1
+			elseif commandGetState(main.p1Cmd, 'l') and config.QuickLaunch > 0 then
+				config.QuickLaunch = config.QuickLaunch - 1
+			end
+			t[item].vardisplay = t_quicklaunchNames[config.QuickLaunch]
+			modified = 1
 		--Legacy Tag Mode
 		elseif t[item].itemname == 'simulmode' and (commandGetState(main.p1Cmd, 'r') or commandGetState(main.p1Cmd, 'l') or main.f_btnPalNo(main.p1Cmd) > 0) then
 			sndPlay(motif.files.snd_data, motif.option_info.cursor_move_snd[1], motif.option_info.cursor_move_snd[2])

--- a/script/select.lua
+++ b/script/select.lua
@@ -2704,7 +2704,7 @@ function select.f_selectVersus()
 			end
 			t_portrait = main.f_reversedTable(t_portrait)
 			for n = #t_portrait, 1, -1 do
-				drawPortrait(
+				drawVersusPortrait(
 					t_portrait[n],
 					motif.vs_screen.p1_pos[1] + motif.vs_screen.p1_offset[1] + motif.vs_screen['p1_c' .. n .. '_offset'][1] + (n - 1) * motif.vs_screen.p1_spacing[1] + select.f_alignOffset(motif.vs_screen.p1_facing),
 					motif.vs_screen.p1_pos[2] + motif.vs_screen.p1_offset[2] + motif.vs_screen['p1_c' .. n .. '_offset'][2] + (n - 1) * motif.vs_screen.p1_spacing[2],
@@ -2721,7 +2721,7 @@ function select.f_selectVersus()
 			end
 			t_portrait = main.f_reversedTable(t_portrait)
 			for n = #t_portrait, 1, -1 do
-				drawPortrait(
+				drawVersusPortrait(
 					t_portrait[n],
 					motif.vs_screen.p2_pos[1] + motif.vs_screen.p2_offset[1] + motif.vs_screen['p2_c' .. n .. '_offset'][1] + (n - 1) * motif.vs_screen.p2_spacing[1] + select.f_alignOffset(motif.vs_screen.p2_facing),
 					motif.vs_screen.p2_pos[2] + motif.vs_screen.p2_offset[2] + motif.vs_screen['p2_c' .. n .. '_offset'][2] + (n - 1) * motif.vs_screen.p2_spacing[2],

--- a/src/bgdef.go
+++ b/src/bgdef.go
@@ -174,9 +174,9 @@ func loadBGDef(def string, bgname string, sffloc string) (int, error) {
 			s.bgc = append(s.bgc, *bgc)
 		}
 	}
-	//s.localscl = float32(sys.gameWidth) / float32(sys.cam.localcoord[0])
+	s.localscl = 240 / s.localcoord[1]
 	sys.bgdef = append(sys.bgdef, s)
-	return len(sys.bgdef)-1, nil
+	return len(sys.bgdef) - 1, nil
 }
 func (s *BGDef) getBg(id int32) (bg []*backGround) {
 	if id >= 0 {
@@ -318,12 +318,12 @@ func (s *BGDef) draw(top bool, x, y, scl float32) {
 	if !top {
 		s.action()
 	}
-	x, y = x/s.localscl, y/s.localscl
-	bgscl := float32(1)
+	//x, y = x/s.localscl, y/s.localscl
+	bgscl := s.localscl
 	pos := [...]float32{x, y}
 	for _, b := range s.bg {
 		if b.visible && b.toplayer == top && b.anim.spr != nil {
-			b.draw(pos, scl, bgscl, s.localscl, s.scale, 0)
+			b.draw(pos, scl, bgscl, 1, s.scale, 0)
 		}
 	}
 }

--- a/src/char.go
+++ b/src/char.go
@@ -2414,7 +2414,7 @@ func (c *Char) isHelper(hid BytecodeValue) BytecodeValue {
 		return BytecodeSF()
 	}
 	id := hid.ToI()
-	return BytecodeBool(c.helperIndex != 0 && (id <= 0 || c.helperId == id))
+	return BytecodeBool(c.helperIndex != 0 && (id == math.MinInt32 || c.helperId == id))
 }
 func (c *Char) leftEdge() float32 {
 	return sys.cam.ScreenPos[0] / c.localscl

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -1570,7 +1570,7 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 	case "inguarddist":
 		out.append(OC_inguarddist)
 	case "ishelper":
-		if _, err := c.oneArg(out, in, rd, true, BytecodeInt(-1)); err != nil {
+		if _, err := c.oneArg(out, in, rd, true, BytecodeInt(math.MinInt32)); err != nil {
 			return bvNone(), err
 		}
 		out.append(OC_ishelper)

--- a/src/lifebar.go
+++ b/src/lifebar.go
@@ -885,7 +885,8 @@ func (r *LifeBarRound) act() bool {
 			if sys.tickNextFrame() {
 				r.swt[t]--
 			}
-			if ats.End(r.dt[t]) {
+			//animが終了したら数値を固定して再度animを再生しないようにする
+			if ats.anim.anim.spr != nil && ats.End(r.dt[t]) {
 				r.wt[t] = 2
 			}
 			if sys.intro < -r.ko_time-10 {
@@ -1015,8 +1016,7 @@ func (r *LifeBarRound) draw(layerno int16) {
 				r.win.text = tmp
 			}
 		}
-		
-		
+
 		if (sys.finish != FT_NotYet || sys.time == 0) && sys.winTeam >= 0 {
 			switch sys.winType[sys.winTeam] {
 			case WT_N, WT_PN:
@@ -1040,22 +1040,21 @@ func (r *LifeBarRound) draw(layerno int16) {
 				r.perfect.DrawScaled(float32(r.pos[0])+sys.lifebarOffsetX, float32(r.pos[1]), layerno, r.fnt, sys.lifebarScale)
 			}
 		}
-		
-		
+
 	}
 	sys.brightness = ob
 }
 
 type LifeBarChallenger struct {
-	cnt           int32
-	snd           *Snd
-	pos           [2]int32
-	challenger    AnimTextSnd
-	sndtime       int32
-	over_pause    int32
-	over_time     int32
-	bg            AnimLayout
-	fnt           []*Fnt
+	cnt        int32
+	snd        *Snd
+	pos        [2]int32
+	challenger AnimTextSnd
+	sndtime    int32
+	over_pause int32
+	over_time  int32
+	bg         AnimLayout
+	fnt        []*Fnt
 }
 
 func newLifeBarChallenger(snd *Snd, fnt []*Fnt) *LifeBarChallenger {
@@ -1077,7 +1076,7 @@ func readLifeBarChallenger(is IniSection,
 	ch.bg = *ReadAnimLayout("bg.", is, sff, at, 0)
 	return ch
 }
-func (ch *LifeBarChallenger) step()  {
+func (ch *LifeBarChallenger) step() {
 	if sys.challenger > 0 {
 		if ch.cnt == ch.sndtime {
 			ch.snd.play(ch.challenger.snd)
@@ -1145,7 +1144,7 @@ func loadLifebar(deffile string) (*Lifebar, error) {
 		"[tag name]": -1, "[challenger]": -1}
 	strc := strings.ToLower(strings.TrimSpace(str))
 	for k, _ := range missing {
-		strc = strings.Replace(strc, ";" + k, "", -1)
+		strc = strings.Replace(strc, ";"+k, "", -1)
 		if strings.Contains(strc, k) {
 			delete(missing, k)
 		} else {