From 9509761791ccdd2f1b447b389fec2718a199ddb4 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Wed, 23 May 2007 03:42:24 +0000 Subject: [PATCH] tweaked ebomb model from leileilol, and corresponding qc tweaks git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2662 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/models/ebomb.mdl | Bin 5204 -> 5204 bytes data/models/elecglass.tga | Bin 12306 -> 3256 bytes data/qcsrc/server/g_hook.qc | 2 +- data/qcsrc/server/w_electro.qc | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/models/ebomb.mdl b/data/models/ebomb.mdl index df6c41d203c835d2f9551b66c0be96389d3bbd27..c656e0941b65e161d0c125da49f5b88bd4725ffd 100644 GIT binary patch delta 2111 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 diff --git a/data/models/elecglass.tga b/data/models/elecglass.tga index 28372eb716443b06ef8c7fac3d57c44186038ebe..58ac9212f91bee312092360efe08a348ea7a4529 100644 GIT binary patch literal 3256 zcmd6q+iuf96h*C)q*waPPrx_yrAUqcH*JL&vSq|zWm7>A+ zTIZY@kL^QIoD}}MC@zX8MR9&Msn1U*#pBaSb#^kIpB|6vlcUk%SU-(Z9hW*^={j5) zc+SID;y#J*GZ-+W<>7NozCv+{ zkLNs`H~&R^6?p1^BR=!y*gRY-esM%?hbbTPi}NzidFpAzZN=kp%z5U+dJ>=dICed? zxK4a`IC(@KeDX%mJmW z?yLA}fQMx+t_9}%080&JU@O&4+@Aw1F^e8c+=bZbWc+B|b4v2>;n(8l1AM=hQt{!o z;%6GYHf6q7)RXdXtlG`r1)lT1SFp+DoMIDmCAJ=q4!QvczR2rX2B#If8gPhh$9brU zJdK>S99)jc@7nq~rkTIZIoPMnJ@G*X>E7$MX_hPAuW7sr5>QBGj zTAE#mEk~n+Wp*5YpF=G;jhr;g@LyU*!`QMzhukt_O&Q z$(e@xv(Jfp2WKYdV{hHOuXlTzy}jGlObes<+KHKa!<^#)nqhBBIy{%&NUP|kq z_q2ICDTc1`tnj|yWGCI{0SBM;=DlU-rsw=wXX?teIS+Bk!#jtupC|FbA&(v2=hwmU z{O#=4O=}{D@5{Ydzmuss)vnllU;K?>-H1b;rJRi%f5T$@#N)|#9y`>8OWx@4-Alhb zpVTjixfaWP@we3u-}dya%-_FQ+b=ofOKZpsS@-M7Ipzp2L9Cz+?W!eP!h^msV*9rR-E-BNEyE%ZvkX|j|0 zHaT-S#NggUhd!|m9{nxcTKrTaxg($Y*WhpsrxQz0NpDSV>P~A!UG%#8Q6J}0-z_G^ zm$S$Yv7$qtT;s~4FKxLlZ!NylNF4KUsjm(Wy|W$a;{O(Q(pnLlUOfN3ef{q8{neYR PS1+G_cz*Tb@>%g4Wt+** literal 12306 zcmeI2U2@wn41_(2?ff>+Jx=a_s-l6lUSdHKl$}l<+Rf_w&cw_4xI6et$jr@%C~W9Iwwu952tu@qwAWpqI!=jLHv2{Y&0~@2UAX7{<)g zyU^hvP0cQ%g|FhfyJ^{xC}Dd#zVwdS?wA^sJx~|9g|GTo;90+c?=e@##TRE$3pQdd zLL*J#S@Uk>>TdJG>3SB}h4ByChSjd{lKuJVI6k_q#ZsFEZl|e*3jCGaQgFr@_Ohv( z1!wkMu(Nv1%ihALY)|J$J<^#x7;1uY0YeF4L2qG|1&|6UIJ?J+osQ^2j5H~>)PPY= zw-ClLzXy+W2vW}JAeM8m!vgcK!cQTK6LwqR=3jy@f-Oyhi`8B5EdYPo^AKM`TAhq6 zs}=_E(6nHcXUBY`t6QkRPf5NMN>I@K~Q&SAbv|ObMqGQdu9&Ey&NchJQ1QwFCVrn@>0$A8@2g1}T7H!F3nJ zLMT2~4V0AxkmEoX+Q=XgVAKM-=)%8w^d$q$z%T|*?*@gUg>(y6iyu;_c$LAR^ik>B1n*n+~FC+MdQA@ltg- zi^V^j-)xR8{O3mncxSa}#fH&oD#eMAor9m#|NpXotOBTv7R^Sqwv`c;LKX|S?1-oJ zw+Wcc0hBeVk5qtpPO5_}JNWIT>h2gDF_hE1J1nRUQjFmZGQR)qgV5|pFpF#IRsK|g zQ=o1fG|gkc`21GjHy!Aw+3Ob4x( zzl9dE zJ;IWnre?3Z=&kML0!-RG;}){DJ=q=xH+*l7j`y-e_^tT%%qI2UTBx!Go>575jP&4b zJo0aE8;9q=-0@q8`3GCTd3Rvj5?0VS!b|b_uSnOA6WePF%kOSMQFR2_FKyq4kAH>P z_<0vpzc->A(VICKpTb-Jp!j#}q5)F<7T_(o6n|@bJhlNoZb9}Sn_8V=-%KXI!b|69 z@slke3*1QG=i)~AB@1_S5wQKT_snYL`70br7qz<(HUg=4bPLvo;7VR-oAg^u{-eRp z*Eg!T*li@x@?}Gw!H41l-UII+?xJX+?82#dQ#EV@uyA4!-Eo5=C1 z^nT#-I<0^6vtl9Hh|Gm$@6lqsi`|klJd;}-;N67}+Br;i?>IM4gjwjg2u4QCQgbG^ zyn!dc+jpU{3)qOT#4f>)AR2LurL)^_&(QZEkOX)G_V036EZpj%<&5^*5Az0}k{dsx GI{Y6dej3&Q diff --git a/data/qcsrc/server/g_hook.qc b/data/qcsrc/server/g_hook.qc index e37f1fd1b..ebce795a4 100644 --- a/data/qcsrc/server/g_hook.qc +++ b/data/qcsrc/server/g_hook.qc @@ -226,7 +226,7 @@ void FireGrapplingHook (void) missile.movetype = MOVETYPE_FLY; missile.solid = SOLID_BBOX; - setmodel (missile, "models/ebomb.mdl"); // replace by something CENTERED!, precision set below + setmodel (missile, "models/ebomb.mdl"); // precision set below setsize (missile, '-3 -3 -3', '3 3 3'); setorigin (missile, org); diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 2c22b08fd..18e2dc2a4 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -100,7 +100,7 @@ void() W_Electro_Attack if (cvar("g_use_ammunition")) self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo"); - proj.effects = EF_BRIGHTFIELD | EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION; + proj.effects = EF_BRIGHTFIELD | EF_LOWPRECISION; proj.movetype = MOVETYPE_FLY; proj.velocity = w_shotdir * cvar("g_balance_electro_primary_speed"); W_SetupProjectileVelocity(proj); @@ -132,7 +132,7 @@ void() W_Electro_Attack2 if (cvar("g_use_ammunition")) self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_secondary_ammo"); - proj.effects = EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION; + proj.effects = EF_LOWPRECISION; //proj.glow_size = 50; //proj.glow_color = 45; proj.movetype = MOVETYPE_BOUNCE; @@ -140,7 +140,7 @@ void() W_Electro_Attack2 W_SetupProjectileVelocity(proj); proj.touch = W_Plasma_Touch; setmodel(proj, "models/ebomb.mdl"); // precision set above - setsize(proj, '0 0 0', '0 0 0'); + setsize(proj, '0 0 -3', '0 0 -3'); proj.takedamage = DAMAGE_YES; proj.damageforcescale = 4; proj.health = 5; -- 2.39.2