Merge branch 'master' of github.com:moecube/ygopro-core

.github/workflows/build.yml

@@ -18,17 +18,16 @@ jobs:
 
     - name: Install lua
       run: |
-        bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.lua.org/ftp/lua-5.4.7.tar.gz ; exit 0"
-        tar xzf lua-5.4.7.tar.gz
+        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: |
-        bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip ; exit 0"
-        7z x premake-5.0.0-beta2-windows.zip
-        move premake\lua.lua lua\premake5.lua
-        move premake\dll.lua dll.lua
-        .\premake5.exe vs2022 --file=dll.lua
+        7z x temp/premake-5.0.0-beta2-windows.zip -opremake-5
+        move premake/lua.lua lua/premake5.lua
+        move premake/dll.lua dll.lua
+        ./premake-5/premake5.exe vs2022 --file=dll.lua
 
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2

.gitignore

-.vscode/
+/.vscode/
+/build/
+/lua/
+/temp/
+/premake-5/
 /premake5.exe
-/build
-/lua

operations.cpp

@@ -2961,6 +2961,7 @@ int32_t field::special_summon_rule(uint16_t step, uint8_t sumplayer, card* targe
 		}
 		target->set_status(STATUS_SUMMONING, FALSE);
 		target->set_status(STATUS_PROC_COMPLETE | STATUS_SPSUMMON_TURN, TRUE);
+		target->set_status(STATUS_CANNOT_CHANGE_FORM, TRUE);
 		target->enable_field_effect(true);
 		if(target->is_status(STATUS_DISABLED))
 			target->reset(RESET_DISABLE, RESET_EVENT);
@@ -4710,10 +4711,8 @@ int32_t field::move_to_field(uint16_t step, card* target, uint32_t enable, uint3
 			target->clear_relate_effect();
 		if(ret == RETURN_TEMP_REMOVE_TO_FIELD) {
 			target->current.reason &= ~REASON_TEMPORARY;
-			target->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
 		}
-		if(ret == 0 && location != target->current.location
-			|| ret == RETURN_TEMP_REMOVE_TO_FIELD && target->turnid != infos.turn_id) {
+		if(ret == 0 && location != target->current.location || ret == RETURN_TEMP_REMOVE_TO_FIELD) {
 			target->set_status(STATUS_SUMMON_TURN, FALSE);
 			target->set_status(STATUS_FLIP_SUMMON_TURN, FALSE);
 			target->set_status(STATUS_SPSUMMON_TURN, FALSE);