diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index f46f8e637d..6526a0734e 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -6152,3 +6152,23 @@ ent-CP14WindowFrameWooden = деревянная оконная рама ent-CP14WindowWoodenBroken = разбитое деревянное окно .desc = { ent-CP14BaseWindowFrameBroken.desc } +ent-CP14HalloweenPumpkin = страшная тыква + .desc = Когда-то это была обычная тыква... А теперь это страшная тыква! + +ent-CP14HalloweenPumpkinEmmisiveBase = тыквенный фонарь + .desc = Ууууу! Страшная! + +ent-CP14JackOLanternVariant1 = { ent-CP14HalloweenPumpkinEmmisiveBase } + .desc = { ent-CP14HalloweenPumpkinEmmisiveBase.desc } + +ent-CP14JackOLanternVariant2 = { ent-CP14HalloweenPumpkinEmmisiveBase } + .desc = { ent-CP14HalloweenPumpkinEmmisiveBase.desc } + +ent-CP14JackOLanternVariant3 = { ent-CP14HalloweenPumpkinEmmisiveBase } + .desc = { ent-CP14HalloweenPumpkinEmmisiveBase.desc } + +ent-CP14JackOLanternVariant4 = { ent-CP14HalloweenPumpkinEmmisiveBase } + .desc = { ent-CP14HalloweenPumpkinEmmisiveBase.desc } + +ent-CP14JackOLantern = спавнер тыквенного фонаря + .desc = { ent-CP14HalloweenPumpkinEmmisiveBase.desc } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/halloween_pumpkin.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/halloween_pumpkin.yml new file mode 100644 index 0000000000..da28cdc7c5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/halloween_pumpkin.yml @@ -0,0 +1,148 @@ +- type: entity + parent: CP14FoodPumpkin + id: CP14HalloweenPumpkin + name: scary pumpkin + description: It was a normal pumpkin one day... Now it's a scary pumpkin! + components: + - type: Sprite + sprite: _CP14/Objects/Misc/halloween_pumpkin.rsi + layers: + - state: base1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + base3: "" + base4: "" + - type: Clothing + quickEquip: false + sprite: _CP14/Clothing/Head/halloween_pumpkin_helmet.rsi + equippedPrefix: 0 + slots: + - HEAD + +- type: entity + parent: FoodInjectableBase + id: CP14HalloweenPumpkinEmmisiveBase + name: jack-o lantern + description: Oooh! Scary! + abstract: true + components: + - type: Sprite + sprite: _CP14/Objects/Misc/halloween_pumpkin.rsi + - type: PointLight + radius: 2.1 + energy: 0.9 + color: "#FEE68E" + castShadows: true + - type: Item + size: Normal + - type: StaticPrice + price: 6 + - type: FlavorProfile + flavors: + - pumpkin + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: PumpkinFlesh + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - type: SliceableFood + count: 5 + sliceTime: 2 + slice: CP14FoodPumpkinSlice + - type: Tag + tags: + - CP14FarmFood + - CP14Vegetable + - CP14Pumpkin + + +- type: entity + parent: CP14HalloweenPumpkinEmmisiveBase + id: CP14JackOLanternVariant1 + suffix: Variant 1 + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - state: base1 + - state: light-base1 + shader: unshaded + - state: light-base1 + shader: shaded + +- type: entity + parent: CP14HalloweenPumpkinEmmisiveBase + id: CP14JackOLanternVariant2 + suffix: Variant 2 + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - state: base2 + - state: light-base2 + shader: unshaded + - state: light-base2 + shader: shaded + +- type: entity + parent: CP14HalloweenPumpkinEmmisiveBase + id: CP14JackOLanternVariant3 + suffix: Variant 3 + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - state: base3 + - state: light-base3 + shader: unshaded + - state: light-base3 + shader: shaded + +- type: entity + parent: CP14HalloweenPumpkinEmmisiveBase + id: CP14JackOLanternVariant4 + suffix: Variant 4 + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - state: base4 + - state: light-base4 + shader: unshaded + - state: light-base4 + shader: shaded + +- type: entity + id: CP14JackOLantern + name: jack-o lantern spawner + description: Oooh! Scary! + parent: MarkerBase + categories: [ ForkFiltered ] + components: + - type: Sprite + layers: + - state: green + - sprite: _CP14/Objects/Misc/halloween_pumpkin.rsi + state: base2 + - sprite: _CP14/Objects/Misc/halloween_pumpkin.rsi + state: light-base2 + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: CP14JackOLanternTable + +- type: entityTable + id: CP14JackOLanternTable + table: !type:GroupSelector + children: + - id: CP14JackOLanternVariant1 + - id: CP14JackOLanternVariant2 + - id: CP14JackOLanternVariant3 + - id: CP14JackOLanternVariant4 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml index 76b1524b70..04531a9867 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/CookingTable/misc.yml @@ -39,3 +39,13 @@ protoId: CP14FoodDoughMedium count: 1 result: CP14FoodDoughMediumFlat + +- type: CP14Recipe + id: CP14HalloweenPumpkin + tag: CP14RecipeCooking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPumpkin + count: 1 + result: CP14HalloweenPumpkin diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index 4972b67b4d..c6474897e0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -250,4 +250,17 @@ - !type:StackResource stack: CP14Cloth count: 2 - result: CP14Rope \ No newline at end of file + result: CP14Rope + +- type: CP14Recipe + id: CP14JackOLantern + tag: CP14RecipeWorkbench + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14HalloweenPumpkin + count: 1 + - !type:ProtoIdResource + protoId: CP14Candle + count: 1 + result: CP14JackOLanternVariant2 diff --git a/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/0-equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/0-equipped-HELMET.png new file mode 100644 index 0000000000..b574464b03 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/meta.json new file mode 100644 index 0000000000..3a13314b9d --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/halloween_pumpkin_helmet.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "equipped-HELMET created by Dinazewwr", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base1.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base1.png new file mode 100644 index 0000000000..d512a4dacd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base2.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base2.png new file mode 100644 index 0000000000..5bebf3ab98 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base3.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base3.png new file mode 100644 index 0000000000..ed08bf02d9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base4.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base4.png new file mode 100644 index 0000000000..e2b701f600 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/base4.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base1.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base1.png new file mode 100644 index 0000000000..64eeed3f33 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base2.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base2.png new file mode 100644 index 0000000000..3ca9fa3043 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base3.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base3.png new file mode 100644 index 0000000000..f879627217 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base3.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base4.png b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base4.png new file mode 100644 index 0000000000..fbf6935b8f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/light-base4.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/meta.json new file mode 100644 index 0000000000..5a735669d5 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Misc/halloween_pumpkin.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Base1-4, light-base1-4 created by Dinazewwr, light-base1-4 modified by oldschool_otaku", + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + }, + { + "name": "base3" + }, + { + "name": "base4" + }, + { + "name": "light-base1" + }, + { + "name": "light-base2" + }, + { + "name": "light-base3" + }, + { + "name": "light-base4" + } + ] +}