diff options
Diffstat (limited to 'revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch')
| -rw-r--r-- | revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch | 225 |
1 files changed, 225 insertions, 0 deletions
diff --git a/revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch b/revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch new file mode 100644 index 0000000..d8974c6 --- /dev/null +++ b/revert-21_fix-Erased-the-npc-Alonso-from-history-the-game-3582.patch @@ -0,0 +1,225 @@ +From d0bdffe94a1222aa26e9d6c2952e80f2b760278c Mon Sep 17 00:00:00 2001 +From: AniDemi <60388907+AniDemi@users.noreply.github.com> +Date: Tue, 7 Nov 2023 02:03:29 +0100 +Subject: [PATCH 063/318] fix: Erased the npc Alonso from history (the game) + (#3582) + +* Rewrite the records, alonso never existed + +* Obsolete npc dialogue + +* style(autofix.ci): automated formatting + +--------- + +Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> +--- + .../mapgen/refugee_center/refugee_center.json | 1 - + .../surface_refugees/NPC_Jenny_Forcette.json | 4 +- + data/json/obsoletion/npc.json | 58 +++++++++++++++++++ + .../npc_dialogue.json} | 58 ------------------- + .../npc_dialogue.json} | 0 + data/mods/DinoMod/snippets/grave_labels.json | 3 +- + data/mods/No_Hope/Mapgen/refugee_center.json | 1 - + 7 files changed, 61 insertions(+), 64 deletions(-) + rename data/json/{npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json => obsoletion/npc_dialogue.json} (78%) + rename data/mods/DinoMod/{NPC/NPC_Alonso_Lautrec.json => obsolete/npc_dialogue.json} (100%) + +diff --git a/data/json/mapgen/refugee_center/refugee_center.json b/data/json/mapgen/refugee_center/refugee_center.json +index fbcc14991b9..ded6de4059c 100644 +--- a/data/json/mapgen/refugee_center/refugee_center.json ++++ b/data/json/mapgen/refugee_center/refugee_center.json +@@ -137,7 +137,6 @@ + { "class": "refugee_AleeshaSeward", "x": 35, "y": 7 }, + { "class": "refugee_PabloNunez", "x": 35, "y": 12 }, + { "class": "refugee_DanaNunez", "x": 35, "y": 13 }, +- { "class": "refugee_AlonsoLautrec", "x": 40, "y": 23 }, + { "class": "refugee_MangalpreetSingh", "x": 40, "y": 5 }, + { "class": "refugee_MandeepSingh", "x": 41, "y": 5 }, + { "class": "refugee_GuneetSingh", "x": 43, "y": 4 }, +diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +index 45ddbb7bbbf..cb5b65dd1ef 100644 +--- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json ++++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +@@ -324,8 +324,8 @@ + "id": "TALK_REFUGEE_JENNY_Refugees2_Others", + "dynamic_line": { + "days_since_cataclysm": 80, +- "yes": "Vanessa… I'm doing my best, I really am, but we just do not get along. One of these days one of us is probably going to brain the other with a tire iron, and I'm just grateful I spend more time around the tire irons. Uyen and Rhyzaea are both excellent people, and I genuinely like them, but I can't stand this ongoing political bullshit they've got going on. Alonso is just a… he's… there's no polite word for what he is. A lot of the others are fine with it, and okay, sure, I guess. John is a walking stereotype, but he's a great poker buddy. I admit I kinda like him.", +- "no": "Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, but we're in this together so I try not to be too harsh. Uyen and Rhyzaea both seem to want to run the show here, but I try to stay out of those politics and just focus on building stuff. I don't see much good coming of it. Alonso is fine, he's clearly interested in me, and also in every other single person here. Not my thing, in a group this small. John is a walking stereotype, I imagine there must be more depth to him, but I haven't seen it yet." ++ "yes": "Vanessa… I'm doing my best, I really am, but we just do not get along. One of these days one of us is probably going to brain the other with a tire iron, and I'm just grateful I spend more time around the tire irons. Uyen and Rhyzaea are both excellent people, and I genuinely like them, but I can't stand this ongoing political bullshit they've got going on. John is a walking stereotype, but he's a great poker buddy. I admit I kinda like him.", ++ "no": "Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, but we're in this together so I try not to be too harsh. Uyen and Rhyzaea both seem to want to run the show here, but I try to stay out of those politics and just focus on building stuff. I don't see much good coming of it. John is a walking stereotype, I imagine there must be more depth to him, but I haven't seen it yet." + }, + "responses": [ + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, +diff --git a/data/json/obsoletion/npc.json b/data/json/obsoletion/npc.json +index 7f067301878..b8560dd46fc 100644 +--- a/data/json/obsoletion/npc.json ++++ b/data/json/obsoletion/npc.json +@@ -78,5 +78,63 @@ + { "item": "5x50_100_mag", "count": 2, "charges": 100, "ammo-item": "5x50heavy" }, + { "item": "5x50heavy", "count": 8 } + ] ++ }, ++ { ++ "type": "npc", ++ "id": "refugee_AlonsoLautrec", ++ "name_unique": "Alonso Lautrec", ++ "gender": "male", ++ "name_suffix": "refugee", ++ "class": "NC_REFUGEE_Alonso", ++ "attitude": 0, ++ "mission": 7, ++ "chat": "TALK_DONE", ++ "faction": "free_merchants" ++ }, ++ { ++ "type": "npc_class", ++ "id": "NC_REFUGEE_Alonso", ++ "name": { "str": "Refugee" }, ++ "job_description": "I'm just trying to survive.", ++ "common": false, ++ "//": "Alonso wants to be the town bicycle, but isn't getting as much interest as he'd hoped. He'll trade a morale bonus for condoms.", ++ "bonus_str": { "rng": [ -2, 1 ] }, ++ "bonus_dex": { "rng": [ -2, 4 ] }, ++ "bonus_int": { "rng": [ -2, 2 ] }, ++ "bonus_per": { "rng": [ -2, 2 ] }, ++ "worn_override": "REFUGEE_Alonso_worn", ++ "carry_override": "REFUGEE_Alonso_carried", ++ "weapon_override": "REFUGEE_Alonso_wield", ++ "traits": [ { "trait": "PRETTY" }, { "group": "Appearance_demographics" } ], ++ "skills": [ ++ { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ 0, -5 ] } ] } ] } }, ++ { "skill": "barter", "bonus": { "rng": [ 0, 1 ] } } ++ ] ++ }, ++ { ++ "type": "item_group", ++ "id": "REFUGEE_Alonso_worn", ++ "subtype": "collection", ++ "entries": [ ++ { "item": "boxer_briefs" }, ++ { "item": "socks" }, ++ { "item": "tshirt" }, ++ { "item": "pants_leather" }, ++ { "item": "jacket_leather" }, ++ { "item": "fancy_sunglasses" }, ++ { "item": "dress_shoes" } ++ ] ++ }, ++ { ++ "type": "item_group", ++ "id": "REFUGEE_Alonso_carried", ++ "subtype": "collection", ++ "entries": [ { "item": "mag_porn" }, { "item": "vibrator" }, { "item": "condom" } ] ++ }, ++ { ++ "type": "item_group", ++ "id": "REFUGEE_Alonso_wield", ++ "subtype": "collection", ++ "entries": [ { "item": "cudgel" } ] + } + ] +diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json b/data/json/obsoletion/npc_dialogue.json +similarity index 78% +rename from data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json +rename to data/json/obsoletion/npc_dialogue.json +index 136c879b117..459467b71a9 100644 +--- a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json ++++ b/data/json/obsoletion/npc_dialogue.json +@@ -1,62 +1,4 @@ + [ +- { +- "type": "npc", +- "id": "refugee_AlonsoLautrec", +- "name_unique": "Alonso Lautrec", +- "gender": "male", +- "name_suffix": "refugee", +- "class": "NC_REFUGEE_Alonso", +- "attitude": 0, +- "mission": 7, +- "chat": "TALK_REFUGEE_Alonso_1", +- "faction": "free_merchants" +- }, +- { +- "type": "npc_class", +- "id": "NC_REFUGEE_Alonso", +- "name": { "str": "Refugee" }, +- "job_description": "I'm just trying to survive.", +- "common": false, +- "//": "Alonso wants to be the town bicycle, but isn't getting as much interest as he'd hoped. He'll trade a morale bonus for condoms.", +- "bonus_str": { "rng": [ -2, 1 ] }, +- "bonus_dex": { "rng": [ -2, 4 ] }, +- "bonus_int": { "rng": [ -2, 2 ] }, +- "bonus_per": { "rng": [ -2, 2 ] }, +- "worn_override": "REFUGEE_Alonso_worn", +- "carry_override": "REFUGEE_Alonso_carried", +- "weapon_override": "REFUGEE_Alonso_wield", +- "traits": [ { "trait": "PRETTY" }, { "group": "Appearance_demographics" } ], +- "skills": [ +- { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "rng": [ 0, -5 ] } ] } ] } }, +- { "skill": "barter", "bonus": { "rng": [ 0, 1 ] } } +- ] +- }, +- { +- "type": "item_group", +- "id": "REFUGEE_Alonso_worn", +- "subtype": "collection", +- "entries": [ +- { "item": "boxer_briefs" }, +- { "item": "socks" }, +- { "item": "tshirt" }, +- { "item": "pants_leather" }, +- { "item": "jacket_leather" }, +- { "item": "fancy_sunglasses" }, +- { "item": "dress_shoes" } +- ] +- }, +- { +- "type": "item_group", +- "id": "REFUGEE_Alonso_carried", +- "subtype": "collection", +- "entries": [ { "item": "mag_porn" }, { "item": "vibrator" }, { "item": "condom" } ] +- }, +- { +- "type": "item_group", +- "id": "REFUGEE_Alonso_wield", +- "subtype": "collection", +- "entries": [ { "item": "cudgel" } ] +- }, + { + "type": "talk_topic", + "//": "common talk responses", +diff --git a/data/mods/DinoMod/NPC/NPC_Alonso_Lautrec.json b/data/mods/DinoMod/obsolete/npc_dialogue.json +similarity index 100% +rename from data/mods/DinoMod/NPC/NPC_Alonso_Lautrec.json +rename to data/mods/DinoMod/obsolete/npc_dialogue.json +diff --git a/data/mods/DinoMod/snippets/grave_labels.json b/data/mods/DinoMod/snippets/grave_labels.json +index 72fdc095b39..c40d3bdb567 100644 +--- a/data/mods/DinoMod/snippets/grave_labels.json ++++ b/data/mods/DinoMod/snippets/grave_labels.json +@@ -14,8 +14,7 @@ + "Life did not find a way.", + "The greatest dinosaur expert of our times. Crushed to death by an apatosaurus.", + "Fool hid in a cardboard box from a deinonychus, shouting Dino Dave! Didn't work.", +- "Here lies a dinosaur, don't know what kind. Hated shovels.", +- "Alonso did not know her, but she was beautiful and majestic and she deserved the proper burial. Alonso will remember this dinosaur for some of the time." ++ "Here lies a dinosaur, don't know what kind. Hated shovels." + ] + } + ] +diff --git a/data/mods/No_Hope/Mapgen/refugee_center.json b/data/mods/No_Hope/Mapgen/refugee_center.json +index 30f4a0e7374..d848a2ef941 100644 +--- a/data/mods/No_Hope/Mapgen/refugee_center.json ++++ b/data/mods/No_Hope/Mapgen/refugee_center.json +@@ -137,7 +137,6 @@ + { "class": "refugee_AleeshaSeward", "x": 35, "y": 7 }, + { "class": "refugee_PabloNunez", "x": 35, "y": 12 }, + { "class": "refugee_DanaNunez", "x": 35, "y": 13 }, +- { "class": "refugee_AlonsoLautrec", "x": 40, "y": 23 }, + { "class": "refugee_MangalpreetSingh", "x": 40, "y": 5 }, + { "class": "refugee_MandeepSingh", "x": 41, "y": 5 }, + { "class": "refugee_GuneetSingh", "x": 43, "y": 4 }, +-- +2.42.0 + |