Achievement Bit fixes #289
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bit_index_valid/output_proto/markers.bin.textproto._old 2024-05-19 02:44:24.571726348 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bit_index_valid/output_proto/markers.bin.textproto._new 2024-05-19 02:44:24.579726476 +0000
@@ -0,0 +1,42 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ achievement_id: 5
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ achievement_id: 2147483647
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ achievement_id: 2147483647
+ }
+ trail {
+ achievement_id: 5
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._old 2024-05-19 02:44:24.595726731 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._new 2024-05-19 02:44:24.595726731 +0000
@@ -1,51 +0,0 @@
-category {
- name: "My Category"
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 5
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 2147483647
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 2147483648
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 4294967291
- }
- trail {
- achievement_bit: 5
- }
- id: "(\350\314\006\302\223^\226"
-}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._old 2024-05-19 02:44:24.607726922 +0000
+++ xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._new 2024-05-19 02:44:24.615727050 +0000
@@ -15,7 +15,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 1
+ 16: 1
}
icon {
map_id: 50
@@ -24,7 +24,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 5
+ 16: 5
}
icon {
map_id: 50
@@ -33,7 +33,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 2147483647
+ 16: 2147483647
}
icon {
map_id: 50
@@ -42,7 +42,7 @@
y: 210.65
z: 215.83
}
- achievement_id: -2147483648
+ 16: 18446744071562067968
}
icon {
map_id: 50
@@ -51,10 +51,10 @@
y: 210.65
z: 215.83
}
- achievement_id: -5
+ 16: 18446744073709551611
}
trail {
- achievement_id: 5
+ 16: 5
}
id: "(\350\314\006\302\223^\226"
}
klingbolt
suggested changes
May 19, 2024
xml_converter/integration_tests/test_cases/achievement_bitmask_valid/input/pack/xml_file.xml
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bit_index_valid/output_proto/markers.bin.textproto._old 2024-05-20 15:05:19.527211817 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bit_index_valid/output_proto/markers.bin.textproto._new 2024-05-20 15:05:19.535211866 +0000
@@ -0,0 +1,33 @@
+category {
+ name: "My Category"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ achievement_id: 5
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ achievement_id: 2147483647
+ }
+ trail {
+ achievement_id: 5
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._old 2024-05-20 15:05:19.547211938 +0000
+++ xml_converter/integration_tests/test_cases/achievement_bitmask_valid/output_proto/markers.bin.textproto._new 2024-05-20 15:05:19.551211962 +0000
@@ -1,51 +0,0 @@
-category {
- name: "My Category"
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 5
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 2147483647
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 2147483648
- }
- icon {
- map_id: 50
- position {
- x: 169.81
- y: 210.65
- z: 215.83
- }
- achievement_bit: 4294967291
- }
- trail {
- achievement_bit: 5
- }
- id: "(\350\314\006\302\223^\226"
-}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._old 2024-05-20 15:05:19.563212035 +0000
+++ xml_converter/integration_tests/test_cases/achievement_id/output_proto/markers.bin.textproto._new 2024-05-20 15:05:19.571212083 +0000
@@ -15,7 +15,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 1
+ 16: 1
}
icon {
map_id: 50
@@ -24,7 +24,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 5
+ 16: 5
}
icon {
map_id: 50
@@ -33,7 +33,7 @@
y: 210.65
z: 215.83
}
- achievement_id: 2147483647
+ 16: 2147483647
}
icon {
map_id: 50
@@ -42,7 +42,7 @@
y: 210.65
z: 215.83
}
- achievement_id: -2147483648
+ 16: 18446744071562067968
}
icon {
map_id: 50
@@ -51,10 +51,10 @@
y: 210.65
z: 215.83
}
- achievement_id: -5
+ 16: 18446744073709551611
}
trail {
- achievement_id: 5
+ 16: 5
}
id: "(\350\314\006\302\223^\226"
}
klingbolt
approved these changes
May 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We had previously assumed that achievement bit was a bitmask, but it is an index.
This PR fixes this misconception and puts effort to prevent it from occuring again by
AchievementBitIndexas an alternative toAchievementBitachievement bitmaskThis PR will have wonky diffs, the best way to review this is to review it one commit at a time. The first commit is the real diff, the second commit is just renaming files.
Additionally the protobin diffs are going to be very strange. This is for two reasons