[Freeciv-Dev] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Status: In Progress = Done Open/Closed:Open = Closed ___ Follow-up Comment #11: all of the subtickets are done and longturn was restarted with freeciv 2.3. There are new differences which will be handled in new tickets. ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #10, patch #1494 (project freeciv): Most of it is done ... (but there are still differences and, thus, this ticket is still open) ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #2121 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Planned Release: 2.3.0 = 2.4.0 ___ Follow-up Comment #9: change planned release to 2.4.0 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Status:None = In Progress Assigned to:None = syntron ___ Follow-up Comment #8: I did a check the longturn code base and did a cleanup. Doing this I tried to uses as many code from trunk as possible. Looking at the patches it is clearly visible, what needs to be done till longturn can use the mainline freeciv version. The list of patches includes: longturn c++ files (newcommers and postgres authentication): 5966b21... [c++] newcommers dfcc14c... [c++] longturn authentication (postgres) 57b2062... [cleanup for c++] fix color in featured_text eee70dd... [cleanup for c++] do not use 'class' b09c016... [cleanup for c++] some magic in specenum eff3ed1... [cleanup for c++] move struct cf_sequence into c file longturn 'specials': 69fa738... longturn command level 0d4cbef... start positions b66d242... rename command 95321a6... player placement hacks e5c6687... first find unused team backports from trunk: 3fa4f9d... [backport for S2_2] possibility to lose a tech if it is transfered 0780f01... [backport for S2_2] different checks if a tech is lost 4e35044... [backport for S2_2] Settings to disable the trade of gold, cities and technologies ported from warclient. acd42fe... [backport for S2_2] Added 'killunhomed' setting. 8ed6618... [backport for S2_2] Added unitwaittime setting. aa60b72... [backport for S2_2] Added convenience function for formatting a time string. (file #9426) ___ Additional Item Attachment: File name: S2_2-longturn.tar.bz2 Size:29 KB ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #7, patch #1494 (project freeciv): I don't know any lua so I will focus on the c part. I think it should be something like /newplayer. This command should create a new player on a empty slot or (re)use the slot of a dead player. ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1574 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #3, patch #1494 (project freeciv): Here is a port of Maho's newcomers code to C. In C, we can finally read and understand it :-) It is a diff against trunk rev 17191 It seems to work well now. The critical parts come when the player list is already full and dead players have to be replaced. The process consists mainly of two parts: 1. Creating a new player, possibly taking a dead slot. Reset everything (map, diplomacy, etc) 2. Creating new units according to the strength of the average player. So it looks at civ score etc. A possible plan of attack might be: 1. A /reap server command to make a dead player's slot and nation free 2. A server command to create a new player during the game, without giving the player anything (or put this in lua) 3. A lua trigger or lua activation method where the script will give the player its starting units. To port this to lua lot of accessors are needed. Of course, it could be interesting to be able to create new players from a scenario or ruleset script, so that action can be made available. But I guess the specific /reap server action has to be a ALLOW_ADMIN command to be carried out from the server. The code I ported was taken from a svn clone of longturn, and I hope it corresponds to the latest code.. I haven't compared with your diff. (file #8738) ___ Additional Item Attachment: File name: newcomers_trunk_r17191.diffSize:16 KB ___ Reply to this item at: http://gna.org/patch/?1494 ___ Meddelandet skickades via/av Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #4, patch #1494 (project freeciv): Here is a port of Maho's newcomers code to C. In C, we can finally read and understand it :-) It is a diff against trunk rev 17191 I will check it. It should be the current version as there are nearly no commits in the longturn branch. Do you plan to do this in lua or is an implementation directly in the server the better approach? ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #5, patch #1494 (project freeciv): The C version can lets us see what we move to lua easily and what not. But my previous message already has a proposed plan of attack which mentions which parts could be implemented in lua and which not. If maho himself has any input it'd great as well of course. I guess everyone would prefer to make the oft-configured stuff (unit/resource allocation) easily configured in lua. ___ Reply to this item at: http://gna.org/patch/?1494 ___ Meddelandet skickades via/av Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #6, patch #1494 (project freeciv): Maybe my original message was not as clear on C vs. lua as I thought, I'm sorry. Rough idea might be: 1. /reap server command -- implement in C 2. server command or server function to create a new player during the game, without giving the player anything. Implement in C. Make the function available in the lua API so scenarios and rulesets can use it. 3. Make many more functions available in lua so that the wanted calcluations can be carried out If you look in the patch, it is basically the higher level mechanisms there that we really want in lua, the rest in various places in C. In Lua we want to be free to change: selecting the starting tile, giving the player initial units and giving the player initial gold and tech. I think new functions we need in lua are things like: Get player gold Get player civilization score (not the same as full score) Create units in boat(?) Check if units can exist on a tile (for trireme on ocean etc) Get unit list for tile city closest to a tile One open question is what to do with the Newcomer strength percentage server option that was in longturn. If giving units to a new player is controlled from lua, then a server option for that doesn't make much sense. The ruleset can of course be reconfigured much more easily in lua than in C. The ruleset may even choose to expose the strength percent directly in the functions it defines for creating newcomers. ___ Reply to this item at: http://gna.org/patch/?1494 ___ Meddelandet skickades via/av Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #2, patch #1494 (project freeciv): (c++) adding new player and changes to ./server/generator/startpos.c this could possible be done in lua; see bug #15644 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1504 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1201 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1258 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1499 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1500 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1501 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Update of patch #1494 (project freeciv): Depends on: = patch #1263 ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
Follow-up Comment #1, patch #1494 (project freeciv): I added some patches; leftovers: * setting: citytrading * command: rename * longturn command level (equal to info?) * (c++) adding new player and changes to ./server/generator/startpos.c * (c++) updated mysql connection * teams placement patch (see http://www.longturn.org/forum/how-know-whats-happening-when-youre-not-ingame) ___ Reply to this item at: http://gna.org/patch/?1494 ___ 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] [patch #1494] [Metaticket] merge longturn into mainline
URL: http://gna.org/patch/?1494 Summary: [Metaticket] merge longturn into mainline Project: Freeciv Submitted by: syntron Submitted on: Sonntag 28.02.2010 um 17:31 Category: general Priority: 1 - Later Status: None Privacy: Public Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: I did a diff between longturn (master) and freeciv 2.1.8. The diff file cleaned by unimportant changes is attached (ca. 100kB). changes added to longturn (TODO list): * setting: unitwaittime by book * setting: (slowly) kill unhomed units * setting: techloosing (patch available) * setting: citytrading * command: rename * longturn command level (equal to info?) * (c++) adding new player changes to ./server/generator/startpos.c * (c++) updated mysql connection ported changes (done): * setting: foggedborders * setting: trademindist I think the hardest part would be the c++ files. ___ File Attachments: --- Date: Sonntag 28.02.2010 um 17:31 Name: lt.diff Size: 97kB By: syntron http://gna.org/patch/download.php?file_id=8326 ___ Reply to this item at: http://gna.org/patch/?1494 ___ Nachricht geschickt von/durch Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
