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

Monster weight / volume granularity #25631

Merged
merged 19 commits into from
Oct 30, 2018
Merged

Monster weight / volume granularity #25631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
68261a3
adds volume & weight to monsters
nexusmrsep Sep 15, 2018
c13d764
json conversion - monsters.json
nexusmrsep Sep 15, 2018
a12fc14
json conversion - /monsters/*.json
nexusmrsep Sep 15, 2018
3ff5b01
json conversion - mods
nexusmrsep Sep 15, 2018
0180e8f
fixed units in calculation
nexusmrsep Sep 15, 2018
c6bfa84
astyle
nexusmrsep Sep 15, 2018
9a23da2
lua class definitions setup
nexusmrsep Oct 7, 2018
40a475e
Merge remote-tracking branch 'upstream/master' into size_granularity
nexusmrsep Oct 7, 2018
6b687bc
fix json decoding strict volume problem
nexusmrsep Oct 7, 2018
7e0213d
linted fish.json
nexusmrsep Oct 7, 2018
509bcc1
post-linting fix
nexusmrsep Oct 7, 2018
a2bb068
linting fix - removes unwanted whitespaces
nexusmrsep Oct 8, 2018
9187d3e
granulated birds, bots, drones (jsons)
nexusmrsep Oct 8, 2018
31efae4
linting mod monsters jsons - removed whitespaces
nexusmrsep Oct 8, 2018
416e975
static cast and rounding up fix
nexusmrsep Oct 8, 2018
6788442
asorted fixes
nexusmrsep Oct 28, 2018
aba77fc
comment description
nexusmrsep Oct 28, 2018
0177fb6
regex weight quote marks
nexusmrsep Oct 28, 2018
085a6f3
Update src/monstergenerator.cpp
ZhilkinSerg Oct 28, 2018
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
426 changes: 284 additions & 142 deletions data/json/monsters.json
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 14 additions & 7 deletions data/json/monsters/bird.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 10,
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 8,
"speed": 80,
"material": [ "flesh" ],
Expand Down Expand Up @@ -49,7 +50,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 1,
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 4,
"speed": 140,
"material": [ "flesh" ],
Expand Down Expand Up @@ -77,7 +79,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 1,
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 4,
"speed": 140,
"material": [ "flesh" ],
Expand Down Expand Up @@ -117,7 +120,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 10,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 15,
"speed": 140,
"material": [ "flesh" ],
Expand All @@ -143,7 +147,8 @@
"copy-from": "mon_turkey",
"name": "pheasant",
"description": "A medium sized game bird that can have bright feathers depending on the sex and species.",
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 6,
"speed": 130,
"dodge": 4,
Expand All @@ -159,7 +164,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 10,
"size": "SMALL",
"volume": "750 ml",
"weight": 1000,
"hp": 20,
"speed": 130,
"material": [ "flesh" ],
Expand Down Expand Up @@ -188,7 +194,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "BIRD" ],
"diff": 10,
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 1,
"speed": 40,
"material": [ "flesh" ],
Expand Down
6 changes: 4 additions & 2 deletions data/json/monsters/defense_bot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"diff": 19,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 80,
"speed": 70,
"material": [ "steel" ],
Expand Down Expand Up @@ -47,7 +48,8 @@
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"diff": 14,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 30,
"speed": 100,
"material": [ "steel" ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/monsters/drones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"name": "autonomous drone",
"default_faction": "defense_bot",
"species": [ "ROBOT" ],
"size": "TINY",
"volume": "750 ml",
"weight": 1000,
"hp": 10,
"material": [ "steel" ],
"symbol": "e",
Expand Down
66 changes: 44 additions & 22 deletions data/json/monsters/fish.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -35,7 +36,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -61,7 +63,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -89,7 +92,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -117,7 +121,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -144,7 +149,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 40,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -172,7 +178,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 30,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -200,7 +207,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -229,7 +237,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -258,7 +267,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -287,7 +297,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -316,7 +327,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -343,7 +355,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 40,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -372,7 +385,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -401,7 +415,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -430,7 +445,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 40,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -457,7 +473,8 @@
"default_faction": "zombie",
"species": [ "ZOMBIE" ],
"diff": 35,
"size": "MEDIUM",
"volume": "62500 ml",
"weight": 81500,
"hp": 250,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -484,7 +501,8 @@
"default_faction": "carp",
"species": [ "FISH" ],
"diff": 20,
"size": "MEDIUM",
"volume": "62500 ml",
"weight": 81500,
"hp": 180,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -511,7 +529,8 @@
"default_faction": "salmon",
"species": [ "FISH" ],
"diff": 20,
"size": "MEDIUM",
"volume": "62500 ml",
"weight": 81500,
"hp": 180,
"speed": 150,
"material": [ "flesh" ],
Expand Down Expand Up @@ -539,7 +558,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 80,
"material": [ "flesh" ],
Expand All @@ -566,7 +586,8 @@
"categories": [ "WILDLIFE" ],
"species": [ "FISH" ],
"diff": 1,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 150,
"material": [ "flesh" ],
Expand All @@ -592,7 +613,8 @@
"default_faction": "mutant",
"species": [ "FISH" ],
"diff": 13,
"size": "SMALL",
"volume": "30000 ml",
"weight": 40750,
"hp": 20,
"speed": 180,
"material": [ "flesh" ],
Expand Down
Loading