From c7b230857fe4d1c4965f8c286b53d508e7ea8990 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Fri, 8 Nov 2024 09:26:08 +0200 Subject: [PATCH] Royal pumpkin (#547) * royal pumpkin * Secret zombie fix --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Structures/Flora/royalpumpkin.yml | 74 ++++++++++++++++++ .../Procedural/Demiplane/Modifiers/test.yml | 22 +++++- .../pumpkin_king.rsi/brother_pumpkin_king.png | Bin 0 -> 1945 bytes .../Mobs/Monster/pumpkin_king.rsi/meta.json | 18 +++++ .../Monster/pumpkin_king.rsi/pumpkin_king.png | Bin 0 -> 4017 bytes .../Flora/royal_pumpkin.rsi/meta.json | 14 ++++ .../Flora/royal_pumpkin.rsi/royal_pumpkin.png | Bin 0 -> 1616 bytes 7 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Flora/royalpumpkin.yml create mode 100644 Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/brother_pumpkin_king.png create mode 100644 Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/pumpkin_king.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/royal_pumpkin.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Flora/royal_pumpkin.rsi/royal_pumpkin.png diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/royalpumpkin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/royalpumpkin.yml new file mode 100644 index 0000000000..5a3f539734 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/royalpumpkin.yml @@ -0,0 +1,74 @@ +- type: entity + id: CP14RoyalPumpkin + parent: CP14BaseFlammableSpreading + name: royal pumpkin + description: It's a huge pumpkin, it feels like you could even make a carriage out of it. + categories: [ ForkFiltered ] + components: + - type: Clickable + - type: Sprite + noRot: true + sprite: _CP14/Structures/Flora/royal_pumpkin.rsi + drawdepth: Mobs + state: royal_pumpkin + - type: FlavorProfile + flavors: + - pumpkin + - type: Food + - type: Damageable + damageContainer: Biological + damageModifierSet: Inflatable + - type: Physics + bodyType: Static + - type: SolutionContainerManager + solutions: + food: + maxVol: 650 + reagents: + - ReagentId: PumpkinFlesh + Quantity: 500 + - ReagentId: Vitamin + Quantity: 125 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.5 + density: 1000 + layer: + - WallLayer + - type: Destructible + thresholds: + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:SpillBehavior + solution: food + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg # Поменять звук + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14FoodPumpkinSlice: + min: 20 + max: 25 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml index 76feaae69a..15b35b7850 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml @@ -283,7 +283,7 @@ - type: cp14DemiplaneModifier id: EnemyZombie difficulty: 0.4 - generationWeight: 20 + generationWeight: 1.5 layers: - !type:OreDunGen entity: CP14SpawnMobUndeadZombieRandom @@ -388,4 +388,22 @@ - CP14FloorBase count: 5 minGroupSize: 2 - maxGroupSize: 5 \ No newline at end of file + maxGroupSize: 5 + +- type: cp14DemiplaneModifier + id: RoyalPumpkin + reward: 0.2 + generationWeight: 0.1 + requiredTags: + - CP14DemiplaneGrass + - CP14DemiplaneOpenSky + layers: + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14RoyalPumpkin + count: 1 + minGroupSize: 1 + maxGroupSize: 1 diff --git a/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/brother_pumpkin_king.png b/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/brother_pumpkin_king.png new file mode 100644 index 0000000000000000000000000000000000000000..c4f9940063456a4dbb073c580528d5c32207cb41 GIT binary patch literal 1945 zcmV;K2WI$*P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2NX#}K~#8N?VDYQ zRaF$n&rGQ>QD#zOh96N#5>#Li=|lQbpj7l!^i&`{7C}AF%yUB2V+i#W^%NBf^^o?U z5mZzVrX=}M){x>?4W-$1f7|mP*X%jx?6uE5cl2R?a5?Afv(MgZ{nuLiT<>g)1s1rr zxcA{Zr_0lMVW>P_HE?*%J+~K|?!UflDT;mH{Tq%)fBdcZ;ftRKYU5QEVC(Z6r>)~L z^C84l6M)D+`}C^dBqFR|v$!~L^g_7CVG9{DC=upWfKQ(qoj!2veDT)e(cskfCq_a$ zj)R@+;^p5*3ZhTcVdqCv!Er?z0bu>= z8^cjZye>uPQ~>KV$nj;PBgN^-sc^n+-;&^{YF{N_qaQn7#iJigc4GT*dF%@ukDa&3 zd7@th&I=+8h^J2#M_ySu&8NIOb|> z-m;}XD{Km4KHV1N+4@ho=l` z1&GtXt9tI2uFI^G45*7n7nx8shBp|VGH4V)19&E^iwq9fPgkUD^3K&s2FMsn#)`IR z%g$LJ+Hys(jt*jh?Q{{eEPeH-^6UzN*~b>(m6}y95Xk#QrD={T z8@R5rw~nj~(1cBcliqJ^xa=H`lL4^+DJUbY6CR;ryPE8a>3b1uGH_yIB4hwZORpx& zv$<#u;jKZYp0?Y zKTcC!zw_RSa0I(}w#@?G8cjcs4MYGU`P?%r%d5-aIBi>Ae7tO#i(a1+OQoZ0u$k5c zwaW1Btcp|}{PzFkmYZiHr9~`8-vQ!?s*T?hV<&CaXdVw5Z{9NiLx0`1J2-1Uw8>Ef z!Z<-2_iz-4g`BSwvk{qUKX~Nt(0BPQ!?XI{x^zk9#{*+A zZmPe6aPsVh;U~_0-zu@q@7$I5rns23W=H;kNZR(TiJNYHe8Pgu0;^+ zp54@LP8sW2v{E#U#XXfA!O^B`w%&qvpzeNqfBQvH{PD|~q1#q1+e~^L9$ir^J#;KA zHg;jc5Uyzl-KP}l7S9xnVV&0;5{COko(1pRr5lQG4qgn7uU;`cv;DSb`|KYj4ekt3 zIx#rB`~LAzYma^ZZMX(SBc^R8*sf&a;>9|v ztdr1)FVx1|z015mK=g2zfE59(<6xavA5f`Sc;?)xsn0nlbwi_pl)h>C$Rip{|E~aS z2HO8+(zMVuk@XNFl&3S4H5QcbmCBe5jtvE^&Q$^+9>+400V^m@#^P%(joU_qR;pDI zFOo9Y8ViVGofK69^cY8UWsn@Ur5BBRZ3rOe6?qH>+RJ*K$(kDG+_OS}9EWJ!EIJb) zj+BsbBG*X9jh~^dJe{G9^U#?9P-PgjHEw|g78o!^@jsU@J>eYghRy&001jnXNoGw= f04e|g00;m8000000Mb*F00000NkvXXu0mjf%CMU7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/meta.json new file mode 100644 index 0000000000..719919fb59 --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 64, + "y": 64 + }, + "license": "CLA", + "copyright": "Created by KREKS for CrystallPunk14", + "states": [ + { + "name": "pumpkin_king", + "directions": 4 + }, + { + "name": "brother_pumpkin_king" + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/pumpkin_king.png b/Resources/Textures/_CP14/Mobs/Monster/pumpkin_king.rsi/pumpkin_king.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d7449447bf467a301210f0727bc82ca5f69967 GIT binary patch literal 4017 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 O0000