Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CleverRaven/Cataclysm-DDA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cdda-experimental-2022-10-12-1638
Choose a base ref
...
head repository: CleverRaven/Cataclysm-DDA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdda-experimental-2022-10-13-0410
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Oct 13, 2022

  1. [DinoMod] hadrosaurs eat mushrooms (#61649)

    * [DinoMod] mutating hadrosaurs
    
    * fungalize
    
    * mutant harvest
    
    * hadrosaur faction
    
    * no fungal damage
    
    * saurornitholestes egg hatching fix
    
    * use hadrosaur faction
    
    * Update dictionary.txt
    LyleSY authored Oct 13, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1de2543 View commit details
7 changes: 7 additions & 0 deletions data/mods/DinoMod/monster_factions.json
Original file line number Diff line number Diff line change
@@ -42,6 +42,13 @@
"friendly": [ "herbivore_young" ],
"hate": [ "plant" ]
},
{
"type": "MONSTER_FACTION",
"name": "hadrosaur",
"base_faction": "herbivore_dino",
"friendly": [ "herbivore_young" ],
"hate": [ "fungus" ]
},
{
"type": "MONSTER_FACTION",
"name": "insectivore_young",
2 changes: 1 addition & 1 deletion data/mods/DinoMod/monstergroups/monstergroups_egg.json
Original file line number Diff line number Diff line change
@@ -235,7 +235,7 @@
{
"name": "GROUP_EGG_saurornitholestes",
"type": "monstergroup",
"monsters": [ { "monster": "mon_velociraptor_hatchling" } ]
"monsters": [ { "monster": "mon_saurornitholestes_hatchling" } ]
},
{
"name": "GROUP_EGG_velociraptor",
2 changes: 2 additions & 0 deletions data/mods/DinoMod/monsters/dinosaur.json
Original file line number Diff line number Diff line change
@@ -1711,6 +1711,7 @@
"copy-from": "mon_camptosaurus",
"volume": "1000 L",
"weight": "1000 kg",
"default_faction": "hadrosaur",
"//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg",
"bodytype": "bear",
"speed": 80,
@@ -1722,6 +1723,7 @@
"armor_bullet": 3,
"hp": 250,
"zombify_into": "mon_zadrosaurus",
"fungalize_into": "mon_hadrosaurus_mutant1",
"description": "A bulky, beaked dinosaur with hooved front legs and strong clawed back legs.",
"special_attacks": [
{ "type": "leap", "cooldown": 10, "max_range": 2, "allow_no_target": true },
78 changes: 78 additions & 0 deletions data/mods/DinoMod/monsters/mutant_dino.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
[
{
"type": "MONSTER",
"id": "mon_hadrosaurus_mutant1",
"name": { "str_sp": "fungal dusted hadrosaur" },
"looks_like": "mon_parasaurolophus",
"species": "DINOSAUR",
"default_faction": "hadrosaur",
"aggro_character": false,
"symbol": "D",
"color": "yellow",
"bodytype": "bear",
"material": [ "flesh" ],
"aggression": -10,
"morale": 25,
"melee_skill": 4,
"dodge": 4,
"families": [ "prof_intro_biology", "prof_wp_dino" ],
"weakpoint_sets": [ "wps_dinosaur_body" ],
"baby_flags": [ "SPRING", "SUMMER" ],
"biosignature": { "biosig_item": "feces_dino", "biosig_timer": 1 },
"flags": [
"SEES",
"SMELLS",
"HEARS",
"ANIMAL",
"PATH_AVOID_DANGER_1",
"PET_MOUNTABLE",
"PET_WONT_FOLLOW",
"BASHES",
"DESTROYS",
"PUSH_MON",
"SWIMS",
"NO_FUNG_DMG"
],
"harvest": "mammal_large_leather",
"fear_triggers": [ "FRIEND_DIED" ],
"anger_triggers": [ "HURT", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ],
"categories": [ "DINOSAUR", "WILDLIFE" ],
"volume": "1000 L",
"weight": "1000 kg",
"//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg",
"speed": 80,
"melee_dice": 2,
"melee_dice_sides": 6,
"melee_damage": [ { "damage_type": "bash", "amount": 2 } ],
"armor_bash": 4,
"armor_cut": 4,
"armor_bullet": 3,
"hp": 250,
"description": "A bulky, beaked dinosaur with hooved front legs. The head has been dusted with fungal spores and an angry red rash is forming around them.",
"special_attacks": [
{ "type": "leap", "cooldown": 10, "max_range": 2, "allow_no_target": true },
{ "id": "stomp_DinoMod", "cooldown": 20, "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ] }
],
"upgrades": { "age_grow": 120, "into": "mon_hadrosaurus_mutant2" }
},
{
"type": "MONSTER",
"id": "mon_hadrosaurus_mutant2",
"name": { "str_sp": "ravenous hadrosaur" },
"looks_like": "mon_parasaurolophus",
"species": "DINOSAUR",
"default_faction": "hadrosaur",
"aggro_character": false,
"symbol": "D",
"color": "yellow",
"bodytype": "bear",
"copy-from": "mon_hadrosaurus_mutant1",
"aggression": 10,
"speed": 100,
"hp": 200,
"melee_dice": 4,
"description": "A bulky, beaked dinosaur with hooved front legs and two heads. The four eyes are wide and rolling.",
"upgrades": { },
"harvest": "mutant_bird_flightless"
}
]
3 changes: 3 additions & 0 deletions tools/spell_checker/dictionary.txt
Original file line number Diff line number Diff line change
@@ -161,6 +161,7 @@ batching
batlike
batrachian
bday
beaked
beartrap
beebalm
beeeeeeeeep
@@ -802,6 +803,7 @@ gutskin
guvnah
gymnocladus
h
hadrosaur
hadrosaurus
haematopoiesis
haft
@@ -858,6 +860,7 @@ holybook
homebrewing
homovorus
honeygold
hooved
hosomaki
hotcut
hotkey