-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
new_weapon_for_sec #51
base: master
Are you sure you want to change the base?
Conversation
RSI Diff Bot; head commit ca151aa merging into e031716 Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MiniEnergyGun.rsi
Resources/Textures/Exodus/Objects/Weapons/Guns/Battery/MyltiLaserForHoS.rsi
Resources/Textures/Exodus/Objects/Weapons/Guns/Projectiles/ProjectilesForLaserByDepresh.rsi
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Необходимо немного подправить общий вид PR.
@@ -77,3 +77,13 @@ | |||
cost: 1000 | |||
category: cargoproduct-category-name-security | |||
group: market | |||
|
|||
- type: cargoProduct |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Переместить в отдельный yml в Exodus/Catalog/Cargo/...yml
@@ -114,3 +114,14 @@ | |||
amount: 4 | |||
|
|||
# Cosmetic Crates | |||
|
|||
- type: entity |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Аналогично переместить в отдельный yml
- type: entity | ||
id: CrateSecurityMiniEnergyGun | ||
parent: CrateSecgear | ||
name: Ящик с миниатюрными энергетическими пистолетами |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Локализация через FTL
@@ -0,0 +1,129 @@ | |||
# Сам прототип оружия | |||
- type: entity | |||
name: Миниатюрный энергетический пистолет |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Локализация. Переместить в Exodus
|
||
# продект лазера | ||
- type: entity | ||
name: Режим лазера |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Локализация
@@ -30,8 +30,7 @@ | |||
eyes: ClothingEyesGlassesSecurity | |||
id: WardenPDA | |||
ears: ClothingHeadsetSecurity | |||
pocket1: WeaponPistolMk58 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Комментарий изменения кода оффов
@@ -0,0 +1,108 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Разделить на смысловые части.
Переместить в Textures/Exodus/
Разделить на rsi
Resources/Audio/Weapons/HoSLaser.ogg
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Переместить в Audio/Exodus/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Переместить в Audio/Exodus/
Resources/Audio/Weapons/HoSLaser.ogg
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Написать Atttribution.yml для звуков
Заменить текстурки самих лазеров на обесцвеченные (спойлер, одна из них уже есть) и задавать цвет уже в компоненте Sprite. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Переименовать, разрешить конфликт, да понять что-то с дробовиком и будет конфетка..)
@@ -0,0 +1,25 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Переименовать папку...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
На кой чёрт этот RSI, если в сборке такие спрайты уже есть?
@@ -27,7 +27,7 @@ | |||
equipment: | |||
eyes: ClothingEyesGlassesSecurity | |||
ears: ClothingHeadsetSecurity | |||
pocket1: WeaponMiniEnergyGun | |||
pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить на комментарий # Exodus - WeaponForHos
storage: | ||
back: | ||
- Flash | ||
back: # Убрал "MagazinePistol " |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить комментарий
@@ -30,7 +30,7 @@ | |||
eyes: ClothingEyesGlassesSecurity | |||
id: WardenPDA | |||
ears: ClothingHeadsetSecurity | |||
pocket1: WeaponMiniEnergyGun | |||
pocket1: WeaponMiniEnergyGun # Убрал "WeaponPistolMk58" и добавил "WeaponMiniEnergyGun" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить комментарий
storage: | ||
back: | ||
- Flash | ||
back: # Убрал "MagazinePistol" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить комментарий
@@ -0,0 +1,82 @@ | |||
# проджект лазера |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить название файла на LaserForHos.yml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❌
На energetic.yml
, если файл уже существует, то закинуть в конец. Исправить косяки с опечатками. Нет такого слова Staner, есть Stunner, от слова Stun. И всё в таком духе.
Также эффекты от попаданий лежат во отдельном файле, impacts.yml
@@ -0,0 +1,79 @@ | |||
# продект лазера |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить название на MiniEnergyGun.yml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
К projectiles.yml
, эффекты от попаданий в impacts.yml
@@ -0,0 +1,10 @@ | |||
- type: entity |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить название файла на security.yml
@@ -0,0 +1,9 @@ | |||
- type: cargoProduct |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Заменить название файла на security.yml
# проджект станера | ||
- type: entity | ||
name: Staner | ||
id: stanerBullet |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Здесь вообще нарушение конвенции имён энтитей, которые должны быть в PascalCase (начинается с большой буквы и каждое слово тоже с большой).
Да и в принципе здесь ID другой быть должен.
|
||
# эффект от станера | ||
- type: entity | ||
id: BulletImpactEffectLaserStan |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BulletImpactEffectLaserCyan
-> BulletImpactEffectStunnerCyan
@@ -46,7 +46,8 @@ | |||
id: HoSPDA | |||
gloves: ClothingHandsGlovesCombat | |||
ears: ClothingHeadsetAltSecurity | |||
pocket1: WeaponX-2Dual-phaseEnergyLaserGun | |||
pocket1: WeaponPistolMk58 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Потерял коментарий
# продект лазера | ||
- type: entity | ||
name: Laser | ||
id: LaserBulletForMEG |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Никаких "AForB" в ID и названиях. -> LaserBulletMEG
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
А ещё лучше отнести снаряд лазера к какой-либо категории, более унифицированно и отталкиваться уже от названия категории, а не от названия пушки, для которой он был сделан.
@@ -0,0 +1,53 @@ | |||
# Сам прототип оружия | |||
- type: entity | |||
name: Mini energy gun |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Название энтити с маленькой буквы быть должны
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Да и название по-креативнее бы....
|
||
# эффект от станера | ||
- type: entity | ||
id: BulletImpactEffectDisablerRed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ну хоть себе-то не ври.
BulletImpactEffectDisablerRed
-> BulletImpactEffectDisablerPink
С названиями сплошная лажа. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Убрано табельный mk-58 у таких ролей как: Офицер сб, смотритель, ГСБ.
Добавлен миниатюрный энергетический пистолет как табельное оружие офицеру сб и смотрителю, так за 2500 можно заказать ящик с двумя такими.
Добавлен Х-2 Двухфазовый энергетический лазерный пистолет. Появляется у ГСБ как табельное оружие в кармане
Removed the mk-58 from such roles as: Officer of the sb, caretaker, GSB.
Added a miniature energy pistol as a tactical weapon for the sec officer and warden, so for 2500 you can order a box with two of them.
Added X-2 Dual Phase Energy Laser Pistol. Appears in the HoS as a service weapon in his pocket