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.

Sign up for GitHub

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

Some fixes & addons #299

Merged
merged 12 commits into from
Oct 25, 2024
Merged

Some fixes & addons #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e0f274
Some fixes& addons
MegaDaimond Oct 24, 2024
7ecbc6c
Merge branch 'master' into Fixes-and-so-on
MegaDaimond Oct 24, 2024
bd69f12
1
MegaDaimond Oct 24, 2024
1cc21d8
Merge branch 'master' into Fixes-and-so-on
MegaDaimond Oct 24, 2024
66c3df2
2?
MegaDaimond Oct 24, 2024
9f71107
Merge branch 'Fixes-and-so-on' of https://github.com/MegaDaimond/Lost…
MegaDaimond Oct 24, 2024
5ce257a
Update lathe.yml
MegaDaimond Oct 24, 2024
2ee9a11
Revert "Update lathe.yml"
MegaDaimond Oct 24, 2024
35486fc
Update security.yml
MegaDaimond Oct 24, 2024
fa7411c
Update lathe.yml
MegaDaimond Oct 25, 2024
91a0191
Update lathe.yml
MegaDaimond Oct 25, 2024
b81f502
Merge branch 'master' into Fixes-and-so-on
BL02DL Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/Jukebox/Jaya-MalinoviePalmi.ogg
View file
Open in desktop
Binary file not shown.
16 changes: 11 additions & 5 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Slash: 17 #cmon, it has to be at least BETTER than the rest.
heavyRateModifier: 0.8
heavyRangeModifier: 1
heavyDamageBaseModifier: 1
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 5
maxTargets: 7
angle: 80
Expand Down Expand Up @@ -48,18 +48,24 @@
- type: Sprite
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV
state: icon
- type: Clothing
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV and LPP!
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Обнаружена проблема с отсутствующим спрайтом

Спрайт DeltaV/Objects/Weapons/Melee/katana.rsi не найден в репозитории. Необходимо убедиться, что:

  • Спрайт существует в правильном месте
  • Путь к спрайту указан корректно
  • Все необходимые ресурсы были добавлены в репозиторий
🔗 Analysis chain

Проверьте использование пути DeltaV

Убедитесь, что использование пути DeltaV в спрайте соответствует структуре проекта Lost Paradise.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if DeltaV path exists and is correct
fd -t f "katana.rsi$" "DeltaV"

Length of output: 124

Script:

#!/bin/bash
# Let's first check all possible locations of katana.rsi files
fd -t f "katana.rsi$"

# Also check for any DeltaV references in yml files
rg "DeltaV" -t yaml

Length of output: 212176

Script:

#!/bin/bash
# Let's check if the sprite exists in the correct location
fd -t f "katana.rsi$" Resources

# Also check for any references to this specific sprite path
rg "DeltaV/Objects/Weapons/Melee/katana.rsi" -g "!*.yml"

Length of output: 90

🧰 Tools
🪛 yamllint

[warning] 52-52: too few spaces before comment

(comments)

[warning] 52-52: missing starting space in comment

(comments)

slots:
- Back
- Belt
- Suitstorage
Comment on lines +51 to +56
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Исправьте стиль комментария и проверьте конфликты слотов

  1. Комментарий "#DeltaV and LPP!" следует переписать в соответствии с правилами (только английский).
  2. Добавление слота Suitstorage отличается от energy katana - необходимо убедиться, что это намеренное различие.
  - type: Clothing
-   sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV and LPP!
+   sprite: DeltaV/Objects/Weapons/Melee/katana.rsi # From DeltaV
    slots:
    - Back
    - Belt
    - Suitstorage
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- type: Clothing
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV and LPP!
slots:
- Back
- Belt
- Suitstorage
- type: Clothing
sprite: DeltaV/Objects/Weapons/Melee/katana.rsi # From DeltaV
slots:
- Back
- Belt
- Suitstorage
🧰 Tools
🪛 yamllint

[warning] 52-52: too few spaces before comment

(comments)

[warning] 52-52: missing starting space in comment

(comments)

[error] 54-54: wrong indentation: expected 6 but found 4

(indentation)

- type: MeleeWeapon
wideAnimationRotation: -135
attackRate: 1.5
soundHit:
path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg
damage:
types:
Slash: 12
heavyRateModifier: 0.5
Slash: 14
heavyRateModifier: 0.75
heavyRangeModifier: 2.75 #Superior Japanese folded steel
heavyDamageBaseModifier: 1.25
heavyStaminaCost: 15
heavyDamageBaseModifier: 1.3
heavyStaminaCost: 10
maxTargets: 1
angle: 20
- type: Item
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,16 @@
- LPPCartridgeAntiMaterielCP
- LPPCartridgeAntiMaterielNL
- LPPWeaponGoliathSniper
- LPPMagazineM4A1Practice
- LPPMagazinePistolPF20Lethal
- LPPMagazinePistolPF20Practice
- LPPCartridgePracticeM4A1
- LPPCartridgeM4A1Lethal
- LPPMagazineRifleM4A1Lethal
- LPPMagazineBoxM4A1Lethal
- LPPMagazineBoxM4A1BigPractice
- LPPMagazineBoxM4A1Practice
- LPPMagazineBoxM4A1BigLethal
# End of modified code
dynamicRecipes:
- LPPSpaceForgeCircuitBoardCMDAndSec
Expand Down Expand Up @@ -863,6 +873,16 @@
#LPP
- LPPMagazineBoxMinigunPractice
- LPPMagazineBoxMinigunRubber
- LPPMagazinePistolPF20Rubber
- LPPMagazinePistolPF20Uranium
- LPPMagazinePistolPF20Incendiary
- LPPMagazineM4A1Rubber
- LPPMagazineM4A1Uranium
Comment on lines +876 to +880
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Правильное добавление вариантов боеприпасов!

Варианты магазинов для PF20 и M4A1 корректно добавлены в секцию dynamicRecipes. Хорошо, что включены различные типы боеприпасов, включая нелетальные варианты.

Рекомендуется добавить комментарии к каждому типу боеприпасов, описывающие их предназначение и эффекты.

- LPPMagazineBoxM4A1Rubber
- LPPMagazineBoxM4A1Uranium
- LPPMagazineBoxM4A1Incendiary
- LPPCartridgeIncendiaryM4A1
- LPPCartridgeUraniumM4A1
# End of modified code
- type: MaterialStorage
whitelist:
Expand Down
19 changes: 0 additions & 19 deletions Resources/Prototypes/Objectives/goals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
- type: stationGoal
id: BureaucraticError

- type: stationGoal
id: Combat

- type: stationGoal
id: Labor

- type: stationGoal
id: Lectures

- type: stationGoal
id: Museum

Expand Down Expand Up @@ -48,13 +39,10 @@
StationGoalPower: 1
StationGoalStation: 1


- type: weightedRandom
id: StationGoalDepartment
weights:
StationGoalScience: 1
StationGoalSecurity: 1


- type: weightedRandom
id: StationGoalPower
Expand All @@ -69,18 +57,11 @@
Artifacts: 1
Xeno: 1

- type: weightedRandom
id: StationGoalSecurity
weights:
Combat: 1

- type: weightedRandom
id: StationGoalStation
weights:
Area: 1
BureaucraticError: 1
Labor: 1
Lectures: 1
Museum: 1
Shuttle: 1
Storage: 1
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Research/arsenal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
# DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree
- CartridgeSpecialIncendiary
- MagazineBoxSpecialIncendiary
#LPP
- LPPMagazinePistolPF20Incendiary
- LPPMagazineBoxM4A1Incendiary
- LPPCartridgeIncendiaryM4A1
# End of modified code

- type: technology
Expand Down Expand Up @@ -72,8 +76,12 @@
# DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree
- CartridgeSpecialRubber
- MagazineBoxSpecialRubber
#LPP
- LPPMagazineBoxMinigunPractice
- LPPMagazineBoxMinigunRubber
- LPPMagazineBoxM4A1Rubber
- LPPMagazinePistolPF20Rubber
- LPPMagazineM4A1Rubber
# End of modified code

- type: technology
Expand All @@ -98,6 +106,11 @@
# DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
- CartridgeSpecialUranium
- MagazineBoxSpecialUranium
#LPP
- LPPMagazinePistolPF20Uranium
- LPPMagazineBoxM4A1Uranium
- LPPCartridgeUraniumM4A1
- LPPMagazineM4A1Uranium
# End of modified code

- type: technology
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_LostParadise/Catalog/jukebox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
name: Pivo Dance - BL02DL
path:
path: /Audio/Jukebox/PivoDance.ogg

- type: jukebox
id: LPPJaya
name: Malinovie Palmi - Jaya
path:
path: /Audio/Jukebox/Jaya-MalinoviePalmi.ogg
2 changes: 1 addition & 1 deletion ...totypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/LPPMags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
color: "#dbdbdb"

- type: entity
id: LPPagazineRifleM4A1Uranium
id: LPPMagazineRifleM4A1Uranium
name: Magazine (calibre 5,56x45 uranium)
parent: LPPBaseMagazineRifle
components:
Expand Down
2 changes: 2 additions & 0 deletions ...ces/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Launchers/blueshield_laser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@
- type: Battery
maxCharge: 3500
startingCharge: 3500
- type: UseDelay
delay: 0
2 changes: 2 additions & 0 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/PF20Pistol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
- type: ChamberMagazineAmmoProvider
soundRack:
path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg
- type: UseDelay
delay: 0
- type: ItemSlots
slots:
gun_magazine:
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

- type: entity
name: desert eagle
parent: WeaponPistolUniversal
Expand Down Expand Up @@ -60,6 +59,8 @@
whitelist:
tags:
- CartridgeSpecial
- type: UseDelay
delay: 0
- type: ContainerContainer
containers:
gun_magazine: !type:ContainerSlot
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
- type: Clothing
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
quickEquip: false
slots:
- Belt
Comment on lines +102 to +104
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Рекомендуется рефакторинг для уменьшения дублирования

Конфигурации quickEquip: false и slots: - Belt дублируются в нескольких сущностях. Рекомендуется создать базовую сущность с этими общими параметрами.

Предлагаемое решение:

- type: entity
  name: LPPBaseWeaponBeltRevolver
  parent: LPPBaseWeaponLeverSniper
  id: LPPBaseWeaponBeltRevolver
  abstract: true
  components:
  - type: Clothing
    quickEquip: false
    slots:
    - Belt

Затем обновить наследование для scarlet lawyer и Judge:

- parent: LPPBaseWeaponLeverSniper
+ parent: LPPBaseWeaponBeltRevolver

Also applies to: 123-125, 159-161, 180-182

🧰 Tools
🪛 yamllint

[error] 104-104: wrong indentation: expected 6 but found 4

(indentation)

- type: BallisticAmmoProvider
whitelist:
tags:
Expand All @@ -117,6 +120,9 @@
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
- type: Clothing
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi
quickEquip: false
slots:
- Belt
- type: BallisticAmmoProvider
whitelist:
tags:
Expand Down Expand Up @@ -150,6 +156,9 @@
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
- type: Clothing
Comment on lines 156 to 157
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Рекомендация по улучшению описания

  1. Описания для обеих версий Judge идентичны, хотя они имеют разное поведение (летальное/нелетальное)
  2. Информация об отдаче должна быть реализована через игровую механику, а не только в описании

Рекомендуется:

  1. Уточнить описания для каждой версии
  2. Проверить реализацию механики отдачи через компонент Gun

Also applies to: 177-178

sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
quickEquip: false
slots:
- Belt
- type: BallisticAmmoProvider
whitelist:
tags:
Expand All @@ -168,6 +177,9 @@
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
- type: Clothing
sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi
quickEquip: false
slots:
- Belt
- type: BallisticAmmoProvider
whitelist:
tags:
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
- type: DisarmMalus
malus: 0.225
- type: ThrowingAngle
angle: 1
angle: 350
- type: MeleeChemicalInjector
solution: melee
- type: RefillableSolution
Expand All @@ -93,3 +93,4 @@
solution: melee
- type: SolutionTransfer
maxTransferAmount: 3
- type: Sharp
76 changes: 71 additions & 5 deletions Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,31 +150,31 @@
category: Ammo
completetime: 5
materials:
Plastic: 1950
Plastic: 2000

- type: latheRecipe
id: LPPMagazineBoxAntiMaterielCP
result: LPPMagazineBoxAntiMaterielCocnterePiercing
category: Ammo
completetime: 5
materials:
Steel: 2500
Steel: 3000

- type: latheRecipe
id: LPPCartridgeAntiMaterielNL
result: LPPCartridgeAntiMaterielNonLethal
category: Ammo
completetime: 1
materials:
Plastic: 500
Plastic: 200

- type: latheRecipe
id: LPPCartridgeAntiMaterielCP
result: LPPCartridgeAntiMaterielCP
category: Ammo
completetime: 1
materials:
Steel: 1200
Steel: 300
Comment on lines +153 to +177
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

На основе анализа рецептов боеприпасов в кодовой базе, я могу сделать окончательный вывод:

Изменения стоимости материалов для AntiMateriel боеприпасов несбалансированы

Сравнение с другими боеприпасами показывает, что новые затраты материалов непропорционально высоки:

  • Коробка AntiMateriel NL требует 2000 пластика, в то время как другие коробки боеприпасов требуют 600-1250
  • Коробка AntiMateriel CP требует 3000 стали, что в 2-3 раза больше чем другие коробки боеприпасов (950-1800)
  • Отдельные патроны также имеют завышенную стоимость материалов

Рекомендуется уменьшить требования материалов до уровня, сопоставимого с другими боеприпасами высокого калибра:

  • Коробка NL: ~1200-1500 пластика
  • Коробка CP: ~1500-2000 стали
  • Отдельные патроны: 100-150 единиц материала
🔗 Analysis chain

Проверьте баланс измененных рецептов

Значительные изменения в количестве материалов:

  • AntiMateriel NonLethal: увеличение пластика до 2000
  • AntiMateriel CP: увеличение стали до 3000
  • Уменьшение требований для отдельных патронов

Необходимо подтвердить, что эти изменения не нарушают игровой баланс.

Let me search for similar ammunition recipes to compare material costs.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for balance-related comments or similar recipes
rg -i "balance|material.*requirement" --type yaml

Length of output: 12954

Script:

#!/bin/bash
# Search for ammunition lathe recipes to compare material costs
rg -B2 -A4 "category: Ammo" --type yaml Resources/Prototypes/

Length of output: 48783


- type: latheRecipe
id: LPPWeaponGoliathSniper
Expand All @@ -183,4 +183,70 @@
materials:
Plastic: 2000
Steel: 10000
Glass: 2500
Glass: 2500

- type: latheRecipe
id: LPPMagazinePistolPF20Lethal
result: LPPMagazinePistolPF20lethal
category: Ammo
completetime: 5
materials:
Steel: 550

- type: latheRecipe
id: LPPMagazinePistolPF20Practice
result: LPPMagazinePistolPF20Practice
category: Ammo
completetime: 5
materials:
Steel: 350

- type: latheRecipe
id: LPPMagazinePistolPF20Rubber
result: LPPMagazinePistolPF20Rubber
category: Ammo
completetime: 5
materials:
Plastic: 400

- type: latheRecipe
id: LPPMagazinePistolPF20Uranium
result: LPPMagazinePistolPF20Uranium
category: Ammo
completetime: 5
materials:
Plastic: 450
Uranium: 75

- type: latheRecipe
id: LPPMagazinePistolPF20Incendiary
result: LPPMagazinePistolPF20Incendiary
category: Ammo
completetime: 5
materials:
Plastic: 550
Comment on lines +188 to +228
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Исправьте опечатку в идентификаторе результата

В рецепте LPPMagazinePistolPF20Lethal обнаружено несоответствие в написании:

  • ID рецепта использует Lethal
  • ID результата использует lethal (строчная буква)

Необходимо исправить для соблюдения единообразия:

  id: LPPMagazinePistolPF20Lethal
- result: LPPMagazinePistolPF20lethal
+ result: LPPMagazinePistolPF20Lethal
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- type: latheRecipe
id: LPPMagazinePistolPF20Lethal
result: LPPMagazinePistolPF20lethal
category: Ammo
completetime: 5
materials:
Steel: 550
- type: latheRecipe
id: LPPMagazinePistolPF20Practice
result: LPPMagazinePistolPF20Practice
category: Ammo
completetime: 5
materials:
Steel: 350
- type: latheRecipe
id: LPPMagazinePistolPF20Rubber
result: LPPMagazinePistolPF20Rubber
category: Ammo
completetime: 5
materials:
Plastic: 400
- type: latheRecipe
id: LPPMagazinePistolPF20Uranium
result: LPPMagazinePistolPF20Uranium
category: Ammo
completetime: 5
materials:
Plastic: 450
Uranium: 75
- type: latheRecipe
id: LPPMagazinePistolPF20Incendiary
result: LPPMagazinePistolPF20Incendiary
category: Ammo
completetime: 5
materials:
Plastic: 550
- type: latheRecipe
id: LPPMagazinePistolPF20Lethal
result: LPPMagazinePistolPF20Lethal
category: Ammo
completetime: 5
materials:
Steel: 550
- type: latheRecipe
id: LPPMagazinePistolPF20Practice
result: LPPMagazinePistolPF20Practice
category: Ammo
completetime: 5
materials:
Steel: 350
- type: latheRecipe
id: LPPMagazinePistolPF20Rubber
result: LPPMagazinePistolPF20Rubber
category: Ammo
completetime: 5
materials:
Plastic: 400
- type: latheRecipe
id: LPPMagazinePistolPF20Uranium
result: LPPMagazinePistolPF20Uranium
category: Ammo
completetime: 5
materials:
Plastic: 450
Uranium: 75
- type: latheRecipe
id: LPPMagazinePistolPF20Incendiary
result: LPPMagazinePistolPF20Incendiary
category: Ammo
completetime: 5
materials:
Plastic: 550
🧰 Tools
🪛 yamllint

[error] 194-194: wrong indentation: expected 4 but found 3

(indentation)

[error] 202-202: wrong indentation: expected 4 but found 3

(indentation)

[error] 210-210: wrong indentation: expected 4 but found 3

(indentation)

[error] 218-218: wrong indentation: expected 4 but found 3

(indentation)

[error] 227-227: wrong indentation: expected 4 but found 3

(indentation)


- type: latheRecipe
id: LPPMagazineM4A1Practice
result: LPPMagazineRifleM4A1Practice
category: Ammo
completetime: 5
materials:
Steel: 300

- type: latheRecipe
id: LPPMagazineM4A1Rubber
result: LPPMagazineRifleM4A1Rubber
category: Ammo
completetime: 5
materials:
Plastic: 475

- type: latheRecipe
id: LPPMagazineM4A1Uranium
result: LPPMagazineRifleM4A1Uranium
category: Ammo
completetime: 5
materials:
Steel: 300
Uranium: 50
Binary file added Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...urces/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-SUITSTORAGE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson.",
"copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson equipped sprites by MegaDaimond.",
"size": {
"x": 32,
"y": 32
Expand All @@ -17,6 +17,18 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
Comment on lines +20 to +31
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Обнаружено несоответствие в спрайтах экипировки!

В файле meta.json указано, что каждое состояние экипировки ("equipped-BACKPACK", "equipped-SUITSTORAGE", "equipped-BELT") должно иметь по 4 направления (directions: 4), однако в директории присутствует только по одному спрайту для каждого состояния:

  • equipped-BACKPACK.png
  • equipped-SUITSTORAGE.png
  • equipped-BELT.png

Необходимо добавить отдельные спрайты для каждого направления (с суффиксами -0, -1, -2, -3) или исправить количество направлений в meta.json на 1, если предполагается использование только одного спрайта.

🔗 Analysis chain

Новые состояния экипировки добавлены корректно!

Добавленные состояния соответствуют новой функциональности ношения катаны в различных слотах. Все состояния правильно определены с 4 направлениями.

Давайте проверим наличие соответствующих спрайтов:

Let me try a different approach to verify the sprite files:

This will help us see all files in the RSI directory and verify if the sprite files exist for the new states.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверяем наличие файлов спрайтов для новых состояний
for state in "equipped-BACKPACK" "equipped-SUITSTORAGE" "equipped-BELT"; do
  for dir in {0..3}; do
    rg -l "${state}-${dir}.png" "Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/"
  done
done

Length of output: 1561

Script:

#!/bin/bash
# Проверяем содержимое директории RSI на наличие спрайтов
ls -la Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/

Length of output: 630

Comment on lines +20 to +31
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Отсутствуют файлы спрайтов для новых состояний катаны!

Проверка выявила, что все необходимые файлы спрайтов отсутствуют в директории. Для корректной работы требуются следующие файлы:

  • equipped-BACKPACK[0-3].png
  • equipped-SUITSTORAGE[0-3].png
  • equipped-BELT[0-3].png

Необходимо добавить все отсутствующие файлы спрайтов для каждого состояния и направления перед слиянием изменений.

🔗 Analysis chain

Проверьте наличие всех необходимых спрайтов!

Новые состояния корректно добавлены для всех слотов экипировки. Структура JSON валидна.

Выполните следующий скрипт для проверки наличия всех необходимых файлов спрайтов:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Описание: Проверка наличия файлов спрайтов для новых состояний катаны

# Проверяем наличие файлов в директории
cd Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/
for state in "equipped-BACKPACK" "equipped-SUITSTORAGE" "equipped-BELT"; do
  for i in {0..3}; do
    if [ ! -f "${state}${i}.png" ]; then
      echo "ОШИБКА: Отсутствует файл ${state}${i}.png"
    fi
  done
done

Length of output: 2230

Comment on lines +20 to +31
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Обнаружено несоответствие в файлах спрайтов!

В meta.json указано, что каждое состояние экипировки ("equipped-BACKPACK", "equipped-SUITSTORAGE", "equipped-BELT") должно иметь 4 направления, но в директории найдены только одиночные файлы спрайтов без указания направлений (например, "equipped-BACKPACK.png" вместо ожидаемых "equipped-BACKPACK-0.png", "equipped-BACKPACK-1.png" и т.д.).

  • equipped-BACKPACK.png - отсутствуют файлы для 4 направлений
  • equipped-SUITSTORAGE.png - отсутствуют файлы для 4 направлений
  • equipped-BELT.png - отсутствуют файлы для 4 направлений
🔗 Analysis chain

Корректное добавление новых состояний спрайтов!

Добавленные состояния спрайтов соответствуют новым слотам экипировки катаны. Все состояния имеют корректное количество направлений (4) и следуют стандартным соглашениям об именовании.

Давайте проверим наличие соответствующих файлов спрайтов:

Let me try a different approach to verify the sprite files existence:

This will list all PNG files in the katana.rsi directory, which should help us verify if the required sprite files are present for the new states.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия файлов спрайтов для новых состояний
echo "Проверка файлов спрайтов катаны..."
for state in "equipped-BACKPACK" "equipped-SUITSTORAGE" "equipped-BELT"; do
  for i in {0..3}; do
    rg -l "${state}-${i}.png" --glob "Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/*"
  done
done

Length of output: 1736

Script:

#!/bin/bash
# Check if the sprite files exist in the directory
echo "Checking katana sprite files..."
fd . "Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi" -t f --extension png | sort

Length of output: 627

}
]
}
Binary file modified Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...aradise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/equipped-SUITSTORAGE.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading