[Freeciv-Dev] [bug #13611] [patch] rework city health

[Matthias Pfafferodt]

Follow-up Comment #4, bug #13611 (project freeciv):

I added all the information about the
calculation of the city health to
http://freeciv.wikia.com/wiki/Math_of_Freeciv.

___

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

[Matthias Pfafferodt]

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

The extra 'upkeep_info' field is needed for homeless
units because even for the player who owns them they
have no upkeep.

___

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 #13621] [patch] load game settings from ruleset

[Matthias Pfafferodt]

Follow-up Comment #4, bug #13621 (project freeciv):

updated patch (version 3)

changes:
- remove {} /* no error */
- reorder include files alphabetical


(file #5896)
___

Additional Item Attachment:

File name: version3-13621-set.patch.diff  Size:8 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 #13600] ruleset requirement option: negated

[Matthias Pfafferodt]

Follow-up Comment #15, bug #13600 (project freeciv):

Could you please add the change to the README
file? (file #5874: NegatedREADME_13600.diff)

___

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 #13611] [patch] rework city health

[Matthias Pfafferodt]

Follow-up Comment #5, bug #13611 (project freeciv):

updated patch

changes:

- remove README file

(file #5897)
___

Additional Item Attachment:

File name: version3-13611-health3.patch.diff Size:14 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 #13587] [patch] add upkeep information to units in city dialog

[Matthias Pfafferodt]

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

version 3

changes:

- both functions take an astring parameter
- unit_activity_text() is now a wrapper for
  unit_activity_astr()
- move include file to unit.c

> Also, do not include headers in other headers 
> (as I have told you in another ticket, sorry if 
> I repeat myself :)). When you have a pointer to 

No problem; it helps and I'm learning something ...

(file #5898)
___

Additional Item Attachment:

File name: version3-13587-gold6.patch.diff Size:7 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 #13636] [patch] update for migration

[Matthias Pfafferodt]

URL:
  

 Summary: [patch] update for migration
 Project: Freeciv
Submitted by: syntron
Submitted on: Samstag 06.06.2009 um 13:09
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:

this patch updates the migration calculation

changes:

- minimum for mgr_*change is 0
- changed logic of the function calls
- score calculation is moved and only executed if
  the value of mgr_score_calc_turn (a new variable
  in the city struct) is not equal to the current
  turn
- define default values for city->migration_score
  and city->mgr_score_calc_turn

I also added information about the used equations
to http://freeciv.wikia.com/wiki/Math_of_Freeciv



___

File Attachments:


---
Date: Samstag 06.06.2009 um 13:09  Name: migration.patch.diff  Size: 9kB  
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 #13637] [patch] add effect Migration_Pct

[Matthias Pfafferodt]

URL:
  

 Summary: [patch] add effect Migration_Pct
 Project: Freeciv
Submitted by: syntron
Submitted on: Samstag 06.06.2009 um 13:12
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:

this patch adds the effect Migration_Pct. It
increases or decreases the possibility for
migration between city. It can be used as effect
for governments or special buildings.



___

File Attachments:


---
Date: Samstag 06.06.2009 um 13:12  Name: migration2.patch.diff  Size: 3kB  
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 #13599] [RFC; patch] pollution on lakes / ocean

[Matthias Pfafferodt]

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

could you give me some hints which code I
should look at to find examples in the AI
code? (autosettler?)

___

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 #13600] ruleset requirement option: negated

[Marko Lindqvist]

Follow-up Comment #16, bug #13600 (project freeciv):

NegatedREADME_13600.diff already committed as r15712.

___

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 #13636] [patch] update for migration

[Marko Lindqvist]

Update of bug #13636 (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 #13637] [patch] add effect Migration_Pct

[Marko Lindqvist]

Update of bug #13637 (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 #13600] ruleset requirement option: negated

[Matthias Pfafferodt]

Follow-up Comment #17, bug #13600 (project freeciv):

ups; I did not used the right directory ...; Yes,
it is there!

___

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] (PR#40767) Revert resource identifiers and remove update22* fields

[Marko Lindqvist]

http://bugs.freeciv.org/Ticket/Display.html?id=40767 >

2009/4/13 Madeline Book :
>
>> [guest - Mon Apr 13 18:37:54 2009]:
>>
>> I've created and tested a rollback patch, which removes
>> all update22* references/code and revert back resource
>> identifiers to the 2.1.x default.
>>
>> - Stéphane Messerli
>
> Also the terrain.ruleset files in the civ1 and civ2 ruleset
> directories need to be updated. I'll test it with recent
> and older savegames once these changes are made. Probably
> savegames already made in 2.1.99 will become incompatible,
> but that was to be expected. Hopefully this will be the
> only drawback.

 Do you want me to handle this patch, or are you going to do it soon?


 - ML



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

[Freeciv-Dev] (PR#40767) Revert resource identifiers and remove update22* fields

[Madeline Book]

http://bugs.freeciv.org/Ticket/Display.html?id=40767 >

> [cazf...@gmail.com - Sat Jun 06 18:41:15 2009]:
> 
> 2009/4/13 Madeline Book :
> >
> >> [guest - Mon Apr 13 18:37:54 2009]:
> >>
> >> I've created and tested a rollback patch, which removes
> >> all update22* references/code and revert back resource
> >> identifiers to the 2.1.x default.
> >>
> >> - Stéphane Messerli
> >
> > Also the terrain.ruleset files in the civ1 and civ2 ruleset
> > directories need to be updated. I'll test it with recent
> > and older savegames once these changes are made. Probably
> > savegames already made in 2.1.99 will become incompatible,
> > but that was to be expected. Hopefully this will be the
> > only drawback.
> 
>  Do you want me to handle this patch, or are you going to do it soon?

If you feel like it and have time now you can do it.


---
好きにしてください。

___
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

[Madeline Book]

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

> The extra 'upkeep_info' field is needed for homeless 
> units because even for the player who owns them they 
> have no upkeep.

Would it be so bad just to show zero upkeep for those
units? Are there any other circumstances when the extra
boolean field would be needed?


> > if the editor is used the changes are visible in the next 
> > turn. I'm not sure, how to force an update. 
> 
> Possibly there should be some more city refreshes 
> after editor actions.

Could you give more details about what editor actions
you used that caused the upkeep values to not show
correctly?



援助すればいいだろう。

___

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 #13624] [Patch] Endturn, onsetbars as turn

[Marko Lindqvist]

Update of bug #13624 (project freeciv):

Category:None => general

___

Follow-up Comment #1:

- Onsetbarbs default turn same as it used to be based on year

(file #5901)
___

Additional Item Attachment:

File name: EndTurn_13624-2.diff   Size:9 KB


___

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 #13628] [Patch] Non-pillageable bases

[Marko Lindqvist]

Update of bug #13628 (project freeciv):

Category:None => general
  Status:None => Fixed  
 Assigned to:None => cazfi  
 Open/Closed:Open => Closed 


___

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 #13629] [Patch] CanPillage unit class flag

[Marko Lindqvist]

Update of bug #13629 (project freeciv):

Category:None => general
  Status:None => Fixed  
 Assigned to:None => cazfi  
 Open/Closed:Open => Closed 


___

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 #13631] [Patch] DoesntOccupy unit class flag

[Marko Lindqvist]

Follow-up Comment #1, bug #13631 (project freeciv):

- Renamed CanOccupy -> CanOccupyCity, DoesntOccupy -> DoesntOccupyTile to
make clear that they use word occupy in different meaning
- Unit help shows CanOccupyTile info


(file #5902)
___

Additional Item Attachment:

File name: DoesntOccupyFlag_13631-2.diff  Size:10 KB


___

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

Re: [Freeciv-Dev] (PR#40767) Revert resource identifiers and remove update22* fields

[Marko Lindqvist]

http://bugs.freeciv.org/Ticket/Display.html?id=40767 >

2009/4/14  <>:
>
>> Also the terrain.ruleset files in the civ1 and civ2 ruleset
>> directories need to be updated. I'll test it with recent
>> and older savegames once these changes are made. Probably
>> savegames already made in 2.1.99 will become incompatible,
>> but that was to be expected. Hopefully this will be the
>> only drawback.
>
> I've fixed the civ1 and civ2 terrain.ruleset files too. Resource
> identifiers have been rolled back to 2.1.x version.
> New patch attached (contains all changes and not only the new civ1/civ2
> changes).

 Desert oil had another hack that prevented it from transferring from
S2_1 savegame to TRUNK version. Updated patch attached.


 - ML

diff -Nurd -X.diff_ignore freeciv/data/civ1/terrain.ruleset 
freeciv/data/civ1/terrain.ruleset
--- freeciv/data/civ1/terrain.ruleset   2009-06-06 23:53:43.0 +0300
+++ freeciv/data/civ1/terrain.ruleset   2009-06-07 00:34:25.0 +0300
@@ -552,8 +552,6 @@
 ; identifier   = single-character identifier used in savegames.  This
 ;must be unique for each resource, and changing it will
 ;break savegame compatibility.
-; update22one  = single-character identifier in < 2.2 civ1 savegames.
-; update22two  = single-character identifier in < 2.2 civ2 savegames.
 ; food = increased food production
 ; shield   = increased shield production
 ; trade= increased trade production
@@ -562,8 +560,7 @@
 name= _("Gold")
 graphic = "ts.gold"
 graphic_alt = "-"
-identifier  = "$"
-update22one = "H"
+identifier  = "H"
 trade   = 6
 # mountains.
 
@@ -572,7 +569,6 @@
 graphic = "ts.tundra_game"
 graphic_alt = "-"
 identifier  = "A"
-update22two = "e"
 food= 2
 # forest, tundra.
 
@@ -581,7 +577,6 @@
 graphic = "ts.coal"
 graphic_alt = "-"
 identifier  = "C"
-update22two = "c"
 shield  = 2
 # hills.
 
@@ -590,7 +585,6 @@
 graphic = "ts.fish"
 graphic_alt = "-"
 identifier  = "F"
-update22two = "y"
 food= 2
 # ocean.
 
@@ -599,7 +593,6 @@
 graphic = "ts.gems"
 graphic_alt = "-"
 identifier  = "G"
-update22two = "g"
 trade   = 4
 # jungle.
 
@@ -608,7 +601,6 @@
 graphic = "ts.horses"
 graphic_alt = "-"
 identifier  = "I"
-update22two = "b"
 shield  = 2
 # plains (horses => buffalo => cattle).
 
@@ -617,7 +609,6 @@
 graphic = "ts.oasis"
 graphic_alt = "-"
 identifier  = "O"
-update22two = "o"
 food= 3
 # desert.
 
@@ -626,7 +617,6 @@
 graphic = "ts.oil"
 graphic_alt = "-"
 identifier  = "P"
-update22two = "a"
 shield  = 4
 # swamp (petroleum => peat => petroleum).
 
@@ -635,7 +625,6 @@
 graphic = "ts.grassland_resources"
 graphic_alt = "-"
 identifier  = "R"
-update22two = "r"
 shield  = 1
 # grassland.
 
@@ -644,7 +633,6 @@
 graphic = "ts.seals"
 graphic_alt = "-"
 identifier  = "S"
-update22two = "i"
 food= 2
 # arctic (seals => walrus).
 
diff -Nurd -X.diff_ignore freeciv/data/civ2/terrain.ruleset 
freeciv/data/civ2/terrain.ruleset
--- freeciv/data/civ2/terrain.ruleset   2009-06-06 23:53:43.0 +0300
+++ freeciv/data/civ2/terrain.ruleset   2009-06-07 00:34:25.0 +0300
@@ -566,8 +566,6 @@
 ; identifier   = single-character identifier used in savegames.  This
 ;must be unique for each resource, and changing it will
 ;break savegame compatibility.
-; update22one  = single-character identifier in < 2.2 civ1 savegames.
-; update22two  = single-character identifier in < 2.2 civ2 savegames.
 ; food = increased food production
 ; shield   = increased shield production
 ; trade= increased trade production
@@ -577,7 +575,6 @@
 graphic = "ts.gold"
 graphic_alt = "-"
 identifier  = "$"
-update22one = "H"
 trade   = 6
 # mountains.
 
@@ -593,8 +590,7 @@
 name= _("?animals:Game")
 graphic = "ts.tundra_game"
 graphic_alt = "-"
-identifier  = "A"
-update22two = "e"
+identifier  = "e"
 food= 2
 shield  = 1
 # tundra.
@@ -603,8 +599,7 @@
 name= _("Furs")
 graphic = "ts.furs"
 graphic_alt = "-"
-identifier  = "b"
-update22two = "u"
+identifier  = "u"
 food= 1
 trade   = 3
 # tundra-only (beaver pelts).
@@ -613,8 +608,7 @@
 name= _("Coal")
 graphic = "ts.coal"
 graphic_alt = "-"
-identifier  = "C"
-update22two = "c"
+identifier  = "c"
 shield  = 2
 # hills.
 
@@ -626,8 +620,7 @@
 name= _("Fish")
 graphic = "ts.fish"
 graphic_alt = "-"
-identifier  = "F"
-update22two = "y"
+identifier  = "y"
 food= 2
 # ocean.
 
@@ -644,8 +637,7 @@
 name= _("Gems")
 graphic = "ts.gems"
 graphic_alt = "-"
-identifier  = "G"
-update22two = "g"
+identifier  = "g"
 trade   = 4
 # jungle.
 
@@ -653,8 +645,7 @@
 name= _("Buffalo")
 graphic = "ts.buffalo"
 graphic_alt = "-"
-i

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

[Matthias Pfafferodt]

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

> Would it be so bad just to show zero upkeep for those 
> units? Are there any other circumstances when the extra 
> boolean field would be needed? 

I know only of the case of homeless unit. So the upkeep_info
field can be removed. Please try it especially with homeless
units and investigating cities of other players.

> Could you give more details about what editor actions 
> you used that caused the upkeep values to not show 
> correctly? 

If I use Shield2Gold the upkeep is changed if I research (or
add using the editor) the corresponding tech or build the
improvement with this effect.

changes in version 3:

- remove upkeep_info


(file #5903)
___

Additional Item Attachment:

File name: version3-13586-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 #13587] [patch] add upkeep information to units in city dialog

[Matthias Pfafferodt]

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

version 4:

- remove upkeep_info (see 13586)

(file #5904)
___

Additional Item Attachment:

File name: version4-13587-gold6.patch.diff Size:8 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 #13611] [patch] rework city health

[Matthias Pfafferodt]

Follow-up Comment #6, bug #13611 (project freeciv):

version 4:

- the values display for the health effects
  (buildings, ...) were not calculated correctly.
  I change the calculation and checked it; only
  the error due to the use of an integer variable
  is still present (approx 0.1)

(file #5905)
___

Additional Item Attachment:

File name: version4-13611-health3.patch.diff Size:14 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 #13643] [RFC] Use lua for customizable database access

[Madeline Book]

URL:
  

 Summary: [RFC] Use lua for customizable database access
 Project: Freeciv
Submitted by: mbook
Submitted on: Sunday 06/07/2009 at 04:44
Category: general
Severity: 3 - Normal
Priority: 3 - Low
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Release: 
Operating System: None

___

Details:

I propose that the current auth code and all
future database interfacing code be written
in lua scripts.

This would have the following advantages:
- No need to recompile to change the way the
  database is used (e.g. table field names,
  sql statment format, etc.).
- Support for databases other than mysql.
- Easily extended beyond just auth.

For example longturn currently uses postgresql
instead of mysql, and warclient servers use
password salt.


The lua database bindings are provided by LuaSQL
(http://www.keplerproject.org/luasql/). It would
be added to the 'dependencies' directory, with
specific driver libraries only being compiled
and linked to the main server executable if the
corresponding database is detected by configure.

As a first step the lua integration would
proceed by combining much of the functionality
of the functions

  authenticate_user
  process_authentication_status
  handle_authentication_reply

into a single script entry point (i.e. a function
that is expected to exist in the database script).
A stand-alone lua state is created for this script
in auth_init().

The lua function will need to return a status
value indicating how the connection should be
handled (e.g. 'accept', 'wait', 'reject').

The script would need to be able to manipulate
'user' objects, which correspond to 'struct
connection'. Methods should be provided which
allow access to at least 'id', 'name' and
'password' information. An alternative would
be to pass the required information to the
script function each time it is invoked.

Possibly all "auth" string occurences in the code
and in filenames should be changed to "database",
in preparation for future generalization.


I'll clarify and revise the details as I test out
a tentative implementation (though this will not
be very high priority for a while).



誰かが月を一口食いちぎたようだ。




___

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