コミット: 5cc1500ce3e29246a309400d79ba09fbea43cd91 - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: 5cc1500ce3e29246a309400d79ba09fbea43cd91 (tree)
• 日時: 2019-06-16 10:11:54
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

Stagefrontedge、Stagebackedgeを追加
Projectileにprojangleを追加
targetにbindしたフレーム中にDestroyselfをするとbind先を5050に戻す仕様を無効にした
BindToTargetのlocalcoord対応を修正
Projectileに足場を作るためのplatform機能を追加。まだ作りかけなので使用非推奨

変更サマリ

• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go

差分

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -361,6 +361,9 @@ const (
 	OC_ex_drawpalno
 	OC_ex_maparray
 	OC_ex_selfstatenoexist
+	OC_ex_groundangle
+	OC_ex_stagefrontedge
+	OC_ex_stagebackedge
 	OC_ex_gethitvar_animtype
 	OC_ex_gethitvar_airtype
 	OC_ex_gethitvar_groundtype
@@ -1082,7 +1085,7 @@ func (be BytecodeExp) run(c *Char) BytecodeValue {
 		case OC_pos_x:
 			sys.bcStack.PushF((c.pos[0]*c.localscl/oc.localscl - sys.cam.Pos[0]/oc.localscl))
 		case OC_pos_y:
-			sys.bcStack.PushF(c.pos[1] * c.localscl / oc.localscl)
+			sys.bcStack.PushF((c.pos[1] - c.platformPosY) * c.localscl / oc.localscl)
 		case OC_power:
 			sys.bcStack.PushI(c.getPower())
 		case OC_powermax:
@@ -1564,6 +1567,12 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 		*i += 4
 	case OC_ex_selfstatenoexist:
 		*sys.bcStack.Top() = c.selfStatenoExist(*sys.bcStack.Top())
+	case OC_ex_groundangle:
+		sys.bcStack.PushF(c.groundAngle)
+	case OC_ex_stagefrontedge:
+		sys.bcStack.PushF(c.stageFrontEdge())
+	case OC_ex_stagebackedge:
+		sys.bcStack.PushF(c.stageBackEdge())
 	default:
 		sys.errLog.Printf("%v\n", be[*i-1])
 		c.panic()
@@ -2820,7 +2829,7 @@ func (sc posSet) Run(c *Char, _ []int32) bool {
 		case posSet_x:
 			crun.setX(sys.cam.Pos[0]/crun.localscl + exp[0].evalF(c)*lclscround)
 		case posSet_y:
-			crun.setY(exp[0].evalF(c) * lclscround)
+			crun.setY(exp[0].evalF(c)*lclscround + crun.platformPosY)
 		case posSet_z:
 			exp[0].run(c)
 		case posSet_redirectid:
@@ -3593,6 +3602,7 @@ const (
 	projectile_remvelocity
 	projectile_accel
 	projectile_projscale
+	projectile_projangle
 	projectile_offset
 	projectile_projsprpriority
 	projectile_projstagebound
@@ -3603,6 +3613,11 @@ const (
 	projectile_pausemovetime
 	projectile_ownpal
 	projectile_remappal
+	projectile_platform
+	projectile_platformwidth
+	projectile_platformheight
+	projectile_platformfence
+	projectile_platformangle
 	projectile_redirectid
 )
 
@@ -3691,6 +3706,8 @@ func (sc projectile) Run(c *Char, _ []int32) bool {
 			if len(exp) > 1 {
 				p.scale[1] = exp[1].evalF(c)
 			}
+		case projectile_projangle:
+			p.angle = exp[0].evalF(c)
 		case projectile_offset:
 			x = exp[0].evalF(c) * lclscround
 			if len(exp) > 1 {
@@ -3720,6 +3737,22 @@ func (sc projectile) Run(c *Char, _ []int32) bool {
 			if len(exp) > 1 {
 				rp[1] = exp[1].evalI(c)
 			}
+		case projectile_platform:
+			p.platform = exp[0].evalB(c)
+		case projectile_platformwidth:
+			p.platformWidth[0] = exp[0].evalF(c) * lclscround
+			if len(exp) > 1 {
+				p.platformWidth[1] = exp[1].evalF(c) * lclscround
+			}
+		case projectile_platformheight:
+			p.platformHeight[0] = exp[0].evalF(c) * lclscround
+			if len(exp) > 1 {
+				p.platformHeight[1] = exp[1].evalF(c) * lclscround
+			}
+		case projectile_platformangle:
+			p.platformAngle = exp[0].evalF(c)
+		case projectile_platformfence:
+			p.platformFence = exp[0].evalB(c)
 		default:
 			if !hitDef(sc).runSub(c, &p.hitdef, id, exp) {
 				afterImage(sc).runSub(c, &p.aimg, id, exp)

--- a/src/char.go
+++ b/src/char.go
@@ -1077,6 +1077,7 @@ type Projectile struct {
 	remanim         int32
 	cancelanim      int32
 	scale           [2]float32
+	angle           float32
 	clsnScale       [2]float32
 	remove          bool
 	removetime      int32
@@ -1106,6 +1107,11 @@ type Projectile struct {
 	palfx           *PalFX
 	localscl        float32
 	parentAttackmul float32
+	platform        bool
+	platformWidth   [2]float32
+	platformHeight  [2]float32
+	platformAngle   float32
+	platformFence   bool
 }
 
 func newProjectile() *Projectile {
@@ -1118,7 +1124,7 @@ func (p *Projectile) clear() {
 		scale: [...]float32{1, 1}, clsnScale: [...]float32{1, 1}, remove: true, localscl: 1,
 		removetime: -1, velmul: [...]float32{1, 1}, hits: 1, priority: 1,
 		prioritypoint: 1, sprpriority: 3, edgebound: 40, stagebound: 40,
-		heightbound: [...]int32{-240, 1}, facing: 1, aimg: *newAfterImage()}
+		heightbound: [...]int32{-240, 1}, facing: 1, aimg: *newAfterImage(), platformFence: true}
 	p.hitdef.clear()
 }
 func (p *Projectile) setPos(pos [2]float32) {
@@ -1321,7 +1327,7 @@ func (p *Projectile) cueDraw(oldVer bool, playerNo int) {
 	if p.ani != nil {
 		sd := &SprData{p.ani, p.palfx, [...]float32{p.pos[0] * p.localscl, p.pos[1] * p.localscl},
 			[...]float32{p.facing * p.scale[0] * p.localscl, p.scale[1] * p.localscl}, [2]int32{-1},
-			p.sprpriority, 0, 0, 0, [...]float32{1, 1}, false, playerNo == sys.superplayer,
+			p.sprpriority, p.facing * p.angle, 0, 0, [...]float32{1, 1}, false, playerNo == sys.superplayer,
 			sys.cgi[playerNo].ver[0] != 1, p.facing}
 		p.aimg.recAndCue(sd, sys.tickNextFrame() && notpause)
 		sys.sprites.add(sd,
@@ -1502,6 +1508,8 @@ type Char struct {
 	cpucmd        int32
 	attackDist    float32
 	offset        [2]float32
+	platformPosY  float32
+	groundAngle   float32
 	stchtmp       bool
 	inguarddist   bool
 	pushed        bool
@@ -2581,6 +2589,18 @@ func (c *Char) selfStatenoExist(stateno BytecodeValue) BytecodeValue {
 	_, ok := c.gi().states[stateno.ToI()]
 	return BytecodeBool(ok)
 }
+func (c *Char) stageFrontEdge() float32 {
+	if c.facing > 0 {
+		return sys.cam.XMax/c.localscl - c.pos[0]
+	}
+	return c.pos[0] - sys.cam.XMin/c.localscl
+}
+func (c *Char) stageBackEdge() float32 {
+	if c.facing < 0 {
+		return sys.cam.XMax/c.localscl - c.pos[0]
+	}
+	return c.pos[0] - sys.cam.XMin/c.localscl
+}
 func (c *Char) time() int32 {
 	return c.ss.time
 }
@@ -3425,17 +3445,17 @@ func (c *Char) bindToTarget(tar []int32, time int32, x, y float32, hmf HMF) {
 		if t := sys.playerID(tar[0]); t != nil {
 			switch hmf {
 			case HMF_M:
-				x += float32(t.size.mid.pos[0])
-				y += float32(t.size.mid.pos[1])
+				x += t.size.mid.pos[0] * (320 / float32(t.localcoord)) / c.localscl
+				y += t.size.mid.pos[1] * (320 / float32(t.localcoord)) / c.localscl
 			case HMF_H:
-				x += float32(t.size.head.pos[0])
-				y += float32(t.size.head.pos[1])
+				x += t.size.head.pos[0] * (320 / float32(t.localcoord)) / c.localscl
+				y += t.size.head.pos[1] * (320 / float32(t.localcoord)) / c.localscl
 			}
 			if !math.IsNaN(float64(x)) {
-				c.setX(t.pos[0] + t.facing*x)
+				c.setX(t.pos[0]*t.localscl/c.localscl + t.facing*x)
 			}
 			if !math.IsNaN(float64(y)) {
-				c.setY(t.pos[1] + y)
+				c.setY(t.pos[1]*t.localscl/c.localscl + y)
 			}
 			c.targetBind(tar[:1], time, c.facing*c.distX(t, c), (t.pos[1]*t.localscl/c.localscl)-(c.pos[1]*c.localscl/t.localscl))
 		}
@@ -3946,7 +3966,7 @@ func (c *Char) bind() {
 	if bt := sys.playerID(c.bindToId); bt != nil {
 		if bt.hasTarget(c.id) {
 			if bt.sf(CSF_destroy) {
-				c.selfState(5050, -1, -1, -1)
+				//c.selfState(5050, -1, -1, -1)
 				c.setBindTime(0)
 				return
 			}
@@ -3998,6 +4018,18 @@ func (c *Char) xScreenBound() {
 	x = MaxF(sys.stage.leftbound/c.localscl, MinF(sys.stage.rightbound/c.localscl, x))
 	c.setPosX(x)
 }
+func (c *Char) xPlatformBound(pxmin, pxmax float32) {
+	x := c.pos[0]
+	if c.ss.stateType != ST_A {
+		min, max := c.getEdge(c.edge[0], true), -c.getEdge(c.edge[1], true)
+		if c.facing > 0 {
+			min, max = -max, -min
+		}
+		x = MaxF(min+pxmin/c.localscl, MinF(max+pxmax/c.localscl, x))
+	}
+	c.setX(x)
+	c.xScreenBound()
+}
 func (c *Char) gethitBindClear() {
 	if c.isBound() {
 		c.setBindTime(0)
@@ -4338,7 +4370,7 @@ func (c *Char) action() {
 			}
 			for {
 				c.posUpdate()
-				if c.ss.physics != ST_A || c.vel[1] <= 0 || c.pos[1] < 0 ||
+				if c.ss.physics != ST_A || c.vel[1] <= 0 || (c.pos[1]-c.platformPosY) < 0 ||
 					c.ss.no == 105 {
 					break
 				}
@@ -4432,6 +4464,8 @@ func (c *Char) update(cvmin, cvmax,
 			c.scf(SCF_ko) && c.scf(SCF_over) {
 			c.exitTarget(true)
 		}
+		c.platformPosY = 0
+		c.groundAngle = 0
 		c.atktmp = int8(Btoi((c.ss.moveType != MT_I ||
 			c.hitdef.reversal_attr > 0) && !c.hitPause()))
 		c.hoIdx = -1
@@ -5320,7 +5354,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 	}
 	if proj {
 		for i, pr := range sys.projs {
-			if i == getter.playerNo && getter.helperIndex == 0 || len(sys.projs[i]) == 0 {
+			if len(sys.projs[i]) == 0 {
 				continue
 			}
 			c := sys.chars[i][0]
@@ -5328,14 +5362,47 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 			c.atktmp = -1
 			for j := range pr {
 				p := &pr[j]
-				if p.id < 0 || p.hits < 0 || p.hitdef.affectteam != 0 &&
+				if (i == getter.playerNo && getter.helperIndex == 0 && p.platform == false) ||
+					p.id < 0 || p.hits < 0 || p.hitdef.affectteam != 0 &&
 					(getter.teamside != p.hitdef.teamside-1) != (p.hitdef.affectteam > 0) {
 					continue
 				}
-				if dist := (getter.pos[0]*getter.localscl - p.pos[0]*p.localscl) * p.facing; dist >= 0 &&
-					dist <= float32(c.size.proj.attack.dist)*c.localscl {
+				dist := (getter.pos[0]*getter.localscl - (p.pos[0])*p.localscl) * p.facing
+				if p.platform == false &&
+					dist >= 0 && dist <= float32(c.size.proj.attack.dist)*c.localscl {
 					getter.inguarddist = true
 				}
+				if p.platform == true {
+					//Platformの足場上空判定
+					if getter.pos[1]*getter.localscl-getter.vel[1]*getter.localscl <= (p.pos[1]+p.platformHeight[1])*p.localscl &&
+						getter.platformPosY*getter.localscl >= (p.pos[1]+p.platformHeight[0])*p.localscl {
+						angleSinValue := float32(math.Sin(float64(p.platformAngle) / 180 * math.Pi))
+						angleCosValue := float32(math.Cos(float64(p.platformAngle) / 180 * math.Pi))
+						oldDist := (getter.oldPos[0]*getter.localscl - (p.pos[0])*p.localscl) * p.facing
+						onPlatform := func(protrude bool) {
+							getter.platformPosY = ((p.pos[1]+p.platformHeight[0]+p.velocity[1])*p.localscl - angleSinValue*(oldDist/angleCosValue)) / getter.localscl
+							getter.groundAngle = p.platformAngle
+							//足場に乗っている状態
+							if getter.ss.stateType != ST_A {
+								getter.pos[0] += p.velocity[0] * p.facing * p.localscl / getter.localscl
+								getter.pos[1] += p.velocity[1] * p.localscl / getter.localscl
+								if protrude {
+									if p.facing > 0 {
+										getter.xPlatformBound((p.pos[0]+p.velocity[0]*2*p.facing+p.platformWidth[0]*angleCosValue*p.facing)*p.localscl, (p.pos[0]-p.velocity[0]*2*p.facing+p.platformWidth[1]*angleCosValue*p.facing)*p.localscl)
+									} else {
+										getter.xPlatformBound((p.pos[0]-p.velocity[0]*2*p.facing+p.platformWidth[1]*angleCosValue*p.facing)*p.localscl, (p.pos[0]+p.velocity[0]*2*p.facing+p.platformWidth[0]*angleCosValue*p.facing)*p.localscl)
+									}
+								}
+							}
+						}
+						if dist >= (p.platformWidth[0]*angleCosValue)*p.localscl && dist <= (p.platformWidth[1]*angleCosValue)*p.localscl {
+							onPlatform(false)
+						} else if p.platformFence && oldDist >= (p.platformWidth[0]*angleCosValue)*p.localscl &&
+							oldDist <= (p.platformWidth[1]*angleCosValue)*p.localscl {
+							onPlatform(true)
+						}
+					}
+				}
 				if p.hits == 0 {
 					continue
 				}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -2041,6 +2041,12 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 			return bvNone(), err
 		}
 		out.append(OC_ex_, OC_ex_selfstatenoexist)
+	case "groundangle":
+		out.append(OC_ex_, OC_ex_groundangle)
+	case "stagefrontedge":
+		out.append(OC_ex_, OC_ex_stagefrontedge)
+	case "stagebackedge":
+		out.append(OC_ex_, OC_ex_stagebackedge)
 	case "=", "!=", ">", ">=", "<", "<=", "&", "&&", "^", "^^", "|", "||",
 		"+", "*", "**", "/", "%":
 		if !sys.ignoreMostErrors || len(c.maeOp) > 0 {
@@ -4589,6 +4595,10 @@ func (c *Compiler) projectile(is IniSection, sc *StateControllerBase,
 			projectile_projscale, VT_Float, 2, false); err != nil {
 			return err
 		}
+		if err := c.paramValue(is, sc, "projangle",
+			projectile_projangle, VT_Float, 1, false); err != nil {
+			return err
+		}
 
 		// hitdef部分
 		if err := c.hitDefSub(is, sc); err != nil {
@@ -4638,6 +4648,26 @@ func (c *Compiler) projectile(is IniSection, sc *StateControllerBase,
 		if err := c.afterImageSub(is, sc, "afterimage."); err != nil {
 			return err
 		}
+		if err := c.paramValue(is, sc, "platform",
+			projectile_platform, VT_Bool, 1, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "platformwidth",
+			projectile_platformwidth, VT_Float, 2, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "platformheight",
+			projectile_platformheight, VT_Float, 2, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "platformangle",
+			projectile_platformangle, VT_Float, 1, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "platformfence",
+			projectile_platformfence, VT_Bool, 1, false); err != nil {
+			return err
+		}
 		return nil
 	})
 	return *ret, err