Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY

gframe/duelclient.cpp

@@ -1096,7 +1096,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				pcard->chain_code = code;
 				mainGame->dField.conti_cards.push_back(pcard);
 				mainGame->dField.conti_act = true;
-				pcard->cmdFlag |= COMMAND_OPERATION;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
 				if (pcard->location == LOCATION_GRAVE)
@@ -1226,7 +1225,6 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 				pcard->chain_code = code;
 				mainGame->dField.conti_cards.push_back(pcard);
 				mainGame->dField.conti_act = true;
-				pcard->cmdFlag |= COMMAND_OPERATION;
 			} else {
 				pcard->cmdFlag |= COMMAND_ACTIVATE;
 				if (pcard->location == LOCATION_GRAVE)

ocgcore/operations.cpp

@@ -1524,7 +1524,7 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
 				eset[i]->get_value(target, 0, &retval);
 				int32 new_min_tribute = retval.size() > 0 ? retval[0] : 0;
 				int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
-				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff - retval[2] : retval[2]) : 0xff00ff;
+				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
 				new_zone &= zone;
 				bool unchanged = (new_zone == zone);
 				if(peffect) {
@@ -2074,7 +2074,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
 				eset[i]->get_value(target, 0, &retval);
 				int32 new_min_tribute = retval.size() > 0 ? retval[0] : 0;
 				int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
-				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff - retval[2] : retval[2]) : 0xff00ff;
+				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
 				new_zone &= zone;
 				bool unchanged = (new_zone == zone);
 				if(peffect) {

strings.conf

@@ -880,5 +880,5 @@
 !setname 0x10f 枪管	ヴァレル
 !setname 0x110 眼纳祭神	アイズ・サクリファイス
 !setname 0x111 武装龙	アームド・ドラゴン
-!setname 0x112 灵神	霊神
-!setname 0x113 幻崩	トロイメア
+!setname 0x112 幻崩	トロイメア
+!setname 0x113 灵神	霊神

system.conf

@@ -14,7 +14,7 @@ serverport = 7911
 lasthost = 127.0.0.1
 lastport = 7911
 automonsterpos = 0
-autospellpos = 1
+autospellpos = 0
 randompos = 0
 autochain = 0
 waitchain = 0
@@ -32,8 +32,8 @@ ignore_deck_changes = 0
 enable_sound = 1
 enable_music = 1
 #Volume of sound and music, between 0 and 100
-sound_volume = 50
-music_volume = 50
+sound_volume = 100
+music_volume = 100
 music_mode = 1
 default_ot = 1
 enable_bot_mode = 1