Skip to content

теперь у таяров в описании 10% стамины а не 25% - #177

Open
kl3n-kl3n wants to merge 1 commit into
ArcaneSS14:masterfrom
kl3n-kl3n:Tajaran-stamina
Open

теперь у таяров в описании 10% стамины а не 25%#177
kl3n-kl3n wants to merge 1 commit into
ArcaneSS14:masterfrom
kl3n-kl3n:Tajaran-stamina

Conversation

@kl3n-kl3n

Copy link
Copy Markdown

Описание PR

В описании у таяров стояло 25%, пришёл я, и героически исправил на 10%

Медиа

Тип PR

  • Feature
  • Fix
  • Tweak
  • Balance
  • Refactor
  • Port
  • Translate
  • Resprite

Лицензионное соглашение

  • Я согласен с лицензионным соглашением Contributor License Agreement, для Arcane SS14 Organization.

Изменения

@kl3n-kl3n

Copy link
Copy Markdown
Author

uwu owo

@coderabbitai

coderabbitai Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: b24b226d-c391-4a93-9070-4d9a1699196c

📥 Commits

Reviewing files that changed from the base of the PR and between 2314e63 and 3711018.

📒 Files selected for processing (1)
  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
📜 Recent review details
⏰ Context from checks skipped due to timeout. (6)
  • GitHub Check: YAML map schema validator
  • GitHub Check: YAML Linter
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Test Packaging
  • GitHub Check: Validate RSIs
🧰 Additional context used
📓 Path-based instructions (5)
Resources/**/*.{yml,ftl,json}

📄 CodeRabbit inference engine (.cursor/rules/ss14-resources.mdc)

Resources/**/*.{yml,ftl,json}: Follow SS14 naming conventions when editing prototype, localization, and resource files
Follow SS14 upstream maintenance practices when editing resource files

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
Resources/**/*.yml

📄 CodeRabbit inference engine (.cursor/rules/ss14-resources.mdc)

Resources/**/*.yml: Follow SS14 ECS prototype patterns and conventions
Follow SS14 graphics generic visualizer appearance conventions and patterns

Resources/**/*.yml: Load ss14-naming-conventions documentation for Resources work
Load ss14-ecs-prototypes documentation for Resources work
Load ss14-upstream-maintenance documentation for Resources work
Load ss14-prototypes-locale documentation for Resources work
Load ss14-localization-strings documentation for Resources work
Load ss14-sprite-overlays-shaders documentation when working with RSI metadata, textures, sprite layers, overlays, or shader resources
Validate YAML after edits

Run dotnet run --project Content.YAMLLinter/Content.YAMLLinter.csproj -c DebugOpt to validate YAML and resource edits.

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
Resources/**/*.{yml,ftl}

📄 CodeRabbit inference engine (.cursor/rules/ss14-resources.mdc)

Follow SS14 prototype locale integration rules and practices

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
**/*.{cs,xaml,yml,yaml}

📄 CodeRabbit inference engine (AGENTS.md)

If the task adds tests or you need to choose the right test layer, load skill ss14-tests-authoring.

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
Resources/Prototypes/**/*.yml

📄 CodeRabbit inference engine (AGENTS.md)

Resources/Prototypes/**/*.yml: Put prototypes under the most specific existing subtree in Resources/Prototypes/. If you introduce a new prototype parent tree, put parent prototypes in base.yml and variants in sibling files.
Keep entity prototype field order as type, abstract, parent, id, categories, name, suffix, description, components. Do not insert blank lines between - type: entries inside a components: list. Separate prototype blocks with one blank line.
Prefer suffix for spawn-menu distinctions instead of changing prototype name.

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml

⚙️ CodeRabbit configuration file

Resources/Prototypes/**/*.yml: Review SS14 prototypes carefully:

  • Use the narrowest existing subtree and avoid duplicating nearby prototype files or parent trees.
  • Keep entity field order as: type, abstract, parent, id, categories, name, suffix, description, components.
  • Prefer base.yml for parent trees and sibling files for variants.
  • Do not add blank lines inside components lists.
  • Call out broken inheritance, risky prototype ID changes, missing paired locale updates, and Appearance / GenericVisualizer mismatches.

Files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
🧠 Learnings (4)
📚 Learning: 2026-06-29T05:34:31.137Z
Learnt from: Alazell
Repo: ArcaneSS14/arcane-station PR: 99
File: Resources/Prototypes/Entities/Clothing/Belt/belts.yml:973-974
Timestamp: 2026-06-29T05:34:31.137Z
Learning: В SS14 YAML-прототипах для компонента `Storage` поле `grid` задаёт **включительные** координаты прямоугольника. При подсчёте вместимости учитывайте оффсет-инклюзивность: прямоугольник `x1,y1,x2,y2` означает размеры `width = (x2 - x1 + 1)` и `height = (y2 - y1 + 1)`, а число ячеек `width * height`. Например, `0,0,0,0` = 1 ячейка, а `0,0,6,2` = (6-0+1)*(2-0+1)=7*3=21. При ревью файлов наподобие `Resources/Prototypes/Entities/Clothing/Belt/belts.yml` не интерпретируйте `x2/y2` как эксклюзивные (чтобы не ошибиться на 1 в ширине/высоте).

