Fix Aspischool and Aramasa

script/c101208186.lua

@@ -6,11 +6,18 @@ function s.initial_effect(c)
 	e1:SetCategory(CATEGORY_DECKDES+CATEGORY_REMOVE+CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+    e1:SetCost(s.cost)
 	e1:SetCondition(s.condition)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
 end
+function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,1,1,nil)
+	Duel.Remove(g,POS_FACEUP,REASON_COST)
+end
 function s.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity()
 end
@@ -43,13 +50,31 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if g1:GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
 		local sg1=g1:Select(tp,1,1,nil)
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-		local sg2=Duel.SelectMatchingCard(tp,s.filter2,tp,LOCATION_DECK,0,1,1,sg1:GetFirst())
-		sg1:Merge(sg2)
-		if sg1 and sg1:GetFirst():IsAbleToGrave() and sg2:GetFirst():IsAbleToGrave() and (not sg1:GetFirst():IsAbleToRemove() or not sg2:GetFirst():IsAbleToRemove() or Duel.SelectOption(tp,1191,1192)==0) then
-			Duel.SendtoGrave(sg1,REASON_EFFECT)
-		else
-			Duel.Remove(sg1,POS_FACEUP,REASON_EFFECT)
-		end
+        if sg1:GetFirst():IsAbleToGrave() then
+            Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
+            local sg2=Duel.SelectMatchingCard(tp,s.filter2,tp,LOCATION_DECK,0,1,1,sg1:GetFirst())
+            sg1:Merge(sg2)
+            if not sg1:GetFirst():IsAbleToRemove() or not sg2:GetFirst():IsAbleToRemove() or Duel.SelectOption(tp,1191,1192)==0 then
+                Duel.SendtoGrave(sg1,REASON_EFFECT)
+            else
+                Duel.Remove(sg1,POS_FACEUP,REASON_EFFECT)
+            end
+        else
+            Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
+            local sg2=Duel.SelectMatchingCard(tp,s.filter3,tp,LOCATION_DECK,0,1,1,sg1:GetFirst())
+            sg1:Merge(sg2)
+            Duel.Remove(sg1,POS_FACEUP,REASON_EFFECT)
+        end
 	end
+    local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e1:SetTargetRange(1,0)
+	e1:SetTarget(s.splimit)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e1,tp)
+end
+function s.splimit(e,c)
+	return not c:IsRace(RACE_FISH)
 end
\ No newline at end of file

script/c101208190.lua

@@ -30,7 +30,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x1c3) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x1c3) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() 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