Skip to content

Commit

Permalink
Update PickupsRandomizer exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Parik27
Parik27 committed Nov 29, 2019
1 parent 0e477f7 commit 9eff723
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Patterns = [
#######################################################
[PickupsRandomizer]

Enabled = true
Enabled = false
ReplaceWithWeaponsOnly = true # Does nothing yet

#######################################################
Expand Down
118 changes: 59 additions & 59 deletions include/config_default.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,73 +271,73 @@ unsigned char config_toml[]
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x0d,
0x0a, 0x5b, 0x50, 0x69, 0x63, 0x6b, 0x75, 0x70, 0x73, 0x52, 0x61, 0x6e,
0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x0d, 0x0a, 0x0d, 0x0a,
0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x74, 0x72,
0x75, 0x65, 0x0d, 0x0a, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x57,
0x69, 0x74, 0x68, 0x57, 0x65, 0x61, 0x70, 0x6f, 0x6e, 0x73, 0x4f, 0x6e,
0x6c, 0x79, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x20, 0x23, 0x20,
0x44, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x68, 0x69, 0x6e, 0x67,
0x20, 0x79, 0x65, 0x74, 0x0d, 0x0a, 0x0d, 0x0a, 0x23, 0x23, 0x23, 0x23,
0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x61,
0x6c, 0x73, 0x65, 0x0d, 0x0a, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65,
0x57, 0x69, 0x74, 0x68, 0x57, 0x65, 0x61, 0x70, 0x6f, 0x6e, 0x73, 0x4f,
0x6e, 0x6c, 0x79, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x20, 0x23,
0x20, 0x44, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x68, 0x69, 0x6e,
0x67, 0x20, 0x79, 0x65, 0x74, 0x0d, 0x0a, 0x0d, 0x0a, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x50, 0x61, 0x72, 0x6b, 0x65, 0x64,
0x43, 0x61, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65,
0x72, 0x5d, 0x0d, 0x0a, 0x0d, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
0x64, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x52, 0x61,
0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x69, 0x78, 0x65, 0x64,
0x53, 0x70, 0x61, 0x77, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75,
0x65, 0x0d, 0x0a, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65,
0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x53, 0x70, 0x61, 0x77, 0x6e, 0x73,
0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x0d, 0x0a, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x4c, 0x69, 0x63,
0x65, 0x6e, 0x73, 0x65, 0x50, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x61, 0x6e,
0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x0d, 0x0a, 0x0d, 0x0a,
0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x74, 0x72,
0x75, 0x65, 0x0d, 0x0a, 0x0d, 0x0a, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x0d, 0x0a, 0x5b, 0x53, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x52, 0x61,
0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x20, 0x23, 0x20,
0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x20, 0x44, 0x69, 0x61, 0x6c, 0x6f,
0x67, 0x75, 0x65, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x77,
0x0d, 0x0a, 0x0d, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20,
0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x4d, 0x61, 0x74, 0x63,
0x68, 0x53, 0x75, 0x62, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x20, 0x3d,
0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x41, 0x75, 0x64, 0x69, 0x6f,
0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x3d,
0x20, 0x22, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x41, 0x75, 0x64, 0x69, 0x6f,
0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x74, 0x78, 0x74, 0x22, 0x20,
0x23, 0x20, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x74,
0x6f, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63,
0x74, 0x6f, 0x72, 0x79, 0x0d, 0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x41,
0x75, 0x64, 0x69, 0x6f, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x61, 0x62,
0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0d,
0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x4c,
0x69, 0x6e, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0d, 0x0a, 0x0d, 0x0a, 0x23,
0x23, 0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x50, 0x61, 0x72, 0x6b, 0x65,
0x64, 0x43, 0x61, 0x72, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a,
0x65, 0x72, 0x5d, 0x0d, 0x0a, 0x0d, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c,
0x65, 0x64, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x52,
0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x69, 0x78, 0x65,
0x64, 0x53, 0x70, 0x61, 0x77, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x74, 0x72,
0x75, 0x65, 0x0d, 0x0a, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a,
0x65, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x53, 0x70, 0x61, 0x77, 0x6e,
0x73, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x0d, 0x0a,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x53, 0x63, 0x72,
0x69, 0x70, 0x74, 0x56, 0x65, 0x68, 0x69, 0x63, 0x6c, 0x65, 0x52, 0x61,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x4c, 0x69,
0x63, 0x65, 0x6e, 0x73, 0x65, 0x50, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x61,
0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x0d, 0x0a, 0x0d,
0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x74,
0x72, 0x75, 0x65, 0x0d, 0x0a, 0x53, 0x6b, 0x69, 0x70, 0x43, 0x68, 0x65,
0x63, 0x6b, 0x73, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20,
0x20, 0x23, 0x20, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x65, 0x6e, 0x61,
0x62, 0x6c, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x66, 0x20,
0x79, 0x6f, 0x75, 0x20, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x77, 0x61,
0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x6c, 0x6f,
0x63, 0x6b, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x0d, 0x0a, 0x20, 0x20,
0x72, 0x75, 0x65, 0x0d, 0x0a, 0x0d, 0x0a, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x53, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x52,
0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x20, 0x23,
0x20, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x20, 0x44, 0x69, 0x61, 0x6c,
0x6f, 0x67, 0x75, 0x65, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f,
0x77, 0x0d, 0x0a, 0x0d, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x4d, 0x61, 0x74,
0x63, 0x68, 0x53, 0x75, 0x62, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x73, 0x20,
0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x41, 0x75, 0x64, 0x69,
0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x20,
0x3d, 0x20, 0x22, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x41, 0x75, 0x64, 0x69,
0x6f, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x74, 0x78, 0x74, 0x22,
0x20, 0x23, 0x20, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20,
0x74, 0x6f, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x69, 0x72, 0x65,
0x63, 0x74, 0x6f, 0x72, 0x79, 0x0d, 0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65,
0x41, 0x75, 0x64, 0x69, 0x6f, 0x4c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x61,
0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65,
0x0d, 0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x41, 0x75, 0x64, 0x69, 0x6f,
0x4c, 0x69, 0x6e, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0d, 0x0a, 0x0d, 0x0a,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23,
0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x23, 0x0d, 0x0a, 0x5b, 0x53, 0x63,
0x72, 0x69, 0x70, 0x74, 0x56, 0x65, 0x68, 0x69, 0x63, 0x6c, 0x65, 0x52,
0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x69, 0x7a, 0x65, 0x72, 0x5d, 0x0d, 0x0a,
0x0d, 0x0a, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20,
0x74, 0x72, 0x75, 0x65, 0x0d, 0x0a, 0x53, 0x6b, 0x69, 0x70, 0x43, 0x68,
0x65, 0x63, 0x6b, 0x73, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65,
0x20, 0x20, 0x23, 0x20, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x65, 0x6e,
0x61, 0x62, 0x6c, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x66,
0x20, 0x79, 0x6f, 0x75, 0x20, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x77,
0x61, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x6c,
0x6f, 0x63, 0x6b, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x0d, 0x0a, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x23, 0x20, 0x6f, 0x74, 0x68, 0x65,
0x72, 0x20, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x3a, 0x50,
0x0d, 0x0a, 0x0d, 0x0a};
unsigned int config_toml_len = 4084;
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x23, 0x20, 0x6f, 0x74, 0x68,
0x65, 0x72, 0x20, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x3a,
0x50, 0x0d, 0x0a, 0x0d, 0x0a};
unsigned int config_toml_len = 4085;
4 changes: 2 additions & 2 deletions src/pickups.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ RandomizePickup (float x, float y, float z, unsigned int modelId,
{
auto config = ConfigManager::GetInstance ()->GetConfigs ().pickups;

printf ("%05d %05d\r", modelId, ammo);
if (ammo && modelId != 1212 && modelId != 367)
if (ammo && modelId != 1212 && modelId != 367 && modelId != 344
&& modelId != 366)
{
modelId
= WeaponRandomizer::GetInstance ()->GetRandomWeapon (nullptr,
Expand Down

0 comments on commit 9eff723

Please sign in to comment.