Merge branch 'master' into patch

gframe/event_handler.cpp

@@ -913,6 +913,23 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					ShowSelectCard(true);
 				break;
 			}
+			if(mainGame->dInfo.player_type == 7) {
+				if(mainGame->wCardSelect->isVisible())
+					break;
+				selectable_cards.clear();
+				switch(hovered_location) {
+				case LOCATION_GRAVE: {
+					for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
+						selectable_cards.push_back(grave[hovered_controler][i]);
+					myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
+					mainGame->wCardSelect->setText(formatBuffer);
+					break;
+				}
+				}
+				if(selectable_cards.size())
+					ShowSelectCard(true);
+				break;
+			}
 			if(hovered_location & 0xe)
 				clicked_card = GetCard(hovered_controler, hovered_location, hovered_sequence);
 			else clicked_card = 0;

ocgcore/processor.cpp

@@ -4351,8 +4351,12 @@ int32 field::sort_chain(uint16 step, uint8 tp) {
 int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_player) {
 	switch(step) {
 	case 0: {
-		chain newchain;
 		core.solving_event.splice(core.solving_event.begin(), core.sub_solving_event);
+		if(!peffect->is_activateable(triggering_player, core.solving_event.front())) {
+			core.solving_event.pop_front();
+			return TRUE;
+		}
+		chain newchain;
 		newchain.chain_id = 0;
 		newchain.chain_count = 0;
 		newchain.triggering_effect = peffect;

script/c41613948.lua

@@ -36,7 +36,8 @@ function c41613948.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c41613948.operation(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and Duel.Remove(tc,tc:GetPosition(),REASON_EFFECT+REASON_TEMPORARY)~=0 then
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) and c:IsFaceup() and tc:IsRelateToEffect(e) and Duel.Remove(tc,tc:GetPosition(),REASON_EFFECT+REASON_TEMPORARY)~=0 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_STANDBY)

script/c42589641.lua

 --星輝士 トライヴェール
 function c42589641.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,aux.XyzFilterFunctionF(c,aux.FilterBoolFunction(Card.IsSetCard,0x9c),4),3)
+	aux.AddXyzProcedure(c,aux.XyzFilterFunctionF(c,c42589641.xyzfilter,4),3)
 	c:EnableReviveLimit()
 	--summon limit
 	local e1=Effect.CreateEffect(c)
@@ -72,6 +72,9 @@ function c42589641.checkop(e,tp,eg,ep,ev,re,r,rp)
 	if p1 then Duel.RegisterFlagEffect(0,42589641,RESET_PHASE+PHASE_END,0,1) end
 	if p2 then Duel.RegisterFlagEffect(1,42589641,RESET_PHASE+PHASE_END,0,1) end
 end
+function c42589641.xyzfilter(c)
+	return Duel.GetFlagEffect(c:GetControler(),42589641)==0 and c:IsSetCard(0x9c)
+end
 function c42589641.regcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ
 end
@@ -89,7 +92,7 @@ function c42589641.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not c:IsSetCard(0x9c)
 end
 function c42589641.splimit(e,se,sp,st,spos,tgp)
-	return bit.band(st,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ and Duel.GetFlagEffect(tgp,42589641)~=0
+	return bit.band(st,SUMMON_TYPE_XYZ)~=SUMMON_TYPE_XYZ or Duel.GetFlagEffect(tgp,42589641)==0
 end
 function c42589641.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ

script/c55713623.lua

@@ -28,7 +28,7 @@ function c55713623.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_SET_BASE_ATTACK)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
-		e1:SetValue(tc:GetTextAttack()/2)
+		e1:SetValue(tc:GetBaseAttack()/2)
 		tc:RegisterEffect(e1)
 	end
 end

script/c97997309.lua

@@ -20,6 +20,7 @@ function c97997309.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_ACTIVATE)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetHintTiming(0,0x1c0+TIMING_BATTLE_PHASE)
+	e2:SetCountLimit(1,97997309+EFFECT_COUNT_CODE_OATH)
 	e2:SetCondition(c97997309.condition)
 	e2:SetCost(c97997309.cost)
 	e2:SetTarget(c97997309.target2)
@@ -32,6 +33,7 @@ function c97997309.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_ACTIVATE)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetHintTiming(0,0x1e0)
+	e3:SetCountLimit(1,97997309+EFFECT_COUNT_CODE_OATH)
 	e3:SetCondition(c97997309.condition)
 	e3:SetCost(c97997309.cost)
 	e3:SetTarget(c97997309.target3)

strings.conf

@@ -217,7 +217,7 @@
 !system 1159 当魔法卡放置
 #menu
 !system 1200 联机模式
-!system 1201 单人模式
+!system 1201 残局模式
 !system 1202 观看录像
 !system 1203 Ｎ／Ａ
 !system 1204 编辑卡组
@@ -239,7 +239,7 @@
 !system 1227 决斗模式：
 !system 1228 ↓额外选项（无特殊要求请勿修改）
 !system 1229 不检查卡组
-!system 1230 开局不洗卡组
+!system 1230 不洗切卡组
 !system 1231 初始LP：
 !system 1232 初始手牌数：
 !system 1233 每回合抽卡：
@@ -381,7 +381,7 @@
 !victory 0x18 「混沌No.88　机关傀儡-灾厄狮子」效果胜利
 !victory 0x19 「头奖壶7」效果胜利
 !victory 0x1a 「魂之接力」效果胜利
-!victory 0x1b 「幽鬼驮天使」效果胜利
+!victory 0x1b 「鬼计惰天使」效果胜利
 !victory 0x20 由于「%ls」的效果获得比赛胜利
 #counters
 !counter 0x3001 魔力指示物