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.

Sign up for GitHub

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

Jump to bottom

Obsolete trigger happy trait #39493

Merged
merged 3 commits into from
Apr 14, 2020
Merged

Obsolete trigger happy trait #39493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09129d5
Obsolete trigger happy trait
Apr 12, 2020
205152f
Make trigger happy invisible
Apr 13, 2020
e9ca635
Apply suggestions from code review
ZhilkinSerg Apr 14, 2020
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
5 changes: 3 additions & 2 deletions data/json/mutations/mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,8 +1086,9 @@
"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,
ymber marked this conversation as resolved.
Show resolved Hide resolved
"player_display": false,
"valid": false
},
{
Expand Down
1 change: 0 additions & 1 deletion data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
{ "trait": "MYOPIC" },
{ "trait": "HYPEROPIC" },
{ "trait": "JITTERY" },
{ "trait": "TRIGGERHAPPY" },
{ "trait": "SMELLY" },
{ "trait": "PROJUNK" },
{ "trait": "BADBACK" },
Expand Down
1 change: 0 additions & 1 deletion data/json/npcs/starting_traits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
Expand Down
1 change: 0 additions & 1 deletion data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
}
Expand Down
1 change: 0 additions & 1 deletion data/mods/More_Locations/refugee_faction/refugee_classes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
[ "JITTERY", 10 ],
[ "BADKNEES", 10 ],
[ "SLOWRUNNER", 10 ],
[ "TRIGGERHAPPY", 10 ],
[ "FLIMSY", 10 ],
{ "group": "Appearance_demographics", "prob": 100 }
],
Expand Down
1 change: 0 additions & 1 deletion data/mods/Mutant_NPCs/trait_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
}
Expand Down
2 changes: 0 additions & 2 deletions src/avatar_action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();
Expand Down