lua fix and strings move

expansions/script/c121000002.lua

@@ -10,7 +10,7 @@ function c121000002.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c121000002.filter(c)
-	return c:IsSetCard(0x121) and c:IsAbleToHand()
+	return c:IsSetCard(0x921) and c:IsAbleToHand()
 end
 function c121000002.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c121000002.filter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c121029233.lua

@@ -70,10 +70,10 @@ function c121029233.splimcon(e)
 	return not e:GetHandler():IsForbidden()
 end
 function c121029233.splimit(e,c,tp,sumtp,sumpos)
-    return not c:IsSetCard(0x121) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
+	return not c:IsSetCard(0x921) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end
 function c121029233.filter(c,tp)
-	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD) and c:IsSetCard(0x121)
+	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD) and c:IsSetCard(0x921)
 		and (c:IsReason(REASON_BATTLE) or (c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp))
 end
 function c121029233.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -87,7 +87,7 @@ function c121029233.repop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Destroy(e:GetHandler(),REASON_EFFECT+REASON_REPLACE)
 end
 function c121029233.posfilter(c)
-	return c:IsPosition(POS_FACEUP) and c:IsSetCard(0x121)
+	return c:IsPosition(POS_FACEUP) and c:IsSetCard(0x921)
 end
 function c121029233.poscon(e,tp)
 	return Duel.IsExistingMatchingCard(c121029233.posfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -108,7 +108,7 @@ function c121029233.posop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c121029233.sefilter(c)
-	return c:IsSetCard(0x121) and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(5) and c:IsAbleToHand() and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
+	return c:IsSetCard(0x921) and c:IsType(TYPE_MONSTER) and c:IsLevelAbove(5) and c:IsAbleToHand() and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function c121029233.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c121029233.sefilter,tp,LOCATION_DECK,0,1,nil) end
@@ -126,7 +126,7 @@ function c121029233.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsContains(e:GetHandler())
 end
 function c121029233.spfilter(c,e,tp)
-	return  c:IsSetCard(0x121) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return  c:IsSetCard(0x921) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c121029233.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetMZoneCount(tp)>0

expansions/script/c121029293.lua

@@ -86,14 +86,14 @@ function c121029293.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.Release(g1,REASON_COST+REASON_FUSION+REASON_MATERIAL)
 end
 function c121029293.efilter(e,c)
-	return c:IsSetCard(0x121) and c:IsFaceup()
+	return c:IsSetCard(0x921) and c:IsFaceup()
 end
 function c121029293.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
 end
 function c121029293.thfilter(c)
-	return c:IsSetCard(0x121)  and c:IsFaceup() and  c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
+	return c:IsSetCard(0x921)  and c:IsFaceup() and  c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()
 end
 function c121029293.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c121029293.thfilter,tp,LOCATION_EXTRA,0,1,nil) end

expansions/script/c121053292.lua

@@ -50,13 +50,13 @@ function c121053292.splimcon(e)
 	return not e:GetHandler():IsForbidden()
 end
 function c121053292.splimit(e,c,tp,sumtp,sumpos)
-    return not c:IsSetCard(0x121) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
+	return not c:IsSetCard(0x921) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end
 function c121053292.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsAbleToEnterBP()
 end
 function c121053292.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x121)
+	return c:IsFaceup() and c:IsSetCard(0x921)
 end
 function c121053292.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c121053292.filter(chkc) end
@@ -101,7 +101,7 @@ function c121053292.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
 end
 function c121053292.thfilter(c)
-	return c:IsSetCard(0x121) and c:IsType(TYPE_MONSTER)  and c:IsAbleToHand()
+	return c:IsSetCard(0x921) and c:IsType(TYPE_MONSTER)  and c:IsAbleToHand()
 		and ((c:IsFaceup() and c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_PENDULUM)) or c:IsLocation(LOCATION_GRAVE))
 end
 function c121053292.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c81021007.lua

@@ -75,11 +75,12 @@ end
 function c81021007.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=Duel.GetAttacker()
 	if c:IsControler(1-tp) then c=Duel.GetAttackTarget() end
+	local atk=e:GetLabel()
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	e1:SetValue(e:GetLabel())
+	e1:SetValue(atk*2)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_UPDATE_DEFENSE)

expansions/script/c81021008.lua

@@ -58,7 +58,7 @@ function c81021008.descon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0 and c:IsPreviousLocation(LOCATION_MZONE) and c:IsFaceup()
 end
-function c81021008.desfilter(c)
+function c81021008.desfilter(c,e,tp)
 	return c:IsSetCard(0x818) and not c:IsCode(81021008) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c81021008.destg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -83,7 +83,7 @@ function c81021008.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetAttacker()
 	if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end
 	e:SetLabelObject(tc)
-	return tc and tc:IsFaceup() and tc:IsSetCard(0x818) and tc:IsRelateToBattle() and Duel.GetAttackTarget()~=nil
+	return tc and tc:IsFaceup() and tc:IsSetCard(0x818) and tc:IsRelateToBattle() and tc~=e:GetHandler() and Duel.GetAttackTarget()~=nil
 end
 function c81021008.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,800) and e:GetHandler():IsReleasable() end

expansions/strings.conf

@@ -134,8 +134,8 @@
 !setname 0x1fbe 事龙人
 !setname 0x3fbe 原数黑姬
 
-#优雨 121 0x120-0x12f
-!setname 0x121 绯樱
+#优雨 121 0x920-0x92f
+!setname 0x921 绯樱
 
 #佚之鱼Justfish 576670569 140 0x400-0x40f
 !setname 0x1406 影魔