From caeb01787da5619cd605a28d99f47299ba8d20f0 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Mon, 27 May 2024 00:45:16 +1000 Subject: [PATCH 1/5] Shrimp Mob for Metempsychosis (#862) * shrinp add * Update metempsychoticNonHumanoids.yml fixed typo * Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> * Update Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> * Update fun.yml * Update meta.json remove ONE SILLY COMMA --------- Signed-off-by: leo <136020119+leonardo-dabepis@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com> --- .../DeltaV/Entities/Mobs/NPCs/fun.yml | 68 ++++++++++++++++++ .../metempsychoticNonHumanoids.yml | 1 + .../DeltaV/Mobs/Animals/shrimp.rsi/dead.png | Bin 0 -> 840 bytes .../DeltaV/Mobs/Animals/shrimp.rsi/meta.json | 24 +++++++ .../DeltaV/Mobs/Animals/shrimp.rsi/shrimp.png | Bin 0 -> 2945 bytes 5 files changed, 93 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml create mode 100644 Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/dead.png create mode 100644 Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/shrimp.png diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml new file mode 100644 index 00000000000..4626e8e2e45 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml @@ -0,0 +1,68 @@ +- type: entity + name: space shrimp + parent: [ SimpleMobBase, FlyingMobBase, MobCombat ] + id: MobSpaceShrimp + description: Shrimply cursed... + suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed. + components: + - type: MeleeWeapon + soundHit: + path: /Audio/Effects/pop.ogg + - type: MovementSpeedModifier + baseWalkSpeed : 6 + baseSprintSpeed : 6 + - type: Sprite + sprite: DeltaV/Mobs/Animals/shrimp.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: shrimp + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 100 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: Physics + - type: DamageStateVisuals + states: + Alive: + Base: shrimp + Dead: + Base: dead + - type: Butcherable + spawned: + - id: FoodMeatCrab + amount: 3 + - type: Bloodstream + bloodMaxVolume: 100 + bloodReagent: BbqSauce #australia reference + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-possum + interactFailureString: petting-failure-possum + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/raccoon_chatter.ogg + - type: Speech + speechSounds: Slime + - type: Puller + needsHands: false + - type: MindContainer + showExamineInfo: true + - type: PotentialPsionic + - type: Psionic + removable: false + - type: PyrokinesisPower + - type: NpcFactionMember + factions: + - Passive + - type: Body + prototype: Animal + - type: HTN + rootTask: + task: SimpleHostileCompound diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml index dcbe23f6082..4679e226110 100644 --- a/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml +++ b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml @@ -7,3 +7,4 @@ MobXenoQueen: 0.01 MobCrab: 0.01 MobPenguin: 1 #ODJ's orders + MobSpaceShrimp: 0.01 # Delta V - I hope this is funny enough diff --git a/Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/dead.png b/Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi/dead.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f1cff31f5bcd6991cb44faac0741b23658d317 GIT binary patch literal 840 zcmV-O1GoH%P)xUeUmD{Ia3sGB%bg{6qp zVVNVCgb5PBO@cD(^+r zWB>pF32;bRa{vG?BLDy{BLR4&KXw2B0f9+GK~z{r?UcVuLopD?&mW`U=Acq2ikr|u z>gwR=?9gs*&g~!2S?KKM=-}qw!NJAHLyB&q2&Fo76I>jm?f1b~l51WP>ZUmep?#P8 z+LDv4=7vp(7U#HC!_aZ ze6PdB+Pd{}9kp9l&pBWk45t`)=@4pgNJiK9UnO7$oF|!B_&kNBGf9EJr@#d7LGh;l SHGz%*0000fH`Di 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 literal 0 HcmV?d00001 From 8af92b81a487258cf2bb63bd3250465e58db689d Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sat, 7 Sep 2024 13:05:55 +0300 Subject: [PATCH 2/5] Increase chance to 1, else it's never gonna be chosen Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml index 9999fb78373..00114644412 100644 --- a/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml +++ b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml @@ -7,4 +7,4 @@ MobXenoQueen: 0.01 MobCrab: 0.01 MobPenguin: 1 - MobSpaceShrimp: 0.01 + MobSpaceShrimp: 1 From 6ed6638ebb993048cd85538e074a361142894e9f Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:19:34 +0300 Subject: [PATCH 3/5] Apply suggestions from code review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml index 4626e8e2e45..d3277a497e6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml @@ -3,7 +3,6 @@ parent: [ SimpleMobBase, FlyingMobBase, MobCombat ] id: MobSpaceShrimp description: Shrimply cursed... - suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed. components: - type: MeleeWeapon soundHit: @@ -40,7 +39,7 @@ amount: 3 - type: Bloodstream bloodMaxVolume: 100 - bloodReagent: BbqSauce #australia reference + bloodReagent: BbqSauce # Australia reference - type: InteractionPopup successChance: 0.5 interactSuccessString: petting-success-possum From 62eca8901e82e1369151c830244b440c33c5dfd1 Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sun, 8 Sep 2024 15:09:56 +0300 Subject: [PATCH 4/5] new psionics guh Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml index d3277a497e6..5ab97cedee7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml @@ -53,10 +53,11 @@ needsHands: false - type: MindContainer showExamineInfo: true - - type: PotentialPsionic - type: Psionic removable: false - - type: PyrokinesisPower + - type: InnatePsionicPowers + powersToAdd: + - PyrokinesisPower - type: NpcFactionMember factions: - Passive From 68d79ffb25772a71aea0072de55d8330a2f30714 Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:38:09 +0300 Subject: [PATCH 5/5] Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml Co-authored-by: VMSolidus Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml index 5ab97cedee7..96008395b3a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/fun.yml @@ -53,11 +53,6 @@ needsHands: false - type: MindContainer showExamineInfo: true - - type: Psionic - removable: false - - type: InnatePsionicPowers - powersToAdd: - - PyrokinesisPower - type: NpcFactionMember factions: - Passive