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.

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

DinoModv3: DinoDNA #26525

Merged
merged 47 commits into from
Mar 6, 2020
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a207d47
DinoModv2 "Dinos inna woods!"
LyleSY Sep 17, 2017
9938f20
Merge branch 'master' into new_branch
LyleSY Nov 11, 2017
c2cb9a5
Removed duplicate notes and snippets
LyleSY Nov 19, 2017
bba0c18
Dinowoods cleanup
LyleSY Oct 30, 2018
82576e4
Merge branch 'master' into new_branch
LyleSY Oct 30, 2018
9f93283
Double space between desc sentences
ZhilkinSerg Oct 30, 2018
e97d873
Double space between desc sentences.2
ZhilkinSerg Oct 30, 2018
7c769a5
Double space between desc sentences.3
ZhilkinSerg Oct 30, 2018
6cf7f93
Double space between desc sentences.4
ZhilkinSerg Oct 30, 2018
01bbb4d
Removing empty line
LyleSY Oct 30, 2018
ed8469d
Deleted end comma in lab notes
LyleSY Oct 30, 2018
6a7a92d
Deleted rogue comma in dinosaurs
LyleSY Oct 30, 2018
aeee506
DinoModv3: DinoDNA
LyleSY Nov 4, 2018
d7f4ea0
Additional files for Dinomodv3:DinoDNA
LyleSY Nov 4, 2018
9a18ab0
Forage clean up
LyleSY Nov 4, 2018
839a349
Removed two unneeded spaces in compy section
LyleSY Nov 4, 2018
128b14f
Fixed compy tab
LyleSY Nov 4, 2018
17fdd63
Remove Titanis and Dimorphodon
LyleSY Nov 9, 2018
380e022
Remove blank line
LyleSY Nov 9, 2018
260a98e
DinoMod mapgen broken, removing
LyleSY Nov 9, 2018
63e10c3
Add recipe for raptor mutagen using dino eggs
LyleSY Nov 9, 2018
1b832ac
Update dinosaur.json
ZhilkinSerg Jan 22, 2019
72ab328
Update egg.json
ZhilkinSerg Jan 22, 2019
c4298d8
Update forage.json
ZhilkinSerg Jan 22, 2019
f9c3ab2
Update lab_notes.json
ZhilkinSerg Jan 22, 2019
b460643
Update recipe_medsandchemicals.json
ZhilkinSerg Jan 22, 2019
6d2d4c1
Merge branch 'master' into DinoDNA
ZhilkinSerg Jan 22, 2019
90a508b
Linted dinosaur.json
LyleSY Jan 28, 2020
9ca07b1
Linted egg.json
LyleSY Jan 28, 2020
8bd908c
Linted forage.json
LyleSY Jan 28, 2020
76e1f38
Linted harvest.json
LyleSY Jan 28, 2020
e902e5f
Linted lab_notes.json
LyleSY Jan 28, 2020
3e50601
Linted monstergroups_egg.json
LyleSY Jan 28, 2020
4038436
Linted recipe_medsandchemicals.json
LyleSY Jan 28, 2020
98efe76
Linted snippets.json
LyleSY Jan 28, 2020
d09de12
Update data/mods/DinoMod/egg.json
LyleSY Jan 29, 2020
8638eab
Adding overmap section back on for now
LyleSY Jan 29, 2020
02a50f5
Merge branch 'master' into DinoDNA
LyleSY Jan 29, 2020
0c153f4
Linted dinosaur.json again
LyleSY Jan 29, 2020
2a35e9f
Linted regional overlay
LyleSY Jan 29, 2020
827e25b
Linted fieldoffice.json
LyleSY Jan 29, 2020
94c33e9
Removed extra space
LyleSY Jan 29, 2020
ac76241
Deleted extra line at bottom
LyleSY Jan 30, 2020
1f8a64a
lab_notes.json formatting
LyleSY Jan 30, 2020
427d58b
Despecialized dinosaur.json
LyleSY Jan 30, 2020
fb76385
Gallimimus is tameable and rideable now
LyleSY Jan 31, 2020
e56c6fe
Fixed spawns in dinosaur.json
LyleSY Feb 2, 2020
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
1,612 changes: 945 additions & 667 deletions data/mods/DinoMod/dinosaur.json

Large diffs are not rendered by default.

108 changes: 108 additions & 0 deletions data/mods/DinoMod/egg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@

LyleSY marked this conversation as resolved.
Show resolved Hide resolved
{
"type": "COMESTIBLE",
"id": "egg_dino",
"name": "dinosaur egg",
"weight": 75,
"color": "green",
"spoils_in": "14 days",
"comestible_type": "FOOD",
"symbol": "o",
"quench": 4,
"healthy": 1,
"calories": 113,
"description": "Pale, football-shaped egg laid by a dinosaur.",
"price": 500,
"material": "egg",
"volume": 1,
"stack_size": 4,
"fun": -6,
"flags": [ "FREEZERBURN" ],
"rot_spawn": "GROUP_EGG_DINO",
"rot_spawn_chance": 70
},
{
"type": "COMESTIBLE",
"id": "egg_compsognathus",
"name": "compsognathus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_gallimimus",
"name": "gallimimus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_spinosaurus",
"name": "spinosaurus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_tyrannosaurus",
"name": "tyrannosaurus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_triceratops",
"name": "triceratops egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_stegosaurus",
"name": "stegosaurus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_ankylosaurus",
"name": "ankylosaurus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_allosaurus",
"name": "allosaurus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_eoraptor",
"name": "eoraptor egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_velociraptor",
"name": "velociraptor egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_deinonychus",
"name": "deinonychus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_utahraptor",
"name": "utahraptor egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_parasaurolophus",
"name": "parasaurolophus egg",
"copy-from": "egg_dino"
},
{
"type": "COMESTIBLE",
"id": "egg_dilophosaurus",
"name": "dilophosaurus egg",
"copy-from": "egg_dino"
}
]
201 changes: 0 additions & 201 deletions data/mods/DinoMod/fieldoffice.json

This file was deleted.

14 changes: 14 additions & 0 deletions data/mods/DinoMod/forage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"id": "forage_spring",
"type": "item_group",
"subtype": "distribution",
"entries": [ { "item": "egg_dino", "prob": 3, "count-min": 2, "count-max": 5 } ]
},
{
"id": "forage_summer",
"type": "item_group",
"subtype": "distribution",
"entries": [ { "item": "egg_dino", "prob": 3, "count-min": 2, "count-max": 5 } ]
}
]
10 changes: 10 additions & 0 deletions data/mods/DinoMod/lab_notes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "snippet",
"category": "lab_notes",
"text": [
"Research on our visitors is proceeding nicely. The raptor DNA is of special interest, with some novel protein chains that may lead to medical breakthroughs.",
"Dr. Yoshimi has been reprimanded for unauthorized contact with the procompsignathids. Disgusting behavior, and a terrible example to the junior researchers.",
"Dr. Yoshimi has escaped, along with an unknown number of dinosaurs. Unfortunately, we have bigger problems with XE037.",
"Strange sounds have been reported from the swamp nearby. An enhanced security team was dispatched, but has not returned in 48 hours. The facility is on lockdown. We can’t let them get back in."
]
}
23 changes: 23 additions & 0 deletions data/mods/DinoMod/monstergroups_egg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"name": "GROUP_EGG_DINO",
"type": "monstergroup",
"default": "mon_compsognathus_hatchling",
"monsters": [
{ "monster": "mon_compsognathus_hatchling", "freq": 100, "cost_multiplier": 1 },
{ "monster": "mon_gallimimus_hatchling", "freq": 50, "cost_multiplier": 1 },
{ "monster": "mon_spinosaurus_hatchling", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_tyrannosaurus_hatchling", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_triceratops_hatchling", "freq": 3, "cost_multiplier": 1 },
{ "monster": "mon_stegosaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
{ "monster": "mon_ankylosaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
{ "monster": "mon_allosaurus_hatchling", "freq": 2, "cost_multiplier": 1 },
{ "monster": "mon_eoraptor_hatchling", "freq": 20, "cost_multiplier": 1 },
{ "monster": "mon_velociraptor_hatchling", "freq": 15, "cost_multiplier": 1 },
{ "monster": "mon_deinonychus_hatchling", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_utahraptor_hatchling", "freq": 5, "cost_multiplier": 1 },
{ "monster": "mon_parasaurolophus_hatchling", "freq": 3, "cost_multiplier": 1 },
{ "monster": "mon_dilophosaurus_hatchling", "freq": 15, "cost_multiplier": 1 }
]
}
]
20 changes: 20 additions & 0 deletions data/mods/DinoMod/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"type": "recipe",
"result": "mutagen_raptor",
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_MUTAGEN",
"skill_used": "cooking",
"skills_required": [ "firstaid", 1 ],
"difficulty": 9,
"time": 10000,
"book_learn": [ [ "recipe_raptor", 9 ] ],
"qualities": [ { "id": "CHEM", "level": 3 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [
[ [ "mutagen", 1 ] ],
[ [ "egg_dino", 1 ], [ "egg_velociraptor", 1 ], [ "egg_deinonychus", 1 ], [ "egg_utahraptor", 1 ] ],
[ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
]
}
]
12 changes: 0 additions & 12 deletions data/mods/DinoMod/regional_overlay.json

This file was deleted.