Add leather addon #1720

ottml · 2024-12-01T16:32:53Z

Fixes #1711

Flamefire

Thanks for working on this! I added some inline notes

libs/s25main/Loader.cpp

libs/s25main/SerializedGameData.cpp

libs/s25main/desktops/dskCredits.cpp

libs/s25main/factories/JobFactory.cpp

libs/s25main/figures/nofLeatherWorker.h

libs/s25main/ingameWindows/iwBuildings.cpp

libs/s25main/ingameWindows/iwShip.cpp

libs/s25main/gameData/BuildingConsts.cpp

libs/s25main/gameData/DoorConsts.h

libs/s25main/gameData/BuildingConsts.h

libs/s25main/gameData/BuildingConsts.cpp

ottml · 2025-06-15T21:07:10Z

From my side everything is finished so far. We can begin reviewing the changes.

ottml · 2025-06-25T15:43:42Z

@Flamefire If you have time it would be nice to get a review :)

…ly died our died by the hunter)

…s for coins - Order, upgrade, enable/disable - Add armor member to nofSoldier, reduce first armor before hitpoints

- refactor gui to handle adding new stuff more easily

…nd version to 2

… save game and replays

…t by a catapult (losing his armor)

…wrong good type for leather addon

…dons checks as bool const, use Gamesettings as parameter instead of player

…readibility

tests/s25Main/integration/testAttacking.cpp

libs/s25main/figures/nofArmored.cpp

tests/s25Main/integration/testArmor.cpp

libs/s25main/AddonHelperFunctions.h

libs/s25main/LeatherLoader.cpp

Co-authored-by: Alexander Grund <[email protected]>

…square for skinner

… latter inherit the former

…and skinner in case of active leather addon to finish their work is doubled to give the skinner the chance to reach the dead animal in time

Flamefire · 2025-12-14T10:47:35Z

libs/s25main/figures/noFigure.cpp

