[Freeciv-Dev] [bug #13587] [patch] add upkeep information to units in city dialog

2009-05-29 Thread Madeline Book 

Update of bug #13587 (project freeciv):

 Assigned to:None => mbook  


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13586] [patch] economic report (was PR#40763) - help needed

2009-05-29 Thread Madeline Book 

Update of bug #13586 (project freeciv):

 Assigned to:None => mbook  


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13596] [patch] use city_refresh queue

2009-05-29 Thread Marko Lindqvist 

Update of bug #13596 (project freeciv):

 Assigned to:None => cazfi  


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13595] [patch] remove unigold struct

2009-05-29 Thread Marko Lindqvist 

Update of bug #13595 (project freeciv):

 Assigned to:None => cazfi  


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13596] [patch] use city_refresh queue

2009-05-29 Thread Matthias Pfafferodt 

URL:
  

 Summary: [patch] use city_refresh queue
 Project: Freeciv
Submitted by: syntron
Submitted on: Freitag 29.05.2009 um 23:05
Category: general
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Release: 
Operating System: None

___

Details:

use city_refresh_queue_add() and city_refresh_queue_processing() in
sell_random_buildings()



___

File Attachments:


---
Date: Freitag 29.05.2009 um 23:05  Name: gold8.patch.diff  Size: 802B   By:
syntron



___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13595] [patch] remove unigold struct

2009-05-29 Thread Matthias Pfafferodt 

URL:
  

 Summary: [patch] remove unigold struct
 Project: Freeciv
Submitted by: syntron
Submitted on: Freitag 29.05.2009 um 22:58
Category: general
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Release: 
Operating System: None

___

Details:

replace the unitgold struct introduced in PR#40619
by a unit_list



___

File Attachments:


---
Date: Freitag 29.05.2009 um 22:58  Name: gold7.patch.diff  Size: 5kB   By:
syntron



___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13587] [patch] add upkeep information to units in city dialog

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #3, bug #13587 (project freeciv):

changes in version 2:

- use astring
- upkeep information are only visible for own units
- also update unit_activity_text()

(file #5844)
___

Additional Item Attachment:

File name: version2-gold6.patch.diff  Size:6 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13586] [patch] economic report (was PR#40763) - help needed

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #3, bug #13586 (project freeciv):

one remark:

if the editor is used the changes are visible in the next
turn. I'm not sure, how to force an update.

___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13586] [patch] economic report (was PR#40763) - help needed

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #2, bug #13586 (project freeciv):

Ok, after some (a lot of!) searching I found my error. The
upkeep information has to be processed two times in packhand.c
- in unpackage_unit() and handle_unit_packet_common()!

changes in version 2:

- it's working!
- move city_units_upkeep() to citytools.c
- upkeep information are only send for own units (a flag
  upkeep_info is used)
- upkeep information are only send if there are changes
- reduce the number of places there this function is called
  (not on every loop!; but within city_refresh())

(file #5843)
___

Additional Item Attachment:

File name: version2-gold5.patch.diff  Size:37 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13585] [patch] shield2gold_units (was PR#40762)

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #2, bug #13585 (project freeciv):

changes in version 2:

- remove ruleset changes

(file #5837)
___

Additional Item Attachment:

File name: version2-gold4.patch.diff  Size:2 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13583] [patch] shield2gold_basics (was PR#40761)

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #2, bug #13583 (project freeciv):

Thanks for looking at the patch!

changes in version2:

- fix all the basic stuff
- remove ruleset changes
- add documentation

(file #5836)
___

Additional Item Attachment:

File name: version2-gold3.patch.diff  Size:3 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #13582] [patch] extend the gold upkeep system (was PR#40760)

2009-05-29 Thread Matthias Pfafferodt 

Follow-up Comment #2, bug #13582 (project freeciv):

Perhaps the comments in the rulesets civ1 and civ2 should also be updated?
See attached patch.

(file #5835)
___

Additional Item Attachment:

File name: gold2.1.patch.diff Size:2 KB


___

Reply to this item at:

  

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] [bug #13582] [patch] extend the gold upkeep system (was PR#40760)

2009-05-29 Thread Matthias Pfafferodt 
Perhaps the comments in the ruleset civ1 and civ2 should also be updated? See 
attached patch. I will also update the following patches ...

Am Friday 29 May 2009 04:11:08 schrieb Madeline Book:
> Update of bug #13582 (project freeciv):
>
>  Assigned to:None => mbook
>
> ___
>
> Follow-up Comment #1:
>
> Patch is fine except for the use of 'true' and 'false'
> which should be 'TRUE' and 'FALSE'. I will fix that
> and commit it.
>
>
> 
> 本当の誠は何なのだ。
>
> ___
>
> Reply to this item at:
>
>   
>
> ___
>   Message sent via/by Gna!
>   http://gna.org/



-- 
Matthias Pfafferodt - http://www.mapfa.de
Matthias.Pfafferodt  mapfa.de
diff -ur '--exclude=*svn*' freeciv-2.1.99svn15687//data/civ1/game.ruleset freeciv-2.1.99svn15687.gold2.1//data/civ1/game.ruleset
--- freeciv-2.1.99svn15687//data/civ1/game.ruleset	2009-05-26 16:23:47.505473635 +0200
+++ freeciv-2.1.99svn15687.gold2.1//data/civ1/game.ruleset	2009-05-29 12:07:54.406185781 +0200
@@ -62,7 +62,13 @@
 ; is negative, random buildings in the city are sold off. If the gold
 ; is still negative, then supported units with gold upkeep are
 ; disbanded.
-; 1 - Gold upkeep for all buildings and units is paid in a lump sum after
+; 1 - In the first step, the player's total gold must be non-negative after
+; paying upkeep for all buildings within a city. If for any city the
+; player's gold is negative, random buildings in the city are sold off.
+; In the second step, gold upkeep for all units is paid in a lump sum.
+; If the player does not have enough gold, random units with gold upkeep
+; are disbanded.
+; 2 - Gold upkeep for all buildings and units is paid in a lump sum after
 ; all cities have been processed. If the player does not have enough
 ; gold, random buildings from random cities are sold. If still more
 ; gold is needed, then random units with gold upkeep are disbanded.
diff -ur '--exclude=*svn*' freeciv-2.1.99svn15687//data/civ2/game.ruleset freeciv-2.1.99svn15687.gold2.1//data/civ2/game.ruleset
--- freeciv-2.1.99svn15687//data/civ2/game.ruleset	2009-05-26 16:23:47.593475294 +0200
+++ freeciv-2.1.99svn15687.gold2.1//data/civ2/game.ruleset	2009-05-29 12:07:41.250549946 +0200
@@ -56,7 +56,13 @@
 ; is negative, random buildings in the city are sold off. If the gold
 ; is still negative, then supported units with gold upkeep are
 ; disbanded.
-; 1 - Gold upkeep for all buildings and units is paid in a lump sum after
+; 1 - In the first step, the player's total gold must be non-negative after
+; paying upkeep for all buildings within a city. If for any city the
+; player's gold is negative, random buildings in the city are sold off.
+; In the second step, gold upkeep for all units is paid in a lump sum.
+; If the player does not have enough gold, random units with gold upkeep
+; are disbanded.
+; 2 - Gold upkeep for all buildings and units is paid in a lump sum after
 ; all cities have been processed. If the player does not have enough
 ; gold, random buildings from random cities are sold. If still more
 ; gold is needed, then random units with gold upkeep are disbanded.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev