Merge pull request #3608 from ikemen-engine/fix4

feat: RemapMovelist sctrl; fix: WinCount regression

Author: K4thos

external/script/menu.lua

@@ -763,8 +763,11 @@ function menu.f_commandlistParse()
 			end
 			if player(pn) and aiLevel() == 0 then
 				local ref = getSelectNo()
-				if start.f_getCharData(ref).commandlist == nil then
-					local movelist = getCharMovelist(ref)
+				local movelist = getMovelist()
+				if sel.movelistText ~= movelist then
+					sel.movelistText = movelist
+					sel.commandlist = nil
+					sel.movelistLine = 1
 					if movelist ~= '' then
 						-- Replace glyph tokens with <token> for later lookup in motif.glyphs.
 						for k, v in main.f_sortKeys(motif.glyphs, function(t, a, b) return string.len(a) > string.len(b) end) do
@@ -801,14 +804,14 @@ function menu.f_commandlistParse()
 							table.insert(t, subt)
 						end
 						t[#t] = nil --blank line produced by regexp matching
-						start.f_getCharData(ref).commandlist = t
+						sel.commandlist = t
 					end
 				end
 				table.insert(menu.t_movelists, {
 					pn = pn,
 					name = start.f_getCharData(ref).name,
 					tbl = sel,
-					commandlist = start.f_getCharData(ref).commandlist,
+					commandlist = sel.commandlist,
 				})
 			end
 		end

external/script/start.lua

@@ -1763,8 +1763,10 @@ function start.f_selectReset(hardReset, preserveProgress)
 	if not preserveProgress then
 		resetGameStats()
 		setMatchNo(1)
-		setWinCount(1, 0)
-		setWinCount(2, 0)
+		if main.elimination then
+			setWinCount(1, 0)
+			setWinCount(2, 0)
+		end
 		setConsecutiveWins(1, 0)
 		setConsecutiveWins(2, 0)
 	end

src/bytecode.go

@@ -12202,6 +12202,34 @@ func (sc redLifeSet) Run(c *Char, _ []int32) bool {
 	return false
 }
 
+type remapMovelist StateControllerBase
+
+const (
+	remapMovelist_value byte = iota
+	remapMovelist_redirectid
+)
+
+func (sc remapMovelist) Run(c *Char, _ []int32) bool {
+	crun := getRedirectedChar(c, StateControllerBase(sc), remapMovelist_redirectid, "RemapMovelist")
+	if crun == nil {
+		return false
+	}
+
+	var v int32
+	StateControllerBase(sc).run(c, func(paramID byte, exp []BytecodeExp) bool {
+		switch paramID {
+		case remapMovelist_value:
+			v = exp[0].evalI(c)
+		}
+		return true
+	})
+	if v < 0 {
+		v = 0
+	}
+	crun.movelist = v
+	return false
+}
+
 type remapSprite StateControllerBase
 
 const (

src/char.go

@@ -2949,6 +2949,61 @@ type PalInfo struct {
 	selectable bool
 }
 
+func readMovelistFiles(is IniSection) map[int]string {
+	ret := make(map[int]string)
+	if v := decodeShiftJIS(is["movelist"]); v != "" {
+		ret[0] = v
+	}
+	if v := decodeShiftJIS(is["movelist0"]); v != "" {
+		if _, ok := ret[0]; !ok {
+			ret[0] = v
+		}
+	}
+	for k, v := range is {
+		kl := strings.ToLower(k)
+		if kl == "movelist" || kl == "movelist0" || !strings.HasPrefix(kl, "movelist") {
+			continue
+		}
+		idx := kl[len("movelist"):]
+		if idx == "" || !IsInt(idx) {
+			continue
+		}
+		n := int(Atoi(idx))
+		if n < 0 {
+			continue
+		}
+		if ml := decodeShiftJIS(v); ml != "" {
+			ret[n] = ml
+		}
+	}
+	if len(ret) == 0 {
+		return nil
+	}
+	return ret
+}
+
+func loadMovelistFiles(def string, files map[int]string) map[int]string {
+	if len(files) == 0 {
+		return nil
+	}
+	ret := make(map[int]string, len(files))
+	for idx, file := range files {
+		idx, file := idx, file
+		LoadFile(&file, []string{def, "", "data/"}, "", func(filename string) error {
+			txt, err := LoadText(filename)
+			if err != nil {
+				return err
+			}
+			ret[idx] = txt
+			return nil
+		})
+	}
+	if len(ret) == 0 {
+		return nil
+	}
+	return ret
+}
+
 type CharGlobalInfo struct {
 	def                     string
 	name                    string
@@ -2977,6 +3032,7 @@ type CharGlobalInfo struct {
 	callFuncs               map[string]BytecodeFunction
 	hitPauseToggleFlagCount int32
 	quotes                  [MaxQuotes]string
+	movelists               map[int]string
 	portraitscale           float32
 	constants               map[string]float32
 	remapPreset             map[string]RemapPreset
@@ -3002,6 +3058,7 @@ func newCharGlobalInfo() CharGlobalInfo {
 		palInfo:       make(map[int]PalInfo, sys.cfg.Config.PaletteMax),
 		fnt:           make(map[int]*Fnt),
 		quotes:        [MaxQuotes]string{},
+		movelists:     make(map[int]string),
 		remapPreset:   make(map[string]RemapPreset),
 		portraitscale: 1,
 	}
@@ -3232,6 +3289,7 @@ type Char struct {
 	ownpal               bool
 	ownProjectile        bool
 	winquote             int32
+	movelist             int32
 	memberNo             int
 	selectNo             int
 	inheritJuggle        int32
@@ -3329,6 +3387,7 @@ func (c *Char) init(n int, idx int) {
 		facing:        1,
 		minus:         3,
 		winquote:      -1,
+		movelist:      0,
 		clsnBaseScale: [2]float32{1, 1},
 		clsnScaleMul:  [2]float32{1, 1},
 		clsnScale:     [2]float32{1, 1},
@@ -3454,6 +3513,7 @@ 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 {
@@ -3546,6 +3606,7 @@ func (c *Char) resetModifyPlayer() {
 	c.powerMax = gi.data.power
 	c.dizzyPointsMax = gi.data.dizzypoints
 	c.guardPointsMax = gi.data.guardpoints
+	c.movelist = 0
 	// c.teamside already assigned by loadCharacter()
 }
 
@@ -3578,6 +3639,7 @@ func (c *Char) load(def string) error {
 
 	lines, lnidx := SplitAndTrim(str, "\n"), 0
 	cns, sprite, anim, sound := "", "", "", ""
+	var movelistFiles map[int]string
 	info, files, keymap, mapArray := true, true, true, true
 	lanInfo, lanFiles, lanKeymap, lanMapArray := true, true, true, true
 	shaders := true
@@ -3676,6 +3738,7 @@ func (c *Char) load(def string) error {
 				sprite = decodeShiftJIS(is["sprite"])
 				anim = decodeShiftJIS(is["anim"])
 				sound = decodeShiftJIS(is["sound"])
+				movelistFiles = readMovelistFiles(is)
 				for i := 0; i < sys.cfg.Config.PaletteMax; i++ {
 					pal := gi.palInfo[i]
 					pal.filename = decodeShiftJIS(is[fmt.Sprintf("pal%v", i+1)])
@@ -3764,6 +3827,9 @@ func (c *Char) load(def string) error {
 	// Reset maps in order to upload the freshly loaded defaults
 	c.mapReset(nil)
 
+	// Load movelists from the loaded character DEF
+	gi.movelists = loadMovelistFiles(def, movelistFiles)
+
 	// Set constants to defaults
 	c.initConstants()
 

src/compiler.go

@@ -170,6 +170,7 @@ func newStateCompiler() *StateCompiler {
 		"printtoconsole":       c.printToConsole,
 		"redlifeadd":           c.redLifeAdd,
 		"redlifeset":           c.redLifeSet,
+		"remapmovelist":        c.remapMovelist,
 		"remapsprite":          c.remapSprite,
 		"rootmapadd":           c.rootMapAdd,
 		"rootmapset":           c.rootMapSet,

src/compiler_functions.go

@@ -5397,6 +5397,21 @@ func (c *StateCompiler) redLifeSet(is IniSection, sc *StateControllerBase) (Stat
 	return *ret, err
 }
 
+func (c *StateCompiler) remapMovelist(is IniSection, sc *StateControllerBase) (StateController, error) {
+	ret, err := (*remapMovelist)(sc), c.stateSec(is, func() error {
+		if err := c.paramValue(is, sc, "redirectid",
+			remapMovelist_redirectid, VT_Int, 1, false); err != nil {
+			return err
+		}
+		if err := c.paramValue(is, sc, "value",
+			remapMovelist_value, VT_Int, 1, false); err != nil {
+			return err
+		}
+		return nil
+	})
+	return *ret, err
+}
+
 func (c *StateCompiler) remapSprite(is IniSection, sc *StateControllerBase) (StateController, error) {
 	ret, err := (*remapSprite)(sc), c.stateSec(is, func() error {
 		if err := c.paramValue(is, sc, "redirectid",

src/script.go

@@ -3330,16 +3330,6 @@ func systemScriptInit(l *lua.LState) {
 		l.Push(tbl)
 		return 1
 	})
-	luaRegister(l, "getCharMovelist", func(*lua.LState) int {
-		/*Get the movelist file path for a character slot.
-		@function getCharMovelist
-		@tparam int charRef 0-based character index in the select list.
-		@treturn string movelist Path or identifier of the movelist file.
-		function getCharMovelist(charRef) end*/
-		c := sys.sel.GetChar(int(numArg(l, 1)))
-		l.Push(lua.LString(c.movelist))
-		return 1
-	})
 	luaRegister(l, "getCharName", func(*lua.LState) int {
 		/*Get the display name of a character slot.
 		@function getCharName
@@ -3850,6 +3840,26 @@ func systemScriptInit(l *lua.LState) {
 		l.Push(lua.LNumber(ti))
 		return 1
 	})
+	luaRegister(l, "getMovelist", func(*lua.LState) int {
+		/*[redirectable] Get the character's movelist text.
+		@function getMovelist
+		@treturn string movelist Movelist text.
+		function getCharMovelist() end*/
+		idx := int(sys.debugWC.movelist)
+		if idx < 0 {
+			idx = 0
+		}
+		if ml, ok := sys.debugWC.gi().movelists[idx]; ok {
+			l.Push(lua.LString(ml))
+			return 1
+		}
+		if ml, ok := sys.debugWC.gi().movelists[0]; ok {
+			l.Push(lua.LString(ml))
+			return 1
+		}
+		l.Push(lua.LString(""))
+		return 1
+	})
 	luaRegister(l, "getRandom", func(l *lua.LState) int {
 		/*Return a 32-bit random number, updating the global seed.
 		@function getRandom

src/system.go

@@ -4189,7 +4189,6 @@ type SelectChar struct {
 	intro         string
 	ending        string
 	arcadepath    string
-	movelist      string
 	pal           []int32
 	pal_defaults  []int32
 	pal_keymap    []int32
@@ -4439,7 +4438,7 @@ func (s *Select) AddChar(def string) *SelectChar {
 		return useDummy("DEF read error: " + err.Error())
 	}
 
-	var cns_orig, sprite_orig, anim_orig, movelist_orig string
+	var cns_orig, sprite_orig, anim_orig string
 	var fnt_orig [10][2]string
 
 	lines, lnidx := SplitAndTrim(charDefContent, "\n"), 0
@@ -4499,7 +4498,6 @@ func (s *Select) AddChar(def string) *SelectChar {
 					}
 				}
 
-				movelist_orig = decodeShiftJIS(isec["movelist"])
 				for fIdx := range fnt_orig {
 					fnt_orig[fIdx][0] = isec[fmt.Sprintf("font%v", fIdx)]
 					fnt_orig[fIdx][1] = isec[fmt.Sprintf("fnt_height%v", fIdx)]
@@ -4651,15 +4649,6 @@ func (s *Select) AddChar(def string) *SelectChar {
 			sc.anims.addSprite(sc.sff, k[0], k[1])
 		}
 	}
-	// read movelist
-	if len(movelist_orig) > 0 {
-		// Movelist is text, can be loaded now
-		LoadFile(&movelist_orig, []string{sc.def, "", "data/"}, "", func(filename string) error {
-			sc.movelist, _ = LoadText(filename)
-			return nil
-		})
-	}
-
 	return sc
 }