Skip to content

Commit

Permalink
Merge pull request #72334 from CleverRaven/revert-69591
Browse files Browse the repository at this point in the history 
Revert the rest of #69591
  • Loading branch information
@Maleclypse
Maleclypse authored Mar 14, 2024
2 parents 4230396 + 6b63aad commit b1885e4
Show file tree
Hide file tree
Showing 36 changed files with 197 additions and 1,052 deletions.
271 changes: 0 additions & 271 deletions data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,277 +283,6 @@
{ "u_make_sound": "a sneeze!", "volume": 10, "type": "speech" }
]
},
{
"type": "effect_on_condition",
"id": "leaves_winter_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": { "and": [ { "is_season": "winter" }, { "u_has_trait": "LEAVES" } ] },
"effect": [
{ "u_message": "The grassy leaves on your head have succumbed to winter dormancy.", "type": "bad" },
{ "u_lose_trait": "LEAVES" },
{ "u_add_trait": "LEAVES_WINTER" }
]
},
{
"type": "effect_on_condition",
"id": "leaves_spring_summer_fall_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "is_season": "spring" }, { "is_season": "summer" }, { "is_season": "autumn" } ] },
{ "u_has_trait": "LEAVES_WINTER" }
]
},
"effect": [
{ "u_message": "Your leaves are looking green and healthy again.", "type": "good" },
{ "u_lose_trait": "LEAVES_WINTER" },
{ "u_add_trait": "LEAVES" }
]
},
{
"type": "effect_on_condition",
"id": "flowers_winter_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": { "and": [ { "is_season": "winter" }, { "u_has_trait": "FLOWERS" } ] },
"effect": [
{
"u_message": "A somber feeling comes over you as the last petals of your wilting flowers fall from your head.",
"type": "bad"
},
{ "u_lose_trait": "FLOWERS" },
{ "u_add_trait": "FLOWERS_WINTER" }
]
},
{
"type": "effect_on_condition",
"id": "flowers_spring_summer_fall_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "is_season": "spring" }, { "is_season": "summer" }, { "is_season": "autumn" } ] },
{ "u_has_trait": "FLOWERS_WINTER" }
]
},
"effect": [
{ "u_message": "You feel a giddy thrill as new flowers bloom from your scalp.", "type": "good" },
{ "u_lose_trait": "FLOWERS_WINTER" },
{ "u_add_trait": "FLOWERS" }
]
},
{
"type": "effect_on_condition",
"id": "leaves2_spring_summer_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "LEAVES2_FALL" }, { "u_has_trait": "LEAVES2_WINTER" } ] },
{ "or": [ { "is_season": "spring" }, { "is_season": "summer" } ] }
]
},
"effect": [
{ "u_message": "New green leaves are growing in on your head and arms.", "type": "good" },
{ "u_lose_trait": "LEAVES2_WINTER" },
{ "u_lose_trait": "LEAVES2_FALL" },
{ "u_add_trait": "LEAVES2" }
]
},
{
"type": "effect_on_condition",
"id": "leaves2_fall_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [ { "or": [ { "u_has_trait": "LEAVES2" }, { "u_has_trait": "LEAVES2_WINTER" } ] }, { "is_season": "autumn" } ]
},
"effect": [
{ "u_message": "Your leaves are turning and starting to drop as the season changes.", "type": "good" },
{ "u_lose_trait": "LEAVES2" },
{ "u_lose_trait": "LEAVES2_WINTER" },
{ "u_spawn_item": "leaves", "count": 1 },
{ "u_add_trait": "LEAVES2_FALL" }
]
},
{
"type": "effect_on_condition",
"id": "leaves2_winter_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": { "and": [ { "or": [ { "u_has_trait": "LEAVES2" }, { "u_has_trait": "LEAVES2_FALL" } ] }, { "is_season": "winter" } ] },
"effect": [
{ "u_message": "The last of your leaves fall, leaving your head and arms bare.", "type": "bad" },
{ "u_lose_trait": "LEAVES2" },
{ "u_lose_trait": "LEAVES2_FALL" },
{ "u_spawn_item": "leaves", "count": 1 },
{ "u_add_trait": "LEAVES2_WINTER" }
]
},
{
"type": "effect_on_condition",
"id": "leaves3_spring_summer_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "LEAVES3_FALL" }, { "u_has_trait": "LEAVES3_WINTER" } ] },
{ "or": [ { "is_season": "spring" }, { "is_season": "summer" } ] }
]
},
"effect": [
{ "u_message": "New green leaves are growing in on your head and upper limbs.", "type": "good" },
{ "u_lose_trait": "LEAVES3_WINTER" },
{ "u_lose_trait": "LEAVES3_FALL" },
{ "u_add_trait": "LEAVES3" }
]
},
{
"type": "effect_on_condition",
"id": "leaves3_fall_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [ { "or": [ { "u_has_trait": "LEAVES3" }, { "u_has_trait": "LEAVES3_WINTER" } ] }, { "is_season": "autumn" } ]
},
"effect": [
{
"u_message": "Your leaves have begun taking on the red-gold hues of fall. A few have fallen already.",
"type": "good"
},
{ "u_lose_trait": "LEAVES3" },
{ "u_lose_trait": "LEAVES3_WINTER" },
{ "u_spawn_item": "leaves", "count": 1 },
{ "u_add_trait": "LEAVES3_FALL" }
]
},
{
"type": "effect_on_condition",
"id": "leaves3_winter_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": { "and": [ { "or": [ { "u_has_trait": "LEAVES3" }, { "u_has_trait": "LEAVES3_FALL" } ] }, { "is_season": "winter" } ] },
"effect": [
{ "u_message": "The last of your leaves fall, leaving your head and upper limbs bare.", "type": "bad" },
{ "u_lose_trait": "LEAVES3" },
{ "u_lose_trait": "LEAVES3_FALL" },
{ "u_spawn_item": "leaves", "count": 1 },
{ "u_add_trait": "LEAVES3_WINTER" }
]
},
{
"type": "effect_on_condition",
"id": "rosebuds_spring_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{
"or": [ { "u_has_trait": "ROSEBUDS_SUMMER" }, { "u_has_trait": "ROSEBUDS_FALL" }, { "u_has_trait": "ROSEBUDS_WINTER" } ]
},
{ "is_season": "spring" }
]
},
"effect": [
{
"u_message": "Spring must be here, the new buds growing from your scalp are giving off a lovely scent.",
"type": "good"
},
{ "u_lose_trait": "ROSEBUDS_WINTER" },
{ "u_lose_trait": "ROSEBUDS_SUMMER" },
{ "u_lose_trait": "ROSEBUDS_FALL" },
{ "u_add_trait": "ROSEBUDS" }
]
},
{
"type": "effect_on_condition",
"id": "rosebuds_summer_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "ROSEBUDS" }, { "u_has_trait": "ROSEBUDS_FALL" }, { "u_has_trait": "ROSEBUDS_WINTER" } ] },
{ "is_season": "summer" }
]
},
"effect": [
{
"u_message": "Your blossoms come into full bloom, sending a brief flush of warmth through your body.",
"type": "good"
},
{ "u_lose_trait": "ROSEBUDS_WINTER" },
{ "u_lose_trait": "ROSEBUDS" },
{ "u_lose_trait": "ROSEBUDS_FALL" },
{ "u_add_trait": "ROSEBUDS_SUMMER" }
]
},
{
"type": "effect_on_condition",
"id": "rosebuds_fall_timer_plant",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "ROSEBUDS" }, { "u_has_trait": "ROSEBUDS_SUMMER" }, { "u_has_trait": "ROSEBUDS_WINTER" } ] },
{ "u_has_trait": "THRESH_PLANT" },
{ "is_season": "autumn" }
]
},
"effect": [
{
"u_message": "Your flowers have withered away and died. In their place, a few small fruits hang from your head.",
"type": "good"
},
{ "u_lose_trait": "ROSEBUDS_WINTER" },
{ "u_lose_trait": "ROSEBUDS" },
{ "u_lose_trait": "ROSEBUDS_SUMMER" },
{ "u_add_trait": "ROSEBUDS_FALL" }
]
},
{
"type": "effect_on_condition",
"id": "picked_rosebuds_fall",
"recurrence": [ "1 seconds", "1 seconds" ],
"condition": { "and": [ { "u_has_trait": "ROSEBUDS_FALL_active" } ] },
"effect": [
{ "u_lose_trait": "ROSEBUDS_FALL_active" },
{ "u_spawn_item": "mutfruit", "count": 1 },
{ "u_add_trait": "ROSEBUDS_FALL_PICKED" }
]
},
{
"type": "effect_on_condition",
"id": "rosebuds_fall_timer_elfa",
"//": "Only true plants bear fruit. Elves just look pretty for longer.",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "ROSEBUDS" }, { "u_has_trait": "ROSEBUDS" }, { "u_has_trait": "ROSEBUDS_WINTER" } ] },
{ "not": { "u_has_trait": "THRESH_PLANT" } },
{ "is_season": "autumn" }
]
},
"effect": [
{
"u_message": "Your blossoms come into full bloom, sending a brief flush of warmth through your body.",
"type": "good"
},
{ "u_lose_trait": "ROSEBUDS_WINTER" },
{ "u_lose_trait": "ROSEBUDS" },
{ "u_lose_trait": "ROSEBUDS_FALL" },
{ "u_add_trait": "ROSEBUDS_SUMMER" }
]
},
{
"type": "effect_on_condition",
"id": "rosebuds_winter_timer",
"recurrence": [ "15 hours", "60 hours" ],
"condition": {
"and": [
{ "or": [ { "u_has_trait": "ROSEBUDS" }, { "u_has_trait": "ROSEBUDS_FALL" }, { "u_has_trait": "ROSEBUDS_SUMMER" } ] },
{ "is_season": "winter" }
]
},
"effect": [
{
"u_message": "Winter claims the last few vestiges of your flowers, leaving your crown bare of adornment.",
"type": "bad"
},
{ "u_lose_trait": "ROSEBUDS_SUMMER" },
{ "u_lose_trait": "ROSEBUDS" },
{ "u_lose_trait": "ROSEBUDS_FALL" },
{ "u_add_trait": "ROSEBUDS_WINTER" }
]
},
{
"type": "effect_on_condition",
"id": "shed_summer_timer_lupine",
Expand Down
5 changes: 0 additions & 5 deletions data/json/flags.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2381,11 +2381,6 @@
"type": "json_flag",
"//": "This corpse is from a monster with the CRITTER_UNDERFED flag."
},
{
"id": "TRANSPARENT",
"type": "json_flag",
"info": "This is transparent and <info>won't block light</info> from hitting the wearer."
},
{
"id": "UNRESTRICTED",
"type": "json_flag",
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-floors-outdoors.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"connect_groups": "DIRTMOUND",
"connects_to": "DIRTMOUND",
"move_cost": 3,
"flags": [ "TRANSPARENT", "DIGGABLE", "MOUNTABLE", "NOCOLLIDE", "PLANTABLE", "TREE_PLANTABLE" ],
"flags": [ "TRANSPARENT", "DIGGABLE", "MOUNTABLE", "NOCOLLIDE", "PLANTABLE" ],
"bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100 },
"examine_action": "dirtmound"
},
Expand Down
7 changes: 3 additions & 4 deletions data/json/items/armor/cloaks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2028,18 +2028,17 @@
"type": "ARMOR",
"category": "clothing",
"symbol": "[",
"color": "white",
"color": "yellow",
"name": { "str": "rain poncho" },
"description": "A lightweight transparent plastic rain poncho with a hood. It folds into a very compact form when not in use.",
"description": "A lightweigh plastic rain poncho with a hood. It folds into a very compact form when not in use.",
"price": 5000,
"price_postapoc": 50,
"material": [ "vinyl" ],
"weight": "280 g",
"volume": "250 ml",
"flags": [ "RAINPROOF", "HOOD", "OVERSIZE", "BELTED", "TRANSPARENT" ],
"flags": [ "RAINPROOF", "HOOD", "OVERSIZE", "BELTED" ],
"environmental_protection": 1,
"material_thickness": 0.4,
"variant_type": "generic",
"armor": [
{ "covers": [ "torso" ], "specifically_covers": [ "torso_upper", "torso_lower" ], "coverage": 100 },
{
Expand Down
Loading

0 comments on commit b1885e4

Please sign in to comment.