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

Nightmare Insert: UPP/USCM Landing Zone Overhaul (All Maps) #7768

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

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Dec 9, 2024

About the pull request

This PR adds a suite of nightmare inserts for all ground maps. These inserts will trigger during the Faction Clash UPP CM game mode (the automated one, not the default one). This will perform four actions on most maps.

  1. Spawn a dedicated UPP landing zone, that is pre-fortified.
  2. Remove 1 of the 2 USCM landing zones
  3. Replace the primary USCM landing zone with a fortified/built up version.
  4. Place an active all-faction communications relay on the planet. Ensuring both factions have access to their faction communications.

Explain why it's good for the game

The objective behind this is to assist in the automation and setup times of the HvH game mode. Currently, an admin is required to manually spawn a UPP landing zone, restrict any possible excess USCM landing zones, assist either or both factions in performing minor fortification work, spawn in basic necessities such as a remote dropship computer or surgical/engineering equipment if the OpFor LZ has it (Example: giving a UPP FOB a surgical table, if the USCM FOB has one), and finally spawning an active comms array so both factions can use their groundside comms.

This PR accomplishes all this in an automated way that requires zero admin intervention by staff running this event.

Furthermore, the FOBs starting pre-fortified, to a greater or lesser extent, help out both teams Engineers, who can instead focus their efforts and limited resources on fortifying the main colony and frontline. This also advantages the UPP slightly, as the UPP LZs have typically been far more sub-optimal than the USCM ones due to the ad-hoc nature of them.

Finished map inserts.

  • LV-624
  • Solaris Ridge
  • New Varadero
  • Kutjevo Refinery
  • Shivas Snowball
  • Sorokyne Strata
  • Trijent Dam
  • Chances Claim
  • Fiorina Sci Annex

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
mapadd: During the Faction Clash gamemode. A UPP forward operating base and Landing Zone will be automatically placed on the planet. This will apply to all current ground maps.
mapadd: Furthermore, the USCM FOB will start pre-fortified. However, only one USCM landing zone will be available to use.
fix: Fixed trolly vehicle hard deletes (Drathek)
fix: Fixed roof_master_node error issue. (cuberound)
/:cl:

@Steelpoint Steelpoint requested a review from Nanu308 as a code owner December 9, 2024 11:51
@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Dec 9, 2024
Steelpoint and others added 11 commits December 9, 2024 20:10
b4d9eea: maps/map_files/BigRed/BigRed.dmm
b4d9eea: maps/map_files/DesertDam/Desert_Dam.dmm
b4d9eea: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
b4d9eea: maps/map_files/New_Varadero/New_Varadero.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Dec 9, 2024
@Steelpoint
Copy link
Contributor Author

Steelpoint commented Dec 9, 2024

Due to a niche bug, I've had to set the USCM landing zones I don't intend to use to the 'Yautja' faction. This is just so neither USCM or UPP factions can use the landing zone. Actually deleting the landing zone docking port via a nightmare insert produces errors.

nvm, will find alt solution

@Steelpoint
Copy link
Contributor Author

I'll ask around for a code fix after I finish doing the mapping work.

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 30, 2025
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jan 31, 2025
Steelpoint and others added 6 commits January 31, 2025 10:49
f468d4c: maps/map_files/DesertDam/Desert_Dam.dmm
f468d4c: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
f468d4c: maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm

Automatically commited by: tools\mapmerge2\fixup.py
cm13-github added a commit that referenced this pull request Feb 3, 2025
@Steelpoint
Copy link
Contributor Author

I've tested New Varadero, Kutjevo, Hybrisa Prospera and Solaris Ridge on the live server with no issues thus far.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 5, 2025
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 6, 2025
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Steelpoint added 3 commits February 6, 2025 16:11
7de503e: maps/map_files/BigRed/BigRed.dmm
7de503e: maps/map_files/DesertDam/Desert_Dam.dmm
7de503e: maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
7de503e: maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
7de503e: maps/map_files/Kutjevo/Kutjevo.dmm
7de503e: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
7de503e: maps/map_files/LV624/LV624.dmm
7de503e: maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
7de503e: maps/map_files/New_Varadero/New_Varadero.dmm
7de503e: maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 8, 2025
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 12, 2025
Steelpoint added 3 commits February 12, 2025 20:19
45ffacc: maps/map_files/BigRed/BigRed.dmm
45ffacc: maps/map_files/DesertDam/Desert_Dam.dmm
45ffacc: maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
45ffacc: maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
45ffacc: maps/map_files/Kutjevo/Kutjevo.dmm
45ffacc: maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
45ffacc: maps/map_files/LV624/LV624.dmm
45ffacc: maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
45ffacc: maps/map_files/New_Varadero/New_Varadero.dmm
45ffacc: maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cmss13-ci cmss13-ci bot removed the Stale beg a maintainer to review your PR label Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Mapping did you remember to save in tgm format?
Projects
Status: Changes Requested
Development

Successfully merging this pull request may close these issues.

3 participants