Merge branch 'master' into server

gframe/replay_mode.cpp

@@ -189,6 +189,7 @@ bool ReplayMode::StartDuel() {
 	mainGame->dInfo.duel_rule = cur_replay.params.duel_flag >> 16;
 	set_player_info(pduel, 0, cur_replay.params.start_lp, cur_replay.params.start_hand, cur_replay.params.draw_count);
 	set_player_info(pduel, 1, cur_replay.params.start_lp, cur_replay.params.start_hand, cur_replay.params.draw_count);
+	preload_script(pduel, "./script/patches/entry.lua");
 	preload_script(pduel, "./script/special.lua");
 	preload_script(pduel, "./script/init.lua");
 	mainGame->dInfo.lp[0] = cur_replay.params.start_lp;

gframe/single_duel.cpp

@@ -617,6 +617,7 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	set_registry_value(pduel, "player_type_1", swapped ? "0" : "1");
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
+	preload_script(pduel, "./script/patches/entry.lua");
 	preload_script(pduel, "./script/special.lua");
 	preload_script(pduel, "./script/init.lua");
 	unsigned int opt = (unsigned int)host_info.duel_rule << 16;

gframe/single_mode.cpp

@@ -61,6 +61,7 @@ int SingleMode::SinglePlayThread() {
 	set_registry_value(pduel, "player_type_1", "1");
 	set_player_info(pduel, 0, start_lp, start_hand, draw_count);
 	set_player_info(pduel, 1, start_lp, start_hand, draw_count);
+	preload_script(pduel, "./script/patches/entry.lua");
 	preload_script(pduel, "./script/special.lua");
 	preload_script(pduel, "./script/init.lua");
 	mainGame->dInfo.lp[0] = start_lp;

gframe/tag_duel.cpp

@@ -593,6 +593,7 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
 	set_registry_value(pduel, "player_type_1", swapped ? "0" : "1");
 	set_player_info(pduel, 0, host_info.start_lp, host_info.start_hand, host_info.draw_count);
 	set_player_info(pduel, 1, host_info.start_lp, host_info.start_hand, host_info.draw_count);
+	preload_script(pduel, "./script/patches/entry.lua");
 	preload_script(pduel, "./script/special.lua");
 	preload_script(pduel, "./script/init.lua");
 	unsigned int opt = (unsigned int)host_info.duel_rule << 16;

ocgcore @ d15a8ef7

-Subproject commit ce8c654094247120ee83ed7f753d19d20539220b
+Subproject commit d15a8ef70c54e3cfdbda2cf82e0164ca79d23f2d

script @ 6b920a4f

-Subproject commit cdd2dcca643c7c48aa253461bb2d5752e01d7a48
+Subproject commit 6b920a4f75575c884139779d83d64eaad9d04301