Colony expedition system #10286
Draft
Colony expedition system #10286
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/api/java/com/minecolonies/api/colony/IVisitorData.java # src/main/java/com/minecolonies/apiimp/initializer/EntityInitializer.java # src/main/java/com/minecolonies/core/MineColonies.java # src/main/java/com/minecolonies/core/colony/interactionhandling/RecruitmentInteraction.java # src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java # src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java # src/main/java/com/minecolonies/core/datalistener/CustomVisitorListener.java # src/main/java/com/minecolonies/core/entity/ai/visitor/EntityAIVisitor.java # src/main/java/com/minecolonies/core/entity/citizen/VisitorCitizen.java
# Conflicts: # src/main/java/com/minecolonies/api/IMinecoloniesAPI.java # src/main/java/com/minecolonies/api/MinecoloniesAPIProxy.java # src/main/java/com/minecolonies/apiimp/CommonMinecoloniesAPIImpl.java # src/main/java/com/minecolonies/apiimp/initializer/EntityInitializer.java # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
# Conflicts: # src/main/java/com/minecolonies/api/colony/managers/interfaces/IExpeditionManager.java # src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java
# Conflicts: # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
# Conflicts: # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
# Conflicts: # gradle.properties
# Conflicts: # src/main/java/com/minecolonies/core/event/EventHandler.java
# Conflicts: # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
# Conflicts: # src/main/java/com/minecolonies/api/util/InventoryUtils.java
|
Please do not comment on pull requests unnecessarily, and use English. |
# Conflicts: # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
# Conflicts: # src/main/java/com/minecolonies/api/loot/ModLootConditions.java
# Conflicts: # gradle.properties # src/main/java/com/minecolonies/core/colony/Colony.java # src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java # src/main/java/com/minecolonies/core/event/DataPackSyncEventHandler.java # src/main/java/com/minecolonies/core/event/EventHandler.java # src/main/java/com/minecolonies/core/event/FMLEventHandler.java # src/main/java/com/minecolonies/core/network/NetworkChannel.java # src/main/resources/assets/minecolonies/lang/manual_en_us.json
Raycoms
reviewed
Dec 17, 2024
| * | ||
| * @return true if so. | ||
| */ | ||
| default boolean isCombatGuard() |
There was a problem hiding this comment.
Pretty much, I use this on the view and the guard assignment to check if the given guard is "any combat guard". Indeed to prevent hiring druids into the expedition.
Raycoms
reviewed
Dec 17, 2024
| @NotNull | ||
| public ExpeditionVisitorMember getLeader() | ||
| { | ||
| for (final IExpeditionMember<?> member : members.values()) |
There was a problem hiding this comment.
Would store the leader in a seperate dara structure tbh. Leader + list of members
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed in this pull request:
You will have to give them a given amount of goods and assign one or more guards to travel alongside them.
Currently a draft, mostly looking for initial implementation feedback and feedback on the actual loot tables that come with the initial expeditions.
[ ] Yes I tested this before submitting it.
[ ] I also did a multiplayer test.
Review please