patchFreeciv - Patches: patch #3902, Fix unit disband when cities starve

 
 
Show feedback again

patch #3902: Fix unit disband when cities starve

Submitted by:  Guillaume Melquiond <silene>
Submitted on:  Wed 08 May 2013 09:18:45 AM UTC  
 
Category: generalPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.3.5, 2.4.0, 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.

 

Wed 15 May 2013 05:49:07 AM UTC, SVN revision 22868:

Disband only those units that are actually using food upkeep
from starving city. Units that have free upkeep, usually provided
by government type, are not disbanded.

Partch by Guillaume Melquiond

See patch #3902

(Browse SVN revision 22868)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 15 May 2013 05:49:01 AM UTC, SVN revision 22867:

Disband only those units that are actually using food upkeep
from starving city. Units that have free upkeep, usually provided
by government type, are not disbanded.

Partch by Guillaume Melquiond

See patch #3902

(Browse SVN revision 22867)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 15 May 2013 05:48:55 AM UTC, SVN revision 22866:

Disband only those units that are actually using food upkeep
from starving city. Units that have free upkeep, usually provided
by government type, are not disbanded.

Partch by Guillaume Melquiond

See patch #3902

(Browse SVN revision 22866)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 15 May 2013 05:48:47 AM UTC, SVN revision 22865:

Disband only those units that are actually using food upkeep
from starving city. Units that have free upkeep, usually provided
by government type, are not disbanded.

Partch by Guillaume Melquiond

See patch #3902

(Browse SVN revision 22865)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 08 May 2013 08:32:11 PM UTC, comment #1:

- Version for S2_3/S2_4
- While at it, fix nearby comment typo

(file #17930, file #17931)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 08 May 2013 09:18:45 AM UTC, original submission:

When starving a city, function city_populate disbands units whose types have a food upkeep. But the units themselves might not have one, so disbanding them does not help. For instance, with the civ2civ3 ruleset, overgrown cities under democracy end up disbanding all of their units! The fix is a one-liner: change the code so that it looks at the actual upkeep.

Guillaume Melquiond <silene>

 

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

Attach File(s):
   
   
Comment:
   

Attached Files
file #17930:  StarveUpkeep-S2_4.patch added by cazfi (1kB - text/x-diff)
file #17931:  StarveUpkeep.patch added by cazfi (1kB - text/x-diff)
file #17927:  starve.patch added by silene (573B - text/x-patch)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by cazfi (Updated the item)
  • -unavailable- added by silene (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 8 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Wed 15 May 2013 05:49:36 AM UTCcazfiStatusReady For Test=>Done
      Open/ClosedOpen=>Closed
    Wed 08 May 2013 08:32:11 PM UTCcazfiAttached File-=>Added StarveUpkeep-S2_4.patch, #17930
      Attached File-=>Added StarveUpkeep.patch, #17931
      StatusNone=>Ready For Test
      Assigned toNone=>cazfi
      Planned Release=>2.3.5, 2.4.0, 2.5.0, 2.6.0
    Wed 08 May 2013 09:18:45 AM UTCsileneAttached File-=>Added starve.patch, #17927
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup