added functionality for change type and attributes of rush cards

Author: Yoshi80

proc_rush.lua

@@ -52,7 +52,37 @@ if Duel.IsDuelType(DUEL_INVERTED_QUICK_PRIORITY) then
 	end)()
 end
 function Card.IsCanChangePositionRush(c)
-	return c:IsCanChangePosition() and not c:IsMaximumMode() and not c:IsHasEffect(EFFECT_CANNOT_CHANGE_POS_E)
+	return c:IsCanChangePosition() and not c:IsMaximumMode()
+end
+function Card.CanChangeIntoTypeRush(c,type,turnvalue)
+	if c:IsOriginalRace(type) then return false end
+	if not c:IsRace(type) then return true end
+	if not c:IsHasEffect(EFFECT_CHANGE_RACE) then return true end
+	if nil==turnvalue then turnvalue=1 end
+	eff={c:GetCardEffect(EFFECT_CHANGE_RACE)}
+	for _,te in ipairs(eff) do
+		local effType=te:GetType()
+		if effType~=EFFECT_TYPE_FIELD and eff_type~=EFFECT_TYPE_EQUIP then
+			local _,effectvalue=te:GetReset()
+			if effectvalue>=turnvalue then return false end
+		end
+	end
+	return true
+end
+function Card.CanChangeIntoAttributeRush(c,attribute,turnvalue)
+	if c:IsOriginalAttribute(attribute) then return false end
+	if not c:IsAttribute(attribute) then return true end
+	if not c:IsHasEffect(EFFECT_CHANGE_ATTRIBUTE) then return true end
+	if nil==turnvalue then turnvalue=1 end
+	eff={c:GetCardEffect(EFFECT_CHANGE_ATTRIBUTE)}
+	for _,te in ipairs(eff) do
+		local effType=te:GetType()
+		if effType~=EFFECT_TYPE_FIELD and eff_type~=EFFECT_TYPE_EQUIP then
+			local _,effectvalue=te:GetReset()
+			if effectvalue>=turnvalue then return false end
+		end
+	end
+	return true
 end
 
 --Add function to simplify some effect

rush/c160002043.lua

@@ -17,7 +17,7 @@ function s.rvfilter(c,tp)
 		and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.attfilter,c:GetAttribute()),tp,0,LOCATION_MZONE,1,nil,c:GetAttribute())
 end
 function s.attfilter(c,att)
-	return c:IsFaceup() and c:IsMonster() and not c:IsAttribute(att)
+	return c:IsFaceup() and c:IsMonster() and c:CanChangeIntoAttributeRush(att)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.rvfilter,tp,LOCATION_HAND,0,1,nil,tp) end

rush/c160003036.lua

@@ -21,7 +21,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetMatchingGroupCountRush(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)>1
 end
 function s.attfilter(c)
-	return c:IsFaceup() and not c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsNotMaximumModeSide()
+	return c:IsFaceup() and c:CanChangeIntoAttributeRush(ATTRIBUTE_LIGHT) and c:IsNotMaximumModeSide()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.attfilter,tp,0,LOCATION_MZONE,1,e:GetHandler()) end

rush/c160004039.lua

@@ -16,7 +16,7 @@ function s.rvfilter(c,tp)
 		and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.attfilter,c:GetRace()),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetAttribute())
 end
 function s.attfilter(c,race)
-	return c:IsFaceup() and c:IsMonster() and not c:IsRace(race)
+	return c:IsFaceup() and c:IsMonster() and c:CanChangeIntoTypeRush(race)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.rvfilter,tp,LOCATION_HAND,0,1,nil,tp) end

rush/c160009030.lua

@@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(-300)
 		e1:SetReset(RESETS_STANDARD_PHASE_END)
 		tc:RegisterEffect(e1)
-		if not tc:IsRace(RACE_INSECT) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
+		if tc:CanChangeIntoTypeRush(RACE_INSECT) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 			Duel.BreakEffect()
 			--Change type to Insect
 			local e2=Effect.CreateEffect(c)

rush/c160010022.lua

@@ -29,7 +29,7 @@ function s.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,ct*200)
 end
 function s.mfilter(c)
-	return c:IsFaceup() and not c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsNotMaximumModeSide()
+	return c:IsFaceup() and c:CanChangeIntoAttributeRush(ATTRIBUTE_LIGHT) and c:IsNotMaximumModeSide()
 end
 function s.damop(e,tp,eg,ep,ev,re,r,rp)
 	--Requirement

rush/c160010035.lua

@@ -22,7 +22,7 @@ function s.rccost(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function s.rcfilter(c)
-	return c:IsFaceup() and not c:IsRace(RACE_INSECT) and c:IsNotMaximumModeSide()
+	return c:IsFaceup() and c:CanChangeIntoTypeRush(RACE_INSECT) and c:IsNotMaximumModeSide()
 end
 function s.rctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.rcfilter,tp,0,LOCATION_MZONE,1,nil) end

rush/c160020032.lua

@@ -34,9 +34,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectMatchingCard(tp,Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.HintSelection(g)
-	Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)
 	local g=Duel.GetMatchingGroup(s.desfilter,tp,0,LOCATION_MZONE,nil,e:GetHandler():GetLevel())
-	if #g>0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
+	if Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 and #g>0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 		local sg=g:Select(tp,1,1,nil)
 		if #sg==0 then return end

rush/c160020033.lua

@@ -31,7 +31,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end
 end
 function s.insectfilter(c)
-	return c:IsFaceup() and c:IsNotMaximumModeSide() and not c:IsRace(RACE_INSECT)
+	return c:IsFaceup() and c:IsNotMaximumModeSide() and c:CanChangeIntoTypeRush(RACE_INSECT,2)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	--Requirement

rush/c160209002.lua

@@ -27,7 +27,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,LOCATION_GRAVE)
 end
 function s.attfilter(c)
-	return c:IsFaceup() and not c:IsAttribute(ATTRIBUTE_LIGHT)
+	return c:IsFaceup() and c:CanChangeIntoAttributeRush(ATTRIBUTE_LIGHT)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<1 then return end