Merge pull request #3610 from ikemen-engine/fix5

fix: movelist resetting on each round, movelist showing current name and warning msg

Author: K4thos

external/script/menu.lua

@@ -762,7 +762,6 @@ function menu.f_commandlistParse()
 				pn = pn + (member - 1) * 2
 			end
 			if player(pn) and aiLevel() == 0 then
-				local ref = getSelectNo()
 				local movelist = getMovelist()
 				if sel.movelistText ~= movelist then
 					sel.movelistText = movelist
@@ -809,7 +808,7 @@ function menu.f_commandlistParse()
 				end
 				table.insert(menu.t_movelists, {
 					pn = pn,
-					name = start.f_getCharData(ref).name,
+					name = name(),
 					tbl = sel,
 					commandlist = sel.commandlist,
 				})

src/bytecode.go

@@ -11657,8 +11657,9 @@ func (sc changeMovelist) Run(c *Char, _ []int32) bool {
 		}
 		return true
 	})
-	if v < 0 {
-		v = 0
+	if _, ok := crun.gi().movelists[int(v)]; !ok {
+		sys.appendToConsole(c.warn() + fmt.Sprintf("changed to invalid movelist: %d", v))
+		return false
 	}
 	crun.movelist = v
 	return false

src/char.go

@@ -3496,7 +3496,6 @@ func (c *Char) prepareNextRound() {
 	//c.updateSizeBox()
 	c.oldPos, c.interPos = c.pos, c.pos
 	if c.helperIndex == 0 {
-		c.movelist = 0
 		if sys.roundsExisted[c.playerNo&1] > 0 { // TODO: Why do we need this branch?
 			c.palfx.clear()
 		} else {