-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
[AFTERSHOCK] Moxphores #45801
Merged
Merged
[AFTERSHOCK] Moxphores #45801
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a037dfa
adding them moxies
Mom-Bun 9b3d6f7
death groups and spawns
Mom-Bun 8bdb3e0
Merge branch 'moxies' of github.com:Positronic-Girl/Cataclysm-DDA int…
Mom-Bun 551049d
Armor adjustment for vs. ranged encounters.
John-Candlebury 6648cf6
Change neme of Scrounger into Regenerator
John-Candlebury 005d0cb
Re-rename regenerator
John-Candlebury a02ef57
Merge pull request #1 from John-Candlebury/test-moxie
Mom-Bun a891102
linting and fixes
Mom-Bun 4fda7b7
Fix minor spacing errors
John-Candlebury 55fc994
Add Moxie clothing item groups
John-Candlebury File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| [ | ||
| { | ||
| "id": "coats_unisex_afs", | ||
| "type": "item_group", | ||
| "//": "unisex coats, jackets, cloaks, etc.", | ||
| "subtype": "distribution", | ||
| "items": [ | ||
| { | ||
| "distribution": [ | ||
| { "item": "cloak", "prob": 80 }, | ||
| { "item": "cloak_wool", "prob": 40 }, | ||
| { "item": "cloak_leather", "prob": 20 }, | ||
| { "item": "cloak_fur", "prob": 10 }, | ||
| { "item": "jedi_cloak", "prob": 5 } | ||
| ], | ||
| "prob": 20 | ||
| }, | ||
| { | ||
| "distribution": [ | ||
| { "item": "trenchcoat", "prob": 80 }, | ||
| { "item": "trenchcoat_leather", "prob": 60 }, | ||
| { "item": "trenchcoat_faux_fur", "prob": 30 }, | ||
| { "item": "trenchcoat_fur", "prob": 5 } | ||
| ], | ||
| "prob": 40 | ||
| }, | ||
| { | ||
| "distribution": [ | ||
| { "item": "coat_winter", "prob": 50 }, | ||
| { "item": "peacoat", "prob": 50 }, | ||
| { "item": "greatcoat", "prob": 35 }, | ||
| { "item": "coat_faux_fur", "prob": 20 }, | ||
| { "item": "coat_fur", "prob": 10 }, | ||
| { "item": "coat_fur_sf", "prob": 5 } | ||
| ], | ||
| "prob": 80 | ||
| }, | ||
| { | ||
| "distribution": [ | ||
| { "item": "jacket_leather", "prob": 50 }, | ||
| { "item": "jacket_leather_red", "prob": 25 }, | ||
| { "item": "poncho", "prob": 30 }, | ||
| { "item": "ski_jacket", "prob": 25 } | ||
| ], | ||
| "prob": 60 | ||
| }, | ||
| { "distribution": [ { "item": "army_top", "prob": 40 }, { "item": "blazer", "prob": 70 } ], "prob": 40 } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "item_group", | ||
| "id": "common_gloves_afs", | ||
| "subtype": "distribution", | ||
| "entries": [ | ||
| { "item": "gloves_light", "prob": 15 }, | ||
| { "item": "gloves_leather", "prob": 15 }, | ||
| { "item": "gloves_wool", "prob": 15 }, | ||
| { "item": "gloves_winter", "prob": 10 }, | ||
| { "item": "gloves_liner", "prob": 15 }, | ||
| { "item": "mittens", "prob": 5 }, | ||
| { "item": "thermal_gloves", "prob": 2 } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "item_group", | ||
| "id": "hatstore_hats_afs", | ||
| "items": [ [ "hat_cotton", 30 ], [ "hat_knit", 40 ], [ "hat_faux_fur", 30 ], [ "hat_fur", 20 ], [ "balclava", 20 ] ] | ||
| }, | ||
| { | ||
| "id": "scarfs_unisex_afs", | ||
| "type": "item_group", | ||
| "//": "unisex scarfs and fabric coverings", | ||
| "subtype": "distribution", | ||
| "items": [ | ||
| { "item": "bandana", "prob": 90 }, | ||
| { "item": "balclava", "prob": 50 }, | ||
| { "item": "headscarf", "prob": 50 }, | ||
| { "item": "scarf_fur_long", "prob": 10 }, | ||
| { "item": "scarf_fur", "prob": 20 }, | ||
| { "item": "scarf", "prob": 80 }, | ||
| { "item": "scarf_long", "prob": 40 }, | ||
| { "item": "long_knit_scarf", "prob": 40 }, | ||
| { "item": "knit_scarf", "prob": 80 }, | ||
| { "item": "keffiyeh", "prob": 30 }, | ||
| { "item": "mask_ski", "prob": 30 }, | ||
| { "item": "thermal_mask", "prob": 5 } | ||
| ] | ||
| }, | ||
| { | ||
| "id": "accesories_personal_unisex_afs", | ||
| "type": "item_group", | ||
| "//": "unisex personal accessories", | ||
| "subtype": "collection", | ||
| "items": [ | ||
| { "group": "clothing_glasses", "prob": 50 }, | ||
| { "group": "clothing_watch", "prob": 15 }, | ||
| { "group": "accessory_ring", "prob": 15 }, | ||
| { "group": "accessory_earring", "prob": 15 }, | ||
| { "group": "accessory_bracelet", "prob": 15 }, | ||
| { "group": "accessory_teeth", "prob": 5 }, | ||
| { "group": "accessory_necklace", "prob": 15 }, | ||
| { "group": "accessory_cat", "prob": 5 }, | ||
| { "group": "accessory_weaponcarry", "prob": 15 }, | ||
| { "group": "accessory_sportsgear", "prob": 15 }, | ||
| { "item": "tool_belt", "prob": 10 }, | ||
| { "item": "leather_belt", "prob": 60 }, | ||
| { "item": "wearable_light", "prob": 30, "charges": [ 0, 100 ] }, | ||
| { "item": "binoculars", "prob": 10 }, | ||
| { "item": "whistle", "prob": 30 }, | ||
| { "item": "harmonica_holder", "prob": 10 }, | ||
| { "group": "flask_liquor", "prob": 10 } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "item_group", | ||
| "id": "pants_unisex_afs", | ||
| "subtype": "distribution", | ||
| "entries": [ | ||
| { "item": "jeans", "prob": 90 }, | ||
| { "item": "jeans_red", "prob": 50 }, | ||
| { "item": "pants", "prob": 75 }, | ||
| { "item": "pants_leather", "prob": 60 }, | ||
| { "item": "pants_cargo", "prob": 70 }, | ||
| { "item": "pants_ski", "prob": 45 }, | ||
| { "item": "pants_fur", "prob": 5 }, | ||
| { "item": "pants_faux_fur", "prob": 15 }, | ||
| { "item": "breeches", "prob": 25 } | ||
| ] | ||
| }, | ||
| { | ||
| "id": "shirts_unisex_afs", | ||
| "type": "item_group", | ||
| "//": "unisex shirts", | ||
| "subtype": "distribution", | ||
| "items": [ | ||
| { "item": "longshirt", "prob": 70 }, | ||
| { "item": "arm_warmers", "prob": 20 }, | ||
| { "item": "armguard_soft", "prob": 10 }, | ||
| { "item": "dress_shirt", "prob": 50 }, | ||
| { "item": "flag_shirt", "prob": 15 }, | ||
| { "item": "linuxtshirt", "prob": 10 }, | ||
| { "item": "polo_shirt", "prob": 30 }, | ||
| { "item": "sweater", "prob": 40 }, | ||
| { "item": "turtleneck", "prob": 15 }, | ||
| { "item": "turtleneck_shirt", "prob": 15 }, | ||
| { "item": "sweatshirt", "prob": 50 }, | ||
| { "item": "tank_top", "prob": 30 }, | ||
| { "item": "tshirt", "prob": 80 }, | ||
| { "item": "tshirt_text", "prob": 50 }, | ||
| { "item": "waistcoat", "prob": 10 }, | ||
| { "item": "wool_hoodie", "prob": 10 }, | ||
| { "item": "hoodie", "prob": 40 } | ||
| ] | ||
| }, | ||
| { | ||
| "id": "shoes_unisex_afs", | ||
| "type": "item_group", | ||
| "//": "unisex shoes (there are no men's only shoes)", | ||
| "subtype": "distribution", | ||
| "items": [ | ||
| { | ||
| "distribution": [ | ||
| { "item": "boots", "prob": 80 }, | ||
| { "item": "boots_hiking", "prob": 50 }, | ||
| { "item": "boots_steel", "prob": 50 }, | ||
| { "item": "boots_combat", "prob": 45 }, | ||
| { "item": "boots_fur", "prob": 10 }, | ||
| { "item": "boots_winter", "prob": 30 }, | ||
| { "item": "knee_high_boots", "prob": 15 }, | ||
| { "item": "motorbike_boots", "prob": 35 } | ||
| ], | ||
| "prob": 60 | ||
| } | ||
| ] | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want all bio_machines ignoring the player unless the player attacks it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea is that bio-machines would be the docile form of moxphores so they can add flavor and populate the world, and will only either attack or flee if attacked themselves, I didn't want all bio-machines to be inherently hostile to the player.