[Freeciv-Dev] [bug #21646] The client may temporarily stop progressing in the diplomat queue

2014-02-13 Thread Sveinung Kvilhaugsvik
URL:
  http://gna.org/bugs/?21646

 Summary: The client may temporarily stop progressing in the
diplomat queue
 Project: Freeciv
Submitted by: sveinung
Submitted on: Thu 13 Feb 2014 02:42:19 PM UTC
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 2.6.0
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

The Gtk clients move along in the diplomat queue as soon as an action is
chosen no matter if follow up questions are expected or not. Bug #21636 is
caused by this. The Xaw, Qt and SDL clients waits for follow up questions on
diplomat actions that have those (bribe, incite, targeted sabotage and
targeted spy) before moving on in the queue. The 3 first actions I just
mentioned ask the follow up questions after the server has replied. If the
server don't reply they won't move on in the diplomat queue. At the moment
this is a minor issue: Should a new item be added to the diplomat queue (user
ask about diplomat action against current tile or the server request a
clarification about what a move means) it will start again.

Possible solutions:
* Add a time out
* making them behave like the Gtk client (move on in the queue before follow
up questions) after bug #21636 are fixed
* make sure that the server always reply and the common client code always
forward
* use the focus queue, ask on focus




___

Reply to this item at:

  http://gna.org/bugs/?21646

___
  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] [patch #4498] Add assertions to the Qt client's diplomat queue handling

2014-02-13 Thread Sveinung Kvilhaugsvik
URL:
  http://gna.org/patch/?4498

 Summary: Add assertions to the Qt client's diplomat queue
handling
 Project: Freeciv
Submitted by: sveinung
Submitted on: Thu 13 Feb 2014 03:14:39 PM UTC
Category: client-qt
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: sveinung
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Detect situations it didn't expect:
 * A new spy action chooser is requested before a follow up question of the
previous diplomat have been answered. (Could be caused by bug #21646)
 * Follow up questions about a bribe, an incite or a targeted sabotage appears
without being requested.



___

File Attachments:


---
Date: Thu 13 Feb 2014 03:14:39 PM UTC  Name: QtQueueAssert.patch  Size: 2kB  
By: sveinung

http://gna.org/patch/download.php?file_id=20032

___

Reply to this item at:

  http://gna.org/patch/?4498

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Edgaras Šeputis
Follow-up Comment #9, bug #21507 (project freeciv):

_I think Windows users are actually our biggest end-user group nowadays. And
for casual Windows user notepad and wordpad are the only ASCII editors._

First I would find quite unlikelly that casual user would be editing rulesets,
second even assuming that. Separate file for help still seems like way way
better alternative, its much easier to switch between windows than to
repeatedly scroll up and down. And if one opens the same file in two windows,
one can as well have two different files open.

_Maybe changing the flag name to something that makes it obvious which way it
works is in order. People have already confused existing ZOC flags.
CausesNoZOC? Existing flags could (in separate ticket) then be renamed as
NotAffectedByZOC (or NotSubjectToZOC) for consistency._

Has and Causes, same as Ignores and NotAffected are almost identical with
regards to clarity (besides neve ever I head such use causes zones of
control, not affected is less odd, but still totaly clear in my opinion),
only second ones are much longer so I do not see a need for change. And there
always exists help and manual, thus frankly such discussion seems kinda
useless.

_You mean changing the rulesets, or is there something missing in ruleset
format level?_
No there is special C code as sveinung said.

___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Marko Lindqvist
Follow-up Comment #10, bug #21507 (project freeciv):

 Has and Causes, same as Ignores and NotAffected are almost
 identical with regards to clarity (besides neve ever I head
 such use causes zones of control, not affected is less odd,
 but still totaly clear in my opinion), only second ones are
 much longer so I do not see a need for change. And there always
 exists help and manual, thus frankly such discussion seems
 kinda useless.

You can argue all you want that it's user error when they get it wrong, but
it's still *our* time wasted when we explain things to those who are wondering
why it doesn't work the way they expect.

___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Edgaras Šeputis
Follow-up Comment #11, bug #21507 (project freeciv):

_In the auto generated help text: zones of control = zone of control_
No just a line above:
_Ignores zone*s* of control._
And it is used like this in most places, if you still do not agree you can
chage it.

_In the auto generated help text: missing space between it (before your line
break) and will (after the line break)._
Fixed

_You forgot a space in the indention after your broke the if statement_
Fixed

_data/helpdata.txt should be updated_
Fixed

_You forgot the tab on the same line as the flag in the rule set documentation
comments._
I'm ether unable to udnerstand or dicern what you want here. I checked
.ruleset files my formatting is consistend with all other flags.

@cazfi (+ _Marko is right that the flag name could be clearer._)
_You can argue all you want that it's user error when they get it wrong, but
it's still our time wasted when we explain things to those who are wondering
why it doesn't work the way they expect._
If you see it as more clear change it, but I do not see it as being clearer in
any way, but it is longer thus makes rulesets more cumbersome to read/write.
Also never seen such use (Causes (no) ZOC, besides I think causes has more
temporal meaning), but I definetly have seen Has (no) ZOC. As for users they
should be refered to manual, that should be kept consistent with workings. But
this is so called biksheding It is trivial for you to rename a flag if you
see it's name as unclear.

(file #20035)
___

Additional Item Attachment:

File name: HasNoZOC_v3.diff   Size:7 KB


___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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] [patch #4497] has_road() lua

2014-02-13 Thread Marko Lindqvist
Update of patch #4497 (project freeciv):

  Status: In Progress = Ready For Test 

___

Follow-up Comment #1:

Patch

(file #20036)
___

Additional Item Attachment:

File name: TileHasRoad.patch  Size:3 KB


___

Reply to this item at:

  http://gna.org/patch/?4497

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Marko Lindqvist
Follow-up Comment #12, bug #21507 (project freeciv):

One style nitpick: is_my_zoc() has no empty line between variable declarations
(only ounit there) and functional code.

___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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] [patch #4445] Specify reason for You can't attack there

2014-02-13 Thread Marko Lindqvist
Update of patch #4445 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?4445

___
  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] [patch #4466] Update descriptions of other rulesets to compare to classic ruleset

2014-02-13 Thread Marko Lindqvist
Update of patch #4466 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?4466

___
  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] [patch #4499] Separate traderoute types depending on diplomatic relations

2014-02-13 Thread Marko Lindqvist
URL:
  http://gna.org/patch/?4499

 Summary: Separate traderoute types depending on diplomatic
relations
 Project: Freeciv
Submitted by: cazfi
Submitted on: Thu 13 Feb 2014 10:19:48 PM EET
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Instead of just IN and INIC traderoute types, split Ally(IC),
Enemy(IC), and Team(IC) from it (plain IN(IC) is still used for peace,
and transitional relations.




___

File Attachments:


---
Date: Thu 13 Feb 2014 10:19:48 PM EET  Name: DsTypeTraderoutes.patch  Size:
7kB   By: cazfi

http://gna.org/patch/download.php?file_id=20037

___

Reply to this item at:

  http://gna.org/patch/?4499

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Marko Lindqvist
Update of bug #21507 (project freeciv):

Category:rulesets = general
 Planned Release: = 2.6.0  


___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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 #21623] techs lost due to tech upkeep

2014-02-13 Thread Marko Lindqvist
Update of bug #21623 (project freeciv):

  Status:  Ready For Test = Fixed  
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?21623

___
  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 #21635] Main menu music not playing after leaving a game

2014-02-13 Thread Marko Lindqvist
Update of bug #21635 (project freeciv):

  Status:  Ready For Test = Fixed  
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?21635

___
  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] Freeciv-Web Project.

2014-02-13 Thread Andreas Røsdal
How is the update of Freeciv-web going? I see that you have reached 
revision 23908, and also cleaned up some of the patches, which is great!
How much work do you think is remaining? What do you think should be the 
next steps for Freeciv-web after the upgrade is complete?


Andreas



On Sat, 8 Feb 2014, Andreas Røsdal wrote:


Hi!

I think it's great that you want to update Freeciv-web to the latest Freeciv
development code, so feel free to work on that on the freeciv github repo.
Once you have completed the update of Freeciv-web I can
begin again improving Freeciv-Web. I will follow your
progress with great interest!

Andreas


 I'm just doing checkout of freeciv-web again. I noticed that the
freeciv server is from last summer TRUNK, so it's a bit like bad sides
of both worlds (using stable branch vs development version): unstable
but old. Swithcing back to stable S2_5 would probably be
counter-productive at this point, so I think we should forward it to
use current development code again. Is it ok if I do? It's likely to
break thing or two for a while, so if you're about to get new version
to production soon, it's better to postpone the freeciv-server update
after that.
 All this assuming that I now get my freeciv-web development
environment to work again.


 - ML



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


[Freeciv-Dev] [patch #4500] Introduce action probabilities (but without any probabilities)

2014-02-13 Thread Sveinung Kvilhaugsvik
URL:
  http://gna.org/patch/?4500

 Summary: Introduce action probabilities (but without any
probabilities)
 Project: Freeciv
Submitted by: sveinung
Submitted on: Thu 13 Feb 2014 10:57:12 PM UTC
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: sveinung
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Introduce action probabilities. It is kept small both in code and in behavior
changes to make it more reviewable.
 * Introduce action probabilities in achions.[c|h]. All the implementation
does for now is to wrap the old implementation. No percentage probabilities
are calculated.
 * Make qt, sdl, sdl2, gtk2, gtk3 and the Xaw client use action probabilities.
They only use it to implement their old behavior. No percentage probabilities
are shown. Those that could indicate that an action is uncertain will keep
doing it.



___

File Attachments:


---
Date: Thu 13 Feb 2014 10:57:12 PM UTC  Name:
UseActionProbabilitiesInClients.patch  Size: 27kB   By: sveinung

http://gna.org/patch/download.php?file_id=20038

___

Reply to this item at:

  http://gna.org/patch/?4500

___
  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] [patch #4200] Don't use meta knowledge in the client

2014-02-13 Thread Sveinung Kvilhaugsvik
Update of patch #4200 (project freeciv):

  Depends on: = patch #4500


___

Reply to this item at:

  http://gna.org/patch/?4200

___
  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] [patch #4501] Show action probabilities in the Qt client

2014-02-13 Thread Sveinung Kvilhaugsvik
URL:
  http://gna.org/patch/?4501

 Summary: Show action probabilities in the Qt client
 Project: Freeciv
Submitted by: sveinung
Submitted on: Thu 13 Feb 2014 11:18:54 PM UTC
Category: client-qt
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: sveinung
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:





___

File Attachments:


---
Date: Thu 13 Feb 2014 11:18:54 PM UTC  Name: QtDisplayProbabilities2.patch 
Size: 1kB   By: sveinung

http://gna.org/patch/download.php?file_id=20039

___

Reply to this item at:

  http://gna.org/patch/?4501

___
  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] [patch #4501] Show action probabilities in the Qt client

2014-02-13 Thread Sveinung Kvilhaugsvik
Update of patch #4501 (project freeciv):

  Depends on: = patch #4500


___

Reply to this item at:

  http://gna.org/patch/?4501

___
  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] Freeciv-Web Project.

2014-02-13 Thread Marko Lindqvist
I'll try to get one step forward tonight (to revision 24430 it seems),
and rest during the weekend. Once freeciv-web reaches freeciv trunk
HEAD, I plan to work on reducing the diff between freeciv and
freeciv-web copy of it in a synchronized manner. There's already patch
#4484 and patch #4485 waiting for that. But I guess that should be the
normal development mode where freeciv-web (master branch) copy of
freeciv server gets constantly updated, so you should be able to work
on web side then, though I don't know if you need to create branches
for versions that actually get deployed.

 My installation of freeciv-web is not complete, so unfortunately I
have not been able to test how scenarios work. There's one important
change there - France scenario now has Inaccessible terrains on East
and South borders. Units shouldn't be able to enter these tiles and
cities should be unable to work them.

 In general freeciv-web development I'm also expecting to fully
implement support for multiple installations on the same machine, to
be able to switch between different versions when developing/testing.
For most parts it's already possible to install it to location other
than ~/freeciv-build/ (I have never used it there) Documentation
obviously needs updating.


 - ML

On 13 February 2014 23:55, Andreas Røsdal andre...@pvv.ntnu.no wrote:
 How is the update of Freeciv-web going? I see that you have reached revision
 23908, and also cleaned up some of the patches, which is great!
 How much work do you think is remaining? What do you think should be the
 next steps for Freeciv-web after the upgrade is complete?

 Andreas

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


[Freeciv-Dev] [bug #21507] Finer controll of ZoC

2014-02-13 Thread Sveinung Kvilhaugsvik
Follow-up Comment #13, bug #21507 (project freeciv):

 And it is used like this in most places
The unit has a zone of control that includes all the tiles it controls. One
enemy unit has a zone of control. Many enemy units have zones of control. A
unit with IgZoc ignore the zones of control of all enemy units, not just the
zone of control of one enemy unit.

 I'm ether unable to udnerstand or dicern what you want here.
The other lines have a tab.

 If you see it as more clear change it,
I do. I didn't notice the possible confusion until Marko pointed it out. He
has a lot of experience talking to confused users.

Marko noticed another white space issue in comment #12.

Do you want to make the above changes your self or should I do it?

___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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 #21507] Finer controll of ZoC

2014-02-13 Thread Sveinung Kvilhaugsvik
Follow-up Comment #14, bug #21507 (project freeciv):

Seems like I sent my previous comment a bit early. Sorry.

 The unit has a zone of control that includes all the tiles it controls.
But do I realize you could argue that one tile is one zone.

 The other lines have a tab.
A tab between the name of the flag and =

___

Reply to this item at:

  http://gna.org/bugs/?21507

___
  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] [patch #4490] Play city_style specific music

2014-02-13 Thread Marko Lindqvist
Follow-up Comment #1, patch #4490 (project freeciv):

- Corrected to apply right against current svn HEAD (stopping the style music
needs to be before starting to play menu music)

(file #20040)
___

Additional Item Attachment:

File name: StyleMusics-2.patch.bz2Size:4 KB


___

Reply to this item at:

  http://gna.org/patch/?4490

___
  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] [patch #4484] Move concat_tile_activity_text() to libfreeciv

2014-02-13 Thread Marko Lindqvist
Update of patch #4484 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?4484

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


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