コミット: c43f10a98fee857ae9d7986c82e9add4f680d5cf - ikemen_go (git)

Go で書き直した Ikemen

コミットメタ情報

• リビジョン: c43f10a98fee857ae9d7986c82e9add4f680d5cf (tree)
• 日時: 2019-01-07 23:55:39
• 作者: neatunsou <sisiy4excite@gmai...>
• コミッター: neatunsou

ログメッセージ

HitFallDamageを通るとFall.Damageが初期化するようにした
地上ヒット時にyvelが0でない時はair.hittimeを参照するようにした
HitdefのAnimTypeのBは地上ではHになるようにした
Hitdefに新パラメータteamsideを追加
ステージ側でキャラを一人読み込めるようにした

変更サマリ

• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/input.go
• modified: src/script.go
• modified: src/system.go

差分

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -1121,10 +1121,14 @@ func (be BytecodeExp) run(c *Char) BytecodeValue {
 			sys.bcStack.PushB(c.ss.stateType == StateType(be[i]))
 			i++
 		case OC_teammode:
-			sys.bcStack.PushB(sys.tmode[c.playerNo&1] == TeamMode(be[i]))
+			if c.teamside == 2 {
+				sys.bcStack.PushB(TM_Single == TeamMode(be[i]))
+			} else {
+				sys.bcStack.PushB(sys.tmode[c.playerNo&1] == TeamMode(be[i]))
+			}
 			i++
 		case OC_teamside:
-			sys.bcStack.PushI(int32(c.playerNo)&1 + 1)
+			sys.bcStack.PushI(int32(c.teamside) + 1)
 		case OC_time:
 			sys.bcStack.PushI(c.time())
 		case OC_topedge:
@@ -1450,7 +1454,7 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 	case OC_ex_drawgame:
 		sys.bcStack.PushB(c.drawgame())
 	case OC_ex_ishometeam:
-		sys.bcStack.PushB(c.playerNo&1 == sys.home)
+		sys.bcStack.PushB(c.teamside == sys.home)
 	case OC_ex_lose:
 		sys.bcStack.PushB(c.lose())
 	case OC_ex_loseko:
@@ -3139,6 +3143,7 @@ const (
 	hitDef_air_animtype
 	hitDef_fall_animtype
 	hitDef_affectteam
+	hitDef_teamside
 	hitDef_id
 	hitDef_chainid
 	hitDef_nochainid
@@ -3234,6 +3239,15 @@ func (sc hitDef) runSub(c *Char, hd *HitDef, id byte, exp []BytecodeExp) bool {
 		hd.fall.animtype = Reaction(exp[0].evalI(c))
 	case hitDef_affectteam:
 		hd.affectteam = exp[0].evalI(c)
+	case hitDef_teamside:
+		n := exp[0].evalI(c)
+		if n > 3 {
+			hd.teamside = 3
+		} else if n < 1 {
+			hd.teamside = 1
+		} else {
+			hd.teamside = int(n)
+		}
 	case hitDef_id:
 		hd.id = Max(0, exp[0].evalI(c))
 	case hitDef_chainid:

--- a/src/char.go
+++ b/src/char.go
@@ -428,6 +428,7 @@ type HitDef struct {
 	hitflag                    int32
 	guardflag                  int32
 	affectteam                 int32
+	teamside                   int
 	animtype                   Reaction
 	air_animtype               Reaction
 	priority                   int32
@@ -1235,8 +1236,8 @@ func (p *Projectile) clsn(playerNo int) {
 	}
 	for i := 0; i < playerNo && p.hits >= 0; i++ {
 		for j, pr := range sys.projs[i] {
-			if pr.hits < 0 || pr.id < 0 || pr.hitdef.affectteam != 0 &&
-				(playerNo&1 != i&1) != (pr.hitdef.affectteam > 0) ||
+			if pr.hits < 0 || pr.id < 0 || (pr.hitdef.affectteam != 0 &&
+				(p.hitdef.teamside-1 != pr.hitdef.teamside-1) != (pr.hitdef.affectteam > 0)) ||
 				pr.ani == nil || len(pr.ani.frames) == 0 {
 				continue
 			}
@@ -1457,6 +1458,7 @@ type Char struct {
 	helperIndex     int32
 	parentIndex     int32
 	playerNo        int
+	teamside        int
 	keyctrl         bool
 	player          bool
 	animPN          int
@@ -1579,7 +1581,7 @@ func (c *Char) clear1() {
 }
 func (c *Char) copyParent(p *Char) {
 	c.parentIndex = p.helperIndex
-	c.name, c.key, c.size = p.name+"'s helper", p.key, p.size
+	c.name, c.key, c.size, c.teamside = p.name+"'s helper", p.key, p.size, p.teamside
 	c.life, c.lifeMax, c.power, c.powerMax = p.lifeMax, p.lifeMax, 0, p.powerMax
 	c.clear2()
 }
@@ -2180,7 +2182,7 @@ func (c *Char) partner(n int32) *Char {
 			p += 2
 		}
 	}
-	if len(sys.chars[p]) > 0 {
+	if len(sys.chars[p]) > 0 && sys.chars[p][0].teamside < 2 {
 		return sys.chars[p][0]
 	}
 	return nil
@@ -2189,6 +2191,9 @@ func (c *Char) enemy(n int32) *Char {
 	if n < 0 || n >= c.numEnemy() {
 		return nil
 	}
+	if c.teamside == 3-1 {
+		return sys.chars[n][0]
+	}
 	return sys.chars[n*2+int32(^c.playerNo&1)][0]
 }
 func (c *Char) enemyNear(n int32) *Char {
@@ -2345,7 +2350,7 @@ func (c *Char) leftEdge() float32 {
 	return sys.cam.ScreenPos[0] / c.localscl
 }
 func (c *Char) lose() bool {
-	return sys.winTeam == ^c.playerNo&1
+	return sys.winTeam == ^c.teamside
 }
 func (c *Char) loseKO() bool {
 	return c.lose() && sys.finish == FT_KO
@@ -2381,6 +2386,9 @@ func (c *Char) numEnemy() int32 {
 	if sys.tmode[^c.playerNo&1] != TM_Simul {
 		return 1
 	}
+	if c.teamside == 3-1 {
+		return sys.numSimul[0] + sys.numSimul[1]
+	}
 	return sys.numSimul[^c.playerNo&1]
 }
 func (c *Char) numExplod(eid BytecodeValue) BytecodeValue {
@@ -2408,7 +2416,7 @@ func (c *Char) numHelper(hid BytecodeValue) BytecodeValue {
 	return BytecodeInt(n)
 }
 func (c *Char) numPartner() int32 {
-	if sys.tmode[c.playerNo&1] != TM_Simul {
+	if sys.tmode[c.playerNo&1] != TM_Simul || c.teamside >= 2 {
 		return 0
 	}
 	return sys.numSimul[c.playerNo&1] - 1
@@ -2460,7 +2468,7 @@ func (c *Char) palno() int32 {
 	return c.gi().palno
 }
 func (c *Char) getPower() int32 {
-	if sys.powerShare[c.playerNo&1] {
+	if sys.powerShare[c.playerNo&1] && c.teamside < 2 {
 		return sys.chars[c.playerNo&1][0].power
 	}
 	return sys.chars[c.playerNo][0].power
@@ -2509,6 +2517,9 @@ func (c *Char) rightEdge() float32 {
 	return sys.cam.ScreenPos[0]/c.localscl + c.gameWidth()
 }
 func (c *Char) roundsExisted() int32 {
+	if c.teamside >= 2 {
+		return sys.round - 1
+	}
 	return sys.roundsExisted[c.playerNo&1]
 }
 func (c *Char) roundState() int32 {
@@ -2546,6 +2557,9 @@ func (c *Char) topEdge() float32 {
 	return sys.cam.ScreenPos[1] / c.localscl
 }
 func (c *Char) win() bool {
+	if c.teamside >= 2 {
+		return false
+	}
 	return sys.winTeam == c.playerNo&1
 }
 func (c *Char) winKO() bool {
@@ -2555,6 +2569,9 @@ func (c *Char) winTime() bool {
 	return c.win() && sys.finish == FT_TO
 }
 func (c *Char) winPerfect() bool {
+	if c.teamside >= 2 {
+		return false
+	}
 	return c.win() && sys.winType[c.playerNo&1] >= WT_PN
 }
 func (c *Char) newChannel(ch int32, lowpriority bool) *Sound {
@@ -2979,9 +2996,14 @@ func (c *Char) setPosY(y float32) {
 	c.pos[1] = y
 }
 func (c *Char) posReset() {
-	c.facing = 1 - 2*float32(c.playerNo&1)
-	c.setX((float32(sys.stage.p[c.playerNo&1].startx-sys.cam.startx)*
-		sys.stage.localscl - c.facing*float32(c.playerNo>>1)*P1P3Dist) / c.localscl)
+	if c.teamside >= 2 {
+		c.facing = 1
+		c.setX(0)
+	} else {
+		c.facing = 1 - 2*float32(c.playerNo&1)
+		c.setX((float32(sys.stage.p[c.playerNo&1].startx-sys.cam.startx)*
+			sys.stage.localscl - c.facing*float32(c.playerNo>>1)*P1P3Dist) / c.localscl)
+	}
 	c.setY(0)
 	c.setXV(0)
 	c.setYV(0)
@@ -3112,6 +3134,9 @@ func (c *Char) setHitdefDefault(hd *HitDef, proj bool) {
 	if hd.air_animtype == RA_Unknown {
 		hd.air_animtype = hd.animtype
 	}
+	if hd.animtype == RA_Back {
+		hd.animtype = RA_Hard
+	}
 	if hd.air_type == HT_Unknown {
 		if hd.ground_type == HT_Trip {
 			hd.air_type = HT_High
@@ -3143,6 +3168,9 @@ func (c *Char) setHitdefDefault(hd *HitDef, proj bool) {
 	if !math.IsNaN(float64(hd.snap[1])) {
 		hd.maxdist[1], hd.mindist[1] = hd.snap[1], hd.snap[1]
 	}
+	if hd.teamside == 0 {
+		hd.teamside = c.teamside + 1
+	}
 	hd.playerNo = c.ss.sb.playerNo
 }
 func (c *Char) setFEdge(fe float32) {
@@ -3479,7 +3507,7 @@ func (c *Char) lifeAdd(add float64, kill, absolute bool) {
 }
 func (c *Char) lifeSet(life int32) {
 	if c.life = Max(0, Min(c.lifeMax, life)); c.life == 0 {
-		if c.player {
+		if c.player && c.teamside < 2 {
 			if c.alive() && c.helperIndex == 0 {
 				if c.ss.moveType != MT_H {
 					if c.playerNo == c.ss.sb.playerNo {
@@ -3514,14 +3542,14 @@ func (c *Char) setPower(pow int32) {
 	}
 }
 func (c *Char) powerAdd(add int32) {
-	if sys.powerShare[c.playerNo&1] {
+	if sys.powerShare[c.playerNo&1] && c.teamside < 2 {
 		sys.chars[c.playerNo&1][0].setPower(c.getPower() + add)
 	} else {
 		sys.chars[c.playerNo][0].setPower(c.getPower() + add)
 	}
 }
 func (c *Char) powerSet(pow int32) {
-	if sys.powerShare[c.playerNo&1] {
+	if sys.powerShare[c.playerNo&1] && c.teamside < 2 {
 		sys.chars[c.playerNo&1][0].setPower(pow)
 	} else {
 		sys.chars[c.playerNo][0].setPower(pow)
@@ -3684,6 +3712,7 @@ func (c *Char) makeDust(x, y float32) {
 func (c *Char) hitFallDamage() {
 	if c.ss.moveType == MT_H {
 		c.lifeAdd(-float64(c.ghv.fall.damage), c.ghv.fall.kill, false)
+		c.ghv.fall.damage = 0
 	}
 }
 func (c *Char) hitFallVel() {
@@ -4600,7 +4629,7 @@ func (c *Char) cueDraw() {
 		if c.roundState() == 4 {
 			c.exitTarget(false)
 		}
-		if sys.supertime < 0 && c.playerNo&1 != sys.superplayer&1 {
+		if sys.supertime < 0 && c.teamside != sys.superplayer&1 {
 			c.defenceMul *= sys.superp2defmul
 		}
 		c.minus = 2
@@ -4856,7 +4885,6 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 							ghv.fall.yvelocity = 0
 						}
 					} else {
-						ghv.hittime = hd.ground_hittime
 						ghv.ctrltime = hd.ground_hittime
 						ghv.xvel = hd.ground_velocity[0] * c.localscl / getter.localscl
 						ghv.yvel = hd.ground_velocity[1] * c.localscl / getter.localscl
@@ -4864,6 +4892,11 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 						if ghv.fallf && ghv.yvel == 0 {
 							ghv.yvel = -0.001 * c.localscl / getter.localscl //新MUGENだとウィンドウサイズを大きくするとここに入る数値が小さくなるが、再現しないほうがよいと思う。
 						}
+						if ghv.yvel != 0 {
+							ghv.hittime = hd.air_hittime
+						} else {
+							ghv.hittime = hd.ground_hittime
+						}
 					}
 					if ghv.hittime < 0 {
 						ghv.hittime = 0
@@ -5201,7 +5234,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 			for j := range pr {
 				p := &pr[j]
 				if p.id < 0 || p.hits < 0 || p.hitdef.affectteam != 0 &&
-					(getter.playerNo&1 != i&1) != (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 &&
@@ -5212,7 +5245,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 					continue
 				}
 				if getter.atktmp != 0 && (getter.hitdef.affectteam == 0 ||
-					(i&1 != getter.playerNo&1) == (getter.hitdef.affectteam > 0)) &&
+					(p.hitdef.teamside-1 != getter.teamside) == (getter.hitdef.affectteam > 0)) &&
 					getter.hitdef.hitflag&int32(ST_P) != 0 &&
 					getter.projClsnCheck(p, false) {
 					p.hits = -2
@@ -5281,7 +5314,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 		for _, c := range cl.runOrder {
 			contact := 0
 			if c.atktmp != 0 && c.id != getter.id && (c.hitdef.affectteam == 0 ||
-				(getter.playerNo&1 != c.playerNo&1) == (c.hitdef.affectteam > 0)) {
+				(getter.teamside != c.hitdef.teamside-1) == (c.hitdef.affectteam > 0)) {
 				dist := -getter.distX(c, getter) * c.facing
 				if c.ss.moveType == MT_A && dist >= 0 && dist <= c.attackDist {
 					getter.inguarddist = true
@@ -5350,7 +5383,7 @@ func (cl *CharList) clsn(getter *Char, proj bool) {
 					}
 				}
 			}
-			if getter.playerNo&1 != c.playerNo&1 && getter.sf(CSF_playerpush) &&
+			if getter.teamside != c.teamside && getter.sf(CSF_playerpush) &&
 				c.sf(CSF_playerpush) && (getter.ss.stateType == ST_A ||
 				getter.pos[1]*getter.localscl-c.pos[1]*c.localscl < getter.height()*c.localscl) &&
 				(c.ss.stateType == ST_A || c.pos[1]*c.localscl-getter.pos[1]*getter.localscl < c.height()*(320/float32(c.localcoord))) {
@@ -5457,7 +5490,7 @@ func (cl *CharList) enemyNear(c *Char, n int32, p2 bool) *Char {
 		}
 	}
 	for _, e := range cl.runOrder {
-		if e.player && e.playerNo&1 != c.playerNo&1 &&
+		if e.player && e.teamside != c.teamside &&
 			(p2 && !e.scf(SCF_ko_round_middle) || !p2 && e.helperIndex == 0) {
 			add(e, 0)
 		}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -4088,6 +4088,10 @@ func (c *Compiler) hitDefSub(is IniSection,
 	}); err != nil {
 		return err
 	}
+	if err := c.paramValue(is, sc, "teamside",
+		hitDef_teamside, VT_Int, 1, false); err != nil {
+		return err
+	}
 	if err := c.paramValue(is, sc, "id",
 		hitDef_id, VT_Int, 1, false); err != nil {
 		return err
@@ -7211,7 +7215,7 @@ func (c *Compiler) Compile(pn int, def string) (map[int32]StateBytecode,
 		return nil, err
 	}
 	if sys.chars[pn][0].cmd == nil {
-		sys.chars[pn][0].cmd = make([]CommandList, MaxSimul*2)
+		sys.chars[pn][0].cmd = make([]CommandList, MaxSimul*2+MaxAttachedChar)
 		b := NewCommandBuffer()
 		for i := range sys.chars[pn][0].cmd {
 			sys.chars[pn][0].cmd[i] = *NewCommandList(b)

--- a/src/input.go
+++ b/src/input.go
@@ -1011,7 +1011,7 @@ type NetInput struct {
 	st         NetState
 	sendEnd    chan bool
 	recvEnd    chan bool
-	buf        [MaxSimul * 2]NetBuffer
+	buf        [MaxSimul*2 + MaxAttachedChar]NetBuffer
 	locIn      int
 	remIn      int
 	time       int32

--- a/src/script.go
+++ b/src/script.go
@@ -207,7 +207,7 @@ func scriptCommonInit(l *lua.LState) {
 	})
 	luaRegister(l, "setAutoguard", func(l *lua.LState) int {
 		pn := int(numArg(l, 1))
-		if pn < 1 || pn > MaxSimul*2 {
+		if pn < 1 || pn > MaxSimul*2+MaxAttachedChar {
 			l.RaiseError("プレイヤー番号(%v)が不正です。", pn)
 		}
 		sys.autoguard[pn-1] = boolArg(l, 2)
@@ -454,7 +454,7 @@ func systemScriptInit(l *lua.LState) {
 	})
 	luaRegister(l, "setCom", func(*lua.LState) int {
 		pn := int(numArg(l, 1))
-		if pn < 1 || pn > MaxSimul*2 {
+		if pn < 1 || pn > MaxSimul*2+MaxAttachedChar {
 			l.RaiseError("プレイヤー番号(%v)が不正です。", pn)
 		}
 		sys.com[pn-1] = Max(0, int32(numArg(l, 2)))
@@ -1713,7 +1713,7 @@ func triggerScriptInit(l *lua.LState) {
 		return 1
 	})
 	luaRegister(l, "ishometeam", func(*lua.LState) int {
-		l.Push(lua.LBool(sys.debugWC.playerNo&1 == sys.home))
+		l.Push(lua.LBool(sys.debugWC.teamside == sys.home))
 		return 1
 	})
 	luaRegister(l, "leftedge", func(*lua.LState) int {

--- a/src/system.go
+++ b/src/system.go
@@ -19,9 +19,10 @@ import (
 )
 
 const (
-	MaxSimul = 4
-	FPS      = 60
-	P1P3Dist = 25
+	MaxSimul        = 4
+	MaxAttachedChar = 2
+	FPS             = 60
+	P1P3Dist        = 25
 )
 
 var sys = System{
@@ -96,15 +97,15 @@ type System struct {
 	keySatate               map[glfw.Key]bool
 	netInput                *NetInput
 	fileInput               *FileInput
-	aiInput                 [MaxSimul * 2]AiInput
+	aiInput                 [MaxSimul*2 + MaxAttachedChar]AiInput
 	keyConfig               []KeyConfig
 	JoystickConfig          []KeyConfig
-	com                     [MaxSimul * 2]int32
+	com                     [MaxSimul*2 + MaxAttachedChar]int32
 	autolevel               bool
 	home                    int
 	gameTime                int32
 	match                   int32
-	inputRemap              [MaxSimul * 2]int
+	inputRemap              [MaxSimul*2 + MaxAttachedChar]int
 	listenPort              string
 	round                   int32
 	intro                   int32
@@ -115,15 +116,15 @@ type System struct {
 	roundsExisted           [2]int32
 	draws                   int32
 	loader                  Loader
-	chars                   [MaxSimul * 2][]*Char
+	chars                   [MaxSimul*2 + MaxAttachedChar][]*Char
 	charList                CharList
-	cgi                     [MaxSimul * 2]CharGlobalInfo
+	cgi                     [MaxSimul*2 + MaxAttachedChar]CharGlobalInfo
 	tmode                   [2]TeamMode
 	numSimul, numTurns      [2]int32
 	esc                     bool
 	loadMutex               sync.Mutex
 	ignoreMostErrors        bool
-	stringPool              [MaxSimul * 2]StringPool
+	stringPool              [MaxSimul*2 + MaxAttachedChar]StringPool
 	bcStack, bcVarStack     BytecodeStack
 	bcVar                   []BytecodeValue
 	workingChar             *Char
@@ -153,7 +154,7 @@ type System struct {
 	envcol                  [3]int32
 	envcol_time             int32
 	envcol_under            bool
-	clipboardText           [MaxSimul * 2][]string
+	clipboardText           [MaxSimul*2 + MaxAttachedChar][]string
 	stage                   *Stage
 	helperMax               int32
 	nextCharId              int32
@@ -183,10 +184,10 @@ type System struct {
 	finish                  FinishType
 	waitdown                int32
 	shuttertime             int32
-	projs                   [MaxSimul * 2][]Projectile
-	explods                 [MaxSimul * 2][]Explod
-	explDrawlist            [MaxSimul * 2][]int
-	topexplDrawlist         [MaxSimul * 2][]int
+	projs                   [MaxSimul*2 + MaxAttachedChar][]Projectile
+	explods                 [MaxSimul*2 + MaxAttachedChar][]Explod
+	explDrawlist            [MaxSimul*2 + MaxAttachedChar][]int
+	topexplDrawlist         [MaxSimul*2 + MaxAttachedChar][]int
 	changeStateNest         int32
 	sprites                 DrawList
 	topSprites              DrawList
@@ -196,7 +197,7 @@ type System struct {
 	drawc2sp                ClsnRect
 	drawc2mtk               ClsnRect
 	drawwh                  ClsnRect
-	autoguard               [MaxSimul * 2]bool
+	autoguard               [MaxSimul*2 + MaxAttachedChar]bool
 	clsnDraw                bool
 	accel                   float32
 	statusDraw              bool
@@ -910,7 +911,7 @@ func (s *System) action(x, y *float32, scl float32) (leftest, rightest,
 			ko := [...]bool{true, true}
 			for ii := range ko {
 				for i := ii; i < len(s.chars); i += 2 {
-					if len(s.chars[i]) > 0 && s.chars[i][0].alive() {
+					if len(s.chars[i]) > 0 && s.chars[i][0].alive() && s.chars[i][0].teamside < 2 {
 						ko[ii] = false
 						break
 					}
@@ -1679,7 +1680,7 @@ type SelectChar struct {
 	sportrait, lportrait, vsportrait, vportrait            *Sprite
 }
 type SelectStage struct {
-	def, name, zoomout, zoomin, bgmusic, bgmvolume string
+	def, name, zoomout, zoomin, bgmusic, bgmvolume, attachedchardef string
 }
 type Select struct {
 	columns, rows   int
@@ -1869,6 +1870,7 @@ func (s *Select) AddStage(def string) error {
 						ss.name = def
 					}
 				}
+				ss.attachedchardef, ok = is.getString("attachedchar")
 			}
 		case "camera":
 			if camera {
@@ -1993,6 +1995,7 @@ func (l *Loader) loadChar(pn int) int {
 	}
 	p.memberNo = memberNo
 	p.selectNo = sys.sel.selected[pn&1][memberNo][0]
+	p.teamside = p.playerNo & 1
 	sys.chars[pn] = make([]*Char, 1)
 	sys.chars[pn][0] = p
 	if sys.cgi[pn].sff == nil {
@@ -2026,13 +2029,53 @@ func (l *Loader) loadChar(pn int) int {
 	}
 	return 1
 }
+
+func (l *Loader) loadAttachedChar(atcpn int, def string) int {
+	pn := atcpn + MaxSimul*2
+	cdef := def
+	var p *Char
+	if len(sys.chars[pn]) > 0 && cdef == sys.cgi[pn].def {
+		p = sys.chars[pn][0]
+		p.key = -pn
+	} else {
+		p = newChar(pn, 0)
+		sys.cgi[pn].sff = nil
+		if len(sys.chars[pn]) > 0 {
+			p.power = sys.chars[pn][0].power
+		}
+	}
+	p.memberNo = -atcpn
+	p.selectNo = -atcpn
+	p.teamside = 2
+	sys.com[pn] = 8
+	sys.chars[pn] = make([]*Char, 1)
+	sys.chars[pn][0] = p
+	if sys.cgi[pn].sff == nil {
+		if sys.cgi[pn].states, l.err =
+			newCompiler().Compile(p.playerNo, cdef); l.err != nil {
+			sys.chars[pn] = nil
+			return -1
+		}
+		if l.err = p.load(cdef); l.err != nil {
+			sys.chars[pn] = nil
+			return -1
+		}
+	}
+	if sys.roundsExisted[pn&1] == 0 {
+		sys.cgi[pn].palno = 1
+	}
+	return 1
+}
+
 func (l *Loader) loadStage() bool {
 	if sys.round == 1 {
 		var def string
 		if sys.sel.selectedStageNo == 0 {
-			def = sys.sel.stagelist[Rand(0, int32(len(sys.sel.stagelist))-1)].def
+			randomstageno := Rand(0, int32(len(sys.sel.stagelist))-1)
+			def = sys.sel.stagelist[randomstageno].def
 		} else {
 			def = sys.sel.stagelist[sys.sel.selectedStageNo-1].def
+			l.loadAttachedChar(0, sys.sel.stagelist[sys.sel.selectedStageNo-1].attachedchardef)
 		}
 		if sys.stage != nil && sys.stage.def == def {
 			return true