Merge remote-tracking branch 'upstream/master' into develop

.github/workflows/build.yml

@@ -16,16 +16,24 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install lua
+    - name: Download dependencies
+      run: |
+        bash -c " \
+        curl -Z --retry 5 --connect-timeout 30 --location \
+        --create-dirs --output-dir temp --remote-name-all \
+        https://www.lua.org/ftp/lua-5.4.7.tar.gz \
+        https://github.com/premake/premake-core/releases/download/v5.0.0-beta5/premake-5.0.0-beta5-windows.zip \
+        ; exit 0"
+
+    - name: Lua
       run: |
-        bash -c "curl -Z --retry 5 --connect-timeout 30 --location --create-dirs --output-dir temp --remote-name-all https://www.lua.org/ftp/lua-5.4.7.tar.gz https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip ; exit 0"
         tar -xzf temp/lua-5.4.7.tar.gz
         move lua-5.4.7 lua
 
     - name: Premake
       run: |
         mkdir premake-5
-        tar -C premake-5 -xzf temp/premake-5.0.0-beta2-windows.zip
+        tar -C premake-5 -xzf temp/premake-5.0.0-beta5-windows.zip
         copy premake\lua.lua lua\premake5.lua
         copy premake\dll.lua dll.lua
         .\premake-5\premake5.exe vs2022 --file=dll.lua

card.cpp

@@ -1067,7 +1067,7 @@ uint32_t card::check_xyz_level(card* pcard, uint32_t lv) {
 			return (card_lv & MAX_XYZ_LEVEL) | ((uint32_t)min_count << 12);
 		return 0;
 	}
-	for (auto& peffect: mset) {
+	for (auto& peffect: eset) {
 		pduel->lua->add_param(this, PARAM_TYPE_CARD);
 		pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
 		uint32_t lev = peffect->get_value(2);

premake/dll.lua

@@ -35,7 +35,7 @@ workspace "ocgcoredll"
         startproject "ocgcore"
 
     filter { "configurations:Release", "action:vs*" }
-        flags { "LinkTimeOptimization" }
+        linktimeoptimization "On"
         staticruntime "On"
         disablewarnings { "4334" }