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

feat(mods/DinoMod): sauropod updates #5966

Merged
merged 45 commits into from
Jan 26, 2025
Merged
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b3b3fda
[DinoMod] sauropods update
LyleSY Jan 24, 2025
3e26200
Update hatchling.json
LyleSY Jan 24, 2025
67cd522
Update juvenile.json
LyleSY Jan 24, 2025
4348aaf
Update dinosaur.json
LyleSY Jan 24, 2025
0470266
rem EAT_CARRION attack
LyleSY Jan 24, 2025
bfc1afc
Update DESIGN.md
LyleSY Jan 24, 2025
dfd98ef
doc no EATS flag
LyleSY Jan 25, 2025
bf9867d
rem EATS flag
LyleSY Jan 25, 2025
c440939
Update juvenile.json PATH_AVOID_DANGER_1 fix
LyleSY Jan 25, 2025
fbe62f0
Update dinosaur.json PATH_AVOID_DANGER_1 fix
LyleSY Jan 25, 2025
4c2f722
SMALL_HIDER flag doc
LyleSY Jan 25, 2025
0a9f57b
armor_bullet doc
LyleSY Jan 25, 2025
1529ee6
rem SMALL_HIDER dinosaur.json
LyleSY Jan 25, 2025
e60f246
no CORNERED_FIGHTER flag doc
LyleSY Jan 25, 2025
7f8ca21
rem CORNERED_FIGHTER flag
LyleSY Jan 25, 2025
d94f15c
doc cleanup
LyleSY Jan 25, 2025
7a03125
rem stomach_size and vertebrate parts
LyleSY Jan 25, 2025
7efe4e1
doc weakpoint_sets
LyleSY Jan 25, 2025
f7ede5d
juvenile fixes
LyleSY Jan 25, 2025
bdffd9e
rem families and weakpoints
LyleSY Jan 25, 2025
1af8b64
rem aggro_character
LyleSY Jan 25, 2025
6d9b101
rem biosignature
LyleSY Jan 25, 2025
1ad6b45
rem baby_type
LyleSY Jan 25, 2025
311ffe2
doc BROWSE and GRAZE
LyleSY Jan 25, 2025
2fe69ce
rem BROWSE and GRAZE
LyleSY Jan 25, 2025
4458f7b
rem CAN_BE_CULLED flag
LyleSY Jan 25, 2025
34b1f7b
doc COMBAT_MOUNT
LyleSY Jan 25, 2025
76c6d6f
rem COMBAT_MOUNT flag
LyleSY Jan 25, 2025
639a701
tailsmash_long_DinoMod
LyleSY Jan 25, 2025
db69180
Update monstergroups_egg.json
LyleSY Jan 25, 2025
390dfe4
Update wilderness.json
LyleSY Jan 25, 2025
f9e5001
document monster_attacks
LyleSY Jan 25, 2025
68f6df0
rem monster_attacks issues
LyleSY Jan 25, 2025
6d79ffa
juvenile armor fixes
LyleSY Jan 25, 2025
9c3b5c6
fix dino armor
LyleSY Jan 25, 2025
e10ca64
Update cooking_components.json
LyleSY Jan 26, 2025
9e2faf1
Update dinosaur.json
LyleSY Jan 26, 2025
23c1ecd
Update fungus.json
LyleSY Jan 26, 2025
7b6c3a8
Update zed-dinosaur.json
LyleSY Jan 26, 2025
6cd9243
juvenile zinos
LyleSY Jan 26, 2025
57b9baf
Update zinosaur_burned.json
LyleSY Jan 26, 2025
c4f7a67
Update zinosaur_upgrade.json
LyleSY Jan 26, 2025
f308f0d
Update zinosaur.json
LyleSY Jan 26, 2025
0ca8c4f
bleed_rate doc
LyleSY Jan 26, 2025
9bf6bd5
Merge branch 'cataclysmbnteam:main' into sauropods_DinoMod
LyleSY Jan 26, 2025
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
21 changes: 19 additions & 2 deletions data/mods/DinoMod/DESIGN.md
Original file line number Diff line number Diff line change
@@ -43,13 +43,29 @@ monsters folder:
As much as possible, there should be content and feature parity between both (all?) Cataclysm variants for the best player experience and easiest mod maintenance. As of October 2022 the known code differences between the two for DinoMod are:
* Monstergroups folder - BN groups need "default" and "cost_multiplier" to be defined, "weight should be "freq" instead
* Monsters folder:
- DDA supports bullet armor and biosignature and dissect and melee_damage and aggro_character and "bleeds" (not the flag) and bleed_rate, and not the BLEEDS or the GUILT flag while BN supports BLEEDS and GUILT and melee_cut and not bullet armor or biosignature or dissect or melee damage or the death_guilt death_function or aggro_character or the "bleeds" entry or bleed_rate.
- DDA supports dissect and melee_damage, while BN supports melee_cut but not dissect or melee damage
- the DDA death_guilt system is handled by the GUILT flag in BN
- the DDA "bleeds" and "bleed_rate" fields are handled by BLEEDS flag in BN
- bullet armor is "armor_bullet" in BN and so on for other armor types
- DDA's petfood entry is handled by DOGFOOD, CATFOOD, and CATTLEFODDER flags in BN.
- Death functions for ACID and FIREBALL and SMOKEBURST have different formatting also.
- RANGED_ATTACKER and WATER_CAMOUFLAGE and CAN_BE_CULLED are flags in DDA but not BN.
- smash special attack in DDA is SMASH in BN.
- No vertebrate parts to drop in BN.
- no EATS flag in BN
- no SMALL_HIDER flag in BN
- no CORNERED_FIGHTER flag in BN
- no COMBAT_MOUNT flag in BN
- no vertebrate parts to drop in BN.
- PATH_AVOID_DANGER flag in DDA is PATH_AVOID_DANGER_1 in BN
- no bleed_rate field in BN
- no stomach_size field in BN
- no families field in BN
- no biosignature field in BN
- no aggro_character field in BN
- no weakpoint_sets field in BN
- for reproduction no baby_type field is needed or understood in BN
- no EAT_CARRION special attack in BN
- no BROWSE or GRAZE special attacks in BN
* Mapgen folder - lots of content missing or different in BN, science basements still need to be reconstructed from BN originals, t_soil isn't a valid terrain in BN, spawn_data": "patrol" doesn't exist in BN. Dozens of nests had to be removed because mapgen could not see the monsters, I'm guessing copy strangeness. Added portal_location to DinoMod since portal map extras do not exist in BN
* Items folder - BN port removes pocket_data and amm0_to_fire and longest_side lines and changes damage_type bullet to stab and removes armor entry. No copy-from or event entries in item groups in BN. No dry catfood or dogfood to copy from in BN
* egg items - BN port removes FREEZERBURN flag
@@ -58,3 +74,4 @@ As much as possible, there should be content and feature parity between both (al
* Recipe folder - activity_level and proficiencies not supported in BN. chain mail recipes must use chainmail_vest item id in BN. Cutting 2 doesn't exist in BN so everything needs to be changed to cutting 1. blacksmithing_standard crafting requirement specifies anvil quality 1, supplemented by blacksmithing_intermediate and blacksmithing_advanced requirements bundling higher anvil quality plus chisel quality, then swage and die set.
* Requirements folder - extend not supported in BN. Bronze armor copies from a different item ID in BN
* Harvest file - no marrow in BN, faulty bionics use the "fault_bionic_nonsterile" fault instead of flags, use of different bionic_group itemgroups for power storage and military dino bionics (which add a chance to generate nothing or non-CBM components, in return for dissection code having a higher success rate in BN)
* monster_attacks file - no BN support for these fields: range, no_adjacent, throw_strength, throw_msg_u, throw_msg_npc
14 changes: 14 additions & 0 deletions data/mods/DinoMod/items/egg.json
Original file line number Diff line number Diff line change
@@ -337,6 +337,13 @@
"copy-from": "egg_dino",
"rot_spawn": "GROUP_EGG_issi"
},
{
"type": "COMESTIBLE",
"id": "egg_moabosaurus",
"name": "moabosaurus egg",
"copy-from": "egg_dino_large",
"rot_spawn": "GROUP_EGG_moabosaurus"
},
{
"type": "COMESTIBLE",
"id": "egg_haplocanthosaurus",
@@ -393,6 +400,13 @@
"copy-from": "egg_dino_large",
"rot_spawn": "GROUP_EGG_brachiosaurus"
},
{
"type": "COMESTIBLE",
"id": "egg_astrodon",
"name": "astrodon egg",
"copy-from": "egg_dino_large",
"rot_spawn": "GROUP_EGG_astrodon"
},
{
"type": "COMESTIBLE",
"id": "egg_alamosaurus",
15 changes: 15 additions & 0 deletions data/mods/DinoMod/monster_attacks.json
Original file line number Diff line number Diff line change
@@ -42,6 +42,21 @@
"miss_msg_u": "%s swings its tail at you, but you dodge it!",
"miss_msg_npc": "%s swings its tail at <npcname>, who dodges it!"
},
{
"type": "monster_attack",
"attack_type": "melee",
"id": "tailsmash_long_DinoMod",
"move_cost": 400,
"cooldown": 20,
"damage_max_instance": [ { "damage_type": "bash", "amount": 30 } ],
"body_parts": [ [ "torso", 3 ], [ "leg_r", 1 ], [ "leg_l", 1 ], [ "arm_r", 1 ], [ "arm_l", 1 ] ],
"hit_dmg_u": "%1$s swings its massive tail at your %2$s, pulverizing it!",
"hit_dmg_npc": "%1$s swings its massive tail at <npcname>'s %2$s!",
"no_dmg_msg_u": "%s swings its tail at you, but it's blunted by your armor.",
"no_dmg_msg_npc": "%s swings its tail at <npcname>, but they appear unharmed.",
"miss_msg_u": "%s swings its tail at you, but you dodge it!",
"miss_msg_npc": "%s swings its tail at <npcname>, who dodges it!"
},
{
"type": "monster_attack",
"attack_type": "melee",
12 changes: 12 additions & 0 deletions data/mods/DinoMod/monstergroups/dinosaur.json
Original file line number Diff line number Diff line change
@@ -21,11 +21,16 @@
{ "monster": "mon_deinonychus", "freq": 10, "cost_multiplier": 15, "pack_size": [ 1, 2 ] },
{ "monster": "mon_utahraptor", "freq": 5, "cost_multiplier": 30 },
{ "monster": "mon_eoraptor", "freq": 20, "cost_multiplier": 0, "pack_size": [ 4, 12 ] },
{ "monster": "mon_sarahsaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_anchisaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_issi", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_moabosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_apatosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_brontosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_diplodocus", "freq": 10, "cost_multiplier": 20, "pack_size": [ 4, 12 ] },
{ "monster": "mon_camarasaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_brachiosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_astrodon", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_alamosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_scutellosaurus", "freq": 5, "cost_multiplier": 0, "pack_size": [ 2, 4 ] },
{ "monster": "mon_stegosaurus", "freq": 5, "cost_multiplier": 20, "pack_size": [ 2, 4 ] },
@@ -85,11 +90,16 @@
{ "monster": "mon_gallimimus_hatchling", "freq": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_nothronychus_hatchling", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_eoraptor_hatchling", "freq": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_sarahsaurus_hatchling", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_anchisaurus_hatchling", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_issi_hatchling", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_moabosaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_apatosaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_brontosaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_diplodocus_hatchling", "freq": 10, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
{ "monster": "mon_camarasaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_brachiosaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_astrodon_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_alamosaurus_hatchling", "freq": 10, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_scutellosaurus_hatchling", "freq": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
{ "monster": "mon_stegosaurus_hatchling", "freq": 10, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
@@ -165,11 +175,13 @@
"name": "GROUP_DINOSAUR_MEGA_HERBIVORE",
"default": "mon_null",
"monsters": [
{ "monster": "mon_moabosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] },
{ "monster": "mon_apatosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_brontosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_diplodocus", "freq": 10, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
{ "monster": "mon_camarasaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_brachiosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_astrodon", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_alamosaurus", "freq": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] },
{ "monster": "mon_stegosaurus", "freq": 5, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
{ "monster": "mon_ankylosaurus", "freq": 5, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
16 changes: 16 additions & 0 deletions data/mods/DinoMod/monstergroups/monstergroups_egg.json
Original file line number Diff line number Diff line change
@@ -66,12 +66,16 @@
"default": "mon_apatosaurus_hatchling",
"type": "monstergroup",
"monsters": [
{ "monster": "mon_moabosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_haplocanthosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_amargasaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_apatosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_brontosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_diplodocus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_barosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_camarasaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_brachiosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_astrodon_hatchling", "freq": 142, "cost_multiplier": 1 },
{ "monster": "mon_alamosaurus_hatchling", "freq": 142, "cost_multiplier": 1 }
]
},
@@ -323,6 +327,12 @@
"default": "mon_issi_hatchling",
"monsters": [ { "monster": "mon_issi_hatchling", "freq": 1, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_moabosaurus",
"type": "monstergroup",
"default": "mon_moabosaurus_hatchling",
"monsters": [ { "monster": "mon_moabosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_haplocanthosaurus",
"type": "monstergroup",
@@ -371,6 +381,12 @@
"default": "mon_brachiosaurus_hatchling",
"monsters": [ { "monster": "mon_brachiosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_astrodon",
"type": "monstergroup",
"default": "mon_astrodon_hatchling",
"monsters": [ { "monster": "mon_astrodon_hatchling", "freq": 1, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_alamosaurus",
"type": "monstergroup",
Loading
Loading