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

Soro Shivas area fixes and tweaks #7488

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Conversation

BOBAMAx
Copy link
Contributor

@BOBAMAx BOBAMAx commented Nov 4, 2024

About the pull request

Fixes incorrect shivas areas from the rework + incorporates super small deck area into other areas

Removes "hallway" areas from soro and incorporates them into surrounding areas. Combines 3 adjacent canteen areas into 1.

"Hallway" areas were added to allow CAS inside buildings. This effectively allowed you to CAS inside any of the colony buildings but required you to know where these super special areas were in the rooms or hunt for them by examining the floor. Now the whole think is just CASable which it basically already was because of how offsets work.

Explain why it's good for the game

Bugs/oversights bad. Power going out in only half of a room because of weird area shenanigans is bad. Now areas make logical sense and the APCs tied to them are in sensible locations.

Testing Photographs and Procedure

before

soro5
soro6

after

soro3
soro4

Changelog

🆑 BOBAMA
fix: bugged Shivas areas
maptweak: Removed Sorokyne "hallway areas"
balance: Areas on Sorokyne that were only CASable because of the "hallway areas" can now just be CASd

/:cl:

@BOBAMAx BOBAMAx requested a review from Nanu308 as a code owner November 4, 2024 04:19
@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Nov 4, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Soro's oviable areas:
Soro

Red X please make not oviable. Yellow please consider making oviable. The question marked area should either be connected or not oviable.

Shiva's seems acceptable:
shiva

If you wanted the same code I'm using to visually check:
patch.diff.txt

@Drulikar Drulikar marked this pull request as draft November 5, 2024 01:37
@BOBAMAx
Copy link
Contributor Author

BOBAMAx commented Nov 5, 2024

added yellow areas. The red X's are oviable because of https://github.com/Nanu308/cmss13/blob/1ce880bb79d215641f1feb7aa48a31208100957a/code/game/objects/effects/landmarks/landmarks.dm#L238-L243. These areas have xeno_hive_spawn landmarks for XvX.

@BOBAMAx BOBAMAx marked this pull request as ready for review November 5, 2024 08:42
@Nanu308
Copy link
Member

Nanu308 commented Nov 5, 2024

added yellow areas. The red X's are oviable because of https://github.com/Nanu308/cmss13/blob/1ce880bb79d215641f1feb7aa48a31208100957a/code/game/objects/effects/landmarks/landmarks.dm#L238-L243. These areas have xeno_hive_spawn landmarks for XvX.

XvX spawns are for a different gamemode, those areas should not be oviable in Distress mode. Distress mode is specifically to keep xenos from rushing down marines and so forth. Besides that see Drathek's comment

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

With some changes I will be doing in another PR to fix the xvx landmarks being used incorrectly:
shiva
soro

@Drulikar Drulikar mentioned this pull request Nov 5, 2024
@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Nov 5, 2024
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

area mapping lgtm now

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 5, 2024
@Drulikar Drulikar added this pull request to the merge queue Nov 5, 2024
Merged via the queue into cmss13-devs:master with commit 9670717 Nov 5, 2024
28 checks passed
cmss13-ci bot added a commit that referenced this pull request Nov 5, 2024
@BOBAMAx BOBAMAx deleted the soro-areas branch November 6, 2024 10:49
github-merge-queue bot pushed a commit that referenced this pull request Nov 6, 2024
# About the pull request

This PR is a follow up to #7363 and #7488 where it was discovered that
the XvX hive landmarks were being used as an area to allow ovi meaning
distress signal was getting areas not intended to be oviable. This also
makes it so the ovi restriction does not apply to XvX (all areas will
allow it).

Oviable areas were also expanded on Kutjevo, Shivas, Tijent Dam,
Chance's Claim, and Fiorina.

# Explain why it's good for the game

Ovi restrictions are intended to disallow hives next to LZs, this fixes
that. It also expands the areas oviable at the start of the game on
Kutjevo, Shivas, Trijent Dam, Chance's Claim, and Fiorina so there is
more variety in where an initial hive can be place.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![Soro](https://github.com/user-attachments/assets/ae1ec4c8-3a96-4b89-9858-1a1662da0357)

![Soro_After](https://github.com/user-attachments/assets/6a8fbcc2-97aa-43bc-9dc2-83f609c9a82b)

![Kutjevo](https://github.com/user-attachments/assets/78e3b971-9880-4322-88f5-690b99a98af9)

![Kutjevo_After](https://github.com/user-attachments/assets/6565a64c-8e83-4b67-9183-72286db3b80f)

![Shivas](https://github.com/user-attachments/assets/ec1c5cce-6490-484a-85ba-1812ce7f4dac)

![Shivas_After](https://github.com/user-attachments/assets/4d892408-914a-4bc8-9a51-d5ee439a5f00)

![Trijent](https://github.com/user-attachments/assets/530c8e40-7e6a-42f3-b80a-f1021b505011)

![Trijent_After](https://github.com/user-attachments/assets/b8a20e59-65ba-4875-b4cb-850d0c0f9073)

![Chances](https://github.com/user-attachments/assets/f70da48a-7183-464e-9a37-cd6ecbf5fa35)

![Chances_After](https://github.com/user-attachments/assets/d5f124a5-35e2-4880-a843-85c83488d90e)

![Fiorina](https://github.com/user-attachments/assets/6b58eac5-61c0-499e-a9ef-5d805d717656)

![Fiorina_After](https://github.com/user-attachments/assets/5ba8736f-290d-4b28-9338-20a17383a756)

![Lv624_After](https://github.com/user-attachments/assets/89d08415-338b-47ab-897c-f34c53832ae1)

![NV_After](https://github.com/user-attachments/assets/27ec79b5-3fc1-4d98-87f4-d408feccdc1f)

![Solaris_After](https://github.com/user-attachments/assets/24ca89c4-934a-4e61-a097-43dfae0b2030)

Testmerge with Hybrisa:

![Hybrisa](https://github.com/user-attachments/assets/5c3ba89f-7c97-428a-aa0b-519eb1680adc)

</details>


# Changelog
:cl: Drathek
balance: Fix XvX landmarks being used for roundstart oviable locations
balance: Roundstart oviable locations are expanded on Kurjevo, Shivas,
Trijent Dam, Chances's Claim, and Fiorina
fix: XvX now makes all areas oviable
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants