Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert Brief and Proximity files to JSON #4068

Merged
merged 89 commits into from
Oct 17, 2024
Merged

Convert Brief and Proximity files to JSON #4068

merged 89 commits into from
Oct 17, 2024

Commits on Oct 16, 2024

  1. Create JSON Proximity file reader 

    To eventually replace the CSV files with JSON variants that are much easier to understand.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a3ad2fb View commit details
    Browse the repository at this point in the history

  2. Convert prox1a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e3245b2 View commit details
    Browse the repository at this point in the history

  3. Convert prox1b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cdff06b View commit details
    Browse the repository at this point in the history

  4. Convert prox1-1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c6e0569 View commit details
    Browse the repository at this point in the history

  5. Convert prox1-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a887160 View commit details
    Browse the repository at this point in the history

  6. Convert prox1-3

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8fa7d2f View commit details
    Browse the repository at this point in the history

  7. Convert prox1c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    036bb9f View commit details
    Browse the repository at this point in the history

  8. Convert prox1ca

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    004a155 View commit details
    Browse the repository at this point in the history

  9. Convert prox1-4a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0991a47 View commit details
    Browse the repository at this point in the history

  10. Convert prox1-5

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    93451a9 View commit details
    Browse the repository at this point in the history

  11. Convert prox1a-c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b3c2e38 View commit details
    Browse the repository at this point in the history

  12. Convert prox1-7

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    04d2851 View commit details
    Browse the repository at this point in the history

  13. Convert prox1d

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    926a87c View commit details
    Browse the repository at this point in the history

  14. Convert prox2a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bebab81 View commit details
    Browse the repository at this point in the history

  15. Convert prox2-1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ef03ff6 View commit details
    Browse the repository at this point in the history

  16. Convert prox2b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    54c0be6 View commit details
    Browse the repository at this point in the history

  17. Convert prox2-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3cf94bf View commit details
    Browse the repository at this point in the history

  18. Convert prox2c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    39d44e0 View commit details
    Browse the repository at this point in the history

  19. Convert prox2-5

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a3e12ad View commit details
    Browse the repository at this point in the history

  20. Convert prox2d

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ca9394e View commit details
    Browse the repository at this point in the history

  21. Convert prox2-6

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6c8b5a1 View commit details
    Browse the repository at this point in the history

  22. Convert prox2-7

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cb88b5e View commit details
    Browse the repository at this point in the history

  23. Convert prox2-8

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0454746 View commit details
    Browse the repository at this point in the history

  24. Convert prox3a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    72e2a38 View commit details
    Browse the repository at this point in the history

  25. Convert prox3-1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1fcdc99 View commit details
    Browse the repository at this point in the history

  26. Convert prox3b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    dda1efa View commit details
    Browse the repository at this point in the history

  27. Convert prox3-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ac730db View commit details
    Browse the repository at this point in the history

  28. Convert prox3c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a32a2e3 View commit details
    Browse the repository at this point in the history

  29. Convert prox3a-d1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cfe06ce View commit details
    Browse the repository at this point in the history

  30. Update Gamma 8 WRF 

    To point to the correct proximity file. Not that it needs to include it...
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7b37e41 View commit details
    Browse the repository at this point in the history

  31. Convert prox3-4

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e4ce51c View commit details
    Browse the repository at this point in the history

  32. Convert prox3-3 

    Note: not used as this mission doesn't exist.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    12c77ad View commit details
    Browse the repository at this point in the history

  33. Convert proxdemo

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e360841 View commit details
    Browse the repository at this point in the history

  34. Convert proxtut

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5b72842 View commit details
    Browse the repository at this point in the history

  35. Remove proxfast 

    Not used anywhere.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c11ed28 View commit details
    Browse the repository at this point in the history

  36. Add documentation for Brief/Proximity files

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    162f9ee View commit details
    Browse the repository at this point in the history

  37. Create JSON Briefing file reader 

    To eventually replace the CSV files with JSON variants.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    db1e2e8 View commit details
    Browse the repository at this point in the history

  38. Add Briefing file format documentation

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    bf13653 View commit details
    Browse the repository at this point in the history

  39. Convert brief1a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    01a18e8 View commit details
    Browse the repository at this point in the history

  40. Convert brief1b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    623c086 View commit details
    Browse the repository at this point in the history

  41. Convert brief1-1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2649365 View commit details
    Browse the repository at this point in the history

  42. Convert brief1-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    38d4b25 View commit details
    Browse the repository at this point in the history

  43. Convert brief1-3

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2f02952 View commit details
    Browse the repository at this point in the history

  44. Convert brief1c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b197970 View commit details
    Browse the repository at this point in the history

  45. Convert brief1ca

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f807d69 View commit details
    Browse the repository at this point in the history

  46. Convert brief1-4a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4b0171c View commit details
    Browse the repository at this point in the history

  47. Convert brief1-5

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0023889 View commit details
    Browse the repository at this point in the history

  48. Convert brief1a-c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f04684e View commit details
    Browse the repository at this point in the history

  49. Convert brief1-7

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    25f121d View commit details
    Browse the repository at this point in the history

  50. Convert brief1d

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4d1271b View commit details
    Browse the repository at this point in the history

  51. Convert cam1-outro

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2a8428b View commit details
    Browse the repository at this point in the history

  52. Convert brief2a 

    First video line has a disabled video. Seems some additional work will be needed to restore missing subtitles.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4cd6e33 View commit details
    Browse the repository at this point in the history

  53. Convert brief2-1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    855541f View commit details
    Browse the repository at this point in the history

  54. Convert brief2b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8c31414 View commit details
    Browse the repository at this point in the history

  55. Convert brief2-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    940ee0a View commit details
    Browse the repository at this point in the history

  56. Convert brief2-c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a868614 View commit details
    Browse the repository at this point in the history

  57. Convert brief2-5

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c0ee60c View commit details
    Browse the repository at this point in the history

  58. Convert brief2-di

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    68086be View commit details
    Browse the repository at this point in the history

  59. Convert brief2-6

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    85ff9fb View commit details
    Browse the repository at this point in the history

  60. Convert brief2-7

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3495849 View commit details
    Browse the repository at this point in the history

  61. Convert brief2-8

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2e5b415 View commit details
    Browse the repository at this point in the history

  62. Convert brief2-dii

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    aeb2c3a View commit details
    Browse the repository at this point in the history

  63. Remove brief2intro 

    Not used.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ed5d78d View commit details
    Browse the repository at this point in the history

  64. Remove cam2-outro 

    Not used (this one is inside brief2-dii).
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8910bf9 View commit details
    Browse the repository at this point in the history

  65. Convert brief3intro

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0e80e0b View commit details
    Browse the repository at this point in the history

  66. Convert brief3-a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    650a6b8 View commit details
    Browse the repository at this point in the history

  67. Convert brief3-1a

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5570e9b View commit details
    Browse the repository at this point in the history

  68. Convert brief3-1b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    acb044a View commit details
    Browse the repository at this point in the history

  69. Convert brief3-b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    08915bb View commit details
    Browse the repository at this point in the history

  70. Convert brief3-2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5b0aaae View commit details
    Browse the repository at this point in the history

  71. Convert brief3a-b

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d5fa0d8 View commit details
    Browse the repository at this point in the history

  72. Convert brief3-c

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6b74a01 View commit details
    Browse the repository at this point in the history

  73. Convert brief3a-d1

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2b030c3 View commit details
    Browse the repository at this point in the history

  74. Convert brief3a-d2

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d4a786d View commit details
    Browse the repository at this point in the history

  75. Convert brief3-4

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3bd4c1c View commit details
    Browse the repository at this point in the history

  76. Convert briefdemo

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    12a5b78 View commit details
    Browse the repository at this point in the history

  77. Convert brieftut

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e69b2c8 View commit details
    Browse the repository at this point in the history

  78. Convert cam1messages

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    efb1353 View commit details
    Browse the repository at this point in the history

  79. Convert cam2messages

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4ccef3f View commit details
    Browse the repository at this point in the history

  80. Convert cam3messages

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    39263c3 View commit details
    Browse the repository at this point in the history

  81. Convert genmessages 

    Just turns it into a placeholder for the WIN and END messages.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a49ba82 View commit details
    Browse the repository at this point in the history

  82. Update sub3-3s wrf 

    Not used, just removing any remnants of SMSG.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    975e9c2 View commit details
    Browse the repository at this point in the history

  83. Cleanup camXmessages files 

    Moved a message in cam1messages to brief1a. The other files had unused IDs or repeated inclusions for END.

camX.wrf files now point to the previously unused genmessages file which will hold WIN/END to reduce duplication.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2cdd7fc View commit details
    Browse the repository at this point in the history

  84. More END/WIN duplication removal 

    Add genmessages to the fastplay WRF file.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3f323a0 View commit details
    Browse the repository at this point in the history

  85. Remove brief3intro 

    Weird situation where 1 video in both brief3intro and brief3-a got used. We can use 1 file instead.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ae41ae5 View commit details
    Browse the repository at this point in the history

  86. Fix various proximity blip errors 

    Original game wrong messages, wrong sound file, missing sound file, and bad locations.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    b00da61 View commit details
    Browse the repository at this point in the history

  87. Cleanup brief3-4 

    Remove outro video since that gets played in the source.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    0b65723 View commit details
    Browse the repository at this point in the history

  88. Remove audio option from brief files 

    Not used and will require additional video playback tweaks to support it properly.
    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7d75636 View commit details
    Browse the repository at this point in the history

  89. Cleanup some remnants of sub3-3

    @KJeff01
    KJeff01 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    e7d2042 View commit details
    Browse the repository at this point in the history