From 2a7bb8673c9401a85e14be3980c0a3ec0224b0a6 Mon Sep 17 00:00:00 2001 From: squeek Date: Mon, 4 Apr 2016 21:52:56 -0700 Subject: [PATCH 1/4] Add super basic weapon script for the scout jumpgun --- scripts/ff_playerclass_scout.txt | 1 + scripts/ff_weapon_jumpgun.txt | 116 +++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 scripts/ff_weapon_jumpgun.txt diff --git a/scripts/ff_playerclass_scout.txt b/scripts/ff_playerclass_scout.txt index 8061514..372b45e 100644 --- a/scripts/ff_playerclass_scout.txt +++ b/scripts/ff_playerclass_scout.txt @@ -28,6 +28,7 @@ PlayerClassData { "weapon" "ff_weapon_crowbar" "weapon" "ff_weapon_shotgun" + "weapon" "ff_weapon_jumpgun" "weapon" "ff_weapon_nailgun" "weapon" "ff_weapon_deploymancannon" diff --git a/scripts/ff_weapon_jumpgun.txt b/scripts/ff_weapon_jumpgun.txt new file mode 100644 index 0000000..8cd5d0e --- /dev/null +++ b/scripts/ff_weapon_jumpgun.txt @@ -0,0 +1,116 @@ +WeaponData +{ + // Weapon characteristics: + "CycleTime" "0.2" // Rate of fire + "CycleDecrement" "1" // Number of bullets fired per cycle + + "Damage" "0" // Damage per burst + "DamageRadius" "0" // Radius of damage + + // Projectile weapons + "Speed" "1500" // Speed for projectile to travel at + + "RecoilAmount" "2" // Amount of recoil + + // Hitscan weapons + "Bullets" "-1" // Bullets to shoot + "BulletSpread" "-1" // Spread of projectiles + + "PreReloadTime" "-1" // Time taken for the weapon to move to reload state + "ReloadTime" "-1" // Time taken to reload a shell/rocket/etc + "PostReloadTime" "-1" // Time taken to move weapon back to firing state + + "SpinTime" "-1" // For AC + + "clip_size" "-1" + "clip2_size" "-1" + "default_clip" "50" + "default_clip2" "-1" + + "primary_ammo" "AMMO_NAILS" + "secondary_ammo" "None" + + "ffencrypted" "1" // required for the script to load + + // Weapon data is loaded by both the Game and Client DLLs. + "printname" "#FF_WPNHUD_JUMPGUN" + "viewmodel" "models/weapons/railgun/v_railgun.mdl" + "playermodel" "models/weapons/railgun/w_railgun.mdl" + + "anim_prefix" "anim" + "PlayerAnimationExtension" "railgun" + "bucket" "2" + "bucket_position" "2" + + "weight" "50" + "item_flags" "0" + + // Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds) + SoundData + { + "empty" "generic.empty" + "single_shot" "railgun.single_shot" + "double_shot" "railgun.charged_shot" + "special1" "railgun.chargeloop" + "special2" "railgun.halfcharge" // half charge notification + "special3" "railgun.fullcharge" // full charge notification + "burst" "railgun.overcharge" // overcharge +// "special2" "ambient.electrical_zap_8" // half charge notification +// "special3" "ambient.electrical_zap_9" // full charge notification +// "burst" "ambient.electrical_zap_5" // overcharge + } + + // Weapon Sprite data is loaded by the Client DLL. + TextureData + { + "weapon" + { + "font" "WeaponIcons" + "character" "t" + } + "weapon_s" + { + "font" "WeaponIconsSelected" + "character" "t" + } + "ammo" + { + "font" "WeaponIconsSmall" + "character" "7" + } + "crosshair" + { + "file" "sprites/crosshairs" + "x" "0" + "y" "48" + "width" "24" + "height" "24" + } + "autoaim" + { + "file" "sprites/crosshairs" + "x" "0" + "y" "48" + "width" "24" + "height" "24" + } + "deathnotice" + { + "font" "StatusGlyphsSmall" + "character" "u" + } + } + ModelBounds + { + Viewmodel + { + Mins "-10 -4 -13" + Maxs "21 9 -1" + } + World + { + Mins "-10 -7 -6" + Maxs "22 8 9" + } + } +} From da40eeff20fbd4f9cd4736f368453bac7bc36cd0 Mon Sep 17 00:00:00 2001 From: Mike Parker Date: Mon, 18 Apr 2016 20:27:52 +0100 Subject: [PATCH 2/4] Reference jumpgun sound file --- scripts/ff_weapon_jumpgun.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/ff_weapon_jumpgun.txt b/scripts/ff_weapon_jumpgun.txt index 8cd5d0e..6c9122c 100644 --- a/scripts/ff_weapon_jumpgun.txt +++ b/scripts/ff_weapon_jumpgun.txt @@ -49,15 +49,7 @@ WeaponData SoundData { "empty" "generic.empty" - "single_shot" "railgun.single_shot" - "double_shot" "railgun.charged_shot" - "special1" "railgun.chargeloop" - "special2" "railgun.halfcharge" // half charge notification - "special3" "railgun.fullcharge" // full charge notification - "burst" "railgun.overcharge" // overcharge -// "special2" "ambient.electrical_zap_8" // half charge notification -// "special3" "ambient.electrical_zap_9" // full charge notification -// "burst" "ambient.electrical_zap_5" // overcharge + "single_shot" "jumpgun.single_shot" } // Weapon Sprite data is loaded by the Client DLL. From 68fbc4972cd1c065883fe40e7992ee869f66671f Mon Sep 17 00:00:00 2001 From: Mike Parker Date: Mon, 18 Apr 2016 20:29:39 +0100 Subject: [PATCH 3/4] Add jumpgun sound to weapons txt --- scripts/game_sounds_ff_weapons.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/game_sounds_ff_weapons.txt b/scripts/game_sounds_ff_weapons.txt index b31e2c6..1f9a96c 100644 --- a/scripts/game_sounds_ff_weapons.txt +++ b/scripts/game_sounds_ff_weapons.txt @@ -430,6 +430,17 @@ "wave" "weapons/pipelauncher/pipe_bounce1.wav" } //---------------- +// Jump gun +//---------------- + "jumpgun.single_shot" + { + "channel" "CHAN_WEAPON" + "volume" "1.0" + "CompatibilityAttenuation" "1.0" + "pitch" "95,105" + "wave" "weapons/jumpgun/jumpgun-fire.wav" + } +//---------------- //Railgun, poor thing, you kicked arse in Quake 3 //---------------- "railgun.single_shot" @@ -804,4 +815,4 @@ "CompatibilityAttenuation" "1.0" "pitch" "95,105" "wave" "weapons/umbrella/umbrella_miss.wav" - } \ No newline at end of file + } From 262905dbd95fa5f13b27a72bf6daab26962fb66f Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Mon, 18 Apr 2016 12:45:24 -0700 Subject: [PATCH 4/4] Add FF_WPNHUD_JUMPGUN localization --- resource/FortressForever_english.txt | Bin 92388 -> 92454 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resource/FortressForever_english.txt b/resource/FortressForever_english.txt index d41ec4470acd84f56d56d9068272e42abad59313..8ca145f10c51ddd52ed8d205207ceceaf93e1ed2 100644 GIT binary patch delta 60 zcmaEIk#*T6)(sKilYfMWsd_PlGWaqCFt`J0KL#ZRPB2trKoM^a4Bs9Y&Nx{R00ChR AivR!s delta 25 hcmZ2>iS@}v)(sKilND@uCI#>{ZwcSNC7iKH5CD@P3RVCB