octane 0.6.2 → 0.6.3
raw patch · 4 files changed
+41/−26 lines, 4 filesdep ~aesondep ~basedep ~binary
Dependency ranges changed: aeson, base, binary
Files
- library/Octane/Data.hs +18/−3
- library/Octane/Parser.hs +15/−15
- octane.cabal +4/−4
- package.yaml +4/−4
library/Octane/Data.hs view
@@ -52,7 +52,9 @@ [ "Archetypes.GameEvent.GameEvent_Season" ]) , ( "TAGame.GameEvent_SoccarPrivate_TA",- [ "Archetypes.GameEvent.GameEvent_SoccarPrivate"+ [ "Archetypes.GameEvent.GameEvent_BasketballPrivate"+ , "Archetypes.GameEvent.GameEvent_HockeyPrivate"+ , "Archetypes.GameEvent.GameEvent_SoccarPrivate" ]) , ( "TAGame.GameEvent_SoccarSplitscreen_TA", [ "Archetypes.GameEvent.GameEvent_BasketballSplitscreen"@@ -75,6 +77,9 @@ , ( "TAGame.Team_TA", [ "Archetypes.Teams.Team" ])+ , ( "TAGame.VoteActor_TA",+ [ "TAGame.Default__VoteActor_TA"+ ]) ] & map (\ (klass, objects) -> ( Text.pack klass , objects & map Text.pack & Set.fromList@@ -183,15 +188,19 @@ booleanProperties = [ "Engine.Actor:bBlockActors" , "Engine.Actor:bCollideActors"+ , "Engine.Actor:bCollideWorld" , "Engine.Actor:bHardAttach" , "Engine.Actor:bHidden"+ , "Engine.Actor:bNetOwner" , "Engine.Actor:bProjTarget" , "Engine.Actor:bTearOff" , "Engine.GameReplicationInfo:bMatchIsOver" , "Engine.Pawn:bCanSwatTurn" , "Engine.Pawn:bRootMotionFromInterpCurve" , "Engine.Pawn:bSimulateGravity"+ , "Engine.PlayerReplicationInfo:bAdmin" , "Engine.PlayerReplicationInfo:bBot"+ , "Engine.PlayerReplicationInfo:bFromPreviousLevel" , "Engine.PlayerReplicationInfo:bIsSpectator" , "Engine.PlayerReplicationInfo:bOnlySpectator" , "Engine.PlayerReplicationInfo:bOutOfLives"@@ -212,7 +221,9 @@ , "TAGame.PRI_TA:bOnlineLoadoutSet" , "TAGame.PRI_TA:bReady" , "TAGame.PRI_TA:bUsingBehindView"+ , "TAGame.PRI_TA:bUsingFreecam" , "TAGame.PRI_TA:bUsingSecondaryCamera"+ , "TAGame.PRI_TA:bVoteToForfeitDisabled" , "TAGame.RBActor_TA:bFrozen" , "TAGame.RBActor_TA:bReplayActor" , "TAGame.Vehicle_TA:bDriving"@@ -264,10 +275,12 @@ -- | A set of properties that are flagged integers. flaggedIntProperties :: Set.Set Text.Text flaggedIntProperties =- [ "Engine.GameReplicationInfo:GameClass"+ [ "Engine.Actor:Owner" , "Engine.Actor:ReplicatedCollisionType"+ , "Engine.GameReplicationInfo:GameClass" , "Engine.Pawn:PlayerReplicationInfo" , "Engine.PlayerReplicationInfo:Team"+ , "Engine.TeamInfo:TeamIndex" , "TAGame.Ball_TA:GameEvent" , "TAGame.CameraSettingsActor_TA:PRI" , "TAGame.CarComponent_TA:Vehicle"@@ -341,7 +354,8 @@ -- | A set of properties that are locations. locationProperties :: Set.Set Text.Text locationProperties =- [ "TAGame.CarComponent_Dodge_TA:DodgeTorque"+ [ "Engine.Actor:RelativeLocation"+ , "TAGame.CarComponent_Dodge_TA:DodgeTorque" ] & map Text.pack & Set.fromList -- | A set of properties that are music stingers.@@ -406,4 +420,5 @@ uniqueIdProperties :: Set.Set Text.Text uniqueIdProperties = [ "Engine.PlayerReplicationInfo:UniqueId"+ -- , "TAGame.PRI_TA:PartyLeader" ] & map Text.pack & Set.fromList
library/Octane/Parser.hs view
@@ -277,13 +277,13 @@ getCamSettingsProperty :: Bits.BitGet PropValue getCamSettingsProperty = do- fov <- getFloat32 -- camera fov- height <- getFloat32 -- camera height- pitch <- getFloat32 -- camera angle- dist <- getFloat32 -- camera distance- stiff <- getFloat32 -- camera stiffness- swiv <- getFloat32 -- camera swivel speed- return (PCamSettings fov height pitch dist stiff swiv)+ fov <- getFloat32+ height <- getFloat32+ angle <- getFloat32+ distance <- getFloat32+ stiffness <- getFloat32+ swivelSpeed <- getFloat32+ return (PCamSettings fov height angle distance stiffness swivelSpeed) getDemolishProperty :: Bits.BitGet PropValue getDemolishProperty = do@@ -347,19 +347,19 @@ getLoadoutProperty :: Bits.BitGet PropValue getLoadoutProperty = do version <- getInt8- a <- getInt32- b <- getInt32- c <- getInt32- d <- getInt32- e <- getInt32- f <- getInt32+ body <- getInt32+ decal <- getInt32+ wheels <- getInt32+ rocketTrail <- getInt32+ antenna <- getInt32+ topper <- getInt32 g <- getInt32 h <- if version > 10 then do value <- getInt32 return (Just value) else return Nothing- return (PLoadout version a b c d e f g h)+ return (PLoadout version body decal wheels rocketTrail antenna topper g h) getLocationProperty :: Bits.BitGet PropValue getLocationProperty = do@@ -445,7 +445,7 @@ return (PUniqueId systemId remoteId localId) -- | Even though this is just a unique ID property, it must be handled--- | specially because it sometimes doesn't have the remote or local IDs.+-- specially because it sometimes doesn't have the remote or local IDs. getPartyLeaderProperty :: Bits.BitGet PropValue getPartyLeaderProperty = do systemId <- getSystemId
octane.cabal view
@@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: octane-version: 0.6.2+version: 0.6.3 synopsis: Parse Rocket League replays. description: Octane parses Rocket League replays. category: Game@@ -30,10 +30,10 @@ library ghc-options: -Wall build-depends:- aeson >=0.9 && <0.12+ aeson ==0.11.* , autoexporter ==0.2.*- , base >=4.8 && <4.10- , binary >=0.7 && <0.9+ , base ==4.9.*+ , binary ==0.8.* , binary-bits ==0.5.* , bytestring ==0.10.* , containers ==0.5.*
package.yaml view
@@ -35,10 +35,10 @@ github: tfausak/octane library: dependencies:- - aeson >=0.9 && <0.12+ - aeson ==0.11.* - autoexporter ==0.2.*- - base >=4.8 && <4.10- - binary >=0.7 && <0.9+ - base ==4.9.*+ - binary ==0.8.* - binary-bits ==0.5.* - bytestring ==0.10.* - containers ==0.5.*@@ -68,4 +68,4 @@ - -with-rtsopts=-N main: TestSuite.hs source-dirs: test-suite-version: '0.6.2'+version: '0.6.3'