Regular fixes

.gitignore

+.history
+ygopro-scripts-define
+.gitignore
+.gitmodules

script/c172016030.lua

@@ -10,6 +10,7 @@ function s.initial_effect(c)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCondition(s.thcon)
+	e1:SetTarget(s.thtg)
 	e1:SetCost(s.thcost)
 	e1:SetOperation(s.thop)
 	c:RegisterEffect(e1)
@@ -44,6 +45,9 @@ end
 function s.thfilter(c)
 	return c:IsAbleToHand() and c:IsSetCard(0x1b2) and c:IsType(TYPE_MONSTER) and not c:IsCode(id)
 end
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil)
+end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local h1=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil)

script/c172016035.lua

@@ -30,7 +30,7 @@ function s.filter(c)
 end
 function s.costfilter(c)
 	local te=c:GetActivateEffect()
-	return c:GetType()==TYPE_TRAP and c:IsAbleToGraveAsCost()
+	return c:GetType()==TYPE_TRAP and c:IsAbleToGraveAsCost() and te and te:GetCode()==EVENT_ATTACK_ANNOUNCE
 end
 function s.costfilter2(c)
 	return c:IsAbleToGraveAsCost() and c:IsType(TYPE_MONSTER)

script/c172016037.lua

@@ -40,6 +40,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e,tp)
 	end
 	-- override effect
+	local c=e:GetHandler()
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)

script/c172016041.lua

@@ -62,7 +62,7 @@ function s.ngop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
-function s.handcon(e,tp,eg,ep,ev,re,r,rp)
+function s.handcon(e,c)
 	return Duel.GetCustomActivityCount(id,e:GetHandlerPlayer(),ACTIVITY_CHAIN)==0 --and ep~=tp
 end
 function s.chainfilter(re,tp,cid)