patchFreeciv - Patches: patch #4656, Generic extras version of adjacent...

 
 
Show feedback again

patch #4656: Generic extras version of adjacent unit activity check

Submitted by:  Marko Lindqvist <cazfi>
Submitted on:  Fri 18 Apr 2014 09:34:29 AM UTC  
 
Category: generalPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.5.0, 2.6.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Sun 14 Dec 2014 01:24:09 AM UTC, SVN revision 27295:

Check for activities of the settler-type units in the adjacent tiles when
another activity potentially removing requirement for it is finished.
This used to be hardcoded so that only finishing mining, and thus potentially
removing irrigation conflicting with the mine, caused recheck of adjacent units
building irrigation.

See patch #4656

(Browse SVN revision 27295)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 07 Dec 2014 11:48:01 PM UTC, comment #7:

Patch for S2_5

(file #23080)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 03 Jun 2014 11:27:24 PM UTC, comment #6:

> (Technically it probably even applies to S2_4, since bases in
> progress could depend on adjacent tiles.)


but then bases and specials (including irrigation) are separate things in 2.4, and there's no assumption of consistency between their handling.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 03 Jun 2014 11:01:54 PM UTC, comment #5:

I think something like this may also be required on S2_5? We have fairly generalised requirements for mines etc there, so there's no reason why irrigation is the only activity that might be disrupted by an adjacent tile's change.

(Technically it probably even applies to S2_4, since bases in progress could depend on adjacent tiles.)

Jacob Nevins <jtn>
Project Administrator
Mon 21 Apr 2014 11:34:44 PM UTC, SVN revision 24788:

Check for activities of the settler-type units in the adjacent tiles when
another activity potentially removing requirement for it is finished.
This used to be hardcoded so that only finishing mining, and thus potentially
removing irrigation?\194?\160conflicting with the mine, caused recheck of adjacent units
building irrigation.

See patch #4656

(Browse SVN revision 24788)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 19 Apr 2014 01:40:12 PM UTC, comment #3:

Sorry, yes, that was line 905 prior to the patch (the very comment you updated). Looks fine to me now.

Emmet Hikory <persia>
Project Member
Sat 19 Apr 2014 12:57:26 PM UTC, comment #2:

- ACTIVITY_POLLUTION and ACTIVITY_FALLOUT added to tile_changing_actions[]
- There's no comment on line 905, but I adjusted one several lines below (hmm.. it could have been in 905 prior to any version of this patch) Is it sufficient now?

(file #20523)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 18 Apr 2014 01:31:42 PM UTC, comment #1:

Should this not also include ACTIVITY_POLLUTION and ACTIVITY_FALLOUT in tile_changing_actions[]? I don't expect it to be used much, but I don't see any reason why a given extra might not require one of the nuisance extras to be in an adjacent tile. Also, adjusting the comment on line 905 might help future developers understand what is happening in the check_adjacent_units conditional.

Emmet Hikory <persia>
Project Member
Fri 18 Apr 2014 09:34:29 AM UTC, original submission:

Currently there's a check specifically crafted for the case where unit building mine or transforming tile may remove irrigation, and thus makes it impossible to units in adjacent tile to continue building irrigation.

This patch makes this generic to all extras.
- Any extra (a) can require any extra (b) in adjacent tile, and any activity removing that extra (b) will stop the activity to build extra (a).

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #20519:  TileChangingActions.patch added by cazfi (2kB - text/x-diff)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by jtn (Posted a comment)
  • -unavailable- added by persia (Posted a comment)
  • -unavailable- added by cazfi (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 14 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun 14 Dec 2014 01:24:23 AM UTCcazfiStatusReady For Test=>Done
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Sun 07 Dec 2014 11:48:01 PM UTCcazfiAttached File-=>Added TileChangingActions-S2_5.patch, #23080
      StatusIn Progress=>Ready For Test
    Mon 07 Jul 2014 11:31:20 PM UTCcazfiAssigned tocazfi=>None
    Tue 03 Jun 2014 11:29:16 PM UTCcazfiPlanned Release2.6.0=>2.5.0, 2.6.0
    Tue 03 Jun 2014 11:27:24 PM UTCcazfiStatusDone=>In Progress
      Open/ClosedClosed=>Open
    Mon 21 Apr 2014 11:34:54 PM UTCcazfiStatusReady For Test=>Done
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Sat 19 Apr 2014 12:57:26 PM UTCcazfiAttached File-=>Added TileChangingActions-2.patch, #20523
    Fri 18 Apr 2014 09:34:30 AM UTCcazfiAttached File-=>Added TileChangingActions.patch, #20519
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup