Merge pull request #430 from Fansana/bunch-of-sprites

Bunch of Sprites and Stuff
Fansana · Dec 27, 2024 · 02b4481 · 02b4481
2 parents 16eba1a + 6dd2b98
commit 02b4481
Show file tree

Hide file tree

Showing 71 changed files with 123,634 additions and 117,432 deletions.
diff --git a/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl
@@ -75,3 +75,5 @@ flavor-base-strange = strange
 flavor-complex-cherry = like cherries
 flavor-complex-walnut = like walnuts
 flavor-complex-despair = despair
+flavor-complex-eggnog = eggnog
+flavor-complex-syndicate-eggnog = like eggnog, and war profiteering
diff --git a/Resources/Locale/en-US/Floof/markings/felinid.ftl b/Resources/Locale/en-US/Floof/markings/felinid.ftl
@@ -0,0 +1,4 @@
+marking-FelinidTiger = Tiger Tail
+marking-FelinidTiger-m_tail_tiger_primary = Tiger Tail primary
+marking-FelinidTiger-m_tail_tiger_secondary = Tiger Tail secondary
+marking-FelinidTiger-m_tail_tiger_tertiary = Tiger Tail tertiary
diff --git a/Resources/Locale/en-US/Floof/markings/reptilian.ftl b/Resources/Locale/en-US/Floof/markings/reptilian.ftl
@@ -0,0 +1,10 @@
+marking-LizardFloofNeckfull = Neck Floof (Full)
+marking-LizardFloofNeckfull-floof_neckfull = Neck Floof
+
+marking-LizardFinTop = Aquatic Fin
+marking-LizardFinTop-primary = Aquatic Fin primary
+marking-LizardFinTop-secondary = Aquatic Fin secondary
+
+marking-LizardCrestLargeTop = Crest (Large)
+marking-LizardCrestLargeTop-primary = Crest (Large) primary
+marking-LizardCrestLargeTop-secondary = Crest (Large) secondary
diff --git a/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl
@@ -189,3 +189,9 @@ reagent-desc-jenn-tonic = Light golden and bubbly, what could go wrong?
 
 reagent-name-hallelujah = Hallelujah
 reagent-desc-hallelujah = Exactly what you need.
+
+reagent-name-eggnog = Eggnog
+reagent-desc-eggnog = creamy, pale yellow and topped with a sprinkle of cinnamon.
+
+reagent-name-syndicate-eggnog = Syndicate Eggnog
+reagent-desc-syndicate-eggnog = creamy, pale yellow and topped with a sprinkle of cinnamon and strongly alcoholic.
diff --git a/Resources/Maps/Floof/glacier.yml b/Resources/Maps/Floof/glacier.yml
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -72,17 +72,6 @@
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_neckfull
 
-# Floof
-- type: marking
-  id: LizardFloofNeckfull
-  bodyPart: HeadSide
-  markingCategory: HeadSide
-  speciesRestriction: [Reptilian]
-  sprites:
-  - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: floof_neckfull
-# end Floof
-
 - type: marking
   id: LizardHornsAngler
   bodyPart: HeadTop

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Rslimes.yml
@@ -83,22 +83,39 @@
 #         state: alive
 #         color: "#FFD35D"
 
-# - type: entity
-#   id: ReagentSlimeWehjuice
-#   parent: ReagentSlime
-#   suffix: Wehjuice
-#   components:
-#   - type: Bloodstream
-#     bloodReagent: JuiceThatMakesYouWeh
-#   - type: PointLight
-#     color: "#59b23a"
-#   - type: Sprite
-#     drawdepth: Mobs
-#     sprite: Mobs/Aliens/elemental.rsi
-#     layers:
-#       - map: [ "enum.DamageStateVisualLayers.Base" ]
-#         state: alive
-#         color: "#59b23a"
+- type: entity
+  id: ReagentSlimeWehjuice
+  parent: ReagentSlime
+  suffix: Wehjuice
+  components:
+  - type: Bloodstream
+    bloodReagent: JuiceThatMakesYouWeh
+  - type: PointLight
+    color: "#59b23a"
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/elemental.rsi
+    layers:
+      - map: [ "enum.DamageStateVisualLayers.Base" ]
+        state: alive
+        color: "#59b23a"
+
+- type: entity
+  id: ReagentSlimeIceCream
+  parent: ReagentSlime
+  suffix: IceCream
+  components:
+  - type: Bloodstream
+    bloodReagent: IceCream
+  - type: PointLight
+    color: "#fffbd6"
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/elemental.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: alive
+      color: "#fffbd6"
 
 # - type: entity
 #   id: ReagentCognizine

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -177,9 +177,10 @@
 
 - type: entity
   parent: VendingMachine
-  id: VendingMachineBooze
+  id: VendingMachineBoozeUnlocked
   name: Booze-O-Mat
   description: A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one.
+  suffix: Unlocked
   components:
   - type: VendingMachine
     pack: BoozeOMatInventory
@@ -203,12 +204,18 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: AccessReader
-    access: [["Bar"]]
   - type: GuideHelp
     guides:
     - Bartender
 
+- type: entity
+  parent: VendingMachineBoozeUnlocked
+  id: VendingMachineBooze
+  suffix: Bar
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCart

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -470,7 +470,7 @@
   components:
   - type: Appearance
   - type: AccessReader
-    access: [["Theatre"]]
+    access: [["Clown"]] # Floof
   - type: EntityStorageVisuals
     stateBaseClosed: clown
     stateDoorOpen: clown_open
@@ -484,7 +484,7 @@
   components:
   - type: Appearance
   - type: AccessReader
-    access: [["Theatre"]]
+    access: [["Mime"]] # Floof
   - type: EntityStorageVisuals
     stateBaseClosed: mime
     stateDoorOpen: mime_open

diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/amulet.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/amulet.yml
@@ -3,19 +3,49 @@
   parent: ClothingNeckBase
   id: ClothingNeckDragonAmuletPolymorph
   name: dragon amulet
+  abstract: true
   description: A beautiful gold amulet, featuring a ruby that shines with an otherworldly glow.
   components:
   - type: Sprite
     sprite: Floof/Clothing/Neck/amulet_dragon.rsi
   - type: Clothing
     sprite: Floof/Clothing/Neck/amulet_dragon.rsi
+
+- type: entity
+  parent: ClothingNeckDragonAmuletPolymorph
+  id: ClothingNeckDragonAmuletPolymorphRubyfang
+  name: dragon amulet
+  description: A beautiful gold amulet, featuring a ruby that shines with an otherworldly glow.
+  suffix: Rubyfang
+  components:
+  - type: PolymorphProvider
+    polymorph: PolymorphDragonRubyfang
+
+- type: entity
+  parent: ClothingNeckDragonAmuletPolymorph
+  id: ClothingNeckDragonAmuletPolymorphPire
+  name: dragon amulet
+  description: A beautiful gold amulet, featuring a ruby that shines with an otherworldly glow.
+  suffix: Pire
+  components:
   - type: PolymorphProvider
-    polymorph: PolymorphDragonRubyFang
+    polymorph: PolymorphDragonPire
 
 - type: polymorph
-  id: PolymorphDragonRubyFang
+  id: PolymorphDragonRubyfang
   configuration:
-    entity: MobDragonRubyFang
+    entity: MobDragonRubyfang
+    forced: false
+    inventory: None
+    transferName: true
+    transferDamage: true
+    revertOnCrit: true
+    revertOnDeath: true
+
+- type: polymorph
+  id: PolymorphDragonPire
+  configuration:
+    entity: MobDragonPire
     forced: false
     inventory: None
     transferName: true
@@ -25,7 +55,7 @@
 
 - type: entity
   parent: [ SimpleSpaceMobBase, FlyingMobBase ]
-  id: MobDragonRubyFang
+  id: MobDragonRubyfang
   suffix: ""
   name: Rubyfang
   description: A giant dragon, probably a couple thousand years old.
@@ -144,3 +174,125 @@
   - type: ActionGun
     action: ActionDragonsBreath
     gunProto: DragonsBreathGun
+
+- type: entity
+  parent: [ SimpleSpaceMobBase, FlyingMobBase ]
+  id: MobDragonPire
+  suffix: ""
+  name: Pire
+  description: A giant dragon, probably a couple thousand years old.
+  components:
+  - type: Bloodstream
+    bloodMaxVolume: 650
+  - type: Speech
+    speechVerb: LargeMob
+  - type: CombatMode
+  - type: MobMover
+  - type: InputMover
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3
+    baseSprintSpeed: 5
+    weightlessModifier: 1.5
+  - type: Sprite
+    color: "#c80000ff"
+    sprite: Mobs/Aliens/Carps/dragon.rsi
+    noRot: true
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: alive
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: alive-unshaded
+      shader: unshaded
+  - type: Appearance
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: alive
+        BaseUnshaded: alive-unshaded
+      Critical:
+        Base: crit
+      Dead:
+        Base: dead
+        BaseUnshaded: dead-unshaded
+  - type: Physics
+    bodyType: KinematicController
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.40
+        density: 100
+        mask:
+        - FlyingMobMask
+        layer:
+        - FlyingMobLayer
+  - type: MobState
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritLastWords
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      450: Critical
+      500: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      250: 0.7
+      400: 0.5
+  # disable taking damage from fire, since its a fire breathing dragon
+  - type: Flammable
+    damage:
+      types: {}
+  - type: Temperature
+    heatDamageThreshold: 800
+  - type: Metabolizer
+    solutionOnBody: false
+    updateInterval: 0.25
+    metabolizerTypes: [ Dragon ]
+    groups:
+    - id: Medicine
+    - id: Poison
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatDragon
+      amount: 2
+  - type: InteractionPopup
+    successChance: 0.25 # It's no goose, but you better smell like carp.
+    interactSuccessString: petting-success-dragon
+    interactFailureString: petting-failure-dragon
+    interactFailureSound:
+      path: /Audio/Animals/space_dragon_roar.ogg
+    soundPerceivedByOthers: false # A 75% chance for a loud roar would get old fast.
+  - type: MeleeWeapon
+    altDisarm: false
+    soundHit:
+      path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+    damage:
+      types:
+        Piercing: 15
+        Slash: 15
+  - type: Devourer
+    foodPreference: Humanoid
+    shouldStoreDevoured: true
+    chemical: Ichor
+    healRate: 15.0
+    whitelist:
+      components:
+      - MobState
+      - Door
+      tags:
+      - Wall
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - DoorBumpOpener
+  - type: UserInterface
+  - type: Puller
+    needsHands: false
+  - type: Hands
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/felinid.yml
@@ -0,0 +1,13 @@
+
+- type: marking
+  id: FelinidTiger
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Felinid, Human]
+  sprites:
+  - sprite: Floof/Mobs/Customization/Felinid/tiger_tail.rsi
+    state: m_tail_tiger_primary
+  - sprite: Floof/Mobs/Customization/Felinid/tiger_tail.rsi
+    state: m_tail_tiger_secondary
+  - sprite: Floof/Mobs/Customization/Felinid/tiger_tail.rsi
+    state: m_tail_tiger_tertiary
diff --git a/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -0,0 +1,31 @@
+
+- type: marking
+  id: LizardFloofNeckfull
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian, Human]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: floof_neckfull
+
+- type: marking
+  id: LizardFinTop
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian, Human]
+  sprites:
+  - sprite: Floof/Mobs/Customization/Reptilian/fin.rsi
+    state: primary
+  - sprite: Floof/Mobs/Customization/Reptilian/fin.rsi
+    state: secondary
+
+- type: marking
+  id: LizardCrestLargeTop
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [Reptilian, Human]
+  sprites:
+  - sprite: Floof/Mobs/Customization/Reptilian/crest_large.rsi
+    state: primary
+  - sprite: Floof/Mobs/Customization/Reptilian/crest_large.rsi
+    state: secondary