Applied to files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
📚 Learning: 2026-07-29T08:12:37.068Z
Learnt from: UmbiMax
Repo: ArcaneSS14/arcane PR: 153
File: Resources/Prototypes/_Orion/Entities/Objects/Tools/energy_dome.yml:137-137
Timestamp: 2026-07-29T08:12:37.068Z
Learning: In ArcaneSS14 prototype YAMLs, the YAML field that disables synchronization for `Content.Shared.Power.Components.BatteryComponent` is spelled exactly `netsync` (all lowercase), not `netSync`. For prototypes derived from `PowerNetworkBattery` (including `BaseAPC`, `CoreSubstation`, `BaseSMES`, `TeslaCoil`), set `netsync: false`; otherwise `Content.Server.Power.EntitySystems.BatterySystem.OnStartup` can throw `DebugAssertException` for a predicted battery connected to a power net. For `Resources/Prototypes/_Orion/Entities/Objects/Tools/energy_dome.yml`, ensure `EnergyDomeWiredTest` uses `netsync: false`.

Applied to files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
📚 Learning: 2026-07-07T17:55:50.395Z
Learnt from: UmbiMax
Repo: ArcaneSS14/arcane-old PR: 101
File: Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs:192-194
Timestamp: 2026-07-07T17:55:50.395Z
Learning: When reviewing ArcaneSS14/arcane-old changes related to `MobState` thresholds/visuals/actions, treat the `Critical` enum value as requiring explicit mappings (it no longer implicitly behaves as an alias of `SoftCritical`). If any YAML prototype `thresholds:` (for `MobThresholdsComponent.Thresholds`) uses the bare `Critical` key (e.g., `MobThresholdsComponent.Thresholds: { Critical: ... }` for entities like `MobMouseCancer`), ensure the prototype (or referenced config) provides corresponding explicit `StateAlertDict` entries and any required `MobStateActions.actions` and `DamageStateVisuals.states` mappings for `Critical`. Otherwise, review should expect failures because the default `StateAlertDict` in `MobThresholdsComponent.cs` typically maps only `Alive`, `SoftCritical`, `HardCritical`, and `Dead`—not `Critical`.

Applied to files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
📚 Learning: 2026-07-28T15:44:38.498Z
Learnt from: UmbiMax
Repo: ArcaneSS14/arcane PR: 152
File: Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml:69-72
Timestamp: 2026-07-28T15:44:38.498Z
Learning: В ArcaneSS14/arcane не выполняйте форматирующие перестановки полей (в т.ч. изменение порядка полей) в upstream-файлах: делайте это только если правка добавляет Arcane-специфичную сущность или напрямую требуется для функциональности. Иначе сохраняйте upstream-порядок полей, даже если он противоречит локальным рекомендациям, чтобы не создавать лишние diff и конфликты при upstream-синхронизации. Исключение: допустимо переупорядочивание/форматирование в `Resources/Prototypes/_Arcane` (и только там).

Applied to files:

  • Resources/Prototypes/_Goobstation/Species/tajaran.yml
🔇 Additional comments (1)
Resources/Prototypes/_Goobstation/Species/tajaran.yml (1)

27-27: 📐 Maintainability & Code Quality

Проверьте YAML перед слиянием.

После изменения ресурса запустите:

dotnet run --project Content.YAMLLinter/Content.YAMLLinter.csproj -c DebugOpt

Проверьте успешное завершение проверки.


Главное изменение

  • Штраф к выносливости вида Tajaran уменьшен с 25% до 10% относительно человека.
  • Изменение исправляет описание вида.

Resources / localization

  • Изменён прототип Resources/Prototypes/_Goobstation/Species/tajaran.yml.
  • Идентификаторы прототипов и расположение файлов не изменены.
  • Отдельные локализационные файлы не затронуты.

Validation / risk

  • Изменение ограничено одним ресурсным значением.
  • Prediction, networking и engine-side код не затронуты.
  • Runtime-проверки и тесты не требуются для этого изменения.

Walkthrough

Штраф к выносливости вида Tajaran уменьшен с 25% до 10% относительно человека.

Changes

Параметры вида Tajaran

Layer / File(s) Summary
Штраф к выносливости
Resources/Prototypes/_Goobstation/Species/tajaran.yml
Штраф к выносливости Tajaran изменён с 25% до 10%.

Estimated code review effort: 1 (Минимальный) | ~2 минуты

Suggested reviewers: puroslavking, notactuallymarty, vecortys

🚥 Pre-merge checks | ✅ 4
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed Заголовок точно описывает основное изменение: значение выносливости в описании вида Tajaran изменено с 25% на 10%.
Description check ✅ Passed Описание связано с изменением и указывает причину исправления значения выносливости для вида Tajaran.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@ReWAFFlution ReWAFFlution left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Чат, это правда?

@UmbiMax

UmbiMax commented Aug 5, 2026

Copy link
Copy Markdown
Collaborator

@coderabbitai Это описание реально меняет характеристики? Если нет, то можешь сравнить описание с реальными характеристиками?

@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '=== Tajaran prototype files ==='
fd -i 'tajaran\.ya?ml$' . -t f

echo '=== Changed prototype context ==='
sed -n '1,260p' Resources/Prototypes/_Goobstation/Species/tajaran.yml

echo '=== Tajaran references with surrounding context ==='
rg -n -i -C 4 '\bTajaran\b|tajaran' \
  Resources Content Server Shared --glob '!**/obj/**' 2>/dev/null || true

echo '=== Stamina-related definitions and modifiers ==='
rg -n -i -C 4 'stamina|Stamina|staminaDamage|StaminaDamage|StaminaModifier|staminaModifier' \
  Resources Content Server Shared --glob '!**/obj/**' 2>/dev/null || true

Length of output: 201144


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '=== PR diff ==='
git diff HEAD^ HEAD -- Resources/Prototypes/_Goobstation/Species/tajaran.yml

echo '=== Species-description prototype ==='
nl -ba Resources/Prototypes/_Goobstation/Species/tajaran.yml | sed -n '1,220p'

echo '=== Tajaran gameplay prototype ==='
nl -ba Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml | sed -n '1,180p'

echo '=== Human gameplay prototype ==='
nl -ba Resources/Prototypes/Entities/Mobs/Species/human.yml | sed -n '1,100p'

echo '=== Exact Tajaran and stamina modifier declarations ==='
rg -n -i -C 3 'id:\s*(Tajaran|Human)\b|species:\s*Tajaran\b|baseCritThreshold:|damageCoefficient:|StaminaResistance|StaminaModifier|staminaDrainRate:' \
  Resources/Prototypes/_Goobstation/Species \
  Resources/Prototypes/_Goobstation/Entities/Mobs/Species \
  Resources/Prototypes/Entities/Mobs/Species \
  Content.Shared Content.Server Content.Client 2>/dev/null || true

Length of output: 1936


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '=== Tajaran gameplay prototype ==='
sed -n '1,180p' Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml

echo '=== Human gameplay prototype ==='
sed -n '1,100p' Resources/Prototypes/Entities/Mobs/Species/human.yml

echo '=== Stamina component declarations ==='
fd -i 'StaminaComponent.cs' Content -t f -x sh -c '
  echo "=== $1 ==="
  sed -n "1,220p" "$1"
' sh {}

echo '=== Tajaran stamina-specific declarations ==='
rg -n -i -C 4 'Tajaran|baseCritThreshold|StaminaResistance|StaminaModifier|staminaDrainRate' \
  Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml \
  Resources/Prototypes/_Goobstation/Species/tajaran.yml \
  Content.Shared Content.Server 2>/dev/null || true

Length of output: 7347


🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '=== Locate StaminaComponent ==='
fd -i 'StaminaComponent\.cs$' . -t f

echo '=== Stamina component defaults ==='
fd -i 'StaminaComponent\.cs$' . -t f -x sh -c '
  echo "=== $1 ==="
  sed -n "1,260p" "$1"
' sh {}

echo '=== Base mob stamina declaration ==='
rg -n -C 5 'type:\s*Stamina\b|baseCritThreshold:' Resources/Prototypes/Entities/Mobs/base.yml \
  Resources/Prototypes/Entities/Mobs/Species/human.yml \
  Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml

Length of output: 10411


@UmbiMax Да. PR меняет только описание. Игровые характеристики он не меняет.

Фактическая настройка находится в Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml:

- type: Stamina
  baseCritThreshold: 75

У человека значение не переопределено. StaminaComponent.BaseCritThreshold по умолчанию равно 100f.

Итог:

Вид Порог stamina critical Разница
Человек 100
Tajaran 75 на 25% меньше

Следовательно, прежнее описание «Стамина меньше на 25%, чем у человека» соответствует текущей механике. Новое описание про 10% не соответствует фактическому значению.

You are interacting with an AI system.

@kl3n-kl3n

kl3n-kl3n commented Aug 5, 2026

Copy link
Copy Markdown
Author

Чёт я не внимательно прочитал члог от шведа(https://discord.com/channels/1500050446444658711/1500549914600538184/1531345063559303248), только щас увидел что те три патча с балансом будут залиты ток когда все три будут готовы. Тогда если швед не против, я могу попробовать это сделать, ибо еще 8 дней назад он был написан

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants