Various .wpn balance and visual changes

Addresses all balance issues in #355 (no cost changes currently) Bacta grenade now uses unique efx Flechette Pistol now uses MOD_EXPLOSION so it does not ignore shields DLT-19 nerfed as its damage was accidentally overtuned due to splash damage. scoped and non-scoped variants use the same damage and splaash range values now. Bryar shotgun adjusted to be more forgiving. Larger collisionsize on both regular and decimator shotgun firing modes. regular fire mode now consumes 3 ammo so all 3 firemodes are consistent. Spread reduced on regular firemode and increased on decimator mode. Various weapons have had overheating adjustments to make them more consequential. Generic vendor NPC prisoner model now uses merchant clothing Vibrosword test weapon added
JKGDevs · May 4, 2024 · 3f4f42e · 3f4f42e
1 parent 86f774e
commit 3f4f42e
Show file tree

Hide file tree

Showing 18 changed files with 167 additions and 28 deletions.
diff --git a/JKGalaxies/ext_data/hilts/15_vibrosword.hilt b/JKGalaxies/ext_data/hilts/15_vibrosword.hilt
@@ -0,0 +1,41 @@
+{
+	"name":			"vibrosword",
+	"fullName":		"Mosquito Vibroblade",
+	"soundOn":		"sound/weapons/sword/draw1.mp3",
+	"soundLoop": 	"null",
+	"saberOff": 	"null",
+	"saberModel": 	"models/weapons/vibroblades/Blade_Mosquito/model.glm",
+	"spinsound": 		"sound/weapons/sword/spin.mp3",
+	"swingsounds":  [ 
+		"sound/weapons/sword/swing1.mp3", 
+		"sound/weapons/sword/swing2.mp3", 
+		"sound/weapons/sword/swing3.mp3" 
+		],
+	"hitSounds": [
+		"sound/weapons/sword/stab1.mp3",
+		"sound/weapons/sword/stab2.mp3",
+		"sound/weapons/sword/stab3.mp3"
+	],
+	"blockSounds": 	[
+		"sound/weapons/sword/stab2.mp3",
+		"sound/weapons/sword/stab2.mp3",
+		"sound/weapons/sword/stab1.mp3"
+	],
+	"bounceSounds": [
+		"sound/weapons/sword/stab1.mp3",
+		"sound/weapons/sword/stab2.mp3",
+		"sound/weapons/sword/stab2.mp3"
+	],
+	"fallSounds": [
+		"sound/weapons/sword/fall1.mp3",
+		"sound/weapons/sword/fall2.mp3",
+		"sound/weapons/sword/fall3.mp3"
+	],
+	"hitPersonEffect": "effects/blood/blood_woundbig.efx",
+	"animSpeedScale":	1.0,
+	"blades": {
+		"blade1": {
+			"length": 0
+		}
+	}
+}
diff --git a/JKGalaxies/ext_data/items/Mine_184_Sequencer.itm b/JKGalaxies/ext_data/items/Mine_184_Sequencer.itm
@@ -0,0 +1,12 @@
+{
+	"name":             "@JKG_ITEMS_Mine_Sequencer",
+	"internal":             "Mine_Sequencer",
+	"itemtype":             "weapon",
+	"weapon":		"WP_TRIP_MINE",
+	"variation":		"2",
+	"weight":		"1",
+	"cost":		"100",
+	"maxStack":		5,
+	"itemIcon":		"models/weapons/Charge_Sequencer/icon_default",
+	"itemDescription": "A common explosive device that has been rigged with a proximity sensor, the Sequencer Charge will automatically detonate when a target comes in range."
+}
diff --git a/JKGalaxies/ext_data/items/RW_40_Lemons.itm b/JKGalaxies/ext_data/items/RW_40_Lemons.itm
@@ -6,5 +6,6 @@
 	"variation":		"11",
 	"xml":			"",
 	"itemIcon":		"models/weapons/Grenade_Stun/icon_lemon",
+	"maxStack":		10,
 	"itemDescription": "Make life rue the day it thought it could give Cave Johnson lemons! Do you know who I am? I'm the man who's gonna burn your house down... with the lemons! I'm gonna get my engineers to invent a combustible lemon that burns your house down!"
 }
diff --git a/JKGalaxies/ext_data/weapons/Grenade_14_Bacta_Antidote-e.wpn b/JKGalaxies/ext_data/weapons/Grenade_14_Bacta_Antidote-e.wpn
@@ -28,14 +28,15 @@
             ],
             "chargingsound": "sound/weapons/grenade_cook.wav",
             "projectilemodel": "models/weapons/Grenade_Bacta/projectile.md3",
+			"projectilefx": "weapons/bactaglow_teal",
 			"runsound": "sound/weapons/helpfulnade_loop.wav",
 			"miss": {
 				"impactfx": "weapons/watergun_impact_big",
 				"shockwavefx": "weapons/watergun_impact_small"
 			},
 			"hit": {
-				"impactfx": "weapons/watergun_impact_big",
-				"shockwavefx": "weapons/watergun_impact_small"
+				"impactfx": "weapons/bactagun_impact_big",
+				"shockwavefx": "weapons/bactagun_impact_small"
 			},
 			"bouncesound": ["sound/weapons/grenade_bounce1.wav", "sound/weapons/grenade_bounce2.wav"],
 			"displayName":  "Throw"
@@ -54,12 +55,12 @@
             "projectilemodel": "models/weapons/Grenade_Bacta/projectile.md3",
 			"runsound": "sound/weapons/helpfulnade_loop.wav",
             "miss": {
-                "impactfx": "weapons/watergun_impact_big",
-                "shockwavefx": "weapons/watergun_impact_small"
+                "impactfx": "weapons/bactagun_impact_big",
+                "shockwavefx": "weapons/bactagun_impact_small"
             },
             "hit": {
-                "impactfx": "weapons/watergun_impact_big",
-                "shockwavefx": "weapons/watergun_impact_small"
+                "impactfx": "weapons/bactagun_impact_big",
+                "shockwavefx": "weapons/bactagun_impact_small"
            },
             "bouncesound":  [ "sound/weapons/grenade_bounce1.wav", "sound/weapons/grenade_bounce2.wav" ],
 			"displayName":  "Roll"

diff --git a/JKGalaxies/ext_data/weapons/array_0_ACP_ArrayGun.wpn b/JKGalaxies/ext_data/weapons/array_0_ACP_ArrayGun.wpn
@@ -79,7 +79,7 @@
         "projectiles":     8,
         "recoil":       3.5,
         "range":       2200,
-        "spread":       1.7,
+        "spread":       1.5,
         "projectilespeed": 6000.0,
         "projectileclass": "blaster_proj",
         "meansofdeath": "MOD_ACP",
@@ -109,7 +109,7 @@
 			    }
 		    ]
 	    },
-        "collisionsize": 3.0,
+        "collisionsize": 4.0,
         "ammocost":     1,
         "burstshotdelay": 250,
         "firedelay":    1350,

diff --git a/JKGalaxies/ext_data/weapons/array_3_Bryar_Shotgun.wpn b/JKGalaxies/ext_data/weapons/array_3_Bryar_Shotgun.wpn
@@ -85,13 +85,14 @@
 
     "firemode0": {
         "damage":       35,
-        "ammocost":     1,
+        "collisionsize": 6.0,
+        "ammocost":     3,
         "firedelay":    900,
         "firingtype":   "semi",
         "projectiles":     3,
-        "recoil":       1.5,
+        "recoil":       2.5,
         "range":       3700,
-        "spread":       10.6,
+        "spread":       6.5,
         "projectilespeed": 4000.0,
         "projectileclass": "blaster_proj",
         "meansofdeath": "MOD_BLASTER",
@@ -114,7 +115,7 @@
     "firemode1": {
         "damage":       35,
         "ammocost":     1,
-        "burstshotdelay": 250,
+        "burstshotdelay": 240,
         "firedelay":    900,
         "firingtype":   "burst",
         "recoil":       0.8,
@@ -137,14 +138,15 @@
     },
 
 	"firemode2": {
-        "damage":       20,
+        "damage":       10,
+        "collisionsize": 2.0,
         "ammocost":     3,
-        "firedelay":    1200,
+        "firedelay":    900,
         "firingtype":   "semi",
         "projectiles":     9,
         "recoil":       7.5,
         "range":       3700,
-        "spread":       8.0,
+        "spread":       9.0,
         "projectilespeed": 4000.0,
         "projectileclass": "blaster_proj",
         "meansofdeath": "MOD_BLASTER",

diff --git a/JKGalaxies/ext_data/weapons/array_4_DoubleBarrel_ArrayGun.wpn b/JKGalaxies/ext_data/weapons/array_4_DoubleBarrel_ArrayGun.wpn
@@ -92,7 +92,9 @@
         	"sightsModifier": 0.75,
         	"walkModifier": 1.1,
         	"inAirModifier": 1.8
-        }
+        },
+		"heatGenerated": 10,
+		"maxHeat": 50
     },
 
     "firemode1": {

diff --git a/JKGalaxies/ext_data/weapons/charge_0_Sequencer.wpn b/JKGalaxies/ext_data/weapons/charge_0_Sequencer.wpn
@@ -24,6 +24,7 @@
             "g2radius":     100,
             "firesound":    "sound/weapons/detpack/fire.wav",
             "miss":         { "sticksound": "sound/weapons/detpack/stick.wav" },
+            "explodefx":    "explosives/demosmall",
 	    "displayName":  "Place"
         },
 

diff --git a/JKGalaxies/ext_data/weapons/pistol_13_EE-3_Pistol.wpn b/JKGalaxies/ext_data/weapons/pistol_13_EE-3_Pistol.wpn
@@ -16,7 +16,8 @@
             "ammo":         [ "models/weapons/EE-3_Rifle/numbers3", "models/weapons/EE-3_Rifle/numbers2", "models/weapons/EE-3_Rifle/numbers1" ]
         },
 
-        "gunposition":      "11.0 -4.0 -7.0",
+//        "gunposition":      "11.0 -4.0 -7.0",
+        "gunposition":      "12.0 -4.0 -6.0",
         "ironsightsposition": "7.0 0 -2.61",
         "ironsightsfov": "75",
 
@@ -105,7 +106,7 @@
 
 	"playeranims": {
         "idle":         { "torso": "BOTH_IDLE1", "legs": "BOTH_IDLE1" },
-        "reload":       { "torso": "TORSO_DROPWEAP1" },
+        "reload":       { "torso": "BOTH_RIFLERELOADB" },
         "sights":        { "torso": "TORSO_WEAPONREADY2", "legs": "BOTH_STAND1" },
         "sightsFiring":       { "torso": "BOTH_ATTACK2" },
 	"ready":	{ "torso": "BOTH_BASE_PISTOLSTANCE", "legs": "BOTH_STAND1" },

diff --git a/JKGalaxies/ext_data/weapons/pistol_14_Westar-34_Pistol.wpn b/JKGalaxies/ext_data/weapons/pistol_14_Westar-34_Pistol.wpn
@@ -59,7 +59,9 @@
 		"ammobase": "AMMO_SS_POWERPAK",
 		"ammodefault": "AMMO_SS_POWERPAK",
 		"clipSize": 20,
-		"heatGenerated": 6.75
+		"heatGenerated": 3,
+		"maxHeat": 35,
+		"reloadClearHeat": 10
 	},
 
     "playeranims": {

diff --git a/JKGalaxies/ext_data/weapons/pistol_2_ELG-3A_Pistol.wpn b/JKGalaxies/ext_data/weapons/pistol_2_ELG-3A_Pistol.wpn
@@ -78,7 +78,9 @@
         "meansofdeath": "MOD_BRYAR_PISTOL",
 		"ammobase": "AMMO_SS_POWERPAK",
 		"ammodefault": "AMMO_SS_POWERPAK",
-        "clipSize":              10
+        "clipSize":              10,
+        "heatGenerated": 4,
+        "maxHeat": 50
     },
 
     "firemode1": {

diff --git a/JKGalaxies/ext_data/weapons/pistol_4_FWG-5_FlechettePistol.wpn b/JKGalaxies/ext_data/weapons/pistol_4_FWG-5_FlechettePistol.wpn
@@ -60,7 +60,7 @@
         "slot":         1,
         "reloadtime":   1500,
         "flags":        [ "roll" ],
-        "reloadmodifier": 0.6,
+        "reloadmodifier": 0.7,
         "speed": 1
     },
 
@@ -85,8 +85,8 @@
         "spread":       0.0,
         "projectilespeed":1600.0,//7000.0,
         "projectileclass":"flech_proj",
-        "meansofdeath": "MOD_SLUGTHROWER",
-        "splashmeansofdeath": "MOD_SLUGTHROWER",
+        "meansofdeath": "MOD_EXPLOSION",
+        "splashmeansofdeath": "MOD_EXPLOSION",
 	    "ammobase": "AMMO_FWG-5",
 	    "ammodefault": "AMMO_FWG-5",
         "clipSize":              8,

diff --git a/JKGalaxies/ext_data/weapons/rifle_8_EE-3_Rifle.wpn b/JKGalaxies/ext_data/weapons/rifle_8_EE-3_Rifle.wpn
@@ -128,7 +128,7 @@
 	"playeranims": {
         "idle":         { "torso": "BOTH_IDLE1", "legs": "BOTH_IDLE1" },
         "reload":       { "torso": "TORSO_DROPWEAP1" },
-        "reload":       { "torso": "BOTH_RIFLERELOADR" },
+        "reload":       { "torso": "BOTH_RIFLERELOADB" },
         "sights":        { "torso": "TORSO_WEAPONREADY3", "legs": "BOTH_STAND1" },
         "sightsFiring":       { "torso": "BOTH_ATTACK3" },
 	"ready":	{ "torso": "BOTH_BASE_RIFLESTANCE", "legs": "BOTH_STAND1" },

diff --git a/JKGalaxies/ext_data/weapons/saber_16_vibrosword.wpn b/JKGalaxies/ext_data/weapons/saber_16_vibrosword.wpn
@@ -0,0 +1,54 @@
+{
+    "name":             "@JKG_ITEMS_weapon_saber",
+    "type":             "WP_SABER",
+    "variation":        16,
+    "classname":        "vibro_mosquito",
+    "description":      "@JKG_ITEMS_weapon_saber",
+
+    "visual": {
+        "hudicon":          "models/weapons/vibroblades/blade_mosquito/icon_default.tga",
+        "hudnaicon":        "models/weapons/vibroblades/blade_mosquito/icon_default.tga",
+		"worldmodel":	    "models/weapons/vibroblades/Blade_Mosquito/model.glm",
+		"barrelCount":		0,
+
+        "firemode0": {
+            "type":         "blaster"
+        },
+
+        "firemode1": {
+            "type":         "blaster"
+        }
+    },
+
+    "stats": {
+        "slot":         0,
+        "flags":        [ "roll" ],
+        "speed":        1.1
+    },
+
+    "saberdata": {
+	"hilt":		"vibrosword",
+	"crystal":	""
+    },
+
+    "firemode0": {
+        "meansofdeath": "MOD_SABER"
+    },
+
+    "firemode1": {
+        "meansofdeath": "MOD_SABER"
+    },
+
+    "playeranims": {
+        "idle":         { "torso": "BOTH_IDLE1", "legs": "BOTH_IDLE1" },
+        "reload":       { "torso": "TORSO_DROPWEAP1" },
+        "ready":        { "torso": "BOTH_STAND1" },
+        "firing":       { "torso": "BOTH_STAND1" }
+    },
+
+    "weaponanims": {
+        "ready":        "READY",   
+        "reload":       "RELOAD",
+        "firing":       "FIRING"
+    }
+}
diff --git a/JKGalaxies/ext_data/weapons/sniper_0_DLT-19_HeavyBlaster.wpn b/JKGalaxies/ext_data/weapons/sniper_0_DLT-19_HeavyBlaster.wpn
@@ -65,13 +65,13 @@
     },
 
     "firemode0": {
-        "damage":       64,
+        "damage":       48, //64
         "ammocost":     10,
         "firedelay":    800,
         "firingtype":   "semi",
         "range":        8000.0,
         "recoil":       1.4,
-		"splashrange":  25.0,
+		"splashrange":  40.0,
         "spread":       0.0,
         "projectilespeed": 7000.0,
         "projectileclass": "blaster_proj",
@@ -94,7 +94,7 @@
     },
 
     "firemode1": {
-        "damage":       19,
+        "damage":       22,
         "ammocost":     1,
         "firedelay":    200,
         "firingtype":   "semi",

diff --git a/JKGalaxies/ext_data/weapons/sniper_5_DLT-19_HeavyBlaster_Scope.wpn b/JKGalaxies/ext_data/weapons/sniper_5_DLT-19_HeavyBlaster_Scope.wpn
@@ -70,7 +70,7 @@
     },
 
     "firemode0": {
-        "damage":       72,
+        "damage":       48, //72
         "ammocost":     10,
         "firedelay":    900,
         "firingtype":   "semi",

diff --git a/JKGalaxies/shaders/Weapons/JKG_Weapons.shader b/JKGalaxies/shaders/Weapons/JKG_Weapons.shader
@@ -2911,6 +2911,23 @@ models/weapons/grenade_thermal/thermal_det_bronze
     }
 }
 
+// Jawa Ion Gun (Jonthe, Pande)
+
+models/weapons/ion_gun/ion_gun_0
+{
+	q3map_nolightmap
+    {
+        map models/weapons/ion_gun/ion_gun
+        rgbGen lightingDiffuse
+    }
+    {
+        map models/weapons/ion_gun/ion_gun_spec
+        blendFunc GL_SRC_ALPHA GL_ONE
+        detail
+        alphaGen lightingSpecular
+	}
+}
+
 // KYD-21 Blaster Pistol (Silverfang, BlasTech)
 
 models/weapons/kyd-21_pistol/pistol_0

diff --git a/JKGalaxies/strings/English/jkg_items.str b/JKGalaxies/strings/English/jkg_items.str
@@ -152,6 +152,9 @@ LANG_ENGLISH	"Arakyd Mk 1 Anti-Personel \nLaser Trip Mine"
 REFERENCE	MINE_LASERTRIP_MK2
 LANG_ENGLISH	"Arakyd Mk 2 Anti-Personel \nLaser Trip Mine"
 
+REFERENCE	MINE_SEQUENCER
+LANG_ENGLISH	"Proximity-sensor rigged \nSequencer Charge"
+
 
 REFERENCE	PISTOL_SUPPRESSORPISTOL
 LANG_ENGLISH	"Trandoshan Suppressor Pistol"