Merge pull request #29 from mycard/develop-8888

Develop 8888

.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

ocgapi.cpp

@@ -201,7 +201,7 @@ extern "C" DECL_DLLEXPORT void new_tag_card(intptr_t pduel, uint32_t code, uint8
 }
 /**
 * @brief Get card information.
-* @param buf uint32_t array
+* @param buf int32_t array
 * @return buffer length in bytes
 */
 extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, uint8_t location, uint8_t sequence, int32_t query_flag, byte* buf, int32_t use_cache) {
@@ -210,7 +210,7 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u
 	duel* ptduel = (duel*)pduel;
 	card* pcard = nullptr;
 	location &= 0x7f;
-	if(location & LOCATION_ONFIELD)
+	if (location == LOCATION_MZONE || location == LOCATION_SZONE)
 		pcard = ptduel->game_field->get_field_card(playerid, location, sequence);
 	else {
 		card_vector* lst = nullptr;
@@ -226,10 +226,9 @@ extern "C" DECL_DLLEXPORT int32_t query_card(intptr_t pduel, uint8_t playerid, u
 			lst = &ptduel->game_field->player[playerid].list_main;
 		else
 			return LEN_FAIL;
-		if(sequence >= (int32_t)lst->size())
-			pcard = nullptr;
-		else
-			pcard = (*lst)[sequence];
+		if (sequence >= (int32_t)lst->size())
+			return LEN_FAIL;
+		pcard = (*lst)[sequence];
 	}
 	if (pcard) {
 		return pcard->get_infos(buf, query_flag, use_cache);

operations.cpp

@@ -4327,10 +4327,8 @@ int32_t field::send_to(uint16_t step, group * targets, effect * reason_effect, u
 			if(nloc == LOCATION_GRAVE)
 				pcard->reset(RESET_TOGRAVE, RESET_EVENT);
 			if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) {
-				if(pcard->current.reason & REASON_TEMPORARY) {
+				if(pcard->current.reason & REASON_TEMPORARY)
 					pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT);
-					pcard->set_status(STATUS_CANNOT_CHANGE_FORM, FALSE);
-				}
 				else
 					pcard->reset(RESET_REMOVE, RESET_EVENT);
 			}
@@ -4711,10 +4709,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);