Fix for broken nightmare inserts #7009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
modified: maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/10.pod_holder.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/10.scav_shipholder.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthday_party.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.no_gear.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.warden_officedecorated.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamer_time.dmm deleted: maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.pool_party.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.yard_basketball.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/25.research_prestine.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineer_office.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizza_time.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.repair_panelslz.dmm modified: maps/map_files/Kutjevo/Kutjevo.dmm renamed: maps/map_files/Kutjevo/sprinkles/35.communications.dmm -> maps/map_files/Kutjevo/sprinkles/35.communications_building.dmm
github-actions
bot
added
Mapping
harryob
requested changes
Aug 24, 2024
There was a problem hiding this comment.
i don't think this is the best way to do it, we can fix this in code
in code/modules/nightmare/nmnodes/mapload.dm, on line 58, with the var/regex/matcher, we can replace the new() statement with new(@"^([0-9]+)([\.\+]).*?\.dmm$", "i") instead
then you can revert map changes as it should work without the underscores
modified: maps/map_files/BigRed/BigRed.dmm modified: maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/10.pod_holder.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/10.scav_shipholder.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/10.scavshipholder.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthday_party.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.birthdayparty.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.no_gear.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.nogear.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/15.warden_officedecorated.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/15.wardenofficedecorated.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamer_time.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.gamertime.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.pool_party.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/20.yard_basketball.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/25.research_prestine.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineer_office.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.engineeroffice.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizza_time.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm renamed: maps/map_files/FOP_v3_Sciannex/sprinkles/30.repair_panelslz.dmm -> maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm modified: maps/map_files/Kutjevo/Kutjevo.dmm renamed: maps/map_files/Kutjevo/sprinkles/35.communications_building.dmm -> maps/map_files/Kutjevo/sprinkles/35.communications.dmm modified: maps/map_files/New_Varadero/New_Varadero.dmm
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
… -> maps/map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm
|
Ignore the comically large amount of commits. I kind of forgot how to use GitHub. |
harryob
approved these changes
Aug 29, 2024
…> maps/map_files/Ice_Colony_v3/sprinkles/unused/20.labs-larder.dmm renamed: maps/map_files/Ice_Colony_v3/sprinkles/33.labs-entrance.dmm -> maps/map_files/Ice_Colony_v3/sprinkles/unused/33.labs-entrance.dmm
auto-merge was automatically disabled
August 29, 2024 16:18
Head branch was pushed to by a user without write access
cm13-github
added a commit
that referenced
this pull request
Aug 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
All but one nightmare insert for Fiorina was broken due to some strange naming bug. In addition, one nightmare insert for Kutjevo was broken. This PR fixes those nightmare inserts and adds them back. Also cleaned up several unused sprinkles and moved them to an appropriate folder.
Explain why it's good for the game
More nightmare inserts are cool.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
fix: fixed issue where nightmare inserts would not spawn
fix: moved unused nightmare inserts to "unused" folder so that they don't cause errors.
/:cl: