Skip to content

Commit

Permalink
Relimb
Browse files Browse the repository at this point in the history
  • Loading branch information
@Venera3
Venera3 committed Apr 6, 2024
1 parent 7fece1f commit 3ecfe2e
Show file tree
Hide file tree
Showing 15 changed files with 1,583 additions and 1,101 deletions.
5 changes: 5 additions & 0 deletions data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"type": "effect_on_condition",
"id": "eoc_debug_mutate",
"effect": [ { "u_mutate": 0 } ]
},
{
"type": "effect_on_condition",
"id": "mut_eyestalk",
Expand Down
16 changes: 13 additions & 3 deletions data/json/mutations/mutations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5213,7 +5213,7 @@
"threshreq": [ "THRESH_BIRD" ],
"category": [ "BIRD" ],
"restricts_gear": [ "arm_l", "arm_r", "hand_l", "hand_r" ],
"flags": [ "WINGS_2", "WING_GLIDE", "ARM_WINGS" ]
"flags": [ "WINGS_2", "WING_GLIDE" ]
},
{
"type": "mutation",
Expand Down Expand Up @@ -6381,7 +6381,7 @@
"mixed_effect": true,
"description": "Most of your fingers have grown to tremendous length, becoming a broad pair of leathery wings. This allows you to arrest a fall or glide from a ledge if you aren't too weighed down, but naturally impedes your fine motor skills. They even keep you warm when you sleep.",
"types": [ "ARMS", "HANDS" ],
"flags": [ "WING_GLIDE", "WINGS_2", "ARM_WINGS" ],
"flags": [ "WING_GLIDE", "WINGS_2" ],
"encumbrance_always": [ [ "arm_r", 20 ], [ "arm_l", 20 ], [ "hand_r", 40 ], [ "hand_l", 40 ] ],
"prereqs": [ "WEBBED" ],
"category": [ "CHIROPTERAN" ],
Expand Down Expand Up @@ -7811,7 +7811,6 @@
"mixed_effect": true,
"description": "Your arms have sprouted feathers, and you find you can no longer fully extend your elbows. This gets in the way a bit, but the feathers offer minor protection from damage and the elements.",
"category": [ "RAPTOR", "BIRD" ],
"flags": [ "WINGS_1", "ARM_WINGS" ],
"changes_to": [ "WINGS_BIRD" ],
"wet_protection": [
{ "part": "arm_l", "neutral": 50 },
Expand Down Expand Up @@ -8884,6 +8883,17 @@
"enchantments": [ "ENCH_DEBUG_BIG_HEAD" ],
"debug": true
},
{
"type": "mutation",
"id": "DEBUG_MUTATE",
"name": { "str": "Debug Genetic Instability" },
"points": 99,
"valid": false,
"description": "You just can't wait to turn into a bug! Triggers a mutation using the normal mutation rules every five seconds.",
"debug": true,
"processed_eocs": [ "eoc_debug_mutate" ],
"time": "5 s"
},
{
"type": "mutation",
"id": "DEBUG_NIGHTVISION",
Expand Down
29 changes: 29 additions & 0 deletions data/mods/Limb_WIP/armor/limb_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,35 @@
}
]
},
{
"type": "ARMOR",
"id": "integrated_feathers",
"copy-from": "integrated_feathers",
"name": { "str_sp": "feathers" },
"armor": [
{
"material": [ { "type": "mut_feather", "covered_by_mat": 100, "thickness": 4 } ],
"covers": [
"hand_l",
"hand_r",
"foot_l",
"foot_r",
"leg_l",
"leg_r",
"arm_l",
"arm_r",
"torso",
"head",
"arm_feathers_l",
"arm_feathers_r",
"arm_wing_bird_l",
"arm_wing_bird_r"
],
"coverage": 100,
"encumbrance": 0
}
]
},
{
"id": "armor_bio_arms_basic",
"type": "ARMOR",
Expand Down
13 changes: 0 additions & 13 deletions data/mods/Limb_WIP/enchantments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,6 @@
"values": [ { "value": "MOVECOST_FLATGROUND_MOD", "multiply": 0.25 } ],
"modified_bodyparts": [ { "lose": "leg_l" }, { "lose": "leg_r" }, { "lose": "foot_r" }, { "lose": "foot_l" }, { "gain": "gastropod_foot" } ]
},
{
"type": "enchantment",
"id": "ench_wings_bird",
"condition": "ALWAYS",
"modified_bodyparts": [
{ "lose": "arm_l" },
{ "lose": "arm_r" },
{ "lose": "hand_r" },
{ "lose": "hand_l" },
{ "gain": "wing_bird_l" },
{ "gain": "wing_bird_r" }
]
},
{
"type": "enchantment",
"id": "ENCH_NO_RIGHT_LEG",
Expand Down
161 changes: 157 additions & 4 deletions data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,26 @@
{ "u_add_effect": "stunned", "duration": [ "5 s", "30 s" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_ARM_PAIN",
"effect": [ { "u_message": "<arm_pain>", "snippet": true }, { "math": [ "u_pain()", "+=", "5" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_ARM_DROP",
"condition": "u_has_weapon",
"effect": [ { "u_message": "<arm_drop>", "snippet": true }, "player_weapon_drop" ]
},
{
"type": "effect_on_condition",
"id": "EOC_ARM_ITCH",
"effect": [
{ "u_message": "<arm_itch>", "snippet": true },
{ "u_add_effect": "formication", "duration": 3600, "target_part": "arm_l" },
{ "u_add_effect": "formication", "duration": 3600, "target_part": "arm_r" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_PRE_EYES_INSECT",
Expand All @@ -43,7 +63,8 @@
{ "math": [ "u_vitamin('mutagen_insect')", ">=", "300" ] },
{ "math": [ "u_vitamin('mutagen')", ">=", "300" ] },
{ "math": [ "u_progress_pre_eyes_insect", ">=", "3" ] },
{ "u_has_effect": "sleep" }
{ "u_has_effect": "sleep" },
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"effect": [
Expand All @@ -66,7 +87,7 @@
{
"x_in_y_chance": { "x": { "math": [ "u_vitamin('mutagen_insect') + u_vitamin('mutagen')" ] }, "y": 1000 }
},
{ "math": [ "time_since('limb_progress_timer', 'unit':'days') >= 1" ] }
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"then": [
Expand Down Expand Up @@ -94,7 +115,8 @@
{ "math": [ "u_vitamin('mutagen_insect')", ">=", "500" ] },
{ "math": [ "u_vitamin('mutagen')", ">=", "500" ] },
{ "math": [ "u_progress_eyes_insect", ">=", "5" ] },
{ "u_has_effect": "sleep" }
{ "u_has_effect": "sleep" },
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"effect": [
Expand All @@ -118,7 +140,7 @@
{
"x_in_y_chance": { "x": { "math": [ "u_vitamin('mutagen_insect') + u_vitamin('mutagen')" ] }, "y": 1200 }
},
{ "math": [ "time_since('limb_progress_timer', 'unit':'days') >= 1" ] }
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"then": [
Expand All @@ -136,5 +158,136 @@
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_PRE_ARM_FEATHERS",
"//": "First-stage limb, single progress dream. Dynamically decide on failure snips/mutation category",
"condition": {
"and": [
{
"or": [ { "math": [ "u_vitamin('mutagen_bird')", ">=", "200" ] }, { "math": [ "u_vitamin('mutagen_raptor')", ">=", "200" ] } ]
},
{ "math": [ "u_vitamin('mutagen')", ">=", "300" ] },
{ "math": [ "u_progress_pre_arm_feathers", ">=", "1" ] },
{ "u_has_effect": "sleep" },
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"effect": [
{
"if": { "math": [ "u_vitamin('mutagen_bird')", ">=", "u_vitamin('mutagen_raptor')" ] },
"then": { "u_mutate_towards": "ARM_FEATHERS", "category": "BIRD", "use_vitamins": true },
"else": { "u_mutate_towards": "ARM_FEATHERS", "category": "RAPTOR", "use_vitamins": true }
},
{
"if": { "u_has_trait": "ARM_FEATHERS" },
"then": [
{ "u_message": "<arm_feathers_success>", "popup": true },
{ "math": [ "u_progress_pre_arm_feathers", "=", "0" ] },
{ "u_lose_effect": "sleep" }
],
"else": {
"if": { "math": [ "u_vitamin('mutagen_bird')", ">=", "u_vitamin('mutagen_raptor')" ] },
"then": { "u_message": "<bird_failure>", "type": "bad", "snippet": true },
"else": { "u_message": "<raptor_failure>", "type": "bad", "snippet": true }
}
}
],
"false_effect": [
{
"if": {
"and": [
{ "u_has_effect": "sleep" },
{
"x_in_y_chance": { "x": { "math": [ "u_vitamin('mutagen_bird') + u_vitamin('mutagen_raptor') + u_vitamin('mutagen')" ] }, "y": 1500 }
},
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"then": [
{ "u_message": "<arm_feathers_dream>", "snippet": true, "popup": true },
{ "u_lose_effect": "sleep" },
{ "math": [ "u_progress_pre_arm_feathers", "++" ] },
{ "math": [ "u_limb_progress_timer", "=", "time('now')" ] }
],
"else": [
{
"if": { "one_in_chance": 5 },
"then": {
"if": { "math": [ "u_vitamin('mutagen_bird')", ">=", "u_vitamin('mutagen_raptor')" ] },
"then": { "u_message": "<bird_failure>", "type": "bad", "snippet": true },
"else": { "u_message": "<raptor_failure>", "type": "bad", "snippet": true }
}
},
{
"if": { "one_in_chance": 10 },
"then": { "weighted_list_eocs": [ [ "EOC_ARM_PAIN", 2 ], [ "EOC_ARM_ITCH", 5 ] ] }
}
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_ARM_FEATHERS",
"//": "If you're on the way towards birdyness try growing wings. No failure message unless you're birdier than raptorier; check if you either have the bird thresh or are still pre-thresh",
"condition": {
"and": [
{ "math": [ "u_vitamin('mutagen_bird')", ">=", "300" ] },
{ "math": [ "u_vitamin('mutagen')", ">=", "300" ] },
{ "math": [ "u_progress_wings_bird", ">=", "3" ] },
{ "u_has_effect": "sleep" },
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"effect": [
{ "u_mutate_towards": "WINGS_BIRD", "category": "BIRD", "use_vitamins": true },
{
"if": { "u_has_trait": "WINGS_BIRD" },
"then": [
{ "u_message": "<wings_bird_success>", "popup": true },
{ "math": [ "u_progress_wings_bird", "=", "0" ] },
{ "u_lose_effect": "sleep" }
],
"else": { "u_message": "<bird_failure>", "type": "bad", "snippet": true }
}
],
"false_effect": [
{
"if": {
"and": [
{ "u_has_effect": "sleep" },
{ "x_in_y_chance": { "x": { "math": [ "u_vitamin('mutagen_bird')" ] }, "y": 400 } },
{ "math": [ "u_vitamin('mutagen')", ">=", "300" ] },
{ "u_has_trait": "THRESH_BIRD" },
{ "math": [ "time_since(u_limb_progress_timer)", ">=", "time('12 h')" ] }
]
},
"then": [
{ "u_message": "<wings_bird_dream>", "snippet": true },
{ "u_lose_effect": "sleep" },
{ "math": [ "u_progress_wings_bird", "++" ] },
{ "math": [ "u_limb_progress_timer", "=", "time('now')" ] }
],
"else": [
{
"if": {
"and": [
{ "math": [ "u_vitamin('mutagen_bird')", ">", "200" ] },
{ "or": [ { "u_has_trait": "THRESH_BIRD" }, { "not": { "u_has_flag": "MUTATION_THRESHOLD" } } ] }
]
},
"then": [
{ "if": { "one_in_chance": 5 }, "then": { "u_message": "<bird_failure>", "type": "bad", "snippet": true } },
{
"if": { "one_in_chance": 10 },
"then": { "weighted_list_eocs": [ [ "EOC_ARM_DROP", 1 ], [ "EOC_ARM_PAIN", 2 ], [ "EOC_ARM_ITCH", 5 ] ] }
}
]
}
]
}
]
}
]
Loading

0 comments on commit 3ecfe2e

Please sign in to comment.