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.

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

Мрамор пак #1008

Merged
merged 13 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTmarble = мрамор
.desc = Какой булыжник!? Это мрамор Итальянский!
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ent-ADTmarblelady = леди из мрамора
.desc = Чудный образец одной из прекрасных дам забытой эпохи

ent-ADTpeacemakermarble = статуя миротворца
.desc = За мир во всем мире!

ent-ADTmarblepillar = мраморная колонна
.desc = Красивая мраморная колонна

ent-ADTmarbleStand = мраморная подставка
.desc = Подставка для ещё не готовой статуи... наверное

ent-ADTmarbleLadyFlower = леди из мрамора с цветами
.desc = Чудный образец одной из леди ушедней эпохи. Эта ещё и с цветами!

ent-ADTmarbleMan = мраморный человек
.desc = Скульптура человека из мрамора. Он стоит и смотрит, смотрит своими глазами прямо в душу

ent-ADTmarbleManDamage = мраморный человек в трещинах
.desc = Скульптура человека из мрамора. Он стоит и смотрит, смотрит своими глазами прямо в душу
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ADTwallmarble = мраморная стена
.desc = Держит воздух внутри, а пассажиров снаружи.
152 changes: 152 additions & 0 deletions Resources/Prototypes/ADT/Decals/marble_decales.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
- type: decal
id: ADTmarBox
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_box

- type: decal
id: ADTmarbleCornerNw
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_corner_nw

- type: decal
id: ADTmarbleCornerNe
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_corner_ne

- type: decal
id: ADTmarbleCornerSe
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_corner_se

- type: decal
id: ADTmarbleCornerSw
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_corner_sw

- type: decal
id: ADTmarbleEndE
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_end_e

- type: decal
id: ADTmarbleEndS
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_end_s

- type: decal
id: ADTmarbleEndN
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_end_n

- type: decal
id: ADTmarbleEndW
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_end_w

- type: decal
id: ADTmarbleInnerNe
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_inner_ne

- type: decal
id: ADTmarbleInnerNw
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_inner_nw

- type: decal
id: ADTmarbleInnerSe
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_inner_se

- type: decal
id: ADTmarbleInnerSw
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_inner_sw

- type: decal
id: ADTmarbleLineE
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_line_e

- type: decal
id: ADTmarbleLineS
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_line_s

- type: decal
id: ADTmarbleLineW
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_line_w

- type: decal
id: ADTmarbleLineN
tags: ["marble"]
snapCardinals: true
defaultSnap: false
sprite:
sprite: ADT/Decals/marble/marble_decals.rsi
state: marble_line_n
17 changes: 17 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Materials/marble.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
id: ADTmarble
parent: BaseItem
name: marble
description: marble... So what?
components:
- type: Item
size: Normal
- type: Sprite
sprite: ADT/Objects/Materials/marble.rsi
layers:
- state: icon
- type: Appearance
- type: Material
- type: PhysicalComposition
- type: StaticPrice
price: 300
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
- type: entity
parent: BaseStructure
id: ADTmarblelady
name: beutiful marble lady
description: She's so pretty
placement:
mode: SnapgridCenter
components:
- type: Sprite
noRot: true
sprite: ADT/Structures/Decoration/marble_structures/marble_lady.rsi
state: marlady
offset: "0.0,0.5"
drawdepth: Mobs
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
parent: ADTmarblelady
id: ADTmarbleLadyFlower
name: marble lady in flowers
description: She's so pretty
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/marblelady_flower.rsi
state: marlady_flowers

- type: entity
parent: ADTmarblelady
id: ADTmarblepillar
name: marble pillar
description: pillar out of marble
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/pillar_marble.rsi
state: pillar_marble

- type: entity
parent: ADTmarblelady
id: ADTmarbleStand
name: marble stand
description: stand for someone
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/marble_stand.rsi
state: marstand

- type: entity
parent: ADTmarblelady
id: ADTmarbleMan
name: marble man
description: he stands
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/marbleman.rsi
state: marman

- type: entity
parent: ADTmarblelady
id: ADTmarbleManDamage
name: marble man crack
description: he stands
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/marblemandamage.rsi
state: marmandmg

- type: entity
parent: ADTmarblelady
id: ADTpeacemakermarble
name: Statue of Peacemaker
description: for the peace in world!
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: ADT/Structures/Decoration/marble_structures/peacemaker.rsi
state: peacemaker
29 changes: 29 additions & 0 deletions Resources/Prototypes/ADT/Entities/Structures/Walls/marble_wall.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- type: entity
parent: BaseWall
id: ADTwallmarble
name: marble wall
description: wall, but marble... Woah
components:
- type: Sprite
sprite: ADT/Structures/Walls/marble_wall.rsi
- type: Icon
sprite: ADT/Structures/Walls/marble_wall.rsi
- type: IconSmooth
key: walls
base: state
- type: Tag
tags:
- Wall
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 400
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
Girder:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
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.
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.
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions Resources/Textures/ADT/Decals/marble/marble_decals.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "author discord by: prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "marble_box"
},
{
"name": "marble_corner_ne"
},
{
"name": "marble_corner_nw"
},
{
"name": "marble_corner_se"
},
{
"name": "marble_corner_sw"
},
{
"name": "marble_end_e"
},
{
"name": "marble_end_n"
},
{
"name": "marble_end_s"
},
{
"name": "marble_end_w"
},
{
"name": "marble_inner_ne"
},
{
"name": "marble_inner_nw"
},
{
"name": "marble_inner_se"
},
{
"name": "marble_inner_sw"
},
{
"name": "marble_line_e"
},
{
"name": "marble_line_w"
},
{
"name": "marble_line_n"
},
{
"name": "marble_line_s"
}
]
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading