From 09129d5513033236bcf3db7e19ccf6a7d48c1320 Mon Sep 17 00:00:00 2001 From: ymber Date: Sun, 12 Apr 2020 08:48:11 +0100 Subject: [PATCH 1/3] Obsolete trigger happy trait --- data/json/mutations/mutations.json | 4 ++-- .../npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json | 1 - data/json/npcs/starting_traits.json | 1 - data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json | 1 - data/mods/More_Locations/refugee_faction/refugee_classes.json | 1 - data/mods/Mutant_NPCs/trait_groups.json | 1 - src/avatar_action.cpp | 2 -- 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 4994a03663461..9c9bff4b5d524 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1086,8 +1086,8 @@ "id": "TRIGGERHAPPY", "name": { "str": "Trigger Happy" }, "points": -1, - "description": "On rare occasion, you will go full-auto when you intended to fire a single shot. This has no effect when firing semi-automatic firearms.", - "starting_trait": true, + "description": "Unimplemented. To be removed after 0.F. to preserve save compatibility.", + "starting_trait": false, "valid": false }, { diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json b/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json index a82354bc6f4f1..09fd15c7c0a99 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json @@ -37,7 +37,6 @@ { "trait": "MYOPIC" }, { "trait": "HYPEROPIC" }, { "trait": "JITTERY" }, - { "trait": "TRIGGERHAPPY" }, { "trait": "SMELLY" }, { "trait": "PROJUNK" }, { "trait": "BADBACK" }, diff --git a/data/json/npcs/starting_traits.json b/data/json/npcs/starting_traits.json index 240dc10edd9bb..5c4f8a9f25597 100644 --- a/data/json/npcs/starting_traits.json +++ b/data/json/npcs/starting_traits.json @@ -65,7 +65,6 @@ { "trait": "SAVANT", "prob": 10 }, { "trait": "SCHIZOPHRENIC", "prob": 1 }, { "trait": "SQUEAMISH", "prob": 20 }, - { "trait": "TRIGGERHAPPY", "prob": 10 }, { "trait": "ANTIWHEAT", "prob": 5 }, { "trait": "WOOLALLERGY", "prob": 5 } ] diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json index c8b08a0792f54..57f0a4cfc5723 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json @@ -917,7 +917,6 @@ { "trait": "SAVANT", "prob": 10 }, { "trait": "SCHIZOPHRENIC", "prob": 10 }, { "trait": "SQUEAMISH", "prob": 10 }, - { "trait": "TRIGGERHAPPY", "prob": 10 }, { "group": "Appearance_demographics", "prob": 100 } ] } diff --git a/data/mods/More_Locations/refugee_faction/refugee_classes.json b/data/mods/More_Locations/refugee_faction/refugee_classes.json index 218cd7b421d71..e7bae76cae5a4 100644 --- a/data/mods/More_Locations/refugee_faction/refugee_classes.json +++ b/data/mods/More_Locations/refugee_faction/refugee_classes.json @@ -26,7 +26,6 @@ [ "JITTERY", 10 ], [ "BADKNEES", 10 ], [ "SLOWRUNNER", 10 ], - [ "TRIGGERHAPPY", 10 ], [ "FLIMSY", 10 ], { "group": "Appearance_demographics", "prob": 100 } ], diff --git a/data/mods/Mutant_NPCs/trait_groups.json b/data/mods/Mutant_NPCs/trait_groups.json index c8b08a0792f54..57f0a4cfc5723 100644 --- a/data/mods/Mutant_NPCs/trait_groups.json +++ b/data/mods/Mutant_NPCs/trait_groups.json @@ -917,7 +917,6 @@ { "trait": "SAVANT", "prob": 10 }, { "trait": "SCHIZOPHRENIC", "prob": 10 }, { "trait": "SQUEAMISH", "prob": 10 }, - { "trait": "TRIGGERHAPPY", "prob": 10 }, { "group": "Appearance_demographics", "prob": 100 } ] } diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 74c292beaa41b..083c93ee0920d 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -928,7 +928,6 @@ void avatar_action::aim_do_turn( avatar &you, map &m ) you.moves -= reload_time; - // TODO: add check for TRIGGERHAPPY int shots_fired = you.fire_gun( trajectory.back(), gun.qty, *gun ); // TODO: bionic power cost of firing should be derived from a value of the relevant weapon. @@ -999,7 +998,6 @@ void avatar_action::fire_turret_manual( avatar &you, map &m, turret_data &turret wrefresh( g->w_terrain ); g->draw_panels(); - // TODO: add check for TRIGGERHAPPY turret.fire( you, trajectory.back() ); } g->reenter_fullscreen(); From 205152f441e9a3abd374092f0a1fd3f5d7a1e144 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 13 Apr 2020 08:26:47 +0100 Subject: [PATCH 2/3] Make trigger happy invisible Co-Authored-By: anothersimulacrum --- data/json/mutations/mutations.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 9c9bff4b5d524..22050769dda2c 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1088,6 +1088,7 @@ "points": -1, "description": "Unimplemented. To be removed after 0.F. to preserve save compatibility.", "starting_trait": false, + "player_display": false, "valid": false }, { From e9ca635826285ac242ce4d907fb326778bd3d6cb Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Tue, 14 Apr 2020 11:58:55 +0300 Subject: [PATCH 3/3] Apply suggestions from code review --- data/json/mutations/mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 22050769dda2c..5e681e85d2eb5 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -1086,7 +1086,7 @@ "id": "TRIGGERHAPPY", "name": { "str": "Trigger Happy" }, "points": -1, - "description": "Unimplemented. To be removed after 0.F. to preserve save compatibility.", + "description": "Unimplemented. To be removed after 0.F. to preserve save compatibility.", "starting_trait": false, "player_display": false, "valid": false