Skip to content

Commit

Permalink
move and update mainline mods
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheGoatGod
TheGoatGod committed Sep 3, 2024
1 parent d651dcf commit 778a21f
Show file tree
Hide file tree
Showing 1,560 changed files with 165,090 additions and 28,840 deletions.
0 ...nline_mods/Mods/No_Fungi/comestibles.json → ...egacy_mods/mods/No_Fungi/comestibles.json
View file
File renamed without changes.
0 ...ainline_mods/Mods/No_Fungi/furniture.json → .../Legacy_mods/mods/No_Fungi/furniture.json
View file
File renamed without changes.
0 .../Mainline_mods/Mods/No_Fungi/modinfo.json → data/Legacy_mods/mods/No_Fungi/modinfo.json
View file
File renamed without changes.
0 .../Mainline_mods/Mods/No_Fungi/terrain.json → data/Legacy_mods/mods/No_Fungi/terrain.json
View file
File renamed without changes.
0 ...e_mods/Mods/No_Rail_Stations/modinfo.json → ...y_mods/mods/No_Rail_Stations/modinfo.json
View file
File renamed without changes.
0 ...ds/No_Rail_Stations/overmap_specials.json → ...ds/No_Rail_Stations/overmap_specials.json
View file
File renamed without changes.
0 ...Mods/No_Rail_Stations/region_overlay.json → ...mods/No_Rail_Stations/region_overlay.json
View file
File renamed without changes.
24 changes: 24 additions & 0 deletions data/Mainline_mods/Mods/Aftershock/EOC/_reusable_conditions.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "effect_on_condition",
"id": "EOC_CONDITION_can_hack",
"condition": {
"and": [
{
"or": [
{ "u_has_item": "electrohack" },
{ "u_has_item": "afs_wrist_computer" },
{ "u_has_item": "electrokinetic_electrohack_1" },
{ "u_has_item": "electrokinetic_electrohack_2" },
{ "u_has_item": "electrokinetic_electrohack_3" },
{ "u_has_item": "electrokinetic_electrohack_4" },
{ "u_has_item": "electrokinetic_electrohack_5" },
{ "u_has_item": "electrokinetic_electrohack_6" }
]
},
"u_can_see"
]
},
"effect": [

]
}
268 changes: 268 additions & 0 deletions data/Mainline_mods/Mods/Aftershock/EOC/agustmoon_travel_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
[
{
"id": "MISSION_REACH_AUGUSTMOON_SHUTTLE",
"type": "mission_definition",
"name": { "str": "Reach the Port Augustmoon shuttle" },
"goal": "MGOAL_GO_TO",
"description": "Your shuttle has landed nearby. It will wait for up to 3 hours before returning to port, you might what to reach it before then.",
"difficulty": 0,
"value": 0,
"invisible_on_complete": true,
"start": { "assign_mission_target": { "var": { "global_val": "landing_site" } } }
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_FIND_PORT_AUGUSTMOON",
"eoc_type": "EVENT",
"required_event": "game_begin",
"condition": { "math": [ "searched_port_augustmoon", "!=", "1" ] },
"effect": [
{
"u_location_variable": { "global_val": "Port_augustmoon" },
"target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 380 },
"zone": "ZONE_START_POINT",
"target_max_radius": 30
},
{
"u_location_variable": { "global_val": "Port_augustmoon_cargo" },
"target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 380 },
"terrain": "t_intermodal_crate_scripted_destination",
"target_max_radius": 26
},
{
"u_location_variable": { "global_val": "augustmoon_main_concourse1" },
"target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true, "search_range": 380 }
},
{
"u_location_variable": { "global_val": "augustmoon_main_concourse2" },
"target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true, "search_range": 380 }
},
{ "math": [ "searched_port_augustmoon", "=", "1" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_FIND_LANDING_PAD",
"eoc_type": "EVENT",
"required_event": "game_begin",
"condition": { "math": [ "searched_landing_pad", "!=", "1" ] },
"effect": [
{
"u_location_variable": { "global_val": "landing_pad" },
"target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 },
"zone": "ZONE_START_POINT",
"target_max_radius": 26
},
{
"u_location_variable": { "global_val": "landing_pad_cargo" },
"target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 },
"terrain": "t_intermodal_crate_scripted_destination",
"target_max_radius": 26
},
{ "math": [ "searched_landing_pad", "=", "1" ] }
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_CALL_AUGUSTMOON_SHUTTLE",
"condition": { "math": [ "augustmoon_shuttle_inprogress", "!=", "1" ] },
"effect": [
{ "u_consume_item": "afs_shuttle_radiobeacon", "count": 1 },
{ "u_message": "Order Received: Shuttle inbound to your location.", "popup": true },
{ "queue_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "30 minutes" },
{ "math": [ "augustmoon_shuttle_inprogress", "=", "1" ] }
],
"false_effect": [ { "u_message": "WARNING: Cannot schedule landing, shuttle already inbound.", "popup": true } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE",
"condition": "u_is_outside",
"effect": [
{
"u_location_variable": { "global_val": "landing_site" },
"target_params": {
"om_terrain": "afs_landed_shuttle",
"om_terrain_replace": "field",
"z": 0,
"random": true,
"min_distance": 4,
"search_range": 10
}
},
{
"u_message": "You see the engine plume of your landing drone shuttle in the distance. You'll have about four hours to reach it before it leaves.",
"popup": true
},
{ "assign_mission": "MISSION_REACH_AUGUSTMOON_SHUTTLE" },
{ "mapgen_update": "augustmoon_shuttle_ground", "target_var": { "global_val": "landing_site" } },
{ "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "4 hours" }
],
"false_effect": [ { "queue_eocs": "EOC_AFS_LAND_AUGUSTMOON_SHUTTLE", "time_in_future": "10 seconds" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL",
"condition": { "not": { "u_near_om_location": "afs_landed_shuttle", "range": 4 } },
"effect": [
{ "math": [ "augustmoon_shuttle_inprogress", "=", "0" ] },
{ "remove_active_mission": "MISSION_REACH_AUGUSTMOON_SHUTTLE" },
{ "mapgen_update": "augustmoon_shuttle_ground_left", "target_var": { "global_val": "landing_site" } }
],
"false_effect": [ { "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "10 seconds" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_AUGUSTMOON_SHUTTLE_TP",
"effect": [
{ "math": [ "augustmoon_shuttle_inprogress", "=", "0" ] },
{ "run_eocs": "EOC_VALIDATE_PORT_AUGUSTMOON" },
{ "queue_eocs": "EOC_AFS_AUGUSTMOON_SHUTTLE_RECALL", "time_in_future": "1 seconds" },
{ "queue_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" },
{
"u_location_variable": { "context_val": "crate_loc" },
"terrain": "t_intermodal_crate_scripted_source",
"target_max_radius": 24
},
{
"u_map_run_item_eocs": "all",
"loc": { "context_val": "crate_loc" },
"min_radius": 0,
"max_radius": 0,
"true_eocs": [ { "id": "EOC_AFS_AUGUSTMOON_CARGO_TP", "effect": [ { "npc_teleport": { "global_val": "Port_augustmoon_cargo" } } ] } ]
},
{ "u_run_npc_eocs": [ "EOC_AFS_TEST_AUGUSTMOON_TP" ], "local": true },
{
"u_message": "The shuttle's ascent is a little rough, but you're soon on your way to Port Augustmoon.",
"popup": true
},
{ "u_teleport": { "global_val": "Port_augustmoon" } }
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_AUGUSTMOON_SPACEPORT_TP",
"effect": [
{ "math": [ "augustmoon_shuttle_inprogress", "=", "0" ] },
{ "run_eocs": "EOC_VALIDATE_PORT_AUGUSTMOON" },
{ "queue_eocs": "EOC_augustmoon_reroll_vending_machine", "time_in_future": "1 seconds" },
{
"u_location_variable": { "context_val": "crate_loc" },
"terrain": "t_intermodal_crate_scripted_source",
"target_max_radius": 24
},
{
"u_map_run_item_eocs": "all",
"loc": { "context_val": "crate_loc" },
"min_radius": 0,
"max_radius": 0,
"true_eocs": [
{ "id": "_EOC_AFS_AUGUSTMOON_CARGO_TP", "effect": [ { "npc_teleport": { "global_val": "Port_augustmoon_cargo" } } ] }
]
},
{ "u_run_npc_eocs": [ "EOC_AFS_TEST_AUGUSTMOON_TP" ], "local": true },
{
"u_message": "The shuttle's ascent is a little rough, but you're soon on your way to Port Augustmoon.",
"popup": true
},
{ "u_teleport": { "global_val": "Port_augustmoon" } }
]
},
{
"type": "effect_on_condition",
"id": "EOC_PORT_TO_LANDING_PAD_TP",
"effect": [
{ "run_eocs": "EOC_VALIDATE_LANDING_PAD" },
{
"u_location_variable": { "context_val": "crate_loc" },
"terrain": "t_intermodal_crate_scripted_source",
"target_max_radius": 24
},
{
"u_map_run_item_eocs": "all",
"loc": { "context_val": "crate_loc" },
"min_radius": 0,
"max_radius": 0,
"true_eocs": [
{
"id": "EOC_AFS_AUGUSTMOON_TO_LANDING_PAD_CARGO_TP",
"effect": [ { "npc_teleport": { "global_val": "landing_pad_cargo" } } ]
}
]
},
{ "u_run_npc_eocs": [ "EOC_AFS_LANDING_PAD_TP" ], "local": true },
{ "u_teleport": { "global_val": "landing_pad" } },
{
"u_message": "An orbital drop in a rackety cargo shuttle preceded by an almost interminable wait within Port Augustmoon customs level leads you to the planetary wastes below.\n\n What passes by the spaceport is nothing but a small radio outpost surrounded by chainlink fencing. Beyond it, any guarantees of civilization are left behind.",
"popup": true
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_VALIDATE_PORT_AUGUSTMOON",
"condition": {
"and": [
{ "math": [ "has_var(Port_augustmoon)" ] },
{ "math": [ "has_var(Port_augustmoon_cargo)" ] },
{ "math": [ "has_var(augustmoon_main_concourse1)" ] },
{ "math": [ "has_var(augustmoon_main_concourse2)" ] }
]
},
"false_effect": [
{ "u_message": "MANUALLY FINDING PORT AUGUSTMOON AS A FALLBACK. (PRESS SPACE).", "popup": true },
{
"u_location_variable": { "global_val": "Port_augustmoon" },
"target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 1380 },
"zone": "ZONE_START_POINT",
"target_max_radius": 30
},
{
"u_location_variable": { "global_val": "Port_augustmoon_cargo" },
"target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 1380 },
"terrain": "t_intermodal_crate_scripted_destination",
"target_max_radius": 26
},
{
"u_location_variable": { "global_val": "augustmoon_main_concourse1" },
"target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true, "search_range": 1380 }
},
{
"u_location_variable": { "global_val": "augustmoon_main_concourse2" },
"target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true, "search_range": 1380 }
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_VALIDATE_LANDING_PAD",
"condition": { "and": [ { "math": [ "has_var(landing_pad)" ] }, { "math": [ "has_var(landing_pad_cargo)" ] } ] },
"false_effect": [
{ "u_message": "MANUALLY FINDING THE LANDING PAD AS A FALLBACK. (PRESS SPACE).", "popup": true },
{
"u_location_variable": { "global_val": "landing_pad" },
"target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 },
"zone": "ZONE_START_POINT",
"target_max_radius": 26
},
{
"u_location_variable": { "global_val": "landing_pad_cargo" },
"target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 },
"terrain": "t_intermodal_crate_scripted_destination",
"target_max_radius": 26
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_TEST_AUGUSTMOON_TP",
"condition": "u_following",
"effect": [ { "u_teleport": { "global_val": "Port_augustmoon" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_LANDING_PAD_TP",
"condition": "u_following",
"effect": [ { "u_teleport": { "global_val": "landing_pad" } } ]
}
]
19 changes: 19 additions & 0 deletions data/Mainline_mods/Mods/Aftershock/EOC/augustmoon_update_eocs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"type": "effect_on_condition",
"id": "EOC_augustmoon_reroll_vending_machine",
"global": true,
"effect": [
{
"mapgen_update": "augustmoon_concourse_vending1",
"om_terrain": "augustmoon_main_concourse1",
"target_var": { "global_val": "augustmoon_main_concourse1" }
},
{
"mapgen_update": "augustmoon_concourse_vending2",
"om_terrain": "augustmoon_main_concourse2",
"target_var": { "global_val": "augustmoon_main_concourse2" }
}
]
}
]
38 changes: 38 additions & 0 deletions data/Mainline_mods/Mods/Aftershock/EOC/drug_eoc.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"//": "This ensures the effect dissapears if the player gets hit in combat or the antiseptic wears off",
"type": "effect_on_condition",
"id": "EOC_AFS_MEDIGEL_REMOVE",
"eoc_type": "EVENT",
"required_event": "character_loses_effect",
"condition": {
"and": [
{ "compare_string": [ "disinfected", { "context_val": "effect" } ] },
{ "u_has_effect": "afs_medigel_eff", "bodypart": { "context_val": "bodypart" } }
]
},
"effect": [ { "u_lose_effect": "afs_medigel_eff", "target_part": { "context_val": "bodypart" } } ]
},
{
"type": "effect_on_condition",
"id": "EOC_AFS_MEDIGEL_ADD",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"condition": {
"and": [ { "u_has_effect": "afs_medigel_eff_trigger" }, { "compare_string": [ "disinfected", { "context_val": "effect" } ] } ]
},
"effect": [
{ "set_string_var": { "context_val": "bodypart" }, "target_var": { "u_val": "heal_part" } },
{ "u_add_effect": "afs_medigel_eff", "duration": "3 days", "target_part": { "u_val": "heal_part" } }
]
},
{
"type": "effect_on_condition",
"//": "The instant use effects of stimpacks",
"id": "EOC_AFS_STIMPACK",
"eoc_type": "EVENT",
"required_event": "character_consumes_item",
"condition": { "compare_string": [ "afs_stimpack", { "context_val": "itype" } ] },
"effect": [ { "math": [ "u_pain()", "-=", "80" ] }, { "math": [ "u_val('stamina')", "+=", "2500" ] } ]
}
]
Loading

0 comments on commit 778a21f

Please sign in to comment.