Merge branch 'newguns'

Conflicts:
	src/cgame/cg_local.h
	src/cgame/cg_main.c

60 files changed, 662 insertions, 48 deletions

diff --git a/assets/gfx/rocketx/0002.jpg b/assets/gfx/rocketx/0002.jpg
new file mode 100644
index 0000000..776768b
--- /dev/null
+++ b/assets/gfx/rocketx/0002.jpg
diff --git a/assets/gfx/rocketx/0003.jpg b/assets/gfx/rocketx/0003.jpg
new file mode 100644
index 0000000..91313e7
--- /dev/null
+++ b/assets/gfx/rocketx/0003.jpg
diff --git a/assets/gfx/rocketx/0004.jpg b/assets/gfx/rocketx/0004.jpg
new file mode 100644
index 0000000..a1848ed
--- /dev/null
+++ b/assets/gfx/rocketx/0004.jpg
diff --git a/assets/gfx/rocketx/0005.jpg b/assets/gfx/rocketx/0005.jpg
new file mode 100644
index 0000000..da5e255
--- /dev/null
+++ b/assets/gfx/rocketx/0005.jpg
diff --git a/assets/gfx/rocketx/0006.jpg b/assets/gfx/rocketx/0006.jpg
new file mode 100644
index 0000000..6d026ba
--- /dev/null
+++ b/assets/gfx/rocketx/0006.jpg
diff --git a/assets/gfx/rocketx/0007.jpg b/assets/gfx/rocketx/0007.jpg
new file mode 100644
index 0000000..c18ce0d
--- /dev/null
+++ b/assets/gfx/rocketx/0007.jpg
diff --git a/assets/gfx/rocketx/0008.jpg b/assets/gfx/rocketx/0008.jpg
new file mode 100644
index 0000000..06a2d74
--- /dev/null
+++ b/assets/gfx/rocketx/0008.jpg
diff --git a/assets/gfx/rocketx/0009.jpg b/assets/gfx/rocketx/0009.jpg
new file mode 100644
index 0000000..6e7bc69
--- /dev/null
+++ b/assets/gfx/rocketx/0009.jpg
diff --git a/assets/gfx/rocketx/0010.jpg b/assets/gfx/rocketx/0010.jpg
new file mode 100644
index 0000000..400d603
--- /dev/null
+++ b/assets/gfx/rocketx/0010.jpg
diff --git a/assets/gfx/rocketx/0011.jpg b/assets/gfx/rocketx/0011.jpg
new file mode 100644
index 0000000..17e0220
--- /dev/null
+++ b/assets/gfx/rocketx/0011.jpg
diff --git a/assets/gfx/rocketx/0012.jpg b/assets/gfx/rocketx/0012.jpg
new file mode 100644
index 0000000..6765bf9
--- /dev/null
+++ b/assets/gfx/rocketx/0012.jpg
diff --git a/assets/gfx/rocketx/0013.jpg b/assets/gfx/rocketx/0013.jpg
new file mode 100644
index 0000000..a543aba
--- /dev/null
+++ b/assets/gfx/rocketx/0013.jpg
diff --git a/assets/gfx/rocketx/0014.jpg b/assets/gfx/rocketx/0014.jpg
new file mode 100644
index 0000000..5ed10d8
--- /dev/null
+++ b/assets/gfx/rocketx/0014.jpg
diff --git a/assets/gfx/rocketx/0015.jpg b/assets/gfx/rocketx/0015.jpg
new file mode 100644
index 0000000..5fe6015
--- /dev/null
+++ b/assets/gfx/rocketx/0015.jpg
diff --git a/assets/gfx/rocketx/0016.jpg b/assets/gfx/rocketx/0016.jpg
new file mode 100644
index 0000000..24f0d16
--- /dev/null
+++ b/assets/gfx/rocketx/0016.jpg
diff --git a/assets/gfx/rocketx/0017.jpg b/assets/gfx/rocketx/0017.jpg
new file mode 100644
index 0000000..3b037f5
--- /dev/null
+++ b/assets/gfx/rocketx/0017.jpg
diff --git a/assets/gfx/rocketx/0018.jpg b/assets/gfx/rocketx/0018.jpg
new file mode 100644
index 0000000..b479532
--- /dev/null
+++ b/assets/gfx/rocketx/0018.jpg
diff --git a/assets/gfx/rocketx/0019.jpg b/assets/gfx/rocketx/0019.jpg
new file mode 100644
index 0000000..288bd52
--- /dev/null
+++ b/assets/gfx/rocketx/0019.jpg
diff --git a/assets/gfx/rocketx/0020.jpg b/assets/gfx/rocketx/0020.jpg
new file mode 100644
index 0000000..97f2d10
--- /dev/null
+++ b/assets/gfx/rocketx/0020.jpg
diff --git a/assets/gfx/rocketx/0021.jpg b/assets/gfx/rocketx/0021.jpg
new file mode 100644
index 0000000..3443b96
--- /dev/null
+++ b/assets/gfx/rocketx/0021.jpg
diff --git a/assets/gfx/rocketx/0022.jpg b/assets/gfx/rocketx/0022.jpg
new file mode 100644
index 0000000..b14747d
--- /dev/null
+++ b/assets/gfx/rocketx/0022.jpg
diff --git a/assets/gfx/rocketx/0023.jpg b/assets/gfx/rocketx/0023.jpg
new file mode 100644
index 0000000..da23eb0
--- /dev/null
+++ b/assets/gfx/rocketx/0023.jpg
diff --git a/assets/gfx/rocketx/0024.jpg b/assets/gfx/rocketx/0024.jpg
new file mode 100644
index 0000000..bfe4476
--- /dev/null
+++ b/assets/gfx/rocketx/0024.jpg
diff --git a/assets/gfx/rocketx/0025.jpg b/assets/gfx/rocketx/0025.jpg
new file mode 100644
index 0000000..e6a7923
--- /dev/null
+++ b/assets/gfx/rocketx/0025.jpg
diff --git a/assets/gfx/rocketx/0026.jpg b/assets/gfx/rocketx/0026.jpg
new file mode 100644
index 0000000..99ef757
--- /dev/null
+++ b/assets/gfx/rocketx/0026.jpg
diff --git a/assets/gfx/rocketx/0027.jpg b/assets/gfx/rocketx/0027.jpg
new file mode 100644
index 0000000..220234b
--- /dev/null
+++ b/assets/gfx/rocketx/0027.jpg
diff --git a/assets/gfx/rocketx/0028.jpg b/assets/gfx/rocketx/0028.jpg
new file mode 100644
index 0000000..5b2b4e6
--- /dev/null
+++ b/assets/gfx/rocketx/0028.jpg
diff --git a/assets/gfx/rocketx/0029.jpg b/assets/gfx/rocketx/0029.jpg
new file mode 100644
index 0000000..585257e
--- /dev/null
+++ b/assets/gfx/rocketx/0029.jpg
diff --git a/assets/gfx/rocketx/0030.jpg b/assets/gfx/rocketx/0030.jpg
new file mode 100644
index 0000000..09721ca
--- /dev/null
+++ b/assets/gfx/rocketx/0030.jpg
diff --git a/assets/icons/iconw_lightning.tga b/assets/icons/iconw_lightning.tga
new file mode 100644
index 0000000..280e83d
--- /dev/null
+++ b/assets/icons/iconw_lightning.tga
diff --git a/assets/icons/iconw_smoke.tga b/assets/icons/iconw_smoke.tga
deleted file mode 100644
index 0dd72b1..0000000
--- a/assets/icons/iconw_smoke.tga
+++ /dev/null
diff --git a/assets/models/weapons/grenade/weapon.cfg b/assets/models/weapons/grenade/weapon.cfg
index a0d2f1b..9d0811c 100644
--- a/assets/models/weapons/grenade/weapon.cfg
+++ b/assets/models/weapons/grenade/weapon.cfg
@@ -9,4 +9,5 @@ primary
   impactParticleSystem  models/weapons/grenade/impactPS2
 
   impactSound           0 models/weapons/grenade/impact0.wav
+  impactQuake           120
 }
diff --git a/assets/models/weapons/lcannon/weapon.cfg b/assets/models/weapons/lcannon/weapon.cfg
index e6f1ab4..5719fdc 100644
--- a/assets/models/weapons/lcannon/weapon.cfg
+++ b/assets/models/weapons/lcannon/weapon.cfg
@@ -16,6 +16,7 @@ primary
   impactMark            32 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/lcannon/impact0.wav
   impactParticleSystem  models/weapons/lcannon/impactPS2
+  impactQuake           1
 }
 
 secondary
@@ -30,4 +31,5 @@ secondary
   impactMark            8 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/lcannon/impact0.wav
   impactParticleSystem  models/weapons/lcannon/secondaryImpactPS2
+  impactQuake           5
 }
diff --git a/assets/models/weapons/lightning/CREDITS b/assets/models/weapons/lightning/CREDITS
new file mode 100644
index 0000000..9ce05bb
--- /dev/null
+++ b/assets/models/weapons/lightning/CREDITS
@@ -0,0 +1,15 @@
+firing.wav:
+	http://freesound.org/people/HerbertBoland/sounds/114595/
+
+flash0.wav:
+	http://freesound.org/people/roper1911/sounds/152322/
+
+impact0.wav:
+impact1.wav:
+impact2.wav:
+	http://freesound.org/people/FreqMan/sounds/24726/
+
+lightning.md3:
+lightning.jpg:
+	see "sidrial license.txt"
+
diff --git a/assets/models/weapons/lightning/bolt.jpg b/assets/models/weapons/lightning/bolt.jpg
new file mode 100644
index 0000000..07d7ef1
--- /dev/null
+++ b/assets/models/weapons/lightning/bolt.jpg
diff --git a/assets/models/weapons/lightning/firing.wav b/assets/models/weapons/lightning/firing.wav
new file mode 100644
index 0000000..3ba7722
--- /dev/null
+++ b/assets/models/weapons/lightning/firing.wav
diff --git a/assets/models/weapons/lightning/flash.jpg b/assets/models/weapons/lightning/flash.jpg
new file mode 100644
index 0000000..070d8fa
--- /dev/null
+++ b/assets/models/weapons/lightning/flash.jpg
diff --git a/assets/models/weapons/lightning/flash0.wav b/assets/models/weapons/lightning/flash0.wav
new file mode 100644
index 0000000..5895c02
--- /dev/null
+++ b/assets/models/weapons/lightning/flash0.wav
diff --git a/assets/models/weapons/lightning/impact0.wav b/assets/models/weapons/lightning/impact0.wav
new file mode 100644
index 0000000..8f70050
--- /dev/null
+++ b/assets/models/weapons/lightning/impact0.wav
diff --git a/assets/models/weapons/lightning/impact1.wav b/assets/models/weapons/lightning/impact1.wav
new file mode 100644
index 0000000..530d28b
--- /dev/null
+++ b/assets/models/weapons/lightning/impact1.wav
diff --git a/assets/models/weapons/lightning/impact2.wav b/assets/models/weapons/lightning/impact2.wav
new file mode 100644
index 0000000..ffff0d2
--- /dev/null
+++ b/assets/models/weapons/lightning/impact2.wav
diff --git a/assets/models/weapons/lightning/lightning.jpg b/assets/models/weapons/lightning/lightning.jpg
new file mode 100644
index 0000000..f7955d6
--- /dev/null
+++ b/assets/models/weapons/lightning/lightning.jpg
diff --git a/assets/models/weapons/lightning/lightning.md3 b/assets/models/weapons/lightning/lightning.md3
new file mode 100644
index 0000000..c96197b
--- /dev/null
+++ b/assets/models/weapons/lightning/lightning.md3
diff --git a/assets/models/weapons/lightning/lightning_flash.md3 b/assets/models/weapons/lightning/lightning_flash.md3
new file mode 100644
index 0000000..2f6ceb0
--- /dev/null
+++ b/assets/models/weapons/lightning/lightning_flash.md3
diff --git a/assets/models/weapons/lightning/lightning_hand.md3 b/assets/models/weapons/lightning/lightning_hand.md3
new file mode 100644
index 0000000..edda546
--- /dev/null
+++ b/assets/models/weapons/lightning/lightning_hand.md3
diff --git a/assets/models/weapons/lightning/sidrial license.txt b/assets/models/weapons/lightning/sidrial license.txt
new file mode 100644
index 0000000..14ac66d
--- /dev/null
+++ b/assets/models/weapons/lightning/sidrial license.txt
@@ -0,0 +1,245 @@
+The weapons (blaster, gat, grenner) their effects and

+icons as well as the powerup-models are taken from

+Sidrial Quake3-MOD by Fountainhead Entertainment

+----------------------------------------------------------

+

+

+LIMITED USE SOFTWARE LICENSE AGREEMENT

+

+This Limited Use Software License Agreement (this

+"Agreement") is a legal agreement between you, the 

+end-user, and Fountainhead Entertainment, Inc. 

+("Fountainhead").  BY CONTINUING THE INSTALLATION 

+OF THE TOTAL CONVERSION TITLED SIDRIAL (THE 

+"SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, 

+OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR 

+COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER 

+STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS 

+OF THIS AGREEMENT.

+

+1.	Grant of License.  Subject to the terms 

+and provisions of this Agreement and so long as 

+you fully comply at all times with this Agreement, 

+Fountainhead grants to you the non-exclusive and 

+limited right to use the Software only in 

+executable or object code form.  The term 

+"Software" includes all elements of the Software, 

+including, without limitation, data files and 

+screen displays.  You are not receiving any 

+ownership or proprietary right, title or interest 

+in or to the Software or the copyrights, 

+trademarks, or other rights related thereto.  For 

+purposes of the first sentence of this section, 

+"use" means loading the Software into RAM and/or 

+onto computer hard drive, as well as installation 

+of the Software on a hard disk or other storage 

+device, and means the uses permitted in sections 

+2. and 4. herein below.  You agree that the 

+Software will not be downloaded, shipped, 

+transferred, exported or re-exported into any 

+country in violation of the U.S. Export 

+Administration Act (or any other law governing 

+such matters) by you or anyone at your direction 

+and that you will not utilize and will not 

+authorize anyone to utilize, in any other manner, 

+the Software in violation of any applicable law.  

+The Software shall not be downloaded or otherwise 

+exported or re-exported into (or to a national or 

+resident of) any country to which the U.S. has 

+embargoed goods or to anyone or into any country 

+who/which are prohibited, by applicable law, from 

+receiving such property.  In exercising your 

+limited rights hereunder, you shall comply, at all 

+times, with all applicable laws, regulations, 

+ordinances and statutes.  Fountainhead reserves 

+all rights not granted in this Agreement, 

+including, without limitation, all rights to 

+Fountainhead's trademarks.  All other trademarks 

+and trade names are properties of their respective 

+owners.

+

+2.	Permitted New Creations.  Subject to the 

+terms and provisions of this Agreement and so long 

+as you fully comply at all times with this 

+Agreement, Fountainhead grants to you the 

+non-exclusive and limited right to create for the 

+Software (except any Software code) your own 

+modifications (the "New Creations") which shall 

+operate only with the Software (but not any demo, 

+test or other version of the Software).  You may 

+include within the New Creations certain textures 

+and other images (the "Software Images") from the 

+Software.  You shall not create any New Creations 

+which infringe against any third party right or 

+which are libelous, defamatory, obscene, false, 

+misleading, or otherwise illegal or unlawful. You 

+agree that the New Creations will not be 

+downloaded, shipped, transferred, exported or 

+re-exported into any country in violation of the 

+U.S. Export Administration Act (or any other law 

+governing such matters) by you or anyone at your 

+direction and that you will not utilize and will 

+not authorize anyone to utilize, in any other 

+manner, the New Creations in violation of any 

+applicable law.  The New Creations shall not be 

+downloaded or otherwise exported or re-exported 

+into (or to a national or resident of) any country 

+to which the U.S. has embargoed goods or to anyone 

+or into any country who/which are prohibited, by 

+applicable law, from receiving such property.  You 

+shall not rent, sell, lease, lend, offer on a 

+pay-per-play basis or otherwise commercially 

+exploit or commercially distribute the New 

+Creations.  You are only permitted to distribute, 

+without any cost or charge, the New Creations to 

+other end-users so long as such distribution is

+not infringing against any third party right and 

+is not otherwise illegal or unlawful.  As noted 

+below, in the event you commit any breach of this 

+Agreement, your license and this Agreement shall 

+automatically terminate, without notice.

+

+3.	Intellectual Property Rights.  Certain 

+

+printed materials (the "Printed Materials") may 

+accompany the Software. The Software, the Printed 

+Materials and all copyrights, trademarks and all 

+other conceivable intellectual property rights 

+related to the Software and the Printed Materials 

+are owned by Fountainhead and are protected by 

+United States copyright laws, international treaty 

+provisions and all applicable law, such as the 

+Lanham Act.  You must treat the Software and the 

+Printed Materials like any other copyrighted 

+material, as required by 17 U.S.C., §101 et seq. 

+and other applicable law.  You agree to use your 

+best efforts to see that any user of the Software 

+licensed hereunder, the Printed Materials or the 

+New Creations complies with this Agreement.  You 

+agree that you are receiving a copy of the 

+Software and the Printed Materials by limited 

+license only and not by sale and that the "first 

+sale" doctrine of 17 U.S.C. §109 does not apply to 

+your receipt or use of the Software or the Printed 

+Materials. This section shall survive the 

+cancellation or termination of this Agreement.

+

+4.	NO FOUNTAINHEAD WARRANTIES.  FOUNTAINHEAD 

+DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR 

+IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED 

+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 

+PARTICULAR PURPOSE AND ANY WARRANTY OF 

+NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, 

+THE PRINTED MATERIALS, THE SOFTWARE IMAGES AND 

+OTHERWISE.  THE SOFTWARE IS PROVIDED "AS IS" AND 

+WITHOUT WARRANTY.  FOUNTAINHEAD DOES NOT WARRANT 

+THAT THE SOFTWARE OR THE OPERATION OF THE SOFTWARE 

+WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE 

+SOFTWARE WILL MEET YOUR SPECIFIC OR SPECIAL 

+REQUIREMENTS.  ADDITIONAL STATEMENTS, WHETHER ORAL 

+OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY 

+FOUNTAINHEAD AND SHOULD NOT BE RELIED UPON.  This 

+section shall survive the cancellation or 

+termination of this Agreement. 

+

+5.	Governing Law, Venue, Indemnity and 

+Liability Limitation.  This Agreement shall be 

+construed in accordance with and governed by the 

+applicable laws of the State of Texas and 

+applicable United States federal law.  Except as 

+set forth below, exclusive venue for all 

+litigation regarding this Agreement shall be in 

+Dallas County, Texas and you agree to submit to 

+the jurisdiction of the federal and state courts 

+in Dallas County, Texas for any such litigation. 

+You hereby agree to indemnify, defend and hold 

+harmless Fountainhead and Fountainhead's 

+respective officers, employees, directors, agents, 

+licensees (excluding you), sub-licensees 

+(excluding you), successors and assigns from and 

+against all losses, lawsuits, damages, causes of 

+action and claims relating to and/or arising from 

+the New Creations or the distribution or other use 

+of the New Creations or relating to and/or arising 

+from your breach of this Agreement.  You agree 

+that your unauthorized use of the Software Images, 

+the Printed Materials, or the Software, or any 

+part thereof, may immediately and irreparably 

+damage Fountainhead such that Fountainhead could 

+not be adequately compensated solely by a monetary 

+award, and in such event, Fountainhead's option, 

+that Fountainhead shall be entitled to an 

+injunctive order, in addition to all other 

+available remedies including a monetary award, to 

+prohibit such unauthorized use without the 

+necessity of Fountainhead posting bond or other 

+security.  IN ANY CASE, FOUNTAINHEAD AND 

+FOUNTAINHEAD'S RESPECTIVE OFFICERS, EMPLOYEES, 

+DIRECTORS, SHAREHOLDERS, REPRESENTATIVES, AGENTS, 

+LICENSEES (EXCLUDING YOU), SUBLICENSEES (EXCLUSING 

+YOU), SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE 

+FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, 

+SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT OR 

+PUNITIVE DAMAGES OR ANY OTHER DAMAGES ARISING FROM 

+ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH 

+OF CONTRACT, NEGLIGENCE, STRICT PRODUCT LIABILITY, 

+OR OTHER LEGAL THEORY EVEN IF FOUNTAINHEAD OR 

+THEIR RESPECTIVE AGENT(S) HAVE BEEN ADVISED OF THE 

+POSSIBILITY OF ANY SUCH DAMAGES, OR EVEN IF SUCH 

+DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM 

+BY ANY OTHER PARTY.  This section shall survive 

+the cancellation or termination of this Agreement.

+

+6.	General Provisions.  Neither this 

+Agreement nor any part or portion hereof shall be 

+assigned or sublicensed by you.  Fountainhead may 

+assign its respective rights under this Agreement 

+in the assigning party's sole discretion.  Should 

+any provision of this Agreement be held to be 

+void, invalid, unenforceable or illegal by a court 

+of competent jurisdiction, the validity and 

+enforceability of the other provisions shall not 

+be affected thereby.  If any provision is 

+determined to be unenforceable by a court of 

+competent jurisdiction, you agree to a 

+modification of such provision to provide for 

+enforcement of the provision's intent, to the 

+extent permitted by applicable law.  Failure of 

+Fountainhead to enforce any provision of this 

+Agreement shall not constitute or be construed as 

+a waiver of such provision or of the right to 

+enforce such provision.  IMMEDIATELY UPON YOUR 

+FAILURE TO COMPLY WITH OR BREACH OF ANY TERM OR 

+PROVISION OF THIS AGREEMENT, YOUR LICENSE GRANTED 

+HEREIN AND THIS AGREEMENT SHALL AUTOMATICALLY 

+TERMINATE, WITHOUT NOTICE, AND FOUNTAINHEAD MAY 

+PURSUE ALL RELIEF AND REMEDIES AGAINST YOU, WHICH 

+ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS 

+AGREEMENT.  Immediately upon termination of this 

+Agreement, any and all rights you are granted 

+hereunder shall terminate, you shall have no right 

+to use the Software, the Printed Materials or the 

+New Creations, in any manner, and you shall 

+immediately destroy all copies of the Software, 

+the Printed Materials and the New Creations in 

+your possession, custody or control, and all 

+rights granted hereunder shall revert, without 

+notice, to and be vested in Fountainhead.

+

+YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, 

+YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT 

+BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY 

+LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR

+COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE 

+OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND 

+CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE 

+THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS, IF 

+ANY, BETWEEN FOUNTAINHEAD AND YOU, THIS AGREEMENT 

+IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE 

+RIGHTS AND LIABILITIES OF THE PARTIES HERETO, 

+RELATING TO THE SUBJECT MATTER HEREOF.  THIS 

+AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, 

+PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER 

+COMMUNICATIONS, IF ANY, BETWEEN FOUNTAINHEAD AND 

+YOU RELATING TO THE SUBJECT MATTER OF THIS 

+AGREEMENT.

diff --git a/assets/models/weapons/lightning/weapon.cfg b/assets/models/weapons/lightning/weapon.cfg
new file mode 100644
index 0000000..9b33568
--- /dev/null
+++ b/assets/models/weapons/lightning/weapon.cfg
@@ -0,0 +1,20 @@
+weaponModel       models/weapons/lightning/lightning.md3
+icon              icons/iconw_lightning
+crosshair         24 gfx/2d/crosshair-lgun_s
+
+primary
+{
+	continuousFlash
+
+	flashDlightColor      0.8 0.9 1.0
+
+	flashSound            0 models/weapons/lightning/flash0.wav
+	firingSound           models/weapons/lightning/firing.wav
+	flashQuake            0.6
+
+	impactMark            6 gfx/marks/bullet_mrk
+	impactSound           0 models/weapons/lightning/impact0.wav
+	impactSound           1 models/weapons/lightning/impact1.wav
+	impactSound           2 models/weapons/lightning/impact2.wav
+}
+
diff --git a/assets/models/weapons/rocketl/flash0.wav b/assets/models/weapons/rocketl/flash0.wav
index 009febe..89e78b7 100644
--- a/assets/models/weapons/rocketl/flash0.wav
+++ b/assets/models/weapons/rocketl/flash0.wav
diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3
index 4119209..d515cf4 100644
--- a/assets/models/weapons/rocketl/rocketl.md3
+++ b/assets/models/weapons/rocketl/rocketl.md3
diff --git a/assets/models/weapons/rocketl/rocketl_flash.md3 b/assets/models/weapons/rocketl/rocketl_flash.md3
new file mode 100644
index 0000000..c1acf35
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl_flash.md3
diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg
index e5dafc6..5c6b70b 100644
--- a/assets/models/weapons/rocketl/weapon.cfg
+++ b/assets/models/weapons/rocketl/weapon.cfg
@@ -11,9 +11,11 @@ primary
 
   flashDlightColor      1.0 0.7 0.0
   flashSound            0 models/weapons/rocketl/flash0.wav
+  flashQuake            1
 
   impactMark            32 gfx/marks/bullet_mrk
   impactSound           0 models/weapons/rocketl/impact0.wav
   impactParticleSystem  models/weapons/rocketl/impactPS
+  impactQuake           50
 }
 
