Skip to content

Commit

Permalink
Update Snowasis (space-wizards#33364)
Browse files Browse the repository at this point in the history
* Update Snowasis

* Appease test gods

* Woops had the leftward animation backwards. Fixed.

* add santa suits and envelopes to chapel

* It looks worse unscaled but whatever.

* fix ghost role

* examines
  • Loading branch information
IProduceWidgets authored Dec 1, 2024
1 parent 5fdf03c commit bf312f2
Show file tree
Hide file tree
Showing 18 changed files with 5,115 additions and 3,025 deletions.
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -310,3 +310,7 @@ ghost-role-information-artifact-description = Enact your eldritch whims. Forcibl
ghost-role-information-tomatokiller-name = Tomato killer
ghost-role-information-tomatokiller-description = This little tomato will serve the botanist for the rest of his life... that is, a couple of minutes
ghost-role-information-gingerbread-name = Gingerbread Man
ghost-role-information-gingerbread-description = A being of pure holiday spirit.
Spread molassesy goodness and to all good cheer.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/species/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ species-name-arachnid = Arachnid
species-name-moth = Moth Person
species-name-skeleton = Skeleton
species-name-vox = Vox
species-name-gingerbread = delicious baked good
## Misc species things

Expand Down
7,829 changes: 4,805 additions & 3,024 deletions Resources/Maps/oasis.yml

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@
category: cargoproduct-category-name-service
group: market

- type: cargoProduct
id: ServiceLightsHoliday
icon:
sprite: Objects/Power/light_bulb.rsi
state: normal
product: CrateServiceHolidayLights
cost: 800
category: cargoproduct-category-name-service
group: market

- type: cargoProduct
id: MousetrapBoxes
icon:
Expand Down Expand Up @@ -207,3 +217,5 @@
cost: 500
category: cargoproduct-category-name-service
group: market


20 changes: 20 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,26 @@
- id: LightBulb
amount: 6

- type: entity
name: holiday lighttube box
parent: BoxLightbulb
id: BoxLighttubeHoliday
components:
- type: StorageFill
contents:
- id: LightTubeCrystalRed # Its alternating on purpose for the light replacer.
- id: LightTubeCrystalGreen
- id: LightTubeCrystalRed
- id: LightTubeCrystalGreen
- id: LightTubeCrystalRed
- id: LightTubeCrystalGreen
- id: LightTubeCrystalRed
- id: LightTubeCrystalGreen
- id: LightTubeCrystalRed
- id: LightTubeCrystalGreen
- id: LightTubeCrystalRed
- id: LightTubeCrystalGreen

- type: entity
name: PDA box
parent: BoxCardboard
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
- id: BoxLighttube
- id: BoxLightbulb

- type: entity
id: CrateServiceHolidayLights
parent: CrateGenericSteel
name: holiday lights crate
description: Deck the halls with these festive holiday lights!
components:
- type: StorageFill
contents:
- id: BoxLighttubeHoliday
- id: BoxLighttubeHoliday

- type: entity
id: CrateMousetrapBoxes
parent: CrateGenericSteel
Expand Down
43 changes: 43 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -880,3 +880,46 @@
- type: ConditionalSpawner
prototypes:
- MobHonkBot

- type: entity
name: gingerbread man Spawner
id: SpawnMobGingerbreadAI
suffix: Ghostrole
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: full
sprite: Mobs/Species/Gingerbread/parts.rsi
- type: ConditionalSpawner
prototypes:
- MobGingerbreadAI

- type: entity
name: Reindeer Buck Spawner
id: SpawnMobReindeerBuck
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: reindeer_buck_still
sprite: Mobs/Animals/reindeer_buck.rsi
- type: ConditionalSpawner
prototypes:
- MobReindeerBuck

- type: entity
name: Reindeer Doe Spawner
id: SpawnMobReindeerDoe
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: reindeer_doe_still
sprite: Mobs/Animals/reindeer_doe.rsi
- type: ConditionalSpawner
prototypes:
- MobReindeerDoe
94 changes: 94 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3468,3 +3468,97 @@
components:
- type: ReplacementAccent
accent: nymph

- type: entity
name: reindeer buck
parent: [ SimpleMobBase, MobCombat ]
id: MobReindeerBuck
description: You think it can pull a sleigh?
components:
- type: Sprite
drawdepth: Mobs
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: reindeer_buck
sprite: Mobs/Animals/reindeer_buck.rsi
# - type: SpriteMovement # One day when this shit isnt broken as hell. For now they hoppity hop.
# movementLayers:
# movement:
# state: reindeer_buck
# noMovementLayers:
# movement:
# state: reindeer_buck_still
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.48
density: 200
mask:
- MobMask
layer:
- MobLayer
- type: DamageStateVisuals
states:
Alive:
Base: reindeer_buck
Critical:
Base: reindeer_buck_dead
Dead:
Base: reindeer_buck_dead
- type: Butcherable
spawned:
- id: FoodMeat
amount: 4
- type: Bloodstream
bloodMaxVolume: 300
# Horns though
- type: MeleeWeapon
damage:
types:
Piercing: 22
animation: WeaponArcFist
- type: NPCRetaliation
- type: FactionException
- type: NpcFactionMember
factions:
- Passive
- type: HTN
rootTask:
task: SimpleHostileCompound
- type: Puller
needsHands: false

- type: entity
name: reindeer doe
parent: MobReindeerBuck
id: MobReindeerDoe
components:
- type: MeleeWeapon
damage:
types:
Blunt: 15
animation: WeaponArcFist
- type: Sprite
drawdepth: Mobs
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: reindeer_doe
sprite: Mobs/Animals/reindeer_doe.rsi
# - type: SpriteMovement # One day when this shit isnt broken as hell. For now they hoppity hop.
# movementLayers:
# movement:
# state: reindeer_doe
# noMovementLayers:
# movement:
# state: reindeer_doe_still
- type: DamageStateVisuals
states:
Alive:
Base: reindeer_doe
Critical:
Base: reindeer_doe_dead
Dead:
Base: reindeer_doe_dead
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,23 @@
damageRecovery:
types:
Asphyxiation: -1.0

- type: entity
name: gingerbread man
id: MobGingerbreadAI
parent: [ MobGingerbread, MobCombat]
components:
- type: GhostRole
name: ghost-role-information-gingerbread-name
description: ghost-role-information-gingerbread-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: NPCRetaliation
- type: FactionException
- type: NpcFactionMember
factions:
- Passive
- type: HTN
rootTask:
task: SimpleHostileCompound

2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/gingerbread.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: species
id: Gingerbread
name: species-name-human
name: species-name-gingerbread
roundStart: false
prototype: MobGingerbread
sprites: MobGingerbreadSprites
Expand Down
52 changes: 52 additions & 0 deletions Resources/Textures/Mobs/Animals/reindeer_buck.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
"states": [
{
"name": "reindeer_buck",
"directions": 4,
"delays": [
[
1,
0.2,
0.2,
0.2,
0.2
],
[
1,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
1
],
[
0.2,
0.2,
0.2,
0.2,
1
]
]
},
{
"name": "reindeer_buck_still",
"directions": 4
},
{
"name": "reindeer_buck_dead"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions Resources/Textures/Mobs/Animals/reindeer_doe.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Deer by Calciumtrice, usable under Creative Commons Attribution 3.0 license, from https://opengameart.org/content/deer, edited by IProduceWidgets (github)",
"states": [
{
"name": "reindeer_doe",
"directions": 4,
"delays": [
[
1,
0.2,
0.2,
0.2,
0.2
],
[
1,
0.2,
0.2,
0.2,
0.2
],
[
0.2,
0.2,
0.2,
0.2,
1
],
[
0.2,
0.2,
0.2,
0.2,
1
]
]
},
{
"name": "reindeer_doe_still",
"directions": 4
},
{
"name": "reindeer_doe_dead"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bf312f2

Please sign in to comment.