+        if(isSoldier(GetJobType()))
+        {
+            auto* armoredFigure = checkedCast<nofArmored*>(this);
+            if(armoredFigure && armoredFigure->HasArmor())


armoredFigure can never be NULL, can it? Did you mean to use dynamic_cast here?

Yes it can never be NULL and should be dynamic_cast. But as you suggested in the review earlier i will remove the nofArmored class completly and use a pure member for the armor. I will added the details add the corresponding comment in noArmored.cpp

…nter

Flamefire reviewed Dec 1, 2024

View reviewed changes

aztimh reviewed Dec 5, 2024

View reviewed changes

libs/s25main/gameData/BuildingConsts.cpp Outdated Show resolved Hide resolved

aztimh reviewed Dec 10, 2024

View reviewed changes

libs/s25main/gameData/BuildingConsts.cpp Outdated Show resolved Hide resolved

aztimh reviewed Dec 11, 2024

View reviewed changes

libs/s25main/gameData/DoorConsts.h Outdated Show resolved Hide resolved

aztimh reviewed Dec 11, 2024

View reviewed changes

libs/s25main/gameData/BuildingConsts.h Outdated Show resolved Hide resolved

aztimh reviewed Dec 11, 2024

View reviewed changes

libs/s25main/gameData/BuildingConsts.h Outdated Show resolved Hide resolved

aztimh reviewed Jan 20, 2025

View reviewed changes

libs/s25main/gameData/BuildingConsts.cpp Outdated Show resolved Hide resolved

ottml force-pushed the leather_addon branch 2 times, most recently from 2a59a2f to e51f41e Compare January 22, 2025 13:44

ottml force-pushed the leather_addon branch from 5c63e65 to 5fbb1fb Compare May 21, 2025 15:11

ottml force-pushed the leather_addon branch from 9e11c02 to f026d88 Compare June 2, 2025 16:56

ottml marked this pull request as ready for review June 11, 2025 17:01

ottml force-pushed the leather_addon branch from fee82d8 to c077f8e Compare June 14, 2025 21:49

ottml force-pushed the leather_addon branch from c16b91c to 0604c85 Compare June 19, 2025 22:23

ottml added 14 commits September 24, 2025 10:40

Adding ware workflow, buildings and menus for leather addon

ed52f31

Add distribution tab for ham and make gui more general

0a375f0

Add compatibilty code

1d64203

Add direct transport route

8ba2b06

Add fixed animations from leather_bobs.lst

8f6442e

Skinner goes out to get skins from carcass if he has no pigs (natural…

eca0f39

…ly died our died by the hunter)

LeatherAddon military (1): Add SetArmorAllowed game command

cecf2f6

LeatherAddon military (2): Add logic for armor in military building a…

128de04

…s for coins - Order, upgrade, enable/disable - Add armor member to nofSoldier, reduce first armor before hitpoints

LeatherAddon military (3): Add armor gui elements to military building

0733fba

- refactor gui to handle adding new stuff more easily

Add test for SetArmorAllowed

05a95fc

Add compatibility code for ChangeDistribution and increase game comma…

0d71a79

…nd version to 2

Add new transportation type leatherworking and compatibility code for…

71956d7

… save game and replays

Fix wrong default build order

73b6b1e

Solider has 30 percent chance to not die if he has an armor and is hi…

db98d2c

…t by a catapult (losing his armor)

ottml added 5 commits November 4, 2025 23:15

Code review: Remove Invalid state from enum and throw exception when …

78acaf3

…wrong good type for leather addon

Code review: Rename functions, remove auto return type and capture ad…

32217de

…dons checks as bool const, use Gamesettings as parameter instead of player

Code review: Add named constants for deserialization code for better …

d7204ff

…readibility

Code review: Use checkedCast

c05a293

Code review: Rewrite test and fold 4 cases into one

650a826

Flamefire reviewed Nov 5, 2025

View reviewed changes

ottml and others added 21 commits November 5, 2025 19:34

Code review: Use switch

a8dd2c8

Co-authored-by: Alexander Grund <[email protected]>

Code review: Rename variables and change type

55b89ea

Code review: Use constants and rewrite counting of traded soldiers

be76687

Code review

31f7ed4

Co-authored-by: Alexander Grund <[email protected]>

Code review: Use clearer names for varibles

cf8ea9a

Code review: Optimize code

a3d378e

Code review: Use better function names and remove german comment

fe3c33d

Code review: Check for production disabled and use radius instead of …

92058a5

…square for skinner

Code review: Use extra enum for armor icon above soldier

c809d4a

Code review: Fix formatting

b8c9388

Code review: Use better function names and remove german comment

90db570

Code review use operator instead of member

c88c6d0

Code review: Add comment to explain scenario

154ffd7

Code review: Handle GoodType::Nothing in save games

f9c3c45

Code review: Add comment to clarify no OBB write appears

01b1946

Code review: Fix wrong index

fe998b6

Code review: Split a PeopleArray from GoodsAndPeopleArray and let the…

a518017

… latter inherit the former

Code review: Revert changed parameter name

95ba8ef

Code review: Cleanup header and remove using instead of direct type

1443103

Code review: Hunter and skinner have same behaviour. Time for hunter …

f32c9b7

…and skinner in case of active leather addon to finish their work is doubled to give the skinner the chance to reach the dead animal in time

Code review: Add check to avoid assert

909328a

Flamefire reviewed Dec 14, 2025

View reviewed changes

ottml added 2 commits December 14, 2025 18:11

Code review: Add comment about ownership of animal for skinner and hu…

90efc4d

…nter

Code review: Add comment about ownership of animal for skinner and hu…

1a4b894

…nter

Add leather addon #1720

Are you sure you want to change the base?

Add leather addon #1720

Uh oh!

Conversation

ottml commented Dec 1, 2024

Uh oh!

Flamefire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ottml commented Jun 15, 2025

Uh oh!

ottml commented Jun 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Flamefire Dec 14, 2025

Choose a reason for hiding this comment

Uh oh!

ottml Dec 14, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants