From 7155b940c47032d3b2c59ebf812ad895a09b5ae8 Mon Sep 17 00:00:00 2001 From: Fansana Date: Fri, 13 Sep 2024 05:57:07 +0200 Subject: [PATCH 1/3] add dragon egg from frontier --- .../Objects/Consumable/Food/dragon_egg.yml | 82 ++++++++++++++++++ .../Floof/Entities/Objects/Lewd/eggs.yml | 10 +-- .../Consumable/Food/dragon_egg.rsi/broken.png | Bin 0 -> 584 bytes .../Consumable/Food/dragon_egg.rsi/icon.png | Bin 0 -> 513 bytes .../Food/dragon_egg.rsi/inhand-left.png | Bin 0 -> 1010 bytes .../Food/dragon_egg.rsi/inhand-right.png | Bin 0 -> 1010 bytes .../Consumable/Food/dragon_egg.rsi/meta.json | 25 ++++++ 7 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/dragon_egg.yml create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/broken.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/icon.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/dragon_egg.yml b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/dragon_egg.yml new file mode 100644 index 00000000000..751f50afa86 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Consumable/Food/dragon_egg.yml @@ -0,0 +1,82 @@ +- type: entity + parent: FoodEggBase + id: DragonEgg + name: dragon egg + description: How many did you kill just to get one of these eggs. + components: + - type: Sprite + sprite: Floof/Objects/Consumable/Food/dragon_egg.rsi + state: icon + - type: Item + sprite: Floof/Objects/Consumable/Food/dragon_egg.rsi + size: Large + - type: MultiHandedItem + - type: Food + trash: DragonEggshells + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Damageable + damageContainer: Biological + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:SpawnEntitiesBehavior + spawn: + DragonEggshells: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 36 + reagents: + - data: null + ReagentId: Egg + Quantity: 12 + - data: null + ReagentId: Ichor + Quantity: 12 + - data: null + ReagentId: Vitamin + Quantity: 12 + - type: StaticPrice + price: 20000 + +- type: entity + name: dragon eggshells + parent: BaseItem + id: DragonEggshells + description: You're walkin' on 'em bud. + components: + - type: Sprite + sprite: Floof/Objects/Consumable/Food/dragon_egg.rsi + state: broken + - type: Food + - type: Item + sprite: Objects/Consumable/Food/egg.rsi + size: Large + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Egg + Quantity: 1 + - type: Tag + tags: + - Egg + - Trash + - type: SpaceGarbage diff --git a/Resources/Prototypes/Floof/Entities/Objects/Lewd/eggs.yml b/Resources/Prototypes/Floof/Entities/Objects/Lewd/eggs.yml index 8d1c005f8a2..13bb43925b3 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Lewd/eggs.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Lewd/eggs.yml @@ -1,6 +1,6 @@ - type: entity parent: BaseItem - id: BasicEgg + id: BasicEggEaster name: basic egg description: A large and shiny egg, couldn't have been laid by a chicken! components: @@ -10,7 +10,7 @@ - type: entity parent: BaseItem - id: DragonEgg + id: DragonEggEaster name: dragon egg description: A warm and shimmering egg, power could be felt from within... components: @@ -20,7 +20,7 @@ - type: entity parent: BaseItem - id: VoidEgg + id: VoidEggEaster name: void egg description: A void egg. This has to be dangerous, right? components: @@ -30,7 +30,7 @@ - type: entity parent: BaseItem - id: SlimeEgg + id: SlimeEggEaster name: slime egg description: A globby and squishy egg, feels nasty. components: @@ -40,7 +40,7 @@ - type: entity parent: BaseItem - id: HoneyEgg + id: HoneyEggEaster name: honeycomb egg description: An egg covered in a sticky and sweet honey. components: diff --git a/Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/broken.png b/Resources/Textures/Floof/Objects/Consumable/Food/dragon_egg.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..63966bcebc80297190597ed1e28310509090c4ad GIT binary patch literal 584 zcmV-O0=NB%P)Px#1ZP1_K>z@;j|==^1poj6*hxe|R9HvtmOn2;Q5eQwc9BX4f{0p*4(?!RL=1E= zAn7JCbtDoW#V4@Zd;u0Q81GWS(k8SR8X^&E^?9B5I6b}R+^c1~zoa?mo-FcBa~$v*kU&9Up1;q|uc*9N;d&T` zRKE#(f@4m(v`S(1R<-y|I1M0B>+PNE*~}=H2y6loJGgCN;0%~1B&{Z<0B3A5AbNf5 z>2u-j1PF=}MwS=mcspFHld(daIEWo!GM*V}%XWY`0T@bR;?LMxS<)GRIKJ(y*bJ+( zZ$tnkwnXZ3U~z7ICSp^ls$C>Wy}k)!(|jmh2hte`L5?cB^zhhFE#KD;hY;_9%LL}3 zPn&r9@EVBRf+%sJxVAy)!x+`15m7M#qd^ephb)R7M=o(*{rWZ)^E1?}-ErIT$*Eoy z=Gm{NWCGt&s|U_B+K%7ChNkwi2lCFKXAFAN7c28@&`wg3PC4rN$LW=%~1DgXcg2mk;8 W00000(o>TF0000Px$yGcYrR9J=WmOW3xKp4k=8si5bEX4LqnILw#(SbN%2Ny^>yWmLpIPQJ}5?maJ z69Z!x3=k7YS_qgBS4SM6M~iQL(YW-VbZ9Tv=l9(6-2VE|s$wUC(Z^N990kpe4we8L?E)lv$=b@V@;J#uv;e0aUq*zj!|2cp(%h*;0 zXE0PdU_KckbPZXpsS^1H^}7JC9sokuAg3z`|A9^Ir;8OKi;kg4R_uB+n$0Htejn%Y zemAgfM%${;?)DM^d~2P`g17Y+x~4L3cYC3%{ZhoW<47wIv|J~U^*%_Fv*5=GACBNp zlr;ND06qk4{C;}}*yzPx&tVu*cRCt{2n!jrzK@`Wo9!DxG5e{W{!wLtHY>_D?NQ%TV5vzCcHw5Q5XQbC{M503i7^^jvmkTC4(G0Wb>6xK=5{@kYSQBk=ry#_LkYy9~ErHyqEqc|;sMv*IMZQLwP2xcWEIkGTuY(Wad=w%Z`+jS>49AyQ zY$XzjL?V$$Boc{arHSn%wFs#^i9RCB<3Xre9JsiQ{g|4R9518|0#oNnKF#h3^-U71 zKFH*FZ{%Oi=hLzEArt^6mFLp{{5!(avvUwaViQS|mg9vpfMQxU8pkKV^8@hm2*(?t zRw)Y^xCl93C;)U$nwE`fy@{v(Jrhcj;BRug2*MfQcq3HnO}MVhoHs2SwZkK3V3aK2 zk>f=W3V`E{py#r(wgBV4WHrD-GfN79; zvVe|$7&)F-4u6l(KA_!hr}nqE#zCV>JA14aFtsS70=y%YQK18K<@k2HEwmSiWh3Nx zBh(I$psl?z=Yz7D`RjM2b{8SX$5I4o8dAC3v}_=w`o;pGrR^Ce@640qMG?vXx=x#x z4fA&DB-uScsZ>Jm`byZqd2&2DU7;Px&tVu*cRCt{2n!jrzK@`Wo9!DxG5e{W{!wLtHY>_D?NQ%TV5vzCcHw5Q5XQbC{M503i7^^jvmkTC4(G0Wb>6xK=5{@kYSQBk=ry#_LkYy9~ErHyqEqc|;sMv*IMZQLwP2xcWEIkGTuY(Wad=w%Z`+jS>49AyQ zY$XzjL?V$$Boc{arHSn%wFs#^i9RCB<3Xre9JsiQ{g|4R9518|0#oNnKF#h3^-U71 zKFH*FZ{%Oi=hLzEArt^6mFLp{{5!(avvUwaViQS|mg9vpfMQxU8pkKV^8@hm2*(?t zRw)Y^xCl93C;)U$nwE`fy@{v(Jrhcj;BRug2*MfQcq3HnO}MVhoHs2SwZkK3V3aK2 zk>f=W3V`E{py#r(wgBV4WHrD-GfN79; zvVe|$7&)F-4u6l(KA_!hr}nqE#zCV>JA14aFtsS70=y%YQK18K<@k2HEwmSiWh3Nx zBh(I$psl?z=Yz7D`RjM2b{8SX$5I4o8dAC3v}_=w`o;pGrR^Ce@640qMG?vXx=x#x z4fA&DB-uScsZ>Jm`byZqd2&2DU7; Date: Fri, 13 Sep 2024 06:13:20 +0200 Subject: [PATCH 2/3] add missing migration --- Resources/Migrations/floofstation.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Migrations/floofstation.yml b/Resources/Migrations/floofstation.yml index 30f4c6d0d19..10976ae1a06 100644 --- a/Resources/Migrations/floofstation.yml +++ b/Resources/Migrations/floofstation.yml @@ -1,2 +1,8 @@ # 2024-08-07 Bonfire: BonfireLit +# 2024-09-13 +BasicEgg: BasicEggEaster +DragonEgg: DragonEggEaster +VoidEgg: VoidEggEaster +SlimeEgg: SlimeEggEaster +HoneyEgg: HoneyEggEaster From bca3971a5aa7cecb7c6e3b39f101030db352c816 Mon Sep 17 00:00:00 2001 From: Fansana Date: Fri, 13 Sep 2024 06:22:34 +0200 Subject: [PATCH 3/3] Revert "add migration" This reverts commit 63c3f5bd --- Resources/Migrations/floofstation.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Resources/Migrations/floofstation.yml b/Resources/Migrations/floofstation.yml index 10976ae1a06..30f4c6d0d19 100644 --- a/Resources/Migrations/floofstation.yml +++ b/Resources/Migrations/floofstation.yml @@ -1,8 +1,2 @@ # 2024-08-07 Bonfire: BonfireLit -# 2024-09-13 -BasicEgg: BasicEggEaster -DragonEgg: DragonEggEaster -VoidEgg: VoidEggEaster -SlimeEgg: SlimeEggEaster -HoneyEgg: HoneyEggEaster