diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml new file mode 100644 index 0000000000..d49f592a0f --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/cobwebs.yml @@ -0,0 +1,66 @@ +- type: entity + id: CP14CobwebRight1 + parent: + - CP14BaseWallmount + - CP14BaseFlammable + name: cobweb + description: The sticky web is surprisingly strong and unpleasant. + categories: [ ForkFiltered ] + suffix: Right. Corner. + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: Sprite + sprite: _CP14/Structures/Decoration/cobweb.rsi + state: cobweb_right1 + - type: Transform + anchored: true + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SpriteFade + - type: SpeedModifierContacts + walkSpeedModifier: 0.5 + sprintSpeedModifier: 0.5 + - type: CP14IgnitionModifier + ignitionTimeModifier: 0.75 + hideCaution: true + - type: FireVisuals + sprite: Mobs/Effects/onfire.rsi + normalState: Mouse_burning # I need a burning sprite on the Wallmount + +- type: entity + id: CP14CobwebLeft1 + parent: CP14CobwebRight1 + suffix: Left. Corner. + components: + - type: Sprite + sprite: _CP14/Structures/Decoration/cobweb.rsi + state: cobweb_left1 + +- type: entity + id: CP14CobwebLeft2 + parent: CP14CobwebRight1 + suffix: Left. Flat. + components: + - type: Sprite + sprite: _CP14/Structures/Decoration/cobweb.rsi + state: cobweb_left2 + +- type: entity + id: CP14CobwebRight2 + parent: CP14CobwebLeft2 + suffix: Right. Flat. + components: + - type: Sprite + sprite: _CP14/Structures/Decoration/cobweb.rsi + state: cobweb_right2 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml index 87e60f805a..fd05c1b2e8 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/statues.yml @@ -158,7 +158,7 @@ shape: !type:PhysShapeAabb bounds: "-0.45,-0.45,0.45,0.45" - density: 60 + density: 120 mask: - MachineMask layer: @@ -213,3 +213,109 @@ map: ["ritual"] visible: false shader: unshaded + +- type: entity + id: CP14StatueStoneHeadHigh + parent: BaseStructure + name: stone head + description: Strange stone heads, they seem to be watching. + categories: [ ForkFiltered ] + suffix: High + components: + - type: Sprite + noRot: true + sprite: _CP14/Structures/Decoration/stone_head_high.rsi + layers: + - state: statue_head_h + drawdepth: Mobs + offset: "0.0,0.5" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 200 + mask: + - MachineMask + layer: + - MachineLayer + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + CP14StoneBlock1: + min: 4 + max: 5 + +- type: entity + id: CP14StatueStoneHeadLow + parent: CP14StatueStoneHeadHigh + suffix: Low + components: + - type: Sprite + sprite: _CP14/Structures/Decoration/stone_head_low.rsi + layers: + - state: statue_head_l + +- type: entity + id: CP14StatueWizard + parent: BaseStructure + name: statue wizard + description: A statue of a magician holding magic. + categories: [ ForkFiltered ] + components: + - type: Sprite + noRot: true + sprite: _CP14/Structures/Decoration/wizard_statue.rsi + layers: + - state: statue_wizard + drawdepth: Mobs + offset: "0.0,0.5" + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.20,-0.35,0.20,0.35" + density: 100 + mask: + - MachineMask + layer: + - MachineLayer + - type: SpriteFade + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 110 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + CP14StoneBlock1: + min: 2 + max: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml new file mode 100644 index 0000000000..e0f8094483 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/potted_plants.yml @@ -0,0 +1,87 @@ +- type: entity + id: CP14PottedPlantBase + parent: BaseStructureDynamic + name: potted plant + description: A domesticated plant in a clay pot, more plants. + abstract: true + categories: [ ForkFiltered ] + components: + - type: SpriteFade + - type: Transform + noRot: true + - type: InteractionOutline + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.1 + density: 120 + mask: + - HighImpassable + - type: Sprite + drawdepth: Overdoors + offset: "0.0,0.3" + noRot: true + sprite: _CP14/Structures/Furniture/flowerpots.rsi + - type: Speech + speechVerb: Plant + - type: SecretStash + tryInsertItemSound: /Audio/Effects/plant_rustle.ogg + tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg + secretStashName: secret-stash-plant + - type: ContainerContainer + containers: + stash: !type:ContainerSlot {} + - type: Pullable + - type: Damageable + damageContainer: StructuralInorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/plant_rustle.ogg + +- type: entity + id: CP14PottedPlant1 + parent: CP14PottedPlantBase + components: + - type: Sprite + layers: + - state: pot + - state: plant1 + +- type: entity + id: CP14PottedPlant2 + parent: CP14PottedPlantBase + components: + - type: Sprite + layers: + - state: pot + - state: plant2 + +- type: entity + id: CP14PottedPlant3 + parent: CP14PottedPlantBase + components: + - type: Sprite + layers: + - state: pot + - state: plant3 + +- type: entity + id: CP14PottedPlant4 + parent: CP14PottedPlantBase + components: + - type: Sprite + layers: + - state: pot + - state: plant4 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml index 5da1425850..ee0002d107 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml @@ -44,4 +44,28 @@ entity: CP14BaseLucensTreeLarge count: 10 minGroupSize: 1 - maxGroupSize: 1 \ No newline at end of file + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: StatueStoneHead + tiers: + - 1 + - 2 + - 3 + generationWeight: 0.1 + generationProb: 0.1 + categories: + Fun: 1 + requiredTags: + - CP14DemiplaneOpenSky + layers: + - !type:OreDunGen + entity: CP14StatueStoneHeadHigh + count: 1 + minGroupSize: 1 + maxGroupSize: 1 + - !type:OreDunGen + entity: CP14StatueStoneHeadLow + count: 1 + minGroupSize: 1 + maxGroupSize: 1 diff --git a/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left1.png b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left1.png new file mode 100644 index 0000000000..833a1a278a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left1.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left2.png b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left2.png new file mode 100644 index 0000000000..0dedcd91f4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_left2.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right1.png b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right1.png new file mode 100644 index 0000000000..eae9a70251 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right1.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right2.png b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right2.png new file mode 100644 index 0000000000..99abf0a34d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/cobweb_right2.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/meta.json b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/meta.json new file mode 100644 index 0000000000..c3d1987f18 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Decoration/cobweb.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by vladimir.s ", + "size": { + "x": 32, + "y": 96 + }, + "states": [ + { + "name": "cobweb_left1", + "directions": 4 + }, + { + "name": "cobweb_left2", + "directions": 4 + }, + { + "name": "cobweb_right1", + "directions": 4 + }, + { + "name": "cobweb_right2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/meta.json b/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/meta.json new file mode 100644 index 0000000000..a4c0088f9b --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s ", + "size": { + "x": 64, + "y": 80 + }, + "states": [ + { + "name": "statue_head_h" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/statue_head_h.png b/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/statue_head_h.png new file mode 100644 index 0000000000..eba20cf916 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/stone_head_high.rsi/statue_head_h.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/meta.json b/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/meta.json new file mode 100644 index 0000000000..6019019ff8 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s ", + "size": { + "x": 48, + "y": 64 + }, + "states": [ + { + "name": "statue_head_l" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/statue_head_l.png b/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/statue_head_l.png new file mode 100644 index 0000000000..2c2beee9e0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/stone_head_low.rsi/statue_head_l.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/meta.json b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/meta.json new file mode 100644 index 0000000000..1192794454 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s ", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "statue_wizard" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png new file mode 100644 index 0000000000..28ad24e6ec Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/meta.json new file mode 100644 index 0000000000..14687fc943 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pot" + }, + { + "name": "plant1" + }, + { + "name": "plant2" + }, + { + "name": "plant3" + }, + { + "name": "plant4" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant1.png b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant1.png new file mode 100644 index 0000000000..3644f573ee Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant1.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant2.png b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant2.png new file mode 100644 index 0000000000..3fbc7bf902 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant2.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant3.png b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant3.png new file mode 100644 index 0000000000..6c1768d0d9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant3.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant4.png b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant4.png new file mode 100644 index 0000000000..404fff654c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/plant4.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/pot.png b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/pot.png new file mode 100644 index 0000000000..431dd3d1cd Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/flowerpots.rsi/pot.png differ