From 71137cfcca77cb4464af7535ac8c6023de81d90c Mon Sep 17 00:00:00 2001
From: Lincoln-LM <maestaslincoln1@gmail.com>
Date: Wed, 19 Jan 2022 01:04:41 -0700
Subject: [PATCH] bump up reidentification blinks to 7, add reident_test.py

---
 barry/eye.png                 | Bin 1119 -> 0 bytes
 configs/config_cresselia.json |  12 +++---
 cresselia/eye.png             | Bin 368 -> 0 bytes
 images/cresselia/cress.png    | Bin 130 -> 0 bytes
 images/cresselia/eye.png      | Bin 482 -> 501 bytes
 src/player_blink_gui.py       |   2 +-
 src/reident_test.py           |  71 ++++++++++++++++++++++++++++++++++
 src/rngtool.py                |   7 +---
 8 files changed, 79 insertions(+), 13 deletions(-)
 delete mode 100644 barry/eye.png
 delete mode 100644 cresselia/eye.png
 delete mode 100644 images/cresselia/cress.png
 create mode 100644 src/reident_test.py

diff --git a/barry/eye.png b/barry/eye.png
deleted file mode 100644
index 5950cf734abb9f3629075d1ab417d939c899a9a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq000sI000*V1^@s61_K}D00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1N2EmK~y+TT~yn0
zBQ+FkX-0D&JFye8VT%Vol;tPjYv3z*qIlTULKYGyb}nPjMWd1EBNs1>OEniut?oXp
zqkjGQQvebyi^DW~c)tK}ynB9Ad<L}ENRk9fFYt@UJO@nEgznT~90%B7p?>-42LfsS
z>CoF5UDsh=_=(pzkMUlZ0;x%PPhpIKA*gI*t>dt;ZV;d!!%QZ!LvJTMKR@FzI09Rk
zj0@8gX%dh{fRxNM+9D^gL8|h&(Xv=*=ZWfO%Cb041fa~BQmoPlx`6d5deT3<z2b3y
zz{CCp`}YprFd+mVhe+3+HZ1&2Zo)vYysojm{)pR;-(!389g1cX+3p^9xV!&~&wu`f
zzjrTq>H4#Zz9$g}t!S=WG@vqstb{kDon^=ivaus+&q%8ktWLQAWan_~2aXZ%!x2ug
zD1N5Pyp&ea%)DO1lr0kK7p8J0X@b10I4ObS&Xz33(UJ+PMtRn=R4RpDe1PWUs%da>
zu|ZWe5#V&{S)m+N*}&vAmXKnZ2h6rd&uVt#5vQ?-3ycK$XdeQC7)u5-6c#@B{R#J9
z@3B8T;{E-A6L*$GOiO~d(~RBI3l6WxD0A@%G%KkCwg3Ne-1Y6S!_(6v9(Vs>PopO?
z6m#7?qaRL`*AqOjOhSZU!Xr@%O7g8ql9>^f{V?F+;S28We#hrOek0fySjv%1C7i4&
zNF>Q{o{YEwwNn(m3QVh(PzTKgtfD6avJ+|DX}~aXG8Gh=W;oC3*R+C8a~;hIWZ-z#
z1Vq^VcgcHvV`!C_%2HDWvQ#5CltU0DYB&T=X7Xc*tYpNs%$FRA!el6OR<%e`X9lIj
zq+ld+g5~+yXwKK3fs>sqL#3u8v^_-+syxGLwZeM6#`R^1n{AC7-rL+q@GLdVn6ROz
z5}~-gBMXkeoWPAR4Cv-!jqPQNZ>}x~(&FZ-jewW!nPHKs*a<|I*l`BpL6xCswr6@X
zqp{tr@!_h(hwBQr*DY=dbh8z9EkQ~$%8^m3^r=|8nG3~e84*$^^diS)!}G-e&Mv{a
zHUy~g?M6n0bz7k>a})$gnIkP7z_G;A^`vrOWe^+;J*!FIDDEg{jIAWF_egINgWI-7
z(^ROqA;m=kdX{9$F`;47Wf$>_z*72>9Uvvp>v7=$1v<-P5?F+$j-!zZa=qdS*KeNv
z#E<lv;iE?~&Uy7@AU+fXY$!Qn7E6|X#rG9`<hO(XbXmHGer5x=Y--Xe7gCarw=kpv
zWs)3aR-=&i!VX}v3*Px`Dki_+jPox_+aF(JlXrn4#Unz<6<a9#OrDomRU53EE7a8`
lS=MBiv+U+PFCMLce*s<%FIJTxSReoZ002ovPDHLkV1l<91F--A

diff --git a/configs/config_cresselia.json b/configs/config_cresselia.json
index 82d237a..77657c7 100644
--- a/configs/config_cresselia.json
+++ b/configs/config_cresselia.json
@@ -1,14 +1,14 @@
 {
     "MonitorWindow": true,
     "WindowPrefix": "SysDVR-Client [PID ",
-    "image": "./images/cresselia/cress.png",
+    "image": "./images/cresselia/eye.png",
     "view": [
-        630,
-        265,
-        11,
-        14
+        617,
+        330,
+        24,
+        31
     ],
-    "thresh": 0.9,
+    "thresh": 0.8,
     "white_delay": 0.0,
     "advance_delay": 0,
     "advance_delay_2": 0,
diff --git a/cresselia/eye.png b/cresselia/eye.png
deleted file mode 100644
index 453d494ca7833f7d39c376fa9061c917fb60ec25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^96-#+!3HFS!eXZZDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#Xt>5K$vl=HlH+51FNTtV~9quZ9uf&5d$8X+n(j2V&@J#{rODm
z4zsAr5%<ib>f@}5nU7Sy^~itv_G^-+#oN!$hJB5BZMnA_zNcrTEi&SI*k$Rc;$y8K
z9Cb#)%_8kc=X_hii-NBL#834d`F_3cuRulFk}bj)S4^0dqWMiQrIOP~BjYravDy~3
zJrfSbooaD>Exu;EdQAQ)Ar;ZhOu_4KY(99?eZqpdwjO`ZMQ|w{<G<GDc)rC=BfX%{
z!s1qgu<$z{g9U4K3SAbN9zUFXe3ylo?S<(<bHCJA8x*d&?sm=PwJV2&=U#4aiGHTw
z>2(jBBxYXXYqG5<+W!9-!}fHZDeF(36G}bhzPzV#evGH0aUuJM-aa2MUe^d<C^2}t
L`njxgN@xNA*glPH

diff --git a/images/cresselia/cress.png b/images/cresselia/cress.png
deleted file mode 100644
index 2445223b8033ee79c7e398788d6c7d385dd9802e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y}!2~3oZYTT$QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtXX&7sn8Z@Z>-HikX=u3>-BS6s8_Mz`(Hh
WJ5!#+>pvzyB@CXfelF{r5}E)$v>`SC

diff --git a/images/cresselia/eye.png b/images/cresselia/eye.png
index ea3233934277af2b13ce6ab42d1684afb88c62a4..22e5749851b064aff97ba999bd263a8a3ca3d552 100644
GIT binary patch
delta 439
zcmV;o0Z9Jh1N8%t7YYps0ssI2@RtK@ks&pIib+I4R47vo&_8bzF&Kbx`?c@vvwi;(
zCD4SbgrW*WMK>6jnb_#ar{hyFgFr|~6|hw5fCNDzG_<rwb3WT=pUM9GmIr@${bu!h
z-F5~coN+#`>nc|)rEv%t#p~-Ua{T;wxmurn`~LIS`L=W3w_0NiQV2k3TvybD*mUlH
z;PA+YV7k^~{PFV_#rd<RPiiHtwdCcCSM$63)#O&h@aX6<SL*BO=>WtBBxGTX1(}yg
zCXEk2R;y|<ZC&3Ovt0jKo?l#Tx=fY8l7tXoQskrh)5(bo0n)U!w$VBf8JC;_8iwF~
zfVc17_s;gc-RMn9lMs;~A`=-TI5I$g3<yCaWy1EcGd<@LXc7S;!r+~D`etxuR1{@i
z6-B*!XCXw+h2%o`7^(M`XDp&{_~5_>xao{X@$&Klh5(cTCE%m?uFH9HZ+9n{b~+l(
zcjk+|h1wp&IK~0CqW8|UP0q+{QtRd~>U+uf!~6TC$h<M|uhR(Q!CK_Z?OM$u#)?Nf
hE3>_6ttf)v{{tO7$Wfj<F^T{H002ovPDHLkV1jyz-a7yQ

delta 420
zcmV;V0bBm{1L6aa7YYmr0ssI2JIm0?ks&pIcS%G+R47voj?GRJQ5Zny{><&YbLXef
zN~JJuzz`A_hP5ty0(ZUxZ$`okn7Gr8#;PGG3c=_CBeak@4efR2{(jE(<mBX_+1um0
z*&Xk2=Y7A|&x)K;3O*nY;GEJmIehuz<K*P@^m_~E)xsF(ozL<v09fS3T84hSI%2VZ
zXtdSFYOOy_K4elnfA+MuUU)Df7kIq8w>jFyJR9!pmyaGdz^av-eEwSfT?S?SQsY>p
zfwF%t6#an#{AW79{B`yF<`&UTCy|&C3XBB=Z{EG1oP2@y4ii;3T&7E-yE0`7#fTz6
z04Tbd&d$D_Utdp!%vX)gdk<)udP*>VIK@a5j49GCMKQ*)lzGgu`<10E(I!xDYvbIg
z+-e$(qj+;L4Bn<$5i<?}A%t5)bDkU=JgFP9sFYT<S}m(;&N>Vr;0Q3IZ5VHFZ75ZZ
z%E5R%EVmyPxe%NnaP22Dm#+zv4&wQuzBvC`$gUI#=d3IT!QDrZ{STAEz$tGJU^06E
O0000<MNUMnLSTX$p~ss5

diff --git a/src/player_blink_gui.py b/src/player_blink_gui.py
index ad937d5..a496fa7 100644
--- a/src/player_blink_gui.py
+++ b/src/player_blink_gui.py
@@ -482,7 +482,7 @@ class Application(tk.Frame):
         self.s01_23.insert(1.0,s01+"\n"+s23)
 
         print([hex(x) for x in state])
-        observed_blinks, observed_intervals, offset_time = rngtool.tracking_blink(self.player_eye, *self.config_json["view"], MonitorWindow=self.config_json["MonitorWindow"], WindowPrefix=self.config_json["WindowPrefix"], crop=self.config_json["crop"], camera=self.config_json["camera"], tk_window=self, th=self.config_json["thresh"], size=6)
+        observed_blinks, observed_intervals, offset_time = rngtool.tracking_blink(self.player_eye, *self.config_json["view"], MonitorWindow=self.config_json["MonitorWindow"], WindowPrefix=self.config_json["WindowPrefix"], crop=self.config_json["crop"], camera=self.config_json["camera"], tk_window=self, th=self.config_json["thresh"], size=7)
         # self.rng, adv = rngtool.reidentifyByBlinks(Xorshift(*state), observed_blinks, return_advance=True, npc=self.config_json["npc"])
         self.rng, adv = rngtool.reidentifyByIntervals(Xorshift(*state), observed_intervals, return_advance=True, npc=self.config_json["npc"])
 
diff --git a/src/reident_test.py b/src/reident_test.py
new file mode 100644
index 0000000..5428e93
--- /dev/null
+++ b/src/reident_test.py
@@ -0,0 +1,71 @@
+from xorshift import Xorshift
+from random import randint
+
+# randomly generate a state to use
+seed = [randint(0,0xFFFFFFFF),randint(0,0xFFFFFFFF),randint(0,0xFFFFFFFF),randint(0,0xFFFFFFFF)]
+# amount of blinks used to reidentify
+blink_len = 20
+# max advances to search
+max_advance = 10000
+# advance when starting reidentify
+reident_advance = 1001
+
+# init rng
+rng = Xorshift(*seed)
+# advance pre-reident
+rng.advance(reident_advance)
+
+# simulate observing player blinks
+counter = 0
+observed_blinks = []
+wait = rng.rangefloat(3,12)
+while observed_blinks.count(True) < blink_len:
+    if counter % 1 <= 0.1:
+        observed_blinks.append(rng.next() & 0b1110 == 0)
+    if wait <= 0:
+        wait = rng.rangefloat(3,12)
+    wait -= 0.1
+    counter += 0.1
+
+# time elapsed during reidentification
+reident_time = len(observed_blinks)
+# account for the maximum amount of extra advances caused by pokemon blinks
+possible_length = int(reident_time*4//3)
+
+# begin to calc current advance
+possible = []
+rng = Xorshift(*seed)
+rng.next()
+blink_rands = [int((r&0b1110)==0) for r in rng.getNextRandSequence(max_advance)]
+# loop through all possible advances
+for adv in range(max_advance-possible_length):
+    # slice blink_rands to only give only the random values that could happen since this advance during reidentification 
+    blinks = blink_rands[adv:adv+possible_length]
+    # init index variables
+    i = 0
+    j = 0
+    # difference = the amount of pokemon blinks that must have happened for this to be possible
+    differences = []
+    try:
+        while i < reident_time:
+            diff = 0
+            # if observed_blinks[i] != blinks[j], assuming this is the correct advance, a pokemon blink must have happened inbetween
+            while observed_blinks[i] != blinks[j]:
+                diff += 1
+                j += 1
+            if diff != 0:
+                differences.append(diff)
+            j += 1
+            i += 1
+    # if pattern does not line up, check next advance
+    except IndexError:
+        continue
+    # at this point, only a handful of potential advances have made it through
+    # calculate the total amount of pokemon blinks that have happened during reident
+    cress_pred_blinks = sum(differences)
+    # add a tuple to possible that can be sorted by the amount of pokemon blinks
+    possible.append((cress_pred_blinks,adv))
+# get the tuple with the lowest amount of pokemon blinks 
+cresselia_blinks, advance = min(possible)
+# display our prediction
+print(f"{advance=} {cresselia_blinks=}")
\ No newline at end of file
diff --git a/src/rngtool.py b/src/rngtool.py
index 9621e6e..a1870c9 100644
--- a/src/rngtool.py
+++ b/src/rngtool.py
@@ -463,14 +463,12 @@ def reidentifyByBlinks(rng:Xorshift, observed_blinks:List[int], npc = 0, search_
 def reidentifyByIntervals(rng:Xorshift, rawintervals:List[int], npc = 0, search_max=10**6, search_min=0, return_advance=False)->Xorshift:
     """reidentify Xorshift state by intervals of observed blinks. 
     This method is faster than "reidentifyByBlinks" in most cases since it can be reidentified by less blinking.
-
     Args:
         rng (Xorshift): [description]
-        rawintervals (List[int]): list of intervals of blinks. 6 or more is recommended.
+        rawintervals (List[int]): list of intervals of blinks. 7 or more are recommended.
         npc (int, optional): [description]. Defaults to 0.
         search_max ([type], optional): [description]. Defaults to 10**6.
         search_min (int, optional): [description]. Defaults to 0.
-
     Returns:
         Xorshift: [description]
     """
@@ -485,9 +483,6 @@ def reidentifyByIntervals(rng:Xorshift, rawintervals:List[int], npc = 0, search_
         blinkrands = [(i, int((r&0b1110)==0)) for i,r in list(enumerate(identify_rng.getNextRandSequence(search_max)))[d::1+npc]]
 
         #prepare
-
-
-
         expected_blinks_lst = []
         expected_blinks = 0
         lastblink_idx = -1