fix

gframe/client_field.cpp

@@ -11,6 +11,7 @@ ClientField::ClientField() {
 	panel = 0;
 	hovered_card = 0;
 	clicked_card = 0;
+	highlighting_card = 0;
 	deck_act = false;
 	grave_act = false;
 	remove_act = false;
@@ -725,7 +726,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 				r->X = 0.0f;
 				r->Z = 0.0f;
 				if (pcard->position & POS_FACEDOWN)
-					r->X = 3.1415926f;
+					r->Y = 3.1415926f;
 				else r->Y = 0.0f;
 			}
 		} else {
@@ -737,7 +738,7 @@ void ClientField::GetCardLocation(ClientCard* pcard, irr::core::vector3df* t, ir
 				r->Z = 3.1415926f / 2.0f;
 				if (pcard->position & POS_FACEDOWN)
 					r->Y = 3.1415926f + 0.001f;
-				else r->Y = 0;
+				else r->Y = 0.0f;
 			} else {
 				r->X = 0.0f;
 				r->Z = 3.1415926f;

gframe/client_field.h

@@ -105,6 +105,7 @@ public:
 	ClientCard* hovered_card;
 	ClientCard* clicked_card;
 	ClientCard* command_card;
+	ClientCard* highlighting_card;
 	int list_command;
 	wchar_t formatBuffer[2048];
 

gframe/duelclient.cpp

@@ -1060,6 +1060,8 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 		if (pcard->code != code)
 			pcard->SetCode(code);
 		BufferIO::ReadInt8(pbuf);
+		pcard->is_highlighting = true;
+		mainGame->dField.highlighting_card = pcard;
 		myswprintf(textBuffer, dataManager.GetSysString(200), dataManager.FormatLocation(l), dataManager.GetName(code));
 		mainGame->gMutex.Lock();
 		mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->textFont, textBuffer);
@@ -1070,6 +1072,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 	case MSG_SELECT_YESNO: {
 		/*int selecting_player = */BufferIO::ReadInt8(pbuf);
 		int desc = BufferIO::ReadInt32(pbuf);
+		mainGame->dField.highlighting_card = 0;
 		mainGame->gMutex.Lock();
 		mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->textFont, (wchar_t*)dataManager.GetDesc(desc));
 		mainGame->PopupElement(mainGame->wQuery);

gframe/event_handler.cpp

@@ -123,6 +123,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				switch(mainGame->dInfo.curMsg) {
 				case MSG_SELECT_YESNO:
 				case MSG_SELECT_EFFECTYN: {
+					if(highlighting_card)
+						highlighting_card->is_highlighting = false;
+					highlighting_card = 0;
 					DuelClient::SetResponseI(1);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
@@ -145,6 +148,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				switch(mainGame->dInfo.curMsg) {
 				case MSG_SELECT_YESNO:
 				case MSG_SELECT_EFFECTYN: {
+					if(highlighting_card)
+						highlighting_card->is_highlighting = false;
+					highlighting_card = 0;
 					DuelClient::SetResponseI(0);
 					mainGame->HideElement(mainGame->wQuery, true);
 					break;
@@ -1189,6 +1195,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 			}
 			case MSG_SELECT_YESNO:
 			case MSG_SELECT_EFFECTYN: {
+				if(highlighting_card)
+					highlighting_card->is_highlighting = false;
+				highlighting_card = 0;
 				DuelClient::SetResponseI(0);
 				mainGame->HideElement(mainGame->wQuery, true);
 				break;

ocgcore/field.cpp

@@ -1782,7 +1782,7 @@ int32 field::is_player_can_remove(uint8 playerid, card * pcard) {
 }
 int32 field::is_chain_negatable(uint8 chaincount, uint8 naga_check) {
 	effect_set eset;
-	if(chaincount < 0 && chaincount > core.current_chain.size())
+	if(chaincount < 0 || chaincount > core.current_chain.size())
 		return FALSE;
 	effect* peffect;
 	if(chaincount == 0)
@@ -1803,7 +1803,7 @@ int32 field::is_chain_negatable(uint8 chaincount, uint8 naga_check) {
 }
 int32 field::is_chain_disablable(uint8 chaincount, uint8 naga_check) {
 	effect_set eset;
-	if(chaincount < 0 && chaincount > core.current_chain.size())
+	if(chaincount < 0 || chaincount > core.current_chain.size())
 		return FALSE;
 	effect* peffect;
 	if(chaincount == 0)
@@ -1823,7 +1823,7 @@ int32 field::is_chain_disablable(uint8 chaincount, uint8 naga_check) {
 	return TRUE;
 }
 int32 field::check_chain_target(uint8 chaincount, card * pcard) {
-	if(chaincount < 0 && chaincount > core.current_chain.size())
+	if(chaincount < 0 || chaincount > core.current_chain.size())
 		return FALSE;
 	chain* pchain;
 	if(chaincount == 0)

script/c1127737.lua

@@ -32,7 +32,7 @@ function c1127737.damtg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(eg:GetFirst():GetSummonPlayer())
 	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,eg:GetFirst():GetSummonPlayer(),500)
 end
 function c1127737.damop1(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then
@@ -46,10 +46,12 @@ function c1127737.cfilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_XYZ)
 end
 function c1127737.damcon2(e,tp,eg,ep,ev,re,r,rp)
-	local turnp=Duel.GetTurnPlayer()
-	return not Duel.IsPlayerAffectedByEffect(turnp,37511832) and Duel.IsExistingMatchingCard(c1127737.cfilter,turnp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c1127737.cfilter,Duel.GetTurnPlayer(),LOCATION_MZONE,0,1,nil)
 end
 function c1127737.damop2(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_CARD,0,36562627)
-	Duel.Damage(p,d,REASON_EFFECT)
+	local p=Duel.GetTurnPlayer()
+	if not Duel.IsPlayerAffectedByEffect(p,37511832) then
+		Duel.Hint(HINT_CARD,0,1127737)
+		Duel.Damage(p,500,REASON_EFFECT)
+	end
 end

script/c1644289.lua

@@ -37,9 +37,8 @@ end
 function c1644289.eqlimit(e,c)
 	return c:IsSetCard(0x30)
 end
-function c1644289.tglimit(e,re)
-	local rc=re:GetOwner()
-	return e:GetHandler():GetControler()~=rc:GetControler() and rc:IsType(TYPE_TRAP+TYPE_MONSTER)
+function c1644289.tglimit(e,re,rp)
+	return rp~=e:GetHandlerPlayer() and re:IsActiveType(TYPE_TRAP+TYPE_MONSTER)
 end
 function c1644289.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0x30)

script/c21702241.lua

@@ -21,7 +21,6 @@ function c21702241.initial_effect(c)
 	e3:SetDescription(aux.Stringid(21702241,0))
 	e3:SetCategory(CATEGORY_DAMAGE)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e3:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetCode(EVENT_CONTROL_CHANGED)
 	e3:SetCondition(c21702241.damcon)
@@ -31,8 +30,7 @@ function c21702241.initial_effect(c)
 end
 function c21702241.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
-	if chk==0 then return not e:GetHandler():IsStatus(STATUS_CHAINING)
-		and Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)
@@ -47,7 +45,7 @@ function c21702241.damcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsContains(e:GetHandler():GetEquipTarget())
 end
 function c21702241.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return not e:GetHandler():IsStatus(STATUS_CHAINING) end
 	local ec=e:GetHandler():GetEquipTarget()
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,ec:GetControler(),ec:GetBaseAttack())
 end

script/c22047978.lua

@@ -3,7 +3,6 @@ function c22047978.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DESTROY)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e1:SetCondition(c22047978.condition)
@@ -14,10 +13,9 @@ end
 function c22047978.condition(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer()
 end
-function c22047978.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function c22047978.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local tg=Duel.GetAttacker()
-	if chkc then return chkc==tg end
-	if chk==0 then return tg:IsOnField() and tg:IsDestructable() and tg:IsCanBeEffectTarget(e) end
+	if chk==0 then return tg:IsOnField() and tg:IsDestructable() end
 	Duel.SetTargetCard(tg)
 	if Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)==0 then
 		Duel.SetOperationInfo(0,CATEGORY_DESTROY,tg,1,0,0)
@@ -35,8 +33,11 @@ function c22047978.activate(e,tp,eg,ep,ev,re,r,rp)
 			local cg=g:Select(1-tp,1,1,nil)
 			Duel.ConfirmCards(tp,cg)
 			Duel.ShuffleHand(1-tp)
+			if Duel.IsChainDisablable(0) then
+				Duel.NegateEffect(0)
 				return
 			end
+		end
 		if Duel.Destroy(tc,REASON_EFFECT)>0 then
 			Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
 		end

script/c22754505.lua

@@ -21,7 +21,7 @@ function c22754505.cfilter(c)
 	return c:IsFaceup() and c:IsCode(25247218)
 end
 function c22754505.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c22754505.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c22754505.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c22754505.filter(c,e,tp)
 	return c:IsCode(58843503) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c2316186.lua

@@ -28,7 +28,7 @@ function c2316186.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local ct=Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)
 	Duel.SetTargetPlayer(1-tp)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,ct*600)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,ct*600)
 end
 function c2316186.operation(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)

script/c23232295.lua

@@ -33,7 +33,7 @@ function c23232295.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
 			e:SetLabelObject(g:GetFirst())
 		else
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESREPLACE)
-			local cg=g:Select(g,1,1,nil)
+			local cg=g:Select(tp,1,1,nil)
 			e:SetLabelObject(cg:GetFirst())
 		end
 		return true

script/c23454876.lua

@@ -52,7 +52,7 @@ function c23454876.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetTargetPlayer(1-tp)
 	local dam=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)*400
 	Duel.SetTargetParam(dam)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,dam)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,dam)
 end
 function c23454876.damop(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)

script/c23915499.lua

@@ -18,7 +18,7 @@ function c23915499.spfilter(c,e,tp)
 	return c:IsCode(87526784) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23915499.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c23915499.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c23915499.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c23915499.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -27,7 +27,7 @@ function c23915499.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c23915499.operation(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if not Duel.IsExistingMatchingCard(c23915499.cfilter,tp,LOCATION_MZONE,0,1,nil) then return end
+	if not Duel.IsExistingMatchingCard(c23915499.cfilter,tp,LOCATION_ONFIELD,0,1,nil) then return end
 	local tc=Duel.GetFirstMatchingCard(c23915499.spfilter,tp,LOCATION_DECK,0,nil,e,tp)
 	if tc then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)

