Commit 65adc9ae authored by SherryChaos's avatar SherryChaos

ygo update

parent bebcc0aa
This diff is collapsed.
fileFormatVersion: 2
guid: 7af3f6fb1a4a74341abbcbe9b28fa17b
\ No newline at end of file
......@@ -1129,6 +1129,15 @@ namespace WindBot.Game.AI
_CardId.EvenlyMatched,
_CardId.DivineArsenalAAZEUS_SkyThunder
};
int[] destroyAllMonsterList =
{
_CardId.DarkHole,
_CardId.InterruptedKaijuSlumber
};
int[] destroyAllOpponentMonsterList =
{
_CardId.Raigeki
};
int[] destroyAllOpponentSpellList =
{
_CardId.HarpiesFeatherDuster,
......@@ -1137,6 +1146,8 @@ namespace WindBot.Game.AI
if (Util.ChainContainsCard(destroyAllList)) return true;
if (Enemy.HasInSpellZone(destroyAllOpponentSpellList, true) && Card.Location == CardLocation.SpellZone) return true;
if (Util.ChainContainsCard(destroyAllMonsterList) && Card.Location == CardLocation.MonsterZone) return true;
if (Duel.CurrentChain.Any(c => c.Controller == 1 && c.IsCode(destroyAllOpponentMonsterList)) && Card.Location == CardLocation.MonsterZone) return true;
if (lightningStormOption == 0 && Card.Location == CardLocation.MonsterZone && Card.IsAttack()) return true;
if (lightningStormOption == 1 && Card.Location == CardLocation.SpellZone) return true;
// TODO: ChainContainsCard(id, player)
......@@ -1579,7 +1590,7 @@ namespace WindBot.Game.AI
if (originId == 0) originId = card.Data.Id;
return crossoutDesignatorIdList.Contains(originId)
|| (calledbytheGraveIdCountMap.ContainsKey(originId) && calledbytheGraveIdCountMap[originId] > 0)
|| card.IsDisabled();
|| (card.IsDisabled() && ((int)card.Location & (int)CardLocation.Onfield) > 0);
}
protected bool DefaultCheckWhetherCardIdIsNegated(int cardId)
......
......@@ -1162,6 +1162,7 @@ namespace WindBot.Game
private bool ShouldExecute(CardExecutor exec, ClientCard card, ExecutorType type, int desc = -1, int timing = -1)
{
Executor.SetCard(type, card, desc, timing);
if (card.Id != 0 && type == ExecutorType.Activate)
{
if (_activatedCards.ContainsKey(card.Id) && _activatedCards[card.Id] >= 9)
......@@ -1169,7 +1170,6 @@ namespace WindBot.Game
if (!Executor.OnPreActivate(card))
return false;
}
Executor.SetCard(type, card, desc, timing);
bool result = card != null && exec.Type == type &&
(exec.CardId == -1 || exec.CardId == card.Id) &&
(exec.Func == null || exec.Func());
......
......@@ -1024,7 +1024,7 @@ namespace WindBot.Game
card.Controller = player;
}
if (card == null) continue;
if (card.Id == 0)
if (card.Id == 0 || card.Location == CardLocation.Deck)
card.SetId(id);
cards.Add(card);
}
......
......@@ -17,7 +17,7 @@
Thunder = 0x1000,
Dragon = 0x2000,
Beast = 0x4000,
BestWarrior = 0x8000,
BeastWarrior = 0x8000,
Dinosaur = 0x10000,
Fish = 0x20000,
SeaSerpent = 0x40000,
......
......@@ -1211,10 +1211,11 @@
!setname 0x1ac Salamandra
!setname 0x1ad Ashened
!setname 0x1ae Millennium
!setname 0x1af Exodo
!setname 0x1af Exodd
!setname 0x1af Obliterate!!!
!setname 0x1b0 Fiendsmith
!setname 0x1b1 White Woods
!setname 0x1b2 Multchummy
!setname 0x1b1 White Forest
!setname 0x1b2 Mulcharmy
!setname 0x1b3 Emblema
!setname 0x1b4 Tachyon
!setname 0x1b5 Blue Tears
......
......@@ -672,7 +672,7 @@
!setname 0x2 Genex
!setname 0x1002 R-Genex
#!setname 0x2002 Aliado Genex
#setname 0x3 Reina del Encanto
!setname 0x3 Reina del Encanto
!setname 0x4 Amazoness
!setname 0x5 Fuerza Arcana
!setname 0x6 Mundo Oscuro
......@@ -1131,7 +1131,7 @@
!setname 0x1158 Solarvid
!setname 0x2158 Solaravalon
!setname 0x4158 Solarsemilla
!setname 0x159 Caballero Estrellado
!setname 0x159 Cabalnoche de Estrellas
!setname 0x15a Muñeca Monstruo
!setname 0x15b Asombro
!setname 0x15c Atracción
......@@ -1223,10 +1223,10 @@
!setname 0x1ac Salamandra
!setname 0x1ad Calcinado
!setname 0x1ae Milenario
!setname 0x1af Exodo
!setname 0x1b0 Forjademonio
!setname 0x1af Exodd
!setname 0x1b0 Demoniherrero
!setname 0x1b1 Bosque Blanco
!setname 0x1b2 Multfamiliar
!setname 0x1b2 Multivador
!setname 0x1b3 Emblema
!setname 0x1b4 Taquión
!setname 0x1b5 Lágrimas Azules
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment