servergreps: add packet version check in parsing packetsout.inc

18 files changed, 20 insertions, 27 deletions

diff --git a/servergreps/hercules/00000000/uselesspackets.txt b/servergreps/hercules/00000000/uselesspackets.txt
index f4586b4..8da90a0 100644
--- a/servergreps/hercules/00000000/uselesspackets.txt
+++ b/servergreps/hercules/00000000/uselesspackets.txt
@@ -5,7 +5,6 @@ Useless packet 0231.
 Useless packet 0234.
 Useless packet 0835.
 Useless packet 0a01.
-Useless packet 0838.
 Useless packet 08e0.
 Useless packet 09a9.
 Useless packet 02f1.
@@ -66,7 +65,6 @@ Useless packet 020f.
 Useless packet 0246.
 Useless packet 0247.
 Useless packet 0244.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 02ba.
 Useless packet 0801.
@@ -79,7 +77,6 @@ Useless packet 0243.
 Useless packet 0251.
 Useless packet 0b09.
 Useless packet 097c.
-Useless packet 022d.
 Useless packet 0368.
 Useless packet 0819.
 Useless packet 0361.
@@ -109,5 +106,4 @@ Useless packet 09ab.
 Useless packet 0213.
 Useless packet 0222.
 Useless packet 0248.
-Useless packet 0980.
 Useless packet 0817.
diff --git a/servergreps/hercules/00000007/uselesspackets.txt b/servergreps/hercules/00000007/uselesspackets.txt
index f4586b4..8da90a0 100644
--- a/servergreps/hercules/00000007/uselesspackets.txt
+++ b/servergreps/hercules/00000007/uselesspackets.txt
@@ -5,7 +5,6 @@ Useless packet 0231.
 Useless packet 0234.
 Useless packet 0835.
 Useless packet 0a01.
-Useless packet 0838.
 Useless packet 08e0.
 Useless packet 09a9.
 Useless packet 02f1.
@@ -66,7 +65,6 @@ Useless packet 020f.
 Useless packet 0246.
 Useless packet 0247.
 Useless packet 0244.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 02ba.
 Useless packet 0801.
@@ -79,7 +77,6 @@ Useless packet 0243.
 Useless packet 0251.
 Useless packet 0b09.
 Useless packet 097c.
-Useless packet 022d.
 Useless packet 0368.
 Useless packet 0819.
 Useless packet 0361.
@@ -109,5 +106,4 @@ Useless packet 09ab.
 Useless packet 0213.
 Useless packet 0222.
 Useless packet 0248.
-Useless packet 0980.
 Useless packet 0817.
diff --git a/servergreps/hercules/20120700/clientpackets.txt b/servergreps/hercules/20120700/clientpackets.txt
index 270e4eb..0f2d1b6 100644
--- a/servergreps/hercules/20120700/clientpackets.txt
+++ b/servergreps/hercules/20120700/clientpackets.txt
@@ -16,6 +16,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 0842    6 clif->pGMRecall2
 0843    6 clif->pGMRemove2
 0848   -1 clif->pCashShopBuy
+08a2   12 clif->pSearchStoreInfoListItemClick
 08aa    7 clif->pActionRequest
 08e5   41 clif->pPartyRecruitRegisterReq
 08e7   10 clif->pPartyRecruitSearchReq
@@ -26,6 +27,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 091d   18 clif->pPartyBookingRegisterReq
 0929   26 clif->pPartyInvite2
 0945   -1 clif->pItemListWindowSelected
+094b   19 clif->pWantToConnection
 0961   36 clif->pStoragePassword
 0963    8 clif->pMoveFromKafra
 096e   -1 clif->ackmergeitems
diff --git a/servergreps/hercules/20120700/uselesspackets.txt b/servergreps/hercules/20120700/uselesspackets.txt
index 7aa48f5..dae63ec 100644
--- a/servergreps/hercules/20120700/uselesspackets.txt
+++ b/servergreps/hercules/20120700/uselesspackets.txt
@@ -21,7 +21,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0940.
 Useless packet 09a7.
@@ -39,4 +38,3 @@ Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
 Useless packet 09ab.
-Useless packet 0980.
diff --git a/servergreps/hercules/20130000/clientpackets.txt b/servergreps/hercules/20130000/clientpackets.txt
index f3aab0c..21bd19f 100644
--- a/servergreps/hercules/20130000/clientpackets.txt
+++ b/servergreps/hercules/20130000/clientpackets.txt
@@ -16,6 +16,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 0843    6 clif->pGMRemove2
 0848   -1 clif->pCashShopBuy
 0863   10 clif->pUseSkillToPos
+08a2   12 clif->pSearchStoreInfoListItemClick
 08aa    7 clif->pActionRequest
 08e5   41 clif->pPartyRecruitRegisterReq
 08e7   10 clif->pPartyRecruitSearchReq
@@ -26,6 +27,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 091d   18 clif->pPartyBookingRegisterReq
 0929   26 clif->pPartyInvite2
 0945   -1 clif->pItemListWindowSelected
+094b   19 clif->pWantToConnection
 0963    8 clif->pMoveFromKafra
 096e   -1 clif->ackmergeitems
 0974    2 clif->cancelmergeitem
diff --git a/servergreps/hercules/20130000/uselesspackets.txt b/servergreps/hercules/20130000/uselesspackets.txt
index f848299..73c3726 100644
--- a/servergreps/hercules/20130000/uselesspackets.txt
+++ b/servergreps/hercules/20130000/uselesspackets.txt
@@ -21,7 +21,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 09a7.
 Useless packet 0b07.
@@ -38,4 +37,3 @@ Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
 Useless packet 09ab.
-Useless packet 0980.
diff --git a/servergreps/hercules/20130221/clientpackets.txt b/servergreps/hercules/20130221/clientpackets.txt
index f3aab0c..21bd19f 100644
--- a/servergreps/hercules/20130221/clientpackets.txt
+++ b/servergreps/hercules/20130221/clientpackets.txt
@@ -16,6 +16,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 0843    6 clif->pGMRemove2
 0848   -1 clif->pCashShopBuy
 0863   10 clif->pUseSkillToPos
+08a2   12 clif->pSearchStoreInfoListItemClick
 08aa    7 clif->pActionRequest
 08e5   41 clif->pPartyRecruitRegisterReq
 08e7   10 clif->pPartyRecruitSearchReq
@@ -26,6 +27,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 091d   18 clif->pPartyBookingRegisterReq
 0929   26 clif->pPartyInvite2
 0945   -1 clif->pItemListWindowSelected
+094b   19 clif->pWantToConnection
 0963    8 clif->pMoveFromKafra
 096e   -1 clif->ackmergeitems
 0974    2 clif->cancelmergeitem
diff --git a/servergreps/hercules/20130221/uselesspackets.txt b/servergreps/hercules/20130221/uselesspackets.txt
index f848299..73c3726 100644
--- a/servergreps/hercules/20130221/uselesspackets.txt
+++ b/servergreps/hercules/20130221/uselesspackets.txt
@@ -21,7 +21,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 09a7.
 Useless packet 0b07.
@@ -38,4 +37,3 @@ Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
 Useless packet 09ab.
-Useless packet 0980.
diff --git a/servergreps/hercules/20140000/clientpackets.txt b/servergreps/hercules/20140000/clientpackets.txt
index dfa8340..3bbced9 100644
--- a/servergreps/hercules/20140000/clientpackets.txt
+++ b/servergreps/hercules/20140000/clientpackets.txt
@@ -20,10 +20,12 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 08fb    6 clif->pDull
 0916   26 clif->pGuildInvite2
 091e   10 clif->pUseSkillToPos
+093e   12 clif->pSearchStoreInfoListItemClick
 0944    6 clif->pGetCharNameRequest
 0950   26 clif->pPartyInvite2
 0957    8 clif->pMoveFromKafra
 0959   18 clif->pPartyBookingRegisterReq
+0963   -1 clif->pItemListWindowSelected
 0964   36 clif->pStoragePassword
 096e   -1 clif->ackmergeitems
 0974    2 clif->cancelmergeitem
diff --git a/servergreps/hercules/20140000/uselesspackets.txt b/servergreps/hercules/20140000/uselesspackets.txt
index 376f0fe..e708c09 100644
--- a/servergreps/hercules/20140000/uselesspackets.txt
+++ b/servergreps/hercules/20140000/uselesspackets.txt
@@ -14,7 +14,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0b07.
 Useless packet 0b09.
@@ -28,4 +27,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/20140403/clientpackets.txt b/servergreps/hercules/20140403/clientpackets.txt
index 6a4e3b3..e3bc6ff 100644
--- a/servergreps/hercules/20140403/clientpackets.txt
+++ b/servergreps/hercules/20140403/clientpackets.txt
@@ -23,6 +23,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 0960    5 clif->pHomMenu
 0963   -1 clif->pItemListWindowSelected
 0964   36 clif->pStoragePassword
+0965   12 clif->pSearchStoreInfoListItemClick
 0968    8 clif->pMoveToKafra
 0969    6 clif->pReqClickBuyingStore
 096e   -1 clif->ackmergeitems
