Browse Source

add magnum reload

master
Alison Watson 3 months ago
parent
commit
d066fe99e9
10 changed files with 22 additions and 8 deletions
  1. BIN
      pk7/acs/lithmain.bin
  2. BIN
      pk7/lsounds/WeaponsW/Magnum/Pickup
  3. BIN
      pk7/lsounds/WeaponsW/Magnum/Reload
  4. +12
    -5
      pk7/lzscript/4_Wanderer/2_Magnum.zsc
  5. +3
    -0
      pk7/sndinfo.txt
  6. BIN
      pk7/sprites/WeaponsW/Magnum/MAGNF0.png
  7. BIN
      pk7/sprites/WeaponsW/Magnum/MAGNG0.png
  8. BIN
      pk7/sprites/WeaponsW/Magnum/MAGNH0.png
  9. +1
    -1
      text/Weapons.txt
  10. +6
    -2
      text/sound/weapons.w.txt

BIN
pk7/acs/lithmain.bin View File


BIN
pk7/lsounds/WeaponsW/Magnum/Pickup View File


BIN
pk7/lsounds/WeaponsW/Magnum/Reload View File


+ 12
- 5
pk7/lzscript/4_Wanderer/2_Magnum.zsc View File

@@ -47,9 +47,9 @@ Fire:
MAGN B 1 bright lith_fireMagnum();
MAGN B 1 bright offset(10, 28) Lith_A_RecoilUp(1.7);
MAGN BB 1 bright;
MAGN CC 1 offset(9, 28);
MAGN C 1 offset(7, 30);
MAGN C 1 offset(5, 31);
MAGN CC 1 bright offset(9, 28);
MAGN C 1 bright offset(7, 30);
MAGN C 1 bright offset(5, 31);
MAGN D 1 offset(4, 31);
MAGN D 1 offset(3, 32);
MAGN DDE 1 offset(2, 32);
@@ -72,8 +72,15 @@ FireEmpty:

Reload:
MAGN A 1 Lith_A_JumpIfMagFull;
MAGN A 1 offset(2, 31) A_StartSound("weapons/magnum/reload", lch_reload);
MAGN A 2 Lith_A_ReloadFinish;
MAGN F 3 A_StartSound("weapons/magnum/reload", lch_reload);
MAGN F 4 offset(7, 32);
MAGN G 3 offset(1, 32);
MAGN G 4 offset(7, 32);
MAGN H 5 offset(1, 32);
MAGN H 5 offset(7, 32);
MAGN F 3 offset(7, 32);
MAGN F 4 offset(1, 32);
MAGN A 5 Lith_A_ReloadFinish;
goto ReadySelector;
}



+ 3
- 0
pk7/sndinfo.txt View File

@@ -773,7 +773,10 @@ weapons/redrifle/fire lsounds/WeaponsT/RedRifle/Fire
weapons/redrifle/bolt lsounds/WeaponsT/RedRifle/Bolt
weapons/magnum/fire1 lsounds/WeaponsW/Magnum/Fire
weapons/magnum/fire2 lsounds/WeaponsW/Magnum/Fire2
weapons/magnum/reload lsounds/WeaponsW/Magnum/Reload
weapons/magnum/pickup lsounds/WeaponsW/Magnum/Pickup
$random weapons/magnum/fire { weapons/magnum/fire1 weapons/magnum/fire2 }
$alias weapons/magnum/draw weapons/magnum/pickup
weapons/cfist/pickup lsounds/Weapons/ChargeFist/Pickup
weapons/cfist/fire1 lsounds/Weapons/ChargeFist/Fire1
weapons/cfist/fire2 lsounds/Weapons/ChargeFist/Fire2


BIN
pk7/sprites/WeaponsW/Magnum/MAGNF0.png View File

Before After
Width: 81  |  Height: 131  |  Size: 2.5KB

BIN
pk7/sprites/WeaponsW/Magnum/MAGNG0.png View File

Before After
Width: 149  |  Height: 139  |  Size: 3.2KB

BIN
pk7/sprites/WeaponsW/Magnum/MAGNH0.png View File

Before After
Width: 104  |  Height: 198  |  Size: 3.9KB

+ 1
- 1
text/Weapons.txt View File

@@ -70,7 +70,7 @@
;fist fist i_flintlock fist fist fist fist fist fist

:wanderer
+w_magnum 2 Magnum Placeholder2 NMag
+w_magnum 2 Magnum "magnum" NMag
;fist fist w_magnum fist fist fist fist fist fist

:assassin


+ 6
- 2
text/sound/weapons.w.txt View File

@@ -9,9 +9,13 @@
weapons {
magnum {
== lsounds/WeaponsW/Magnum
fire1 Fire # Marathon 2
fire2 Fire2 # //
fire1 Fire # Marathon 2
fire2 Fire2 # //
reload Reload # //
pickup Pickup # Fallout 4

$random fire { fire1, fire2, }
$alias draw = pickup
}
}



Loading…
Cancel
Save