Skip to content

update RFR for changes to siegeengines #5643

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

Merged
ab9rf merged 1 commit into from
Nov 17, 2025
+26 −8
Merged

update RFR for changes to siegeengines #5643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Template for new versions:

## Fixes
- `buildingplan`: Bolt throwers will no longer be constructed using populated bins.
- `RemoteFortressReader`: updated siege engine facing enums for new diagonal directions
- `suspendmanager`: treat reinforced walls as a blocking construction and buildable platform

## Misc Improvements
Expand Down
2 changes: 1 addition & 1 deletion library/xml
Open in desktop
Submodule xml updated 1 files
+22 −17 df.building.xml
25 changes: 19 additions & 6 deletions plugins/remotefortressreader/building_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,18 +560,31 @@ void CopyBuilding(int buildingIndex, RemoteFortressReader::BuildingInstance * re
auto facing = actual->facing;
switch (facing)
{
case df::building_siegeenginest::Left:
remote_build->set_direction(WEST);
break;
case df::building_siegeenginest::Up:
using enum df::enums::siegeengine_orientation::siegeengine_orientation;
case North:
remote_build->set_direction(NORTH);
break;
case df::building_siegeenginest::Right:
case Northeast:
remote_build->set_direction(NORTHEAST);
break;
case East:
remote_build->set_direction(EAST);
break;
case df::building_siegeenginest::Down:
case Southeast:
remote_build->set_direction(SOUTHEAST);
break;
case South:
remote_build->set_direction(SOUTH);
break;
case Southwest:
remote_build->set_direction(SOUTHWEST);
break;
case West:
remote_build->set_direction(WEST);
break;
case Northwest:
remote_build->set_direction(NORTHWEST);
break;
default:
break;
}
Expand Down
6 changes: 5 additions & 1 deletion plugins/remotefortressreader/proto/RemoteFortressReader.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@ enum BuildingDirection
EAST = 1;
SOUTH = 2;
WEST = 3;
NONE = 4;
NORTHEAST = 4;
SOUTHEAST = 5;
SOUTHWEST = 6;
NORTHWEST = 7;
NONE = 8;
}

enum TileDigDesignation
Expand Down