diff --git a/servergreps/hercules/20140403/uselesspackets.txt b/servergreps/hercules/20140403/uselesspackets.txt
index 7d3dc6c..a206771 100644
--- a/servergreps/hercules/20140403/uselesspackets.txt
+++ b/servergreps/hercules/20140403/uselesspackets.txt
@@ -13,7 +13,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0b07.
 Useless packet 0b09.
@@ -26,4 +25,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/20141016/clientpackets.txt b/servergreps/hercules/20141016/clientpackets.txt
index 0a4826c..58e8ee5 100644
--- a/servergreps/hercules/20141016/clientpackets.txt
+++ b/servergreps/hercules/20141016/clientpackets.txt
@@ -23,6 +23,7 @@ UNIMPLIMENTED CMSG_PARTY_INVITED
 0959   18 clif->pPartyBookingRegisterReq
 0963   -1 clif->pItemListWindowSelected
 0964   36 clif->pStoragePassword
+0965   12 clif->pSearchStoreInfoListItemClick
 096e   -1 clif->ackmergeitems
 0974    2 clif->cancelmergeitem
 09ce  102 clif->pGM_Monster_Item
diff --git a/servergreps/hercules/20141016/uselesspackets.txt b/servergreps/hercules/20141016/uselesspackets.txt
index 7d3dc6c..a206771 100644
--- a/servergreps/hercules/20141016/uselesspackets.txt
+++ b/servergreps/hercules/20141016/uselesspackets.txt
@@ -13,7 +13,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0b07.
 Useless packet 0b09.
@@ -26,4 +25,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/20141022/uselesspackets.txt b/servergreps/hercules/20141022/uselesspackets.txt
index f1fe21b..6fa7a90 100644
--- a/servergreps/hercules/20141022/uselesspackets.txt
+++ b/servergreps/hercules/20141022/uselesspackets.txt
@@ -11,7 +11,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0b07.
 Useless packet 0b09.
@@ -24,4 +23,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/20150226/uselesspackets.txt b/servergreps/hercules/20150226/uselesspackets.txt
index f1fe21b..6fa7a90 100644
--- a/servergreps/hercules/20150226/uselesspackets.txt
+++ b/servergreps/hercules/20150226/uselesspackets.txt
@@ -11,7 +11,6 @@ Useless packet 0064.
 Useless packet 0065.
 Useless packet 0061.
 Useless packet 0068.
-Useless packet 0a35.
 Useless packet 027c.
 Useless packet 0b07.
 Useless packet 0b09.
@@ -24,4 +23,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/20150513/uselesspackets.txt b/servergreps/hercules/20150513/uselesspackets.txt
index eaf9844..6fa7a90 100644
--- a/servergreps/hercules/20150513/uselesspackets.txt
+++ b/servergreps/hercules/20150513/uselesspackets.txt
@@ -23,4 +23,3 @@ Useless packet 0b0f.
 Useless packet 0b0d.
 Useless packet 0b0e.
 Useless packet 0b0c.
-Useless packet 0980.
diff --git a/servergreps/hercules/packets.py b/servergreps/hercules/packets.py
index 559a1c7..4303c63 100755
--- a/servergreps/hercules/packets.py
+++ b/servergreps/hercules/packets.py
@@ -111,9 +111,17 @@ def collectManaPlusInPackets(fileName, packetVersion):
                 clientPacketsManaPlus[m.group("packet").lower()] = m.group("name")
                 sizes[m.group("packet").lower()] = m.group("len")
 
-def collectManaPlusOutPackets(fileName):
+def collectManaPlusOutPackets(fileName, packetVersion):
+    version = 0
     with open(fileName, "r") as f:
         for line in f:
+            m = protocolinverre.search(line)
+            if m is not None:
+                version = int(m.group("ver"))
+                continue
+            # skip bigger versions than requested
+            if version > packetVersion:
+                continue
             m = protocoloutre.search(line)
             if m is not None:
                 clientPacketsManaPlus[m.group("packet").lower()] = m.group("name")
@@ -271,7 +279,7 @@ collectNamedPackets(namedPacketsPath);
 collectServerPackets(srcPath)
 collectClientPackets(clientPacketsPath)
 collectManaPlusInPackets(protocolPath + "in.inc", int(packetVersion))
-collectManaPlusOutPackets(protocolPath + "out.inc")
+collectManaPlusOutPackets(protocolPath + "out.inc", int(packetVersion))
 #collectManaPlusSizes(packetsPath);
 processManaPlusCppFiles(eathenaPath);
 sortClientPackets()