提交: 7c1457eeca8cfa75cb01ac5a8cea0222c77b67c5 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: 7c1457eeca8cfa75cb01ac5a8cea0222c77b67c5 (tree)
• 时间: 2019-09-27 00:12:59
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

hitflagでPを指定してProjectileに当てたときにp1statenoが機能しなかったのを修正
BONUS GAMESでAIが入らなかったのを修正

更改概述

• modified: script/main.lua
• modified: script/select.lua
• modified: src/char.go
• modified: src/main.go
• modified: src/system.go

差异

--- a/script/main.lua
+++ b/script/main.lua
@@ -2121,6 +2121,7 @@ function main.f_bonusExtras()
 			else
 				sndPlay(motif.files.snd_data, motif.title_info.cursor_done_snd[1], motif.title_info.cursor_done_snd[2])
 				main.versusScreen = false
+				main.p2In = 1
 				main.p1TeamMenu = {mode = 0, chars = 1}
 				main.p2TeamMenu = {mode = 0, chars = 1}
 				main.p2Char = {main.t_bonusChars[item]}

--- a/script/select.lua
+++ b/script/select.lua
@@ -2464,8 +2464,7 @@ function select.f_selectVictory()
 				winnerNum,
 				motif.victory_screen.p1_offset[1],
 				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing,
-				motif.victory_screen.p1_scale[1],
+				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
 				motif.victory_screen.p1_scale[2]
 			)
 		else
@@ -2473,16 +2472,14 @@ function select.f_selectVictory()
 				p1Num,
 				motif.victory_screen.p1_offset[1],
 				motif.victory_screen.p1_offset[2],
-				motif.victory_screen.p1_facing,
-				motif.victory_screen.p1_scale[1],
+				motif.victory_screen.p1_facing * motif.victory_screen.p1_scale[1],
 				motif.victory_screen.p1_scale[2]
 			)
 			drawVictoryPortrait(
 				p2Num,
 				motif.victory_screen.p2_offset[1],
 				motif.victory_screen.p2_offset[2],
-				motif.victory_screen.p2_facing,
-				motif.victory_screen.p2_scale[1],
+				motif.victory_screen.p2_facing * motif.victory_screen.p2_scale[1],
 				motif.victory_screen.p2_scale[2]
 			)
 		end
@@ -2531,9 +2528,12 @@ local txt_credits = main.f_createTextImg(
 )
 
 function select.f_continue()
+	main.f_resetBG(motif.continue_screen, motif.continuebgdef, motif.music.continue_bgm, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart, motif.music.continue_bgm_loopend)
+	animReset(motif.continue_screen.continue_anim_data)
+	animUpdate(motif.continue_screen.continue_anim_data)
 	continue = false
-	playBGM(motif.music.continue_bgm, true, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart or "0", motif.music.continue_bgm_loopend or "0")
-	--textImgSetText(txt_credits, text[1])
+	local text = main.f_extractText(motif.continue_screen.credits_text, main.credits)
+	textImgSetText(txt_credits, text[1])
 	main.f_cmdInput()
 	while true do
 		--draw clearcolor (disabled to not cover area)

--- a/src/char.go
+++ b/src/char.go
@@ -1516,27 +1516,27 @@ type Char struct {
 	ivar            [NumVar + NumSysVar]int32
 	fvar            [NumFvar + NumSysFvar]float32
 	CharSystemVar
-	mapArray      map[string]int32
-	aimg          AfterImage
-	sounds        Sounds
-	p1facing      float32
-	cpucmd        int32
-	attackDist    float32
-	offset        [2]float32
-	platformPosY  float32
-	groundAngle   float32
-	stchtmp       bool
-	inguarddist   bool
-	pushed        bool
-	hitdefContact bool
-	movedY        bool
-	atktmp        int8
-	hittmp        int8
-	acttmp        int8
-	minus         int8
-	winquote      int32
-	memberNo      int
-	selectNo      int
+	mapArray              map[string]int32
+	aimg                  AfterImage
+	sounds                Sounds
+	p1facing              float32
+	cpucmd                int32
+	attackDist            float32
+	offset                [2]float32
+	platformPosY          float32
+	groundAngle           float32
+	stchtmp               bool
+	inguarddist           bool
+	pushed                bool
+	hitdefContact         bool
+	movedY                bool
+	atktmp                int8
+	hittmp                int8
+	acttmp                int8
+	minus                 int8
+	winquote              int32
+	memberNo              int
+	selectNo              int
 	comboExtraFrameWindow int32
 }
 
@@ -5452,6 +5452,9 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 					(p.hitdef.teamside-1 != getter.teamside) == (getter.hitdef.affectteam > 0)) &&
 					getter.hitdef.hitflag&int32(ST_P) != 0 &&
 					getter.projClsnCheck(p, false) {
+					if getter.hitdef.p1stateno >= 0 && getter.stateChange1(getter.hitdef.p1stateno, getter.hitdef.playerNo) {
+						getter.setCtrl(false)
+					}
 					p.hits = -2
 					sys.cgi[i].pctype = PC_Cancel
 					sys.cgi[i].pctime = 0

--- a/src/main.go
+++ b/src/main.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/go-gl/glfw/v3.2/glfw"
-	"github.com/yuin/gopher-lua"
+	lua "github.com/yuin/gopher-lua"
 )
 
 func init() {
@@ -143,21 +143,21 @@ func main() {
 }
 `, "\n"), "\r\n"))
 	tmp := struct {
-		HelperMax				int32
-		PlayerProjectileMax		int
-		ExplodMax				int
-		AfterImageMax			int32
-		MasterVolume			int
-		WavVolume				int
-		BgmVolume               int
-		Attack_LifeToPowerMul	float32 `json:"Attack.LifeToPowerMul"`
-		GetHit_LifeToPowerMul	float32 `json:"GetHit.LifeToPowerMul"`
-		Width					int32
-		Height					int32
-		Super_TargetDefenceMul	float32 `json:"Super.TargetDefenceMul"`
-		LifebarFontScale		float32
-		System					string
-		KeyConfig				[]struct {
+		HelperMax              int32
+		PlayerProjectileMax    int
+		ExplodMax              int
+		AfterImageMax          int32
+		MasterVolume           int
+		WavVolume              int
+		BgmVolume              int
+		Attack_LifeToPowerMul  float32 `json:"Attack.LifeToPowerMul"`
+		GetHit_LifeToPowerMul  float32 `json:"GetHit.LifeToPowerMul"`
+		Width                  int32
+		Height                 int32
+		Super_TargetDefenceMul float32 `json:"Super.TargetDefenceMul"`
+		LifebarFontScale       float32
+		System                 string
+		KeyConfig              []struct {
 			Joystick int
 			Buttons  []interface{}
 		}
@@ -165,19 +165,19 @@ func main() {
 			Joystick int
 			Buttons  []interface{}
 		}
-		NumTag					int
-		TeamLifeShare			bool
-		AIRandomColor			bool
-		ComboExtraFrameWindow	int32
-		Fullscreen				bool
-		AudioDucking			bool
-		AllowDebugKeys			bool
-		MSAA					bool
-		PostProcessingShader	int32
-		LocalcoordScalingType	int32
-		CommonAir				string
-		CommonCmd				string
-		QuickLaunch				int
+		NumTag                int
+		TeamLifeShare         bool
+		AIRandomColor         bool
+		ComboExtraFrameWindow int32
+		Fullscreen            bool
+		AudioDucking          bool
+		AllowDebugKeys        bool
+		MSAA                  bool
+		PostProcessingShader  int32
+		LocalcoordScalingType int32
+		CommonAir             string
+		CommonCmd             string
+		QuickLaunch           int
 	}{}
 	chk(json.Unmarshal(defcfg, &tmp))
 	const configFile = "save/config.json"

--- a/src/system.go
+++ b/src/system.go
@@ -49,31 +49,31 @@ var sys = System{
 	listenPort:        "7500",
 	loader:            *newLoader(),
 	numSimul:          [...]int32{2, 2}, numTurns: [...]int32{2, 2},
-	ignoreMostErrors: true,
-	superpmap:        *newPalFX(),
-	wincnt:           wincntMap(make(map[string][]int32)),
-	wincntFileName:   "save/autolevel.save",
-	powerShare:       [...]bool{true, true},
-	oldNextAddTime:   1,
-	commandLine:      make(chan string),
-	cam:              *newCamera(),
-	mainThreadTask:   make(chan func(), 65536),
-	workpal:          make([]uint32, 256),
-	errLog:           log.New(os.Stderr, "", 0),
-	audioClose:       make(chan bool, 1),
-	keyInput:         glfw.KeyUnknown,
-	keyString:        "",
-	comboExtraFrameWindow:	1,
+	ignoreMostErrors:      true,
+	superpmap:             *newPalFX(),
+	wincnt:                wincntMap(make(map[string][]int32)),
+	wincntFileName:        "save/autolevel.save",
+	powerShare:            [...]bool{true, true},
+	oldNextAddTime:        1,
+	commandLine:           make(chan string),
+	cam:                   *newCamera(),
+	mainThreadTask:        make(chan func(), 65536),
+	workpal:               make([]uint32, 256),
+	errLog:                log.New(os.Stderr, "", 0),
+	audioClose:            make(chan bool, 1),
+	keyInput:              glfw.KeyUnknown,
+	keyString:             "",
+	comboExtraFrameWindow: 1,
 	// Localcoord sceenpack
-	luaSpriteScale:			1,
-	luaSmallPortraitScale:	1,
-	luaBigPortraitScale:	1,
-	luaSpriteOffsetX:		0,
-	lifebarScale:			1,
-	lifebarOffsetX:			0,
+	luaSpriteScale:        1,
+	luaSmallPortraitScale: 1,
+	luaBigPortraitScale:   1,
+	luaSpriteOffsetX:      0,
+	lifebarScale:          1,
+	lifebarOffsetX:        0,
 	//Shader vars
 	MultisampleAntialiasing: false,
-	PostProcessingShader:	0,
+	PostProcessingShader:    0,
 }
 
 type TeamMode int32
@@ -149,7 +149,7 @@ type System struct {
 	afterImageMax           int32
 	attack_LifeToPowerMul   float32
 	getHit_LifeToPowerMul   float32
-	comboExtraFrameWindow	int32
+	comboExtraFrameWindow   int32
 	envShake                EnvShake
 	pause                   int32
 	pausetime               int32