Merge pull request #60 from ReuschelCGN/development

merge develop
ReuschelCGN · Jan 24, 2024 · d09bae6 · d09bae6
2 parents 033ebc4 + 8294ecc
commit d09bae6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Package.swift b/Package.swift
@@ -22,7 +22,7 @@ let package = Package(
         .package(name: "S2Geometry", url: "https://github.com/123FLO321/S2Geometry.git", from: "0.5.0"),
         .package(name: "Regex", url: "https://github.com/crossroadlabs/Regex.git", from: "1.2.0"),
         .package(name: "swift-backtrace", url: "https://github.com/swift-server/swift-backtrace.git", from: "1.3.3"),
-        .package(name: "POGOProtos", url: "https://github.com/123FLO321/POGOProtos-Swift.git", .upToNextMinor(from: "2.33.0"))
+        .package(name: "POGOProtos", url: "https://github.com/123FLO321/POGOProtos-Swift.git", .upToNextMinor(from: "2.34.0"))
     ],
     targets: [
         .target(

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# RealDeviceMap 
+# RealDeviceMap
 
 <strong>The contents of this repo is a proof of concept and is for educational use only!</strong>
 

diff --git a/Sources/RealDeviceMapLib/Modell/Gym.swift b/Sources/RealDeviceMapLib/Modell/Gym.swift
@@ -271,7 +271,7 @@ public class Gym: JSONConvertibleObject, NSCopying, WebHookEvent, Hashable {
             self.raidSpawnTimestamp = UInt32(fortData.raidInfo.raidSpawnMs / 1000)
             self.raidBattleTimestamp = UInt32(fortData.raidInfo.raidBattleMs / 1000)
             self.raidLevel = UInt8(fortData.raidInfo.raidLevel.rawValue)
-            self.raidIsExclusive = fortData.raidInfo.isExclusive
+            self.raidIsExclusive = false
             self.raidPokemonId = UInt16(fortData.raidInfo.raidPokemon.pokemonID.rawValue)
             self.raidPokemonMove1 = UInt16(fortData.raidInfo.raidPokemon.move1.rawValue)
             self.raidPokemonMove2 = UInt16(fortData.raidInfo.raidPokemon.move2.rawValue)

diff --git a/Sources/RealDeviceMapLib/Modell/Pokestop.swift b/Sources/RealDeviceMapLib/Modell/Pokestop.swift
@@ -445,6 +445,12 @@ public class Pokestop: JSONConvertibleObject, NSCopying, WebHookEvent, Hashable
             case .withUniqueRouteTravel: break
             case .withTappableType: break
             case .withInParty: break
+            case .withShinyPokemon: break
+            case .withAbilityPartyPowerDamageDealt: break
+            case .withAuthProviderType: break
+            case .withOpponentPokemonBattleStatus: break
+            case .withFortID: break
+            case .withPokemonMove: break
             case .unset: break
             case .UNRECOGNIZED: break
             }
@@ -511,6 +517,7 @@ public class Pokestop: JSONConvertibleObject, NSCopying, WebHookEvent, Hashable
                 infoData["level_cap"] = info
             case .incident: break
             case .playerAttribute: break
+            case .eventBadge: break
             case .unset: break
             case .UNRECOGNIZED: break
             }