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

Mod cleanup: Fix special attacks and death functions #36186

Merged
merged 8 commits into from
Dec 17, 2019
Merged

Mod cleanup: Fix special attacks and death functions #36186

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1321e7
Fix special attacks
ZhilkinSerg Dec 17, 2019
1fc1bae
Fix death functions
ZhilkinSerg Dec 17, 2019
f75d70c
Removed unused item_chance node
ZhilkinSerg Dec 17, 2019
a40b8f7
Used proper leap special attack
ZhilkinSerg Dec 17, 2019
2974e74
Apply suggestions from code review
ZhilkinSerg Dec 17, 2019
cdcfdb4
Apply suggestions from code review
ZhilkinSerg Dec 17, 2019
e92bdb2
Apply suggestions from code review
ZhilkinSerg Dec 17, 2019
f6f92a6
Apply suggestions from code review
ZhilkinSerg Dec 17, 2019
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
126 changes: 34 additions & 92 deletions data/mods/Animatronics/animatronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic fox, nearly twice your size. Its teeth and claws look quite sharp. Its right hand is replaced with a hook. It looks heavily worn and degraded.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -56,13 +54,11 @@
"armor_cut": 8,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] },
"luminance": 0,
"hp": 160,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic fox, nearly twice your size. Its teeth and claws look quite sharp. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -90,13 +86,11 @@
"armor_cut": 12,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A wrecked animatronic fox, laying in a pile on the ground. Its teeth and claws still look quite sharp. It's able to crawl around and climb on the ceiling.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -124,13 +118,11 @@
"armor_cut": 8,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] },
"luminance": 0,
"hp": 160,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic bunny, nearly twice your size. Its actually quite cute, even though it's trying to kill you. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -158,13 +150,11 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic bunny, nearly twice your size. Its face has been torn clear off, though the sockets for it's eyes still exist. It looks heavily worn and degraded.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -192,13 +182,11 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic chicken, nearly twice your size. It's wearing a bib that reads 'Let's Eat!'. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -226,13 +214,11 @@
"armor_cut": 8,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 75 ], [ "default_zombie_clothes", 10 ], [ "child_items", 25 ] ] },
"luminance": 0,
"hp": 160,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic chicken, nearly twice your size. It's wearing a bib that reads 'Let's Party!'. She oddly has a curvaceous figure. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -260,13 +246,11 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic bear, nearly twice your size. It's holding a microphone, and wearing a top hat. Though it is a robot, it stinks like death. It looks heavily worn and degraded.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -294,13 +278,11 @@
"armor_cut": 8,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 180,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A bipedal animatronic bear, nearly twice your size. It's holding a microphone, and wearing a top hat. Its outer layer is made of reinforced plastic. It looks to be high tech, and in good shape.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -328,13 +310,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic bat, nearly twice your size. It might have been cute once, but has fallen into disrepair. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -362,13 +341,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic beaver, nearly twice your size. Its buck teeth look far more sharp than they should be. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -396,13 +372,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic cat, nearly twice your size. Its claws are extremely sharp. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -430,13 +403,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic chipmunk, nearly twice your size. You might call it cute if it wasn't charging you down right now. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -464,13 +434,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 160,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic cow, nearly twice your size. Its voice-box is broken, making it emit shrill, eerie moos. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -498,13 +465,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic coyote, nearly twice your size. Its head twitches about faster than seems possible. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -532,13 +496,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic deer, nearly twice your size. The hunter becomes the hunted. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -566,13 +527,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 180,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic horse, nearly twice your size. It's amazing. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -600,13 +558,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 160,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic pig, nearly twice your size. Little piggy go home, little piggy no no. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -634,13 +589,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic sheep, nearly twice your size. Its wool is mangy and gross. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -668,13 +620,10 @@
"armor_cut": 4,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic squirrel, nearly twice your size. Judging by its sharp teeth, you hope it does not like nuts. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -702,13 +651,11 @@
"armor_cut": 2,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "An animatronic child. It looks like it's annoying as hell. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -736,13 +683,11 @@
"armor_cut": 2,
"vision_day": 50,
"vision_night": 50,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 10 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 100,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ [ "PARROT", 0 ] ],
"death_function": [ "BROKEN" ],
"special_attacks": [ [ "PARROT", 0 ] ],
"description": "A marionette able to move itself around. There are no strings on him however.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down Expand Up @@ -770,13 +715,10 @@
"armor_cut": 6,
"vision_day": 30,
"vision_night": 5,
"item_chance": 80,
"death_drops": { "groups": [ [ "robots", 60 ], [ "default_zombie_clothes", 40 ], [ "child_items", 75 ] ] },
"luminance": 0,
"hp": 150,
"special_freq": [ 0 ],
"death_function": "BROKEN",
"special_attack": [ "NONE" ],
"death_function": [ "BROKEN" ],
"description": "A bipedal animatronic wolf, nearly twice your size. If the animal counterpart was scary, this robot is terrifying. Though it is a robot, it stinks like death.",
"flags": [ "SEES", "GRABS", "HEARS", "BASHES", "ELECTRONIC", "NO_BREATHE" ],
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ]
Expand Down
Loading