script/c25866285.lua

@@ -16,7 +16,7 @@ function c25866285.condition(e,tp,eg,ep,ev,re,r,rp)
 	return ec:IsFaceup() and ec:IsControler(tp) and ec:IsSetCard(0x2a)
 end
 function c25866285.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToGrave() end
+	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
 end
 function c25866285.operation(e,tp,eg,ep,ev,re,r,rp)

script/c29669359.lua

@@ -36,7 +36,7 @@ function c29669359.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c29669359.filter,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,g:GetFirst():GetTextAttack())
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetFirst():GetTextAttack())
 end
 function c29669359.operation(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c30757396.lua

@@ -36,7 +36,7 @@ function c30757396.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local ct=Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)
 	Duel.SetTargetPlayer(1-tp)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,ct*300)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,ct*300)
 end
 function c30757396.damop(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
@@ -50,7 +50,7 @@ function c30757396.damtg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(1-tp)
 	Duel.SetTargetParam(300)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,300)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,300)
 end
 function c30757396.damop2(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

script/c30915572.lua

@@ -6,10 +6,14 @@ function c30915572.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DAMAGE+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
+	e1:SetCost(c30915572.spcost)
 	e1:SetTarget(c30915572.sptarget)
 	e1:SetOperation(c30915572.spoperation)
 	c:RegisterEffect(e1)
 end
+function c30915572.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return not e:GetHandler():IsPublic() end
+end
 function c30915572.sptarget(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,1)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end

script/c31557782.lua

@@ -16,5 +16,5 @@ end
 function c31557782.spcon(e,c)
 	if c==nil then return true end
 	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c31557782.filter,c:GetControler(),LOCATION_MZONE,0,1,nil)
+		and Duel.IsExistingMatchingCard(c31557782.filter,c:GetControler(),LOCATION_ONFIELD,0,1,nil)
 end

script/c33655493.lua

@@ -17,6 +17,6 @@ end
 function c33655493.tg(e,c)
 	return c:IsFaceup() and c:GetCode()~=33655493
 end
-function c33655493.tglimit(e,re)
-	return not re:GetHandler():IsType(TYPE_MONSTER)
+function c33655493.tglimit(e,re,rp)
+	return rp~=e:GetHandlerPlayer() and re:IsActiveType(TYPE_SPELL+TYPE_TRAP)
 end

script/c34193084.lua

@@ -20,6 +20,6 @@ function c34193084.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c34193084.spop(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then
-		Duel.SpecialSummon(e:GetHandler(),1,tp,tp,false,false,POS_FACEUP)
+		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 	end
 end

script/c39139935.lua

@@ -31,7 +31,7 @@ function c39139935.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local tc=g:GetFirst()
 	local atk=tc:GetAttack()
 	local batk=tc:GetBaseAttack()
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,(batk>atk) and (batk-atk) or (atk-batk))
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,(batk>atk) and (batk-atk) or (atk-batk))
 end
 function c39139935.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c43487744.lua

@@ -2,25 +2,25 @@
 function c43487744.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_DISABLE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCondition(c43487744.condition)
-	e1:SetTarget(c43487744.target)
 	e1:SetOperation(c43487744.activate)
 	c:RegisterEffect(e1)
 end
 function c43487744.condition(e,tp,eg,ep,ev,re,r,rp)
-	return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsCode(53129443) and Duel.IsChainDisablable(ev)
-end
-function c43487744.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
-	local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,0,LOCATION_MZONE,nil)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
+	return rp~=tp and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsCode(53129443)
 end
 function c43487744.activate(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateEffect(ev)
-	local g=Duel.GetMatchingGroup(Card.IsDestructable,tp,0,LOCATION_MZONE,nil)
-	Duel.Destroy(g,REASON_EFFECT)
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetValue(c43487744.indval)
+	e1:SetReset(RESET_CHAIN)
+	e1:SetLabel(ev)
+	Duel.RegisterEffect(e1,tp)
+end
+function c43487744.indval(e,re,rp)
+	return Duel.GetCurrentChain()==e:GetLabel()
 end

script/c47596607.lua

@@ -29,6 +29,7 @@ function c47596607.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function c47596607.spop(e,tp,eg,ep,ev,re,r,rp)
+	if not e:GetHandler():IsRelateToEffect(e) then return end
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)

script/c48505422.lua

@@ -21,12 +21,12 @@ function c48505422.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c48505422.spfilter(c)
-	return c:IsFaceup() and c:GetCode()==74094021
+	return c:IsFaceup() and c:IsCode(74094021)
 end
 function c48505422.spcon(e,c)
 	if c==nil then return true end
 	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0 and
-		Duel.IsExistingMatchingCard(c48505422.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
+		Duel.IsExistingMatchingCard(c48505422.spfilter,c:GetControler(),LOCATION_ONFIELD,0,1,nil)
 end
 function c48505422.rlcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
@@ -35,7 +35,7 @@ function c48505422.filter(c)
 	return c:IsSetCard(0x3d) and c:GetCode()~=48505422 and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c48505422.rltg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:GetControler()==tp and chkc:GetLocation()==LOCATION_GRAVE and c48505422.filter(chkc) end
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c48505422.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c48505422.filter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,c48505422.filter,tp,LOCATION_GRAVE,0,1,1,nil)

script/c50319138.lua

@@ -18,7 +18,7 @@ function c50319138.spfilter(c,e,tp)
 	return c:IsCode(23915499) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c50319138.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c50319138.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c50319138.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c50319138.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -27,7 +27,7 @@ function c50319138.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c50319138.operation(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if not Duel.IsExistingMatchingCard(c50319138.cfilter,tp,LOCATION_MZONE,0,1,nil) then return end
+	if not Duel.IsExistingMatchingCard(c50319138.cfilter,tp,LOCATION_ONFIELD,0,1,nil) then return end
 	local tc=Duel.GetFirstMatchingCard(c50319138.spfilter,tp,LOCATION_DECK,0,nil,e,tp)
 	if tc then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)

script/c52875873.lua

@@ -13,30 +13,19 @@ function c52875873.initial_effect(c)
 	c:RegisterEffect(e1)
 	if not c52875873.global_check then
 		c52875873.global_check=true
-		c52875873[0]=true
-		c52875873[1]=true
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		ge1:SetCode(EVENT_ATTACK_ANNOUNCE)
 		ge1:SetOperation(c52875873.checkop)
 		Duel.RegisterEffect(ge1,0)
-		local ge2=Effect.CreateEffect(c)
-		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge2:SetCode(EVENT_PHASE_START+PHASE_DRAW)
-		ge2:SetOperation(c52875873.clear)
-		Duel.RegisterEffect(ge2,0)
 	end
 end
 function c52875873.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	if tc:IsCode(70095154) then
-		c52875873[tc:GetControler()]=false
+		Duel.RegisterFlagEffect(tc:GetControler(),52875873,RESET_PHASE+PHASE_END,0,1)
 	end
 end
-function c52875873.clear(e,tp,eg,ep,ev,re,r,rp)
-	c52875873[0]=true
-	c52875873[1]=true
-end
 function c52875873.cfilter(c)
 	return c:IsFaceup() and c:IsCode(70095154)
 end
@@ -44,7 +33,7 @@ function c52875873.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c52875873.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c52875873.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return c52875873[tp] end
+	if chk==0 then return Duel.GetFlagEffect(tp,52875873)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)

script/c58843503.lua

@@ -21,7 +21,7 @@ function c58843503.cfilter(c)
 	return c:IsFaceup() and c:IsCode(25247218)
 end
 function c58843503.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c58843503.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c58843503.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c58843503.filter(c,e,tp)
 	return c:IsCode(22754505) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c60080151.lua

@@ -3,7 +3,6 @@ function c60080151.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DAMAGE+CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e1:SetCondition(c60080151.condition)
@@ -14,13 +13,12 @@ end
 function c60080151.condition(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer()
 end
-function c60080151.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function c60080151.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local tg=Duel.GetAttacker()
-	if chkc then return chkc==tg end
-	if chk==0 then return tg:IsOnField() and tg:IsCanBeEffectTarget(e) and tg:IsAbleToRemove() end
+	if chk==0 then return tg:IsOnField() and tg:IsAbleToRemove() end
 	Duel.SetTargetCard(tg)
 	local dam=tg:GetAttack()
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,dam)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,dam)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,tg,1,0,0)
 end
 function c60080151.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -29,13 +27,10 @@ function c60080151.activate(e,tp,eg,ep,ev,re,r,rp)
 		local dam=tc:GetAttack()
 		if Duel.Damage(tp,dam,REASON_EFFECT)>0 and Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)>0 then
 			local e1=Effect.CreateEffect(e:GetHandler())
-			e1:SetDescription(aux.Stringid(60080151,0))
-			e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-			e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+			e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			e1:SetCountLimit(1)
 			e1:SetCode(EVENT_PHASE+PHASE_END)
 			e1:SetCondition(c60080151.spcon)
-			e1:SetTarget(c60080151.sptg)
 			e1:SetOperation(c60080151.spop)
 			e1:SetLabelObject(tc)
 			e1:SetLabel(Duel.GetTurnCount())
@@ -50,14 +45,6 @@ function c60080151.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnCount()~=e:GetLabel() and Duel.GetTurnPlayer()~=tp
 		and tc:GetFlagEffect(60080151)~=0 and tc:GetReasonEffect():GetHandler()==e:GetHandler()
 end
-function c60080151.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	Duel.SetTargetCard(e:GetLabelObject())
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetLabelObject(),1,0,0)
-end
 function c60080151.spop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then
-		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
-	end
+	Duel.SpecialSummon(e:GetLabelObject(),0,tp,tp,false,false,POS_FACEUP)
 end

script/c60530944.lua

@@ -17,17 +17,17 @@ function c60530944.condition(e,tp,eg,ep,ev,re,r,rp)
 		and Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0
 		and not Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_MZONE,1,nil)
 end
-function c60530944.getrace(g)
-	local arc=0
+function c60530944.getattr(g)
+	local aat=0
 	local tc=g:GetFirst()
 	while tc do
-		arc=bit.bor(arc,tc:GetRace())
+		aat=bit.bor(aat,tc:GetAttribute())
 		tc=g:GetNext()
 	end
-	return arc
+	return aat
 end
-function c60530944.rmfilter(c,rc)
-	return not c:IsRace(0xffffff-rc)
+function c60530944.rmfilter(c,at)
+	return not c:IsAttribute(0xff-at)
 end
 function c60530944.operation(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
@@ -38,10 +38,10 @@ function c60530944.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g2=Duel.GetFieldGroup(tp,0,LOCATION_MZONE)
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(60530944,0))
-	local r1=Duel.AnnounceRace(tp,1,c60530944.getrace(g1))
+	local r1=Duel.AnnounceAttribute(tp,1,c60530944.getattr(g1))
 	g1:Remove(c60530944.rmfilter,nil,r1)
 	Duel.Hint(HINT_SELECTMSG,1-tp,aux.Stringid(60530944,0))
-	local r2=Duel.AnnounceRace(1-tp,1,c60530944.getrace(g2))
+	local r2=Duel.AnnounceAttribute(1-tp,1,c60530944.getattr(g2))
 	g2:Remove(c60530944.rmfilter,nil,r2)
 	g1:Merge(g2)
 	Duel.SendtoGrave(g1,REASON_EFFECT)

script/c63391643.lua

@@ -12,10 +12,10 @@ function c63391643.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c63391643.cfilter(c)
-	return c:IsFaceup() and c:GetCode()==46986414
+	return c:IsFaceup() and c:IsCode(46986414)
 end
 function c63391643.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c63391643.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c63391643.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c63391643.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsDestructable() end

script/c63883999.lua

@@ -33,7 +33,7 @@ function c63883999.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c63883999.filter(c,e,tp)
 	local lv=c:GetLevel()
-	return lv>0 and c:IsSetCard(0x45)
+	return lv>0 and c:IsFaceup() and c:IsSetCard(0x45)
 		and Duel.IsExistingMatchingCard(c63883999.rfilter,tp,LOCATION_MZONE,0,1,c)
 		and Duel.IsExistingMatchingCard(c63883999.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK,0,1,nil,lv,e,tp)
 end

script/c65396880.lua

@@ -16,9 +16,9 @@ end
 function c65396880.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
 	return Duel.GetTurnPlayer()==tp and (ph==PHASE_MAIN1 or ph==PHASE_MAIN2)
-		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_MZONE,0,1,nil,58538870)
-		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_MZONE,0,1,nil,12143771)
-		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_MZONE,0,1,nil,85936485)
+		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_ONFIELD,0,1,nil,58538870)
+		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_ONFIELD,0,1,nil,12143771)
+		and Duel.IsExistingMatchingCard(c65396880.cfilter,tp,LOCATION_ONFIELD,0,1,nil,85936485)
 end
 function c65396880.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDestructable,tp,0,LOCATION_ONFIELD,1,nil)

script/c66970002.lua

@@ -63,7 +63,7 @@ function c66970002.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c66970002.filter,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,g:GetFirst():GetAttack())
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetFirst():GetAttack())
 end
 function c66970002.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c68191243.lua

@@ -14,7 +14,7 @@ function c68191243.cfilter(c)
 	return c:IsFaceup() and c:IsCode(76922029)
 end
 function c68191243.con(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c68191243.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c68191243.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c68191243.filter(c,e,tp)
 	return c:IsSetCard(0x1a) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

script/c72575145.lua

@@ -20,14 +20,20 @@ function c72575145.initial_effect(c)
 	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetCode(EFFECT_EQUIP_LIMIT)
-	e4:SetValue(1)
+	e4:SetValue(c72575145.eqlimit)
 	c:RegisterEffect(e4)
 end
+function c72575145.eqlimit(e,c)
+	return c:GetLevel()>0
+end
+function c72575145.filter(c)
+	return c:IsFaceup() and c:GetLevel()>0
+end
 function c72575145.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
-	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c72575145.filter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c72575145.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
-	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	Duel.SelectTarget(tp,c72575145.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)
 end
 function c72575145.operation(e,tp,eg,ep,ev,re,r,rp)

script/c74094021.lua

@@ -22,12 +22,12 @@ function c74094021.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c74094021.spfilter(c)
-	return c:IsFaceup() and c:GetCode()==48505422
+	return c:IsFaceup() and c:IsCode(48505422)
 end
 function c74094021.spcon(e,c)
 	if c==nil then return true end
 	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0 and
-		Duel.IsExistingMatchingCard(c74094021.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
+		Duel.IsExistingMatchingCard(c74094021.spfilter,c:GetControler(),LOCATION_ONFIELD,0,1,nil)
 end
 function c74094021.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroup(tp,Card.IsSetCard,1,e:GetHandler(),0x3d) end

script/c75433814.lua

@@ -51,7 +51,7 @@ function c75433814.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c75433814.desfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	local g=Duel.GetMatchingGroup(c75433814.desfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,g:GetCount()*500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetCount()*500)
 end
 function c75433814.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c75433814.desfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)

script/c85121942.lua

@@ -63,7 +63,7 @@ function c85121942.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 	local g=Duel.SelectTarget(tp,c85121942.filter,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,g:GetFirst():GetAttack())
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetFirst():GetAttack())
 end
 function c85121942.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c86821010.lua

