Skip to content

Commit

Permalink
feat(port): Rabbit Mutations (#5885)
Browse files Browse the repository at this point in the history
* initial commit

- CleverRaven/Cataclysm-DDA#48548
- CleverRaven/Cataclysm-DDA#52410
- CleverRaven/Cataclysm-DDA#51630

Co-Authored-By: Frozen Tear <15993955+frozentearcdda@users.noreply.github.com>
Co-Authored-By: KittyTac <52408044+kittytac@users.noreply.github.com>
Co-Authored-By: Maleclypse <54345792+maleclypse@users.noreply.github.com>

* style(autofix.ci): automated formatting

* graphics

Co-Authored-By: thhoney08 <55903475+thhoney08@users.noreply.github.com>

* more graphics

* update

* style(autofix.ci): automated formatting

* Update data/json/mutations/mutations.json

Co-authored-by: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com>

* Update mutations.json

---------

Co-authored-by: Frozen Tear <15993955+frozentearcdda@users.noreply.github.com>
Co-authored-by: KittyTac <52408044+kittytac@users.noreply.github.com>
Co-authored-by: Maleclypse <54345792+maleclypse@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: thhoney08 <55903475+thhoney08@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com>
  • Loading branch information
8 people authored Feb 2, 2025
1 parent 970140f commit 243a679
Show file tree
Hide file tree
Showing 13 changed files with 313 additions and 40 deletions.
8 changes: 8 additions & 0 deletions data/json/achievements.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,14 @@
"hidden_by": [ "achievement_mutation_threshold_plant" ],
"requirements": [ { "event_statistic": "num_avatar_mutation_threshold_plant", "is": ">=", "target": 1 } ]
},
{
"id": "achievement_mutation_threshold_rabbit",
"type": "achievement",
"name": { "str": "[Mutation] Finally beat the tortoise…" },
"description": "You finally won the race against the tortoise. You are now a post-threshold Rabbit mutant.",
"hidden_by": [ "achievement_mutation_threshold_rabbit" ],
"requirements": [ { "event_statistic": "num_avatar_mutation_threshold_rabbit", "is": ">=", "target": 1 } ]
},
{
"id": "achievement_mutation_threshold_rat",
"type": "achievement",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 78 additions & 0 deletions data/json/external_tileset/rabbit_mutations/rabbit_mutations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
[
{
"type": "mod_tileset",
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
"tiles-new": [
{
"file": "external_tileset/rabbit_mutations/rabbit_ears.png",
"tiles": [
{ "id": "overlay_female_mutation_RABBIT_EARS", "fg": 0, "rotates": false },
{ "id": "overlay_male_mutation_RABBIT_EARS", "fg": 0, "rotates": false }
],
"sprite_offset_y": -8,
"sprite_width": 32,
"sprite_height": 32
}
]
},
{
"type": "mod_tileset",
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
"tiles-new": [
{
"file": "external_tileset/rabbit_mutations/rabbit_tail.png",
"tiles": [
{ "id": "overlay_female_mutation_TAIL_RABBIT", "fg": 0, "rotates": false },
{ "id": "overlay_male_mutation_TAIL_RABBIT", "fg": 0, "rotates": false }
],
"sprite_width": 32,
"sprite_height": 32
}
]
},
{
"type": "mod_tileset",
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
"tiles-new": [
{
"file": "external_tileset/rabbit_mutations/rabbit_nose.png",
"tiles": [
{ "id": "overlay_female_mutation_RABBIT_NOSE", "fg": 0, "rotates": false },
{ "id": "overlay_male_mutation_RABBIT_NOSE", "fg": 0, "rotates": false }
],
"sprite_width": 32,
"sprite_height": 32
}
]
},
{
"type": "mod_tileset",
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
"tiles-new": [
{
"file": "external_tileset/rabbit_mutations/rabbit_paw.png",
"tiles": [
{ "id": "overlay_female_mutation_PAWS_LITTLE", "fg": 0, "rotates": false },
{ "id": "overlay_male_mutation_PAWS_LITTLE", "fg": 0, "rotates": false }
],
"sprite_width": 32,
"sprite_height": 32
}
]
},
{
"type": "mod_tileset",
"compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
"tiles-new": [
{
"file": "external_tileset/rabbit_mutations/rabbit_fur.png",
"tiles": [
{ "id": "overlay_female_mutation_RABBIT_FUR", "fg": 1, "rotates": false },
{ "id": "overlay_male_mutation_RABBIT_FUR", "fg": 0, "rotates": false }
],
"sprite_width": 32,
"sprite_height": 32
}
]
}
]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions data/json/items/comestibles/mutagen.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,15 @@
"color": "green",
"use_action": { "type": "mutagen_iv", "mutation_category": "PLANT" }
},
{
"id": "iv_mutagen_rabbit",
"copy-from": "iv_mutagen_flavor",
"type": "COMESTIBLE",
"name": "rabbit serum",
"description": "A super-concentrated mutagen that looks like pureed carrots. You need a syringe to inject it… if you really want to?",
"color": "light_red",
"use_action": { "type": "mutagen_iv", "mutation_category": "RABBIT" }
},
{
"id": "iv_mutagen_raptor",
"copy-from": "iv_mutagen_flavor",
Expand Down Expand Up @@ -387,6 +396,13 @@
"price": "2 kUSD",
"use_action": { "type": "mutagen", "mutation_category": "RAPTOR" }
},
{
"id": "mutagen_rabbit",
"copy-from": "mutagen_flavor",
"type": "COMESTIBLE",
"name": "rabbit mutagen",
"use_action": { "type": "mutagen", "mutation_category": "RABBIT" }
},
{
"id": "mutagen_rat",
"copy-from": "mutagen_flavor",
Expand Down
9 changes: 9 additions & 0 deletions data/json/mutations/mutation_category.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,5 +256,14 @@
"mutagen_message": "You feel a desire to curl up in a nice, warm pile of… shredded paper.",
"iv_message": "You feel… small. But comfortable.",
"memorial_message": "Found the cheese."
},
{
"type": "mutation_category",
"id": "RABBIT",
"name": "Rabbit",
"threshold_mut": "THRESH_RABBIT",
"mutagen_message": "Walking is overrated. It's time to start hopping.",
"iv_message": "You are craving beta carotene.",
"memorial_message": "Acquired a taste for carrots."
}
]
7 changes: 5 additions & 2 deletions data/json/mutations/mutation_ordering.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"LUPINE_FUR",
"LYNX_FUR",
"PLANTSKIN",
"RABBIT_FUR",
"SCALES",
"SKIN_ROUGH",
"SLEEK_SCALES",
Expand Down Expand Up @@ -157,7 +158,7 @@
},
{ "id": [ "PAWS", "PAWS_LARGE", "SLIME_HANDS" ], "order": 2500 },
{
"id": [ "CLAWS", "CLAWS_RAT", "CLAWS_RETRACT", "LONG_FINGERNAILS", "VINES1", "VINES2", "VINES3", "bio_claws" ],
"id": [ "PAWS_LITTLE", "CLAWS", "CLAWS_RAT", "CLAWS_RETRACT", "LONG_FINGERNAILS", "VINES1", "VINES2", "VINES3", "bio_claws" ],
"order": 3000
},
{ "id": [ "bio_blade", "bio_blaster", "bio_emp_armgun" ], "order": 3250 },
Expand All @@ -167,6 +168,7 @@
"TAIL_CLUB",
"TAIL_FIN",
"TAIL_LONG",
"TAIL_RABBIT",
"TAIL_RAPTOR",
"TAIL_RAT",
"TAIL_STING",
Expand All @@ -178,7 +180,7 @@
{ "id": [ "LEG_TENTACLES" ], "order": 4000 },
{ "id": [ "HOOVES", "ROOTS1", "ROOTS2", "ROOTS3", "TALONS" ], "order": 4500 },
{ "id": [ "FLOWERS" ], "order": 5000 },
{ "id": [ "ELFA_EARS", "FELINE_EARS", "LUPINE_EARS", "URSINE_EARS" ], "order": 5500 },
{ "id": [ "ELFA_EARS", "RABBIT_EARS", "FELINE_EARS", "LUPINE_EARS", "URSINE_EARS" ], "order": 5500 },
{ "id": [ "ANTENNAE", "ANTLERS", "CURVED_HORNS", "HORNS", "POINTED_HORNS" ], "order": 6000 },
{ "id": [ "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE" ], "order": 6500 },
{
Expand All @@ -190,6 +192,7 @@
"MUZZLE_BEAR",
"MUZZLE_LONG",
"MUZZLE_RAT",
"RABBIT_NOSE",
"MINOTAUR",
"SLIT_NOSTRILS",
"SNOUT",
Expand Down
Loading

0 comments on commit 243a679

Please sign in to comment.