Push by Appveyor

expansions/script/c22250003.lua

@@ -33,7 +33,7 @@ function c22250003.IsRiviera(c)
 	return m and m.named_with_Riviera
 end
 function c22250003.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and Duel.GetTurnPlayer()~=rp
+	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.GetTurnPlayer()~=rp
 end
 function c22250003.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c22250101.lua

@@ -70,7 +70,7 @@ function c22250101.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetValue(-500)
 		e2:SetReset(RESET_EVENT+0x1fe0000)
 		bc:RegisterEffect(e2)
-		if bc:GetAttack()*bc:GetDefense()==0 then
+		if (bc:IsType(TYPE_LINK) and bc:GetAttack()==0) or (bc:GetAttack()*bc:GetDefense()==0 and not bc:IsType(TYPE_LINK)) then
 			Duel.Remove(bc,POS_FACEUP,REASON_EFFECT)
 			if Duel.Remove(c,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then
 				local e1=Effect.CreateEffect(c)

expansions/script/c22251001.lua

@@ -171,13 +171,9 @@ function c22251001.op(e,tp,eg,ep,ev,re,r,rp,chk)
 		e1:SetValue(-400*e:GetLabel())
 		e1:SetReset(RESET_EVENT+0x1fe0000)
 		tc:RegisterEffect(e1)
-		if tc:GetAttack()*tc:GetDefense()==0 then
+		if (tc:IsType(TYPE_LINK) and tc:GetAttack()==0) or (tc:GetAttack()*tc:GetDefense()==0 and not tc:IsType(TYPE_LINK))then
 			Duel.Destroy(tc,REASON_EFFECT)
 		end
 		tc=g:GetNext()
 	end
-end
-
+end
\ No newline at end of file
-
-
-