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

Wine addon #1673

Merged
merged 85 commits into from
Aug 4, 2024
Merged

Wine addon #1673

merged 85 commits into from
Aug 4, 2024

Commits on Jul 19, 2024

  1. Initial version of wine addon

    @ottml
    ottml committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    1684d06 View commit details
    Browse the repository at this point in the history

  2. Add missing images

    @ottml
    ottml committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    a196f77 View commit details
    Browse the repository at this point in the history

  3. Reactivate assert

    @ottml
    ottml committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    31fe87d View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Add missing buildings to lua

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    bb7846a View commit details
    Browse the repository at this point in the history

  2. Winery and Temple get wares directly without going of warehouse

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    879a564 View commit details
    Browse the repository at this point in the history

  3. First approach for separate loader for wine addon images

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    001413f View commit details
    Browse the repository at this point in the history

  4. Add new image data for buildings

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f2be6f9 View commit details
    Browse the repository at this point in the history

  5. Use correct index for harvested field and add correct shadow for it

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    16ab6a8 View commit details
    Browse the repository at this point in the history

  6. Change names of workers

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    94768dc View commit details
    Browse the repository at this point in the history

  7. Increase work cycle for Winery to match miller work cycle (slows down… 

    … animation too). Speed up Vineyard work cycle like farmer.
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    3c8ae1d View commit details
    Browse the repository at this point in the history

  8. Fix Fat grape carrier animation frames to be off by 1

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    474d875 View commit details
    Browse the repository at this point in the history

  9. Adjust temple window offset to new one

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    d0ffbe3 View commit details
    Browse the repository at this point in the history

  10. Adjust x sign to new values

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    b7c18bf View commit details
    Browse the repository at this point in the history

  11. Fix formatting and clang tidy

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a06eed1 View commit details
    Browse the repository at this point in the history

  12. Utf8 issue

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    78d8fda View commit details
    Browse the repository at this point in the history

  13. Translate docs to english

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    bb2ef4e View commit details
    Browse the repository at this point in the history

  14. Fix formatting

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    83ed699 View commit details
    Browse the repository at this point in the history

  15. Reset wrongly changed radius of CharBurner

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    9051778 View commit details
    Browse the repository at this point in the history

  16. Give wine and grapes same transport prio then other food stuff

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    0e5d84f View commit details
    Browse the repository at this point in the history

  17. Add production toggle button and logic for temple, use special window… 

    … for temple building(increased size, and toggle button)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4dbf6ea View commit details
    Browse the repository at this point in the history

  18. Add new constants to lua test

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a53f0e2 View commit details
    Browse the repository at this point in the history

  19. Play sound only for digging for Winegrower. Reduce animation digging … 

    …by one loop
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    be7dcea View commit details
    Browse the repository at this point in the history

  20. Use new lts files and use direct index computation instead of index t… 

    …able
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    41bf47a View commit details
    Browse the repository at this point in the history

  21. Grape fields and grain fields block each other as they do to themselv… 

    …es to have a 1 space gap.
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    46f00c1 View commit details
    Browse the repository at this point in the history

  22. Use typed enum

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f47d736 View commit details
    Browse the repository at this point in the history

  23. Remove useless comments

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    f85d9c0 View commit details
    Browse the repository at this point in the history

  24. Change GetNationTex to get nation and building type and add support f… 

    …or new building (including charburner)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4fccb6f View commit details
    Browse the repository at this point in the history

  25. Use generic size instead of hard coded one

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    5ea51cc View commit details
    Browse the repository at this point in the history

  26. Use helpers::EnumArray and remove obsolete include

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    3713b9b View commit details
    Browse the repository at this point in the history

  27. Remove comment and fix description

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    9cfbf4c View commit details
    Browse the repository at this point in the history

  28. Adjust temple work duration

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a9ddf2c View commit details
    Browse the repository at this point in the history

  29. Change comment

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4750409 View commit details
    Browse the repository at this point in the history

  30. Remove unused headers

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    0342ea1 View commit details
    Browse the repository at this point in the history

  31. Fix wrong id

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    0ef90a8 View commit details
    Browse the repository at this point in the history

  32. Refactor bob index table

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ca11c8f View commit details
    Browse the repository at this point in the history

  33. Add review fixes

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    1cf3189 View commit details
    Browse the repository at this point in the history

  34. Add review fixes, move Get*Tex implentation to cpp file of loader

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    c33effc View commit details
    Browse the repository at this point in the history

  35. Make DrawWalking(DrawPoint drawPt) virtual and move code to according… 

    … derived classes
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    0ecba1b View commit details
    Browse the repository at this point in the history

  36. Code review

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    cea191d View commit details
    Browse the repository at this point in the history

  37. Make iwTempleBuilding a derived class of iwBuilding to avoid code dup… 

    …lication
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    9856ca5 View commit details
    Browse the repository at this point in the history

  38. Remove iwTempleBuilding completly and add stuff to iwBuilding

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ed53ef1 View commit details
    Browse the repository at this point in the history

  39. Re add iwTempleBuilding

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    bfed4ef View commit details
    Browse the repository at this point in the history

  40. Use Nothing entries for new wine addon building and add LST files to … 

    …the addon folder

- So we can use the normal loading api
- Use correct image without shadow for CharBurner and wine addon buildings
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    81f4cb9 View commit details
    Browse the repository at this point in the history

  41. Remove unused includes

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    843f2d7 View commit details
    Browse the repository at this point in the history

  42. Use ProductionMode::Default image as temple output ware icon

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4838188 View commit details
    Browse the repository at this point in the history

  43. Rename fucntion GetNationTex to GetBuildingTex

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    203e79b View commit details
    Browse the repository at this point in the history

  44. Fix test 

    - Resize initial map size because building placing will otherwise collide with the automatically placed HQ
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a6a23df View commit details
    Browse the repository at this point in the history

  45. Add compatibility code for old file versions

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    cc25ced View commit details
    Browse the repository at this point in the history

  46. Jump to correct window

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    115166c View commit details
    Browse the repository at this point in the history

  47. Remove wine.lst not needed anymore because splitted into seperate files

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4a73c92 View commit details
    Browse the repository at this point in the history

  48. Add function to check if addon is active

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ea5618b View commit details
    Browse the repository at this point in the history

  49. Refactor productivity and building count menu to show only buildings … 

    …of active addons (Wine and Charburner)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    8beb5f3 View commit details
    Browse the repository at this point in the history

  50. Fix formatting

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4e29d2c View commit details
    Browse the repository at this point in the history

  51. Refactor distribution menu to show only entries of active addons (Win… 

    …e and Charburner)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    950ae2f View commit details
    Browse the repository at this point in the history

  52. Fix insertion

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    91b40a0 View commit details
    Browse the repository at this point in the history

  53. Refactor inventory view in ware houses and global inventory to show o… 

    …nly entries of active addons (Wine and Charburner)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    1418910 View commit details
    Browse the repository at this point in the history

  54. Simplify code

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a5a267a View commit details
    Browse the repository at this point in the history

  55. removed unused include

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    a175593 View commit details
    Browse the repository at this point in the history

  56. Fix wrong walking if people are transferred between warehouse

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    1ed769a View commit details
    Browse the repository at this point in the history

  57. Refactor building order view to show only entries of active addons (W… 

    …ine and Charburner)
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    485b9bf View commit details
    Browse the repository at this point in the history

  58. Revert "Fix wrong walking if people are transferred between warehouse" 

    This reverts commit dca19f8.
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    27f04ae View commit details
    Browse the repository at this point in the history

  59. Revert "Make DrawWalking(DrawPoint drawPt) virtual and move code to a… 

    …ccording derived classes"

This reverts commit c4c76f7.
    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ca7b744 View commit details
    Browse the repository at this point in the history

  60. Introduce constants for more readibility

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    209a67e View commit details
    Browse the repository at this point in the history

  61. Add new temple produce icon with bigger size

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    63ddeec View commit details
    Browse the repository at this point in the history

  62. Add door const for new buildings

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    d612086 View commit details
    Browse the repository at this point in the history

  63. Do not show wineaddon jobs and goods for credits screen

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ef0d603 View commit details
    Browse the repository at this point in the history

  64. Add winaddon job types to ship inventory

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    cd668d6 View commit details
    Browse the repository at this point in the history

  65. Code review

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    9d0c8a1 View commit details
    Browse the repository at this point in the history

  66. Harvest grape field even when no wares available for new field

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    825d2ed View commit details
    Browse the repository at this point in the history

  67. Ai uses correct distribution

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    62772a8 View commit details
    Browse the repository at this point in the history

  68. Add fix for replay from @Flamefire

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    e0feead View commit details
    Browse the repository at this point in the history

  69. Refactor nofFarmhand work start handling 

    Translate comments and improve naming and comments
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    d1206d8 View commit details
    Browse the repository at this point in the history

  70. Translate docstrings of nofFarmhand

    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    d4f1815 View commit details
    Browse the repository at this point in the history

  71. Remove IsPointAvailable from nofFarmhand 

    Only used in one place and includes costly PointQuality calculation
which needs to happen twice due to this.
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4cd7995 View commit details
    Browse the repository at this point in the history

  72. Add GetPointQuality with isBeforeWork 

    Easier handling for derived classes that need to check for available
wares.
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    7836045 View commit details
    Browse the repository at this point in the history

  73. Refactor BurnedWarehous leave handling 

    Translate comments and use `static_vector` instead of array and size
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    ee35fc2 View commit details
    Browse the repository at this point in the history

  74. Fix direction handling in BurnedWarehouse 

    The startDirection was added to a valid direction which may result in an
invalid direction.
Use a random index instead.
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    4f38909 View commit details
    Browse the repository at this point in the history

  75. Optimize for few people in burned warehouse 

    Skip loop iteration if there are no people of a job.
This also avoids asyncs when adding/removing jobs and improves speed by
not calling RANDOM_RAND in that case.
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    6c79a0a View commit details
    Browse the repository at this point in the history

  76. Update test replays

    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    89d362a View commit details
    Browse the repository at this point in the history

  77. Check that replay is not newer than supported 

    We only provide backwards compatibility. So we need to reject any newer
version to avoid corrupting memory due to unexpected changes.
    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    66875eb View commit details
    Browse the repository at this point in the history

  78. Wine addon changes for farmhand refactoring

    @Flamefire @ottml
    Flamefire authored and ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    e312639 View commit details
    Browse the repository at this point in the history

  79. Fix carriers carrying grapes

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    50483ea View commit details
    Browse the repository at this point in the history

  80. Fix wrong roman watch tower x sign (typo)

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    7f9319f View commit details
    Browse the repository at this point in the history

  81. Adjust the winegrower digging sound to animation

    @ottml
    ottml committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    88eb9e1 View commit details
    Browse the repository at this point in the history

  82. Fix compiler error 

    Co-authored-by: Alexander Grund <[email protected]>
    @ottml @Flamefire
    ottml and Flamefire committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    28daf78 View commit details
    Browse the repository at this point in the history