summaryrefslogtreecommitdiff
path: root/faction-01_more-factions.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-01-26 18:58:13 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-01-26 18:58:13 -0800
commit580b2c5970d96a2e94b0e82e7a41b7c798057db9 (patch)
tree5a97a107d6a9b81dfbe54b61c189dc2250243b23 /faction-01_more-factions.patch
parentFix many patch fuzzing warnings. (diff)
downloadcataclysm-bn-580b2c5970d96a2e94b0e82e7a41b7c798057db9.tar.xz
Port faction updates from DDA.
Port Island Prison updates from DDA. Port Kindred updates from DDA. Port Mr Lapin updates from DDA.
Diffstat (limited to 'faction-01_more-factions.patch')
-rw-r--r--faction-01_more-factions.patch141
1 files changed, 141 insertions, 0 deletions
diff --git a/faction-01_more-factions.patch b/faction-01_more-factions.patch
new file mode 100644
index 0000000..e3165af
--- /dev/null
+++ b/faction-01_more-factions.patch
@@ -0,0 +1,141 @@
+--- a/data/json/npcs/factions.json
++++ b/data/json/npcs/factions.json
+@@ -54,6 +54,7 @@
+ "type": "faction",
+ "id": "robofac",
+ "name": "Hub 01",
++ "mon_faction": "robofac",
+ "likes_u": -200,
+ "respects_u": 0,
+ "known_by_u": false,
+@@ -578,5 +579,130 @@
+ "marloss": { "kill on sight": true }
+ },
+ "description": "A small group of churchgoers that formed a community in the woods. They welcome anyone in their faction, but hate the unnatural."
++ },
++ {
++ "type": "faction",
++ "id": "lapin",
++ "name": "Rabbit Enthusiasts",
++ "likes_u": 30,
++ "respects_u": 20,
++ "known_by_u": false,
++ "size": 1,
++ "power": 1,
++ "currency": "fur",
++ "food_supply": 87500,
++ "wealth": 82500,
++ "relations": {
++ "free_merchants": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false,
++ "knows your voice": true
++ },
++ "old_guard": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": false,
++ "defends your space": false,
++ "knows your voice": false
++ },
++ "tacoma_commune": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false
++ },
++ "lobby_beggars": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false
++ },
++ "no_faction": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false,
++ "knows your voice": true
++ },
++ "wasteland_scavengers": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false,
++ "knows your voice": true
++ },
++ "isherwood_family": {
++ "kill on sight": false,
++ "watch your back": false,
++ "share my stuff": false,
++ "guard your stuff": false,
++ "lets you in": true,
++ "defends your space": false,
++ "knows your voice": true
++ },
++ "hells_raiders": { "kill on sight": true },
++ "marloss": { "kill on sight": true }
++ },
++ "description": "Mr Lapin and any acolytes he may have gathered in the apocalypse."
++ },
++ {
++ "type": "faction",
++ "id": "fisherman_family",
++ "name": "Fisherman Family",
++ "likes_u": 0,
++ "respects_u": 0,
++ "known_by_u": false,
++ "size": 3,
++ "power": 3,
++ "food_supply": 100,
++ "wealth": 20000,
++ "relations": {
++ "free_merchants": { "knows your voice": true },
++ "old_guard": { "knows your voice": true },
++ "your_followers": { "knows your voice": true },
++ "no_faction": { "knows your voice": true }
++ },
++ "description": "A small family trying to survive in this new world."
++ },
++ {
++ "type": "faction",
++ "id": "prisoners",
++ "name": "Prisoners",
++ "likes_u": 0,
++ "respects_u": 0,
++ "known_by_u": true,
++ "size": 100,
++ "power": 100,
++ "food_supply": 230400,
++ "wealth": 45000000,
++ "relations": {
++ "hells_raiders": {
++ "kill on sight": false,
++ "watch your back": true,
++ "share my stuff": true,
++ "guard your stuff": true,
++ "lets you in": true,
++ "defends your space": true,
++ "knows your voice": true
++ },
++ "free_merchants": { "kill on sight": true },
++ "old_guard": { "kill on sight": true },
++ "your_followers": { "kill on sight": false }
++ },
++ "description": "Former prisoners who got their freedom during the apocalypse."
+ }
+ ]