new ygo stuff

Assets/Prefabs/Popup/PopupSearchFilter.cs

@@ -303,7 +303,7 @@ namespace MDPro3.UI.Popup
         }
         private void OnPackClose()
         {
-            Program.instance.currentServant.returnAction = Hide;
+            //Program.instance.currentServant.returnAction = Hide;
         }
 
         protected override void Update()

Assets/Scripts/Windbot/Game/AI/Decks/RyzealExecutor.cs.meta

+fileFormatVersion: 2
+guid: c05c4430a631c3e4cbb128cbefcd8ccd
\ No newline at end of file

Assets/Scripts/Windbot/Game/AI/DefaultExecutor.cs

@@ -99,7 +99,13 @@ namespace WindBot.Game.AI
             public const int GhostOgreAndSnowRabbit = 59438930;
             public const int GhostBelle = 73642296;
             public const int EffectVeiler = 97268402;
+            public const int GhostMournerMoonlitChill = 52038441;
             public const int ArtifactLancea = 34267821;
+            public const int DimensionShifter = 91800273;
+            public const int NibiruThePrimalBeing = 27204311;
+            public const int MulcharmyPurulia = 84192580;
+            public const int MulcharmyFuwalos = 42141493;
+            public const int MulcharmyNyalus = 87126721;
 
             public const int CalledByTheGrave = 24224830;
             public const int CrossoutDesignator = 65681983;
@@ -120,9 +126,19 @@ namespace WindBot.Game.AI
 
             public const int ImperialOrder = 61740673;
             public const int RoyalDecreel = 51452091;
+            public const int NaturalExterio = 99916754;
             public const int NaturiaBeast = 33198837;
+            public const int SwordsmanLV7 = 37267041;
             public const int AntiSpellFragrance = 58921041;
-            
+            public const int Number41BagooskatheTerriblyTiredTapir = 90590303;
+            public const int SkillDrain = 82732705;
+
+            public const int DimensionalFissure = 81674782;
+            public const int BanisheroftheRadiance = 94853057;
+            public const int BanisheroftheLight = 61528025;
+            public const int KashtiraAriseHeart = 48626373;
+            public const int MaskedHERODarkLaw = 58481572;
+
             public const int VaylantzWorld_ShinraBansho = 49568943;
             public const int VaylantzWorld_KonigWissen = 75952542;
             public const int DivineArsenalAAZEUS_SkyThunder = 90448279;
@@ -214,6 +230,7 @@ namespace WindBot.Game.AI
             public const int FurHire = 0x114;
             public const int Altergeist = 0x103;
             public const int Crusadia = 0x116;
+            public const int Danger = 0x11e;
             public const int Endymion = 0x12a;
             public const int AncientWarriors = 0x137;
             public const int RescueACE = 0x18b;
@@ -780,7 +797,7 @@ namespace WindBot.Game.AI
             };
             if (Util.GetLastChainCard().IsCode(ignoreList))
                 return false;
-            if (Util.GetLastChainCard().HasSetcode(0x11e) && Util.GetLastChainCard().Location == CardLocation.Hand) // Danger! archtype hand effect
+            if (Util.GetLastChainCard().HasSetcode(_Setcode.Danger) && Util.GetLastChainCard().Location == CardLocation.Hand) // Danger! archtype hand effect
                 return false;
             return Duel.LastChainPlayer == 1;
         }
@@ -1599,6 +1616,12 @@ namespace WindBot.Game.AI
                 || (calledbytheGraveIdCountMap.ContainsKey(cardId) && calledbytheGraveIdCountMap[cardId] > 0);
         }
 
+        protected int GetCalledbytheGraveIdCount(int cardId)
+        {
+            if (!calledbytheGraveIdCountMap.ContainsKey(cardId)) return 0;
+            return calledbytheGraveIdCountMap[cardId];
+        }
+
 
         protected virtual bool DefaultSetForDiabellze()
         {

Assets/Scripts/Windbot/Game/ClientCard.cs

@@ -350,6 +350,11 @@ namespace WindBot.Game
             return Id == id || Alias - Id < 20 && Alias == id;
         }
 
+        public bool IsOnField()
+        {
+            return Location == CardLocation.MonsterZone || Location == CardLocation.SpellZone || Location == CardLocation.PendulumZone || Location == CardLocation.FieldZone;
+        }
+
         public bool HasXyzMaterial()
         {
             return Overlays.Count > 0;

Assets/Scripts/Windbot/Game/GameBehavior.cs

@@ -1017,7 +1017,13 @@ namespace WindBot.Game
                 packet.ReadByte(); // pos
                 ClientCard card;
                 if (((int)loc & (int)CardLocation.Overlay) != 0)
+                {
                     card = new ClientCard(id, CardLocation.Overlay, -1);
+                    CardLocation ownerLoc = loc ^ CardLocation.Overlay;
+                    ClientCard ownerCard = _duel.GetCard(player, ownerLoc, seq);
+                    if (ownerCard != null)
+                        card.OwnTargets.Add(ownerCard);
+                }
                 else
                 {
                     card = _duel.GetCard(player, loc, seq);

Data/Windbot/Decks/AI_Ryzeal.ydk

+#created by ...
+#main
+8633261
+8633261
+8633261
+35844557
+35844557
+35844557
+72238166
+34022970
+34022970
+34022970
+42141493
+42141493
+84192580
+87126721
+14558127
+14558127
+14558127
+59438930
+59438930
+23434538
+23434538
+94145021
+97268402
+97268402
+97268402
+7477101
+7477101
+7477101
+25311006
+35261759
+35261759
+85106525
+24224830
+24224830
+60394026
+65681983
+6798031
+10045474
+10045474
+10045474
+#extra
+9940036
+34909328
+34909328
+2061963
+7511613
+7511613
+45852939
+45852939
+6983839
+90590303
+46772449
+16643334
+21044178
+66011101
+8728498
+!side
+20292186
+34267821
+34267821
+34267821
+67173574
+18144507
+19613556
+35269904
+15693423
+83326048
+83326048
+83326048
+41420027
+41420027
+41420027

Data/locales/en-US/bot.conf

@@ -129,6 +129,11 @@ Name=CopyDiplodocus Deck=Salamangreat Dialog=anothercopy.en-EN
 Salamangreat Deck
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!CopyDiplodocus-Ryzeal
+Name=CopyDiplodocus Deck=Ryzeal Dialog=anothercopy.en-EN
+Ryzeal Deck
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-Familiar-Possesed
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.en-EN
 Familiar-Possesed Beat

Data/locales/en-US/strings.conf

@@ -1238,5 +1238,9 @@
 !setname 0x1be Ryzeal
 !setname 0x1bf Maliss
 !setname 0x1c0 Ryu-Ge
-!setname 0x1c1 ARG☆S
+!setname 0x1c1 Argostars
 !setname 0x1c2 Aqua Jet
+!setname 0x1c3 Mitsurugi
+!setname 0x1c4 Dragon Ruler
+!setname 0x1c5 Regenesis
+!setname 0x1c6 Dominus

Data/locales/es-ES/bot.conf

@@ -129,6 +129,11 @@ Name=Diplodocus Deck=Salamangreat Dialog=anothercopy.es-ES
 Baraja meta de fuego, "Salamangrande" sabe como encender el duelo en llamas cuando menos te lo esperas.
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!CopyDiplodocus-Ryzeal
+Name=Diplodocus Deck=Ryzeal Dialog=anothercopy.es-ES
+Ryzeal Deck
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911 - Familiar Poseído
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.es-ES
 Que su nombre no te engañe, esta baraja está reforzada con un engine de cartas antimeta muy molesto.

Data/locales/es-ES/strings.conf

@@ -870,7 +870,7 @@
 !setname 0x1083 Marioneta Trucada
 #setname 0x84 Boxeador Indomable
 !setname 0x1084 Boxeador Indómito
-!setname 0x2084 Boxeo Indómito
+!setname 0x2084 Boxeadores
 !setname 0x85 Súper Robot de Defensa
 !setname 0x86 Serafín Estelar
 !setname 0x87 Horror de las Sombras
@@ -1207,7 +1207,7 @@
 !setname 0x196 Nouvelles
 !setname 0x197 Receta
 !setname 0x198 Visas
-!setname 0x199 Contraefecto
+!setname 0x199 Contra
 !setname 0x19a Vedas
 !setname 0x19b Diabell
 !setname 0x119b Diabellstar
@@ -1250,5 +1250,9 @@
 !setname 0x1be Ryzeal
 !setname 0x1bf Maliss
 !setname 0x1c0 Ryu-Ge
-!setname 0x1c1 ARG☆S
+!setname 0x1c1 Argostars
 !setname 0x1c2 Aqua Jet
+!setname 0x1c3 Mitsurugi
+!setname 0x1c4 Señor Dragón
+!setname 0x1c5 Regénesis
+!setname 0x1c6 Dominus

Data/locales/ja-JP/bot.conf

@@ -122,13 +122,18 @@ AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 !リプロドクス-オルフェゴール
 Name=复制梁龙 Deck=Orcust Dialog=anothercopy.zh-CN
 オルフェゴールデッキ。
-AI_LV4 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !リプロドクス-サラマングレイト
-Name=复制梁龙 Deck=Salamangreat Dialog=anothercopy.zh-CN
+Name=リプロドクス Deck=Salamangreat Dialog=anothercopy.zh-CN
 サラマングレイトデッキ。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!リプロドクス-ライゼオル
+Name=CopyDiplodocus Deck=Ryzeal Dialog=anothercopy.zh-CN
+ライゼオル
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-憑依装着
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.zh-CN
 憑依装着を中心としたメタデッキ。

Data/locales/ja-JP/strings.conf

@@ -1248,4 +1248,8 @@
 !setname 0x1bf Ｍ∀ＬＩＣＥ
 !setname 0x1c0 竜華
 !setname 0x1c1 ＡＲＧ☆Ｓ
-!setname 0x1c2 アクア・ジェット
+!setname 0x1c2 アクア・ジェット
\ No newline at end of file
+!setname 0x1c3 御剣
+!setname 0x1c4 征竜
+!setname 0x1c5 再世（リジェネシス）
+!setname 0x1c6 ドミナス
\ No newline at end of file

Data/locales/ko-KR/bot.conf

@@ -129,6 +129,11 @@ Name=카카시 Deck=Salamangreat Dialog=anothercopy.kor
 샐러맨그레이트 덱입니다. (신 마스터 룰|마스터 룰 개정판 사용 가능)
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!카카시-라이제올
+Name=카카시 Deck=Ryzeal Dialog=anothercopy.kor
+라이제올 덱입니다.
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-빙의장착
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.kor
 빙의장착 덱입니다. (마스터 룰3|신 마스터 룰|마스터 룰 개정판 사용 가능)

Data/locales/ko-KR/strings.conf

@@ -664,12 +664,15 @@
 !counter 0x67 카운터(컴배트 휠)
 !counter 0x68 카운터(토템폴)
 !counter 0x69 카운터(베다=우파니샤드)
-!counter 0x6a 항명 카운터
+!counter 0x6a 향명 카운터
+!counter 0x6b 광애 카운터
+!counter 0x6c 액세스 카운터
+!counter 0x6d 숙제 카운터
 #setnames, using tab for comment
 !setname 0x1 A·O·J
 !setname 0x2 제넥스
 !setname 0x1002 레알 제넥스
-#!setname 0x2002 A·제넥스
+#setname 0x2002 A·제넥스
 !setname 0x3 얼루어 퀸
 !setname 0x4 아마조네스
 !setname 0x5 아르카나 포스
@@ -708,7 +711,8 @@
 !setname 0x1017 싱크론
 !setname 0x2017 싱크로 드래곤
 !setname 0x18 운마물
-!setname 0x19 검투수
+!setname 0x19 검투/글래디얼
+!setname 0x1019 검투수
 !setname 0x1a 전갈
 !setname 0x1b 환상수
 !setname 0x101b 환상수기
@@ -750,8 +754,10 @@
 !setname 0x3a 리추어
 !setname 0x3b 붉은 눈
 !setname 0x3c 레프티레스
-!setname 0x3d 여섯 무사
-!setname 0x103d 그림자 여섯 무사
+#setname 0x3d 여섯
+!setname 0x103d 여섯 무사
+!setname 0x203d 여섯 무식
+!setname 0x903d 그림자 여섯 무사
 !setname 0x3e 웜
 !setname 0x3f 세이비어
 !setname 0x40 봉인된
@@ -1194,13 +1200,14 @@
 !setname 0x192 GP(골드 프라이드)
 !setname 0x193 래버린스 월
 !setname 0x194 페이버릿
-!setname 0x195 VS(뱅퀴시 소울)
+!setname 0x195 VS(뱅키시 소울)
 !setname 0x196 누밸즈
 !setname 0x197 요리법
 !setname 0x198 비서스
 !setname 0x199 카운터
 !setname 0x19a 베다
-!setname 0x19b 디아벨스타
+!setname 0x19b 디아벨
+!setname 0x119b 디아벨스타
 !setname 0x19c 스네이크아이
 !setname 0x19d 호루스
 !setname 0x119d 호루스의 흑염룡
@@ -1219,7 +1226,7 @@
 !setname 0x1aa 천배룡
 !setname 0x1ab 뇌화
 !setname 0x1ac 사라만도라
-!setname 0x1ad Ashened(잿빛)
+!setname 0x1ad 회멸
 !setname 0x1ae 천년/밀레니엄
 !setname 0x1af 엑조드
 !setname 0x1b0 데먼스미스
@@ -1227,16 +1234,18 @@
 !setname 0x1b2 마루챠미
 !setname 0x1b3 엠블레마
 !setname 0x1b4 타키온
-!setname 0x1b5 파란눈물의
-!setname 0x1b6 석판의
-!setname 0x1b7 Mimighoul(무굴)
-!setname 0x1b8 상어
+!setname 0x1b5 파란눈물
+!setname 0x1b6 웨주
+!setname 0x1b7 미미구울
+!setname 0x1b8 샤크
 !setname 0x11b8 샤크 드레이크
-!setname 0x1b9 원시
-!setname 0x1ba 메탈모프
-!setname 0x1bb 모르가니타
-!setname 0x1bc 나의 결심
-!setname 0x1bd 학업의 성공
-!setname 0x1be 리젤
-!setname 0x1bf 말리스
-!setname 0x1c0 류게
+!setname 0x1b9 원석
+!setname 0x1ba 메탈화
+!setname 0x1bb 모르가나이트
+!setname 0x1bc 아자미나
+!setname 0x1bd 축대
+!setname 0x1be 라이제올
+!setname 0x1bf M∀LICE(맬리스)
+!setname 0x1c0 용화
+!setname 0x1c1 ARG☆S(아르고스타즈)
+!setname 0x1c2 아쿠아 제트

Data/locales/zh-CN/bot.conf

@@ -129,6 +129,11 @@ Name=复制梁龙 Deck=Salamangreat Dialog=anothercopy.zh-CN
 转生炎兽卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!复制梁龙-雷火沸动
+Name=复制梁龙 Deck=Ryzeal Dialog=anothercopy.zh-CN
+初代雷火沸动卡组。
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-凭依装着
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.zh-CN
 凭依装着卡组。

Data/locales/zh-CN/strings.conf

@@ -1245,3 +1245,7 @@
 !setname 0x1c0 龙华	竜華
 !setname 0x1c1 阿尔戈☆群星	ARG☆S
 !setname 0x1c2 喷水引擎	アクア・ジェット
+!setname 0x1c3 御剑	Mitsurugi
+!setname 0x1c4 征龙	征竜
+!setname 0x1c5 再世	再世
+!setname 0x1c6 统王	ドミナス
\ No newline at end of file

Data/locales/zh-TW/bot.conf

@@ -129,6 +129,11 @@ Name=复制梁龙 Deck=Salamangreat Dialog=anothercopy.zh-CN
 转生炎兽卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!复制梁龙-雷火沸动
+Name=复制梁龙 Deck=Ryzeal Dialog=anothercopy.zh-CN
+初代雷火沸动卡组。
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-凭依装着
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.zh-CN
 凭依装着卡组。

Tools/YGO Classes/ygoserver/premake5.lua

@@ -4,7 +4,15 @@ include "spmemvfs/."
 project "ygoserver"
     kind "SharedLib"
 
-    files { "**.cpp", "**.cc", "**.c", "**.h" }
+    files { "gframe.cpp", "gframe.h",
+            "config.h", "serverapi.cpp", "serverapi.h",
+            "game.cpp", "game.h", "myfilesystem.h",
+            "deck_manager.cpp", "deck_manager.h",
+            "data_manager.cpp", "data_manager.h",
+            "replay.cpp", "replay.h",
+            "netserver.cpp", "netserver.h",
+            "single_duel.cpp", "single_duel.h",
+            "tag_duel.cpp", "tag_duel.h" }
     includedirs { "spmemvfs", "../ocgcore", "../event/include", "../event/windows", "../sqlite3", "../Irrlicht/source/Irrlicht", "../Irrlicht/include" }
     links { "ocgcore", "clzma", "sqlite3", "lua" , "event", "irrlicht", "cspmemvfs", "ws2_32"}
     defines { "YGOPRO_SERVER_MODE", "SERVER_ZIP_SUPPORT", "SERVER_PRO2_SUPPORT", "SERVER_PRO3_SUPPORT", "_IRR_WCHAR_FILESYSTEM", "SERVER_TAG_SURRENDER_CONFIRM" }