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

Add Counterstrike mission Sarin Gas 2: Down Under #15952

Merged
merged 1 commit into from Mar 28, 2019

Conversation

@Smittytron
Copy link
Contributor

commented Dec 27, 2018

Hoo boy this one took awhile.

I decided not to get fancy with difficulties here. There's normal mode and don't lose a single soldier mode.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from f65d483 to 6e0ab70 Dec 30, 2018

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Dec 30, 2018

Rebased

@Muh-Muh
Copy link
Contributor

left a comment

I only found a few things that need changing and I had to go out of my way to actually make it crash ingame.

Other than that just two very minor points:

(1) Is it intentional that Tanya may day without any repercussions?
(2) The line on the ground in Tanya's prison doesn't correspond to the range of the flame towers. But I don't know if this is something that needs to be adressed at all.

mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 6e0ab70 to fe5b583 Dec 31, 2018

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Dec 31, 2018

Updated. Added IsDead checks for everything but the mammoth 2 cam, which I moved over by a cell and expanded the trigger distance by 1. I'm certain that there's no way to destroy the mammoth without spawning the camera first.

(1) Is it intentional that Tanya may day without any repercussions?
(2) The line on the ground in Tanya's prison doesn't correspond to the range of the flame towers. But I don't know if this is something that needs to be adressed at all.

In the original you could lose Tanya and go on, but I guess it makes sense to have an objective for her. I added a free and keep Tanya alive objective.
As far as the line goes; I don't want to change a map from the original, and Tanya's vision is good enough for the player to see whether or not she is getting fire-balled or not. 😄

@pchote

This comment has been minimized.

Copy link
Member

commented Dec 31, 2018

It would be great if we could get this merged in time for the playtest.

@Muh-Muh

This comment has been minimized.

Copy link
Contributor

commented Dec 31, 2018

Updated. Added IsDead checks for everything

One thing that still doesn't work right is the trigger for the scientist entering the demo truck.

if not ScientistMan.IsDead then
		Trigger.OnRemovedFromWorld(ScientistMan, DemoTruckExit)

This creates the trigger and if the scientist then dies (while on the way to the truck) the truck starts moving. Expected behavior is: Truck doesn't move if the scientist is killed on the way. Perhaps, instead of "OnRemovedFromWorld" you could use "OnPassengerEntered" or a simple proximitytrigger?

By the way: did you add an extra dog? I can't free tanya with just the spies from the prison anymore. All the lua-crashed depended on being able to do this somewhat easily. If this is taken care of I think the mission works fine as is.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from fe5b583 to 78f8431 Dec 31, 2018

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Dec 31, 2018

Updated: Moving the IsDead check to the next function worked for me.

By the way: did you add an extra dog?

Yeah, I thought it made more sense than having two flamers there. In theory, you aren't supposed to be able to use the two spies without breaking them out of prison first. I didn't realize they could get past their own guard dogs.

@Muh-Muh

This comment has been minimized.

Copy link
Contributor

commented Dec 31, 2018

Found something else (sorry -.-):
You can infiltrate the first war factory multiple times. This gives a lua crash for the second infiltration.
Can infiltratable be made conditional? If so, you could make it conditional and remove the condition for both warfactories after the first successful infiltration.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 78f8431 to 978f2ec Dec 31, 2018

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Jan 1, 2019

Updated

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 978f2ec to 76caf02 Jan 1, 2019

@Muh-Muh

This comment has been minimized.

Copy link
Contributor

commented Jan 1, 2019

I have no more complaints. I think it works well now.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 76caf02 to 965ec4e Jan 2, 2019

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Jan 2, 2019

Updated. Changed the hard objective message to specify that the player only needs to protect the units under their command.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 965ec4e to 38f575a Feb 3, 2019

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Feb 3, 2019

Updated to work with #16041 and #16119.

@reaperrr reaperrr added this to the Next + 1 milestone Mar 7, 2019

@pchote

This comment has been minimized.

Copy link
Member

commented Mar 9, 2019

Can we get some testing and reviewing here?

mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 38f575a to 1c92278 Mar 12, 2019

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Mar 12, 2019

Updated

@abcdefg30
Copy link
Member

left a comment

Looks good to me otherwise.

mods/ra/maps/sarin-gas-2-down-under/downunder.lua Outdated Show resolved Hide resolved
mods/ra/maps/sarin-gas-2-down-under/rules.yaml Outdated Show resolved Hide resolved

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 1c92278 to e3981a2 Mar 12, 2019

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Mar 12, 2019

Updated

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from e3981a2 to 7aa18c9 Mar 12, 2019

@obrakmann
Copy link
Contributor

left a comment

I have only one complaint about this mission (other than my general grievances about these kind of maps having no place in an RTS): when all your dudes die before Tanya gets freed, the mission does not fail automatically. It would be nice if that could be fixed. Otherwise the mission looks ok.

@Smittytron Smittytron force-pushed the Smittytron:sarin-gas-2 branch from 7aa18c9 to f5b7375 Mar 28, 2019

@Smittytron

This comment has been minimized.

Copy link
Contributor Author

commented Mar 28, 2019

Updated. I addressed the above comment by making Tanya temporarily German. She will fall under the player's command when the flametowers guarding her are destroyed.

@obrakmann obrakmann merged commit 99987db into OpenRA:bleed Mar 28, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@obrakmann

This comment has been minimized.

Copy link
Contributor

commented Mar 28, 2019

@obrakmann obrakmann referenced this pull request Mar 28, 2019
7 of 8 tasks complete

@Smittytron Smittytron deleted the Smittytron:sarin-gas-2 branch Apr 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.