diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index e82c4d6a2b..fb44fc6eaf 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -129,6 +129,9 @@ ent-CP14Mist = облако ent-CP14MistVitalExtract = { ent-CP14Mist } .desc = { ent-CP14Mist.desc } +ent-CP14ExpeditionShipTargetPoint = Expedition ship target point + .desc = One of the possible arrival points of a ship carrying players + ent-CP14SpawnPointAdventurer = авантюрист ent-CP14SpawnPointAlchemist = алхимик @@ -741,9 +744,23 @@ ent-CP14CrateCoffin = гроб ent-CP14Cliff = обрыв .desc = Серьезные неровности природного ландшафта. + .suffix = Прямой ent-CP14CliffCorner = { ent-CP14Cliff } .desc = { ent-CP14Cliff.desc } + .suffix = Угол + +ent-CP14CliffCornerSmall = { ent-CP14Cliff } + .desc = { ent-CP14Cliff.desc } + .suffix = Малый угол + +ent-CP14CliffEndLeft = { ent-CP14Cliff } + .desc = { ent-CP14Cliff.desc } + .suffix = Левый край + +ent-CP14CliffEndRight = { ent-CP14Cliff } + .desc = { ent-CP14Cliff.desc } + .suffix = Правый край ent-CP14IronGrilleBase = железная решетка .desc = Прочный барьер из сваренных вместе железных прутьев. diff --git a/Resources/Prototypes/Entities/Markers/marker_base.yml b/Resources/Prototypes/Entities/Markers/marker_base.yml index ecd4cf5004..4e957ae164 100644 --- a/Resources/Prototypes/Entities/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Markers/marker_base.yml @@ -1,6 +1,7 @@ - type: entity id: MarkerBase abstract: true + descpription: marker placement: mode: SnapgridCenter components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/cliffs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/cliffs.yml index 41243ca7a8..226b6994df 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/cliffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/cliffs.yml @@ -2,6 +2,7 @@ parent: BaseStructure id: CP14Cliff name: cliff + suffix: Straight description: Severe unevenness of the natural landscape. components: - type: Sprite @@ -29,6 +30,40 @@ - type: entity parent: CP14Cliff id: CP14CliffCorner + suffix: Corner + components: + - type: Sprite + drawdepth: WallTops + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: smallcorner + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: smallcorner + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.49,-0.49,0.49,-0.25" + density: 1000 + mask: + - TableMask + layer: + - TableLayer + fix2: + shape: + !type:PhysShapeAabb + bounds: "0.49,0.49,0.25,-0.49" + density: 1000 + mask: + - TableMask + layer: + - TableLayer + +- type: entity + parent: CP14Cliff + id: CP14CliffCornerSmall + suffix: CornerSmall components: - type: Sprite drawdepth: WallTops @@ -47,4 +82,30 @@ mask: - TableMask layer: - - TableLayer \ No newline at end of file + - TableLayer + +- type: entity + parent: CP14Cliff + id: CP14CliffEndLeft + suffix: Left End + components: + - type: Sprite + drawdepth: WallTops + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: end_left + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: end_left + +- type: entity + parent: CP14Cliff + id: CP14CliffEndRight + suffix: Right End + components: + - type: Sprite + drawdepth: WallTops + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: end_right + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cliffs.rsi + state: end_right \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/cliff.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/cliff.png index 308eecb75a..2469202610 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/cliff.png and b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/cliff.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/corner.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/corner.png index 511e395d7a..ddeb3d35c8 100644 Binary files a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/corner.png and b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/corner.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_left.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_left.png new file mode 100644 index 0000000000..23c96202c6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_left.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_right.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_right.png new file mode 100644 index 0000000000..264183ee13 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/end_right.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/meta.json index 67debae114..60818a8cc2 100644 --- a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "By TheShuEd(github) for CrystallPunk14", + "copyright": "By Jaraten(github/discord) for CrystallPunk14", "size": { "x": 32, "y": 96 @@ -11,9 +11,21 @@ "name": "cliff", "directions": 4 }, + { + "name": "smallcorner", + "directions": 4 + }, { "name": "corner", "directions": 4 + }, + { + "name": "end_left", + "directions": 4 + }, + { + "name": "end_right", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/smallcorner.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/smallcorner.png new file mode 100644 index 0000000000..40b964b0ee Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cliffs.rsi/smallcorner.png differ