Merge branch 'master' of github.com:alstroemeria-silentlove/ygopro-222DIY-cards

expansions/script/c11200109.lua

@@ -9,13 +9,6 @@ function c11200109.initial_effect(c)
 	e1:SetTarget(c11200109.target)
 	e1:SetOperation(c11200109.activate)
 	c:RegisterEffect(e1)
-	--Equip limit
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_EQUIP_LIMIT)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetValue(1)
-	c:RegisterEffect(e2)
 	--Remove
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
@@ -100,6 +93,15 @@ function c11200109.activate(e,tp,eg,ep,ev,re,r,rp)
 			Duel.Remove(mat1,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
 			Duel.BreakEffect()
 			Duel.SpecialSummonStep(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+			--Add Equip limit
+			local e1=Effect.CreateEffect(e:GetHandler())
+			e1:SetType(EFFECT_TYPE_SINGLE)
+			e1:SetCode(EFFECT_EQUIP_LIMIT)
+			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+			e1:SetValue(c11200109.eqlimit)
+			e1:SetLabelObject(tc)
+			tc:RegisterEffect(e1)
 			local e2=Effect.CreateEffect(e:GetHandler())
 			e2:SetType(EFFECT_TYPE_SINGLE)
 			e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
@@ -117,6 +119,9 @@ function c11200109.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
+function c11200109.eqlimit(e,c)
+	return e:GetLabelObject()==c
+end
 function c11200109.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=e:GetHandler():GetEquipTarget()

expansions/script/c81000000.lua

@@ -23,11 +23,8 @@ end
 --Reika effect condition
 function Tenka.ReikaCon(e,tp,eg,ep,ev,re,r,rp)
 	local tp=e:GetHandlerPlayer()
-	if Duel.IsPlayerAffectedByEffect(tp,81015050) then 
-		return true else
-		for i=0,4 do
-			if Duel.GetFieldCard(tp,LOCATION_SZONE,i) then return false end
-		end
+	for i=0,4 do
+		if Duel.GetFieldCard(tp,LOCATION_SZONE,i) then return false end
 	end
 	return true
 end