@@ -15,7 +15,7 @@ function c86821010.cfilter(c)
 	return c:IsFaceup() and c:IsCode(2403771)
 end
 function c86821010.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c86821010.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c86821010.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c86821010.filter(c)
 	return c:IsType(TYPE_EQUIP) and c:IsAbleToDeck()

script/c86827882.lua

@@ -16,14 +16,15 @@ function c86827882.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
 end
 function c86827882.filter(c)
-	if c==Duel.GetAttacker() and Duel.GetAttackTarget()==nil then return false end
 	return c:IsFaceup() and (c:IsSetCard(0x42) or c:IsSetCard(0x4b))
 end
 function c86827882.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c86827882.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c86827882.filter,tp,LOCATION_MZONE,0,1,nil) end
+	local exc=nil
+	if Duel.GetCurrentPhase()==PHASE_DAMAGE and Duel.GetAttackTarget()==nil then exc=Duel.GetAttacker() end
+	if chk==0 then return Duel.IsExistingTarget(c86827882.filter,tp,LOCATION_MZONE,0,1,exc) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	Duel.SelectTarget(tp,c86827882.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	Duel.SelectTarget(tp,c86827882.filter,tp,LOCATION_MZONE,0,1,1,exc)
 end
 function c86827882.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()

script/c87526784.lua

@@ -18,7 +18,7 @@ function c87526784.spfilter(c,e,tp)
 	return c:IsCode(50319138) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c87526784.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c87526784.cfilter,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(c87526784.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c87526784.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -27,7 +27,7 @@ function c87526784.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c87526784.operation(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if not Duel.IsExistingMatchingCard(c87526784.cfilter,tp,LOCATION_MZONE,0,1,nil) then return end
+	if not Duel.IsExistingMatchingCard(c87526784.cfilter,tp,LOCATION_ONFIELD,0,1,nil) then return end
 	local tc=Duel.GetFirstMatchingCard(c87526784.spfilter,tp,LOCATION_DECK,0,nil,e,tp)
 	if tc then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)

script/c87614611.lua

@@ -25,14 +25,14 @@ function c87614611.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e1:SetCode(EFFECT_CANNOT_SUMMON)
-	e1:SetReset(RESET_PHASE+PHASE_END,2)
+	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,1)
 	e1:SetTargetRange(1,0)
 	Duel.RegisterEffect(e1,tp)
 	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e2:SetReset(RESET_PHASE+PHASE_END,2)
+	e2:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,1)
 	e2:SetTargetRange(1,0)
 	Duel.RegisterEffect(e2,tp)
 end

script/c87621407.lua

@@ -10,11 +10,11 @@ function c87621407.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c87621407.filter(c)
-	return c:IsFaceup() and c:GetCode()==8715625
+	return c:IsFaceup() and c:IsCode(8715625)
 end
 function c87621407.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	local ct=Duel.GetMatchingGroupCount(c87621407.filter,tp,LOCATION_MZONE,0,nil)
+	local ct=Duel.GetMatchingGroupCount(c87621407.filter,tp,LOCATION_ONFIELD,0,nil)
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(ct+1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,ct+1)

script/c90219263.lua

