Merge pull request #561 from salix5/patch3

fix

script/c47942531.lua

---偉大魔獣 ガーゼット
-function c47942531.initial_effect(c)
-	--atk
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_SUMMON_SUCCESS)
-	e1:SetOperation(c47942531.atop)
-	c:RegisterEffect(e1)
-	--tribute check
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_MATERIAL_CHECK)
-	e2:SetValue(c47942531.valcheck)
-	e2:SetLabelObject(e1)
-	c:RegisterEffect(e2)
-end
-function c47942531.valcheck(e,c)
-	local tc=c:GetMaterial():GetFirst()
-	local atk=tc:GetTextAttack()
-	if atk<0 then atk=0 end
-	e:GetLabelObject():SetLabel(atk*2)
-end
-function c47942531.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_SET_ATTACK)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(e:GetLabel())
-	e1:SetReset(RESET_EVENT+0x1ff0000)
-	c:RegisterEffect(e1)
-end
+--偉大魔獣 ガーゼット
+function c47942531.initial_effect(c)
+	--tribute check
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_MATERIAL_CHECK)
+	e1:SetValue(c47942531.valcheck)
+	c:RegisterEffect(e1)
+end
+function c47942531.valcheck(e,c)
+	local tc=c:GetMaterial():GetFirst()
+	local atk=0
+	if tc then atk=tc:GetTextAttack()*2 end
+	if atk<0 then atk=0 end
+	--atk continuous effect
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_SET_ATTACK)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetValue(atk)
+	e1:SetReset(RESET_EVENT+0xff0000)
+	c:RegisterEffect(e1)	
+end

script/c6614221.lua

@@ -6,11 +6,11 @@ function c6614221.initial_effect(c)
 	e1:SetCode(EFFECT_DECREASE_TRIBUTE)
 	e1:SetValue(0x2)
 	c:RegisterEffect(e1)
-	--atk
+	--tribute check
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_SUMMON_SUCCESS)
-	e2:SetOperation(c6614221.atkop)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetCode(EFFECT_MATERIAL_CHECK)
+	e2:SetValue(c6614221.valcheck)
 	c:RegisterEffect(e2)
 	--cannot release
 	local e3=Effect.CreateEffect(c)
@@ -21,23 +21,22 @@ function c6614221.initial_effect(c)
 	e3:SetTargetRange(1,1)
 	c:RegisterEffect(e3)
 end
-function c6614221.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local mg=c:GetMaterial()
-	local tc=mg:GetFirst()
+function c6614221.valcheck(e,c)
+	local g=c:GetMaterial()
+	local tc=g:GetFirst()
 	local atk=0
 	while tc do
 		local catk=tc:GetTextAttack()
-		if catk<0 then catk=0 end
-		atk=atk+catk
-		tc=mg:GetNext()
-	end
-	if atk~=0 then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_SET_ATTACK)
-		e1:SetValue(atk)
-		e1:SetReset(RESET_EVENT+0x1ff0000)
-		c:RegisterEffect(e1)
+		atk=atk+(catk>=0 and catk or 0)
+		tc=g:GetNext()
 	end
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_SET_ATTACK)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetValue(atk)
+	e1:SetReset(RESET_EVENT+0xff0000)
+	c:RegisterEffect(e1)
 end
+

script/c73333463.lua

---ライトロード·エンジェル ケルビム
-function c73333463.initial_effect(c)
-	--summon success
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(73333463,0))
-	e1:SetCategory(CATEGORY_REMOVE)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_SUMMON_SUCCESS)
-	e1:SetCondition(c73333463.condition)
-	e1:SetTarget(c73333463.target)
-	e1:SetOperation(c73333463.operation)
-	c:RegisterEffect(e1)
-	--tribute check
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_MATERIAL_CHECK)
-	e2:SetValue(c73333463.valcheck)
-	e2:SetLabelObject(e1)
-	c:RegisterEffect(e2)
-end
-function c73333463.valcheck(e,c)
-	local g=c:GetMaterial()
-	if g:IsExists(Card.IsSetCard,1,nil,0x16) then
-		e:GetLabelObject():SetLabel(1)
-	else
-		e:GetLabelObject():SetLabel(0)
-	end
-end
-function c73333463.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE and e:GetLabel()==1
-end
-function c73333463.filter(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()
-end
-function c73333463.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	local g=Duel.GetMatchingGroup(c73333463.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
-end
-function c73333463.operation(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(c73333463.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
-	if g:GetCount()>0 then
-		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
-	end
-end
+--アーマロイドガイデンゴー
+function c73333463.initial_effect(c)
+	--summon success
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(73333463,0))
+	e1:SetCategory(CATEGORY_REMOVE)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetCondition(c73333463.condition)
+	e1:SetTarget(c73333463.target)
+	e1:SetOperation(c73333463.operation)
+	c:RegisterEffect(e1)
+	--tribute check
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetCode(EFFECT_MATERIAL_CHECK)
+	e2:SetValue(c73333463.valcheck)
+	e2:SetLabelObject(e1)
+	c:RegisterEffect(e2)
+end
+function c73333463.valcheck(e,c)
+	local g=c:GetMaterial()
+	if g:IsExists(Card.IsSetCard,1,nil,0x16) then
+		e:GetLabelObject():SetLabel(1)
+	else
+		e:GetLabelObject():SetLabel(0)
+	end
+end
+function c73333463.condition(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():GetSummonType()==SUMMON_TYPE_ADVANCE and e:GetLabel()==1
+end
+function c73333463.filter(c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()
+end
+function c73333463.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	local g=Duel.GetMatchingGroup(c73333463.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
+end
+function c73333463.operation(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetMatchingGroup(c73333463.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	if g:GetCount()>0 then
+		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
+	end
+end

script/c8794435.lua

---合成魔獣 ガーゼット
-function c8794435.initial_effect(c)
-	--atk
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_SUMMON_SUCCESS)
-	e1:SetOperation(c8794435.atop)
-	c:RegisterEffect(e1)
-	--tribute check
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_MATERIAL_CHECK)
-	e2:SetValue(c8794435.valcheck)
-	e2:SetLabelObject(e1)
-	c:RegisterEffect(e2)
-end
-function c8794435.valcheck(e,c)
-	local g=c:GetMaterial()
-	local tc=g:GetFirst()
-	local atk=0
-	while tc do
-		local catk=tc:GetTextAttack()
-		atk=atk+(catk>=0 and catk or 0)
-		tc=g:GetNext()
-	end
-	e:GetLabelObject():SetLabel(atk)
-end
-function c8794435.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_SET_ATTACK)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(e:GetLabel())
-	e1:SetReset(RESET_EVENT+0x1ff0000)
-	c:RegisterEffect(e1)
-end
+--合成魔獣 ガーゼット
+function c8794435.initial_effect(c)
+	--tribute check
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_MATERIAL_CHECK)
+	e1:SetValue(c8794435.valcheck)
+	c:RegisterEffect(e1)
+end
+function c8794435.valcheck(e,c)
+	local g=c:GetMaterial()
+	local tc=g:GetFirst()
+	local atk=0
+	while tc do
+		local catk=tc:GetTextAttack()
+		atk=atk+(catk>=0 and catk or 0)
+		tc=g:GetNext()
+	end
+	--atk continuous effect
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_SET_ATTACK)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetValue(atk)
+	e1:SetReset(RESET_EVENT+0xff0000)
+	c:RegisterEffect(e1)
+end

script/c88071625.lua

@@ -17,11 +17,11 @@ function c88071625.initial_effect(c)
 	e2:SetOperation(c88071625.otop)
 	e2:SetValue(SUMMON_TYPE_ADVANCE)
 	c:RegisterEffect(e2)
-	--atk
+	--tribute check
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_SUMMON_SUCCESS)
-	e3:SetOperation(c88071625.atkop)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetCode(EFFECT_MATERIAL_CHECK)
+	e3:SetValue(c88071625.valcheck)
 	c:RegisterEffect(e3)
 	--copy
 	local e4=Effect.CreateEffect(c)
@@ -43,30 +43,28 @@ function c88071625.otop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:SetMaterial(sg)
 	Duel.Release(sg, REASON_SUMMON+REASON_MATERIAL)
 end
-function c88071625.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if c:GetMaterialCount()==0 then return end
-	local e1=Effect.CreateEffect(c)
-	local mg=c:GetMaterial()
-	local tc=mg:GetFirst()
+function c6614221.valcheck(e,c)
+	local g=c:GetMaterial()
+	local tc=g:GetFirst()
 	local atk=0
 	local def=0
 	while tc do
 		local catk=tc:GetTextAttack()
 		local cdef=tc:GetTextDefence()
-		if catk<0 then catk=0 end
-		if cdef<0 then cdef=0 end
-		atk=atk+catk
-		def=def+cdef
-		tc=mg:GetNext()
+		atk=atk+(catk>=0 and catk or 0)
+		def=def+(cdef>=0 and cdef or 0)
+		tc=g:GetNext()
 	end
+	--atk continuous effect
+	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetValue(atk)
-	e1:SetReset(RESET_EVENT+0x1ff0000)
+	e1:SetReset(RESET_EVENT+0xff0000)
 	c:RegisterEffect(e1)
+	--def continuous effect
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_UPDATE_DEFENCE)
 	e2:SetValue(def)