-
Notifications
You must be signed in to change notification settings - Fork 290
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
Adding flesh raptors to mainline #2184
Closed
thelonestander
wants to merge
2
commits into
cataclysmbnteam:upload
from
thelonestander:flesh_raptors
Closed
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| [ | ||
| { | ||
| "id": "mon_zombie_crawler_pupa_decoy", | ||
| "type": "MONSTER", | ||
| "name": { "str": "pupating zombie crawler" }, | ||
| "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything neck down. Beneath the wrapping there is strange rhythmic movement grotesque to behold.", | ||
| "copy-from": "mon_zombie_crawler", | ||
| "delete": { "categories": [ "CLASSIC" ] }, | ||
| "armor_bash": 7, | ||
| "armor_cut": 5, | ||
| "armor_bullet": 5, | ||
| "special_attacks": [ { "type": "bite", "cooldown": 3 } ], | ||
| "regenerates": 10, | ||
| "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] } | ||
| }, | ||
| { | ||
| "id": "mon_zombie_crawler_pupa", | ||
| "type": "MONSTER", | ||
| "name": { "str": "pupating zombie crawler" }, | ||
| "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything neck down. Beneath the wrapping there is strange rhythmic movement grotesque to behold.", | ||
| "copy-from": "mon_zombie_crawler_pupa_decoy", | ||
| "extend": { | ||
| "special_attacks": [ | ||
| { | ||
| "type": "spell", | ||
| "spell_data": { "id": "small_raptor_spawn", "hit_self": true }, | ||
| "cooldown": 50, | ||
| "monster_message": "The pupating zombie crawler bursts, and gore-smeared winged beasts climb out of the corpse!" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "mon_zombie_pupa_decoy", | ||
| "type": "MONSTER", | ||
| "name": { "str": "pupating zombie" }, | ||
| "description": "This human corpse is wrapped in sticky black fibers that cover everything neck down. Beneath the wrapping there is strange rhythmic movement grotesque to behold.", | ||
| "copy-from": "mon_zombie_fat", | ||
| "delete": { "categories": [ "CLASSIC" ] }, | ||
| "armor_bash": 8, | ||
| "armor_cut": 6, | ||
| "armor_bullet": 6, | ||
| "special_attacks": [ { "type": "bite", "cooldown": 3 } ], | ||
| "regenerates": 10, | ||
| "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] } | ||
| }, | ||
| { | ||
| "id": "mon_zombie_pupa", | ||
| "type": "MONSTER", | ||
| "name": { "str": "pupating zombie" }, | ||
| "description": "This human corpse is wrapped in sticky black fibers that cover everything neck down. Beneath the wrapping there is strange rhythmic movement grotesque to behold.", | ||
| "copy-from": "mon_zombie_pupa_decoy", | ||
| "extend": { | ||
| "special_attacks": [ | ||
| { | ||
| "type": "spell", | ||
| "spell_data": { "id": "small_raptor_spawn", "hit_self": true }, | ||
| "cooldown": 50, | ||
| "monster_message": "The pupating zombie bursts, and gore-smeared winged beasts climb out of the corpse!" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "id": "mon_zombie_pupa_decoy_shady", | ||
| "type": "MONSTER", | ||
| "name": { "str": "shady pupating zombie" }, | ||
| "description": "An uncanny shadow envelops this creature. You can make out the outline of what once may have been a human being, but its edges bulge rhythmically in places that are not anatomically possible for humans.", | ||
| "copy-from": "mon_zombie_fat", | ||
| "delete": { "categories": [ "CLASSIC" ] }, | ||
| "armor_bash": 8, | ||
| "armor_cut": 6, | ||
| "armor_bullet": 6, | ||
| "special_attacks": [ { "type": "bite", "cooldown": 3 } ], | ||
| "regenerates": 5, | ||
| "vision_day": 8, | ||
| "vision_night": 15, | ||
| "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF", "NIGHT_INVISIBILITY" ] } | ||
| }, | ||
| { | ||
| "id": "mon_zombie_pupa_shady", | ||
| "type": "MONSTER", | ||
| "name": { "str": "shady pupating zombie" }, | ||
| "description": "An uncanny shadow envelops this creature. You can make out the outline of what once may have been a human being, but its edges bulge rhythmically in places that are not anatomically possible for humans.", | ||
| "copy-from": "mon_zombie_pupa_decoy", | ||
| "extend": { | ||
| "special_attacks": [ | ||
| { | ||
| "type": "spell", | ||
| "spell_data": { "id": "shady_raptor_spawn", "hit_self": true }, | ||
| "cooldown": 50, | ||
| "monster_message": "The pupating zombie bursts, and shadowy winged beasts climb out of the corpse!" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| [ | ||
| { | ||
| "id": "mon_spawn_raptor", | ||
| "type": "MONSTER", | ||
| "name": { "str": "flesh-raptor" }, | ||
| "description": "This small winged predator darts through the air on three thinly haired wings that look like stretched human hands. Where the wings meet juts a sheer jagged spike. It looks like nothing you've seen on Earth, and yet strangely like it was made of human parts.", | ||
| "species": [ "ZOMBIE", "HUMAN" ], | ||
| "default_faction": "zombie", | ||
| "diff": 1, | ||
| "volume": "4 L", | ||
| "weight": "6 kg", | ||
| "hp": 20, | ||
| "speed": 140, | ||
| "material": [ "flesh" ], | ||
| "symbol": "z", | ||
| "color": "white", | ||
| "aggression": 100, | ||
| "morale": 100, | ||
| "melee_skill": 9, | ||
| "melee_dice": 2, | ||
| "melee_dice_sides": 3, | ||
| "melee_cut": 4, | ||
| "dodge": 3, | ||
| "vision_night": 5, | ||
| "harvest": "zombie", | ||
| "special_attacks": [ { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } ], | ||
| "death_function": [ "NORMAL" ], | ||
| "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_RAPTOR_UPGRADES" }, | ||
| "flags": [ | ||
| "SEES", | ||
| "HEARS", | ||
| "SMELLS", | ||
| "STUMBLES", | ||
| "WARM", | ||
| "POISON", | ||
| "BASHES", | ||
| "GROUP_BASH", | ||
| "NO_BREATHE", | ||
| "FILTHY", | ||
| "HIT_AND_RUN", | ||
| "SWARMS", | ||
| "FLIES" | ||
| ] | ||
| }, | ||
| { | ||
| "type": "MONSTER", | ||
| "id": "mon_spawn_raptor_shady", | ||
| "name": { "str": "shadow raptor" }, | ||
| "copy-from": "mon_spawn_raptor", | ||
| "color": "light_gray", | ||
| "description": "An uncanny shadow envelops this creature. You can make out the outline of three flapping wings connected to a jagged pointed object.", | ||
| "upgrades": { }, | ||
| "extend": { "flags": [ "NIGHT_INVISIBILITY" ] }, | ||
| "vision_day": 10, | ||
| "vision_night": 25 | ||
| }, | ||
| { | ||
| "type": "MONSTER", | ||
| "id": "mon_spawn_raptor_unstable", | ||
| "name": { "str_sp": "unstable flesh-raptor" }, | ||
| "copy-from": "mon_spawn_raptor", | ||
| "speed": 100, | ||
| "color": "red", | ||
| "description": "This small winged predator darts through the air on three thinly haired wings that look like stretched human hands. Where the wings meet juts a jagged spike and a bloated fleshy belly.", | ||
| "special_attacks": [ | ||
| [ "SUICIDE", 20 ], | ||
| { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } | ||
| ], | ||
| "death_function": [ "EXPLODE" ], | ||
| "upgrades": { } | ||
| }, | ||
| { | ||
| "type": "MONSTER", | ||
| "id": "mon_spawn_raptor_electric", | ||
| "name": { "str": "zaptor" }, | ||
| "copy-from": "mon_spawn_raptor", | ||
| "color": "light_cyan", | ||
| "diff": 10, | ||
| "description": "This small winged predator darts through the air on three thinly haired wings that look like stretched human hands. Where the wings meet juts a jagged spike with a pulsing electrical glow.", | ||
| "melee_damage": [ { "damage_type": "electric", "amount": 8 } ], | ||
| "luminance": 8, | ||
| "special_attacks": [ | ||
| [ "SHOCKSTORM", 25 ], | ||
| { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } | ||
| ], | ||
| "special_when_hit": [ "ZAPBACK", 100 ], | ||
| "upgrades": { }, | ||
| "extend": { "flags": [ "ELECTRIC" ] } | ||
| } | ||
| ] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are those groups "redefined" like this? It should probably be added to the original group. Same for the rest, below.