refactor: mugenversion and ikemenversion type and syntax

Example:
trigger1 = P2, IkemenVersion Major = 0
trigger1 = P2, IkemenVersion Minor >= 99
trigger1 = P2, IkemenVersion Patch >= 1

Author: K4thos

data/common1.cns.zss

@@ -718,7 +718,7 @@ if hitOver {
 
 #-------------------------------------------------------------------------------
 [Function IkSys_HitGroundEffect(vely)]
-if mugenVersion < 1.0 {
+if mugenVersion major = 0 {
 	gameMakeAnim{
 		value: 60 + ($vely > 5) + ($vely > 14);
 		pos: 0, 0;
@@ -740,7 +740,7 @@ playSnd{value: F7, ($vely > const240p(5)) + ($vely > const240p(14))}
 [StateDef 5100; type: L; movetype: H; physics: N;]
 
 if time = 0 {
-	if mugenVersion < 1.0 && getHitVar(fall.yVel) = 0 && vel x > 1 {
+	if mugenVersion major = 0 && getHitVar(fall.yVel) = 0 && vel x > 1 {
 		velSet{x: 1}
 	}
 	fallEnvShake{}
@@ -904,7 +904,7 @@ if time = 0 {
 	}
 	posSet{y: 0}
 	palFx{time: 3; add: 128, 128, 128}
-	if mugenVersion >= 1.0 {
+	if mugenVersion major = 1 {
 		explod{
 			anim: F60;
 			postype: none;
@@ -913,7 +913,7 @@ if time = 0 {
 			sprpriority: -10
 		}
 	}
-} else if time = 1 && mugenVersion < 1.0 {
+} else if time = 1 && mugenVersion major = 0 {
 	gameMakeAnim{value: 60; pos: 0, 0; under: 1}
 }
 notHitBy{value: SCA; time: 1}
@@ -930,7 +930,7 @@ if time = 0 {
 	}
 	notHitBy{value: SCA; time: 15}
 } else if time < 4 {
-	if mugenVersion >= 1.0 {
+	if mugenVersion major = 1 {
 		posFreeze{}
 	}
 } else {
@@ -943,7 +943,7 @@ if time = 0 {
 			x: const(velocity.air.gethit.airrecover.add.x);
 			y: const(velocity.air.gethit.airrecover.add.y);
 		}
-		if mugenVersion < 1.0 {
+		if mugenVersion major = 0 {
 			if vel y > 0 {
 				velMul{y: .5}
 			}

data/training.zss

@@ -111,7 +111,7 @@ ignoreHitPause if gameMode = "training" {
 							}
 							if $rcv {
 								# WinMugen characters assert inputs because asserting commands directly may trigger their AI activation codes
-								if mugenVersion < 1.0 {
+								if mugenVersion major = 0 {
 									if gametime % 2 {
 										assertInput{flag: x; flag2: y; flag3: z}
 									} else {

src/bytecode.go

@@ -402,8 +402,11 @@ const (
 	OC_const_displayname
 	OC_const_stagevar_info_author
 	OC_const_stagevar_info_displayname
-	OC_const_stagevar_info_ikemenversion
-	OC_const_stagevar_info_mugenversion
+	OC_const_stagevar_info_ikemenversion_major
+	OC_const_stagevar_info_ikemenversion_minor
+	OC_const_stagevar_info_ikemenversion_patch
+	OC_const_stagevar_info_mugenversion_major
+	OC_const_stagevar_info_mugenversion_minor
 	OC_const_stagevar_info_name
 	OC_const_stagevar_camera_boundleft
 	OC_const_stagevar_camera_boundright
@@ -675,7 +678,9 @@ const (
 	OC_ex_movehitvar_spark_x
 	OC_ex_movehitvar_spark_y
 	OC_ex_movehitvar_uniqhit
-	OC_ex_ikemenversion
+	OC_ex_ikemenversion_major
+	OC_ex_ikemenversion_minor
+	OC_ex_ikemenversion_patch
 	OC_ex_incustomanim
 	OC_ex_incustomstate
 	OC_ex_isassertedchar
@@ -697,7 +702,8 @@ const (
 	OC_ex_lerp
 	OC_ex_memberno
 	OC_ex_movecountered
-	OC_ex_mugenversion
+	OC_ex_mugenversion_major
+	OC_ex_mugenversion_minor
 	OC_ex_pausetime
 	OC_ex_physics
 	OC_ex_playerno
@@ -2746,10 +2752,16 @@ func (be BytecodeExp) run_const(c *Char, i *int, oc *Char) {
 	case OC_const_stagevar_info_displayname:
 		nameStr := be.ReadPoolStringAt(i)
 		sys.bcStack.PushB(sys.stage.displaynameLow == nameStr)
-	case OC_const_stagevar_info_ikemenversion:
-		sys.bcStack.PushF(sys.stage.ikemenverF)
-	case OC_const_stagevar_info_mugenversion:
-		sys.bcStack.PushF(sys.stage.mugenverF)
+	case OC_const_stagevar_info_ikemenversion_major:
+		sys.bcStack.PushI(int32(sys.stage.ikemenver[0]))
+	case OC_const_stagevar_info_ikemenversion_minor:
+		sys.bcStack.PushI(int32(sys.stage.ikemenver[1]))
+	case OC_const_stagevar_info_ikemenversion_patch:
+		sys.bcStack.PushI(int32(sys.stage.ikemenver[2]))
+	case OC_const_stagevar_info_mugenversion_major:
+		sys.bcStack.PushI(int32(sys.stage.mugenver[0]))
+	case OC_const_stagevar_info_mugenversion_minor:
+		sys.bcStack.PushI(int32(sys.stage.mugenver[1]))
 	case OC_const_stagevar_info_name:
 		nameStr := be.ReadPoolStringAt(i)
 		sys.bcStack.PushB(sys.stage.nameLow == nameStr)
@@ -3320,8 +3332,12 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 		*sys.bcStack.Top() = c.helperIndexExist(*sys.bcStack.Top())
 	case OC_ex_hitoverridden:
 		sys.bcStack.PushB(c.hoverIdx >= 0)
-	case OC_ex_ikemenversion:
-		sys.bcStack.PushF(c.gi().ikemenverF)
+	case OC_ex_ikemenversion_major:
+		sys.bcStack.PushI(int32(c.gi().ikemenver[0]))
+	case OC_ex_ikemenversion_minor:
+		sys.bcStack.PushI(int32(c.gi().ikemenver[1]))
+	case OC_ex_ikemenversion_patch:
+		sys.bcStack.PushI(int32(c.gi().ikemenver[2]))
 	case OC_ex_incustomanim:
 		sys.bcStack.PushB(c.animPN != c.playerNo)
 	case OC_ex_incustomstate:
@@ -3438,10 +3454,10 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 		sys.bcStack.PushI(int32(c.memberNo) + 1)
 	case OC_ex_movecountered:
 		sys.bcStack.PushI(c.moveCountered())
-	case OC_ex_mugenversion:
-		sys.bcStack.PushF(c.gi().mugenverF)
-		// Here the version is always checked directly in the character instead of the working state
-		// This is because in a custom state this trigger will be used to know the enemy's version rather than our own
+	case OC_ex_mugenversion_major:
+		sys.bcStack.PushI(int32(c.gi().mugenver[0]))
+	case OC_ex_mugenversion_minor:
+		sys.bcStack.PushI(int32(c.gi().mugenver[1]))
 	case OC_ex_pausetime:
 		sys.bcStack.PushI(c.pauseTimeTrigger())
 	case OC_ex_physics:

src/char.go

@@ -1963,7 +1963,7 @@ func (e *Explod) update() {
 		}
 	}
 
-	oldVer := root.gi().mugenverF < 1.1
+	oldVer := root.gi().mugenver[0] != 1 || root.gi().mugenver[1] != 1
 
 	// Bind explod to parent
 	// In Mugen this only happens if the explod is not paused, hence "act"
@@ -3070,9 +3070,7 @@ type CharGlobalInfo struct {
 	palInfo                 map[int]PalInfo
 	palno                   int32
 	ikemenver               [3]uint16
-	ikemenverF              float32
 	mugenver                [2]uint16
-	mugenverF               float32
 	data                    CharData
 	velocity                CharVelocity
 	movement                CharMovement

src/common.go

@@ -821,8 +821,7 @@ func sliceMove[T any](array []T, srcIndex int, dstIndex int) []T {
 	return append(array[:dstIndex], append([]T{value}, array[dstIndex:]...)...)
 }
 
-// We save an array for precise checking, and a float for triggers
-func ParseIkemenVersion(versionStr string) ([3]uint16, float32) {
+func ParseIkemenVersion(versionStr string) [3]uint16 {
 	var ver [3]uint16
 	parts := SplitAndTrim(versionStr, ".")
 	for i, s := range parts {
@@ -835,28 +834,11 @@ func ParseIkemenVersion(versionStr string) ([3]uint16, float32) {
 			break
 		}
 	}
-
-	// Convert into a float for triggers
-	re := regexp.MustCompile(`[^0-9.]`)
-	cleanStr := re.ReplaceAllString(versionStr, "")
-	// Keep only the first decimal point
-	strParts := strings.Split(cleanStr, ".")
-	if len(strParts) > 1 {
-		cleanStr = strParts[0] + "." + strings.Join(strParts[1:], "")
-	}
-	var verF float32
-	if result, err := strconv.ParseFloat(cleanStr, 32); err == nil {
-		verF = float32(result)
-	}
-
-	return ver, verF
+	return ver
 }
 
-func ParseMugenVersion(versionStr string) ([2]uint16, float32) {
+func ParseMugenVersion(versionStr string) [2]uint16 {
 	var ver [2]uint16
-	var verF float32
-
-	// Parse the string into the array
 	parts := SplitAndTrim(versionStr, ".")
 	for i, s := range parts {
 		if i >= len(ver) {
@@ -865,21 +847,14 @@ func ParseMugenVersion(versionStr string) ([2]uint16, float32) {
 		if v, err := strconv.ParseUint(s, 10, 16); err == nil {
 			ver[i] = uint16(v)
 		} else {
-			ver = [2]uint16{}
-			break
+			return [2]uint16{0, 5}
 		}
 	}
-
-	// Turn the array into the versions we know
-	if ver[0] == 1 && ver[1] == 1 {
-		verF = 1.1
-	} else if ver[0] == 1 && ver[1] == 0 {
-		verF = 1.0
-	} else if ver[0] != 0 {
-		verF = 0.5 // Arbitrary value
+	// Normalize everything except Mugen 1.0 and 1.1 to WinMugen.
+	if ver == [2]uint16{1, 0} || ver == [2]uint16{1, 1} {
+		return ver
 	}
-
-	return ver, verF
+	return [2]uint16{0, 5}
 }
 
 type Error string

src/compiler.go

@@ -2839,7 +2839,6 @@ func (c *CharCompiler) expValue(out *BytecodeExp, in *string,
 			return nil
 		}
 		if err := eqne(hda); err != nil {
-			//if sys.cgi[c.playerNo].ikemenverF > 0 || !sys.ignoreMostErrors {
 			if c.zssMode || !sys.ignoreMostErrors {
 				return bvNone(), err
 			}
@@ -3778,10 +3777,16 @@ func (c *CharCompiler) expValue(out *BytecodeExp, in *string,
 		case "info.displayname":
 			opc = OC_const_stagevar_info_displayname
 			isStr = true
-		case "info.ikemenversion":
-			opc = OC_const_stagevar_info_ikemenversion
-		case "info.mugenversion":
-			opc = OC_const_stagevar_info_mugenversion
+		case "info.ikemenversion.major":
+			opc = OC_const_stagevar_info_ikemenversion_major
+		case "info.ikemenversion.minor":
+			opc = OC_const_stagevar_info_ikemenversion_minor
+		case "info.ikemenversion.patch":
+			opc = OC_const_stagevar_info_ikemenversion_patch
+		case "info.mugenversion.major":
+			opc = OC_const_stagevar_info_mugenversion_major
+		case "info.mugenversion.minor":
+			opc = OC_const_stagevar_info_mugenversion_minor
 		case "info.name":
 			opc = OC_const_stagevar_info_name
 			isStr = true
@@ -4652,7 +4657,17 @@ func (c *CharCompiler) expValue(out *BytecodeExp, in *string,
 	case "hitoverridden":
 		out.append(OC_ex_, OC_ex_hitoverridden)
 	case "ikemenversion":
-		out.append(OC_ex_, OC_ex_ikemenversion)
+		c.token = c.tokenizer(in)
+		switch c.token {
+		case "major":
+			out.append(OC_ex_, OC_ex_ikemenversion_major)
+		case "minor":
+			out.append(OC_ex_, OC_ex_ikemenversion_minor)
+		case "patch":
+			out.append(OC_ex_, OC_ex_ikemenversion_patch)
+		default:
+			return bvNone(), Error("Invalid IkemenVersion argument: " + c.token)
+		}
 	case "incustomanim":
 		out.append(OC_ex_, OC_ex_incustomanim)
 	case "incustomstate":
@@ -5009,7 +5024,15 @@ func (c *CharCompiler) expValue(out *BytecodeExp, in *string,
 			return bvNone(), err
 		}
 	case "mugenversion":
-		out.append(OC_ex_, OC_ex_mugenversion)
+		c.token = c.tokenizer(in)
+		switch c.token {
+		case "major":
+			out.append(OC_ex_, OC_ex_mugenversion_major)
+		case "minor":
+			out.append(OC_ex_, OC_ex_mugenversion_minor)
+		default:
+			return bvNone(), Error("Invalid MugenVersion argument: " + c.token)
+		}
 	case "numplayer":
 		out.append(OC_ex_, OC_ex_numplayer)
 	case "pausetime":
@@ -6308,7 +6331,6 @@ func (c *CharCompiler) paramSpace(is IniSection, sc *StateControllerBase, id byt
 		case "screen":
 			spc = Space_screen
 		default:
-			//if sys.cgi[c.playerNo].ikemenverF > 0 && !sys.ignoreMostErrors {
 			if c.zssMode && !sys.ignoreMostErrors {
 				return Error("Invalid space type: " + data)
 			} else {
@@ -8113,25 +8135,12 @@ func (c *CharCompiler) Compile(pn int, def string, constants map[string]float32)
 			// Read info section for the Mugen/Ikemen version of the character
 			if info {
 				info = false
-				var ok bool
-				var str string
-				// Clear then read MugenVersion
-				sys.cgi[pn].mugenver = [2]uint16{}
-				sys.cgi[pn].mugenverF = 0
-				if str, ok = is["mugenversion"]; ok {
-					sys.cgi[pn].mugenver, sys.cgi[pn].mugenverF = ParseMugenVersion(str)
-				}
-				// Clear then read IkemenVersion
-				sys.cgi[pn].ikemenver = [3]uint16{}
-				sys.cgi[pn].ikemenverF = 0
-				if str, ok = is["ikemenversion"]; ok {
-					sys.cgi[pn].ikemenver, sys.cgi[pn].ikemenverF = ParseIkemenVersion(str)
-				}
+				// Read MugenVersion and IkemenVersion
+				sys.cgi[pn].mugenver = ParseMugenVersion(is["mugenversion"])
+				sys.cgi[pn].ikemenver = ParseIkemenVersion(is["ikemenversion"])
 				// Ikemen characters adopt Mugen 1.1 version as a safeguard
 				if sys.cgi[pn].ikemenver[0] != 0 || sys.cgi[pn].ikemenver[1] != 0 {
-					sys.cgi[pn].mugenver[0] = 1
-					sys.cgi[pn].mugenver[1] = 1
-					sys.cgi[pn].mugenverF = 1.1
+					sys.cgi[pn].mugenver = [2]uint16{1, 1}
 				}
 			}
 		case "files":

src/fightscreen.go

@@ -4595,9 +4595,7 @@ type FightScreen struct {
 	authorLow     string
 	localcoord    [2]int32
 	ikemenver     [3]uint16
-	ikemenverF    float32
 	mugenver      [2]uint16
-	mugenverF     float32
 	offsetX       float32
 	offsetY       float32
 	scale         float32
@@ -4750,14 +4748,8 @@ func loadFightScreen(def string) (*FightScreen, error) {
 			fs.nameLow = strings.ToLower(fs.name)
 			fs.author, _, _ = is.getText("author")
 			fs.authorLow = strings.ToLower(fs.author)
-			// Read MugenVersion
-			if str, ok := is["mugenversion"]; ok {
-				fs.mugenver, fs.mugenverF = ParseMugenVersion(str)
-			}
-			// Read IkemenVersion
-			if str, ok := is["ikemenversion"]; ok {
-				fs.ikemenver, fs.ikemenverF = ParseIkemenVersion(str)
-			}
+			fs.mugenver = ParseMugenVersion(is["mugenversion"])
+			fs.ikemenver = ParseIkemenVersion(is["ikemenversion"])
 			var b bool
 			is.ReadBool("doubleres", &b)
 			if b {