-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Описание PR <!-- Что вы изменили в этом пулл реквесте? --> добавила костюм и меч мимикрии ## Почему / Баланс <!-- Почему оно было изменено? Ссылайтесь на любые обсуждения или вопросы здесь. Пожалуйста, обсудите, как это повлияет на игровой баланс. --> **Ссылка на публикацию в Discord** <!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги, заказы в разработку или предложения - [Технические проблемы](ссылка) - [Баги](ссылка) - [Заказы-разработка](ссылка) - [Предложения](ссылка) - [Перенос контента](ссылка)--> https://discord.com/channels/901772674865455115/1281005212429193247 ## Медиа <!-- Пулл реквесты, которые вносят внутриигровые изменения (добавление одежды, предметов, новых возможностей и т.д.), должны содержать медиа, демонстрирующие изменения. Небольшие исправления/рефакторы не требуют медиа. Если Вы не уверены в том, что Ваш пулл реквест требует медиа, спросите мейнтейнера. --> ## Требования <!-- В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют правильным рекомендациям. Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР) впервые. Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их (поставьте X в скобках, например [X]): --> - [x] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре
- Loading branch information
Showing
32 changed files
with
273 additions
and
1 deletion.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
- type: entity | ||
id: ADTActionTeatacles | ||
name: tentacles | ||
categories: [ HideSpawnMenu ] | ||
components: | ||
- type: InstantAction | ||
useDelay: 10 | ||
itemIconStyle: BigAction | ||
icon: | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
state: icon | ||
event: !type:InstantSpawnSpellEvent | ||
prototype: ADTEffectiMicriaTentacleSpawn | ||
posData: !type:TargetInFront |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
- type: entity | ||
id: ADTEffectiMicriaTentacleRetract | ||
parent: BaseEffectGoliathTentacleSpawn | ||
categories: [ HideSpawnMenu ] | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
state: mimicria_tentacle_retract | ||
- type: EffectVisuals | ||
- type: AnimationPlayer | ||
|
||
- type: entity | ||
id: ADTEffectiMicriaTentacleSpawn | ||
parent: BaseEffectGoliathTentacleSpawn | ||
categories: [ HideSpawnMenu ] | ||
name: tentacle | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
state: mimicria_tentacle_spawn | ||
- type: SpawnOnDespawn | ||
prototype: ADTMimicriaTentacle |
58 changes: 58 additions & 0 deletions
58
Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/mimicria.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
- type: entity | ||
name: Mimicria | ||
parent: BaseSword | ||
id: ADTWeaponSworldMimicry | ||
components: | ||
- type: Sprite | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
- type: MeleeWeapon | ||
damage: | ||
types: | ||
Slash: 15 | ||
soundHit: | ||
path: /Audio/Weapons/bladeslice.ogg | ||
- type: DisarmMalus | ||
- type: Spellbook | ||
learnTime: 0.01 | ||
spellActions: | ||
ADTActionTeatacles: -1 | ||
- type: Item | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
size: Huge | ||
|
||
- type: entity | ||
id: ADTMimicriaTentacle | ||
name: tentacle | ||
categories: [ HideSpawnMenu ] | ||
components: | ||
- type: Transform | ||
anchored: True | ||
- type: Physics | ||
bodyType: Static | ||
canCollide: true | ||
- type: InteractionOutline | ||
- type: Sprite | ||
sprite: ADT/Objects/Weapons/Melee/mimicria_sword.rsi | ||
layers: | ||
- state: mimicria_tentacle_wiggle | ||
- type: Fixtures | ||
fixtures: | ||
fix: | ||
shape: | ||
!type:PhysShapeAabb | ||
bounds: "-0.45,-0.45,0.45,0.45" | ||
mask: | ||
- Impassable | ||
layer: | ||
- Impassable | ||
hard: false | ||
- type: TimedDespawn #do this shit by hand because of fucking course. | ||
lifetime: 1 | ||
- type: DamageContacts | ||
damage: | ||
types: | ||
Slash: 20 | ||
Piercing: 20 | ||
- type: SpawnOnDespawn | ||
prototype: ADTEffectiMicriaTentacleRetract | ||
|
Binary file added
BIN
+205 Bytes
Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/equipped-EYES.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
BIN
+408 Bytes
Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-left.png
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
BIN
+451 Bytes
Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/ADT/Clothing/Eyes/Glasses/mimicry.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by decente", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-EYES", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+385 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/equipped-FEET.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
BIN
+343 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-left.png
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
BIN
+361 Bytes
Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/ADT/Clothing/Shoes/Boots/mimicry.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by decente", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-FEET", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.59 KB
.../Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/equipped-INNERCLOTHING.png
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
BIN
+468 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/icon.png
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
BIN
+433 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-left.png
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
BIN
+451 Bytes
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Created by decente", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+849 Bytes
Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/icon.png
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
BIN
+952 Bytes
Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-left.png
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
BIN
+949 Bytes
Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions
55
Resources/Textures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Mage by decente", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "mimicria_tentacle_spawn", | ||
"delays": [ | ||
[ | ||
0.2, | ||
0.2, | ||
0.2, | ||
0.1 | ||
] | ||
] | ||
}, | ||
{ | ||
"name": "mimicria_tentacle_wiggle", | ||
"delays": [ | ||
[ | ||
0.1, | ||
0.1, | ||
0.1, | ||
0.1 | ||
] | ||
] | ||
}, | ||
{ | ||
"name": "mimicria_tentacle_retract", | ||
"delays": [ | ||
[ | ||
0.1, | ||
0.2, | ||
0.2, | ||
0.3 | ||
] | ||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+2.04 KB
...ures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_retract.png
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
BIN
+1.97 KB
...xtures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_spawn.png
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
BIN
+2.48 KB
...tures/ADT/Objects/Weapons/Melee/mimicria_sword.rsi/mimicria_tentacle_wiggle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.