Расширение механики луков и добавление луков для сб#2474
Open
Firemixx wants to merge 41 commits intoAdventureTimeSS14:masterfrom
Open
Расширение механики луков и добавление луков для сб#2474Firemixx wants to merge 41 commits intoAdventureTimeSS14:masterfrom
Firemixx wants to merge 41 commits intoAdventureTimeSS14:masterfrom
Conversation
Contributor
WalkthroughДобавлены системы луков: Shared Suggested labelssize/S 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Tip Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs). 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 |
![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: 11
🤖 Fix all issues with AI agents
In `@Content.Server/ADT/BowsSystem/BowsSystem.cs`:
- Around line 14-27: Add XML summary comments for the BowsSystem class and its
event handler, rename the misspelled method OnShootAttemp to OnShootAttempt and
update the SubscribeLocalEvent call to reference OnShootAttempt so the handler
is wired correctly; inside the handler (method handling ShotAttemptedEvent for
ExpendedBowsComponent) after cancelling/processing the shot set
ExpendedBowsComponent.StepOfTension = 0 to reset tension so the player must
re-tension before next shot, and ensure the method signature matches the
SubscribeLocalEvent delegate (Entity<ExpendedBowsComponent> bow, ref
ShotAttemptedEvent args).
- Around line 1-10: Remove the unused and suspicious using directives at the top
of BowsSystem.cs (notably Microsoft.VisualBasic and the unused namespaces:
System.Diagnostics.CodeAnalysis, Content.Shared.Interaction.Events,
Content.Shared.Projectiles, Content.Shared.Weapons.Ranged.Components,
Content.Shared.Weapons.Ranged.Systems, Robust.Shared.Containers,
Robust.Shared.Utility), leaving only the namespaces actually referenced by the
BowsSystem class (e.g., Content.Shared.ADT.BowsSystem.Components,
Content.Shared.Weapons.Ranged.Events, Robust.Shared.* as required); then sort
the remaining using directives alphabetically to conform to the /ADT/ file
guideline.
In `@Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs`:
- Around line 9-19: The ExpendedBowsComponent has typo'd field names and an
unused field: rename public fields coldownStart -> CooldownStart and coldown ->
Cooldown (or consistently cooldownStart/cooldown if your style prefers
camelCase, but use the project naming convention), update any references to
these symbols (e.g., in BowsSystem / SharedBowsSystem) to the new names, and
remove the unused ItemSlot field entirely (ItemSlot) since ammo container is
taken from ContainerAmmoProviderComponent.Container; leave StepOfTension as-is.
- Around line 1-7: Уберите неиспользуемые директивы using (удалить
Robust.Shared.Prototypes и
Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype),
приведите оставшиеся импорты в алфавитный порядок и добавьте XML-документацию
/// <summary> над объявлением компонента ExpendedBowsComponent (класс
ExpendedBowsComponent) с кратким описанием его назначения; убедитесь, что
атрибуты [RegisterComponent, NetworkedComponent] остаются непосредственно над
объявлением класса.
- Around line 30-37: Rename the misspelled field TensionAnModieferSpeed to
TensionAndModifierSpeed in ExpendedBowsComponent (update the field declaration
and any DataField usage) and update every reference to this field in
SharedBowsSystem.cs (and any other callers) to the new name to keep code
compiling and consistent; ensure you update any serialized/reflective usage
(DataField names or string references) if present so serialization and lookups
continue to work.
In `@Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs`:
- Line 16: The file declares the wrong namespace causing a type conflict: change
the namespace declaration in SharedBowsSystem.cs from
Content.Server.ADT.BowsSystem to Content.Shared.ADT.BowsSystem so the shared
sealed partial class BowsSystem has a distinct FQN; after that, verify the
server-side BowsSystem (in BowsSystem.cs) is not declared as a partial of the
shared class (remove or rename any partial modifier or matching definition) so
the two assemblies no longer declare the same fully-qualified type.
- Around line 58-80: In Update (in the loop over
EntityQueryEnumerator<ExpendedBowsComponent>) replace the early "return" after
the TryComp<WieldableComponent> check with "continue" so a non-wielded entity
skips only that iteration instead of aborting the whole loop; also remove the
magic "3" used in the comp.StepOfTension comparison and instead use a named
constant or derive the max tension from comp.TensionAndLoc (e.g. max index or
Count-1) when deciding whether to increment comp.StepOfTension and show the
_popup.PopupClient, and ensure comp.coldownStart is still set using
_timing.CurTime + comp.coldown.
- Around line 34-50: The early-return condition is inverted: change the
_containerSystem.TryGetContainer check in the block that follows
TryComp<ContainerAmmoProviderComponent>(bow, out var containerComp) to use
negation so the method returns when the container is NOT found (i.e. if
(!_containerSystem.TryGetContainer(..., out var container)) return;) so the
damage-modifying loop runs when a container is found; also extract the
hard-coded "Piercing" string used against proj.Damage.DamageDict into a named
constant (e.g., PiercingDamageType) and use that constant where you read and
write proj.Damage.DamageDict, keeping the multiplication logic that uses
bow.Comp.StepOfTension and ProjectileComponent/proj intact.
- Around line 1-14: Удалите неиспользуемые директивы using (System.Diagnostics,
System.Reflection.Metadata, System.Threading) и уберите инжектированную, но не
используемую зависимость _itemSlotsSystem
(поле/конструктор/[Dependency]-атрибут, связанный с ItemSlotsSystem) из
SharedBowsSystem; после удаления приведение списка using к алфавитному порядку.
Убедитесь, что ссылки на компоненты/методы не ломаются и удаляете только
упомянутые symbols: System.Reflection.Metadata, System.Diagnostics,
System.Threading и поле _itemSlotsSystem.
In `@Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.flt`:
- Around line 1-4: В четырёх записях локали (ключи popup-bow-use-null,
popup-bow-use-light, popup-bow-use-medium, popup-bow-use-hard) допущена
орфографическая ошибка: слово «тетеву» нужно заменить на правильную форму
«тетиву» во всех строках; отредактируй значения соответствующих ключей, оставив
остальной текст без изменений.
- Around line 1-4: The file extension is wrong: rename popups-bows-expended.flt
to popups-bows-expended.ftl and ensure any references to this resource (e.g.,
resource include lists or localization registries that reference
"popups-bows-expended") are updated to the new filename so the engine will load
the Fluent entries like popup-bow-use-null, popup-bow-use-light,
popup-bow-use-medium, and popup-bow-use-hard.
🧹 Nitpick comments (1)
Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs (1)
18-30: Отсутствует/// <summary>документация для класса и методов.Класс
BowsSystemи все его публичные методы (OnShoot,OnUseInHand,Update,EditSpeed) не имеют XML-документации. Также обработчики событий рекомендуется делатьprivate.♻️ Пример добавления документации
+/// <summary> +/// Shared-система луков: управляет натяжением тетивы, модификацией урона и скорости снаряда. +/// </summary> public sealed partial class BowsSystem : EntitySystem { ... - public void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args) + /// <summary> + /// Модифицирует урон снаряда в зависимости от степени натяжения. + /// </summary> + private void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args)As per coding guidelines, предлагается
/// <summary>документация к важным функциям и классам.
Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs
Outdated
Show resolved
Hide resolved
Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs
Outdated
Show resolved
Hide resolved
Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs
Outdated
Show resolved
Hide resolved
Resources/Locale/ru-RU/ADT/bowsexpended/popups-bows-expended.flt
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Fix all issues with AI agents
In `@Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs`:
- Around line 37-39: The field name DamageToModidiering is a typo and the three
fields are not serializable; rename DamageToModidiering to a clear name like
DamageModifierType (or DamageToModifying if preferred) in the
ExpendedBowsComponent and add [DataField("...")] attributes to
DamageModifierType, MaxTension and MinTension so they are exposed to YAML
prototypes (use explicit keys like "damageModifierType", "maxTension",
"minTension"); update any usages of the old field name to the new identifier
throughout the codebase and ensure the default values remain the same.
In `@Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs`:
- Around line 35-48: The loop currently uses "return" when a projectile's
DamageDict lacks the DamageToModidiering key, which prematurely exits the method
and prevents resetting bow.Comp.StepOfTension to bow.Comp.MinTension and stops
processing remaining container.ContainedEntities; change that "return" inside
the foreach (where TryComp<ProjectileComponent> yields proj and you check
proj.Damage.DamageDict.TryGetValue(...)) to "continue" so the loop skips only
the current projectile, allows other projectiles to be processed, and ensures
the final assignment bow.Comp.StepOfTension = bow.Comp.MinTension always runs.
- Around line 80-83: EditSpeed currently indexes TensionAndModieferSpeed
directly which can throw KeyNotFoundException; change it to use
dictionary.TryGetValue with a safe fallback (e.g. multiplier = 1.0f) and then
multiply args.ProjectileSpeed by that multiplier; also apply the same pattern
for the other dictionary access (TensionAndLoc at the other method/line 75) by
TryGetValue and using an appropriate fallback value so missing keys don’t crash
(refer to EditSpeed, TensionAndModieferSpeed, TensionAndLoc, and StepOfTension
to locate the spots).
🧹 Nitpick comments (1)
Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs (1)
15-16: Отсутствует/// <summary>документация для классаBowsSystem.♻️ Предлагаемое исправление
+/// <summary> +/// Система управления механикой натяжения лука: прогрессия натяжения, модификация урона и скорости снаряда. +/// </summary> public sealed partial class BowsSystem : EntitySystemAs per coding guidelines, предлагай
/// summaryдокументацию к важным классам.
Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Fix all issues with AI agents
In `@Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs`:
- Around line 16-21: The field coldownTime cannot be initialized from another
instance field (floatToColdown); change coldownTime into a computed property or
initialize it in the constructor instead. For example, replace the field
coldownTime with a read-only property (e.g., public TimeSpan coldownTime =>
TimeSpan.FromSeconds(floatToColdown)) or assign
TimeSpan.FromSeconds(floatToColdown) inside the class constructor so the value
is computed at runtime rather than in a field initializer; update any callers to
use the new property name if you rename it.
In `@Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs`:
- Around line 51-54: The code references a non-existent/misspelled field
coldownTime on ExpendedBowsComponent; after fixing the component to expose a
valid member (e.g., property CooldownTime), update all usages in
SharedBowsSystem to use that corrected name. Specifically, in the OnUseInHand
method (and the other methods in the same class that read bow.Comp.coldownTime)
replace bow.Comp.coldownTime with bow.Comp.CooldownTime (and ensure casing
matches the new property), leaving bow.Comp.coldownStart assignment logic
intact.
- Around line 31-33: В блоке где используется
TryComp<ContainerAmmoProviderComponent> и затем обращаются к
containerComp.ProviderUid.Value перед вызовом _containerSystem.TryGetContainer —
добавьте проверку на null/HasValue для containerComp.ProviderUid и
выйдите/верните из метода если ProviderUid отсутствует; затем передавайте
гарантированное не-null значение (например через локальную переменную
providerUid) в _containerSystem.TryGetContainer вместо прямого обращения к
.Value, чтобы избежать возможного InvalidOperationException.
🧹 Nitpick comments (1)
Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs (1)
15-15: Отсутствует/// <summary>документация на классе и методах.Класс
BowsSystemи его публичные методы (OnShoot,OnUseInHand,EditSpeed) не имеют XML-документации.
Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs
Outdated
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs`:
- Around line 74-76: In Update, the code references bow.Comp.floatToColdown but
no variable named bow exists; fix by fetching the bow component from the current
entity and using it (e.g., declare a local like var bowComp =
_entManager.GetComponent<BowComponent>(uid) or otherwise get the appropriate
component from wielded) and then replace bow.Comp.floatToColdown with
bowComp.floatToColdown (or the correct field on that retrieved component); keep
the rest of the logic using comp, uid, wielded and _timing unchanged.
🧹 Nitpick comments (1)
Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs (1)
15-15: Отсутствует/// <summary>на классеBowsSystem.Добавьте XML-документацию с описанием назначения системы.
♻️ Исправление
+/// <summary> +/// Shared-система механики луков: управление натяжением тетивы, модификация скорости и урона снарядов. +/// </summary> public sealed partial class BowsSystem : EntitySystemAs per coding guidelines, нужна
/// <summary>документация к важным классам.
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Fix all issues with AI agents
In `@Content.Shared/ADT/BowsSystem/Components/ExpendedBowsComponent.cs`:
- Around line 27-30: The XML doc comment for the field StepOfTension in
ExpendedBowsComponent is unprofessional; replace the current comment
"Aaa.....Step of tension in bow" with a concise, informative summary such as
"Step of tension in the bow" (or more detailed: "Current tension step for the
bow, used to determine draw strength and animation state"), ensure it uses
proper XML <summary> tags and clear English, and keep the field declaration
public int StepOfTension = 0 unchanged.
In `@Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs`:
- Around line 60-62: Замените использование null-forgiving оператора на явную
проверку: возьмите локальную переменную user = wielded.User и, если она null,
безопасно выйдите/пропустите дальнейшую логику (или залогируйте и верните),
иначе используйте эту user в вызовах _popup.PopupClient(...) и
_audio.PlayPvs(...); измените места, где сейчас используется wielded.User!
(вызовы PopupClient и PlayPvs и/или связанные с comp.StepOfTension), чтобы
избежать возможного NullReferenceException.
🧹 Nitpick comments (2)
Content.Shared/ADT/BowsSystem/SharedBowsSystem.cs (2)
17-17: Отсутствует/// <summary>на классеBowsSystem.♻️ Предлагаемое исправление
namespace Content.Shared.ADT.BowsSystem; +/// <summary> +/// Shared-система управления механикой натяжения лука: прогрессия натяжения, кулдаун и модификация скорости снаряда. +/// </summary> public sealed partial class BowsSystem : EntitySystemAs per coding guidelines, к важным классам нужна
/// <summary>документация.
32-35: Методы-обработчики без/// <summary>и безprivateмодификатора.Обработчики событий (
OnShoot,OnUseInHand,EditSpeed) объявлены какpublic, хотя используются только как callback-и внутри класса. Рекомендуется сделать ихprivateи добавить краткую XML-документацию.♻️ Пример
- public void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args) + /// <summary> + /// Сбрасывает натяжение лука после выстрела. + /// </summary> + private void OnShoot(Entity<ExpendedBowsComponent> bow, ref GunShotEvent args) { - bow.Comp.StepOfTension=bow.Comp.MinTension; + bow.Comp.StepOfTension = bow.Comp.MinTension; }As per coding guidelines, к важным функциям нужна
/// <summary>документация.
Contributor
|
RSI Diff Bot; head commit e6a8000 merging into 7352f69 Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_handmade.rsi
Resources/Textures/ADT/Objects/Weapons/Guns/Bow/compound_bow_security.rsi
Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/arrows_custom.rsi
Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi
|
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
|
@coderabbitai resume |
Contributor
✅ Actions performedReviews resumed. |
Contributor
Author
|
@coderabbitai глянь код пожалуйста |
Contributor
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain
🏁 Script executed: Length of output: 10834
🔴 Критическая ошибка
if (wieldedcomp.User is not {} owner)
return; // ← ОШИБКА! Прерывает весь цикл UpdateЕсли у любого лука в мире нет активного пользователя — цикл полностью прерывается, и все следующие луки в энумераторе не обновляются. Нужно: if (wieldedcomp.User is not {} owner)
continue; // ← правильно🟠 Серьёзные проблемы1. Ключевые поля без
|
| Было | Должно быть |
|---|---|
coldownStart |
cooldownStart |
floatToColdown |
cooldownDuration / tensionInterval |
TensionAndModieferSpeed |
TensionAndModifierSpeed |
OnShootAttemp |
OnShootAttempt |
7. Обработчики событий должны быть private
// Было:
public void OnShoot(...) { }
public void OnUseInHand(...) { }
public void EditSpeed(...) { }
// Должно быть:
private void OnShoot(...) { }
private void OnUseInHand(...) { }
private void EditSpeed(...) { }8. Неиспользуемые поля
ItemSlot— объявлен, но нигде не используется в системахDamageToModifying— аналогично
9. Форматирование
// Были пропуски вокруг операторов:
if(bow.Comp.StepOfTension==0)
bow.Comp.StepOfTension=bow.Comp.MinTension;
// Должно быть:
if (bow.Comp.StepOfTension == 0)
bow.Comp.StepOfTension = bow.Comp.MinTension;Итог: Критически важно исправить return → continue и добавить [DataField] на ключевые поля (иначе разные типы луков через YAML не настроить). Остальное — существенно для корректной работы, но менее срочно.
🧠 Learnings used
Learnt from: BitBoxxxer
Repo: AdventureTimeSS14/space_station_ADT PR: 0
File: :0-0
Timestamp: 2024-11-14T19:41:52.431Z
Learning: В этом репозитории автоматические обзоры отключены, и пользователь предпочитает также отключить статусные сообщения от CodeRabbit, установив `reviews.review_status` в `false` в файле `.coderabbit.yaml`.
Learnt from: Schrodinger71
Repo: AdventureTimeSS14/space_station_ADT PR: 0
File: :0-0
Timestamp: 2026-02-24T07:56:31.049Z
Learning: В проекте AdventureTimeSS14/space_station_ADT CodeRabbit не должен approve-ать pull request пока ВСЕ его review комментарии не решены и весь функционал полностью завершён, даже если пользователь явно просит об approve. Пользователь Schrodinger71 указал, что approval должен означать готовность к мёрджу без оговорок.
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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.
Описание PR
Почему / Баланс
Возрождение луков, добавление луков для сб(ну бляха...существует же конская полиция! Может кому и понравится стрелять в преступников из лука в кк...)
В случае, если ваш pull request привязан к запросу из нашего discord сервера, используйте образец, представленный далее.
Ссылка на заказ, предложение или баг-репорт
Часть идей - мои, часть - discord: mateo_xilka(Tedden)
Техническая информация
Добавлен ExpendedBowsComponent и системы связанные с ним
Медиа
Пока что нету
Чейнджлог
❗❗ УДАЛЯЙТЕ КОММЕНТЫ НИЖЕ И ПИШИТЕ no cl, no fun ЕСЛИ НИ ХОТИТЕ ЭТОГО В ЧЕЙНЖЛОГИ ❗❗
❗❗ НЕ МЕРДЖИТЬ ПОКА НЕ УДАЛИТЕ ❗❗
❗❗ ↓↓↓ ВОТ ЭТИ ↓↓↓ ❗❗
❗❗ ↑↑↑ УДАЛЯЙТЕ КОММЕНТЫ ↑↑↑ ❗❗