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

Cyberiad: Various improves and fixes #991

Merged
merged 3 commits into from
Jan 15, 2025

Conversation

dj-34
Copy link
Collaborator

@dj-34 dj-34 commented Jan 14, 2025

  1. Различные фиксы и улучшения Кибериады.
  • Поправил летающие лампочки.
  • Зона с названием "Consul Chamber" была заменена на понятную митинг руму глав.
  • Добавил еще больше недостающего контента с оригинальной карты.
  • Поправил зону у Хопской.
  • Вся тайлы воды на станции (по факту на мостике и в баньке) были заменены на воду в которой нельзя рыбачить, кроме одной зоны - парка в гетто, там все еще вода с рыбками.
  1. Портировал еще один сайдинг с Пары.
  2. Портировал с Пары статуи Кибериады и Дельты.
  3. Добавил новый подтип воды no_fishing и альтернативный тайл воды с спрайтом (модифицированным) с билда Mojave Sun.
  4. Вроде пофиксил странное поведение лееров у шаттеров и бластдоров.

Summary by Sourcery

Add statues for Cyberiad and Delta stations, a new "royal" siding type, a new water subtype with no fishing, and an alternative water tile. Update the Cyberiad map with content from the original map and replace the "Consul Chamber" with a meeting room.

New Features:

  • Added statues for Cyberiad and Delta stations.
  • Added a new "royal" siding type.
  • Added a new water subtype with no fishing and an alternative water tile.

Summary by Sourcery

Add statues for Cyberiad and Delta stations, add a new "royal" siding type, and add a new water subtype with no fishing and an alternative water tile. Update the Cyberiad map with content from the original map and replace the "Consul Chamber" with a meeting room.

New Features:

  • Add statues for Cyberiad and Delta stations.
  • Add a new "royal" siding type.
  • Add a new water subtype with no fishing and an alternative water tile.

Copy link

sourcery-ai bot commented Jan 14, 2025

Reviewer's Guide by Sourcery

This pull request introduces several improvements and fixes to the Cyberiad station, adds new station statues, a new siding type, and a new water subtype.

Class diagram for new station statue structures

classDiagram
    class obj_structure_statue_station_map {
      +anchored: bool
      +impressiveness: int
      +max_integrity: int
      +Initialize()
      +get_seethrough_map()
      +wrench_act()
      +Destroy()
      +atom_deconstruct()
    }

    class obj_structure_statue_station_map_cyberiad {
      +name: string
      +desc: string
      +icon: string
    }

    class obj_structure_statue_station_map_delta {
      +name: string
      +desc: string
      +icon: string
    }

    obj_structure_statue_station_map <|-- obj_structure_statue_station_map_cyberiad
    obj_structure_statue_station_map <|-- obj_structure_statue_station_map_delta

    note for obj_structure_statue_station_map "Base class for station map statues
with see-through functionality"
    note for obj_structure_statue_station_map_cyberiad "Cyberiad station statue
with multiple segments (nw,n,ne,etc)"
    note for obj_structure_statue_station_map_delta "Delta station statue
with multiple segments (nw,n,ne,etc)"
Loading

Class diagram for new water types

classDiagram
    class turf_open_water {
      +fishing_datum
    }

    class turf_open_water_no_fishing {
      +fishing_datum: null
    }

    class turf_open_water_alternative {
      +desc: string
      +icon: string
      +icon_state: string
      +base_icon_state: string
      +baseturfs
      +immerse_overlay_color: string
    }

    class turf_open_water_alternative_muddy {
      +desc: string
      +icon_state: string
      +base_icon_state: string
      +baseturfs
      +immerse_overlay_color: string
    }

    turf_open_water <|-- turf_open_water_no_fishing
    turf_open_water <|-- turf_open_water_alternative
    turf_open_water_alternative <|-- turf_open_water_alternative_muddy

    note for turf_open_water_no_fishing "Water turf without fishing functionality"
    note for turf_open_water_alternative "Alternative water appearance"
    note for turf_open_water_alternative_muddy "Muddy water variant"
Loading

File-Level Changes

Change Details Files
Added statues for Cyberiad and Delta stations. The statues have a see-through effect when the player is behind or near them.
  • Created new statue objects for Cyberiad and Delta stations.
  • Implemented a see-through effect for the statues using a see-through map.
  • Added descriptions and icons for the statues.
modular_bandastation/objects/code/structures/statues.dm
code/__HELPERS/see_through_maps.dm
Added a new "royal" siding type.
  • Created a new "royal" siding turf decal with gold stripes.
  • Added corner, inner corner, and end variants for the new siding.
modular_bandastation/objects/code/effects/turf_decal.dm
Added a new water subtype with no fishing.
  • Created a new water subtype that disables fishing.
  • Created an alternative water tile with a modified sprite from the Mojave Sun build.
  • Added a muddy variant for the alternative water tile.
modular_bandastation/turfs/code/water.dm
modular_bandastation/turfs/_turfs.dm
modular_bandastation/turfs/_turfs.dme
modular_bandastation/turfs/icons/attributions.txt
Updated the Cyberiad map with content from the original map and replaced the "Consul Chamber" with a meeting room.
  • Added missing content to the Cyberiad map from the original map.
  • Replaced the "Consul Chamber" area with a meeting room.
  • Fixed floating lights and other visual issues.
  • Updated the water tiles on the station to the new no_fishing subtype, except for the park in the ghetto.
_maps/map_files/Cyberiad/Cyberiad.dmm
Ported another siding from Para.
  • Ported an existing siding type from the Para station to Cyberiad.
modular_bandastation/modular_bandastation.dme

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time. You can also use
    this command to specify where the summary should be inserted.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@github-actions github-actions bot added 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. labels Jan 14, 2025
@dj-34 dj-34 marked this pull request as draft January 14, 2025 16:07
@dj-34 dj-34 force-pushed the cyberiad_miscellaneous_things branch from 3c64393 to 6b9f0b6 Compare January 14, 2025 16:13
@dj-34 dj-34 marked this pull request as ready for review January 14, 2025 16:14
@AyIong AyIong merged commit e045a4c into ss220club:master Jan 15, 2025
22 of 24 checks passed
@dj-34 dj-34 deleted the cyberiad_miscellaneous_things branch January 15, 2025 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants