Diff of /grab_plus.sma

-revision 9, Fri Nov  2 01:14:09 2007 UTC
+revision 10, Sun Nov  4 03:44:10 2007 UTC
 Line 16
  --------------------------------------------------------------------------------
  http://ian.cammarata.us/projects/grab_plus
- Nov 01 04:16
+ Nov 02 01:52
  Description:
 Line 47
  +pull/+push (or invnext/invprev): Pulls/pushes the grabbed towards/away from you as you hold the button.
- +use : Chokes the grabbed (it damages the grabbed with 5 (cvar: gp_chokedmg) hp per 1.5 (cvar: gp_choketime) seconds)
+ +use : Chokes the grabbed (it damages the grabbed with 5 (cvar: gp_choke_dmg) hp per 1.5 (cvar: gp_choke_time) seconds)
- drop - Throws the grabbed with 1500 velocity. (cvar: gp_throwforce)
+ drop - Throws the grabbed with 1500 velocity. (cvar: gp_throw_force)
  Cvars (First value is default):
  gp_enabled <1|0> Enables all plugin functionality.
- gp_playersonly <0|1> Disables admins grabbing entities other than players.
+ gp_players_only <0|1> Disables admins grabbing entities other than players.
  gp_min_dist <90|...> Min distance between the grabber and grabbed.
- gp_grabforce <8|...> Sets the amount of force used when grabbing players.
+ gp_grab_force <8|...> Sets the amount of force used when grabbing players.
- gp_throwforce <1500|...> Sets the power used when throwing players.
+ gp_throw_force <1500|...> Sets the power used when throwing players.
  gp_speed <5|...> How fast the grabbed moves when using push and pull.
- gp_choketime <1.5|...> Time frequency for choking.
+ gp_choke_time <1.5|...> Time frequency for choking.
- gp_chokedmg <5|...> Amount of damage done with each choke.
+ gp_choke_dmg <5|...> Amount of damage done with each choke.
+ gp_auto_choke <1|0> Enable/disable choking automatically with +pull command.
- gp_screenfade <1|0> Enables/disables screenfade when grabbing.
+ gp_screen_fade <1|0> Enables/disables screenfade when grabbing.
  gp_glow <1|0> Enables/disables glowing for grabbed objects.
  gp_glow_r <50|0-255> Sets red amount for glow and screenfade.
-Line 104
+Line 105
  Change Log:
  Key (+ added | - removed | c changed | f fixed)
- v1.2 (Nov ??, 2007)
+ v1.2 (Nov 02, 2007)
- +: Cvars gp_screenfade and gp_glow to enable/disable these features.
+ +: Cvars gp_screen_fade and gp_glow to enable/disable these features.
  +: Cvar gp_glow_a controls to control alpha of screenfade and glow.
+ +: Cvar gp_auto_choke to enable/disable choking automatically with +pull command.
  c: Removed dependency of engine and fun modules.  Thanks to vittu for doing all the work.
+ c: Made cvar names more consistent by adding more underscores.
  f: Fixed compile bug with amxx 1.8.0 (Compiles with 1.7x as well).
  v1.1 (Oct 16, 2007)
  +: Grab a few types of entities other than players.
- +: Cvar gp_playersonly.
+ +: Cvar gp_players_only.
  v1.0 (Oct 13, 2007)
  !: Initial release
-Line 123
+Line 126
  #include <amxmisc>
  #include <fakemeta>
- #define VERSION "1.2b5"
+ #define VERSION "1.2b6"
  #define ADMIN ADMIN_LEVEL_A
  #define TSK_CHKE 50
-Line 142
+Line 145
  #define CDF_NO_CHOKE  (1<<2)
  //Cvar Pointers
- new p_enabled, p_playersonly
+ new p_enabled, p_players_only
- new p_throwforce, p_mindist, p_speed, p_grabforce
+ new p_throw_force, p_min_dist, p_speed, p_grab_force
- new p_choketime, p_chokedmg
+ new p_choke_time, p_choke_dmg, p_auto_choke
  new p_glow_r, p_glow_b, p_glow_g, p_glow_a
  new p_fade, p_glow
-Line 159
+Line 162
          set_cvar_string( "grab_plus_version", VERSION )
          p_enabled = register_cvar( "gp_enabled", "1" )
-         p_playersonly = register_cvar( "gp_playersonly", "0" )
+         p_players_only = register_cvar( "gp_players_only", "0" )
-         p_mindist = register_cvar ( "gp_min_dist", "90" )
+         p_min_dist = register_cvar ( "gp_min_dist", "90" )
-         p_throwforce = register_cvar( "gp_throwforce", "1500" )
+         p_throw_force = register_cvar( "gp_throw_force", "1500" )
-         p_grabforce = register_cvar( "gp_grabforce", "8" )
+         p_grab_force = register_cvar( "gp_grab_force", "8" )
          p_speed = register_cvar( "gp_speed", "5" )
-         p_choketime = register_cvar( "gp_choketime", "1.5" )
+         p_choke_time = register_cvar( "gp_choke_time", "1.5" )
-         p_chokedmg = register_cvar( "gp_chokedmg", "5" )
+         p_choke_dmg = register_cvar( "gp_choke_dmg", "5" )
+         p_auto_choke = register_cvar( "gp_auto_choke", "1" )
          p_glow_r = register_cvar( "gp_glow_r", "50" )
          p_glow_g = register_cvar( "gp_glow_g", "0" )
          p_glow_b = register_cvar( "gp_glow_b", "0" )
          p_glow_a = register_cvar( "gp_glow_a", "200" )
-         p_fade = register_cvar( "gp_screenfade", "1" )
+         p_fade = register_cvar( "gp_screen_fade", "1" )
          p_glow = register_cvar( "gp_glow", "1" )
          register_clcmd( "amx_grab", "force_grab", ADMIN, "Grab client & teleport to you." )
-Line 221
+Line 225
                  pev( id, pev_view_ofs, ret )
                  for( new i = 0; i < 3; i++ ) orig[i] += ret[i]
-                 velocity_by_aim( id, 1, ret )
+                 //velocity_by_aim( id, 1, ret )
+                 pev( id, pev_v_angle, ret )
                  for( new i = 0; i < 3; i++ ) ret[i] = orig[i] + ( ret[i] * 9999 )
                  engfunc( EngFunc_TraceLine, orig, ret, 0, id, 0 )
-Line 233
+Line 238
                          if( is_grabbed( target, id ) ) return PLUGIN_CONTINUE
                          set_grabbed( id, target )
                  }
-                 else if( !get_pcvar_num( p_playersonly ) )
+                 else if( !get_pcvar_num( p_players_only ) )
                  {
                          new movetype
                          if( target )
-Line 301
+Line 306
          pev( id, pev_origin, dest )
          pev( id, pev_view_ofs, tmpvec )
-         velocity_by_aim( id, len, tmpvec2 )
+         //velocity_by_aim( id, len, tmpvec2 )
+         pev( id, pev_v_angle, tmpvec2 )
+         for( new i = 0; i < 3; i++ ) tmpvec2[i] *= len
          torig = get_target_origin_f( target )
-         new force = get_pcvar_num( p_grabforce )
+         new force = get_pcvar_num( p_grab_force )
          for( new i = 0; i < 3; i++ )
          {
-Line 372
+Line 381
          new target = client_data[id][GRABBED]
          if( target > 0 )
          {
-                 new Float:pVelocity[3]
+                 new Float:vel[3]
-                 velocity_by_aim( id, get_pcvar_num(p_throwforce), pVelocity )
+                 new len = get_pcvar_num(p_throw_force)
-                 set_pev( target, pev_velocity, pVelocity )
+                 //velocity_by_aim( id, get_pcvar_num(p_throw_force), vel )
+                 pev( id, pev_v_angle, vel )
+                 for( new i = 0; i < 3; i++ ) vel[i] *= len
+                 set_pev( target, pev_velocity, vel )
                  unset_grabbed( id )
                  return PLUGIN_HANDLED
          }
-Line 433
+Line 447
          pev( target, pev_origin, torig )
          pev( id, pev_origin, orig )
          client_data[id][GRAB_LEN] = floatround( get_distance_f( torig, orig ) )
-         if( client_data[id][GRAB_LEN] < get_pcvar_num( p_mindist ) ) client_data[id][GRAB_LEN] = get_pcvar_num( p_mindist )
+         if( client_data[id][GRAB_LEN] < get_pcvar_num( p_min_dist ) ) client_data[id][GRAB_LEN] = get_pcvar_num( p_min_dist )
  }
  public push( id )
-Line 474
+Line 488
  public do_pull( id )
  {
-         new mindist = get_pcvar_num( p_mindist )
+         new mindist = get_pcvar_num( p_min_dist )
          new len = client_data[id][GRAB_LEN]
          if( len > mindist )
-Line 483
+Line 497
                  if( len < mindist ) len = mindist
                  client_data[id][GRAB_LEN] = len
          }
-         else do_choke( id )
+         else if( get_pcvar_num( p_auto_choke ) )
+                 do_choke( id )
  }
  public do_choke( id )
-Line 491
+Line 506
          new target = client_data[id][GRABBED]
          if( client_data[id][FLAGS] & CDF_NO_CHOKE || id == target || target > MAXPLAYERS) return
-         new dmg = get_pcvar_num( p_chokedmg )
+         new dmg = get_pcvar_num( p_choke_dmg )
          new Float:vec[3]
          get_target_origin_f( target )
-Line 539
+Line 554
          emit_sound( target, CHAN_BODY, "player/PL_PAIN2.WAV", VOL_NORM, ATTN_NORM, 0, PITCH_NORM )
          client_data[id][FLAGS] ^= CDF_NO_CHOKE
-         set_task( get_pcvar_float( p_choketime ), "clear_no_choke", TSK_CHKE + id )
+         set_task( get_pcvar_float( p_choke_time ), "clear_no_choke", TSK_CHKE + id )
  }
  public clear_no_choke( tskid )
-Line 572
+Line 587
          pev( id, pev_origin, orig )
          pev( id, pev_view_ofs, tmpvec )
          for( i = 0; i < 3; i++ ) tmpvec[i] += orig[i]
-         velocity_by_aim( id, get_pcvar_num( p_mindist ), tmpvec2 )
+         //velocity_by_aim( id, get_pcvar_num( p_min_dist ), tmpvec2 )
+         new min_dist = get_pcvar_num( p_min_dist )
+         pev( id, pev_v_angle, tmpvec2 )
+         for( new i = 0; i < 3; i++ ) tmpvec2[i] *= min_dist
          for( new j = 1; j < 11 && !safe; j++ )
          {

 Legend:



Removed from v.9
 


changed lines


 
Added in v.10
 Legend:



Removed from v.9
 


changed lines


 
Added in v.10
-Removed from v.9
+Added in v.10

Contact	ViewVC Help
Powered by ViewVC 1.0.4