Новая антаг-роль: Терминатор#56
Open
CREAsTIVE wants to merge 16 commits into
Open
Conversation
Contributor
📝 WalkthroughWalkthroughThis pull request introduces a complete Terminator antagonist archetype to the game, featuring: heat-cascade mechanics via ChangesTerminator Antagonist Role Implementation
🎯 3 (Moderate) | ⏱️ ~25 minutes
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
Author
|
Сложно немного по балансу. Он имеет некоторые очень сильные стороны, но как мне кажется они контрятся довольно не плохо. Главным преимуществом человеческой формы является отсутствие нокаута. По сути у него суммарно в 2 раза больше ХП + нет необходимости дышать, но его легко обнаружить за счёт мед. сканера. Во второй фазе он имеет очень мощный взрыв, но за счёт сообщения безопасности имеется минимальная задержка в пару секунд, что позволяет цели среагировать и отбежать, сам терминатор при этом движется чуть медленнее обычного человека. Можно ещё сильне поднёрфить, потому что слабый антаг лучше сильного антага в большинстве случаев, но надо думать |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 10
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
Content.Server/_Maid/Terminator/Roles/TerminatorRoleComponent.cs (1)
1-10:⚠️ Potential issue | 🟠 Major | ⚡ Quick winNormalize line endings to LF to unblock CI.
The current file encoding is failing CI (CRLF check). Please convert this file to LF line endings before merge.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Terminator/Roles/TerminatorRoleComponent.cs` around lines 1 - 10, This file contains CRLF line endings causing CI failure; convert the file to use LF line endings (e.g., change the TerminatorRoleComponent.cs file's line endings to LF using your editor or run a git-normalize step) and re-save/commit so the class/namespace declarations (TerminatorRoleComponent, BaseMindRoleComponent, namespace Content.Server._Maid.Terminator.Roles) remain unchanged but the file uses LF endings; ensure your commit does not include other unrelated changes.
🧹 Nitpick comments (5)
Content.Server/_Maid/Triggers/EntitySystems/AddComponentsOnTriggerSystem.cs (1)
9-9: ⚡ Quick winPrefer the built-in
EntityManagerproperty.Line 9 injects
IEntityManageras a dependency. Most entity systems in this codebase use the inheritedEntityManagerproperty fromEntitySystembase class rather than injectingIEntityManager. While both work, using the inherited property is more idiomatic and consistent.♻️ Proposed refactor
- [Dependency] private IEntityManager _entityManager = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent<AddComponentsOnTriggerComponent, TriggerEvent>(OnAddComponentsTrigger); } private void OnAddComponentsTrigger(EntityUid uid, AddComponentsOnTriggerComponent component, ref TriggerEvent args) { if (!TryComp(uid, out SubdermalImplantComponent? implant) || implant.ImplantedEntity is null) return; - _entityManager.AddComponents(implant.ImplantedEntity.Value, component.Components, component.RemoveExisting); + EntityManager.AddComponents(implant.ImplantedEntity.Value, component.Components, component.RemoveExisting); args.Handled = true; }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Triggers/EntitySystems/AddComponentsOnTriggerSystem.cs` at line 9, The AddComponentsOnTriggerSystem currently injects a private field _entityManager of type IEntityManager; remove the [Dependency] private IEntityManager _entityManager = default! declaration and replace any usage of _entityManager inside AddComponentsOnTriggerSystem with the inherited EntityManager property from the EntitySystem base class (e.g., update methods that call _entityManager.* to call EntityManager.*) so the system uses the built-in EntityManager for idiomatic consistency.Content.Server/_Maid/Triggers/Components/AddComponentsOnTriggerComponent.cs (1)
14-15: ⚡ Quick winRemove redundant initialization of required field.
Line 15 initializes
Componentstonew()even though line 14 marks it asrequired: true. The initialization is redundant and can mask configuration errors if the requirement fails to be enforced.♻️ Proposed fix
[DataField(serverOnly: true, readOnly: true, required: true)] - public ComponentRegistry Components = new(); + public ComponentRegistry Components = default!;🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Triggers/Components/AddComponentsOnTriggerComponent.cs` around lines 14 - 15, The Components field in AddComponentsOnTriggerComponent is marked [DataField(..., required: true)] but is redundantly initialized to new(), which can mask missing configuration; remove the default initialization so the declaration is "public ComponentRegistry Components;" leaving the required DataField attribute in place to ensure configuration must supply it, and keep the field name Components and the AddComponentsOnTriggerComponent type as references when locating the code to change.Content.Server/_Maid/Triggers/Components/PopupOnTriggerComponent.cs (1)
11-12: ⚡ Quick winRemove redundant initialization of required field.
Line 12 marks
Popupasrequired: truebut also initializes it tostring.Empty. The initialization is redundant becauserequired: trueenforces that the field must be provided during serialization. If the requirement fails to be enforced, the empty string masks configuration errors instead of failing clearly.♻️ Proposed fix
[DataField(required: true)] - public string Popup = string.Empty; + public string Popup = default!;🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Triggers/Components/PopupOnTriggerComponent.cs` around lines 11 - 12, The PopupOnTriggerComponent declares the field Popup with [DataField(required: true)] but also initializes it to string.Empty; remove the redundant initialization on the Popup field in the PopupOnTriggerComponent so the required: true enforcement can surface missing configuration errors (i.e., change the declaration to a plain public string Popup; leaving the DataField attribute intact).Content.Server/_Maid/Terminator/Components/HeatOverTimeComponent.cs (1)
15-19: ⚡ Quick winUse consistent property declarations.
Lines 16 and 19 declare
IntervalandNextTickTimeas fields with direct initialization, while other data fields (lines 10, 13, 22, 25, 28, 31) use auto-properties with{ get; set; }. This inconsistency can confuse maintainers and may lead to serialization surprises.♻️ Proposed fix for consistency
- [DataField(customTypeSerializer: typeof(TimespanSerializer))] - public TimeSpan Interval = TimeSpan.FromSeconds(1); + [DataField(customTypeSerializer: typeof(TimespanSerializer))] + public TimeSpan Interval { get; set; } = TimeSpan.FromSeconds(1); [DataField] - public TimeSpan NextTickTime = TimeSpan.Zero; + public TimeSpan NextTickTime { get; set; } = TimeSpan.Zero;🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Terminator/Components/HeatOverTimeComponent.cs` around lines 15 - 19, Change the two public fields Interval and NextTickTime to auto-properties to match the other data fields: replace the field declarations for Interval (currently annotated with [DataField(customTypeSerializer: typeof(TimespanSerializer))]) and NextTickTime (annotated with [DataField]) with public TimeSpan Interval { get; set; } = TimeSpan.FromSeconds(1); and public TimeSpan NextTickTime { get; set; } = TimeSpan.Zero; so serialization and style are consistent with the other properties in HeatOverTimeComponent.Content.Server/_Maid/Triggers/EntitySystems/PopupOnTriggerSystem.cs (1)
18-25: ⚡ Quick winPopupOnTriggerComponent is implant-only but not documented.
The handler at line 20 silently returns if the entity lacks
SubdermalImplantComponentor has noImplantedEntity. The component's XML summary (line 6 inPopupOnTriggerComponent.cs) states it "displays a popup on a target entity when this entity is triggered," which does not mention the implant requirement. This can confuse developers who try to use this component on non-implant entities.📝 Proposed documentation update
Update the summary in
PopupOnTriggerComponent.cs:/// <summary> -/// Displays a popup on a target entity when this entity is triggered. +/// Displays a popup on the implanted entity when this subdermal implant is triggered. /// </summary>🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@Content.Server/_Maid/Triggers/EntitySystems/PopupOnTriggerSystem.cs` around lines 18 - 25, The PopupOnTriggerComponent is effectively implant-only because OnPopupTrigger checks for SubdermalImplantComponent and a non-null ImplantedEntity and returns silently otherwise; update the XML summary/comment for PopupOnTriggerComponent to explicitly state it only works on implanted entities (references: PopupOnTriggerComponent, OnPopupTrigger, SubdermalImplantComponent, ImplantedEntity) so callers know the component requires an implanted host and that the popup is displayed on the implanted target.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Content.Server/_Maid/Terminator/Components/HeatOverTimeComponent.cs`:
- Around line 27-28: Multiplier is left at the default 0f which causes
component.Heat * component.Multiplier to always be zero; set a sensible non-zero
default (e.g., 1f or a documented game-appropriate value) by initializing the
Multiplier property in HeatOverTimeComponent (the Multiplier auto-property) so
that new instances have a usable multiplier; update the [DataField] public float
Multiplier { get; set; } declaration to provide the chosen default value.
In `@Content.Server/_Maid/Terminator/EntitySystems/HeatOverTimeSystem.cs`:
- Around line 38-52: The while loop in HeatOverTimeSystem that processes ticks
until component.NextTickTime is reached is unbounded and can spin many
iterations; add a safe iteration cap (e.g., MAX_TICKS_PER_UPDATE) and limit
processing to at most that many ticks per update, computing the number of ticks
to apply as the smaller of the elapsed intervals and the cap, then apply
heat/fire effects that many times (calling _temperature.ChangeHeat and
_flammable.AdjustFireStacks) and advance component.NextTickTime by Interval *
appliedTicks and increment component.Multiplier by MultiplierIncrease *
appliedTicks so state remains consistent even when we bail early.
In `@Resources/Locale/ru-RU/_Maid/Terminator/terminator.ftl`:
- Line 18: In the terminator.ftl localization string in
Resources/Locale/ru-RU/_Maid/Terminator, replace the incorrect two-word phrase
"так же" with the single-word "также" so the sentence reads "...Вам также
необходимо минимизировать изменения таймлайна..." to use the correct Russian
adverb form; update that specific line in terminator.ftl accordingly.
- Line 23: Replace the current string for terminator-overheat-popup which uses
"внутренности" and "нагреваться" with a robot-appropriate translation; update
the value of terminator-overheat-popup to use "внутренние системы" and the verb
"перегреваться" (e.g., "Ваши внутренние системы начинают перегреваться!") so the
phrasing matches the English "internal systems" and "overheat".
- Line 21: Add a comma before the participle phrase in the string
roles-antag-terminator-objective: change "Убейте цель минимизируя изменения в
таймлайне, от этого зависит будущее." to include a comma before "минимизируя" so
the sentence reads correctly with the participial clause separated.
- Line 7: In the translation string in
Resources/Locale/ru-RU/_Maid/Terminator/terminator.ftl that currently reads
"Устраните цель минимизируя изменения таймлайна.", insert a comma immediately
before the participle phrase starting with "минимизируя" so the sentence reads
correctly in Russian; locate the exact string and add the comma before
"минимизируя" within that entry.
In `@Resources/Prototypes/_Maid/Terminator/implants.yml`:
- Around line 24-26: The YAML for the PopupOnTrigger component includes an
unknown field "target" (target: ImplantedEntity) which is not defined on
PopupOnTriggerComponent (it only has Popup and PopupType); remove the target
line from the PopupOnTrigger entry (keeping popup: terminator-overheat-popup) so
the configuration matches the PopupOnTriggerComponent and relies on the existing
behavior in PopupOnTriggerSystem that targets the implanted entity.
- Around line 17-23: The HeatOverTime entry is missing the Multiplier field
(Multiplier in HeatOverTimeComponent.cs defaults to 0f), so add multiplier: 1 to
the HeatOverTime block in the YAML to ensure the first tick applies heat (see
HeatOverTimeComponent.cs and HeatOverTimeSystem.cs for how Multiplier is used).
- Around line 13-15: The YAML includes an unknown field "target" for the
AddComponentsOnTrigger component; either remove that key from the prototype (so
the fragment only uses the defined fields RemoveExisting and Components) or, if
you intended configurable targeting, add a corresponding property to
AddComponentsOnTriggerComponent and handle it in AddComponentsOnTriggerSystem.
Specifically, for the current behavior (system always targets the implanted
entity), delete the "target: ImplantedEntity" line from the
AddComponentsOnTrigger entry so deserialization/validation matches
AddComponentsOnTriggerComponent (which declares RemoveExisting and Components)
and the system code in AddComponentsOnTriggerSystem.
In `@Resources/Prototypes/_Maid/Terminator/mobs.yml`:
- Around line 24-38: The MobHumanTerminator currently lists "Stun" and
"KnockedDown" in its StatusEffects allowed list which contradicts the human-form
knockout immunity; update the MobHumanTerminator StatusEffects (the "allowed"
array) to remove "Stun" and "KnockedDown" so the human form cannot be stunned or
knocked down, or if the intent is different, add a clarifying comment in the
MobHumanTerminator definition explaining why those statuses remain and adjust
the implementation to match that intent.
---
Outside diff comments:
In `@Content.Server/_Maid/Terminator/Roles/TerminatorRoleComponent.cs`:
- Around line 1-10: This file contains CRLF line endings causing CI failure;
convert the file to use LF line endings (e.g., change the
TerminatorRoleComponent.cs file's line endings to LF using your editor or run a
git-normalize step) and re-save/commit so the class/namespace declarations
(TerminatorRoleComponent, BaseMindRoleComponent, namespace
Content.Server._Maid.Terminator.Roles) remain unchanged but the file uses LF
endings; ensure your commit does not include other unrelated changes.
---
Nitpick comments:
In `@Content.Server/_Maid/Terminator/Components/HeatOverTimeComponent.cs`:
- Around line 15-19: Change the two public fields Interval and NextTickTime to
auto-properties to match the other data fields: replace the field declarations
for Interval (currently annotated with [DataField(customTypeSerializer:
typeof(TimespanSerializer))]) and NextTickTime (annotated with [DataField]) with
public TimeSpan Interval { get; set; } = TimeSpan.FromSeconds(1); and public
TimeSpan NextTickTime { get; set; } = TimeSpan.Zero; so serialization and style
are consistent with the other properties in HeatOverTimeComponent.
In `@Content.Server/_Maid/Triggers/Components/AddComponentsOnTriggerComponent.cs`:
- Around line 14-15: The Components field in AddComponentsOnTriggerComponent is
marked [DataField(..., required: true)] but is redundantly initialized to new(),
which can mask missing configuration; remove the default initialization so the
declaration is "public ComponentRegistry Components;" leaving the required
DataField attribute in place to ensure configuration must supply it, and keep
the field name Components and the AddComponentsOnTriggerComponent type as
references when locating the code to change.
In `@Content.Server/_Maid/Triggers/Components/PopupOnTriggerComponent.cs`:
- Around line 11-12: The PopupOnTriggerComponent declares the field Popup with
[DataField(required: true)] but also initializes it to string.Empty; remove the
redundant initialization on the Popup field in the PopupOnTriggerComponent so
the required: true enforcement can surface missing configuration errors (i.e.,
change the declaration to a plain public string Popup; leaving the DataField
attribute intact).
In `@Content.Server/_Maid/Triggers/EntitySystems/AddComponentsOnTriggerSystem.cs`:
- Line 9: The AddComponentsOnTriggerSystem currently injects a private field
_entityManager of type IEntityManager; remove the [Dependency] private
IEntityManager _entityManager = default! declaration and replace any usage of
_entityManager inside AddComponentsOnTriggerSystem with the inherited
EntityManager property from the EntitySystem base class (e.g., update methods
that call _entityManager.* to call EntityManager.*) so the system uses the
built-in EntityManager for idiomatic consistency.
In `@Content.Server/_Maid/Triggers/EntitySystems/PopupOnTriggerSystem.cs`:
- Around line 18-25: The PopupOnTriggerComponent is effectively implant-only
because OnPopupTrigger checks for SubdermalImplantComponent and a non-null
ImplantedEntity and returns silently otherwise; update the XML summary/comment
for PopupOnTriggerComponent to explicitly state it only works on implanted
entities (references: PopupOnTriggerComponent, OnPopupTrigger,
SubdermalImplantComponent, ImplantedEntity) so callers know the component
requires an implanted host and that the popup is displayed on the implanted
target.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: 19aa7305-3e41-42cd-be2f-813ab334f11f
📒 Files selected for processing (28)
Content.Server/_Maid/Terminator/Components/HeatOverTimeComponent.csContent.Server/_Maid/Terminator/EntitySystems/HeatOverTimeSystem.csContent.Server/_Maid/Terminator/GameTicking/Rules/TerminatorRuleComponent.csContent.Server/_Maid/Terminator/GameTicking/Rules/TerminatorRuleSystem.csContent.Server/_Maid/Terminator/Roles/TerminatorRoleComponent.csContent.Server/_Maid/Triggers/Components/AddComponentsOnTriggerComponent.csContent.Server/_Maid/Triggers/Components/PopupOnTriggerComponent.csContent.Server/_Maid/Triggers/EntitySystems/AddComponentsOnTriggerSystem.csContent.Server/_Maid/Triggers/EntitySystems/PopupOnTriggerSystem.csResources/Locale/en-US/_Maid/Terminator/terminator.ftlResources/Locale/en-US/_Maid/mind/role-types.ftlResources/Locale/en-US/objectives/conditions/terminate.ftlResources/Locale/ru-RU/_Maid/Terminator/terminator.ftlResources/Locale/ru-RU/_Maid/mind/role-types.ftlResources/Locale/ru-RU/_Maid/prototypes/entities/body/terminator.ftlResources/Locale/ru-RU/_Maid/prototypes/objectives/terminator.ftlResources/Locale/ru-RU/objectives/conditions/terminate.ftlResources/Prototypes/GameRules/events.ymlResources/Prototypes/_Maid/Body/Parts/terminator.ymlResources/Prototypes/_Maid/Body/Prototypes/terminator.ymlResources/Prototypes/_Maid/Damage/modifier_sets.ymlResources/Prototypes/_Maid/GameRules/midround.ymlResources/Prototypes/_Maid/Species/terminator.ymlResources/Prototypes/_Maid/Terminator/actions.ymlResources/Prototypes/_Maid/Terminator/implants.ymlResources/Prototypes/_Maid/Terminator/mobs.ymlResources/Prototypes/_Maid/Terminator/objectives.ymlResources/Prototypes/_Maid/Terminator/roles.yml
Contributor
Author
|
Убрал AddComponentsOnTrigger, потому что его добавили в апстриме |
Contributor
Author
|
В целом должно быть готово к мерджу |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Описание
Добавляет новую мид-раунд антаг-роль Терминатор.
Терминатор состоит из двух этапов:
Человеческая форма:
Имеет почти такие же статы, как и у человека, но не имеет состояние нокаута + не получает яды и клеточный урон. Медицинский сканер может легко спалить, что внутри человека находится робот.
Имеет действие "Перегрев", сжигающий кожаную оболочку и вскрывая титановый эндоскелет.
Форма робота, активируется после сжигания или смерти предыдущей формы:
Имеет сильный резист к большинству типов урона и 100 хп, но не имеет рук и возможности носить какую либо экипировку.
Имеет действие "Самоуничтожение", при активации которого взрывается сильным взрывом, способным нанести достаточно серьёзный урон.
При убийстве без триггера "самоуничтожения" происходит слабый взрыв, наносящий минорный урон и только вплотную.
При смерти выпадает "голова терминатора"
Имеет 2 цели: Самоуничтожение и Убийство рандомной цели.
Спрайты уже присутствовали, однако вся логика была вырезана.
Изменения
🆑
Summary by CodeRabbit
New Features