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

expansions/script/c11200001.lua

@@ -29,7 +29,7 @@ function c11200001.filter(c)
 	return c11200001.mfilter(c) and c:IsAbleToHand()
 end
 function c11200001.mfilter(c)
-	return c:IsSetCard(0x134) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_RITUAL)
+	return c:IsSetCard(0x62f) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_RITUAL)
 end
 function c11200001.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c11200001.filter,tp,LOCATION_DECK,0,1,nil) end
@@ -50,7 +50,7 @@ function c11200001.lrcon(e,tp,eg,ep,ev,re,r,rp)
 	if lp<=ev then return false end
 	if not re then return false end
 	local rc=re:GetHandler()
-	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x134) and e:GetHandler():IsAbleToRemoveAsCost()
+	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x62f) and e:GetHandler():IsAbleToRemoveAsCost()
 end
 function c11200001.lrop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)

expansions/script/c11200002.lua

@@ -36,7 +36,7 @@ function c11200002.lrcon(e,tp,eg,ep,ev,re,r,rp)
 	if lp<=ev then return false end
 	if not re then return false end
 	local rc=re:GetHandler()
-	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x134) and e:GetHandler():IsAbleToRemoveAsCost()
+	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x62f) and e:GetHandler():IsAbleToRemoveAsCost()
 end
 function c11200002.lrop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)

expansions/script/c11200003.lua

@@ -26,7 +26,7 @@ function c11200003.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsReason(REASON_EFFECT)
 end
 function c11200003.tgfilter(c)
-	return c:IsSetCard(0x134) and c:IsAbleToGrave()
+	return c:IsSetCard(0x62f) and c:IsAbleToGrave()
 end
 function c11200003.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c11200003.tgfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,nil) end
@@ -47,7 +47,7 @@ function c11200003.lrcon(e,tp,eg,ep,ev,re,r,rp)
 	if lp<=ev then return false end
 	if not re then return false end
 	local rc=re:GetHandler()
-	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x134) and e:GetHandler():IsAbleToRemoveAsCost()
+	return rc:IsLocation(LOCATION_MZONE) and rc:IsSetCard(0x62f) and e:GetHandler():IsAbleToRemoveAsCost()
 end
 function c11200003.lrop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)

expansions/script/c11200004.lua

@@ -47,7 +47,7 @@ function c11200004.ffilter(c,fc)
 	return c11200004.ffilter1(c,fc) or c11200004.ffilter2(c,fc)
 end
 function c11200004.ffilter1(c,fc)
-	return c:IsFusionSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
+	return c:IsFusionSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
 end
 function c11200004.ffilter2(c,fc)
 	return c:IsRace(RACE_SPELLCASTER) and c:IsCanBeFusionMaterial(fc) 

expansions/script/c11200005.lua

@@ -56,7 +56,7 @@ function c11200005.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c11200005.ovfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x134) and c:IsType(TYPE_FUSION)
+	return c:IsFaceup() and c:IsSetCard(0x62f) and c:IsType(TYPE_FUSION)
 end
 function c11200005.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
@@ -133,7 +133,7 @@ function c11200005.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c11200005.desfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x134) and c:IsLocation(LOCATION_MZONE)
+	return c:IsFaceup() and c:IsSetCard(0x62f) and c:IsLocation(LOCATION_MZONE)
 end
 function c11200005.flcon(e,tp,eg,ep,ev,re,r,rp)
    if  not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end
@@ -146,5 +146,5 @@ end
 function c11200005.descon2(e,tp,eg,ep,ev,re,r,rp)
 	if tp==Duel.GetTurnPlayer() then return false end
 	local tc=Duel.GetAttackTarget()
-	return tc and tc:IsFaceup() and tc:IsSetCard(0x134)
+	return tc and tc:IsFaceup() and tc:IsSetCard(0x62f)
 end
\ No newline at end of file

expansions/script/c11200006.lua

@@ -53,10 +53,10 @@ function c11200006.ffilter(c,fc)
 	return c11200006.ffilter1(c,fc) or c11200006.ffilter2(c,fc) 
 end
 function c11200006.ffilter1(c,fc)
-	return c:IsFusionSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
+	return c:IsFusionSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
 end
 function c11200006.ffilter2(c,fc)
-	return c:IsFusionSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc)  
+	return c:IsFusionSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc)  
 end
 function c11200006.spfilter1(c,tp,mg,fc)
 	  return mg:IsExists(c11200006.spfilter2,1,c,tp,c,fc) 
@@ -145,14 +145,14 @@ end
 	Duel.SetFusionMaterial(g)
 end
 function c11200006.rfilter(c,fc)
-	return (c:IsFusionSetCard(0x134) or c:IsRace(RACE_SPELLCASTER)) and c:IsCanBeFusionMaterial(fc) 
+	return (c:IsFusionSetCard(0x62f) or c:IsRace(RACE_SPELLCASTER)) and c:IsCanBeFusionMaterial(fc) 
 end
 function c11200006.rfilter1(c,tp,g)
 	return g:IsExists(c11200006.spfilter2,1,c,tp,c)
 end
 function c11200006.rfilter2(c,tp,mc)
-	return ((c:IsFusionSetCard(0x134) and mc:IsRace(RACE_SPELLCASTER)) or
-	(mc:IsFusionSetCard(0x134) and c:IsRace(RACE_SPELLCASTER))) and  Duel.GetLocationCountFromEx(tp,tp,Group.FromCards(c,mc))>0
+	return ((c:IsFusionSetCard(0x62f) and mc:IsRace(RACE_SPELLCASTER)) or
+	(mc:IsFusionSetCard(0x62f) and c:IsRace(RACE_SPELLCASTER))) and  Duel.GetLocationCountFromEx(tp,tp,Group.FromCards(c,mc))>0
 end
 function c11200006.spcon(e,c)
 	if c==nil then return true end

expansions/script/c11200007.lua

@@ -31,7 +31,7 @@ function c11200007.initial_effect(c)
 	c:RegisterEffect(e3)	
 end
 function c11200007.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x134)
+	return se:GetHandler():IsSetCard(0x62f)
 end
 function c11200007.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -88,7 +88,7 @@ function c11200007.operation(e,tp,eg,ep,ev,re,r,rp)
   end
 end
 function c11200007.spfilter(c,e,tp)
-	return c:IsSetCard(0x134) and not c:IsType(TYPE_RITUAL)
+	return c:IsSetCard(0x62f) and not c:IsType(TYPE_RITUAL)
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function c11200007.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c11200009.lua

@@ -32,7 +32,7 @@ function c11200009.ffilter(c,fc)
 	return c11200009.ffilter1(c,fc) or c11200009.ffilter2(c,fc)
 end
 function c11200009.ffilter1(c,fc)
-	return c:IsFusionSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
+	return c:IsFusionSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial(fc) 
 end
 function c11200009.ffilter2(c,fc)
 	return c:IsType(TYPE_RITUAL) and c:IsCanBeFusionMaterial(fc) 
@@ -151,7 +151,7 @@ function c11200009.filter1(c,e)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
 end
 function c11200009.filter2(c,e,tp,m,f,gc,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x134) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x62f) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,gc,chkf)
 end
 function c11200009.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c11200010.lua

@@ -43,7 +43,7 @@ function c11200010.mfilterf(c,tp,mg,rc)
 	else return false end
 end
 function c11200010.mfilter(c)
-	return c:GetLevel()>0 and c:IsSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove() 
+	return c:GetLevel()>0 and c:IsSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove() 
 end
 function c11200010.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

expansions/script/c11200011.lua

@@ -24,7 +24,7 @@ function c11200011.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c11200011.merfilter(c)
-	return c:IsSetCard(0x134) and c:IsFaceup() 
+	return c:IsSetCard(0x62f) and c:IsFaceup() 
 end
 function c11200011.mertg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c11200011.merfilter(chkc) end

expansions/script/c11200012.lua

@@ -25,13 +25,13 @@ function c11200012.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c11200012.filter(c)
-	return c:IsSetCard(0x134) and c:IsAbleToGrave()
+	return c:IsSetCard(0x62f) and c:IsAbleToGrave()
 end
 function c11200012.filter2(c)
-	return c:IsSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+	return c:IsSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function c11200012.filter3(c)
-	return  c:IsSetCard(0x134) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
+	return  c:IsSetCard(0x62f) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function c11200012.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local b1=Duel.GetMatchingGroup(c11200012.filter,tp,LOCATION_HAND+LOCATION_ONFIELD,0,e:GetHandler())
@@ -66,7 +66,7 @@ function c11200012.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c11200012.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x134) and c:GetAttack()>0
+	return c:IsFaceup() and c:IsSetCard(0x62f) and c:GetAttack()>0
 end
 function c11200012.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c11200012.atkfilter(chkc) end

expansions/script/c1156015.lua

@@ -47,12 +47,15 @@ function c1156015.initial_effect(c)
 --
 end
 --
+function c1156015.chnfilter(c)
+    return c:GetOriginalCode()==77765004 and not c:IsDisabled()
+end
 function c1156015.lkfilter(c,lc,tp)
 	local flag=c:IsFaceup() and c:IsCanBeLinkMaterial(lc)
 	if c:IsType(TYPE_MONSTER) then
 		return flag and c:IsRace(RACE_SPELLCASTER)
 	else
-		return c:IsFaceup() and c:IsType(TYPE_SPELL) and not c:IsHasEffect(EFFECT_CANNOT_BE_LINK_MATERIAL)
+		return c:IsFaceup() and c:IsType(TYPE_SPELL) and not Duel.IsExistingMatchingCard(c1156015.cknfilter,tp,0,LOCATION_SZONE,1,nil)
 	end
 end
 function c1156015.lvfilter(c)

expansions/strings.conf

@@ -91,8 +91,9 @@
 !setname 0x215e 御龙骑
 !setname 0xa15e 御龙骑士
 
-#xig 112 0x620-0x621
+#xig 112 0x620-0x62f
 !setname 0x621 因幡帝
+!setname 0x62f 美树沙耶加
 #xig_ihs_0x132 铃仙·优昙华院·因幡记述
 #xig_ihs_0x133 因幡帝记述