fix&new scripts

gframe/config.h

@@ -61,5 +61,6 @@ using namespace io;
 using namespace gui;
 
 extern const unsigned short PRO_VERSION;
+extern bool enable_log;
 
 #endif

gframe/gframe.cpp

@@ -2,7 +2,9 @@
 #include "game.h"
 #include <event2/thread.h>
 
-int main() {
+bool enable_log = false;
+
+int main(int argc, char* argv[]) {
 #ifdef _WIN32
 	WORD wVersionRequested;
 	WSADATA wsaData;
@@ -16,6 +18,8 @@ int main() {
 	ygo::mainGame = &_game;
 	if(!ygo::mainGame->Initialize())
 		return 0;
+	if(argc >= 2 && !strcmp(argv[1], "-debug"))
+		enable_log = true;
 	ygo::mainGame->MainLoop();
 #ifdef _WIN32
 	WSACleanup();

gframe/netserver.h

@@ -21,6 +21,7 @@ class NetServer {
 	static char net_server_read[0x2000];
 	static char net_server_write[0x2000];
 	static unsigned short last_sent;
+
 public:
 	static bool StartServer(unsigned short port);
 	static bool StartBroadcast();

gframe/single_duel.cpp

@@ -1346,9 +1346,13 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
 	}
 }
 int SingleDuel::MessageHandler(long fduel, int type) {
+	if(!enable_log)
+		return 0;
 	char msgbuf[1024];
 	get_log_message(fduel, (byte*)msgbuf);
 	FILE* fp = fopen("error.log", "at+");
+	if(!fp)
+		return 0;
 	msgbuf[1023] = 0;
 	fprintf(fp, "[Script error:] %s\n", msgbuf);
 	fclose(fp);

ocgcore/card.cpp

@@ -1698,7 +1698,8 @@ int32 card::is_destructable_by_effect(effect* peffect, uint8 playerid) {
 	for(int32 i = 0; i < eset.count; ++i) {
 		pduel->lua->add_param(peffect, PARAM_TYPE_EFFECT);
 		pduel->lua->add_param(playerid, PARAM_TYPE_INT);
-		if(eset[i]->check_value_condition(2))
+		pduel->lua->add_param(this, PARAM_TYPE_CARD);
+		if(eset[i]->check_value_condition(3))
 			return FALSE;
 	}
 	return TRUE;

ocgcore/interpreter.cpp

@@ -352,7 +352,7 @@ static const struct luaL_Reg duellib[] = {
 	{ "IsDamageCalculated", scriptlib::duel_is_damage_calculated },
 	{ "GetAttacker", scriptlib::duel_get_attacker },
 	{ "GetAttackTarget", scriptlib::duel_get_attack_target },
-	{ "DisableAttack", scriptlib::duel_disable_attack },
+	{ "NegateAttack", scriptlib::duel_disable_attack },
 	{ "ChainAttack", scriptlib::duel_chain_attack },
 	{ "Readjust", scriptlib::duel_readjust },
 	{ "GetFieldGroup", scriptlib::duel_get_field_group },

ocgcore/operations.cpp

@@ -184,7 +184,8 @@ void field::destroy(card_set* targets, effect* reason_effect, uint32 reason, uin
 		(*cit)->temp.reason_effect = (*cit)->current.reason_effect;
 		(*cit)->temp.reason_player = (*cit)->current.reason_player;
 		(*cit)->current.reason = reason;
-		(*cit)->current.reason_effect = reason_effect;
+		if(reason_effect)
+			(*cit)->current.reason_effect = reason_effect;
 		(*cit)->current.reason_player = reason_player;
 		p = playerid;
 		if(!(destination & (LOCATION_HAND + LOCATION_DECK + LOCATION_REMOVED)))
@@ -732,10 +733,14 @@ int32 field::remove_overlay_card(uint16 step, uint32 reason, card* pcard, uint8
 int32 field::get_control(uint16 step, effect * reason_effect, uint8 reason_player, card * pcard, uint8 playerid, uint8 reset_phase, uint8 reset_count) {
 	switch(step) {
 	case 0: {
+		if(pcard->current.controler == playerid) {
+			returns.ivalue[0] = 1;
+			return TRUE;
+		}
 		returns.ivalue[0] = 0;
 		if(pcard->overlay_target)
 			return TRUE;
-		if(pcard->current.controler == PLAYER_NONE || pcard->current.controler == playerid)
+		if(pcard->current.controler == PLAYER_NONE)
 			return TRUE;
 		if(pcard->current.location != LOCATION_MZONE)
 			return TRUE;

ocgcore/processor.cpp

@@ -4298,18 +4298,22 @@ int32 field::adjust_step(uint16 step) {
 		}
 		//self destroy
 		uint8 tp = infos.turn_player;
-		card* pcard;
+		effect* peffect;
 		core.destroy_set.clear();
 		for(uint8 p = 0; p < 2; ++p) {
 			for(uint8 i = 0; i < 5; ++i) {
-				pcard = player[tp].list_mzone[i];
-				if(pcard && pcard->is_position(POS_FACEUP) && pcard->is_affected_by_effect(EFFECT_SELF_DESTROY))
+				card* pcard = player[tp].list_mzone[i];
+				if(pcard && pcard->is_position(POS_FACEUP) && (peffect = pcard->is_affected_by_effect(EFFECT_SELF_DESTROY))) {
 					core.destroy_set.insert(pcard);
+					pcard->current.reason_effect = peffect;
+				}
 			}
 			for(uint8 i = 0; i < 6; ++i) {
-				pcard = player[tp].list_szone[i];
-				if(pcard && pcard->is_position(POS_FACEUP) && pcard->is_affected_by_effect(EFFECT_SELF_DESTROY))
+				card* pcard = player[tp].list_szone[i];
+				if(pcard && pcard->is_position(POS_FACEUP) && (peffect = pcard->is_affected_by_effect(EFFECT_SELF_DESTROY))) {
 					core.destroy_set.insert(pcard);
+					pcard->current.reason_effect = peffect;
+				}
 			}
 			tp = 1 - tp;
 		}

script/c10000010.lua

@@ -101,7 +101,7 @@ function c10000010.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,1000)
 end
 function c10000010.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocatioin(LOCATION_MZONE) and chkcLIsDestructable() end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsDestructable() end
 	if chk==0 then return Duel.IsExistingTarget(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)

script/c10000011.lua

@@ -101,7 +101,7 @@ function c10000011.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,1000)
 end
 function c10000011.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocatioin(LOCATION_MZONE) and chkcLIsDestructable() end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsDestructable() end
 	if chk==0 then return Duel.IsExistingTarget(Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,Card.IsDestructable,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)

script/c10875327.lua

@@ -0,0 +1,87 @@
+--地縛神 Aslla piscu
+function c10875327.initial_effect(c)
+	--only 1 can exists
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_SUMMON)
+	e1:SetCondition(c10875327.excon)
+	c:RegisterEffect(e1)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_CANNOT_FLIP_SUMMON)
+	c:RegisterEffect(e2)
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e3:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e3:SetValue(c10875327.splimit)
+	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_SINGLE)
+	e4:SetCode(EFFECT_SELF_DESTROY)
+	e4:SetCondition(c10875327.sdcon)
+	c:RegisterEffect(e4)
+	--battle target
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_SINGLE)
+	e5:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetValue(1)
+	c:RegisterEffect(e5)
+	--direct atk
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_SINGLE)
+	e6:SetCode(EFFECT_DIRECT_ATTACK)
+	c:RegisterEffect(e6)
+	--destroy
+	local e7=Effect.CreateEffect(c)
+	e7:SetDescription(aux.Stringid(10875327,0))
+	e7:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE)
+	e7:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e7:SetCode(EVENT_LEAVE_FIELD)
+	e7:SetCondition(c10875327.descon)
+	e7:SetTarget(c10875327.destg)
+	e7:SetOperation(c10875327.desop)
+	c:RegisterEffect(e7)
+end
+function c10875327.exfilter(c,fid)
+	return c:IsFaceup() and c:IsSetCard(0x21) and (fid==nil or c:GetFieldID()<fid)
+end
+function c10875327.excon(e)
+	return Duel.IsExistingMatchingCard(c10875327.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil)
+end
+function c10875327.splimit(e,se,sp,st,spos,tgp)
+	if bit.band(spos,POS_FACEDOWN)~=0 then return true end
+	return not Duel.IsExistingMatchingCard(c10875327.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil)
+end
+function c10875327.sdcon(e)
+	local c=e:GetHandler()
+	if c:IsStatus(STATUS_BATTLE_DESTROYED) or c:IsHasEffect(67987302) then return false end
+	local f1=Duel.GetFieldCard(0,LOCATION_SZONE,5)
+	local f2=Duel.GetFieldCard(1,LOCATION_SZONE,5)
+	return ((f1==nil or not f1:IsFaceup()) and (f2==nil or not f2:IsFaceup()))
+		or Duel.IsExistingMatchingCard(c10875327.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetFieldID())
+end
+function c10875327.descon(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+		and (not re or re:GetHandler()~=c)
+end
+function c10875327.desfilter(c)
+	return c:IsFaceup() and c:IsDestructable()
+end
+function c10875327.destg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	local g=Duel.GetMatchingGroup(c10875327.desfilter,tp,0,LOCATION_MZONE,nil)
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
+	if g:GetCount()~=0 then
+		Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,g:GetCount()*800)
+	end
+end
+function c10875327.desop(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetMatchingGroup(c10875327.desfilter,tp,0,LOCATION_MZONE,nil)
+	local ct=Duel.Destroy(g,REASON_EFFECT)
+	if ct~=0 then
+		Duel.Damage(1-tp,ct*800,REASON_EFFECT)
+	end
+end

script/c14315573.lua

@@ -21,7 +21,7 @@ function c14315573.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c14315573.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetAttacker()
-	if tc:IsRelateToEffect(tc) and tc:IsFaceup() and Duel.DisableAttack(tc) then
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.NegateAttack() then
 		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
 	end
 end

script/c14462257.lua

@@ -30,7 +30,7 @@ function c14462257.filter(c)
 	return c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
 function c14462257.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsCOntroler(tp) and c14462257.filter(chkc) end
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c14462257.filter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c14462257.filter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectTarget(tp,c14462257.filter,tp,LOCATION_GRAVE,0,1,1,nil)

script/c15187079.lua

@@ -0,0 +1,89 @@
+--地縛神 Uru
+function c15187079.initial_effect(c)
+	--only 1 can exists
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_SUMMON)
+	e1:SetCondition(c15187079.excon)
+	c:RegisterEffect(e1)
+	local e2=e1:Clone()
+	e2:SetCode(EFFECT_CANNOT_FLIP_SUMMON)
+	c:RegisterEffect(e2)
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e3:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e3:SetValue(c15187079.splimit)
+	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_SINGLE)
+	e4:SetCode(EFFECT_SELF_DESTROY)
+	e4:SetCondition(c15187079.sdcon)
+	c:RegisterEffect(e4)
+	--battle target
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_SINGLE)
+	e5:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetValue(1)
+	c:RegisterEffect(e5)
+	--direct atk
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_SINGLE)
+	e6:SetCode(EFFECT_DIRECT_ATTACK)
+	c:RegisterEffect(e6)
+	--damage
+	local e7=Effect.CreateEffect(c)
+	e7:SetDescription(aux.Stringid(15187079,0))
+	e7:SetCategory(CATEGORY_CONTROL)
+	e7:SetType(EFFECT_TYPE_IGNITION)
+	e7:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e7:SetRange(LOCATION_MZONE)
+	e7:SetCountLimit(1)
+	e7:SetCost(c15187079.ctcost)
+	e7:SetTarget(c15187079.cttg)
+	e7:SetOperation(c15187079.ctop)
+	c:RegisterEffect(e7)
+end
+function c15187079.exfilter(c,fid)
+	return c:IsFaceup() and c:IsSetCard(0x21) and (fid==nil or c:GetFieldID()<fid)
+end
+function c15187079.excon(e)
+	return Duel.IsExistingMatchingCard(c15187079.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil)
+end
+function c15187079.splimit(e,se,sp,st,spos,tgp)
+	if bit.band(spos,POS_FACEDOWN)~=0 then return true end
+	return not Duel.IsExistingMatchingCard(c15187079.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil)
+end
+function c15187079.sdcon(e)
+	local c=e:GetHandler()
+	if c:IsStatus(STATUS_BATTLE_DESTROYED) or c:IsHasEffect(67987302) then return false end
+	local f1=Duel.GetFieldCard(0,LOCATION_SZONE,5)
+	local f2=Duel.GetFieldCard(1,LOCATION_SZONE,5)
+	return ((f1==nil or not f1:IsFaceup()) and (f2==nil or not f2:IsFaceup()))
+		or Duel.IsExistingMatchingCard(c15187079.exfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetFieldID())
+end
+function c15187079.ctcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.CheckReleaseGroup(tp,nil,1,e:GetHandler()) end
+	local g=Duel.SelectReleaseGroup(tp,nil,1,1,e:GetHandler())
+	Duel.Release(g,REASON_EFFECT)
+end
+function c15187079.filter(c)
+	return c:IsFaceup() and c:IsAbleToChangeControler()
+end
+function c15187079.cttg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c15187079.filter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c15187079.filter,tp,0,LOCATION_MZONE,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
+	local g=Duel.SelectTarget(tp,c15187079.filter,tp,0,LOCATION_MZONE,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,1,0,0)
+end
+function c15187079.ctop(e,tp,eg,ep,ev,re,r,rp)
+	local tc=Duel.GetFirstTarget()
+	if tc:IsRelateToEffect(e) and tc:IsFaceup() and not Duel.GetControl(tc,tp,PHASE_END,1) then
+		if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then
+			Duel.Destroy(tc,REASON_EFFECT)
+		end
+	end
+end

