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

Scp1344Item & move Prefabs #235

Merged
merged 13 commits into from
Dec 7, 2024
Merged

Conversation

Misfiy
Copy link
Member

@Misfiy Misfiy commented Nov 27, 2024

Description

Describe the changes

  • Remove ToysHelper, put Prefabs into the class theyre prefabs of
  • Add Scp1344 item wrapper

What is the current behavior? (You can also link to an open issue here)

What is the new behavior? (if this is a feature change)

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:


Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentations

Submission checklist

  • I have checked the project can be compiled
  • I have tested my changes and it worked as expected

Patches (if there are any changes related to Harmony patches)

  • I have checked no IL patching errors in the console

Other

  • Still requires more testing

@Misaka-ZeroTwo
Copy link
Collaborator

build error moment

@Misfiy
Copy link
Member Author

Misfiy commented Nov 28, 2024

build error moment

forgot to commit ooops

@BoltonDev BoltonDev mentioned this pull request Nov 28, 2024
8 tasks
/// <param name="scale">The scale of the <see cref="Speaker"/>.</param>
/// <param name="spawn">Whether the <see cref="Speaker"/> should be initially spawned.</param>
/// <returns>The new <see cref="Speaker"/>.</returns>
public static Speaker Create(Vector3? position, Vector3? rotation, Vector3? scale, bool spawn)

Choose a reason for hiding this comment

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

if you consider them as nullable maybe add a null default value?

Choose a reason for hiding this comment

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

we can add default value yeah, i just copied the method from another toy

@BoltonDev
Copy link

Don't merge this pr for the moment because there is a problem with the prefab loader. We actually load them from NetworkClient which doesn't register prefabs before map generation so actually if we push this, we're unable to spawn things that use prefab when the map is generated

@Misaka-ZeroTwo
Copy link
Collaborator

There are conflicts.

@VALERA771 VALERA771 merged commit 0d20b8b into ExMod-Team:scpsl14 Dec 7, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants