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

expansions/lflist.conf

@@ -93,7 +93,8 @@
 09980234 1 --物语纪录·暴力之骏河
 09980235 1 --物语纪录·焦心之翼
 09980236 1 --物语纪录·不死之忍
-09980719 1 --恶魔人
+09980719 0 --恶魔人
+09980713 0 --AWSL
 09980718 1 --两花开
 09980717 1 --丁玲丁玲
 09980716 0 --手冲天皇

expansions/script/c77765008.lua

@@ -47,13 +47,13 @@ function cm.filter1(c,e,sp)
 	return c:IsCode(77765001) and c:IsCanBeSpecialSummoned(e,0,sp,false,false) and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function cm.target1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_DECK+LOCATION_HAND+LOCATON_GRAVE+LOCATION_HAND+LOCATON_GRAVE,0,1,nil,e,tp)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp)
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_HAND+LOCATON_GRAVE)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE)
 end
 function cm.operation1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	local sc=Duel.GetFirstMatchingCard(cm.filter1,tp,LOCATION_DECK+LOCATION_HAND+LOCATON_GRAVE,0,nil,e,tp)
+	local sc=Duel.GetFirstMatchingCard(cm.filter1,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,nil,e,tp)
 	if sc then
 		Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)
 	end

expansions/script/c9980480.lua

@@ -80,7 +80,7 @@ function c9980480.negcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetAttacker():GetControler()~=tp and e:GetHandler():GetCounter(0x50)==1
 end
 function c9980480.spfilter(c,e,tp)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x5bcb,0xabca) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevelBelow(4) and (c:IsSetCard(0x5bcb) or c:IsSetCard(0xabca))and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9980480.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not Duel.IsPlayerAffectedByEffect(tp,59822133)

expansions/script/c9980512.lua

@@ -12,11 +12,11 @@ function c9980512.initial_effect(c)
 	e1:SetOperation(c9980512.activate)
 	c:RegisterEffect(e1)
 end
-function c9980513.cfilter(c)
+function c9980512.cfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcbcc)
 end
 function c9980512.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() and Duel.IsExistingMatchingCard(c9980513.cfilter,tp,LOCATION_PZONE+LOCATION_MZONE,0,1,nil)
+	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() and Duel.IsExistingMatchingCard(c9980512.cfilter,tp,LOCATION_PZONE+LOCATION_MZONE,0,1,nil)
 end
 function c9980512.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0x5bcc)

expansions/script/c9980706.lua

 --戈尔贡三姐妹
 function c9980706.initial_effect(c)
-	c:EnableUnsummonable()
+	c:EnableReviveLimit()
 	--splimit
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)