Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ants teleporting into the map area in ant-01 #17451

Merged
merged 1 commit into from Jan 2, 2020
Merged

Conversation

@abcdefg30
Copy link
Member

abcdefg30 commented Dec 11, 2019

Waypoint17 is not at the map edge, waypoint7 is.
Also fixes a path, since waypoint20 -> waypoint10 is going back and makes no sense.
Going directly waypoint20 -> waypoint2 works and as compensation I added
waypoint21 -> waypoint10 -> waypoint2.

Waypoint17 is not at the map edge, waypoint7 is.
Also fixes a path, since waypoint20 -> waypoint10 is going back and makes no sense.
Going directly waypoint20 -> waypoint2 works and as compensation I added waypoint21 -> waypoint10 -> waypoint2.
@reaperrr reaperrr added this to the Next Release milestone Dec 29, 2019
@pchote

This comment has been minimized.

Copy link
Member

pchote commented Jan 1, 2020

Why aren't we using the teams or paths from the original mission?
Applying a basic translation of the [TeamTypes] from sca01ea shows:

scare=  ANT3 x 1 (Germany): Spawn at W.27, Attack Ukraine, Attack Germany
scout=  ANT3 x 1 (Germany): Spawn at W. 4, Move to W.4, Move to W.3, Move to W.2, Move to W.0, Attack Greece
scout2= ANT3 x 1 (Germany): Spawn at W. 7, Move to W.7, Move to W.16, Move to W.1, Move to W.0, Attack Greece
scout3= ANT3 x 1 (Germany): Spawn at W.12, Move to W.12, Move to W.14, Move to W.9, Move to W.0, Attack Greece
nwharv= ANT3 x 2 (Germany): Spawn at W. 8, Move to W.8, Move to W.13, Move to W.16, Move to W.17, Do This:10(?)
seharv= ANT3 x 1 (Germany): Spawn at W. 4, Move to W.4, Move to W.2, Move to W.10, Move to W.9, Do This:10(?)
m020=   ANT3 x 2 (Germany): Spawn at W. 8, Move to W.4, Move to W.5, Move to W.15, Move to W.0
loop1=  ANT3 x 2 (Germany): Spawn at W.12, Patrol to W.13, Patrol to W.1, Patrol to W.16, Repeat
m025=   ANT3 x 2 (Germany): Spawn at W. 7, Move to W.7, Move to W.16, Move to W.1, Move to W.0, Attack Ukraine
loop2=  ANT3 x 2 (Germany): Spawn at W. 4, Patrol to W.18, Patrol to W.3, Patrol to W.5, Repeat
m040=   ANT3 x 2 (Germany): Spawn at W. 8, Move to W.8, Move to W.9, Attack Greece
m042=   ANT2 x 1 (Ukraine): Spawn at W. 4, Move to W.4, Move to W.5, Move to W.15, Attack Ukraine, Attack Greece
m060a=  ANT3 x 2 (Germany): Spawn at W. 4, Move to W.4, Move to W.3, Attack USSR
m060b=  ANT3 x 2 (Germany): Spawn at W. 7, Move to W.7, Move to W.16, Move to W.1, Attack Neutral, Attack USSR
m060c=  ANT2 x 1 (Ukraine): Spawn at W. 8, Move to W.8, Move to W.9, Move to W.19, Attack Ukraine, Attack Greece
sat1=   ANT3 x 1 (Germany): Spawn at W.20, Move to W.20, Attack Greece
sat2=   ANT3 x 1 (Germany): Spawn at W.21, Move to W.21, Attack Greece
wait1=  ANT3 x 2 (Germany): Spawn at W.12, Move to W.12, Move to W.11, Move to W.1,5:3, Patrol to W.0, Do This:14(?)
wait2=  ANT3 x 2 (Germany): Spawn at W. 8, Move to W.8, Move to W.10, Move to W.2,5:3, Patrol to W.0, Attack USSR
wait3=  ANT3 x 2 (Germany): Spawn at W. 7, Move to W.7, Move to W.6, Move to W.15,5:2, Patrol to W.0
p2min=  ANT3 x 1 (Germany): Spawn at W.12, Move to W.11, Move to W.1, Do This:14
ditch1= ANT3 x 5 (Germany): Spawn at W. 4, Move to W.18, Move to W.5, Attack Greece
ditch2= ANT3 x 5 (Germany): Spawn at W. 7, Move to W.17, Move to W.16, Patrol to W.1, Attack Greece
ditch3= ANT3 x 4 (Germany): Spawn at W.12, Move to W.11, Move to W.14, Patrol to W.9, Attack Ukraine, Attack Greece
ditch4= ANT2 x 2 (Ukraine): Spawn at W. 8, Move to W.10, Patrol to W.2, Attack Greece
m130=   ANT3 x 2 (Germany): Spawn at W.12, Move to W.12, Move to W.11, Move to W.14, Move to W.9, Attack Ukraine, Attack Neutral
m140=   ANT3 x 2 (Germany): Spawn at W. 7, Move to W.17, Move to W.6, Move to W.15, Attack 8, Attack Turkey
m145=   ANT3 x 2 (Germany): Spawn at W. 4, Move to W.18, Move to W.3, Move to W.2
m149=   ANT2 x 1 (Ukraine): Spawn at W. 8, Move to W.8, Move to W.9, Attack Ukraine, Attack Germany, Attack USSR
m165b=  ANT3 x 3 (Germany): Spawn at W. 7, Move to W.17, Move to W.16, Move to W.1, Attack Ukraine, Attack Germany
m180=   ANT3 x 2 (Germany): Spawn at W. 4, Move to W.18, Move to W.3,1:26, Patrol to W.0, Attack Greece
m186=   ANT2 x 1 (Ukraine): Spawn at W.12, Move to W.12, Move to W.11, Move to W.13, Move to W.1, Attack Ukraine, Attack Germany, Do This:14(?)
m210=   ANT3 x 3 (Germany): Spawn at W. 4, Move to W.18, Patrol to W.26, Attack USSR
m214=   ANT3 x 2 (Germany): Spawn at W.12, Move to W.11, Patrol to W.1, Attack Ukraine
m280a=  ANT3 x 2 (Germany): Spawn at W. 7, Move to W.17, Move to W.6, Attack Ukraine, Attack Greece
m280b=  ANT3 x 2 (Ukraine): Spawn at W. 8, Move to W.10, Patrol to W.2, Attack Greece
@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Jan 1, 2020

That's a good question.
But I think at least for the hotfix, the PR as-is would be safer than rewriting half the lua script under time pressure, which would then also require more testing.

@pchote
pchote approved these changes Jan 2, 2020
Copy link
Member

pchote left a comment

Indeed. Confirmed that this improves the current script.

@pchote pchote merged commit ab34833 into OpenRA:bleed Jan 2, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30 abcdefg30 deleted the abcdefg30:ants branch Jan 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.