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 HK33s to be from 3CB and not NiArms #228

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

baegel49
Copy link

Changed Hk33s source to be 3CB and not NiArms.
Updated code to look for NiArms MG3 instead of BWmod MG5 (+ ammo)

Changed Hk33s source to be 3CB and not NiArms. 
Updated code to look for NiArms MG3 instead of BWmod MG5 (+ ammo)
@baegel49 baegel49 added the Standard Faction INDFOR For issues regarding the INDFOR standard faction composition label Sep 26, 2022
@Seb105
Copy link
Contributor

Seb105 commented Sep 26, 2022

I see we're still using hlc_ (NiArms) mags, do these still exist?

@baegel49
Copy link
Author

You mean for the MG3? Yeah they exist

@Seb105
Copy link
Contributor

Seb105 commented Oct 2, 2022

Ok I knew there was some problem, you somehow had the whole original replacement function (NiArms version) defined and running after your new one (which works btw).

It didn't cause any problems as everything that needed to be replaced already had been replaced, that's how I spotted the NiArms mags being used. I fixed it and I'm not seeing any errors.

@baegel49
Copy link
Author

baegel49 commented Oct 5, 2022

Thanks for checking, strange that that happened though

Copy link
Contributor

@JamesTheClarke JamesTheClarke left a comment

Choose a reason for hiding this comment

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

Made some comments about one minor mistake and one potential minor mistake to fix before merging.

class items
{
items=1;
class Item0
{
dataType="Layer";
name="TFN Cold War";
name="TFN Cold War_1";
Copy link
Contributor

Choose a reason for hiding this comment

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

This was probably a mistake by copying the composition folder in EDEN, thus changing the composition folder name to TFN Cold War_1

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, not a big deal though. It may be able to be fixed must by editing the .sqm

@@ -1,19 +1,19 @@
version=54;
center[]={2671.946,5,6095.9458};
version=55;
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this a manual edit? I vaguely remember @freghar telling me that we shouldn't update the version number if not necessary (though I'm not 100% if I remember correctly). All our other compositions are still versioned 54 afaik.

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't touch it. The game's internal sqm version has increased.

Copy link
Author

Choose a reason for hiding this comment

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

I manually edited it, feel free to reverse. Didn't know a version number change would cause issues, seems dumb

Copy link
Contributor

Choose a reason for hiding this comment

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

It refers to the internal version of the game engines composition parser, not the version of the composition

Copy link
Contributor

Choose a reason for hiding this comment

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

I manually edited it, feel free to reverse. Didn't know a version number change would cause issues, seems dumb

That makes sense because I made a few commits recently and they didn't change the version number. It's possible that the sqm version may have increased in the past two weeks but I think that's unlikely. I'd recommend to reverse this before rollout.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Standard Faction INDFOR For issues regarding the INDFOR standard faction composition
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants