Feature #765978: Trade route revenue and caravan bonus styles - Freeciv - HostedRedmine by Planio

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Send by e-mail

Feature #765978

Trade route revenue and caravan bonus styles

Added by Zoltán Žarkov over 2 years ago. Updated over 2 years ago.

Status:

Closed

Priority:

Normal

Assignee:

Marko Lindqvist

Category:

General

Sprint/Milestone:

3.0.0

Start date:

Due date:

% Done:

Estimated time:

Description

I am porting these formulas over from the old warclient codebase. Caravan bonus is O(log^2 N) so does not break the game and trade revenue only cares about the citizen trade of the two cities.

traderoutes-master.patch (5.1 KB) traderoutes-master.patch	master	Zoltán Žarkov, 2018-07-22 06:47 PM
traderoutes-S3_0.patch (599 Bytes) traderoutes-S3_0.patch	S3_0	Zoltán Žarkov, 2018-07-22 06:52 PM
traderoutes-S3_0.patch (9.98 KB) traderoutes-S3_0.patch	S3_0	Zoltán Žarkov, 2018-07-22 06:55 PM
traderoutes-master.patch (10 KB) traderoutes-master.patch	master	Zoltán Žarkov, 2018-07-22 06:56 PM
traderoutes-S3_0.patch (10 KB) traderoutes-S3_0.patch	S3_0	Zoltán Žarkov, 2018-07-22 07:17 PM
traderoutes-master.patch (10 KB) traderoutes-master.patch	master	Zoltán Žarkov, 2018-07-22 07:18 PM
traderoutes-master.patch (13.6 KB) traderoutes-master.patch		Zoltán Žarkov, 2018-07-23 05:34 PM
traderoutes-master.patch (13.6 KB) traderoutes-master.patch		Zoltán Žarkov, 2018-07-24 08:08 PM
traderoutes-master.patch (13.6 KB) traderoutes-master.patch		Zoltán Žarkov, 2018-07-24 08:10 PM
0001-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch (13.2 KB) 0001-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch		Zoltán Žarkov, 2018-07-24 09:02 PM
0020-Port-caravan-bonus-style-and-trade-revenue-style-opt.patch (13.2 KB) 0020-Port-caravan-bonus-style-and-trade-revenue-style-opt.patch		Marko Lindqvist, 2018-07-26 09:14 PM
0002-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch (13.6 KB) 0002-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch	S3_0	Zoltán Žarkov, 2018-07-26 09:29 PM
0002-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch (13.6 KB) 0002-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch		Zoltán Žarkov, 2018-07-26 09:32 PM

History

Sorry, screwed up the first patch

#4 Updated by Zoltán Žarkov over 2 years ago

File traderoutes-master.patch traderoutes-master.patch added

#5 Updated by Zoltán Žarkov over 2 years ago

File traderoutes-S3_0.patch traderoutes-S3_0.patch added
File traderoutes-master.patch traderoutes-master.patch added

In accordance with CodingStyle

#6 Updated by Marko Lindqvist over 2 years ago

I didn't read patch in details (such as coding style) yet, but please address one point before that:
- Make _styles specenums instead of using magic values.

#7 Updated by Zoltán Žarkov over 2 years ago

File traderoutes-master.patch traderoutes-master.patch added

Made it a specenum.

#8 Updated by Zoltán Žarkov over 2 years ago

File traderoutes-master.patch traderoutes-master.patch added

Fixed some more style.

#9 Updated by Zoltán Žarkov over 2 years ago

File traderoutes-master.patch traderoutes-master.patch added

With gnu style function braces

#10 Updated by Zoltán Žarkov over 2 years ago

File 0001-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch 0001-Ports-caravan-bonus-style-and-trade-revenue-style-op.patch added

with git format patch

#11 Updated by Marko Lindqvist over 2 years ago

File 0020-Port-caravan-bonus-style-and-trade-revenue-style-opt.patch 0020-Port-caravan-bonus-style-and-trade-revenue-style-opt.patch added
Category set to General
Status changed from New to In Progress

New master version:
- Renamed parameter of traderevenuestyle_name() from 'generator' to 'revenue_style'
- Reformatted commit message
- Applies on top of Feature #764944