Merge lp:~widelands-dev/widelands/bug-1801767-tutorial2-ai into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8928
Proposed branch: lp:~widelands-dev/widelands/bug-1801767-tutorial2-ai
Merge into: lp:widelands
Diff against target: 10 lines (+1/-1)
1 file modified
data/campaigns/tutorial02_warfare.wmf/player_names (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1801767-tutorial2-ai
Reviewer Review Type Date Requested Status
hessenfarmer Needs Fixing
Review via email: mp+358363@code.launchpad.net

Commit message

Use empty AI in tutorial 2

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4194. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/452674525.
Appveyor build 3990. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1801767_tutorial2_ai-3990.

8908. By GunChleoc

Merged trunk.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

just had a look on the scripting code of the scenario.

I think empty AI would be ok but we need to define some roads to connect the military buildings of p2 in this case. otherwise there will be no reinforcements for the military buildings coming from HQ

review: Needs Fixing
Revision history for this message
GunChleoc (gunchleoc) wrote :

Do we care if there are reinforcements coming? The purpose here is that the player learns how to use the Attack button. I would no be against defining some roads though.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

I will have a look tonight to fix this bug and the missing atlantean well in basic economy in one branch as both are somewhat related to AI.

Having roads would look nicer and somewhat more normal.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

ok I have added the fixes for this branch to my new branch cause branching takes a lot of time on my old machine (due to a lot of write operations on my hard disk)

so this branch is probably superseded

Revision history for this message
GunChleoc (gunchleoc) wrote :

Since there will be no conflicts, I'll just merge it without closing the bug report

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Error merging this proposal:

Output:
stdout:

stderr:
Committing to: /Volumes/transcend/bunnybot/bunnybot/data/bzr_repo/_widelands_dev_widelands_trunk/
bzr: ERROR: No changes to commit. Please 'bzr add' the files you want to commit, or use --unchanged to force an empty commit.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/tutorial02_warfare.wmf/player_names'
2--- data/campaigns/tutorial02_warfare.wmf/player_names 2014-10-26 09:05:11 +0000
3+++ data/campaigns/tutorial02_warfare.wmf/player_names 2018-11-16 06:28:55 +0000
4@@ -12,5 +12,5 @@
5 [player_2]
6 name="Sparring Partner"
7 tribe="empire"
8-ai=
9+ai=empty
10 closeable="false"

Subscribers

People subscribed via source and target branches

to status/vote changes: