Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Halloween #113

Merged
merged 3 commits into from
Oct 31, 2024
Merged

Halloween #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
657b022
Halloween
Gersoon458 Oct 30, 2024
f889454
Merge remote-tracking branch 'upstream/master' into Halloween
Gersoon458 Oct 30, 2024
eb6b70f
HotFIX
Gersoon458 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15,110 changes: 8,173 additions & 6,937 deletions Resources/Maps/DryDock.yml
View file
Open in desktop

Large diffs are not rendered by default.

12,109 changes: 6,492 additions & 5,617 deletions Resources/Maps/Moose.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
components:
- type: StorageFill
contents:
- id: PresentHalloweenRandom #Temporary edition for halloween time. WWDP edit
prob: 1
- id: Lantern
prob: 0.50
- id: Wirecutter
Expand Down
110 changes: 110 additions & 0 deletions Resources/Prototypes/Entities/Objects/Decoration/flora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,3 +627,113 @@
- type: Sprite
sprite: Objects/Decoration/Flora/flora_treeslight.rsi
state: tree06

#Autumn large tree
- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge01
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge01

- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge02
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge02

- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge03
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge03

- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge04
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge04

- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge05
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge05

- type: entity
parent: BaseTreeLarge
id: FloraTreeAutumnOrangeLarge06
name: large tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_treeslarge.rsi
state: orangelarge06

#Autumn tree
- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange01
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange01

- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange02
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange02

- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange03
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange03

- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange04
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange04

- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange05
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange05

- type: entity
parent: BaseTree
id: FloraTreeAutumnOrange06
name: tree
components:
- type: Sprite
sprite: _White/Objects/Decoration/Flora/autumn_trees.rsi
state: orange06
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
whitelist:
components:
- Pill
- Food
tags:
- FoodSnack
- type: ContainerContainer
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
id: CargoPDA
ears: ClothingHeadsetCargo
pocket1: AppraisalTool
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtCargo
satchel: ClothingBackpackSatchelCargoFilled
duffelbag: ClothingBackpackDuffelCargoFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
ears: ClothingHeadsetQM
belt: BoxFolderClipboard
pocket1: AppraisalTool
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtQM
satchel: ClothingBackpackSatchelQuartermasterFilled
duffelbag: ClothingBackpackDuffelQuartermasterFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@
shoes: ClothingShoesBootsSalvage
id: SalvagePDA
ears: ClothingHeadsetCargo
inhand:
- CandyBucket
- PresentHalloweenRandom
satchel: ClothingBackpackSatchelSalvageFilled
duffelbag: ClothingBackpackDuffelSalvageFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
shoes: ClothingShoesColorBlack
id: PassengerPDA
ears: ClothingHeadsetGrey
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtColorGrey
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
shoes: ClothingShoesColorBlack
id: BartenderPDA
ears: ClothingHeadsetService
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
ears: ClothingHeadsetService
outerClothing: ClothingOuterApronBotanist
belt: ClothingBeltPlantFilled
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtHydroponics
satchel: ClothingBackpackSatchelHydroponicsFilled
duffelbag: ClothingBackpackDuffelHydroponicsFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
shoes: ClothingShoesColorBlack
id: ChaplainPDA
ears: ClothingHeadsetScience
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtChaplain
satchel: ClothingBackpackSatchelChaplainFilled
duffelbag: ClothingBackpackDuffelChaplainFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
ears: ClothingHeadsetService
outerClothing: ClothingOuterApronChef
belt: ClothingBeltChefFilled
inhand:
- CandyBucket
- PresentHalloweenRandom
Comment on lines +37 to +39
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Consider reducing starting Halloween items and marking them as seasonal

Based on the verification:

  1. Both items lack explicit seasonal/temporary markers in their definitions, though Halloween presents are clearly themed
  2. Starting with both items (candy bucket + random present) seems excessive as:
    • Candy bucket is a storage container for snacks
    • Halloween presents contain various rewards (sweets, clothing, or even a "soul")
  3. The random presents have multiple variants with different loot pools, making their starting impact unpredictable

Recommendations:

  • Consider giving only one item (either bucket or present) as starting gear
  • Add seasonal/temporary markers to both items' definitions
  • Document the intended duration of these additions in the codebase
🔗 Analysis chain

Verify item definitions and consider gameplay balance.

While adding Halloween items aligns with the PR objectives, please consider:

  1. The gameplay balance implications of giving both a candy bucket and a random Halloween present to every role
  2. Whether these items should be temporary/seasonal or permanent additions

Let's verify the item definitions:

Let me verify the contents of these presents to better assess gameplay balance.

Let me check the contents of the candy bucket and look for any seasonal/temporary markers.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for CandyBucket and PresentHalloweenRandom definitions
echo "Searching for CandyBucket definition..."
rg "id: CandyBucket" -A 5

echo "Searching for PresentHalloweenRandom definition..."
rg "id: PresentHalloweenRandom" -A 5

Length of output: 6096

Script:

#!/bin/bash
# Search for the contents of Halloween presents
echo "Searching for PresentHalloweenBase definition..."
rg "id: PresentHalloweenBase" -A 10

echo "Searching for gift pools..."
rg "GiftPool:|GiftPoolSoul:" -A 10

Length of output: 3796

Script:

#!/bin/bash
# Check candy bucket components and storage
echo "Checking candy bucket components..."
rg -A 15 "components:" Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml

# Look for seasonal/temporary markers
echo "Checking for seasonal markers..."
rg -i "seasonal|temporary|halloween" Resources/Prototypes/Entities/Objects/Fun/candy_bucket.yml
rg -i "seasonal|temporary|halloween" Resources/Prototypes/_White/Entities/Objects/Decoration/halloweenpresent.yml

Length of output: 3415

innerClothingSkirt: ClothingUniformJumpskirtChef
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,8 @@
pocket2: ClownRecorder
id: ClownPDA
ears: ClothingHeadsetService
inhand:
- CandyBucket
- PresentHalloweenRandom
satchel: ClothingBackpackSatchelClownFilled
duffelbag: ClothingBackpackDuffelClownFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
head: ClothingHeadHatCatEars
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
inhand:
- CandyBucket
- PresentHalloweenRandom
Comment on lines +43 to +45
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Halloween items should be added to regular JanitorGear

The search results show that Halloween items (CandyBucket and PresentHalloweenRandom) have been consistently added to all job roles' gear configurations, including both regular and variant gears. The current implementation where these items are only added to JanitorMaidGear but not to JanitorGear is inconsistent with the rest of the codebase.

  • Add the following items to JanitorGear in Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml: 
    inhand:
  - CandyBucket
  - PresentHalloweenRandom
🔗 Analysis chain

Verify: Halloween items only added to maid variant.

The Halloween items (CandyBucket and PresentHalloweenRandom) have been added only to JanitorMaidGear but not to the regular JanitorGear. Based on the PR objectives and AI summary showing these items being added across multiple roles, please verify if this is intentional.

Let me gather more specific information about Halloween items in other roles' gear.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if other roles have Halloween items in both their regular and variant gears
# Expected: Find patterns where Halloween items are consistently added to all gear variants

# Search for starting gear definitions that might have variant pairs
rg -A 10 "type: startingGear" | grep -E "id:|inhand:"

Length of output: 19810

Script:

#!/bin/bash
# Search for Halloween-related items in gear configurations
rg -A 5 "inhand:" | grep -E "inhand:|CandyBucket|PresentHalloweenRandom"

Length of output: 9733

innerClothingSkirt: ClothingUniformJumpskirtJanimaid
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
id: LawyerPDA
ears: ClothingHeadsetSecurity
pocket1: BookSecurity
pocket2: PresentHalloweenRandom
inhand:
- BriefcaseBrownFilled
- CandyBucket
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included
duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included
6 changes: 4 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
outerClothing: ClothingOuterCoatRnd
id: LibrarianPDA
ears: ClothingHeadsetScience
pocket1: d10Dice
pocket2: HandLabeler
pocket1: HandLabeler
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtLibrarian
satchel: ClothingBackpackSatchelLibrarianFilled
duffelbag: ClothingBackpackDuffelLibrarianFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
mask: ClothingMaskMime
id: MimePDA
ears: ClothingHeadsetService
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtMime
satchel: ClothingBackpackSatchelMimeFilled
duffelbag: ClothingBackpackDuffelMimeFilled
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@
shoes: ClothingShoesBootsLaceup
id: MusicianPDA
ears: ClothingHeadsetService
inhand:
- CandyBucket
- PresentHalloweenRandom
satchel: ClothingBackpackSatchelMusicianFilled
duffelbag: ClothingBackpackDuffelMusicianFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
shoes: ClothingShoesColorBlack
id: ServiceWorkerPDA
ears: ClothingHeadsetService
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen # DeltaV
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/captain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
outerClothing: ClothingOuterArmorCaptainCarapace
id: CaptainPDA
ears: ClothingHeadsetAltCommand
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtCaptain
satchel: ClothingBackpackSatchelCaptainFilled
duffelbag: ClothingBackpackDuffelCaptainFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
belt: WeaponPistolN1984
pocket1: BoxFolderBlack
pocket2: PenCentcom
inhand:
- CandyBucket
- PresentHalloweenRandom
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
gloves: ClothingHandsGlovesHop
ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset.
belt: BoxFolderClipboard
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtHoP
satchel: ClothingBackpackSatchelHOPFilled
duffelbag: ClothingBackpackDuffelHOPFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
id: AtmosPDA
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtAtmos
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetCE
belt: ClothingBeltUtilityEngineering
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
satchel: ClothingBackpackSatchelChiefEngineerFilled
duffelbag: ClothingBackpackDuffelChiefEngineerFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtEngineering
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
5 changes: 4 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
id: TechnicalAssistantPDA
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
pocket2: BookEngineersHandbook
pocket1: BookEngineersHandbook
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtColorYellow
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
id: ChemistryPDA
ears: ClothingHeadsetMedical
belt: ChemBag
inhand:
- CandyBucket
- PresentHalloweenRandom
# the purple glasses?
innerClothingSkirt: ClothingUniformJumpskirtChemistry
satchel: ClothingBackpackSatchelChemistryFilled
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
id: CMOPDA
ears: ClothingHeadsetCMO
belt: ClothingBeltMedicalFilled
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtCMO
satchel: ClothingBackpackSatchelCMOFilled
duffelbag: ClothingBackpackDuffelCMOFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
id: MedicalPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalFilled
inhand:
- CandyBucket
- PresentHalloweenRandom
innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled
Loading
Loading