From: LegendaryGuard Date: Sun, 21 May 2023 10:14:28 +0000 (+0200) Subject: Merge branch 'pending-release' into LegendaryGuard/rename_weapon_filenames X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68893cee24dc4dfbf66e3c4f501a7091be6480d1;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'pending-release' into LegendaryGuard/rename_weapon_filenames --- 68893cee24dc4dfbf66e3c4f501a7091be6480d1 diff --cc models/weapons/h_ok_nex.iqm index abc34f406,000000000..d4dce98ee mode 100644,000000..100644 Binary files differ diff --cc models/weapons/h_ok_rpc.iqm index 2870b04d8,000000000..89acc4762 mode 100644,000000..100644 Binary files differ diff --cc models/weapons/h_ok_rpc.iqm.framegroups index fae30c94d,000000000..1a93d58d8 mode 100644,000000..100644 --- a/models/weapons/h_ok_rpc.iqm.framegroups +++ b/models/weapons/h_ok_rpc.iqm.framegroups @@@ -1,10 -1,0 +1,9 @@@ +/* - Generated framegroups file for h_uzi ++Generated framegroups file for h_ok_rl +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + - 1 61 30 0 // h_uzi mgafire - 62 61 30 0 // h_uzi mgafire - 123 101 3 1 // h_uzi mgaidle - 224 61 30 0 // h_uzi mgafire - 285 61 30 0 // h_uzi mgafire ++1 61 30 0 // h_ok_rl fire ++62 61 30 0 // h_ok_rl fire ++123 101 3 1 // h_ok_rl idle ++224 61 30 0 // h_ok_rl fire diff --cc models/weapons/v_devastator.md3 index 534e616ac,000000000..a24361058 mode 100644,000000..100644 Binary files differ diff --cc models/weapons/v_vortex.md3 index 4cafdd10f,000000000..bb67413fe mode 100644,000000..100644 Binary files differ diff --cc qcsrc/common/mutators/mutator/overkill/oknex.qc index ded9d70a3,a30a2bf52..d1569b9a4 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@@ -324,10 -326,10 +326,10 @@@ METHOD(OverkillNex, wr_zoom, bool(entit METHOD(OverkillNex, wr_impacteffect, void(entity thiswep, entity actor)) { entity this = actor; - vector org2 = w_org + w_backoff * 6; + vector org2 = w_org + w_backoff * 2; pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); if(!w_issilent) - sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM); + sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM); } METHOD(OverkillNex, wr_init, void(entity thiswep)) diff --cc qcsrc/common/weapons/weapon/blaster.qh index 9f07959d6,944e86405..557b96133 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@@ -13,11 -13,12 +13,12 @@@ CLASS(Blaster, Weapon /* flash mdl */ ATTRIB(Blaster, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Blaster, m_muzzleeffect, entity, EFFECT_BLASTER_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairlaser"); +/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairblaster"); /* crosshair */ ATTRIB(Blaster, w_crosshair_size, float, 0.5); -/* wepimg */ ATTRIB(Blaster, model2, string, "weaponlaser"); +/* wepimg */ ATTRIB(Blaster, model2, string, "weaponblaster"); /* refname */ ATTRIB(Blaster, netname, string, "blaster"); /* wepname */ ATTRIB(Blaster, m_name, string, _("Blaster")); + /* legacy */ ATTRIB(Blaster, m_deprecated_netname, string, "laser"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --cc qcsrc/common/weapons/weapon/devastator.qh index bb3418aa0,7a10bf62a..e9081e6b7 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@@ -13,11 -13,12 +13,12 @@@ CLASS(Devastator, Weapon /* flash mdl */ ATTRIB(Devastator, m_muzzlemodel, Model, MDL_DEVASTATOR_MUZZLEFLASH); /* flash eff */ ATTRIB(Devastator, m_muzzleeffect, entity, EFFECT_ROCKET_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairrocketlauncher"); +/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairdevastator"); /* crosshair */ ATTRIB(Devastator, w_crosshair_size, float, 0.7); -/* wepimg */ ATTRIB(Devastator, model2, string, "weaponrocketlauncher"); +/* wepimg */ ATTRIB(Devastator, model2, string, "weapondevastator"); /* refname */ ATTRIB(Devastator, netname, string, "devastator"); /* wepname */ ATTRIB(Devastator, m_name, string, _("Devastator")); + /* legacy */ ATTRIB(Devastator, m_deprecated_netname, string, "rocketlauncher"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --cc qcsrc/common/weapons/weapon/machinegun.qh index 0139e209d,a4097f947..2aa738fe6 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@@ -13,11 -13,12 +13,12 @@@ CLASS(MachineGun, Weapon /* flash mdl */ ATTRIB(MachineGun, m_muzzlemodel, Model, MDL_MACHINEGUN_MUZZLEFLASH); /* flash eff */ ATTRIB(MachineGun, m_muzzleeffect, entity, EFFECT_MACHINEGUN_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairuzi"); +/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairmachinegun"); /* crosshair */ ATTRIB(MachineGun, w_crosshair_size, float, 0.6); -/* wepimg */ ATTRIB(MachineGun, model2, string, "weaponuzi"); +/* wepimg */ ATTRIB(MachineGun, model2, string, "weaponmachinegun"); /* refname */ ATTRIB(MachineGun, netname, string, "machinegun"); /* wepname */ ATTRIB(MachineGun, m_name, string, _("MachineGun")); + /* legacy */ ATTRIB(MachineGun, m_deprecated_netname, string, "uzi"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --cc qcsrc/common/weapons/weapon/mortar.qh index d3c397ea8,6d44e7564..ab27ab1e6 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@@ -13,11 -13,12 +13,12 @@@ CLASS(Mortar, Weapon /* flash mdl */ ATTRIB(Mortar, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Mortar, m_muzzleeffect, entity, EFFECT_GRENADE_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairgrenadelauncher"); +/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairmortar"); /* crosshair */ ATTRIB(Mortar, w_crosshair_size, float, 0.7); -/* wepimg */ ATTRIB(Mortar, model2, string, "weapongrenadelauncher"); +/* wepimg */ ATTRIB(Mortar, model2, string, "weaponmortar"); /* refname */ ATTRIB(Mortar, netname, string, "mortar"); /* wepname */ ATTRIB(Mortar, m_name, string, _("Mortar")); + /* legacy */ ATTRIB(Mortar, m_deprecated_netname, string, "grenadelauncher"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --cc qcsrc/common/weapons/weapon/vaporizer.qh index bc9002068,87249f736..7760be3b2 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@@ -13,12 -13,13 +13,13 @@@ CLASS(Vaporizer, Weapon /* flash mdl */ ATTRIB(Vaporizer, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Vaporizer, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairminstanex"); +/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairvaporizer"); /* crosshair */ ATTRIB(Vaporizer, w_crosshair_size, float, 0.6); -/* reticle */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(Vaporizer, model2, string, "weaponminstanex"); +/* reticle */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_vortex"); +/* wepimg */ ATTRIB(Vaporizer, model2, string, "weaponvaporizer"); /* refname */ ATTRIB(Vaporizer, netname, string, "vaporizer"); /* wepname */ ATTRIB(Vaporizer, m_name, string, _("Vaporizer")); + /* legacy */ ATTRIB(Vaporizer, m_deprecated_netname, string, "minstanex"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \ diff --cc qcsrc/common/weapons/weapon/vortex.qc index 2bc84b2b8,4d4e43ec6..9e82c1060 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@@ -321,10 -321,10 +321,10 @@@ METHOD(Vortex, wr_zoom, bool(entity thi METHOD(Vortex, wr_impacteffect, void(entity thiswep, entity actor)) { entity this = actor; - vector org2 = w_org + w_backoff * 6; + vector org2 = w_org + w_backoff * 2; pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); if(!w_issilent) - sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM); + sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM); } METHOD(Vortex, wr_init, void(entity thiswep)) { diff --cc qcsrc/common/weapons/weapon/vortex.qh index f2b2953fb,2d80a7a61..571a982a4 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@@ -13,12 -13,13 +13,13 @@@ CLASS(Vortex, Weapon /* flash mdl */ ATTRIB(Vortex, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Vortex, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairnex"); +/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairvortex"); /* crosshair */ ATTRIB(Vortex, w_crosshair_size, float, 0.65); -/* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(Vortex, model2, string, "weaponnex"); +/* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_vortex"); +/* wepimg */ ATTRIB(Vortex, model2, string, "weaponvortex"); /* refname */ ATTRIB(Vortex, netname, string, "vortex"); /* wepname */ ATTRIB(Vortex, m_name, string, _("Vortex")); + /* legacy */ ATTRIB(Vortex, m_deprecated_netname, string, "nex"); #define X(BEGIN, P, END, class, prefix) \ BEGIN(class) \