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

Move the Dwarvish Miner unit to core #7324

Merged
merged 1 commit into from
Feb 14, 2023
Merged

Move the Dwarvish Miner unit to core #7324

merged 1 commit into from
Feb 14, 2023

Conversation

CelticMinstrel
Copy link
Member

@CelticMinstrel CelticMinstrel commented Jan 25, 2023

This allows addons to safely use it without having to copy the files into their own addon directory.

Also changes the tracking of what they're carrying to be a status instead of a role, which should be more portable to other use-cases.

This also changes the tracking of what they're carrying to be a status instead of a role, which should be more portable to other use-cases.
@github-actions github-actions bot added Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign Graphics Issues that involve the graphics engine or assets. Units Issues that involve unit definitions or their implementation in the engine. labels Jan 25, 2023
Copy link
Member

@knyghtmare knyghtmare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arigatou Gosaimasu.
I was planning on using them for a UMC, so I dont have to copy them over anymore.

@Pentarctagon
Copy link
Member

Pentarctagon commented Jan 26, 2023

Was the Miner's stats changed? It's not obvious from the diff.

Edit-
It looks like it was moved from one campaign to core, and a duplicate deleted from the other campaign?

@knyghtmare
Copy link
Member

Was the Miner's stats changed?

Yes, -1 MP when checking the file.

@CelticMinstrel
Copy link
Member Author

CelticMinstrel commented Jan 26, 2023

The diff shows -1 MP too. I'm not sure if I actually made that change or if something else happened, for example:

  • Mainline increased the MP at some point after the file was copied
  • The campaign that shows the file as deleted had -1 MP relative to the other campaign, and I actually copied it from there

@Pentarctagon
Copy link
Member

It looks like the SoF miner has 4 movement while the SotA miner has 5 movement.

@CelticMinstrel
Copy link
Member Author

Yeah, so that's probably what happened then – I copied the SoF one.

@Pentarctagon Pentarctagon requested a review from nemaara January 26, 2023 19:10
@Pentarctagon
Copy link
Member

@nemaara is the one movement difference an issue?

@nemaara
Copy link
Contributor

nemaara commented Jan 26, 2023

Need to replay SotA to see, it's one of the campaigns I'm not quite as familiar with so I kinda forgor.

@spixi
Copy link
Contributor

spixi commented Feb 2, 2023

Need to replay SotA to see, it's one of the campaigns I'm not quite as familiar with so I kinda forgor.

SotA could just add the quick trait or inherit the unit like it is done with the bat line to fix the standing animation underneath the ship rigging.

@knyghtmare
Copy link
Member

In case of SotA, I dont think 5 MP Dwarf Miner is required. The PR is just fine as its own.

@CelticMinstrel
Copy link
Member Author

Yeah, even if it is required they can just be given the quick trait… but we still need to confirm if that's the case and give the trait if so.

[or]
role=has_gold
[/or]
status=has_coal,has_gold
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to only support two types of resource, and will need some workaround if a scenario has miners picking up crystal (#7378). That workaround might be as simple as "we use has_coal to mean crystal", but is there a nicer way to incorporate it into the unit?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking about this too a little while ago. As it is right now I don't think there's a reason to call the status "has_xxx" instead of "loaded" or similar; however, I believe I chose this with the thought that the two statuses might have different graphics at some point in the future. But I'm not sure if there's a nice way to handle this generically in a way that would support other resources…

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe add a generalized "has_fullbag"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That falls under this:

"loaded" or similar

On the other hand, adding it as an exclusive to the existing two seems kind of pointless, as it doesn't actually help someone who wants them to be loaded with a different resource if the sprites actually reflect the resource being carried.

@knyghtmare
Copy link
Member

Can this be merged?

@nemaara
Copy link
Contributor

nemaara commented Feb 14, 2023

Yeehaw go ahead.

@knyghtmare knyghtmare merged commit 354afc3 into master Feb 14, 2023
@CelticMinstrel CelticMinstrel deleted the dwarf_miner branch February 14, 2023 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Campaign (any) Deprecated tag, replaced with separate tags for each mainline campaign Graphics Issues that involve the graphics engine or assets. Units Issues that involve unit definitions or their implementation in the engine.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants