Merge branch 'Android' of git.mycard.moe:nanahira/ygopro2 into Android

.gitignore

@@ -64,5 +64,6 @@ AI_core_vs2017solution/core.VC.VC.opendb
 AI_core_vs2017solution/System.Servicemodel.Faltexception.dll
 [Ll]ibrary_/
 Assets/StreamingAssets/update.zip*
+commamd.shell
 
 /output

.gitlab-ci.yml

@@ -18,6 +18,7 @@ unity:
       - KoishiPro2-src/
   only:
     - Android
+    - tags
   tags:
     - unity
 
@@ -30,6 +31,6 @@ upload_to_minio:
   image: python
   script:
     - pip install -U awscli
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete KoishiPro2-src s3://mycard/koishipro2
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete KoishiPro2-src/ s3://mycard/koishipro2/$CI_COMMIT_TAG
   only:
-    - Android
+    - tags

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -1354,7 +1354,7 @@ public class Ocgcore : ServantWithCardDescription
                 gameInfo.swaped = false;
                 isObserver = ((playertype & 0xf0) > 0) ? true : false;
                 if (r.BaseStream.Length > 17) // dumb fix for yrp3d replay older than v1.034.9
-                    r.ReadByte(); // duel_rule
+                    MasterRule = r.ReadByte(); // duel_rule
                 life_0 = r.ReadInt32();
                 life_1 = r.ReadInt32();
                 lpLimit = life_0;

Assets/SibylSystem/Ocgcore/mt19937ar.cs

+#region "License"
+/* 
+   A C-program for MT19937, with initialization improved 2002/1/26.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+
+   Before using, initialize the state by using init_genrand(seed)  
+   or init_by_array(init_key, key_length).
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.                          
+   Copyright (C) 2005, Mutsuo Saito,
+   All rights reserved.                          
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+*/
+
+/*
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
+*/
+
+/* 
+   A C#-program for MT19937, with initialization improved 2006/01/06.
+   Coded by Mitil.
+
+   Copyright (C) 2006, Mitil, All rights reserved.
+
+   Any feedback is very welcome.
+   URL: http://meisui.psk.jp/
+   email: m-i-t-i-l [at@at] p-s-k . j-p
+           (remove dash[-], and replace [at@at] --> @)
+*/
+
+#endregion 
+
+using System;
+
+namespace Meisui.Random
+{
+
+	public class MersenneTwister
+	{
+	
+		#region "Private Parameter"
+		/* Period parameters */  
+		private const Int16  N= 624;
+		private const Int16  M= 397;
+		private const UInt32  MATRIX_A= (UInt32)0x9908b0df;   /* constant vector a */
+		private const UInt32  UPPER_MASK = (UInt32)0x80000000; /* most significant w-r bits */
+		private const UInt32  LOWER_MASK = (UInt32)0x7fffffff; /* least significant r bits */
+		private UInt32[] mt; /* the array for the state vector  */
+		private UInt16 mti; /* mti==N+1 means mt[N] is not initialized */
+		private UInt32[] mag01;
+		#endregion
+
+		#region "Constructor"
+		
+		public MersenneTwister(UInt32 s)
+		 {
+			 MT();
+			init_genrand(s);
+		 }
+
+		// coded by Mitil. 2006/01/04
+		public MersenneTwister()
+		{
+			MT();
+
+			// auto generate seed for .NET
+			UInt32[] seed_key = new UInt32[6]; 
+			Byte[] rnseed = new Byte[8];
+
+			seed_key[0]=(UInt32)System.DateTime.Now.Millisecond;
+			seed_key[1]=(UInt32)System.DateTime.Now.Second;
+			seed_key[2]=(UInt32)System.DateTime.Now.DayOfYear;
+			seed_key[3]=(UInt32)System.DateTime.Now.Year;
+;			 
+			System.Security.Cryptography.RandomNumberGenerator rn 
+				= new System.Security.Cryptography.RNGCryptoServiceProvider();
+			rn.GetNonZeroBytes(rnseed);
+
+			seed_key[4]=((UInt32)rnseed[0]<<24)|((UInt32)rnseed[1]<<16)
+				|((UInt32)rnseed[2]<<8)|((UInt32)rnseed[3]);
+			seed_key[5]=((UInt32)rnseed[4]<<24)|((UInt32)rnseed[5]<<16)
+				|((UInt32)rnseed[6]<<8)|((UInt32)rnseed[7]);
+
+			init_by_array(seed_key);
+
+			rn=null;
+			seed_key=null;
+			rnseed=null;
+		}
+
+		 public MersenneTwister(UInt32[] init_key)
+         {
+             MT();
+
+			 init_by_array(init_key);
+         }
+
+		 private void MT()
+		 {
+			mt = new UInt32[N];
+
+			mag01=new UInt32[] {0, MATRIX_A};
+			/* mag01[x] = x * MATRIX_A  for x=0,1 */
+
+			mti=N+1;
+		}
+
+		#endregion
+
+		#region "Destructor"
+		 ~MersenneTwister()
+		{
+			 mt=null;
+			 mag01=null;
+		}
+		#endregion
+
+		#region "seed init"
+		/* initializes mt[N] with a seed */
+		private  void init_genrand(UInt32 s)
+		{
+			mt[0]= s;
+			
+			for (mti=1; mti<N; mti++) 
+			{
+				mt[mti] =
+					((UInt32)1812433253 * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
+				/* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
+				/* In the previous versions, MSBs of the seed affect   */
+				/* only MSBs of the array mt[].                        */
+				/* 2002/01/09 modified by Makoto Matsumoto             */
+			}
+		}
+
+		/* initialize by an array with array-length */
+		/* init_key is the array for initializing keys */
+		/* key_length is its length */
+		/* slight change for C++, 2004/2/26 */
+		private  void init_by_array(UInt32[] init_key)
+		{
+			UInt32 i, j;
+			Int32 k;
+			Int32 key_length=init_key.Length;
+			
+			init_genrand(19650218);
+			i=1; j=0;
+			k = (N>key_length ? N : key_length);
+			
+			for (; k>0; k--) 
+			{
+				mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * (UInt32)1664525))
+					+ init_key[j] + (UInt32)j; /* non linear */
+				i++; j++;
+				if (i>=N) { mt[0] = mt[N-1]; i=1; }
+				if (j>=key_length) j=0;
+			}
+			for (k=N-1;k>0; k--) 
+			{
+				mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * (UInt32)1566083941))
+					- (UInt32)i; /* non linear */
+				i++;
+				if (i>=N) { mt[0] = mt[N-1]; i=1; }
+			}
+
+			mt[0] = 0x80000000; /* MSB is 1; assuring non-zero initial array */ 
+		}
+		#endregion
+
+		#region "Get Unsigned Int 32bit number"
+		/* generates a random number on [0,0xffffffff]-Interval */
+		public  UInt32 genrand_Int32()
+		{
+			UInt32 y;
+
+			if (mti >= N) 
+			{ /* generate N words at one time */
+				Int16 kk;
+
+				if (mti == N+1)   /* if init_genrand() has not been called, */
+						init_genrand(5489); /* a default initial seed is used */
+
+				for (kk=0;kk<N-M;kk++) 
+				{
+						y = ((mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK)) >> 1 ;
+					mt[kk] = mt[kk+M] ^ mag01[mt[kk+1] & 1] ^ y;
+				}
+				for (;kk<N-1;kk++) {
+						y = ((mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK)) >> 1 ;
+					mt[kk] = mt[kk+(M-N)] ^ mag01[mt[kk+1] & 1] ^ y;
+				}
+				y = ((mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK)) >> 1 ;
+				mt[N-1] = mt[M-1] ^ mag01[mt[0] & 1] ^ y;
+
+				mti = 0;
+			}
+		  
+			y = mt[mti++];
+
+			/* Tempering */
+			y ^= (y >> 11) ;
+            y ^= (y << 7) & 0x9d2c5680;
+			y ^= (y << 15) & 0xefc60000;
+			y ^= (y >> 18);
+
+			return y;
+		}
+		#endregion
+
+		#region "Get Int31 number"
+		/* generates a random number on [0,0x7fffffff]-Interval */
+		public  UInt32 genrand_Int31()
+		{
+			return (genrand_Int32()>>1);
+		}
+		#endregion
+
+		#region "Get type'double' number"
+		/* generates a random number on [0,1]-real-Interval */
+		public  double genrand_real1()
+		{
+			return genrand_Int32()*((double)1.0/4294967295.0); 
+			/* divided by 2^32-1 */ 
+		}
+
+		/* generates a random number on [0,1)-real-Interval */
+		public  double genrand_real2()
+		{
+			return genrand_Int32()*((double)1.0/4294967296.0); 
+			/* divided by 2^32 */
+		}
+
+		/* generates a random number on (0,1)-real-Interval */
+		public  double genrand_real3()
+		{
+			return (((double)genrand_Int32()) + 0.5)*((double)1.0/4294967296.0); 
+			/* divided by 2^32 */
+		}
+
+		/* generates a random number on [0,1) with 53-bit resolution*/
+		public  double genrand_res53() 
+		{ 
+			UInt32 a=genrand_Int32()>>5, b=genrand_Int32()>>6; 
+			return((double)a*67108864.0+b)*((double)1.0/9007199254740992.0); 
+		} 
+		/* These real versions are due to Isaku Wada, 2002/01/09 added */
+		#endregion
+
+	}
+}

Assets/SibylSystem/Ocgcore/mt19937ar.cs.meta

+fileFormatVersion: 2
+guid: 2c9ab21e46eaff74cb7a4683ba6a70f2
+timeCreated: 1590474751
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SibylSystem/coreWrapper.cs

@@ -212,6 +212,7 @@ namespace Percy
         public int Defense;
         public int LScale;
         public int RScale;
+        public int LinkMarker;
     }
     unsafe static class dll
     {
@@ -515,12 +516,12 @@ namespace Percy
             for (int i = deck_player.Main.Count - 1; i >= 0; i--)
             {
                dll.new_card(duel, (uint)deck_player.Main[i],
-                    (byte)playerId, (byte)playerId, (byte)CardLocation.Deck, 0, 0);
+                    (byte)playerId, (byte)playerId, (byte)CardLocation.Deck, 0, (byte)CardPosition.FaceDownDefence);
             }
             for (int i = 0; i < deck_player.Extra.Count; i++)
             {
                dll.new_card(duel, (uint)deck_player.Extra[i],
-                    (byte)playerId, (byte)playerId, (byte)CardLocation.Extra, 0, 0);
+                    (byte)playerId, (byte)playerId, (byte)CardLocation.Extra, 0, (byte)CardPosition.FaceDownDefence);
             }
         }
 
@@ -543,7 +544,8 @@ namespace Percy
             yrp3dbuilder = new BinaryWriter(stream);
             sendToPlayer(yrp.getNamePacket());
             dll.end_duel(duel);
-            duel = dll.create_duel(yrp.Seed);
+            Meisui.Random.MersenneTwister mtrnd = new Meisui.Random.MersenneTwister(yrp.Seed);
+            duel = dll.create_duel(mtrnd.genrand_Int32());
             godMode = true;
             isFirst = true;
             dll.set_player_info(duel, 0, yrp.StartLp, yrp.StartHand, yrp.DrawCount);
@@ -552,11 +554,11 @@ namespace Percy
             {
                 foreach (var item in yrp.playerData[0].main)
                 {
-                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Deck, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Deck, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[0].extra)
                 {
-                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Extra, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Extra, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[1].main)
                 {
@@ -569,11 +571,11 @@ namespace Percy
 
                 foreach (var item in yrp.playerData[2].main)
                 {
-                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Deck, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Deck, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[2].extra)
                 {
-                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Extra, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Extra, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[3].main)
                 {
@@ -588,25 +590,26 @@ namespace Percy
             {
                 foreach (var item in yrp.playerData[0].main)
                 {
-                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Deck, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Deck, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[0].extra)
                 {
-                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Extra, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)0, (byte)0, (byte)CardLocation.Extra, 0, (byte)CardPosition.FaceDownDefence);
                 }
 
                 foreach (var item in yrp.playerData[1].main)
                 {
-                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Deck, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Deck, 0, (byte)CardPosition.FaceDownDefence);
                 }
                 foreach (var item in yrp.playerData[1].extra)
                 {
-                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Extra, 0, 0);
+                    dll.new_card(duel, (uint)item, (byte)1, (byte)1, (byte)CardLocation.Extra, 0, (byte)CardPosition.FaceDownDefence);
                 }
             }
             BinaryMaster master = new BinaryMaster();
             master.writer.Write((char)GameMessage.Start);
             master.writer.Write((byte)0);
+            master.writer.Write((byte)(yrp.opt >> 16));
             master.writer.Write(yrp.StartLp);
             master.writer.Write(yrp.StartLp);
             master.writer.Write((UInt16)dll.query_field_count(duel, 0, 0x1));
@@ -825,7 +828,7 @@ namespace Percy
 
             MemoryStream ms = new MemoryStream(result);
             BinaryReader reader = new BinaryReader(ms);
-            for (int i = 0; i < 5; i++)
+            for (int i = 0; i < 7; i++)
             {
                 int len = reader.ReadInt32();
                 if (len == 4)
@@ -1038,8 +1041,8 @@ namespace Percy
                     {
                         int code = currentReader.ReadInt32();
                         int p = currentReader.ReadByte();
-                        //currentWriter.Write(((int)(p == player ? code : 0)));
-                        //currentWriter.Write((byte)p);
+                        currentWriter.Write(((int)(p == player ? code : 0)));
+                        currentWriter.Write((byte)p);
                         move(3);
                     }
                     returnValue = true;

Assets/SibylSystem/precy.cs

@@ -123,6 +123,7 @@ public class PrecyOcg
         retuvalue.RScale = card.RScale;
         retuvalue.Setcode = card.Setcode;
         retuvalue.Type = card.Type;
+        retuvalue.LinkMarker = card.LinkMarker;
         return retuvalue;
     }