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

Jump to bottom

[SHIPBATTLE] Корабельные пушки #862

Merged
merged 22 commits into from
Dec 29, 2024
Merged

[SHIPBATTLE] Корабельные пушки #862

merged 22 commits into from
Dec 29, 2024

Conversation

PyotrIgn
Copy link
Contributor

@PyotrIgn PyotrIgn commented Dec 1, 2024 •
edited
Loading

Описание PR

Добавление прототипов корабельных пушек для космических боев

Почему / Баланс

Потому что мне нужна ДАККА

Чейнджлог
🆑 Пётр

  • add: Добавлена малая корабельная турель GAU-32
  • add: Добавлена корабельная автопушка DS-30
  • add: Добавлены корабельные орудия D-100 и Mk.155
  • add: Добавлены боеприпасы для корабельных пушек

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Dec 1, 2024
@PyotrIgn PyotrIgn added the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Dec 1, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 1, 2024 •
edited
Loading

RSI Diff Bot; head commit 62cc6d7 merging into bb30a2c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/100mm.rsi

State Old New Status
ap-inhand-left Added
ap-inhand-right Added
ap Added
emp-inhand-left Added
emp-inhand-right Added
emp Added
he-inhand-left Added
he-inhand-right Added
he Added
spent Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Casings/155mm.rsi

State Old New Status
ap-inhand-left Added
ap-inhand-right Added
ap Added
emp-inhand-left Added
emp-inhand-right Added
emp Added
he-inhand-left Added
he-inhand-right Added
he Added
spent Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Magazine/ds30.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Ammunition/Magazine/gau32.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/d100.rsi

State Old New Status
d100_broken Added
d100_kmt Added
d100_tsf Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/ds30.rsi

State Old New Status
ds30_broken Added
ds30_kmt Added
ds30_tsf Added
mag-0 Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/gau32.rsi

State Old New Status
gau32_broken Added
gau32_kmt Added
gau32_kmt_icon Added
gau32_tsf Added
gau32_tsf_icon Added
mag-0 Added
mag-1 Added
mag-10 Added
mag-11 Added
mag-12 Added
mag-13 Added
mag-14 Added
mag-15 Added
mag-16 Added
mag-17 Added
mag-18 Added
mag-19 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/large_shipguns_icon32x32.rsi

State Old New Status
d100_broken_icon Added
d100_kmt_icon Added
d100_tsf_icon Added
ds30_broken_icon Added
ds30_kmt_icon Added
ds30_tsf_icon Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/large_shipguns_icon64x64.rsi

State Old New Status
mk155_broken_icon Added
mk155_kmt_icon Added
mk155_tsf_icon Added

Resources/Textures/ADT/ADTGlobalEvents/ShipBattle/Objects/Weapons/Guns/Turrets/mk155.rsi

State Old New Status
mk155_broken Added
mk155_kmt Added
mk155_tsf Added

Edit: diff updated after 62cc6d7

@PyotrIgn PyotrIgn added the In progress В процессе выполнения label Dec 2, 2024
@PyotrIgn PyotrIgn marked this pull request as draft December 5, 2024 15:17
@PyotrIgn PyotrIgn removed the Не Мерджить Не МЕРДЖИТЬ НИ В КОЕМ СЛУЧАЕ label Dec 5, 2024
jungarikjan
jungarikjan previously requested changes Dec 13, 2024
View reviewed changes
Copy link
Contributor

@jungarikjan jungarikjan left a comment

Choose a reason for hiding this comment

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

Ревью локали 1. Я хз, вежливо ли это самому менять, поэтому лучше ревью оставлю

@github-actions github-actions bot added the Status: Awaiting Changes Ожидание изменений label Dec 13, 2024
@PyotrIgn PyotrIgn marked this pull request as ready for review December 16, 2024 19:25
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added size/XL and removed size/L labels Dec 20, 2024
@PyotrIgn PyotrIgn removed Status: Awaiting Changes Ожидание изменений In progress В процессе выполнения labels Dec 26, 2024
@PyotrIgn PyotrIgn requested a review from KashRas2 December 26, 2024 13:23
@Filokini
Copy link
Contributor

А аттрибутионс у звуков нема?

@PyotrIgn
Copy link
Contributor Author

А аттрибутионс у звуков нема?

Взяты из бесплатных библиотек или сшиты из кусков разного взятого из бесплатных. И в них оно без конкретного авторства

Ratyyy
Ratyyy requested changes Dec 28, 2024
View reviewed changes
Copy link
Collaborator

@Ratyyy Ratyyy left a comment

Choose a reason for hiding this comment

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

собственно ревью

@github-actions github-actions bot added the Status: Awaiting Changes Ожидание изменений label Dec 28, 2024
Ratyyy
Ratyyy previously requested changes Dec 28, 2024
View reviewed changes
Copy link
Collaborator

@Ratyyy Ratyyy left a comment

Choose a reason for hiding this comment

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

собственно ревью

Resources/Audio/ADT/ADTGlobalEvents/ShipBattle/Weapons/Guns/turret_destroy.ogg Outdated Show resolved Hide resolved
KashRas2
KashRas2 approved these changes Dec 28, 2024
View reviewed changes
Copy link
Collaborator

@KashRas2 KashRas2 left a comment

Choose a reason for hiding this comment

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

53tcyc.jpg

@github-actions github-actions bot removed the Status: Awaiting Changes Ожидание изменений label Dec 28, 2024
@PyotrIgn PyotrIgn merged commit 66f6f0e into master Dec 29, 2024
16 checks passed
@PyotrIgn PyotrIgn deleted the shipbattle_guns branch December 29, 2024 03:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KashRas2 KashRas2 KashRas2 approved these changes

@Ratyyy Ratyyy Ratyyy left review comments

@jungarikjan jungarikjan Awaiting requested review from jungarikjan

@Darkiich Darkiich Awaiting requested review from Darkiich

@Schrodinger71 Schrodinger71 Awaiting requested review from Schrodinger71

@FaDeOkno FaDeOkno Awaiting requested review from FaDeOkno

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: No C# Changes: Sprites Изменение спрайтов No C# S: Needs Review size/XL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@PyotrIgn @Filokini @Ratyyy @KashRas2 @jungarikjan