lua fix and strings move

expansions/script/c121000002.lua

 --樱之大地
 function c121000002.initial_effect(c)
-    --Activate
+	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
@@ -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
@@ -27,7 +27,7 @@ function c121000002.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ShuffleDeck(tp)
 		if Duel.IsExistingMatchingCard(c121000002.tdfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)  and Duel.SelectYesNo(tp,aux.Stringid(23310009,5)) then
 		local tg=Duel.SelectMatchingCard(tp,c121000002.tdfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil)
-	     if tg:GetCount()>0 then
+		 if tg:GetCount()>0 then
 		Duel.SendtoDeck(tg,nil,0,REASON_EFFECT)
 	end
 end

expansions/script/c121029233.lua

@@ -3,15 +3,15 @@ function c121029233.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)
 	--splimit
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetRange(LOCATION_PZONE)
-    e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
-    e1:SetTargetRange(1,0)
-    e1:SetCondition(c121029233.splimcon)
-    e1:SetTarget(c121029233.splimit)
-    c:RegisterEffect(e1)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetRange(LOCATION_PZONE)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetTargetRange(1,0)
+	e1:SetCondition(c121029233.splimcon)
+	e1:SetTarget(c121029233.splimit)
+	c:RegisterEffect(e1)
 	--destroy replace
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
@@ -56,7 +56,7 @@ function c121029233.initial_effect(c)
 	e6:SetTarget(c121029233.sptg)
 	e6:SetOperation(c121029233.spop)
 	c:RegisterEffect(e6)
-    local e7=Effect.CreateEffect(c)
+	local e7=Effect.CreateEffect(c)
 	e7:SetDescription(aux.Stringid(88241506,1))
 	e7:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e7:SetCode(EVENT_BE_BATTLE_TARGET)
@@ -67,13 +67,13 @@ function c121029233.initial_effect(c)
 	c:RegisterEffect(e7)
 end
 function c121029233.splimcon(e)
-    return not e:GetHandler():IsForbidden()
+	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,10 +87,10 @@ 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)
+	return Duel.IsExistingMatchingCard(c121029233.posfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c121029233.posfilter2(c)
 	return c:IsPosition(POS_FACEUP) and c:IsCanTurnSet()
@@ -100,7 +100,7 @@ function c121029233.postg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_POSITION,nil,1,0,0)
 end
 function c121029233.posop(e,tp,eg,ep,ev,re,r,rp)
-   	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectMatchingCard(tp,c121029233.posfilter2,tp,0,LOCATION_MZONE,1,1,nil)
 	local tc=g:GetFirst()
 	if tc:IsFaceup() then
@@ -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
@@ -140,7 +140,7 @@ function c121029233.spop(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.GetMZoneCount(tp)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c121029233.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then 	
+	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then   
 	local tf=re:GetTarget()
 	local res,ceg,cep,cev,cre,cr,crp=Duel.CheckEvent(re:GetCode(),true)
 	if tf(re,rp,ceg,cep,cev,cre,cr,crp,0,g:GetFirst()) and Duel.SelectYesNo(tp,aux.Stringid(23310009,7)) then
@@ -157,7 +157,7 @@ function c121029233.cbop(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.GetMZoneCount(tp)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c121029233.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
-	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then 	
+	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 then   
 	if not Duel.GetAttacker():IsImmuneToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(23310009,7)) then
 		   Duel.BreakEffect()
 		   Duel.ChangeAttackTarget(g:GetFirst())

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

@@ -3,15 +3,15 @@ function c121053292.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)
 	--splimit
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetRange(LOCATION_PZONE)
-    e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
-    e1:SetTargetRange(1,0)
-    e1:SetCondition(c121053292.splimcon)
-    e1:SetTarget(c121053292.splimit)
-    c:RegisterEffect(e1)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetRange(LOCATION_PZONE)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetTargetRange(1,0)
+	e1:SetCondition(c121053292.splimcon)
+	e1:SetTarget(c121053292.splimit)
+	c:RegisterEffect(e1)
 	--attack all
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(121053292,0))
@@ -24,16 +24,16 @@ function c121053292.initial_effect(c)
 	e2:SetOperation(c121053292.operation)
 	c:RegisterEffect(e2)
 	--hand
-    local e3=Effect.CreateEffect(c)
-    e3:SetDescription(aux.Stringid(121053292,4))
-    e3:SetCategory(CATEGORY_HANDES+CATEGORY_DAMAGE)
-    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(121053292,4))
+	e3:SetCategory(CATEGORY_HANDES+CATEGORY_DAMAGE)
+	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e3:SetRange(LOCATION_MZONE)
-    e3:SetCode(EVENT_DAMAGE_STEP_END)
-    e3:SetCondition(c121053292.effcon)
-    e3:SetTarget(c121053292.attar)
-    e3:SetOperation(c121053292.atop)
-    c:RegisterEffect(e3)
+	e3:SetCode(EVENT_DAMAGE_STEP_END)
+	e3:SetCondition(c121053292.effcon)
+	e3:SetTarget(c121053292.attar)
+	e3:SetOperation(c121053292.atop)
+	c:RegisterEffect(e3)
 	--tohand
 	local e4=Effect.CreateEffect(c)
 	e4:SetCategory(CATEGORY_TOHAND)
@@ -47,16 +47,16 @@ function c121053292.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c121053292.splimcon(e)
-    return not e:GetHandler():IsForbidden()
+	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
@@ -79,29 +79,29 @@ function c121053292.atkfilter(e,c)
 	return c:IsSummonType(SUMMON_TYPE_SPECIAL)
 end
 function c121053292.effcon(e,tp,eg,ep,ev,re,r,rp)
-    return e:GetHandler()==Duel.GetAttacker() and e:GetHandler():IsRelateToBattle()
+	return e:GetHandler()==Duel.GetAttacker() and e:GetHandler():IsRelateToBattle()
 end
 function c121053292.attar(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return true end
-    Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1)
+	if chk==0 then return true end
+	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1)
 end
 function c121053292.atop(e,tp,eg,ep,ev,re,r,rp)
-    local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
-    if g:GetCount()>0 then
-        local sg=g:RandomSelect(1-tp,1)
-        Duel.SendtoGrave(sg,REASON_EFFECT+REASON_DISCARD)
-        local tc=sg:GetFirst()
-        if tc:IsType(TYPE_MONSTER) then
-            Duel.Damage(1-tp,tc:GetLevel()*200,REASON_EFFECT)
-        end
-    end
+	local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
+	if g:GetCount()>0 then
+		local sg=g:RandomSelect(1-tp,1)
+		Duel.SendtoGrave(sg,REASON_EFFECT+REASON_DISCARD)
+		local tc=sg:GetFirst()
+		if tc:IsType(TYPE_MONSTER) then
+			Duel.Damage(1-tp,tc:GetLevel()*200,REASON_EFFECT)
+		end
+	end
 end
 function c121053292.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 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 影魔