new

ocgcore/card.h

@@ -338,10 +338,10 @@ public:
 #define SUMMON_TYPE_DUAL	0x12000000
 #define SUMMON_TYPE_FLIP	0x20000000
 #define SUMMON_TYPE_SPECIAL	0x40000000
-#define SUMMON_TYPE_FUSION	0x41000000
-#define SUMMON_TYPE_RITUAL	0x42000000
-#define SUMMON_TYPE_SYNCHRO	0x43000000
-#define SUMMON_TYPE_XYZ		0x44000000
+#define SUMMON_TYPE_FUSION	0x43000000
+#define SUMMON_TYPE_RITUAL	0x45000000
+#define SUMMON_TYPE_SYNCHRO	0x46000000
+#define SUMMON_TYPE_XYZ		0x49000000
 //Status
 #define STATUS_DISABLED				0x0001	//
 #define STATUS_TO_ENABLE			0x0002	//

script/c34236961.lua

@@ -18,26 +18,27 @@ function c34236961.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function c34236961.activate(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)==0 or Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)==0 then return end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 	local g1=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_HAND,0,1,1,nil)
+	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CONFIRM)
 	local g2=Duel.SelectMatchingCard(1-tp,nil,1-tp,LOCATION_HAND,0,1,1,nil)
-        if g1:GetCount()>0 and g2:GetCount()>0 then
-		Duel.ConfirmCards(1-tp,g1)
-		Duel.ConfirmCards(tp,g2)
-		local atpsl=g1:GetFirst()
-		local ntpsl=g2:GetFirst()
-		local atplv=atpsl:IsType(TYPE_MONSTER) and atpsl:GetLevel() or 0
-		local ntplv=ntpsl:IsType(TYPE_MONSTER) and ntpsl:GetLevel() or 0
-		if atplv==ntplv then
-			Duel.ShuffleHand(tp)
-			Duel.ShuffleHand(1-tp)
-		elseif atplv>ntplv then
-			Duel.Damage(1-tp,1000,REASON_EFFECT)
-			Duel.SendtoGrave(g2,REASON_EFFECT)
-			Duel.ShuffleHand(tp)
-		else
-			Duel.Damage(tp,1000,REASON_EFFECT)
-			Duel.SendtoGrave(g1,REASON_EFFECT)
-			Duel.ShuffleHand(1-tp)
-		end
+	Duel.ConfirmCards(1-tp,g1)
+	Duel.ConfirmCards(tp,g2)
+	local atpsl=g1:GetFirst()
+	local ntpsl=g2:GetFirst()
+	local atplv=atpsl:IsType(TYPE_MONSTER) and atpsl:GetLevel() or 0
+	local ntplv=ntpsl:IsType(TYPE_MONSTER) and ntpsl:GetLevel() or 0
+	if atplv==ntplv then
+		Duel.ShuffleHand(tp)
+		Duel.ShuffleHand(1-tp)
+	elseif atplv>ntplv then
+		Duel.Damage(1-tp,1000,REASON_EFFECT)
+		Duel.SendtoGrave(g2,REASON_EFFECT)
+		Duel.ShuffleHand(tp)
+	else
+		Duel.Damage(tp,1000,REASON_EFFECT)
+		Duel.SendtoGrave(g1,REASON_EFFECT)
+		Duel.ShuffleHand(1-tp)
 	end
 end

script/c64163367.lua

@@ -22,7 +22,7 @@ function c64163367.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c64163367.ctop1(e,tp,eg,ep,ev,re,r,rp)
-	e:GetHandler():AddCounter(0xe,ev)
+	e:GetHandler():AddCounter(0xe,1)
 end
 function c64163367.ctcon2(e,tp,eg,ep,ev,re,r,rp)
 	local ct=e:GetHandler():GetCounter(0xe)

script/constant.lua

@@ -107,10 +107,10 @@ SUMMON_TYPE_ADVANCE	=0x11000000
 SUMMON_TYPE_DUAL	=0x12000000
 SUMMON_TYPE_FLIP	=0x20000000
 SUMMON_TYPE_SPECIAL	=0x40000000
-SUMMON_TYPE_FUSION	=0x41000000
-SUMMON_TYPE_RITUAL	=0x42000000
-SUMMON_TYPE_SYNCHRO	=0x43000000
-SUMMON_TYPE_XYZ		=0x44000000
+SUMMON_TYPE_FUSION	=0x43000000
+SUMMON_TYPE_RITUAL	=0x45000000
+SUMMON_TYPE_SYNCHRO	=0x46000000
+SUMMON_TYPE_XYZ		=0x49000000
 --Status
 STATUS_DISABLED				=0x0001	--
 STATUS_TO_ENABLE			=0x0002	--