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

Random encounter 2: refugee center visitors #56940

Merged
merged 47 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
55c1cb3
Add nested map infrastructure
I-am-Erk Apr 4, 2022
42043e6
Update roadstop.json
I-am-Erk Apr 5, 2022
24f7458
Update roadstop.json
I-am-Erk Apr 5, 2022
25dada6
Update roadstop.json
I-am-Erk Apr 5, 2022
6e8cc90
Update roadstop.json
I-am-Erk Apr 5, 2022
35f7498
Update roadstop.json
I-am-Erk Apr 5, 2022
e93e8ff
Merge branch 'CleverRaven:master' into random-encounter-1
I-am-Erk Apr 6, 2022
a548972
Update roadstop.json
I-am-Erk Apr 6, 2022
613b990
dialogue
I-am-Erk Apr 6, 2022
269e3cc
Update free_merchant_caravans.json
I-am-Erk Apr 6, 2022
600c9f7
cleanup after playtesting
I-am-Erk Apr 6, 2022
552ff80
Add NPC remove script by Mylie
I-am-Erk Apr 6, 2022
ee14ca7
Merge remote-tracking branch 'upstream/master' into random-encounter-1
I-am-Erk Apr 6, 2022
7dc8bc4
astyle
I-am-Erk Apr 6, 2022
52ce629
Apply suggestions from code review
I-am-Erk Apr 6, 2022
ec03693
Update NPC_free_merchant_shopkeep.json
I-am-Erk Apr 6, 2022
58652b2
change recurrence type
I-am-Erk Apr 6, 2022
5ad9ad6
Make the pickup custom
I-am-Erk Apr 6, 2022
d5b6e23
Update factional.json
I-am-Erk Apr 7, 2022
308001a
Update NPC_free_merchant_shopkeep.json
I-am-Erk Apr 7, 2022
9ecca0c
Update free_merchant_caravans.json
I-am-Erk Apr 7, 2022
7cf7584
Update randenc_caravans.json
I-am-Erk Apr 7, 2022
93280ad
begin making some more simple NPCs
I-am-Erk Apr 7, 2022
9a23881
Merge remote-tracking branch 'upstream/master' into random-encounter-…
I-am-Erk Apr 20, 2022
964e2f0
Update NPC_visiting_scavenger.json
I-am-Erk Apr 20, 2022
61280c9
Update NPC_visiting_scavenger.json
I-am-Erk Apr 20, 2022
c92ed07
Merge remote-tracking branch 'upstream/master' into random-encounter-…
I-am-Erk Apr 25, 2022
37957b8
Update NPC_john_bailey_visitor.json
I-am-Erk Apr 25, 2022
ea6da45
Some of John's dialogue
I-am-Erk Apr 25, 2022
2a8fa9d
more dialogue for john
I-am-Erk Apr 25, 2022
824723f
almost done John's dialogue
I-am-Erk Apr 25, 2022
2650782
Add teaching and advice
I-am-Erk Apr 25, 2022
b90e3ac
Merge remote-tracking branch 'upstream/master' into random-encounter-…
I-am-Erk Apr 26, 2022
60e4517
updated johns gear (#25)
bombasticSlacks Apr 26, 2022
507437e
touch up arithmetic
I-am-Erk Apr 26, 2022
ff61286
Update NPC_john_bailey_visitor.json
I-am-Erk Apr 26, 2022
3b27b00
Update NPC_john_bailey_visitor.json
I-am-Erk Apr 26, 2022
22822a9
clear change to roadstop
I-am-Erk Apr 26, 2022
a9306e2
Rename data/json/npcs/refugee_center/surface_visitors/NPC_john_bailey…
I-am-Erk Apr 27, 2022
779c0a8
Create randenc_refugee_center.json
I-am-Erk Apr 27, 2022
33cf83a
Update john_bailey.json
I-am-Erk Apr 28, 2022
d3bf3ba
Update john_bailey.json
I-am-Erk Apr 28, 2022
05c7d43
playtest fixes
I-am-Erk Apr 28, 2022
2867641
Update randenc_refugee_center.json
I-am-Erk Apr 28, 2022
90e9416
Update NPC_visiting_scavenger.json
I-am-Erk Apr 28, 2022
c486444
Make john able to teach more than once
I-am-Erk Apr 28, 2022
316c4e0
Update john_bailey.json
I-am-Erk Apr 28, 2022
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
84 changes: 84 additions & 0 deletions data/json/encounters/randenc_refugee_center.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
[
{
"type": "effect_on_condition",
"id": "EOC_RandEnc_RC_Shoppers_add",
"//": "Adds random survivors visiting the refugee center to shop",
"recurrence": 6000,
"global": true,
"condition": {
"and": [
"is_day",
{ "one_in_chance": 10 },
{ "u_has_var": "FMShopkeep_Mission1", "type": "mission", "context": "flag", "value": "yes" },
{
"not": { "u_compare_time_since_var": "RandEnc", "type": "timer", "context": "RC_Shoppers", "op": "<", "time": "1 d" }
}
]
},
"effect": [
{ "mapgen_update": "nest_RandEnc_RC_Shoppers_add", "om_terrain": "evac_center_13" },
{ "u_add_var": "RandEnc", "type": "timer", "context": "RC_Shoppers", "time": true }
]
},
{
"type": "effect_on_condition",
"id": "EOC_RandEnc_RC_Shoppers_remove",
"recurrence": 200,
"global": true,
"condition": {
"or": [
{ "u_compare_time_since_var": "RandEnc", "type": "timer", "context": "RC_Shoppers", "op": ">", "time": "6 h" },
"is_night"
]
},
"effect": [ { "remove_npc": "RC_survivor_visiting" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_RandEnc_RC_JohnBailey_add",
"//": "Specific travelling NPC John Bailey stops in at the refugee center. Regardless of where you meet him, you can't meet John more than once per 3 days.",
"recurrence": 6200,
"global": true,
"condition": {
"and": [
"is_day",
{ "one_in_chance": 15 },
{ "u_has_var": "FMShopkeep_Mission1", "type": "mission", "context": "flag", "value": "yes" },
{
"not": { "u_compare_time_since_var": "RandEnc", "type": "timer", "context": "JohnBailey", "op": "<", "time": "3 d" }
}
]
},
"effect": [
{ "mapgen_update": "nest_RandEnc_RC_JohnBailey_add", "om_terrain": "evac_center_13" },
{ "u_add_var": "RandEnc", "type": "timer", "context": "JohnBailey", "time": true }
]
},
{
"type": "effect_on_condition",
"id": "EOC_RandEnc_RC_JohnBailey_remove",
"recurrence": 200,
"global": true,
"condition": {
"or": [
{ "u_compare_time_since_var": "RandEnc", "type": "timer", "context": "JohnBailey", "op": ">", "time": "6 h" },
"is_night"
]
},
"effect": [ { "remove_npc": "RC_John_Bailey_visiting" } ]
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "nest_RandEnc_RC_Shoppers_add",
"//": "Adds a random NPC to the refugee center, placed somewhere it won't intersect with beggars or other random NPCs.",
"object": { "place_npcs": [ { "class": "RC_survivor_visiting", "x": 20, "y": 23 } ] }
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "nest_RandEnc_RC_JohnBailey_add",
"//": "Adds a random NPC to the refugee center, placed somewhere it won't intersect with beggars or other random NPCs.",
"object": { "place_npcs": [ { "class": "RC_John_Bailey_visiting", "x": 19, "y": 21 } ] }
}
]
Loading