Merge lp://staging/~widelands-dev/widelands/ai_differentiation into lp://staging/widelands
Proposed by
TiborB
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 8461 | ||||
Proposed branch: | lp://staging/~widelands-dev/widelands/ai_differentiation | ||||
Merge into: | lp://staging/widelands | ||||
Diff against target: |
877 lines (+161/-107) 24 files modified
data/ai/ai_input_1.wai (+9/-9) data/ai/ai_input_2.wai (+11/-11) data/ai/ai_input_3.wai (+14/-14) data/ai/ai_input_4.wai (+12/-12) data/tribes/buildings/productionsites/atlanteans/blackroot_farm/init.lua (+3/-1) data/tribes/buildings/productionsites/atlanteans/farm/init.lua (+3/-1) data/tribes/buildings/productionsites/atlanteans/fishers_house/init.lua (+3/-1) data/tribes/buildings/productionsites/atlanteans/foresters_house/init.lua (+3/-1) data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua (+1/-1) data/tribes/buildings/productionsites/barbarians/farm/init.lua (+3/-1) data/tribes/buildings/productionsites/barbarians/fishers_hut/init.lua (+3/-1) data/tribes/buildings/productionsites/barbarians/hunters_hut/init.lua (+3/-1) data/tribes/buildings/productionsites/barbarians/rangers_hut/init.lua (+3/-1) data/tribes/buildings/productionsites/empire/bakery/init.lua (+3/-1) data/tribes/buildings/productionsites/empire/farm/init.lua (+3/-1) data/tribes/buildings/productionsites/empire/foresters_house/init.lua (+3/-1) data/tribes/buildings/productionsites/empire/sawmill/init.lua (+1/-1) data/tribes/buildings/productionsites/empire/sheepfarm/init.lua (+3/-1) data/tribes/buildings/productionsites/empire/vineyard/init.lua (+4/-1) src/ai/ai_help_structs.cc (+33/-13) src/ai/ai_help_structs.h (+1/-3) src/ai/defaultai.cc (+32/-29) src/ai/defaultai.h (+0/-1) src/ai/defaultai_warfare.cc (+7/-0) |
||||
To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/ai_differentiation | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
GunChleoc | Approve | ||
Review via email: mp+331085@code.staging.launchpad.net |
Description of the change
- Redesigned limitation of buildings count for weaker player (It seems that it was broken)
- New set of WAI files
- Slight change in mutation logic
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 2681. State: passed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 277952118. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ ai_differentiat ion-2501.
Appveyor build 2501. State: success. Details: https:/