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

D2K - Subfaction Images and Voices #14458

Merged
merged 3 commits into from Dec 23, 2017

Conversation

Projects
None yet
4 participants
@MustaphaTR
Member

MustaphaTR commented Nov 30, 2017

Before this PR human player that uses subfactions get no unit or mentat voice. Now they use the voices from the same faction they share structure artwork with.

This fixes that Fremen uses Harkonnen structure artwork instead of Atreides.

This changes Image: tag for structures from Harkonnen ones to Ordos, as there are 3 Ordos and 2 other subfactions. Harkonnen and Corrino are now defined on FactionImages:, while Ordos, Mercenary and Smuggler are removed from there.

At last this replaces missing cameos with Ordos counterparts for Mercenary War Factory and Smuggler Starport (Those use Ornithopter Cameo in original game and was Atreides Combat Tank on ORA).

Depends on #14457, as you can't test the second commit without what that PR fixes.

@ltem

This comment has been minimized.

Show comment
Hide comment
@ltem

ltem Dec 10, 2017

Contributor

I took a quick look over it and I couldn't spot any issues but I have to check it again in more detail, I should be done in the next days. However, I have two questions.

First, could it be that Fremen use the same palace-shp-file as Corrino?
I found this image some time ago and used it as a reference (I think I got it from gruntsmods). While the Smuggler Starport and Mercenary Heavy Factory are fine, the Corrino palace shape is used for the Fremen.

structures

Second, did you ever stumble over "crushing screams" in d2k, which gets played if infantry gets crushed by a vehicle? I'm asking because you're handling the sound files in this PR.

Contributor

ltem commented Dec 10, 2017

I took a quick look over it and I couldn't spot any issues but I have to check it again in more detail, I should be done in the next days. However, I have two questions.

First, could it be that Fremen use the same palace-shp-file as Corrino?
I found this image some time ago and used it as a reference (I think I got it from gruntsmods). While the Smuggler Starport and Mercenary Heavy Factory are fine, the Corrino palace shape is used for the Fremen.

structures

Second, did you ever stumble over "crushing screams" in d2k, which gets played if infantry gets crushed by a vehicle? I'm asking because you're handling the sound files in this PR.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 11, 2017

Member

Palace is wierd, when you preplace using Map Editor, Fremen gets Emparor's Palace. Play as Fremen ingame and progress thru, you get Atreides Palace buildable. I'm not sure what is the case with Corrino itself, i may need to test.

Member

MustaphaTR commented Dec 11, 2017

Palace is wierd, when you preplace using Map Editor, Fremen gets Emparor's Palace. Play as Fremen ingame and progress thru, you get Atreides Palace buildable. I'm not sure what is the case with Corrino itself, i may need to test.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 12, 2017

Member

Rebased, as #14457 is now merged.

Member

MustaphaTR commented Dec 12, 2017

Rebased, as #14457 is now merged.

Show outdated Hide outdated mods/d2k/rules/structures.yaml Outdated
Show outdated Hide outdated mods/d2k/sequences/structures.yaml Outdated
Show outdated Hide outdated mods/d2k/sequences/structures.yaml Outdated
FactionImages:
atreides: palace.atreides
ordos: palace.ordos
fremen: palace.atreides
harkonnen: palace.harkonnen
corrino: palace.corrino

This comment has been minimized.

@ltem

ltem Dec 13, 2017

Contributor

The Corrino palace exit point is a bit off, could this be updated in this PR? IMO it isn't urgent.

@ltem

ltem Dec 13, 2017

Contributor

The Corrino palace exit point is a bit off, could this be updated in this PR? IMO it isn't urgent.

This comment has been minimized.

@MustaphaTR

MustaphaTR Dec 14, 2017

Member

Corrino palace isn't meant to be able to build stuff tbh. Considering #14460 maybe we should seperate the palaces.

@MustaphaTR

MustaphaTR Dec 14, 2017

Member

Corrino palace isn't meant to be able to build stuff tbh. Considering #14460 maybe we should seperate the palaces.

This comment has been minimized.

@ltem

ltem Dec 14, 2017

Contributor

Sounds good, I left a line about it at the issue.

@ltem

ltem Dec 14, 2017

Contributor

Sounds good, I left a line about it at the issue.

MustaphaTR added some commits Nov 30, 2017

Update D2K FactionImages
Default is now Ordos, as there are 3 ordos subfactions and 2 for others.
Fremen now uses Atreides Structures as in original, rather than
Harkonnen
@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 14, 2017

Member

Updated.

Member

MustaphaTR commented Dec 14, 2017

Updated.

@ltem

ltem approved these changes Dec 14, 2017

@pchote

pchote approved these changes Dec 23, 2017

@pchote pchote merged commit 4490eb3 into OpenRA:bleed Dec 23, 2017

2 checks passed

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

@MustaphaTR MustaphaTR deleted the MustaphaTR:d2k-subfaction-images-and-voices branch Dec 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment