From cf78350e2e5872135ef56b4cdba633f901b19dcb Mon Sep 17 00:00:00 2001
From: Pancake <Pangogie@users.noreply.github.com>
Date: Sat, 30 Jul 2022 20:12:06 -0700
Subject: [PATCH] Monkey Polymorph Wand (#9829)

---
 .../Objects/Weapons/Guns/Basic/wands.yml      | 24 ++++++++--
 .../Weapons/Guns/Projectiles/magic.yml        | 44 ++++++++++++-------
 Resources/Prototypes/Polymorphs/polymorph.yml | 20 +++++++++
 3 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
index f2ba66be9a..a0c88584a2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
@@ -1,8 +1,6 @@
 - type: entity
-  name: wand of carp polymorph
   parent: WeaponWandBase
-  id: WeaponWandPolymorphCarp
-  description: For when you need a carp filet quick and the clown is looking juicy.
+  id: WeaponWandPolymorphBase
   components:
   - type: Sprite
     layers:
@@ -16,6 +14,26 @@
     proto: ProjectilePolyboltCarp
     capacity: 5
 
+- type: entity
+  name: wand of carp polymorph
+  parent: WeaponWandPolymorphBase
+  id: WeaponWandPolymorphCarp
+  description: For when you need a carp filet quick and the clown is looking juicy.
+  components:
+  - type: BasicEntityAmmoProvider
+    proto: ProjectilePolyboltCarp
+    capacity: 5
+
+- type: entity
+  name: wand of monkey polymorph
+  parent: WeaponWandPolymorphBase
+  id: WeaponWandPolymorphMonkey
+  description: For when you need a monkey friend.
+  components:
+  - type: BasicEntityAmmoProvider
+    proto: ProjectilePolyboltMonkey
+    capacity: 5
+
 - type: entity
   name: wand of fireball
   parent: WeaponWandBase
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index d08e159150..a43d732e41 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -17,9 +17,7 @@
     maxTileBreak: 0
 
 - type: entity
-  id: ProjectilePolyboltCarp
-  name: carp polybolt
-  description: Nooo, I don't wanna be fish!
+  id: ProjectilePolyboltBase
   parent: BaseBullet
   noSpawn: true
   components:
@@ -28,24 +26,42 @@
     layers:
     - state: spell
       color: '#00FF00'
-  - type: PolymorphOnCollide
-    polymorph: WizardForcedCarp
-    whitelist:
-      components:
-      - Body
-    blacklist:
-      tags:
-      - Carp # can't re-polymorph
   - type: Projectile
     damage:
       types:
         Poison: 5
 
+- type: entity
+  id: ProjectilePolyboltCarp
+  parent: ProjectilePolyboltBase
+  name: carp polybolt
+  description: Nooo, I don't wanna be fish!
+  noSpawn: true
+  components:
+  - type: PolymorphOnCollide
+    polymorph: WizardForcedCarp
+    whitelist:
+      components:
+      - Body
+
+- type: entity
+  id: ProjectilePolyboltMonkey
+  parent: ProjectilePolyboltBase
+  name: monkey polybolt
+  description: Nooo, I don't wanna be monkey!
+  noSpawn: true
+  components:
+  - type: PolymorphOnCollide
+    polymorph: WizardForcedMonkey
+    whitelist:
+      components:
+      - Body
+
 - type: entity
   id: ProjectilePolyboltDoor
+  parent: ProjectilePolyboltBase
   name: door polybolt
   description: Nooo, I don't wanna be door!
-  parent: BaseBullet
   noSpawn: true
   components:
   - type: Sprite
@@ -61,10 +77,6 @@
       - Firelock
       tags:
       - Wall
-  - type: Projectile
-    damage:
-      types:
-        Poison: 5
 
 - type: entity
   id: ProjectileHealingBolt
diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml
index 1bad0ffb8b..628c1aa8e8 100644
--- a/Resources/Prototypes/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/Polymorphs/polymorph.yml
@@ -28,6 +28,26 @@
   revertOnCrit: false
   revertOnDeath: true
 
+- type: polymorph
+  id: WizardForcedSkeleton
+  entity: MobSkeletonPerson
+  forced: true
+  inventory: Drop
+  transferName: true
+  transferDamage: true
+  revertOnCrit: false
+  revertOnDeath: false
+
+- type: polymorph
+  id: WizardForcedMonkey
+  entity: MobMonkey
+  forced: true
+  inventory: None
+  transferName: true
+  transferDamage: true
+  revertOnCrit: false
+  revertOnDeath: true
+
 - type: polymorph
   id: WizardWallDoor
   entity: WoodDoor