Skip to content

Commit

Permalink
Fix Auto Oviable Areas (#7507)
Browse files Browse the repository at this point in the history
# 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:
  • Loading branch information
Drulikar authored Nov 6, 2024
1 parent 412949e commit a3e52c2
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 9 deletions.
2 changes: 2 additions & 0 deletions code/game/area/DesertDam.dm
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,12 @@
/area/desert_dam/building/substation/northeast
name = "Command Substation"
icon_state = "northeastern_ss"
unoviable_timer = FALSE

/area/desert_dam/building/substation/central
name = "Command Substation"
icon_state = "central_ss"
unoviable_timer = FALSE

/area/desert_dam/building/substation/southwest
name = "Command Substation"
Expand Down
1 change: 1 addition & 0 deletions code/game/area/LV522_Chances_Claim.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
/area/lv522/outdoors/colony_streets/containers
name = "Colony Streets - Container Yard"
icon_state = "yellow"
unoviable_timer = FALSE

/area/lv522/outdoors/colony_streets/windbreaker
name = "Colony Windbreakers"
Expand Down
3 changes: 3 additions & 0 deletions code/game/area/kutjevo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,13 @@
name = "Kutjevo - Abandoned Construction Interior"
ceiling = CEILING_METAL
icon_state = "construction_int"
unoviable_timer = FALSE

/area/kutjevo/interior/foremans_office
name = "Kutjevo - Foreman's Office"
ceiling = CEILING_METAL
icon_state = "foremans"
unoviable_timer = FALSE

/area/kutjevo/interior/botany_bay_int
name = "Kutjevo - Space Weed Farm Interior"
Expand Down Expand Up @@ -313,3 +315,4 @@
ceiling = CEILING_DEEP_UNDERGROUND
icon_state = "colony_caves_3"
minimap_color = MINIMAP_AREA_ENGI_CAVE
unoviable_timer = FALSE
1 change: 0 additions & 1 deletion code/game/area/prison_v3_fiorina.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
icon_state = "tumor1"
requires_power = 0
minimap_color = MINIMAP_AREA_SHIP
unoviable_timer = 25 MINUTES

/area/fiorina/tumor/civres
name = "Fiorina - Green Block Residences"
Expand Down
7 changes: 7 additions & 0 deletions code/game/area/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
/area/shiva/exterior/cp_colony_grounds
name = "Shiva's Snowball - Colony Grounds"
icon_state = "junkyard2"
unoviable_timer = FALSE

/area/shiva/exterior/junkyard
name = "Shiva's Snowball - Junkyard"
Expand All @@ -148,10 +149,12 @@
/area/shiva/exterior/junkyard/cp_bar
name = "Shiva's Snowball - Bar Grounds"
icon_state = "bar0"
unoviable_timer = FALSE

/area/shiva/exterior/cp_s_research
name = "Shiva's Snowball - Research Hab Exterior"
icon_state = "junkyard1"
unoviable_timer = FALSE

/area/shiva/exterior/cp_lz2
name = "Shiva's Snowball - North Colony Grounds"
Expand Down Expand Up @@ -261,18 +264,22 @@
/area/shiva/interior/valley_huts
name = "Shiva's Snowball - Valley Bunker 1"
icon_state = "hangars1"
unoviable_timer = FALSE

/area/shiva/interior/valley_huts/no2
name = "Shiva's Snowball - Valley Bunker 2"
icon_state = "hangars2"
unoviable_timer = FALSE

/area/shiva/interior/valley_huts/disposals
name = "Shiva's Snowball - Valley Disposals"
icon_state = "hangars3"
unoviable_timer = FALSE

/area/shiva/interior/garage
name = "Shiva's Snowball - Cargo Tug Repair Station"
icon_state = "hangars2"
unoviable_timer = FALSE

/area/shiva/interior/lz2_habs
name = "Shiva's Snowball - Argentinian Research Headquarters"
Expand Down
6 changes: 3 additions & 3 deletions code/game/gamemodes/colonialmarines/xenovsxeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
initialize_post_xenomorph_list(GLOB.xeno_hive_spawns)

round_time_lobby = world.time
for(var/area/A in GLOB.all_areas)
if(!(A.is_resin_allowed))
A.is_resin_allowed = TRUE
for(var/area/cur_area in GLOB.all_areas)
cur_area.is_resin_allowed = TRUE
cur_area.unoviable_timer = FALSE

open_podlocks("map_lockdown")

Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/effects/landmarks/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@

/obj/effect/landmark/queen_spawn/Initialize(mapload, ...)
. = ..()

var/area/area = get_area(src)
area.unoviable_timer = FALSE

GLOB.queen_spawns += src

/obj/effect/landmark/queen_spawn/Destroy()
Expand All @@ -232,15 +236,11 @@
return ..()

/obj/effect/landmark/xeno_hive_spawn
name = "xeno hive spawn"
name = "xeno vs xeno hive spawn"
icon_state = "hive_spawn"

/obj/effect/landmark/xeno_hive_spawn/Initialize(mapload, ...)
. = ..()

var/area/area = get_area(src)
area.unoviable_timer = FALSE

GLOB.xeno_hive_spawns += src

/obj/effect/landmark/xeno_hive_spawn/Destroy()
Expand Down

0 comments on commit a3e52c2

Please sign in to comment.