Skip to content

Commit

Permalink
feat: [#176, #266] Added Entry Shotgun
Browse files Browse the repository at this point in the history
  • Loading branch information
annabranco committed Feb 15, 2021
1 parent 47d3ae7 commit 8434744
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
Binary file not shown.
4 changes: 4 additions & 0 deletions src/assets/sounds/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Crowbar from './weapons/Crowbar.mp3';
import DesertEagle from './weapons/DesertEagle.mp3';
import DoubleBarrel from './weapons/DoubleBarrel.mp3';
import EvilTwins from './weapons/EvilTwins.mp3';
import EntryShotgun from './weapons/EntryShotgun.mp3';
import FireAxe from './weapons/FireAxe.mp3';
import Flashbang from './weapons/Flashbang.mp3';
import Handgun from './weapons/Handgun.mp3';
Expand Down Expand Up @@ -71,6 +72,7 @@ import MoveTactical from './actions/move-tactical.mp3';
import OpenDoorBatteringRam from './actions/open-door-BatteringRam.mp3';
import OpenDoorChainsaw from './actions/open-door-Chainsaw.mp3';
import OpenDoorCrowbar from './actions/open-door-Crowbar.mp3';
import OpenDoorEntryShotgun from './actions/open-door-EntryShotgun.mp3';
import OpenDoorFireAxe from './actions/open-door-FireAxe.mp3';
import Reload from './actions/reload.mp3';
import Search0 from './actions/search0.mp3';
Expand Down Expand Up @@ -153,6 +155,7 @@ export const SOUNDS = {
Crowbar,
DesertEagle,
DoubleBarrel,
EntryShotgun,
EvilTwins,
FireAxe,
Flashbang,
Expand Down Expand Up @@ -217,6 +220,7 @@ export const SOUNDS = {
'open-door-Chainsaw': OpenDoorChainsaw,
'open-door-Crowbar': OpenDoorCrowbar,
'open-door-FireAxe': OpenDoorFireAxe,
'open-door-EntryShotgun': OpenDoorEntryShotgun,
reload: Reload,
search0: Search0,
search1: Search1,
Expand Down
Binary file added src/assets/sounds/weapons/EntryShotgun.mp3
Binary file not shown.
11 changes: 11 additions & 0 deletions src/setup/weapons.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ColtPython from '../assets/images/weapons/colt-python.jpg';
import Crowbar from '../assets/images/weapons/crowbar.jpg';
import DesertEagle from '../assets/images/weapons/desert-eagle.jpg';
import DoubleBarrel from '../assets/images/weapons/double-barreled-shotgun.jpg';
import EntryShotgun from '../assets/images/weapons/entry-shotgun.jpg';
import EvilTwins from '../assets/images/weapons/evil-twins.jpg';
import ExpandableBaton from '../assets/images/weapons/expandable-baton.jpg';
import ExpandableBatonClosed from '../assets/images/weapons/expandable-baton-closed.jpg';
Expand Down Expand Up @@ -286,6 +287,16 @@ export const WEAPONS_NIGHT_SHIFT = {
noise: true,
type: WEAPONS
},
EntryShotgun: {
canOpenDoor: NOISY,
attack: RANGED,
dice: 2,
img: EntryShotgun,
name: 'Entry Shotgun',
needsReloading: true,
noise: true,
type: WEAPONS
},
ExpandableBaton: {
altImage: ExpandableBatonClosed,
attack: MELEE,
Expand Down

0 comments on commit 8434744

Please sign in to comment.