Merge branch 'master' of https://github.com/purerosefallen/ygopro-222DIY

expansions/script/c12000010.lua

@@ -33,7 +33,7 @@ function c12000010.activate1(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
 		Duel.SendtoGrave(tc,REASON_EFFECT+REASON_RETURN)
-		Duel.Draw(tp,1,REASON_EFFECT)
+		Duel.DiscardHand(tp,aux.TRUE,1,1,REASON_EFFECT+REASON_DISCARD)
 	end
 end
 function c12000010.thfilter(c)

expansions/script/c12000052.lua

 --奇迹糕点 誓言皇后
 function c12000052.initial_effect(c)
-	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)

expansions/script/c17060903.lua

@@ -17,6 +17,7 @@ function c17060903.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_GRAVE)
+	e2:SetCondition(aux.exccon)
 	e2:SetHintTiming(0,0x1c0)
 	e2:SetCost(aux.bfgcost)
 	e2:SetOperation(c17060903.downop)

expansions/script/c17060905.lua

@@ -9,6 +9,7 @@ function c17060905.initial_effect(c)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetCountLimit(1,17060905)
 	e1:SetCondition(c17060905.effcon)
+	e1:SetTarget(c17060905.efftg)
 	e1:SetOperation(c17060905.effop)
 	c:RegisterEffect(e1)
 	--destroy
@@ -38,27 +39,34 @@ end
 function c17060905.effcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_PZONE,0,1,e:GetHandler())
 end
+function c17060905.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return e:GetHandler():IsDestructable() end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
+end
 function c17060905.effop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstMatchingCard(nil,tp,LOCATION_PZONE,0,e:GetHandler())
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_UPDATE_LSCALE)
-	e1:SetValue(4)
-	e1:SetReset(RESET_EVENT+0x1fe0000)
-	tc:RegisterEffect(e1)
-	local e2=e1:Clone()
-	e2:SetCode(EFFECT_UPDATE_RSCALE)
-	tc:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(tc)
-	e3:SetDescription(aux.Stringid(17060905,2))
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EFFECT_DESTROY_REPLACE)
-	e3:SetRange(LOCATION_PZONE)
-	e3:SetTarget(c17060905.reptg)
-	e3:SetValue(c17060905.repval)
-	e3:SetOperation(c17060905.repop)
-	tc:RegisterEffect(e3)
+	if not e:GetHandler():IsRelateToEffect(e) then return end
+	if Duel.Destroy(e:GetHandler(),REASON_EFFECT)~=0 then
+		local tc=Duel.GetFirstMatchingCard(nil,tp,LOCATION_PZONE,0,e:GetHandler())
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_UPDATE_LSCALE)
+		e1:SetValue(4)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
+		tc:RegisterEffect(e1)
+		local e2=e1:Clone()
+		e2:SetCode(EFFECT_UPDATE_RSCALE)
+		tc:RegisterEffect(e2)
+		local e3=Effect.CreateEffect(tc)
+		e3:SetDescription(aux.Stringid(17060905,2))
+		e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
+		e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e3:SetCode(EFFECT_DESTROY_REPLACE)
+		e3:SetRange(LOCATION_PZONE)
+		e3:SetTarget(c17060905.reptg)
+		e3:SetValue(c17060905.repval)
+		e3:SetOperation(c17060905.repop)
+		tc:RegisterEffect(e3)
+	end
 end
 function c17060905.repfilter(c,tp)
 	return c:IsFaceup() and c:IsType(TYPE_PENDULUM) and c:IsLocation(LOCATION_MZONE+LOCATION_PZONE)

expansions/strings.conf

@@ -111,6 +111,7 @@
 
 #兔锅 222
 #named_with_Shirasawa_Tama 白泽球
+#named_with_Darkest_D DDD
 
 #Nemoma 337 0x440-0x44f
 !setname 0x442 动物朋友

gframe/tag_duel.cpp

@@ -639,10 +639,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			case 2:
 			case 3:
 			case 5:
-			//modded
-			case 10:
-			case 11:
-			case 12: {
+			case 10: {
 				NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, pbuf - offset);
 				break;
 			}
@@ -658,6 +655,18 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 					NetServer::ReSendToPlayer(*oit);
 #ifdef YGOPRO_SERVER_MODE
 			NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
+#endif
+				break;
+			}
+			//modded
+			case 11:
+			case 12: {
+				for(int i = 0; i < 4; ++i)
+					NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
+				for(auto oit = observers.begin(); oit != observers.end(); ++oit)
+					NetServer::ReSendToPlayer(*oit);
+#ifdef YGOPRO_SERVER_MODE
+			NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
 #endif
 				break;
 			}