Skip to content

Commit

Permalink
init
Browse files Browse the repository at this point in the history
  • Loading branch information
ampersand55 committed Nov 14, 2024
1 parent 65b3721 commit 762657a
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,7 @@
{
"id": "black_white_varsity_jacket",
"name": { "str": "black and white varsity jacket" },
"description": "This one is is black except the white arms, and has no discerning emblem or writing.",
"description": "This one is black except the white arms, and has no discerning emblem or writing.",
"color": "white",
"weight": 10,
"append": true
Expand Down Expand Up @@ -3723,7 +3723,7 @@
{
"id": "tacjacket_desert",
"name": { "str": "arid tactical jacket" },
"description": "If you were traipsing off to the Sonoran desert, this pocket-laden jacket, with its sand-tan hues, streaks of beige and black, and ventilated interior, would have been your friend. Now, all it is is a reminder of a part of the world that may as well be the crust of Mars, for how remote and unreachable it is.",
"description": "If you were traipsing off to the Sonoran desert, this pocket-laden jacket, with its sand-tan hues, streaks of beige and black, and ventilated interior, would have been your friend. Now, all it is, is a reminder of a part of the world that may as well be the crust of Mars, for how remote and unreachable it is.",
"color": "brown",
"weight": 10,
"append": true
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@
"type": "ARMOR",
"category": "armor",
"name": { "str": "tireplate" },
"description": "Armor fashioned from from overlapping chunks of tire and rolls of duct tape, covering the shoulders and torso.",
"description": "Armor fashioned from overlapping chunks of tire and rolls of duct tape, covering the shoulders and torso.",
"weight": "5790 g",
"volume": "9500 ml",
"price": "42 USD",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/TALK_FACTION_CAMP.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
{
"id": "TALK_CAMP_TUTORIAL_ADVICE",
"type": "talk_topic",
"dynamic_line": "Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n How much you want to expand your camps is up to you. A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off. What kind of camp (or camps) you want to build depends both on what you intend to focus on and whether you want to be stationary or roaming with stops in areas only for some time before moving on. If nothing else, you should consider building a water well as soon as you can, which may require you to perform construction prerequisites.\n If you have access to a fire station or evac shelter, you may want to build your camp in them. Both of those camps are are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n If you are adding expansions to your camp, consider starting with a farm, canteen, or fabrication workshop. The farm makes it easy to grow your own food if you don't have any ready plowed farms nearby, the canteen provides you with a well and root cellars after some upgrades, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n The livestock area, storage area, and saltworks probably shouldn't be your first expansions, but they all have their uses.",
"dynamic_line": "Starting a camp doesn't take much time, and you can use a faction camp to keep your companions fed without needing to regularly give them food, so it's a good idea to establish a minimal camp anywhere you intend to be for a while.\n How much you want to expand your camps is up to you. A modular field camp can be very resource intensive, but building one up allows you to send companions off to hunt and farm for you, so there's quite the pay-off. What kind of camp (or camps) you want to build depends both on what you intend to focus on and whether you want to be stationary or roaming with stops in areas only for some time before moving on. If nothing else, you should consider building a water well as soon as you can, which may require you to perform construction prerequisites.\n If you have access to a fire station or evac shelter, you may want to build your camp in them. Both of those camps are very compact, but have much of the same functionality as an upgraded field camp without requiring so many resources.\n If you are adding expansions to your camp, consider starting with a farm, canteen, or fabrication workshop. The farm makes it easy to grow your own food if you don't have any ready plowed farms nearby, the canteen provides you with a well and root cellars after some upgrades, while the fabrication workshop can allow you to craft some of the resources you need to upgrade your camp.\n The livestock area, storage area, and saltworks probably shouldn't be your first expansions, but they all have their uses.",
"responses": [
{ "text": "Give me an overview of how camps work.", "topic": "TALK_CAMP_TUTORIAL_OVERVIEW" },
{ "text": "I want to go to the list of possible camps.", "topic": "TALK_CAMP_TUTORIAL_BUILDING" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
"id": "TALK_BLACKSMITH_BOUGHT_COOP",
"type": "talk_topic",
"dynamic_line": [
"There yah go, one co-op membership with your name on it. Shop's in the back, keep it tidy and share if anyone else is around workin'. Just as a heads-up, you'll need to bring your own charcoal. There's a kiln in there too, so if you got things to burn, just throw 'em in there there and light up."
"There yah go, one co-op membership with your name on it. Shop's in the back, keep it tidy and share if anyone else is around workin'. Just as a heads-up, you'll need to bring your own charcoal. There's a kiln in there too, so if you got things to burn, just throw 'em in there and light up."
],
"responses": [
{ "text": "Thanks.", "topic": "TALK_BLACKSMITH_SERVICES" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/random_encounters/camper_van_traveler.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
},
"no": {
"compare_string": [ "west", { "npc_val": "dialogue_travel_direction_travel_direction" } ],
"yes": "I'm going west, see how things are out there in tumbleweed territory. You see, the Midwest didn't have a whole lot of people in it compared the the East Coast, so there logically shouldn't be as many <zombies> as there are here. I just hope that everything hasn't <swear> collapsed, that someone's still holding on.",
"yes": "I'm going west, see how things are out there in tumbleweed territory. You see, the Midwest didn't have a whole lot of people in it compared the East Coast, so there logically shouldn't be as many <zombies> as there are here. I just hope that everything hasn't <swear> collapsed, that someone's still holding on.",
"no": "ERROR: DIRECTION PARAMETERS EITHER NOT PICKED OR OUT OF BOUNDS"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
"has_generic_rewards": false,
"dialogue": {
"describe": "I think I might know where those special pants might be though…",
"offer": "This clown was into some of the different things, not the vanilla, you understand me? Yes. I think you will find my valuables in a toy shop not so so far.",
"offer": "This clown was into some of the different things, not the vanilla, you understand me? Yes. I think you will find my valuables in a toy shop not so far.",
"accepted": "You make me so happy I could give you little kisses, and some big kisses, and then something else maybe.",
"rejected": "I know that you cannot resist me long. I will wait, and perhaps some other pretty thing will help me instead?",
"advice": "It may be crowded no? A popular place before, maybe is better to visit at night. Sounds like Alonso's apartment no?",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/robofac/NPC_Cranberry_Foster.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "npc",
"id": "robofac_merc_1",
"name_unique": "Cranberry Foster",
"//": "Appears in the the surface of Hub 01 as an external mercenary.",
"//": "Appears in the surface of Hub 01 as an external mercenary.",
"name_suffix": "Hub Mercenary",
"mission_offered": "MISSION_ROBOFAC_MERC_1_RADIO",
"class": "NC_ROBOFAC_MERC_1",
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/LIXA_snippets.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"text": [
{
"id": "LIXA_lab_graffiti_bored_1",
"text": "This is is a very large circle, filled with hundreds and hundreds of delicate spirals in yellow and orange marker."
"text": "This is a very large circle, filled with hundreds and hundreds of delicate spirals in yellow and orange marker."
},
{
"id": "LIXA_lab_graffiti_bored_2",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/items/comestibles/medicine.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"quench": 5,
"price_postapoc": "250 USD",
"price": "250 USD",
"description": "A chalk white blood analogue for emergency medical use. Far more efficient at oxygenation than natural blood, it can also be used as a general performance enhancer. Once injected, it will be metabolized or otherwise expunged from the the body in around 8 hours.",
"description": "A chalk white blood analogue for emergency medical use. Far more efficient at oxygenation than natural blood, it can also be used as a general performance enhancer. Once injected, it will be metabolized or otherwise expunged from the body in around 8 hours.",
"material": [ "blood" ],
"volume": "250 ml",
"charges": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/snippets/fliers.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
{
"id": "magiclysm_flier_2",
"text": "This is an advertisement for magical protective services. There is a large glossy picture of a spiky, clawed creature with a a single, enormous green eye taking up most of its head. \"With a trained krabgek, your possessions will be safe! Any thieves will have their flesh rotted right off of their bones!\" The paragraph of tiny text at the bottom of the flyer containing a series of disclaimers makes you wonder how safe or trained those krabgeks really are."
"text": "This is an advertisement for magical protective services. There is a large glossy picture of a spiky, clawed creature with a single, enormous green eye taking up most of its head. \"With a trained krabgek, your possessions will be safe! Any thieves will have their flesh rotted right off of their bones!\" The paragraph of tiny text at the bottom of the flyer containing a series of disclaimers makes you wonder how safe or trained those krabgeks really are."
},
{
"id": "magiclysm_flier_3",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"subtype": "hobby",
"id": "newly_clairsentient",
"name": "Newly-Awakened Clairsentient",
"description": "Something happened during the storms that raged during the Cataclysm, and now you can do things that would have once seemed impossible. You can read much faster and can see much better in the dark, and even in total darkness you no longer have any hesitation about moving. At least once you avoided zombies on the other side of a wall that you didn't hear and couldn't see, but you you just knew they were there.",
"description": "Something happened during the storms that raged during the Cataclysm, and now you can do things that would have once seemed impossible. You can read much faster and can see much better in the dark, and even in total darkness you no longer have any hesitation about moving. At least once you avoided zombies on the other side of a wall that you didn't hear and couldn't see, but you, you just knew they were there.",
"points": 5,
"traits": [ "CLAIRSENTIENT", "CLAIR_SENSES" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/mutations/traits.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"id": "MOM_PSYCHIC_VAMPIRE",
"name": { "str": "Psychic Vampire" },
"points": 1,
"description": "You can drain a bit of vital energy from from victims when attacking their minds with telepathy or their bodies with vitakinesis.",
"description": "You can drain a bit of vital energy from victims when attacking their minds with telepathy or their bodies with vitakinesis.",
"valid": false,
"starting_trait": true,
"purifiable": false,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/powers/clairsentience_eoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"condition": { "and": [ { "math": [ "u_val('rad')", ">", "0" ] }, { "math": [ "u_val('rad')", "<=", "50" ] } ] },
"effect": [
{
"u_message": "Turning your senses on yourself, you see see a few dull glimmers, hidden deep in your flesh. The damage is minimal for now, but you had best not let it fester.",
"u_message": "Turning your senses on yourself, you see a few dull glimmers, hidden deep in your flesh. The damage is minimal for now, but you had best not let it fester.",
"type": "mixed"
}
],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/snippets/snippets_nightmares.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"You dream you are going down into the basement to look for something, but as you step off the last step the basement door shuts behind you, leaving you in darkness. As you climb back up to look for a lightswitch, you hear the stairs creak behind you, and then you wake up.",
"You dream you are waiting in a doctor's office. Patients go into the door, but no one ever comes out. As the last person before you vanishes through the back door, you get up to leave but find the front door locked. As the receptionist calls your name, you wake up.",
"You dream you are in a ruined city, full of empty windows and toppled columns. No matter where you go, you cannot find a way out, and when you turn a corner and see your own footprints in the dirt-covered cobblestones, you wake up.",
"You dream you stand in total darkness with the sound of something breathing nearby. The breathing gets closer and closer, until whatever it is is almost on top of you, and just when you feel a puff of warm, wet air on your face, you wake up.",
"You dream you stand in total darkness with the sound of something breathing nearby. The breathing gets closer and closer, until whatever it is, is almost on top of you, and just when you feel a puff of warm, wet air on your face, you wake up.",
"You dream you've taken shelter in a cave to avoid a howling snowstorm. As you wait, you hear something crunching through the snow and feel the ground start to shake with its footsteps. As something moves in front of the cave mouth, you wake up.",
"You dream of flying. You fly higher and higher until you are in outer space. You look back at Earth and see that it's cracked - something is hatching and a thousand crimson eyes are fixated on you.",
"You are alone in darkness. You try to move, but all of your limbs are frozen in place. You can't even blink your eyes. As you wait, you hear a thin, reedy humming sound from somewhere off in the darkness, slowly getting closer. You struggle frantically, trying to move even a single finger, as the sound approaches from behind your head. Just as the humming finally gets within arm's reach and you hear it move closer to your face, you awaken.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
"points": 13,
"visibility": 2,
"ugliness": 1,
"description": "The Arvore's blood is a sticky sap that that oozes rather than gushes from their wounds and aggressively fights back against invading organisms. They will bleed much more slowly than normal, are immune to parasites and infection, and cannot be transformed by the Mycus.",
"description": "The Arvore's blood is a sticky sap that oozes rather than gushes from their wounds and aggressively fights back against invading organisms. They will bleed much more slowly than normal, are immune to parasites and infection, and cannot be transformed by the Mycus.",
"prereqs": [ "ARVORE_BLOOD_3" ],
"prereqs2": [ "ARVORE_ANTI_PLANT_SPELL" ],
"category": [ "ARVORE" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
"id": "ierde_entrap_target_in_stone",
"type": "SPELL",
"name": "Lithic Gaol",
"description": "Summon up a series of spikes around a a single target, imprisoning them in a cage of stone. The target must be on earth or stone for the spell to take effect.",
"description": "Summon up a series of spikes around a single target, imprisoning them in a cage of stone. The target must be on earth or stone for the spell to take effect.",
"valid_targets": [ "hostile" ],
"skill": "deduction",
"spell_class": "IERDE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"id": "SALAMANDER_HEALTH_FOR_MANA",
"name": { "str": "Burning New Wood" },
"points": 6,
"description": "In times of extreme need, the Salamander can can fuel their powers with their own body. Activate this to restore mana at the cost of health.",
"description": "In times of extreme need, the Salamander can fuel their powers with their own body. Activate this to restore mana at the cost of health.",
"prereqs": [ "SALAMANDER_BIGGER_STOMACH", "SALAMANDER_BIGGER_STOMACH2" ],
"prereqs2": [ "SALAMANDER_SKIN_1", "SALAMANDER_SKIN_2", "SALAMANDER_SKIN_3" ],
"category": [ "SALAMANDER" ],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/npc/boann.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"topic": "TALK_GET_SHADOW_SINGULARITY_PIECE_COMPLETED"
},
{
"text": "I'm back and I killed the the star-crowned hound",
"text": "I'm back and I killed the star-crowned hound",
"condition": { "compare_string": [ "yes", { "u_val": "killed_star_crown_hound_for_boann" } ] },
"effect": [
{ "u_spawn_item": "dream_attuning_necklace", "count": 1 },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/npc/vampire_mentor.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"topic": "TALK_VAMPIRE_MENTOR_BECOME_VAMPIRE"
},
{
"text": "You already made made me as strong as a vampire can be. See you.",
"text": "You already made me as strong as a vampire can be. See you.",
"condition": { "u_has_trait": "BLOOD_DRINKER" },
"topic": "TALK_DONE"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
{
"result": [ "t_triffid_wood_wall" ],
"valid_terrain": [ "t_triffid_bark_wall" ],
"message": "The wooden wall shudders as as the bark peels off in sheets, eventually becoming a solid expanse of bare wood."
"message": "The wooden wall shudders as the bark peels off in sheets, eventually becoming a solid expanse of bare wood."
},
{
"result": [ "t_triffid_bark_wall" ],
Expand Down
2 changes: 1 addition & 1 deletion data/mods/classic_zombies/npcs/liam_follower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "snippet",
"category": "<talk_snippet_modded_liam_meeting1>",
"text": "*, your old friend, looks up at you in shock. At his feet lies a a corpse, its head almost completely blown off by the shotgun that drops limply from Liam's fingers as you approach. \"I swear, dude, this is not what it looks like.\""
"text": "*, your old friend, looks up at you in shock. At his feet lies a corpse, its head almost completely blown off by the shotgun that drops limply from Liam's fingers as you approach. \"I swear, dude, this is not what it looks like.\""
},
{
"type": "talk_topic",
Expand Down

0 comments on commit 762657a

Please sign in to comment.