Hi Mike, Cool, i like it now how the claim-land feature works!
For the first TRIP update I have created a feature branch: "jazzrexl/lock-actions-on-freecolpanels-open" Which only contains the a bit revised method of adding the possibility of FreeColPanels blocking other Actions to be executed. I also applied it to the (otherwise yet unchanged) TRIP. Currently the only panel i know of which needs a name entered, is this TRIP. All other input requiring text fields are on real JDialog (FreeColDialogs) which are modal and do not require the actions to be disabled. I didn't remove the the getGUI().isClientOptionsDialogShowing() in the FreeColAction yet, however I think we can safely remove it - this ClientOptionsDialog is one of these FreeColDialog (JDialog), which is really modal so it shouldn't be necessary to disable the actions: /** * Checks if this action should be enabled. * * @return True if neither the {@link ClientOptionsDialog} nor another modal * {@link FreeColPanel} is visible. */ protected boolean shouldBeEnabled() { return !(getGUI().isClientOptionsDialogShowing() || getGUI().isFreeColActionBlockingPanelShowing()); } If you approve, I would either merge it to master, or you can do it right away. If this is merged/commited to master, I will continue with the revised TRIP design. BR, Stefan. -- Sent with Tutanota, the secure & ad-free mailbox. Dec 18, 2021, 03:03 by mp...@computer.org: > On Thu, 16 Dec 2021 17:49:01 +0100 (CET) > Stefan Fellner <stefan.fell...@tutanota.com> wrote: > >[Lots of testing] > > Argh, that is indeed complex and weird. I really do not like mere > exploration making implicit land claims. If we implemented that directly > the native anger levels would go through the roof. > >> Now what do we want to do for freecol / classic ruleset? >> ------------------------------------------------------------- >> >> I suggest the following, more clear way: >> Leave the handling as it is now, claim land only if: >> - Founding a colony >> - Improving a tile (pioneering) >> - Working a tile in the colony (potential payment / stealing of native owned >> as it is) >> > > Agreed. Note also we have implemented land claims by wandering > natives, however there were complaints that they claimed too much land, so > native land claims occur with probability proportional to proximity to the > brave's home settlement, subject to a maximum. > >> But, I would add the settlement ownership like I did in the patch, if a tile >> get's claimed by an improvement action. Then you wouldn't loose potential >> resources. >> > > Done (git.96b1cb917e). Tiles claimed by an improvement action are now > owned by a neighbouring colony owned by the same player. > >> Maybe claim the land for settlements right away when founding the colony, >> but only tiles unowned. >> > > Done as foreshadowed, with the new "Claim all tiles" game option, enabled > in classic mode, disabled in freecol mode (git.1ce7690fa9). > > Cheers, > Mike Pope >
_______________________________________________ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers