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

[Megafauna] Add weakpoints and anatomical proficiencies #63590

Merged
merged 14 commits into from
Aug 5, 2023
Merged

[Megafauna] Add weakpoints and anatomical proficiencies #63590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
622e2af
Prof Biology added
Feb 13, 2023
9d1d296
Update data/mods/Megafauna/monsters/mf_domestic.json
merrygin Feb 16, 2023
6e31049
First steps defining weakpoints
Feb 20, 2023
083e7e4
Merge branch 'mf-weakpoints' of https://github.com/merrygin/Cataclysm…
Feb 20, 2023
97b1f7b
The eyes #1
Feb 20, 2023
5a4b8dc
Update data/mods/Megafauna/mf_weakpoint_sets.json
merrygin Feb 20, 2023
56f77dd
Basic weakpoints and linting
Apr 9, 2023
57dbd90
random commit to end error?
Apr 9, 2023
c1c1c0f
Merge branch 'master' into mf-weakpoints
merrygin Apr 9, 2023
aa8ecf6
fix bad language
merrygin Apr 9, 2023
49453e7
Update data/mods/Megafauna/proficiencies/mf_weakpoints.json
Maleclypse May 16, 2023
4321c1e
Update data/mods/Megafauna/proficiencies/mf_weakpoints.json
Maleclypse May 16, 2023
2dd2107
Merge branch 'master' into mf-weakpoints
dseguin May 20, 2023
3615324
Update data/mods/Megafauna/mf_weakpoint_sets.json
Maleclypse Aug 4, 2023
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
14 changes: 13 additions & 1 deletion data/mods/Megafauna/monsters/mf_domestic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "600 L",
"weight": "600 kg",
"hp": 400,
Expand Down Expand Up @@ -48,6 +49,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "90 L",
"weight": "90 kg",
"hp": 80,
Expand Down Expand Up @@ -77,6 +79,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "400 L",
"weight": "400 kg",
"hp": 120,
Expand Down Expand Up @@ -120,6 +123,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "60 L",
"weight": "60 kg",
"hp": 50,
Expand Down Expand Up @@ -148,7 +152,8 @@
"default_faction": "mega_herbivore",
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"species": [ "MAMMAL" ],
merrygin marked this conversation as resolved.
Show resolved Hide resolved
"families": [ "prof_intro_biology" ],
"volume": "200 L",
"weight": "200 kg",
"hp": 200,
Expand Down Expand Up @@ -189,6 +194,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "40 L",
"weight": "40 kg",
"hp": 30,
Expand Down Expand Up @@ -217,6 +223,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 420,
Expand Down Expand Up @@ -253,6 +260,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "160 L",
"weight": "160 kg",
"hp": 150,
Expand Down Expand Up @@ -282,6 +290,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "350 L",
"weight": "350 kg",
"hp": 120,
Expand Down Expand Up @@ -355,6 +364,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 500,
Expand Down Expand Up @@ -428,6 +438,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 400,
Expand Down Expand Up @@ -492,6 +503,7 @@
"bodytype": "pig",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "50 L",
"weight": "40 kg",
"hp": 40,
Expand Down
4 changes: 4 additions & 0 deletions data/mods/Megafauna/monsters/mf_predators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "118 L",
"weight": "110 kg",
"hp": 110,
Expand Down Expand Up @@ -85,6 +86,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "250 L",
"weight": "250 kg",
"hp": 250,
Expand Down Expand Up @@ -182,6 +184,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "210 L",
"weight": "210 kg",
"hp": 210,
Expand Down Expand Up @@ -265,6 +268,7 @@
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "8600 ml",
"weight": "8600 g",
"hp": 16,
Expand Down
9 changes: 9 additions & 0 deletions data/mods/Megafauna/monsters/mf_wild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "100 L",
"weight": "100 kg",
"hp": 100,
Expand Down Expand Up @@ -63,6 +64,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 800,
Expand Down Expand Up @@ -127,6 +129,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "580 L",
"weight": "560 kg",
"hp": 540,
Expand Down Expand Up @@ -195,6 +198,7 @@
"bodytype": "elephant",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 600,
Expand Down Expand Up @@ -314,6 +318,7 @@
"bodytype": "elephant",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 670,
Expand Down Expand Up @@ -428,6 +433,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "950 kg",
"hp": 700,
Expand Down Expand Up @@ -497,6 +503,7 @@
"bodytype": "bird",
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"families": [ "prof_intro_biology" ],
"volume": "25 L",
"weight": "5000 g",
"hp": 21,
Expand Down Expand Up @@ -536,6 +543,7 @@
"bodytype": "bear",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "1000 L",
"weight": "1000 kg",
"hp": 600,
Expand Down Expand Up @@ -609,6 +617,7 @@
"bodytype": "horse",
"categories": [ "WILDLIFE" ],
"species": [ "MAMMAL" ],
"families": [ "prof_intro_biology" ],
"volume": "280 L",
"weight": "280 kg",
"hp": 90,
Expand Down