script/c16255442.lua

@@ -19,7 +19,7 @@ function c16255442.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	local sg=Duel.GetFieldGroup(tp,LOCATION_HAND,0,nil)
 	local tg=Duel.GetMatchingGroup(c16255442.filter,tp,LOCATION_GRAVE,0,nil)
-	Duel.SetOperationInfo(0,CATEGORY_HANDDES,sg,sg:GetCount(),0,0)
+	Duel.SetOperationInfo(0,CATEGORY_HANDES,sg,sg:GetCount(),0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,tg,sg:GetCount(),tp,LOCATION_GRAVE)
 end
 function c16255442.operation(e,tp,eg,ep,ev,re,r,rp)

script/c18060565.lua

@@ -18,7 +18,7 @@ function c18060565.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0x29) and c:IsRace(RACE_WINDBEAST)
 end
 function c18060565.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MOZNE) and chkc:IsControler(tp) and c18060565.filter(chkc) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c18060565.filter(chkc) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.IsExistingTarget(c18060565.filter,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)

script/c18407024.lua

@@ -21,7 +21,7 @@ end
 function c18407024.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(ep,LOCATION_HAND,0,nil)
 	if g:GetCount()==0 then return end
-	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSGDISCARD)
+	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_DISCARD)
 	local sg=g:Select(1-tp,1,1,nil)
 	Duel.SendtoGrave(sg,REASON_DISCARD+REASON_EFFECT)
 end

script/c18964575.lua

@@ -20,6 +20,7 @@ function c18964575.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
 end
 function c18964575.operation(e,tp,eg,ep,ev,re,r,rp)
-	Duel.DisableAttack()
-	Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
+	if Duel.NegateAttack() then
+		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
+	end
 end

script/c20638610.lua

@@ -6,7 +6,7 @@ function c20638610.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(0,TIMING_ENG_PHASE)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetTarget(c20638610.target)
 	e1:SetOperation(c20638610.operation)
 	c:RegisterEffect(e1)

script/c21420702.lua

@@ -49,7 +49,7 @@ function c21420702.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local g=Duel.SelectTarget(tp,Card.IsDestructable,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,500)
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,HAND)
+	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_HAND)
 end
 function c21420702.desop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end