Stop people in refugee center from bashing and tell them to return to places. #62472

I-am-Erk · 2022-11-29T20:37:43Z

Summary

Bugfixes "Adds NO_BASH and RETURN_TO_START_POS to most NPCs in refugee center."

Purpose of change

Partially addresses #62470

Describe the solution

Gives all the surface refugees and guards the listed traits, but allows them to still investigate sounds. I may give some of the quest giving NPCs the no investigate flag as well.

Created a novel guard class for the refugee center in the process rather than overriding traits. This gives them all an evac jacket which should be nice and uniform. These are the interior guards at the center, and so I have assumed these folks have minimal training and are using melee weapons, not guns. Later, in Experimental, I'd like to propose a quest line to help them improve their training and equipment.

Describe alternatives you've considered

As above - some of them could probably get no investigate as well.

Testing

TBA - at work.

data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json

data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json

data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json

data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json

data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json

data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json

data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json

data/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json

data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json

data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json

MNG-cataclysm · 2022-12-01T00:13:31Z

Apparently, the new guard class you created is considered invalid by the tests.

MNG-cataclysm · 2022-12-14T14:27:23Z

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json

@@ -8,7 +8,8 @@
    "attitude": 0,
    "mission": 3,
    "chat": "TALK_FREE_MERCHANT_TEAMSTER",
-    "faction": "free_merchants"
+    "faction": "free_merchants",
+    "traits": [ { "trait": "IGNORE_SOUND" }, { "trait": "NO_BASH" }, { "trait": "RETURN_TO_START_POS" } ]


You need to move the traits to the NPC Class definition. They aren’t registered here.

I'm aware. Just been too burnt out from work to fix it for a few days.

* Update NPC_Aleesha_Seward.json * Update NPC_Alonso_Lautrec.json * Update NPC_Boris_Borichenko.json * Update NPC_Dana_Nunez.json * Update NPC_Draco_Dune.json * Update NPC_Fatima_Al_Jadir.json * Update NPC_Garry_Villeneuve.json * Update NPC_Guneet_Singh.json * Update NPC_Jenny_Forcette.json * Update NPC_John_Clemens.json * Update NPC_Mandeep_Singh.json * Update NPC_Mangalpreet_Singh.json * Update NPC_Pablo_Nunez.json * Update NPC_Rhyzaea_Johnny.json * Update NPC_Stan_Borichenko.json * Update NPC_Uyen_Tran.json * Update NPC_Vanessa_Toby.json * Update NPC_free_merchant_guard1.json * Update NPC_free_merchant_guard2.json * Update NPC_free_merchant_guard3.json * Update NPC_free_merchant_guard_generic.json * Update NPC_free_merchant_hostile_guard.json * Update NPC_free_merchant_teamster.json * Update NPC_free_merchant_teamster.json * Create Generic_class_definitions * Linting Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update NPC_free_merchant_guard1.json * Update NPC_free_merchant_guard2.json * Update NPC_free_merchant_guard3.json * Update NPC_free_merchant_guard_generic.json * Update NPC_free_merchant_hostile_guard.json * Update Generic_class_definitions * Update Generic_class_definitions * Add worn override * Apply my suggestions * restart tests Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

MNG-cataclysm · 2023-02-06T13:58:58Z

As #63289 merged the content from this PR, it should probably be closed.

Maleclypse · 2023-02-12T02:34:09Z

Completed by #63289

I-am-Erk added 25 commits November 29, 2022 12:18

Update NPC_Aleesha_Seward.json

e433cc2

Update NPC_Alonso_Lautrec.json

7d1f8b9

Update NPC_Boris_Borichenko.json

8fb9d3c

Update NPC_Dana_Nunez.json

bc1fdaf

Update NPC_Draco_Dune.json

b565487

Update NPC_Fatima_Al_Jadir.json

b780afb

Update NPC_Garry_Villeneuve.json

7c932f6

Update NPC_Guneet_Singh.json

0ddca35

Update NPC_Jenny_Forcette.json

7861c07

Update NPC_John_Clemens.json

791d726

Update NPC_Mandeep_Singh.json

aaa4f64

Update NPC_Mangalpreet_Singh.json

7325188

Update NPC_Pablo_Nunez.json

fc72dea

Update NPC_Rhyzaea_Johnny.json

0d49fa9

Update NPC_Stan_Borichenko.json

815b39f

Update NPC_Uyen_Tran.json

90d5f11

Update NPC_Vanessa_Toby.json

8d11982

Update NPC_free_merchant_guard1.json

bf31ec9

Update NPC_free_merchant_guard2.json

b5cb220

Update NPC_free_merchant_guard3.json

a39bfda

Update NPC_free_merchant_guard_generic.json

30f5a3f

Update NPC_free_merchant_hostile_guard.json

2279175

Update NPC_free_merchant_teamster.json

700c12e

Update NPC_free_merchant_teamster.json

0a83a69

Create Generic_class_definitions

1f19555

I-am-Erk added NPC / Factions NPCs, AI, Speech, Factions, Ownership <Bugfix> This is a fix for a bug (or closes open issue) labels Nov 29, 2022

github-actions bot added the [JSON] Changes (can be) made in JSON label Nov 29, 2022

github-actions bot reviewed Nov 29, 2022

View reviewed changes

github-actions bot added the astyled astyled PR, label is assigned by github actions label Nov 29, 2022

Linting

e1609cf

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Nov 29, 2022

I-am-Erk mentioned this pull request Nov 29, 2022

Amend NPC's with IGNORE_SOUNDS, NO_BASH and RETURN_TO_START_POS #62476

Merged

I-am-Erk added 7 commits November 30, 2022 13:27

Update NPC_free_merchant_guard1.json

7b53d4a

Update NPC_free_merchant_guard2.json

7940cba

Update NPC_free_merchant_guard3.json

6bd101a

Update NPC_free_merchant_guard_generic.json

f031df7

Update NPC_free_merchant_hostile_guard.json

0bcb46b

Update Generic_class_definitions

d91a2d2

Update Generic_class_definitions

4f8dd37

I-am-Erk commented Nov 30, 2022

View reviewed changes

Add worn override

9705133

I-am-Erk marked this pull request as ready for review November 30, 2022 22:16

I-am-Erk mentioned this pull request Dec 6, 2022

IGNORE_SOUND, NO_BASH and RETURN_TO_START_POS traits to more NPCs. #62470

Open

MNG-cataclysm suggested changes Dec 14, 2022

View reviewed changes

MNG-cataclysm mentioned this pull request Jan 26, 2023

Finish PR #62472 #63289

Merged

Maleclypse closed this Feb 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stop people in refugee center from bashing and tell them to return to places. #62472

Stop people in refugee center from bashing and tell them to return to places. #62472

I-am-Erk commented Nov 29, 2022 •

edited

MNG-cataclysm commented Dec 1, 2022

MNG-cataclysm Dec 14, 2022

I-am-Erk Dec 16, 2022

MNG-cataclysm commented Feb 6, 2023

Maleclypse commented Feb 12, 2023

Stop people in refugee center from bashing and tell them to return to places. #62472

Stop people in refugee center from bashing and tell them to return to places. #62472

Conversation

I-am-Erk commented Nov 29, 2022 • edited

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

MNG-cataclysm commented Dec 1, 2022

MNG-cataclysm Dec 14, 2022

Choose a reason for hiding this comment

I-am-Erk Dec 16, 2022

Choose a reason for hiding this comment

MNG-cataclysm commented Feb 6, 2023

Maleclypse commented Feb 12, 2023

I-am-Erk commented Nov 29, 2022 •

edited