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.

Sign up for GitHub

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

Fork Sync: Update from parent repository #23

Merged
merged 13 commits into from
Mar 9, 2023
Merged

Fork Sync: Update from parent repository #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
97587b8
add rep events
MNG-cataclysm Mar 5, 2023
4f40818
Apply suggestions from code review
MNG-cataclysm Mar 5, 2023
bb578f6
spellchecking
MNG-cataclysm Mar 5, 2023
a224b71
Merge branch 'reputation_events_1' of https://github.com/MNG-cataclys…
MNG-cataclysm Mar 5, 2023
26b47de
No hub instabomb
MNG-cataclysm Mar 5, 2023
9777f4e
Merge pull request #63958 from MNG-cataclysm/reputation_events_1
Rivet-the-Zombie Mar 8, 2023
58e15ec
Location-dependent hallucinations (#62098)
Night-Pryanik Mar 8, 2023
401678d
Terminating support for obsolete primitive field camp (#63235)
cake-pie Mar 8, 2023
a201b33
[Magiclysm] Make summoning great again! pt 2 (#63040)
GuardianDll Mar 8, 2023
2579396
Disallow towing by racked parts (#62959)
irwiss Mar 8, 2023
2f71c08
Freezer recipe and disassemble (#63895)
KHeket Mar 8, 2023
2c69d7b
[Xedra Evolved] Make vampire cathedrals spawn in cities (#64049)
Maleclypse Mar 8, 2023
b1675c4
veh_interact structure packing refactor (#64045)
cake-pie Mar 8, 2023
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
89 changes: 89 additions & 0 deletions data/json/effect_on_condition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,5 +563,94 @@
]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_BANDIT_ASSASSIN",
"recurrence": [ "7 days", "14 days" ],
"condition": {
"and": [
{ "compare_int": [ { "faction_like": "hells_raiders" }, "<", { "const": -40 } ] },
{ "compare_int": [ { "faction_like": "hells_raiders" }, ">", { "const": -60 } ] },
{ "days_since_cataclysm": 9 },
{ "not": { "is_weather": "portal_storm" } },
{ "not": { "u_near_om_location": "godco_enter", "range": 4 } },
{ "not": { "u_near_om_location": "evac_center_18", "range": 4 } },
{ "not": { "u_near_om_location": "pagan_cult_enter", "range": 4 } },
{ "not": { "u_near_om_location": "lumbermill_0_0_ocu", "range": 4 } },
{ "not": { "u_near_om_location": "smallscrapyard_ocu", "range": 4 } }
]
},
"effect": [ { "mapgen_update": "bandit_killer_add" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BANDIT_ASSASSIN_2",
"recurrence": [ "7 days", "14 days" ],
"condition": {
"and": [
{ "compare_int": [ { "faction_like": "hells_raiders" }, "<", { "const": -60 } ] },
{ "compare_int": [ { "faction_like": "hells_raiders" }, ">", { "const": -90 } ] },
{ "days_since_cataclysm": 15 },
{ "not": { "is_weather": "portal_storm" } },
{ "not": { "u_near_om_location": "godco_enter", "range": 4 } },
{ "not": { "u_near_om_location": "evac_center_18", "range": 4 } },
{ "not": { "u_near_om_location": "pagan_cult_enter", "range": 4 } },
{ "not": { "u_near_om_location": "lumbermill_0_0_ocu", "range": 4 } },
{ "not": { "u_near_om_location": "smallscrapyard_ocu", "range": 4 } }
]
},
"effect": [ { "mapgen_update": "bandit_killer_add" }, { "mapgen_update": "bandit_killer_add" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_BANDIT_ASSASSIN_3",
"recurrence": [ "7 days", "14 days" ],
"condition": {
"and": [
{ "compare_int": [ { "faction_like": "hells_raiders" }, "<", { "const": -90 } ] },
{ "days_since_cataclysm": 21 },
{ "not": { "is_weather": "portal_storm" } },
{ "not": { "u_near_om_location": "godco_enter", "range": 4 } },
{ "not": { "u_near_om_location": "evac_center_18", "range": 4 } },
{ "not": { "u_near_om_location": "pagan_cult_enter", "range": 4 } },
{ "not": { "u_near_om_location": "lumbermill_0_0_ocu", "range": 4 } },
{ "not": { "u_near_om_location": "smallscrapyard_ocu", "range": 4 } }
]
},
"effect": [
{ "mapgen_update": "bandit_killer_add" },
{ "mapgen_update": "bandit_killer_add" },
{ "mapgen_update": "bandit_killer_add" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_OLD_GUARD_ASSASSIN",
"recurrence": [ "7 days", "14 days" ],
"condition": {
"and": [
{ "compare_int": [ { "faction_like": "old_guard" }, "<", { "const": -45 } ] },
{ "days_since_cataclysm": 9 },
{ "not": { "is_weather": "portal_storm" } }
]
},
"effect": [ { "mapgen_update": "government_killteam_add" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_EXODII_ASSASSIN",
"recurrence": [ "7 days", "14 days" ],
"condition": { "and": [ { "compare_int": [ { "faction_like": "exodii" }, "<", { "const": -35 } ] }, { "days_since_cataclysm": 5 } ] },
"effect": [ { "mapgen_update": "exodii_bomb_add" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_ROBOFAC_ASSASSIN",
"recurrence": [ "7 days", "14 days" ],
"condition": {
"and": [ { "compare_int": [ { "faction_like": "robofac" }, "<", { "const": -230 } ] }, { "days_since_cataclysm": 5 } ]
},
"effect": [ { "mapgen_update": "exodii_bomb_add" } ]
}
]
1 change: 1 addition & 0 deletions data/json/furniture_and_terrain/appliances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"epower": "-35 W",
"item": "freezer",
"requirements": {
"removal": { "time": "2 m" },
"repair": {
"skills": [ [ "mechanics", 4 ] ],
"time": "60 m",
Expand Down
212 changes: 1 addition & 211 deletions data/json/itemgroups/faction_camps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,219 +1,9 @@
[
{
"type": "item_group",
"id": "gathering_faction_base_camp_firewood",
"id": "gathering_faction_camp_firewood",
"items": [ [ "stick", 200 ], [ "withered", 10 ], [ "straw_pile", 10 ], [ "splinter", 400 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_1",
"items": [ [ "2x4", 100 ], [ "stick", 200 ], [ "rock", 100 ], [ "straw_pile", 100 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_2",
"items": [ [ "2x4", 100 ], [ "stick", 200 ], [ "rock", 100 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_3",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_4",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_5",
"items": [ [ "2x4", 50 ], [ "log", 100 ], [ "stick", 300 ], [ "nail", 10 ], [ "broketent", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_6",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_7",
"items": [
[ "2x4", 50 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "metal_tank", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_8",
"items": [
[ "2x4", 100 ],
[ "stick", 300 ],
[ "rock", 100 ],
[ "straw_pile", 100 ],
[ "nail", 10 ],
[ "sheet_metal", 20 ],
[ "pipe", 30 ],
[ "broketent", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_9",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "sheet_metal", 20 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_10",
"items": [ [ "2x4", 30 ], [ "log", 100 ], [ "stick", 300 ], [ "nail", 10 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_11",
"items": [
[ "rock", 100 ],
[ "stick", 100 ],
[ "pipe", 30 ],
[ "2x4", 40 ],
[ "nail", 10 ],
[ "scrap", 40 ],
[ "steel_chunk", 20 ],
[ "broketent", 10 ],
[ "well_pump", 5 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_12",
"items": [
[ "withered", 300 ],
[ "straw_pile", 100 ],
[ "vine_30", 50 ],
[ "log", 100 ],
[ "nail", 10 ],
[ "scrap", 20 ],
[ "steel_chunk", 10 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_13",
"items": [
[ "withered", 500 ],
[ "straw_pile", 100 ],
[ "vine_30", 50 ],
[ "log", 100 ],
[ "nail", 10 ],
[ "scrap", 20 ],
[ "steel_chunk", 10 ],
[ "broketent", 10 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_14",
"items": [
[ "withered", 100 ],
[ "straw_pile", 50 ],
[ "vine_30", 25 ],
[ "2x4", 50 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 30 ],
[ "metal_tank", 10 ],
[ "scrap", 20 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_15",
"items": [
[ "2x4", 50 ],
[ "pipe", 50 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 30 ],
[ "metal_tank", 20 ],
[ "scrap", 30 ]
]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_16",
"items": [ [ "2x4", 100 ], [ "stick", 300 ], [ "nail", 20 ], [ "scrap", 30 ] ]
},
{
"type": "item_group",
"id": "gathering_faction_base_camp_17",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "broketent", 10 ],
[ "sheet_metal", 20 ],
[ "scrap", 30 ]
]
},
{
"type": "item_group",
"//": "There are no more upgrades for the camp but you shouldn't be punished for that.",
"id": "gathering_faction_base_camp_20",
"items": [
[ "2x4", 10 ],
[ "log", 100 ],
[ "stick", 300 ],
[ "nail", 10 ],
[ "cotton_patchwork", 100 ],
[ "sheet_metal", 20 ],
[ "scrap", 30 ],
[ "withered", 50 ],
[ "straw_pile", 50 ],
[ "vine_30", 5 ]
]
},
{
"type": "item_group",
"id": "foraging_faction_camp_spring",
Expand Down
26 changes: 26 additions & 0 deletions data/json/items/tool/explosives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,5 +1618,31 @@
"explosion": { "power": 69200, "shrapnel": { "casing_mass": 12000, "fragment_mass": 600 } }
},
"flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ]
},
{
"id": "exodii_bomb",
"type": "TOOL",
"category": "weapons",
"name": { "str": "strange alien bomb" },
"description": "A strange device that you do not recognize, shaped like a football and filled with wires, fluids, and other such things. It's making a beeping noise that you don't feel right about.",
"weight": "4400 g",
"volume": "10 L",
"price": 0,
"to_hit": -5,
"bashing": 20,
"material": [ "steel" ],
"symbol": "(",
"color": "light_red",
"initial_charges": 2,
"max_charges": 2,
"turns_per_charge": 1,
"explode_in_fire": true,
"explosion": { "power": 25000, "max_noise": 1200 },
"use_action": {
"type": "explosion",
"no_deactivate_msg": "The device seems to be a bomb - clear the area immediately!",
"explosion": { "power": 25000, "max_noise": 1200 }
},
"flags": [ "BOMB", "TRADER_AVOID" ]
}
]
Loading