diff --git a/assets/models/weapons/smoke/smoke.jpg b/assets/models/weapons/smoke/smoke.jpg
deleted file mode 100644
index a001de3..0000000
--- a/assets/models/weapons/smoke/smoke.jpg
+++ /dev/null
diff --git a/assets/models/weapons/smoke/smoke.md3 b/assets/models/weapons/smoke/smoke.md3
deleted file mode 100644
index 53fed50..0000000
--- a/assets/models/weapons/smoke/smoke.md3
+++ /dev/null
diff --git a/assets/models/weapons/smoke/smoke.wav b/assets/models/weapons/smoke/smoke.wav
deleted file mode 100644
index 6c2d7ea..0000000
--- a/assets/models/weapons/smoke/smoke.wav
+++ /dev/null
diff --git a/assets/models/weapons/smoke/smokegfx.tga b/assets/models/weapons/smoke/smokegfx.tga
deleted file mode 100644
index f028d75..0000000
--- a/assets/models/weapons/smoke/smokegfx.tga
+++ /dev/null
diff --git a/assets/models/weapons/smoke/weapon.cfg b/assets/models/weapons/smoke/weapon.cfg
deleted file mode 100644
index 93fd03a..0000000
--- a/assets/models/weapons/smoke/weapon.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-icon              icons/iconw_smoke
-idleSound         models/weapons/smoke/smoke.wav
-primary
-{
-
-  missileParticleSystem models/weapons/smoke/impactPS
-
-  missileModel          models/weapons/smoke/smoke.md3
-  missileAnimates       0 20 20 0
-
-}
diff --git a/assets/scripts/hw_lightning.particle b/assets/scripts/hw_lightning.particle
new file mode 100644
index 0000000..f9370d5
--- /dev/null
+++ b/assets/scripts/hw_lightning.particle
@@ -0,0 +1,35 @@
+
+models/weapons/lightning/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/lightning/particle
+
+      displacement 0 0 0 ~2.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 -1 ~10
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 ~10
+
+      radius 0 9 0
+      alpha  0 1.0 1.0
+      rotation 0 ~360 -
+      bounce 0.5
+
+      lifeTime 100
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
diff --git a/assets/scripts/hw_lightning.shader b/assets/scripts/hw_lightning.shader
new file mode 100644
index 0000000..c42612b
--- /dev/null
+++ b/assets/scripts/hw_lightning.shader
@@ -0,0 +1,36 @@
+gfx/lightning/particle
+{
+	{
+		map models/weapons/lightning/flash.jpg
+		blendFunc add
+	}
+}
+
+gfx/lightning/beam
+{
+	nomipmaps
+	{
+		map models/weapons/lightning/bolt.jpg
+		blendFunc add
+		tcMod scroll -5 0
+		tcMod scale 5 1
+	}
+}
+
+models/weapons/lightning/flash
+{
+	cull none
+	{
+		map models/weapons/lightning/flash.jpg
+		blendFunc add
+	}
+}
+
+models/weapons/lightning/bolt
+{
+	cull none
+	{
+		map models/weapons/lightning/bolt.jpg
+		blendFunc add
+	}
+}
diff --git a/assets/scripts/hw_rocketl.particle b/assets/scripts/hw_rocketl.particle
index 891ac18..5fbf798 100644
--- a/assets/scripts/hw_rocketl.particle
+++ b/assets/scripts/hw_rocketl.particle
@@ -38,40 +38,7 @@ models/weapons/rocketl/impactPS
   {
     particle
     {
-      shader sync rocketFlareParticle
-      displacement          0 0 0 0
-
-      velocityType          normal
-
-      velocityDir           linear
-
-      velocityMagnitude     0
-      velocity              0 0 0 ~0
-
-      accelerationType      static
-      accelerationDir       linear
-      acceleration          0 0 0 ~0
-      accelerationMagnitude 0
-
-      radius                0 50 100
-      alpha                 250 1 0
-      rotation              0 ~-15 ~15
-      bounce                0.0
-
-      lifeTime              40
-    }
-
-    count   1
-    delay   0
-    period  0 - 0
-  }
-
-  ejector
-  {
-    particle
-    {
       shader sync gfx/sprites/smoke
-      //shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
       displacement          0 0 0 0
 
       velocityType          normal
@@ -103,7 +70,7 @@ models/weapons/rocketl/impactPS
   {
     particle
     {
-      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
+      shader sync rocketx1 rocketx2 rocketx3 rocketx4 rocketx5 rocketx6 rocketx7 rocketx8 rocketx9 rocketx10 rocketx11 rocketx12 rocketx13 rocketx14 rocketx15 rocketx16 rocketx17 rocketx18 rocketx19 rocketx20 rocketx21 rocketx22 rocketx23 rocketx24 rocketx25 rocketx26 rocketx27 rocketx28 rocketx29
       displacement          0 0 0 0
 
       velocityType          normal
@@ -118,9 +85,9 @@ models/weapons/rocketl/impactPS
       acceleration          0 0 -1 ~5
       accelerationMagnitude 25
 
-      radius                0 0 100
-      alpha                 250 .75 0
-      rotation              0 ~-15 ~15
+      radius                0 30 70
+      alpha                 250 1 1
+      rotation              ~360 0 0
       bounce                0.0
       color                 0 { 0.8 0.2 0.2 } -
 
diff --git a/assets/scripts/hw_rocketl.shader b/assets/scripts/hw_rocketl.shader
index 28c56cb..45abbb8 100644
--- a/assets/scripts/hw_rocketl.shader
+++ b/assets/scripts/hw_rocketl.shader
@@ -56,3 +56,305 @@ rocketThrust
 	}
 }
 
+models/weapons/rocketl/flash
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0006.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+// BEST ROCKET EPXLSION EVAR!
+rocketx1
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0002.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx2
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0003.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx3
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0004.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx4
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0005.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx5
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0006.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx6
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0007.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx7
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0008.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx8
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0009.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx9
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0010.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx10
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0011.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx11
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0012.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx12
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0013.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx13
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0014.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx14
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0015.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx15
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0016.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx16
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0017.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx17
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0018.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx18
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0019.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx19
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0020.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx20
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0021.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx21
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0022.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx22
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0023.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx23
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0024.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx24
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0025.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx25
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0026.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx26
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0027.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx27
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0028.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+
+rocketx28
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0029.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+
+rocketx29
+{
+	nopicmip
+	cull disable
+	{
+		map gfx/rocketx/0030.jpg
+		blendFunc GL_ONE GL_ONE
+	}
+}
+