Merge pull request #1376 from Tianchenglipu/patch-3

Gemini Treat As Normal

script/c13391185.lua

@@ -4,23 +4,27 @@ function c13391185.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_TYPE)
+	e1:SetCode(EFFECT_ADD_TYPE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c13391185.eqcon1)
-	e1:SetValue(TYPE_NORMAL+TYPE_MONSTER)
+	e1:SetValue(TYPE_NORMAL)
 	c:RegisterEffect(e1)
-	--tohand
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(13391185,0))
-	e2:SetCategory(CATEGORY_TOHAND)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,13391185)
-	e2:SetCondition(c13391185.thcon)
-	e2:SetTarget(c13391185.thtg)
-	e2:SetOperation(c13391185.thop)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_REMOVE_TYPE)
+	e2:SetValue(TYPE_EFFECT)
 	c:RegisterEffect(e2)
+	--tohand
+	local e3=Effect.CreateEffect(c)
+	e3:SetDescription(aux.Stringid(13391185,0))
+	e3:SetCategory(CATEGORY_TOHAND)
+	e3:SetType(EFFECT_TYPE_IGNITION)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCountLimit(1,13391185)
+	e3:SetCondition(c13391185.thcon)
+	e3:SetTarget(c13391185.thtg)
+	e3:SetOperation(c13391185.thop)
+	c:RegisterEffect(e3)
 end
 function c13391185.eqcon1(e)
 	local eg=e:GetHandler():GetEquipGroup()

script/c47120245.lua

@@ -4,35 +4,39 @@ function c47120245.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_TYPE)
+	e1:SetCode(EFFECT_ADD_TYPE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c47120245.eqcon1)
-	e1:SetValue(TYPE_NORMAL+TYPE_MONSTER)
+	e1:SetValue(TYPE_NORMAL)
 	c:RegisterEffect(e1)
-	--Attribute Dark
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_ATTRIBUTE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(c47120245.eqcon2)
-	e2:SetValue(ATTRIBUTE_DARK)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_REMOVE_TYPE)
+	e2:SetValue(TYPE_EFFECT)
 	c:RegisterEffect(e2)
-	local e3=e2:Clone()
-	e3:SetCode(EFFECT_UPDATE_LEVEL)
-	e3:SetValue(1)
+	--Attribute Dark
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetCode(EFFECT_CHANGE_ATTRIBUTE)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCondition(c47120245.eqcon2)
+	e3:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e3)
-	--search
-	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(47120245,0))
-	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e4:SetType(EFFECT_TYPE_IGNITION)
-	e4:SetRange(LOCATION_MZONE)
-	e4:SetCountLimit(1,47120245)
-	e4:SetCondition(c47120245.thcon)
-	e4:SetTarget(c47120245.thtg)
-	e4:SetOperation(c47120245.thop)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_UPDATE_LEVEL)
+	e4:SetValue(1)
 	c:RegisterEffect(e4)
+	--search
+	local e5=Effect.CreateEffect(c)
+	e5:SetDescription(aux.Stringid(47120245,0))
+	e5:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e5:SetType(EFFECT_TYPE_IGNITION)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetCountLimit(1,47120245)
+	e5:SetCondition(c47120245.thcon)
+	e5:SetTarget(c47120245.thtg)
+	e5:SetOperation(c47120245.thop)
+	c:RegisterEffect(e5)
 end
 function c47120245.eqcon1(e)
 	return not e:GetHandler():GetEquipGroup():IsExists(Card.IsSetCard,1,nil,0x207a)

script/c47459126.lua

 --チューンド・マジシャン
 function c47459126.initial_effect(c)
+	aux.EnableDualAttribute(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_DUAL_SUMMONABLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e1:SetCode(EFFECT_ADD_TYPE)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCondition(aux.IsDualState)
+	e1:SetValue(TYPE_TUNER)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CHANGE_TYPE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCondition(aux.DualNormalCondition)
-	e2:SetValue(TYPE_NORMAL+TYPE_DUAL+TYPE_MONSTER)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_CHANGE_TYPE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetValue(c47459126.tpval)
-	c:RegisterEffect(e3)
-end
-function c47459126.tpval(e,c)
-	if c:IsFaceup() and not c:IsDualState() then return TYPE_NORMAL+TYPE_DUAL+TYPE_MONSTER
-	else return TYPE_EFFECT+TYPE_DUAL+TYPE_MONSTER+TYPE_TUNER end
 end
+

script/c59057152.lua

 --聖騎士モルドレッド
 function c59057152.initial_effect(c)
-	--Attribute Dark
+	--normal monster
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_CHANGE_TYPE)
+	e1:SetCode(EFFECT_ADD_TYPE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c59057152.eqcon1)
-	e1:SetValue(TYPE_NORMAL+TYPE_MONSTER)
+	e1:SetValue(TYPE_NORMAL)
 	c:RegisterEffect(e1)
-	--Attribute Dark
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e2:SetCode(EFFECT_CHANGE_ATTRIBUTE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(c59057152.eqcon2)
-	e2:SetValue(ATTRIBUTE_DARK)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_REMOVE_TYPE)
+	e2:SetValue(TYPE_EFFECT)
 	c:RegisterEffect(e2)
+	--Attribute Dark
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetCode(EFFECT_UPDATE_LEVEL)
+	e3:SetCode(EFFECT_CHANGE_ATTRIBUTE)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(c59057152.eqcon2)
-	e3:SetValue(1)
+	e3:SetValue(ATTRIBUTE_DARK)
 	c:RegisterEffect(e3)
-	--spsummon
-	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(59057152,0))
-	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e4:SetType(EFFECT_TYPE_IGNITION)
-	e4:SetRange(LOCATION_MZONE)
-	e4:SetCountLimit(1)
-	e4:SetCondition(c59057152.spcon)
-	e4:SetTarget(c59057152.sptg)
-	e4:SetOperation(c59057152.spop)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_UPDATE_LEVEL)
+	e4:SetValue(1)
 	c:RegisterEffect(e4)
+	--spsummon
+	local e5=Effect.CreateEffect(c)
+	e5:SetDescription(aux.Stringid(59057152,0))
+	e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e5:SetType(EFFECT_TYPE_IGNITION)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetCountLimit(1)
+	e5:SetCondition(c59057152.spcon)
+	e5:SetTarget(c59057152.sptg)
+	e5:SetOperation(c59057152.spop)
+	c:RegisterEffect(e5)
 end
 function c59057152.eqcon1(e)
 	local eg=e:GetHandler():GetEquipGroup()

script/c86489182.lua

 --始祖神鳥シムルグ
 function c86489182.initial_effect(c)
+	--normal monster
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetCode(EFFECT_CHANGE_TYPE)
-	e1:SetValue(TYPE_NORMAL+TYPE_MONSTER)
+	e1:SetCode(EFFECT_ADD_TYPE)
+	e1:SetValue(TYPE_NORMAL)
 	c:RegisterEffect(e1)
-	--decrease tribute
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DECREASE_TRIBUTE)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WIND))
-	e2:SetValue(0x10001)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_REMOVE_TYPE)
+	e2:SetValue(TYPE_EFFECT)
 	c:RegisterEffect(e2)
-	local e3=e2:Clone()
-	e3:SetCode(EFFECT_DECREASE_TRIBUTE_SET)
+	--decrease tribute
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_DECREASE_TRIBUTE)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
+	e3:SetTarget(aux.TargetBoolFunction(Card.IsAttribute,ATTRIBUTE_WIND))
+	e3:SetValue(0x10001)
 	c:RegisterEffect(e3)
-	--summon success
-	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(86489182,0))
-	e4:SetCategory(CATEGORY_TOHAND)
-	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e4:SetCode(EVENT_SUMMON_SUCCESS)
-	e4:SetCondition(c86489182.condition)
-	e4:SetTarget(c86489182.target)
-	e4:SetOperation(c86489182.operation)
+	local e4=e3:Clone()
+	e4:SetCode(EFFECT_DECREASE_TRIBUTE_SET)
 	c:RegisterEffect(e4)
-	--tribute check
+	--summon success
 	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_SINGLE)
-	e5:SetCode(EFFECT_MATERIAL_CHECK)
-	e5:SetValue(c86489182.valcheck)
-	e5:SetLabelObject(e4)
+	e5:SetDescription(aux.Stringid(86489182,0))
+	e5:SetCategory(CATEGORY_TOHAND)
+	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e5:SetCode(EVENT_SUMMON_SUCCESS)
+	e5:SetCondition(c86489182.condition)
+	e5:SetTarget(c86489182.target)
+	e5:SetOperation(c86489182.operation)
 	c:RegisterEffect(e5)
+	--tribute check
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_SINGLE)
+	e6:SetCode(EFFECT_MATERIAL_CHECK)
+	e6:SetValue(c86489182.valcheck)
+	e6:SetLabelObject(e5)
+	c:RegisterEffect(e6)
 end
 function c86489182.valcheck(e,c)
 	local g=c:GetMaterial()
@@ -62,4 +67,4 @@ function c86489182.operation(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 	end
-end
\ No newline at end of file
+end

script/utility.lua

@@ -76,12 +76,16 @@ function Auxiliary.EnableDualAttribute(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CHANGE_TYPE)
+	e2:SetCode(EFFECT_ADD_TYPE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
 	e2:SetCondition(aux.DualNormalCondition)
-	e2:SetValue(TYPE_NORMAL+TYPE_DUAL+TYPE_MONSTER)
+	e2:SetValue(TYPE_NORMAL)
 	c:RegisterEffect(e2)
+	local e3=e2:Clone()
+	e3:SetCode(EFFECT_REMOVE_TYPE)
+	e3:SetValue(TYPE_EFFECT)
+	c:RegisterEffect(e3)
 end
 function Auxiliary.TargetEqualFunction(f,value,a,b,c)
 	return	function(effect,target)