lp:~widelands-dev/widelands/ware_routing_speedup

Created by TiborB on 2017-10-23 and last modified on 2019-09-18
Get this branch:
bzr branch lp:~widelands-dev/widelands/ware_routing_speedup
Members of Widelands Developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Widelands Developers
Project:
widelands
Status:
Abandoned

Recent revisions

8466. By TiborB on 2018-05-06

trunk merged

8465. By TiborB on 2017-10-23

speed up

8464. By GunChleoc on 2017-10-14

Fetched translations and updated catalogues.

8463. By GunChleoc on 2017-10-09

Fetched translations and updated catalogues.

8462. By Wideland's Bunnybot <email address hidden> on 2017-10-04

Merged lp:~widelands-dev/widelands/market1:
First working land-based trading implementation.

A trade works like this: A player proposes to another players market to initiate a trade. A trade consists of the three pieces of information: what wares will I sent, what wares do I want from you and how often do we exchange. For example I'll send 3 logs whenever you send 1 plank and 5 iron and we do ship these batches 10 times.

Once a trade is initiated, both players will require the correct number of oxen for a batch, i.e. p1 requires 3 (for 3 logs) and p2 requires 6 (1 plank + 5 iron). Once all workers and wares for one batch have arrived in the markets, both markets will launch one caravan and the items gets exchanged.

This is a minimal implementation and not ready for use in-game. Highlights of stuff still missing:
- UI (clicking a market will crash the game).
- denying/accepting a proposed trade. Every proposed trade is auto-accepted atm.
- releasing trade carriers and left-over wares once a trade is cancelled or fulfilled.
- load/save/serialize for networking for all commands and new map objects.

Implemented:
- Adds Lua functions to propose a trade from Lua.
- Adds a PlayerCommand to propose a trade from Lua, but this is still unused.
- Adds logic to trade between two Markets.
- Adds a test that does a simple trade.

The test is run with the regular regression test runs, but can be run standalone using:

./build/debug/src/widelands --datadir=data --datadir_for_testing=test --scenario=maps/market_trading.wmf --script=maps/market_trading.wmf/scripting/test_simple_trade.lua

8461. By Wideland's Bunnybot <email address hidden> on 2017-09-29

Merged lp:~widelands-dev/widelands/ai_differentiation.

8460. By GunChleoc on 2017-09-29

Fetched translations and updated catalogues.

8459. By Wideland's Bunnybot <email address hidden> on 2017-09-22

Merged lp:~widelands-dev/widelands/gcc_optimize.

8458. By Wideland's Bunnybot <email address hidden> on 2017-09-20

Merged lp:~widelands-dev/widelands/bug-986611-cppcheck-mopup:
Fixed diverse cppcheck warnings:
- Performance
- Made some constructors explicit.
- Added parentheses to logic in MapPlayersViewPacket.
- Fixed order of statements and a logic error in the AI.
- Fixed suspicious calculation warnings.
- Removed some unused variables.
- Removed most unused functions.

8457. By Wideland's Bunnybot <email address hidden> on 2017-09-18

Merged lp:~widelands-dev/widelands/market:
Adds a new building type called 'Market' that will be the trading building for land-based trading. The building is only added to the barbarians and is is disabled in all barbarian scenarios and start conditions.

This merge request (MR) adds the (massive) boilerplate and a simple test that the new building can actually be build. I'd like to get this in before adding the logic, so future MRs are smaller.

The test is run with the regular regression test runs, but can be run standalone using:

./build/debug/src/widelands --datadir=data --datadir_for_testing=test --scenario=maps/market_trading.wmf --script=maps/market_trading.wmf/scripting/test_market_can_be_build.lua

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:widelands
This branch contains Public information 
Everyone can see this information.