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.

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

Разное #138

Merged
merged 9 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
8 changes: 6 additions & 2 deletions data/json/itemgroups/Clothing_Gear/costumes.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
{ "item": "coat_straw", "prob": 5 },
{ "item": "robe", "prob": 10 },
{ "item": "samghati", "prob": 1 },
{ "item": "haori", "prob": 1 }
{ "item": "haori", "prob": 1 },
{ "item": "suit_bostonchan", "prob": 20 }
]
},
{
Expand Down Expand Up @@ -189,6 +190,7 @@
{ "item": "hat_hard", "variant": "steampunk_hat_hard", "prob": 10 },
{ "item": "hat_hard_hooded", "variant": "steampunk_hat_hard", "prob": 1 },
{ "item": "clown_wig", "prob": 15 },
{ "item": "bostonchan_wig", "prob": 20 },
{ "item": "tricorne", "prob": 5 },
{ "item": "wizard_hat_costume", "prob": 25 },
{ "item": "pointed_hat", "prob": 20 },
Expand Down Expand Up @@ -289,7 +291,9 @@
{ "item": "cheerleader_skirt", "prob": 15 },
{ "item": "cheerleader_skirt_short", "prob": 15 },
{ "item": "nanoskirt", "prob": 10 },
{ "item": "skirt_leather", "prob": 15 }
{ "item": "skirt_leather", "prob": 15 },
{ "item": "skirt_bostonchan", "prob": 20 }
]
]
},
{
Expand Down
26 changes: 25 additions & 1 deletion data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -2279,7 +2279,31 @@
"weight": 10,
"color": "green",
"append": true
}
},
{
"id": "skirt_bostonchan",
"type": "ARMOR",
"name": { "str": "Boston-Chan skirt" },
"description": "A short skirt for the Boston-Chan costume.",
"weight": "230 g",
"volume": "250 ml",
"price": 9500,
"price_postapoc": 50,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "skirt",
"color": "blue",
"warmth": 10,
"material_thickness": 0.6,
"flags": [ "VARSIZE" ],
"armor": [
{
"encumbrance": 5,
"coverage": 100,
"covers": [ "leg_l", "leg_r" ],
"specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
},
{ "coverage": 38, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] }
]
}
]
21 changes: 20 additions & 1 deletion data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,5 +312,24 @@
"material_thickness": 1.0,
"environmental_protection": 0,
"armor": [ { "encumbrance": 15, "coverage": 10, "covers": [ "head" ] } ]
}
},
{
"id": "bostonchan_wig",
"type": "ARMOR",
"name": { "str": "Boston-Chan wig" },
"description": "A long blue hair wig for the Boston-Chan costume.",
"weight": "125 g",
"volume": "750 ml",
"price": 2500,
"price_postapoc": 10,
"to_hit": -3,
"material": [ "cotton" ],
"symbol": "[",
"color": "blue",
"warmth": 10,
"material_thickness": 0.2,
"environmental_protection": 1,
"flags": [ "VARSIZE" ],
"armor": [ { "encumbrance": 5, "coverage": 60, "covers": [ "head" ] } ]
}
collectanos marked this conversation as resolved.
Show resolved Hide resolved

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
}
}

]
6 changes: 3 additions & 3 deletions data/json/npcs/holdouts/NC_GLOOSCAP.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"topic": "TALK_GLOOSCAP_WHERE"
},
{
"text": "[INT 11] Like the Abenaki myth?",
"text": "[INT 11] Like the Wabanaki myth?",
"topic": "TALK_GLOOSCAP_MYTH",
"condition": {
"and": [
Expand Down Expand Up @@ -224,7 +224,7 @@
{
"type": "talk_topic",
"id": "TALK_GLOOSCAP_JOKING",
"dynamic_line": "Haha, right. What would Glooscap be doing in the sunrise lands at the beginning of the fourth age? That's silly. I'm probably some Abenaki that got hit on the head or something. And who turns into a beaver? Haha. You got me. Just a normal human made out of trees like the rest.",
"dynamic_line": "Haha, right. What would Glooscap be doing in the sunrise lands at the beginning of the fourth age? That's silly. I'm probably some Wabanaki that got hit on the head or something. And who turns into a beaver? Haha. You got me. Just a normal human made out of trees like the rest.",
"responses": [
{
"text": "No problem, a lot of people are going through some hard times right now. Honestly, you're doing better than most. You should follow me, I have a pretty good handle on reality.",
Expand Down Expand Up @@ -279,7 +279,7 @@
{
"type": "talk_topic",
"id": "TALK_SUGGEST_FOLLOW_GLOOSCAP",
"dynamic_line": "Maybe some day. If you can survive a long enough I may decide to come and stay with you.",
"dynamic_line": "Maybe some day. If you can survive for long enough I may decide to come and stay with you.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_GLOOSCAP" },
{ "text": "I need to move on.", "topic": "TALK_DONE" }
Expand Down
Loading