Re: [Freeciv-Dev] T0 timeout

2011-09-19 Thread Michal Mazurek
On Mon, Sep 19, 2011 at 11:30:46PM +0100, Jacob Nevins wrote:
> Michal Mazurek writes:
> > On Sun, Sep 18, 2011 at 10:19:58PM +0200, Matthias Pfafferodt wrote:
> >> Am Sonntag, 18. September 2011, 13:32:43 schrieb Jacob Nevins:
> >>> I think this can be achieved in unmodified 2.3.x with the
> >>> "timeoutincrease" command:
> >>> 
> >>>   set timeout 60
> >>>   timeoutincrease 1 1 -20 0
> >>> 
> >>> gives a T0 of 60 seconds, and subsequent turns of 40 seconds.
> >> 
> >> So we have two ways to do one thing? Could they be merged?
> > 
> > Do we? If the turn is, say, T5 and the server restarted with the above
> > commands in a .serv file, wont the timeout be 60 seconds?
> 
> Yes, if you're at T5 and the server restarts (say due to lack of
> players), the turn is reset to T0, a .serv file specified with -r is
> reloaded, and the timeout for the first turn of the new game is 60
> seconds (and subsequent turns are 40 seconds again). I think the same is
> true of the 'first_timeout' option. Is that not what you want? Or have I
> misunderstood your question?

No, restarts means /save, /quit, and start again with the same commandline
options.

-- 
Michal Mazurek

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


Re: [Freeciv-Dev] T0 timeout

2011-09-19 Thread Jacob Nevins
Michal Mazurek writes:
> On Sun, Sep 18, 2011 at 10:19:58PM +0200, Matthias Pfafferodt wrote:
>> Am Sonntag, 18. September 2011, 13:32:43 schrieb Jacob Nevins:
>>> I think this can be achieved in unmodified 2.3.x with the
>>> "timeoutincrease" command:
>>> 
>>>   set timeout 60
>>>   timeoutincrease 1 1 -20 0
>>> 
>>> gives a T0 of 60 seconds, and subsequent turns of 40 seconds.
>> 
>> So we have two ways to do one thing? Could they be merged?
> 
> Do we? If the turn is, say, T5 and the server restarted with the above
> commands in a .serv file, wont the timeout be 60 seconds?

Yes, if you're at T5 and the server restarts (say due to lack of
players), the turn is reset to T0, a .serv file specified with -r is
reloaded, and the timeout for the first turn of the new game is 60
seconds (and subsequent turns are 40 seconds again). I think the same is
true of the 'first_timeout' option. Is that not what you want? Or have I
misunderstood your question?

(If you contrive to restart the server without the 'timeoutincrease'
command being issued again, the dynamic timeout stuff carries on where
it left off, so in this case the timeout is stuck at 60 seconds. That's
arguably a bug in 'timeoutincrease'.)

One thing that first_timeout can do that timeoutincrease can't
(currently) do is to allow an unlimited first turn (as timeoutincrease
is currently disabled if timeout=0).

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


Re: [Freeciv-Dev] T0 timeout

2011-09-18 Thread Matthias Pfafferodt
Am Montag, 19. September 2011, 06:42:38 schrieb Michal Mazurek:
> On Sun, Sep 18, 2011 at 10:19:58PM +0200, Matthias Pfafferodt wrote:
> > Am Sonntag, 18. September 2011, 13:32:43 schrieb Jacob Nevins:
> > > Michal Mazurek writes:
> > > > On Sat, Sep 10, 2011 at 11:17:15PM +0300, Marko Lindqvist wrote:
> > > >> On 10 September 2011 22:29, Michal Mazurek  
wrote:
> > > >>> I remember writing a diff and sending it to gna, to allow setting
> > > >>> the T0 timeout to a different value. Was it ever commited? I cant
> > > >>> seem to find it.
> > > >>> 
> > > >>  It was hard to find (gna tracker really sucks in search
> > > >> 
> > > >> capabilities), but I think this is it: http://gna.org/patch/?1967
> > > > 
> > > > Thank you. It was commited to 2.4, I'll just backport it to my 2.3
> > > > tree.
> > > 
> > > I think this can be achieved in unmodified 2.3.x with the
> > > 
> > > "timeoutincrease" command:
> > >   set timeout 60
> > >   timeoutincrease 1 1 -20 0
> > > 
> > > gives a T0 of 60 seconds, and subsequent turns of 40 seconds.
> > 
> > So we have two ways to do one thing? Could they be merged?
> 
> Do we? If the turn is, say, T5 and the server restarted with the above
> commands in a .serv file, wont the timeout be 60 seconds?

I do not know as I do not use these options. That's why I ask! ;-)

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


Re: [Freeciv-Dev] T0 timeout

2011-09-18 Thread Michal Mazurek
On Sun, Sep 18, 2011 at 10:19:58PM +0200, Matthias Pfafferodt wrote:
> Am Sonntag, 18. September 2011, 13:32:43 schrieb Jacob Nevins:
> > Michal Mazurek writes:
> > > On Sat, Sep 10, 2011 at 11:17:15PM +0300, Marko Lindqvist wrote:
> > >> On 10 September 2011 22:29, Michal Mazurek  wrote:
> > >>> I remember writing a diff and sending it to gna, to allow setting the
> > >>> T0 timeout to a different value. Was it ever commited? I cant seem to
> > >>> find it.
> > >>> 
> > >>  It was hard to find (gna tracker really sucks in search
> > >> 
> > >> capabilities), but I think this is it: http://gna.org/patch/?1967
> > > 
> > > Thank you. It was commited to 2.4, I'll just backport it to my 2.3 tree.
> > 
> > I think this can be achieved in unmodified 2.3.x with the
> > "timeoutincrease" command:
> > 
> >   set timeout 60
> >   timeoutincrease 1 1 -20 0
> > 
> > gives a T0 of 60 seconds, and subsequent turns of 40 seconds.
> 
> So we have two ways to do one thing? Could they be merged?

Do we? If the turn is, say, T5 and the server restarted with the above
commands in a .serv file, wont the timeout be 60 seconds?

-- 
Michal Mazurek

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


Re: [Freeciv-Dev] T0 timeout

2011-09-18 Thread Matthias Pfafferodt
Am Sonntag, 18. September 2011, 13:32:43 schrieb Jacob Nevins:
> Michal Mazurek writes:
> > On Sat, Sep 10, 2011 at 11:17:15PM +0300, Marko Lindqvist wrote:
> >> On 10 September 2011 22:29, Michal Mazurek  wrote:
> >>> I remember writing a diff and sending it to gna, to allow setting the
> >>> T0 timeout to a different value. Was it ever commited? I cant seem to
> >>> find it.
> >>> 
> >>  It was hard to find (gna tracker really sucks in search
> >> 
> >> capabilities), but I think this is it: http://gna.org/patch/?1967
> > 
> > Thank you. It was commited to 2.4, I'll just backport it to my 2.3 tree.
> 
> I think this can be achieved in unmodified 2.3.x with the
> "timeoutincrease" command:
> 
>   set timeout 60
>   timeoutincrease 1 1 -20 0
> 
> gives a T0 of 60 seconds, and subsequent turns of 40 seconds.

So we have two ways to do one thing? Could they be merged?

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


Re: [Freeciv-Dev] T0 timeout

2011-09-18 Thread Jacob Nevins
Michal Mazurek writes:
> On Sat, Sep 10, 2011 at 11:17:15PM +0300, Marko Lindqvist wrote:
>> On 10 September 2011 22:29, Michal Mazurek  wrote:
>>> I remember writing a diff and sending it to gna, to allow setting the T0
>>> timeout to a different value. Was it ever commited? I cant seem to find
>>> it.
>> 
>>  It was hard to find (gna tracker really sucks in search
>> capabilities), but I think this is it: http://gna.org/patch/?1967
> 
> Thank you. It was commited to 2.4, I'll just backport it to my 2.3 tree.

I think this can be achieved in unmodified 2.3.x with the
"timeoutincrease" command:

  set timeout 60
  timeoutincrease 1 1 -20 0

gives a T0 of 60 seconds, and subsequent turns of 40 seconds.

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


Re: [Freeciv-Dev] T0 timeout

2011-09-10 Thread Michal Mazurek
On Sat, Sep 10, 2011 at 11:17:15PM +0300, Marko Lindqvist wrote:
> On 10 September 2011 22:29, Michal Mazurek  wrote:
> > I remember writing a diff and sending it to gna, to allow setting the T0
> > timeout to a different value. Was it ever commited? I cant seem to find
> > it.
> 
>  It was hard to find (gna tracker really sucks in search
> capabilities), but I think this is it: http://gna.org/patch/?1967

Thank you. It was commited to 2.4, I'll just backport it to my 2.3 tree.

-- 
Michal Mazurek

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


Re: [Freeciv-Dev] T0 timeout

2011-09-10 Thread Marko Lindqvist
On 10 September 2011 22:29, Michal Mazurek  wrote:
> I remember writing a diff and sending it to gna, to allow setting the T0
> timeout to a different value. Was it ever commited? I cant seem to find
> it.

 It was hard to find (gna tracker really sucks in search
capabilities), but I think this is it: http://gna.org/patch/?1967


 - ML

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


[Freeciv-Dev] T0 timeout

2011-09-10 Thread Michal Mazurek
I remember writing a diff and sending it to gna, to allow setting the T0
timeout to a different value. Was it ever commited? I cant seem to find
it.

-- 
Michal Mazurek

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