Merge branch 'master' of git.mycard.moe:alstroemeria-silentlove/ygopro-222DIY-cards

expansions/script/c1160043.lua

@@ -27,7 +27,7 @@ function c1160043.initial_effect(c)
 end
 --
 function c1160043.cfilter1(c)
-	return c:GetLevel()==1 and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsType(TYPE_MONSTER)
+	return c:GetLevel()==1 and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsType(TYPE_MONSTER) and c:GetPreviousAttackOnField()>=400
 end
 function c1160043.con1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33500612.lua

@@ -52,13 +52,9 @@ function cm.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetTargetRange(0,1)
-	e1:SetValue(cm.actlimit)
+	e1:SetValue(aux.TRUE)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
-	Duel.Hint(HINT_MUSIC,0,aux.Stringid(m,0))   
-end
-function cm.actlimit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
 end
 --e2
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c33700071.lua

@@ -74,7 +74,7 @@ function c33700071.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33700071.aclimit(e,re,tp)
 	local tc=e:GetLabelObject()
-	return  re:GetHandler():IsCode(tc:GetCode()) and not re:GetHandler():IsImmuneToEffect(e)
+	return  re:GetHandler():IsCode(tc:GetCode())
 end
 function c33700071.confilter(c)
 	return c:IsSetCard(0x442) and c:IsFaceup() and c:IsType(TYPE_MONSTER)
@@ -91,8 +91,8 @@ function c33700071.effcon2(e)
 	return g:GetClassCount(Card.GetCode)>=e:GetLabel() 
 end
 function c33700071.tg(e,c)
-   return c:GetLevel()>e:GetHandler():GetLevel() and not c:IsImmuneToEffect(e)
+   return c:GetLevel()>e:GetHandler():GetLevel()
 end
 function c33700071.tg2(e,c)
-   return c:GetAttack()>e:GetHandler():GetAttack() and not c:IsImmuneToEffect(e)
+   return c:GetAttack()>e:GetHandler():GetAttack()
 end
\ No newline at end of file

expansions/script/c33700088.lua

@@ -33,7 +33,7 @@ function c33700088.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(0,1)
 	e3:SetCondition(c33700088.actcon)
-	e3:SetValue(c33700088.limit)
+	e3:SetValue(1)
 	c:RegisterEffect(e3)
 	--Destroy
 	local e4=Effect.CreateEffect(c)
@@ -81,7 +81,7 @@ function c33700088.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33700088.aclimit(e,re,tp)
 	local tc=e:GetLabelObject()
-	return  re:GetHandler():IsCode(tc:GetCode()) and not re:GetHandler():IsImmuneToEffect(e)
+	return  re:GetHandler():IsCode(tc:GetCode())
 end
 function c33700088.effcon(e)
 	local g=Duel.GetMatchingGroup(c33700088.confilter,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil)
@@ -109,9 +109,6 @@ function c33700088.actcon(e)
 	local ph=Duel.GetCurrentPhase()
 	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (g:GetClassCount(Card.GetCode)>=12  or  e:GetLabel()==33700090) and Duel.GetTurnPlayer()==e:GetHandlerPlayer() 
 end
-function c33700088.limit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
-end
 function c33700088.confilter(c)
 	return c:IsSetCard(0x442) and c:IsFaceup() and c:IsType(TYPE_MONSTER)
 end

expansions/script/c33700089.lua

@@ -32,7 +32,7 @@ function c33700089.initial_effect(c)
 	e3:SetTargetRange(0,1)
 	e3:SetCondition(c33700089.actcon)
 	effect_list[7]=e3
-	e3:SetValue(c33700089.limit)
+	e3:SetValue(aux.TRUE)
 	c:RegisterEffect(e3)
 	--Destroy
 	local e4=Effect.CreateEffect(c)
@@ -98,9 +98,6 @@ function c33700089.actcon(e)
 	local ph=Duel.GetCurrentPhase()
 	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (g:GetClassCount(Card.GetCode)>=7 or e:GetLabel()==33700090) and Duel.GetTurnPlayer()~=e:GetHandlerPlayer()
 end
-function c33700089.limit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
-end
 function c33700089.confilter(c)
 	return c:IsSetCard(0x442) and c:IsFaceup() and c:IsType(TYPE_MONSTER)
 end

expansions/script/c33700905.lua

@@ -21,15 +21,12 @@ function c33700905.initial_effect(c)
 	e3:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetTargetRange(1,1)
-	e3:SetValue(c33700905.aclimit)
+	e3:SetValue(aux.TRUE)
 	c:RegisterEffect(e3)
 end
 function c33700905.disable(e,c)
 	return c~=e:GetHandler()
 end
-function c33700905.aclimit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
-end
 function c33700905.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not e:IsHasType(EFFECT_TYPE_ACTIVATE) then return end

expansions/script/c50218345.lua

@@ -158,7 +158,7 @@ end
 function c50218345.actval(e,re,rp)
 	local rc=re:GetHandler()
 	return rc:IsLocation(LOCATION_MZONE) and re:IsActiveType(TYPE_MONSTER)
-		and rc:IsType(TYPE_FUSION) and not rc:IsImmuneToEffect(e)
+		and rc:IsType(TYPE_FUSION)
 end
 function c50218345.hdcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)

expansions/script/c50218350.lua

@@ -115,7 +115,7 @@ end
 function c50218350.actval(e,re,rp)
 	local rc=re:GetHandler()
 	return rc:IsLocation(LOCATION_MZONE) and re:IsActiveType(TYPE_MONSTER)
-        and rc:IsType(TYPE_SYNCHRO) and not rc:IsImmuneToEffect(e)
+		and rc:IsType(TYPE_SYNCHRO)
 end
 function c50218350.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)

expansions/script/c50218355.lua

@@ -115,7 +115,7 @@ end
 function c50218355.actval(e,re,rp)
 	local rc=re:GetHandler()
 	return rc:IsLocation(LOCATION_MZONE) and re:IsActiveType(TYPE_MONSTER)
-        and rc:IsType(TYPE_XYZ) and not rc:IsImmuneToEffect(e)
+		and rc:IsType(TYPE_XYZ)
 end
 function c50218355.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)

expansions/script/c50218360.lua

@@ -116,7 +116,7 @@ end
 function c50218360.actval(e,re,rp)
 	local rc=re:GetHandler()
 	return rc:IsLocation(LOCATION_MZONE) and re:IsActiveType(TYPE_MONSTER)
-        and rc:IsType(TYPE_LINK) and not rc:IsImmuneToEffect(e)
+		and rc:IsType(TYPE_LINK)
 end
 function c50218360.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c53799046.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e1:SetRange(LOCATION_SZONE)
 	e1:SetTargetRange(0,1)
-	e1:SetValue(cm.actlimit)
+	e1:SetValue(aux.TRUE)
 	c:RegisterEffect(e1)
 end
 function cm.actlimit(e,re,tp)

expansions/script/c60159911.lua

@@ -60,7 +60,6 @@ function c60159911.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
 end
 function c60159911.aclimit(e,re,tp)
 	return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_SPECIAL)==SUMMON_TYPE_SPECIAL and e:GetHandler():GetSummonLocation()==LOCATION_HAND and e:GetHandler():IsFaceup() and re:IsActiveType(TYPE_MONSTER) and bit.band(re:GetHandler():GetSummonLocation(),LOCATION_EXTRA+LOCATION_GRAVE)~=0
-		and not re:GetHandler():IsImmuneToEffect(e)
 end
 function c60159911.ctcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c77707025.lua

@@ -18,13 +18,10 @@ function c77707025.op(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	e2:SetTargetRange(0,1)
-	e2:SetValue(c77707025.aclimit)
+	e2:SetValue(1)
 	e2:SetCondition(c77707025.actcon)
 	Duel.RegisterEffect(e2,tp)
 end
-function c77707025.aclimit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
-end
 function c77707025.actcon(e)
 	local ph=Duel.GetCurrentPhase()
 	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE 

expansions/script/c81012046.lua

@@ -65,7 +65,7 @@ function c81012046.mat_filter(c)
 end
 function c81012046.limval(e,re,rp)
 	local rc=re:GetHandler()
-	return re:IsActiveType(TYPE_MONSTER) and rc:IsType(TYPE_PENDULUM) and not rc:IsType(TYPE_RITUAL) and not rc:IsImmuneToEffect(e)
+	return re:IsActiveType(TYPE_MONSTER) and rc:IsType(TYPE_PENDULUM) and not rc:IsType(TYPE_RITUAL)
 end
 function c81012046.descon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)

expansions/script/c81012063.lua

@@ -49,7 +49,6 @@ function c81012063.initial_effect(c)
 	e6:SetHintTiming(0,TIMING_DRAW_PHASE)
 	e6:SetCountLimit(1,81012963)
 	e6:SetCost(c81012063.actcost)
-
 	e6:SetOperation(c81012063.actop)
 	c:RegisterEffect(e6)
 end

expansions/script/c81040010.lua

@@ -56,7 +56,7 @@ function c81040010.actop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e1:SetTargetRange(0,1)
 	e1:SetCondition(c81040010.actcon)
-	e1:SetValue(c81040010.actlimit)
+	e1:SetValue(1)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
@@ -64,6 +64,3 @@ function c81040010.actcon(e)
 	local ph=Duel.GetCurrentPhase()
 	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
 end
-function c81040010.actlimit(e,re,tp)
-	return not re:GetHandler():IsImmuneToEffect(e)
-end