Skip to content

Commit

Permalink
Fix frag grenade sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
DeltaHelios committed Jan 9, 2025
1 parent 8a60e0f commit fce4d2e
Show file tree
Hide file tree
Showing 19 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup)
.addOptionalTag(ConventionalBlockTags.GLASS_BLOCKS)
.addOptionalTag(BlockTags.ICE)
.add(Blocks.FERN)
.add(Blocks.LARGE_FERN);
.add(Blocks.LARGE_FERN)
.add(Blocks.BROWN_MUSHROOM)
.add(Blocks.RED_MUSHROOM);

getOrCreateTagBuilder(Gadgets.DETONATES_GRENADE)
.add(Blocks.REDSTONE_BLOCK)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void tick()
super.tick();
if (hasDrag())
{
this.setVelocity(getVelocity().multiply(0.9d));
this.setVelocity(getVelocity().multiply(0.95d));
velocityModified = true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public ActionResult useLeft(World world, LivingEntity user, Hand hand)
else
{
if (world.isClient())
sounds.playArmSound(user);
sounds.playDisarmSound(user);
stack.remove(Gadgets.PRIMING_TIME);
//sounds.playDisarmSound(user);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"shared.arm": {
"subtitle": "subtitle.pswg_gadgets.arm",
"subtitle": "subtitle.pswg_gadgets.grenade_arm",
"sounds": [
"pswg_gadgets:arm"
]
},
"shared.disarm": {
"subtitle": "subtitle.pswg_gadgets.disarm",
"subtitle": "subtitle.pswg_gadgets.grenade_disarm",
"sounds": [
"pswg_gadgets:disarm"
]
Expand Down Expand Up @@ -56,7 +56,7 @@
"fragmentationgrenade.beep": {
"subtitle": "subtitle.pswg_gadgets.fragmentationgrenade.beep",
"sounds": [
"pswg_gadgets_gadgets:c25_beep_loop"
"pswg_gadgets:c25_beep_loop"
]
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit fce4d2e

Please sign in to comment.