sync ocgcore & strings

Classes/gframe/duelclient.cpp

@@ -26,6 +26,7 @@ char DuelClient::duel_client_read[0x2000];
 char DuelClient::duel_client_write[0x2000];
 bool DuelClient::is_closing = false;
 int DuelClient::select_hint = 0;
+int DuelClient::select_unselect_hint = 0;
 wchar_t DuelClient::event_string[256];
 mtrandom DuelClient::rnd;
 
@@ -1452,7 +1453,9 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		}
 		std::sort(mainGame->dField.selectable_cards.begin(), mainGame->dField.selectable_cards.end(), ClientCard::client_card_sort);
 		if(select_hint)
-			myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetDesc(select_hint),
+			select_unselect_hint = select_hint;
+		if(select_unselect_hint)
+			myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetDesc(select_unselect_hint),
 			           mainGame->dField.select_min, mainGame->dField.select_max);
 		else myswprintf(textBuffer, L"%ls(%d-%d)", dataManager.GetSysString(560), mainGame->dField.select_min, mainGame->dField.select_max);
 		select_hint = 0;

Classes/gframe/duelclient.h

@@ -30,6 +30,7 @@ private:
 	static char duel_client_write[0x2000];
 	static bool is_closing;
 	static int select_hint;
+	static int select_unselect_hint;
 	static wchar_t event_string[256];
 	static mtrandom rnd;
 public:

Classes/ocgcore/effect.cpp

@@ -594,7 +594,8 @@ void effect::dec_count(uint32 playerid) {
 		return;
 	if(count_limit == 0)
 		return;
-	count_limit -= 1;
+	if(count_code == 0 || is_flag(EFFECT_FLAG_NO_TURN_RESET))
+		count_limit -= 1;
 	if(count_code) {
 		uint32 code = count_code & 0xfffffff;
 		if(code == 1)

Classes/ocgcore/interpreter.cpp

@@ -509,6 +509,7 @@ static const struct luaL_Reg duellib[] = {
 	{ "ReleaseRitualMaterial", scriptlib::duel_release_ritual_material },
 	{ "GetFusionMaterial", scriptlib::duel_get_fusion_material },
 	{ "SetSelectedCard", scriptlib::duel_set_must_select_cards },
+	{ "GrabSelectedCard", scriptlib::duel_grab_must_select_cards },
 	{ "SetTargetCard", scriptlib::duel_set_target_card },
 	{ "ClearTargetCard", scriptlib::duel_clear_target_card },
 	{ "SetTargetPlayer", scriptlib::duel_set_target_player },

Classes/ocgcore/libduel.cpp

@@ -2798,6 +2798,15 @@ int32 scriptlib::duel_set_must_select_cards(lua_State *L) {
 		luaL_error(L, "Parameter %d should be \"Card\" or \"Group\".", 1);
 	return 0;
 }
+int32 scriptlib::duel_grab_must_select_cards(lua_State *L) {
+	duel* pduel = interpreter::get_duel_info(L);
+	group* pgroup = pduel->new_group();
+	if(pduel->game_field->core.must_select_cards.size())
+		pgroup->container.insert(pduel->game_field->core.must_select_cards.begin(), pduel->game_field->core.must_select_cards.end());
+	pduel->game_field->core.must_select_cards.clear();
+	interpreter::group2value(L, pgroup);
+	return 1;
+}
 int32 scriptlib::duel_set_target_card(lua_State *L) {
 	check_action_permission(L);
 	check_param_count(L, 1);

Classes/ocgcore/scriptlib.h

@@ -503,6 +503,7 @@ public:
 	static int32 duel_release_ritual_material(lua_State *L);
 	static int32 duel_get_fusion_material(lua_State *L);
 	static int32 duel_set_must_select_cards(lua_State *L);
+	static int32 duel_grab_must_select_cards(lua_State *L);
 	static int32 duel_set_target_card(lua_State *L);
 	static int32 duel_clear_target_card(lua_State *L);
 	static int32 duel_set_target_player(lua_State *L);

mobile/assets/data/conf/strings.conf

@@ -740,7 +740,7 @@
 !setname 0x82 怒怒怒	ドドド
 !setname 0x83 机关傀儡	ギミック・パペット
 !setname 0x84 燃烧拳击手	BK（バーニングナックラー）
-!setname 0x85 超级防御机器人	SDロボ
+!setname 0x85 超级防卫机器人	SDロボ
 !setname 0x86 光天使
 !setname 0x87 阴影	アンブラル
 !setname 0x88 武神
@@ -818,6 +818,7 @@
 !setname 0xbf 灵使	霊使い
 !setname 0xc0 凭依装着	憑依装着
 !setname 0xc1 PSY骨架	PSYフレーム
+!setname 0x10c1 PSY骨架装备	PSYフレームギア
 !setname 0xc2 动力工具	パワー・ツール
 !setname 0xc3 锋利小鬼	エッジインプ
 !setname 0xc4 神数	セフィラ

mobile/assets_en/data/conf/strings.conf

@@ -811,6 +811,7 @@
 !setname 0xbf Charmer
 !setname 0xc0 Familiar-Possessed
 !setname 0xc1 PSY-Frame
+!setname 0x10c1 PSY-Framegear
 !setname 0xc2 Power Tool
 !setname 0xc3 Edge Imp
 !setname 0xc4 Zefra

mobile/assets_ko/data/conf/strings.conf

@@ -818,6 +818,7 @@
 !setname 0xbf 령사
 !setname 0xc0 빙의장착
 !setname 0xc1 PSY(싸이)프레임
+!setname 0x10c1 PSY(싸이)프레임기어
 !setname 0xc2 파워 툴
 !setname 0xc3 에지임프
 !setname 0xc4 세피라