@@ -14,7 +14,7 @@ function c90219263.cfilter(c)
 	return c:IsFaceup() and c:IsCode(76812113)
 end
 function c90219263.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(c90219263.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
+	return Duel.IsExistingMatchingCard(c90219263.cfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
 end
 function c90219263.filter(c,e,tp)
 	local code=c:GetCode()

script/c93211810.lua

@@ -12,22 +12,48 @@ function c93211810.initial_effect(c)
 	e1:SetTarget(c93211810.target)
 	e1:SetOperation(c93211810.activate)
 	c:RegisterEffect(e1)
+	if not c93211810.global_check then
+		c93211810.global_check=true
+		c93211810[0]=0
+		c93211810[1]=0
+		local ge1=Effect.CreateEffect(c)
+		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge1:SetCode(EVENT_ATTACK_ANNOUNCE)
+		ge1:SetOperation(c93211810.checkop)
+		Duel.RegisterEffect(ge1,0)
+		local ge2=Effect.CreateEffect(c)
+		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge2:SetCode(EVENT_PHASE_START+PHASE_DRAW)
+		ge2:SetOperation(c93211810.clear)
+		Duel.RegisterEffect(ge2,0)
+	end
+end
+function c93211810.checkop(e,tp,eg,ep,ev,re,r,rp)
+	local tc=eg:GetFirst()
+	if tc:GetFlagEffect(93211810)==0 then
+		c93211810[ep]=c93211810[ep]+1
+		tc:RegisterFlagEffect(93211810,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
+	end
+end
+function c93211810.clear(e,tp,eg,ep,ev,re,r,rp)
+	c93211810[0]=0
+	c93211810[1]=0
 end
 function c93211810.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
 	return Duel.GetTurnPlayer()==tp and ph<PHASE_MAIN2 and (ph~=PHASE_DAMAGE or not Duel.IsDamageCalculated())
 end
 function c93211810.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return not Duel.CheckAttackActivity(tp) end
+	if chk==0 then return c93211810[tp]<2 end
 end
-function c93211810.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x101b)
+function c93211810.filter(c,tp)
+	return c:IsFaceup() and c:IsSetCard(0x101b) and (c93211810[tp]==0 or c:GetFlagEffect(93211810)~=0)
 end
 function c93211810.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c93211810.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c93211810.filter,tp,LOCATION_MZONE,0,1,nil) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c93211810.filter(chkc,tp) end
+	if chk==0 then return Duel.IsExistingTarget(c93211810.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	local g=Duel.SelectTarget(tp,c93211810.filter,tp,LOCATION_MZONE,0,1,1,nil)
+	local g=Duel.SelectTarget(tp,c93211810.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_ATTACK)

script/c93224848.lua

@@ -17,7 +17,7 @@ function c93224848.filter(c)
 end
 function c93224848.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)>=2
-		and Duel.IsExistingMatchingCard(c93224848.filter,tp,LOCATION_MZONE,0,1,nil)
+		and Duel.IsExistingMatchingCard(c93224848.filter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c93224848.cfilter(c)
 	return not c:IsAbleToGraveAsCost()

script/c96008713.lua

@@ -27,10 +27,13 @@ function c96008713.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c96008713.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and tc:IsFaceup() and not Duel.GetControl(tc,tp,PHASE_BATTLE,1) then
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
+		if not Duel.GetControl(tc,tp,PHASE_BATTLE,1) then
 			if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then
 				Duel.Destroy(tc,REASON_EFFECT)
 			end
-		else Duel.ChangeAttackTarget(tc)
+		else
+			Duel.ChangeAttackTarget(tc)
+		end
 	end
 end

script/c98143165.lua

@@ -25,14 +25,20 @@ function c98143165.initial_effect(c)
 	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetCode(EFFECT_EQUIP_LIMIT)
-	e4:SetValue(1)
+	e4:SetValue(c98143165.eqlimit)
 	c:RegisterEffect(e4)
 end
+function c98143165.eqlimit(e,c)
+	return c:GetLevel()>0
+end
+function c98143165.filter(c)
+	return c:IsFaceup() and c:GetLevel()>0
+end
 function c98143165.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
-	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c98143165.filter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c98143165.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
-	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	Duel.SelectTarget(tp,c98143165.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)
 end
 function c98143165.operation(e,tp,eg,ep,ev,re,r,rp)

script/c98299011.lua

@@ -16,7 +16,7 @@ function c98299011.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rec=Duel.GetFieldGroupCount(tp,LOCATION_MZONE,LOCATION_MZONE)*300
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(rec)
-	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,1-tp,rec)
+	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,rec)
 end
 function c98299011.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)

script/c99177923.lua

@@ -4,11 +4,11 @@ function c99177923.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(99177923,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_MULTIACT_HAND)
 	e1:SetCode(EVENT_DRAW)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCondition(c99177923.spcon)
+	e1:SetCost(c99177923.spcost)
 	e1:SetTarget(c99177923.sptg)
 	e1:SetOperation(c99177923.spop)
 	c:RegisterEffect(e1)
@@ -29,6 +29,9 @@ function c99177923.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local ct=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)
 	return ev==ct and eg:IsContains(c)
 end
+function c99177923.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return not e:GetHandler():IsPublic() end
+end
 function c99177923.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

script/c99517131.lua

@@ -18,7 +18,7 @@ function c99517131.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rec=Duel.GetMatchingGroupCount(c99517131.filter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)*400
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(rec)
-	if rec>0 then Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,1-tp,rec) end
+	if rec>0 then Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,rec) end
 end
 function c99517131.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(Card.IsFacedown,tp,LOCATION_MZONE,LOCATION_MZONE,nil)