lua and cdb and strings fix

expansions/script/c11200080.lua

@@ -37,7 +37,7 @@ function c11200080.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end
 function c11200080.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x131) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x62e) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c11200080.fusiontg(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c11200081.lua

@@ -37,7 +37,7 @@ function c11200081.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end
 function c11200081.filter2(c,e,tp,m,f,chkf)
-	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x131) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and c:IsSetCard(0x62e) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c11200081.fusiontg(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c11200082.lua

@@ -2,7 +2,7 @@
 function c11200082.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x131),2,true)
+	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x62e),2,true)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
@@ -29,7 +29,7 @@ function c11200082.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c11200082.rfilter(c)
-	return c:IsSetCard(0x131) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
+	return c:IsSetCard(0x62e) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function c11200082.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(c11200082.rfilter,tp,LOCATION_HAND+LOCATION_MZONE+LOCATION_GRAVE,0,e:GetHandler())

expansions/script/c11200083.lua

@@ -35,7 +35,7 @@ function c11200083.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,e:GetHandler()) end
 end
 function c11200083.rfilter(c)
-	return c:IsSetCard(0x131) and c:IsAbleToRemove()
+	return c:IsSetCard(0x62e) and c:IsAbleToRemove()
 end
 function c11200083.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -53,7 +53,7 @@ function c11200083.activate(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetValue(1)
 		e3:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e3,tp)
-		if g:IsExists(Card.IsSetCard,1,nil,0x131) and Duel.SelectYesNo(tp,aux.Stringid(11200083,0)) then
+		if g:IsExists(Card.IsSetCard,1,nil,0x62e) and Duel.SelectYesNo(tp,aux.Stringid(11200083,0)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 			local g1=Duel.SelectMatchingCard(tp,c11200083.rfilter,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 			Duel.Remove(g1,POS_FACEUP,REASON_EFFECT)
@@ -61,7 +61,7 @@ function c11200083.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c11200083.filter(c)
-	return c:IsSetCard(0x131) and c:IsFaceup()
+	return c:IsSetCard(0x62e) and c:IsFaceup()
 end
 --function c11200083.con(e)
 --  local ph=Duel.GetCurrentPhase()
@@ -73,7 +73,7 @@ function c11200083.con(e)
 	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
 end
 function c11200083.cfilter(c)
-	return c:IsSetCard(0x131) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x62e) and c:IsType(TYPE_MONSTER)
 end
 function c11200083.ctcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and tp==rp and ((bit.band(r,REASON_BATTLE)~=0 and c11200083.cfilter(eg:GetFirst())) or (bit.band(r,REASON_EFFECT)~=0) and c11200083.cfilter(re:GetHandler()))

expansions/script/c11200084.lua

@@ -33,7 +33,7 @@ function c11200084.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c11200084.filter(c)
-	return c:IsSetCard(0x131) and c:IsAbleToRemove()
+	return c:IsSetCard(0x62e) and c:IsAbleToRemove()
 end
 function c11200084.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD,0)<Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)

expansions/script/c11200085.lua

@@ -32,7 +32,7 @@ function c11200085.initial_effect(c)
 	
 end
 function c11200085.filter(c)
-	return c:IsSetCard(0x131) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
+	return c:IsSetCard(0x62e) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function c11200085.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c11200085.filter,tp,LOCATION_MZONE+LOCATION_REMOVED,0,1,nil)
@@ -82,7 +82,7 @@ function c11200085.activate(e,tp,eg,ep,ev,re,r,rp)
 	--Duel.RegisterEffect(e1,tp)
 end
 function c11200085.cfilter(c)
-	return c:IsSetCard(0x131) and c:IsType(TYPE_MONSTER) and c:IsOnField()
+	return c:IsSetCard(0x62e) and c:IsType(TYPE_MONSTER) and c:IsOnField()
 end
 function c11200085.ctcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep==1-tp and tp==rp and ((bit.band(r,REASON_BATTLE)~=0 and c11200085.cfilter(eg:GetFirst())) or (bit.band(r,REASON_EFFECT)~=0) and c11200085.cfilter(re:GetHandler()))
@@ -91,10 +91,10 @@ function c11200085.ctop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Damage(1-tp,550,REASON_EFFECT)
 end
 function c11200085.filter2(c)
-	return c:IsSetCard(0x131) and c:IsFaceup()
+	return c:IsSetCard(0x62e) and c:IsFaceup()
 end
 function c11200085.rcheck(c,sg)
-	return c:IsSetCard(0x131) and c:IsFaceup() and sg:IsExists(aux.TRUE,1,c)
+	return c:IsSetCard(0x62e) and c:IsFaceup() and sg:IsExists(aux.TRUE,1,c)
 end
 function c11200085.rselect(c,tp,mg,sg)
 	sg:AddCard(c)

expansions/script/c26809020.lua

@@ -41,12 +41,12 @@ function c26809020.spfilter(c,e,tp)
 end
 function c26809020.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c26809020.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
 end
 function c26809020.operation(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c26809020.spfilter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,c26809020.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummonStep(tc,SUMMON_TYPE_RITUAL,tp,tp,true,false,POS_FACEUP) then
 		local e1=Effect.CreateEffect(c)

expansions/script/c65050125.lua

@@ -29,11 +29,11 @@ function c65050125.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsDiscardable() end
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
 end
-function c65050125.thfilter2(c)
-	return c:IsSetCard(0x5da8) and c:IsType(TYPE_SPELL) and c:IsAbleToHand() and not c:IsType(TYPE_RITUAL)
+function c65050125.tgfilter(c)
+	return c:IsSetCard(0x5da8) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function c65050125.tg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,LOCATION_HAND,0,1,e:GetHandler()) and Duel.IsPlayerCanDraw(tp,2) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c65050125.tgfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) and Duel.IsPlayerCanDraw(tp,2) end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_HAND)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,0,0,tp,2)
 end

expansions/script/c81011203.lua

 --选择困难症候群 艾露玛
-function c81011203.initial_effect(c)
---选择困难症候群 艾露玛
 function c81011203.initial_effect(c)
 	--summon with s/t
 	local e0=Effect.CreateEffect(c)

expansions/strings.conf

@@ -93,6 +93,7 @@
 
 #xig 112 0x620-0x62f
 !setname 0x621 因幡帝
+!setname 0x62e 清兰
 !setname 0x62f 美树沙耶加
 #xig_ihs_0x132 铃仙·优昙华院·因幡记述
 #xig_ihs_0x133 因幡帝记述