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

New Dynamic Faction Endings #74126

Merged
merged 68 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
cd57497
adds dynamic faction epilogues
GalacticApple May 26, 2024
646c231
dynamic epilogues update 1
GalacticApple May 26, 2024
5b6bdce
Merge branch 'CleverRaven:master' into factions
GalacticApple May 26, 2024
32a18b6
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 26, 2024
1e72f14
fixed Hub-01 "neutral" ending
GalacticApple May 26, 2024
1d45020
Hells Raiders text update
GalacticApple May 26, 2024
f6bb6c7
format fix
GalacticApple May 26, 2024
2830240
added free merchant ending
GalacticApple May 26, 2024
4ffe243
format fixes
GalacticApple May 26, 2024
cf53bfe
correct CLRF type in game.h
GalacticApple May 26, 2024
e2ae88c
Isherwood text update
GalacticApple May 26, 2024
41dd8b7
Update src/faction.cpp
GalacticApple May 26, 2024
b03ae28
Update src/game.cpp
GalacticApple May 26, 2024
6ff7e20
Update src/game.cpp
GalacticApple May 26, 2024
ebeb594
Update src/game.cpp
GalacticApple May 26, 2024
73618ea
Update src/game.cpp
GalacticApple May 26, 2024
7c5c47e
Update src/game.h
GalacticApple May 26, 2024
58ac75f
fix integer variables
GalacticApple May 26, 2024
9eb05b3
char update
GalacticApple May 26, 2024
3672471
char fix
GalacticApple May 27, 2024
8415044
Update epilogue_factions.json
GalacticApple May 27, 2024
364dda4
updates
GalacticApple May 28, 2024
4354dec
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 28, 2024
d24b527
fix for faction.cpp and faction.h
GalacticApple May 28, 2024
1d0303c
Apply suggestions from code review
Maleclypse May 30, 2024
6279bd6
faction.cpp fixes
GalacticApple May 31, 2024
c5756d6
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 31, 2024
d1a2ab9
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 31, 2024
2484866
Update faction.h
GalacticApple May 31, 2024
7650b03
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
e35c8f1
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
cc609eb
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
554a3d3
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
b01c75c
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
354db49
Update src/faction.cpp
GalacticApple May 31, 2024
599ade8
Update src/faction.cpp
GalacticApple May 31, 2024
f2c7646
Update src/faction.cpp
GalacticApple May 31, 2024
45dbb1d
Update src/faction.cpp
GalacticApple May 31, 2024
b2af5bb
Update src/faction.h
GalacticApple May 31, 2024
02f643f
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
a8e659d
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
e8db0c0
Update src/faction.cpp
GalacticApple May 31, 2024
96c1755
consumes_food fix
GalacticApple May 31, 2024
ce16a2a
actual consumes_food fix
GalacticApple May 31, 2024
4ab7263
Update src/faction.h
GalacticApple May 31, 2024
5707a7a
json fix
GalacticApple May 31, 2024
fff1db0
Update src/faction.h
GalacticApple May 31, 2024
5a8740d
text update
GalacticApple May 31, 2024
b3e7525
Update data/json/npcs/factions.json
GalacticApple May 31, 2024
2f42115
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 31, 2024
92a6c7a
another text update
GalacticApple May 31, 2024
0c9eb0b
astyle fix
GalacticApple May 31, 2024
e627283
Update src/faction.cpp
GalacticApple May 31, 2024
d3fc083
Update src/faction.cpp
GalacticApple May 31, 2024
5a13a42
text update
GalacticApple May 31, 2024
c22dfa9
Merge branch 'factions' of https://github.com/GalacticApple/Cataclysm…
GalacticApple May 31, 2024
fa30c6b
typo
GalacticApple May 31, 2024
6fe59fe
removed testing values
GalacticApple May 31, 2024
178b5fc
Update src/faction.cpp
GalacticApple Jun 2, 2024
9b37101
Update src/faction.cpp
GalacticApple Jun 2, 2024
9578ff0
Update src/faction.cpp
GalacticApple Jun 2, 2024
5bc9f57
Update src/faction.cpp
GalacticApple Jun 2, 2024
8230dbd
Update src/game.cpp
GalacticApple Jun 2, 2024
0bef362
Update src/faction.h
GalacticApple Jun 2, 2024
4b0d91c
Merge branch 'CleverRaven:master' into factions
GalacticApple Jun 2, 2024
1dd469d
Update factions.json
GalacticApple Jun 2, 2024
5668960
Merge branch 'CleverRaven:master' into factions
GalacticApple Jun 11, 2024
7b6af24
Apply suggestions from code review
Maleclypse Jun 18, 2024
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
189 changes: 181 additions & 8 deletions data/json/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,33 @@
}
},
"mon_faction": "player",
"epilogues": [ { "power_min": 0, "power_max": 149, "id": "epilogue_faction_your_followers_0" } ],
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_your_followers_0" },
{ "power_min": 150, "id": "epilogue_faction_your_followers_150" },
{
"power_min": 150,
"dynamic": [
{ "faction": "free_merchants", "power_min": 150 },
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 }
],
"id": "epilogue_faction_your_followers_FM"
},
{
"power_min": 150,
"dynamic": [ { "faction": "free_merchants", "power_max": 150 }, { "faction": "tacoma_commune", "power_min": 150 } ],
"id": "epilogue_faction_your_followers_revolt"
},
{
"power_min": 150,
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "robofac", "power_min": 150 }
],
"id": "epilogue_faction_your_followers_OG"
}
],
"description": "The survivors who have entrusted you with their well-being. If morale drops, poor performance and mutiny may become issues."
},
{
Expand Down Expand Up @@ -82,7 +108,36 @@
},
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_robofac_0" },
{ "power_min": 150, "power_max": 299, "id": "epilogue_faction_robofac_150" }
{
"power_min": 150,
"dynamic": [ { "faction": "exodii", "power_max": 150 }, { "faction": "the_great_library", "power_max": 150 } ],
"id": "epilogue_faction_robofac_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "exodii", "power_min": 150 }, { "faction": "the_great_library", "power_max": 150 } ],
"id": "epilogue_faction_robofac_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "exodii", "power_max": 150 }, { "faction": "the_great_library", "power_min": 150 } ],
"id": "epilogue_faction_robofac_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "exodii", "power_min": 150 }, { "faction": "the_great_library", "power_min": 150 } ],
"id": "epilogue_faction_robofac_thrive"
},
{
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_robofac_thrive_OG"
}
],
"description": "The surviving staff of Hub 01, a pre-Cataclysm research lab. They rarely leave their lab, if at all, and rely on their robots and advanced technology to survive."
},
Expand Down Expand Up @@ -147,8 +202,28 @@
"hells_raiders": { "kill on sight": true }
},
"epilogues": [
{ "power_min": 0, "id": "epilogue_faction_old_guard_0" },
{ "power_min": 150, "id": "epilogue_faction_old_guard_150" }
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_old_guard_0" },
{
"power_min": 150,
"dynamic": [ { "faction": "tacoma_commune", "power_max": 150 }, { "faction": "robofac", "power_min": 150 } ],
"id": "epilogue_faction_old_guard_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "tacoma_commune", "power_min": 150 }, { "faction": "robofac", "power_max": 150 } ],
"id": "epilogue_faction_old_guard_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "tacoma_commune", "power_max": 150 }, { "faction": "robofac", "power_max": 150 } ],
"id": "epilogue_faction_old_guard_150"
},
{
"power_min": 150,
"power_max": 300,
"dynamic": [ { "faction": "tacoma_commune", "power_min": 150 }, { "faction": "robofac", "power_min": 150 } ],
"id": "epilogue_faction_old_guard_thrive"
}
],
"description": "The remains of the federal government. The extent of their strength is unknown but squads of patrolling soldiers have been seen under their banner."
},
Expand Down Expand Up @@ -237,7 +312,26 @@
},
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_free_merchants_0" },
{ "power_min": 150, "id": "epilogue_faction_free_merchants_150" }
{
"power_min": 150,
"dynamic": [ { "faction": "old_guard", "power_max": 150 }, { "faction": "tacoma_commune", "power_min": 150 } ],
"id": "epilogue_faction_free_merchants_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "old_guard", "power_min": 150 }, { "faction": "tacoma_commune", "power_max": 150 } ],
"id": "epilogue_faction_free_merchants_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "old_guard", "power_max": 150 }, { "faction": "tacoma_commune", "power_max": 150 } ],
"id": "epilogue_faction_free_merchants_150"
},
{
"power_min": 150,
"dynamic": [ { "faction": "old_guard", "power_min": 150 }, { "faction": "tacoma_commune", "power_min": 150 } ],
"id": "epilogue_faction_free_merchants_thrive"
}
],
"description": "A conglomeration of entrepreneurs and businessmen that stand together to hammer-out an existence through trade and industry."
},
Expand Down Expand Up @@ -328,7 +422,38 @@
},
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_tacoma_commune_0" },
{ "power_min": 150, "id": "epilogue_faction_tacoma_commune_150" }
{
"power_min": 150,
"power_max": 400,
"dynamic": [ { "faction": "tacoma_commune", "power_min": 150 }, { "faction": "free_merchants", "power_min": 150 } ],
"id": "epilogue_faction_tacoma_commune_150"
},
{
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "free_merchants", "power_min": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_tacoma_commune_150_OG"
},
{
"dynamic": [ { "faction": "tacoma_commune", "power_min": 150 }, { "faction": "free_merchants", "power_max": 150 } ],
"id": "epilogue_faction_tacoma_commune_revolt"
},
{
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "free_merchants", "power_max": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_tacoma_commune_revolt_OG"
}
],
"description": "An outpost started by the Free Merchants to provide a source of food and raw materials."
},
Expand Down Expand Up @@ -469,8 +594,32 @@
"your_followers": { "kill on sight": true }
},
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_hells_raiders_0" },
{ "power_min": 150, "id": "epilogue_faction_hells_raiders_150" }
{
"dynamic": [ { "faction": "old_guard", "power_max": 150 }, { "faction": "hells_raiders", "power_max": 150 } ],
"id": "epilogue_faction_hells_raiders_0"
},
{
"dynamic": [ { "faction": "old_guard", "power_max": 150 }, { "faction": "hells_raiders", "power_min": 150 } ],
"id": "epilogue_faction_hells_raiders_150"
},
{
"dynamic": [ { "faction": "old_guard", "power_min": 150 }, { "faction": "hells_raiders", "power_max": 150 } ],
"id": "epilogue_faction_hells_raiders_stalemate"
},
{
"dynamic": [ { "faction": "old_guard", "power_min": 150 }, { "faction": "hells_raiders", "power_min": 150 } ],
"id": "epilogue_faction_hells_raiders_stalemate"
},
{
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_hells_raiders_collapse"
}
],
"description": "The largest gang of hooligans and bandits that preys upon other survivors. Even if you have no gear, there is always a need for slaves and fresh meat."
},
Expand Down Expand Up @@ -608,6 +757,30 @@
},
"epilogues": [
{ "power_min": 0, "power_max": 149, "id": "epilogue_faction_isherwoods_0" },
{
"power_min": 150,
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "free_merchants", "power_min": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_isherwoods_OG_FM"
},
{
"power_min": 150,
"dynamic": [
{ "faction": "old_guard", "power_min": 150 },
{ "faction": "tacoma_commune", "power_min": 150 },
{ "faction": "free_merchants", "power_max": 150 },
{ "faction": "robofac", "power_min": 150 },
{ "faction": "exodii", "power_min": 150 },
{ "faction": "the_great_library", "power_min": 150 }
],
"id": "epilogue_faction_isherwoods_OG"
},
{ "power_min": 150, "id": "epilogue_faction_isherwoods_150" }
],
"description": "A small family surviving on their generational land."
Expand Down
Loading
Loading