]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove the unused Plasma ammo type 1372/head
authorMario <mario.mario@y7mail.com>
Wed, 9 Oct 2024 01:28:10 +0000 (11:28 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 9 Oct 2024 01:28:10 +0000 (11:28 +1000)
40 files changed:
_hud_common.cfg
balance-mario.cfg
balance-nexuiz25.cfg
balance-overkill.cfg
balance-samual.cfg
balance-xdf.cfg
balance-xonotic.cfg
balance-xpm.cfg
gfx/hud/luma/ammo_plasma.tga [deleted file]
models/items/a_plasma_luma.iqm [deleted file]
models/items/a_plasma_luma.iqm_0.skin [deleted file]
models/items/a_plasma_luma.tga [deleted file]
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/hud/panel/weapons.qh
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
qcsrc/common/items/item/ammo.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/resources/all.inc
qcsrc/common/resources/resources.qh
qcsrc/common/resources/sv_resources.qc
qcsrc/common/stats.qh
qcsrc/common/weapons/all.qc
qcsrc/server/bot/default/havocbot/roles.qc
qcsrc/server/cheats.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/items/items.qc
qcsrc/server/mutators/events.qh
qcsrc/server/weapons/spawning.qc
qcsrc/server/world.qc
qcsrc/server/world.qh
randomitems-xonotic.cfg
scripts/luma.shader

index 6af283e017340b4643636320a5d4e424b2160d72..50af6b4b9b085b25ad3f3cc629ff9ab731057327 100644 (file)
@@ -78,7 +78,6 @@ seta hud_panel_pickup_dynamichud           1 "apply the dynamic hud effects to t
 seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_cells 180 "show 100% of the status bar at this ammo count"
-seta hud_panel_weapons_ammo_full_plasma 180 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_rockets 160 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_fuel 100 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_hide_ondeath 0 "hide this panel when dead"
index 21a4980ac561d8c264741ef32e2648e10655e41d..1dc34238421c796aae1221818184ae36c2827833 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 0 
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 200
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 200
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
index d2213d6faa4e9b2230ece0a503189c10e1af6d95..cacdc95c4013721df33b2d2ba8c62e99879440a6 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 40
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 15
 set g_random_start_cells 25
-set g_random_start_plasma 25
 set g_warmup_start_health 250 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 250
 set g_ca_start_armor 100
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 50
 set g_ca_start_ammo_nails 150
 set g_ca_start_ammo_rockets 50
 set g_ca_start_ammo_cells 50
-set g_ca_start_ammo_plasma 50
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 150
 set g_ft_start_armor 0 
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 50
 set g_ft_start_ammo_nails 150
 set g_ft_start_ammo_rockets 50
 set g_ft_start_ammo_cells 50
-set g_ft_start_ammo_plasma 50
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 250
 set g_lms_start_armor 100
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 50
 set g_lms_start_ammo_nails 150
 set g_lms_start_ammo_rockets 50
 set g_lms_start_ammo_cells 50
-set g_lms_start_ammo_plasma 50
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 250
 set g_mayhem_start_armor 100
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 50
 set g_mayhem_start_ammo_nails 150
 set g_mayhem_start_ammo_rockets 50
 set g_mayhem_start_ammo_cells 50
-set g_mayhem_start_ammo_plasma 50
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 250
 set g_tmayhem_start_armor 100
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 50
 set g_tmayhem_start_ammo_nails 150
 set g_tmayhem_start_ammo_rockets 50
 set g_tmayhem_start_ammo_cells 50
-set g_tmayhem_start_ammo_plasma 50
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 15
 set g_balance_nix_ammo_nails 45
 set g_balance_nix_ammo_rockets 15
 set g_balance_nix_ammo_cells 15
-set g_balance_nix_ammo_plasma 15
 set g_balance_nix_ammo_fuel 25
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 999
 set g_pickup_cells 25
 set g_pickup_cells_weapon 25
 set g_pickup_cells_max 999
-set g_pickup_plasma 25
-set g_pickup_plasma_weapon 25
-set g_pickup_plasma_max 999
 set g_pickup_fuel 25
 set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
index 3eb522751ce0c5aa143349e8cf9895251cebef6d..9b13ce31a2a9c1da8347c93613e4ea1cc25c3561 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 0 
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 100
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 100
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 100
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
index 6219367880595dbe3b8651ae29082e44c457a3a7..58d3a924ac3fb61e387cf3c50314226ed9ae2bd8 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 0 
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 200
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 200
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
index 0818ef574d9fca2fcd9f9f9f2c2483632f28e724..f694182b41fe6340686e465b9f89059abba8180a 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 0 
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 200
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 200
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
index 1027c6f49102dc728952a32fe206d40bbc10a707..92817883e5ffdc526f41da465688f01ec77096de 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 100
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 200
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 200
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
index ebfceb2c4d6d89d736f051176ad2274ea7986e0d..9ec9c7d78bb4fc3a847434c31be6b0a0c79692dd 100644 (file)
@@ -8,7 +8,6 @@ set g_start_ammo_shells 15
 set g_start_ammo_nails 0
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
-set g_start_ammo_plasma 0
 set g_start_ammo_fuel 0
 set g_random_start_weapons_count 0
 set g_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator"
@@ -16,14 +15,12 @@ set g_random_start_shells 15
 set g_random_start_bullets 80
 set g_random_start_rockets 40
 set g_random_start_cells 30
-set g_random_start_plasma 30
 set g_warmup_start_health 100 "starting values when being in warmup-stage"
 set g_warmup_start_armor 100 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_shells 30 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_nails 160 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
-set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_ca_start_health 200
 set g_ca_start_armor 200
@@ -31,7 +28,6 @@ set g_ca_start_ammo_shells 60
 set g_ca_start_ammo_nails 320
 set g_ca_start_ammo_rockets 160
 set g_ca_start_ammo_cells 180
-set g_ca_start_ammo_plasma 180
 set g_ca_start_ammo_fuel 0
 set g_ft_start_health 100
 set g_ft_start_armor 100
@@ -39,7 +35,6 @@ set g_ft_start_ammo_shells 60
 set g_ft_start_ammo_nails 320
 set g_ft_start_ammo_rockets 160
 set g_ft_start_ammo_cells 180
-set g_ft_start_ammo_plasma 180
 set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
@@ -47,7 +42,6 @@ set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
-set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
 set g_mayhem_start_health 200
 set g_mayhem_start_armor 200
@@ -55,7 +49,6 @@ set g_mayhem_start_ammo_shells 60
 set g_mayhem_start_ammo_nails 320
 set g_mayhem_start_ammo_rockets 160
 set g_mayhem_start_ammo_cells 180
-set g_mayhem_start_ammo_plasma 180
 set g_mayhem_start_ammo_fuel 0
 set g_tmayhem_start_health 200
 set g_tmayhem_start_armor 200
@@ -63,7 +56,6 @@ set g_tmayhem_start_ammo_shells 60
 set g_tmayhem_start_ammo_nails 320
 set g_tmayhem_start_ammo_rockets 160
 set g_tmayhem_start_ammo_cells 180
-set g_tmayhem_start_ammo_plasma 180
 set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
@@ -71,13 +63,11 @@ set g_balance_nix_ammo_shells 60
 set g_balance_nix_ammo_nails 320
 set g_balance_nix_ammo_rockets 160
 set g_balance_nix_ammo_cells 180
-set g_balance_nix_ammo_plasma 180
 set g_balance_nix_ammo_fuel 100
 set g_balance_nix_ammoincr_shells 2 // eh this will need figured out later I assume
 set g_balance_nix_ammoincr_nails 6
 set g_balance_nix_ammoincr_rockets 2
 set g_balance_nix_ammoincr_cells 2
-set g_balance_nix_ammoincr_plasma 2
 set g_balance_nix_ammoincr_fuel 2
 // }}}
 
@@ -96,9 +86,6 @@ set g_pickup_rockets_max 160
 set g_pickup_cells 30
 set g_pickup_cells_weapon 30
 set g_pickup_cells_max 180
-set g_pickup_plasma 30
-set g_pickup_plasma_weapon 30
-set g_pickup_plasma_max 180
 set g_pickup_fuel 50
 set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
diff --git a/gfx/hud/luma/ammo_plasma.tga b/gfx/hud/luma/ammo_plasma.tga
deleted file mode 100644 (file)
index c47bc6f..0000000
Binary files a/gfx/hud/luma/ammo_plasma.tga and /dev/null differ
diff --git a/models/items/a_plasma_luma.iqm b/models/items/a_plasma_luma.iqm
deleted file mode 100644 (file)
index a5cc3e6..0000000
Binary files a/models/items/a_plasma_luma.iqm and /dev/null differ
diff --git a/models/items/a_plasma_luma.iqm_0.skin b/models/items/a_plasma_luma.iqm_0.skin
deleted file mode 100644 (file)
index f7ca324..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Plane,a_cells_luma
diff --git a/models/items/a_plasma_luma.tga b/models/items/a_plasma_luma.tga
deleted file mode 100644 (file)
index d21484c..0000000
Binary files a/models/items/a_plasma_luma.tga and /dev/null differ
index 2863f62d9fe160f50797762a34120c37c2b803a5..fe0b84f702278c32ccf99aeb2a1e85aa3a4f7a0a 100644 (file)
@@ -586,7 +586,6 @@ void HUD_Weapons()
                                                case RES_BULLETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_nails;   break;
                                                case RES_ROCKETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break;
                                                case RES_CELLS:   ammo_full = autocvar_hud_panel_weapons_ammo_full_cells;   break;
-                                               case RES_PLASMA:  ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma;  break;
                                                case RES_FUEL:    ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel;    break;
                                                default: ammo_full = 60;
                                        }
index afb2ee16bcca900b65be01d7ae17a82f9536d06b..3a7182d5edf0e696211658edea8ba2d0ae838d7e 100644 (file)
@@ -7,7 +7,6 @@ bool autocvar_hud_panel_weapons_ammo;
 float autocvar_hud_panel_weapons_ammo_alpha;
 string autocvar_hud_panel_weapons_ammo_color;
 int autocvar_hud_panel_weapons_ammo_full_cells;
-int autocvar_hud_panel_weapons_ammo_full_plasma;
 int autocvar_hud_panel_weapons_ammo_full_fuel;
 int autocvar_hud_panel_weapons_ammo_full_nails;
 int autocvar_hud_panel_weapons_ammo_full_rockets;
index 5315d1e88f017e05ae6aea4246000abad13a2936..dcdc11414a3dc9f8e459e4e43201a7a71d891db4 100644 (file)
@@ -9,7 +9,6 @@ float autocvar_g_ca_start_ammo_shells = 60;
 float autocvar_g_ca_start_ammo_nails = 320;
 float autocvar_g_ca_start_ammo_rockets = 160;
 float autocvar_g_ca_start_ammo_cells = 180;
-float autocvar_g_ca_start_ammo_plasma = 180;
 float autocvar_g_ca_start_ammo_fuel = 0;
 
 .float ca_damage_counter;
@@ -460,7 +459,6 @@ MUTATOR_HOOKFUNCTION(ca, SetStartItems)
        start_ammo_nails   = warmup_start_ammo_nails   = autocvar_g_ca_start_ammo_nails;
        start_ammo_rockets = warmup_start_ammo_rockets = autocvar_g_ca_start_ammo_rockets;
        start_ammo_cells   = warmup_start_ammo_cells   = autocvar_g_ca_start_ammo_cells;
-       start_ammo_plasma  = warmup_start_ammo_plasma  = autocvar_g_ca_start_ammo_plasma;
        start_ammo_fuel    = warmup_start_ammo_fuel    = autocvar_g_ca_start_ammo_fuel;
 }
 
index 21639bfad48a00a01f70e262b43d6fed388da5fd..a9f0143a87ab742f4fb36e20edbd0ed253df1cf4 100644 (file)
@@ -16,7 +16,6 @@ float autocvar_g_ft_start_ammo_shells = 60;
 float autocvar_g_ft_start_ammo_nails = 320;
 float autocvar_g_ft_start_ammo_rockets = 160;
 float autocvar_g_ft_start_ammo_cells = 180;
-float autocvar_g_ft_start_ammo_plasma = 180;
 float autocvar_g_ft_start_ammo_fuel = 0;
 
 void freezetag_count_alive_players()
@@ -718,7 +717,6 @@ MUTATOR_HOOKFUNCTION(ft, SetStartItems)
        start_ammo_nails   = warmup_start_ammo_nails   = autocvar_g_ft_start_ammo_nails;
        start_ammo_rockets = warmup_start_ammo_rockets = autocvar_g_ft_start_ammo_rockets;
        start_ammo_cells   = warmup_start_ammo_cells   = autocvar_g_ft_start_ammo_cells;
-       start_ammo_plasma  = warmup_start_ammo_plasma  = autocvar_g_ft_start_ammo_plasma;
        start_ammo_fuel    = warmup_start_ammo_fuel    = autocvar_g_ft_start_ammo_fuel;
 }
 
index 348262e76c231cd7d60d1ebe68bc3b8edd8e68ed..46a6ae1cf8e02c750db6e0a36ce6c961871a146c 100644 (file)
@@ -635,7 +635,6 @@ MUTATOR_HOOKFUNCTION(lms, SetStartItems)
        start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_lms_start_ammo_nails");
        start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
        start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
-       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
        start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
 }
 
index 7c4d09d73c49647af93e4a61d9aec15755a7c928..50979ec77a914e08103692b4f99754763c9871fa 100644 (file)
@@ -26,7 +26,6 @@ float autocvar_g_mayhem_start_ammo_shells = 60;
 float autocvar_g_mayhem_start_ammo_nails = 320;
 float autocvar_g_mayhem_start_ammo_rockets = 160;
 float autocvar_g_mayhem_start_ammo_cells = 180;
-float autocvar_g_mayhem_start_ammo_plasma = 180;
 float autocvar_g_mayhem_start_ammo_fuel = 0;
 
 .float total_damage_dealt;
@@ -72,7 +71,6 @@ MUTATOR_HOOKFUNCTION(mayhem, SetStartItems)
        start_ammo_nails   = warmup_start_ammo_nails   = autocvar_g_mayhem_start_ammo_nails;
        start_ammo_rockets = warmup_start_ammo_rockets = autocvar_g_mayhem_start_ammo_rockets;
        start_ammo_cells   = warmup_start_ammo_cells   = autocvar_g_mayhem_start_ammo_cells;
-       start_ammo_plasma  = warmup_start_ammo_plasma  = autocvar_g_mayhem_start_ammo_plasma;
        start_ammo_fuel    = warmup_start_ammo_fuel    = autocvar_g_mayhem_start_ammo_fuel;
 }
 
index 761c6e10a63db9582573f26c48e858affa76920f..07ea262ac5305b2ddf74ff9aebccd4838e7f3afc 100644 (file)
@@ -23,7 +23,6 @@ float autocvar_g_tmayhem_start_ammo_shells = 60;
 float autocvar_g_tmayhem_start_ammo_nails = 320;
 float autocvar_g_tmayhem_start_ammo_rockets = 160;
 float autocvar_g_tmayhem_start_ammo_cells = 180;
-float autocvar_g_tmayhem_start_ammo_plasma = 180;
 float autocvar_g_tmayhem_start_ammo_fuel = 0;
 
 .float total_damage_dealt;
@@ -102,7 +101,6 @@ MUTATOR_HOOKFUNCTION(tmayhem, SetStartItems)
        start_ammo_nails   = warmup_start_ammo_nails   = autocvar_g_tmayhem_start_ammo_nails;
        start_ammo_rockets = warmup_start_ammo_rockets = autocvar_g_tmayhem_start_ammo_rockets;
        start_ammo_cells   = warmup_start_ammo_cells   = autocvar_g_tmayhem_start_ammo_cells;
-       start_ammo_plasma  = warmup_start_ammo_plasma  = autocvar_g_tmayhem_start_ammo_plasma;
        start_ammo_fuel    = warmup_start_ammo_fuel    = autocvar_g_tmayhem_start_ammo_fuel;
 }
 
index 179cc9a1d76df4878d167b3ad00a33ed48cbfb3f..c9688a282330c8fb97f926132f0ac7139e4a4b34 100644 (file)
@@ -163,35 +163,3 @@ REGISTER_ITEM(Cells, Ammo) {
 }
 
 SPAWNFUNC_ITEM(item_cells, ITEM_Cells)
-
-
-// ammo type #5: plasma
-#ifdef GAMEQC
-MODEL(Plasma_ITEM, Item_Model("a_cells.md3"));
-#endif
-
-#ifdef SVQC
-PROPERTY(int, g_pickup_plasma);
-void ammo_plasma_init(Pickup this, entity item)
-{
-    if(!GetResource(item, RES_PLASMA))
-        SetResourceExplicit(item, RES_PLASMA, g_pickup_plasma);
-}
-#endif
-REGISTER_ITEM(Plasma, Ammo) {
-    this.m_canonical_spawnfunc = "item_plasma";
-#ifdef GAMEQC
-    this.spawnflags = ITEM_FLAG_NORMAL | ITEM_FLAG_RESOURCE;
-    this.m_model    = MDL_Plasma_ITEM;
-#endif
-    this.netname    = "plasma";
-    this.m_name     = _("Plasma");
-    this.m_icon     = "ammo_plasma";
-#ifdef SVQC
-    this.m_botvalue = 1500;
-    this.m_itemid   = IT_RESOURCE;
-    this.m_iteminit = ammo_plasma_init;
-#endif
-}
-
-SPAWNFUNC_ITEM(item_plasma, ITEM_Plasma)
index f3da794ba517834f3f42e1e66b0ffdabeacd5743..6e6b7324d8bdd5a72dba9b862971449087e883d9 100644 (file)
@@ -100,7 +100,6 @@ bool M_Mage_Defend_Heal_Check(entity this, entity targ)
                case 1:
                {
                        return ((GetResource(targ, RES_CELLS) && GetResource(targ, RES_CELLS) < g_pickup_cells_max)
-                               ||  (GetResource(targ, RES_PLASMA) && GetResource(targ, RES_PLASMA) < g_pickup_plasma_max)
                                ||  (GetResource(targ, RES_ROCKETS) && GetResource(targ, RES_ROCKETS) < g_pickup_rockets_max)
                                ||  (GetResource(targ, RES_BULLETS) && GetResource(targ, RES_BULLETS) < g_pickup_nails_max)
                                ||  (GetResource(targ, RES_SHELLS) && GetResource(targ, RES_SHELLS) < g_pickup_shells_max)
@@ -237,7 +236,6 @@ void M_Mage_Defend_Heal(entity this)
                                case 1:
                                {
                                        if(GetResource(it, RES_CELLS)) GiveResourceWithLimit(it, RES_CELLS, 1, g_pickup_cells_max);
-                                       if(GetResource(it, RES_PLASMA)) GiveResourceWithLimit(it, RES_PLASMA, 1, g_pickup_plasma_max);
                                        if(GetResource(it, RES_ROCKETS)) GiveResourceWithLimit(it, RES_ROCKETS, 1, g_pickup_rockets_max);
                                        if(GetResource(it, RES_SHELLS)) GiveResourceWithLimit(it, RES_SHELLS, 2, g_pickup_shells_max);
                                        if(GetResource(it, RES_BULLETS)) GiveResourceWithLimit(it, RES_BULLETS, 5, g_pickup_nails_max);
index 6a8d8bf35c47edb8cc997f021790a7a27df71646..d6884dff5bf8f661bcde381191915796ae1607e7 100644 (file)
@@ -261,7 +261,6 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, SetStartItems, CBC_ORDER_LAST)
        start_ammo_shells  = warmup_start_ammo_shells  = 0;
        start_ammo_nails   = warmup_start_ammo_nails   = 0;
        start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_instagib_ammo_start");
-       start_ammo_plasma  = warmup_start_ammo_plasma  = 0;
        start_ammo_rockets = warmup_start_ammo_rockets = 0;
        //start_ammo_fuel    = warmup_start_ammo_fuel    = 0;
 
index b5e85dde32a62e5b1f7e6310a6b04cf2b7d25cdc..5d603ed0c45af2386aea594dde8b6e13bd6c3b17 100644 (file)
@@ -738,7 +738,6 @@ void nade_ammo_touch(entity this, entity toucher)
        float ambullets = GetResource(toucher, RES_BULLETS);
        float amrockets = GetResource(toucher, RES_ROCKETS);
        float amcells = GetResource(toucher, RES_CELLS);
-       float amplasma = GetResource(toucher, RES_PLASMA);
        if(IS_PLAYER(toucher) || IS_MONSTER(toucher))
        if(!IS_DEAD(toucher))
        if(!STAT(FROZEN, toucher))
@@ -761,7 +760,6 @@ void nade_ammo_touch(entity this, entity toucher)
                        CHECK_AMMO_RESOURCE_LIMIT(ambullets, RES_BULLETS);
                        CHECK_AMMO_RESOURCE_LIMIT(amrockets, RES_ROCKETS);
                        CHECK_AMMO_RESOURCE_LIMIT(amcells,   RES_CELLS);
-                       CHECK_AMMO_RESOURCE_LIMIT(amplasma,  RES_PLASMA);
 
                        if (this.nade_show_particles)
                                Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
@@ -773,7 +771,6 @@ void nade_ammo_touch(entity this, entity toucher)
                        DROP_AMMO_RESOURCE(ambullets, RES_BULLETS);
                        DROP_AMMO_RESOURCE(amrockets, RES_ROCKETS);
                        DROP_AMMO_RESOURCE(amcells,   RES_CELLS);
-                       DROP_AMMO_RESOURCE(amplasma,  RES_PLASMA);
 
                        return;
                }
index c53c76eb777e1773700264ca807ae9b6e4a55f3d..863cfb505b73d345dfd1c8e7f69c70a8f123b1a0 100644 (file)
@@ -5,13 +5,11 @@
 
 //string autocvar_g_nix;
 int autocvar_g_balance_nix_ammo_cells;
-int autocvar_g_balance_nix_ammo_plasma;
 int autocvar_g_balance_nix_ammo_fuel;
 int autocvar_g_balance_nix_ammo_nails;
 int autocvar_g_balance_nix_ammo_rockets;
 int autocvar_g_balance_nix_ammo_shells;
 int autocvar_g_balance_nix_ammoincr_cells;
-int autocvar_g_balance_nix_ammoincr_plasma;
 int autocvar_g_balance_nix_ammoincr_fuel;
 int autocvar_g_balance_nix_ammoincr_nails;
 int autocvar_g_balance_nix_ammoincr_rockets;
@@ -22,7 +20,6 @@ bool autocvar_g_nix_with_healtharmor;
 bool autocvar_g_nix_with_blaster;
 bool autocvar_g_nix_with_powerups;
 int autocvar_g_pickup_cells_max;
-int autocvar_g_pickup_plasma_max;
 int autocvar_g_pickup_fuel_max;
 int autocvar_g_pickup_nails_max;
 int autocvar_g_pickup_rockets_max;
@@ -64,7 +61,6 @@ REGISTER_MUTATOR(nix, expr_evaluate(cvar_string("g_nix")) && !MUTATOR_IS_ENABLED
                        SetResource(it, RES_BULLETS, start_ammo_nails);
                        SetResource(it, RES_ROCKETS, start_ammo_rockets);
                        SetResource(it, RES_CELLS, start_ammo_cells);
-                       SetResource(it, RES_PLASMA, start_ammo_plasma);
                        SetResource(it, RES_FUEL, start_ammo_fuel);
                        STAT(WEAPONS, it) = start_weapons;
                        for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
@@ -142,7 +138,6 @@ void NIX_GiveCurrentWeapon(entity this)
                SetResource(this, RES_BULLETS, 0);
                SetResource(this, RES_ROCKETS, 0);
                SetResource(this, RES_CELLS, 0);
-               SetResource(this, RES_PLASMA, 0);
                SetResource(this, RES_FUEL, 0);
                if(this.items & IT_UNLIMITED_AMMO)
                {
@@ -152,7 +147,6 @@ void NIX_GiveCurrentWeapon(entity this)
                                case RES_BULLETS: SetResource(this, RES_BULLETS, autocvar_g_pickup_nails_max);   break;
                                case RES_ROCKETS: SetResource(this, RES_ROCKETS, autocvar_g_pickup_rockets_max); break;
                                case RES_CELLS:   SetResource(this, RES_CELLS, autocvar_g_pickup_cells_max);   break;
-                               case RES_PLASMA:  SetResource(this, RES_PLASMA, autocvar_g_pickup_plasma_max);   break;
                                case RES_FUEL:    SetResource(this, RES_FUEL, autocvar_g_pickup_fuel_max);    break;
                        }
                }
@@ -164,7 +158,6 @@ void NIX_GiveCurrentWeapon(entity this)
                                case RES_BULLETS: SetResource(this, RES_BULLETS, autocvar_g_balance_nix_ammo_nails);   break;
                                case RES_ROCKETS: SetResource(this, RES_ROCKETS, autocvar_g_balance_nix_ammo_rockets); break;
                                case RES_CELLS:   SetResource(this, RES_CELLS, autocvar_g_balance_nix_ammo_cells);   break;
-                               case RES_PLASMA:  SetResource(this, RES_PLASMA, autocvar_g_balance_nix_ammo_plasma);   break;
                                case RES_FUEL:    SetResource(this, RES_FUEL, autocvar_g_balance_nix_ammo_fuel);    break;
                        }
                }
@@ -205,7 +198,6 @@ void NIX_GiveCurrentWeapon(entity this)
                        case RES_BULLETS: GiveResource(this, RES_BULLETS, autocvar_g_balance_nix_ammoincr_nails);   break;
                        case RES_ROCKETS: GiveResource(this, RES_ROCKETS, autocvar_g_balance_nix_ammoincr_rockets); break;
                        case RES_CELLS:   GiveResource(this, RES_CELLS, autocvar_g_balance_nix_ammoincr_cells);   break;
-                       case RES_PLASMA:  GiveResource(this, RES_PLASMA, autocvar_g_balance_nix_ammoincr_plasma);   break;
                        case RES_FUEL:    GiveResource(this, RES_FUEL, autocvar_g_balance_nix_ammoincr_fuel);    break;
                }
 
index 8ef77ebf1592152b2590cfbbc47c0505f840ac17..354aa63fc27699c8fd2e54eb66ea2a93185d63aa 100644 (file)
@@ -53,17 +53,6 @@ REGISTER_RESOURCE(CELLS, NEW(AmmoResource)) {
        this.m_name = _("Cells");
        this.m_icon = "ammo_cells";
 }
-REGISTER_RESOURCE(PLASMA, NEW(AmmoResource)) {
-       this.netname = "plasma";
-#ifdef GAMEQC
-       this.m_field = ammo_plasma;
-#endif
-       this.m_name = _("Plasma");
-       this.m_icon = "ammo_plasma";
-#ifdef CSQC
-       this.m_hidden = true; // WIP ammo type
-#endif
-}
 REGISTER_RESOURCE(FUEL, NEW(AmmoResource)) {
        this.netname = "fuel";
 #ifdef GAMEQC
index 8839b3a88e22b15140563f62814d203ad20bb449..342985a8d9450d42a35ee0d471fa217f5a6e33f9 100644 (file)
 .int ammo_rockets;
 .int ammo_cells;
 #ifdef SVQC
-const .int ammo_plasma = _STAT(PLASMA);
 const .int ammo_fuel = _STAT(FUEL);
 #else
-.int ammo_plasma;
 .int ammo_fuel;
 #endif
 #endif
index 37805f852f06d947bdfd0283a808288995da44d8..a59ae045c627498ff79389ef79b661cf3136c279 100644 (file)
@@ -48,11 +48,6 @@ float GetResourceLimit(entity e, Resource res_type)
                        limit = g_pickup_cells_max;
                        break;
                }
-               case RES_PLASMA:
-               {
-                       limit = g_pickup_plasma_max;
-                       break;
-               }
                case RES_FUEL:
                {
                        limit = autocvar_g_balance_fuel_limit;
index 9b4394e45a62f1d0a2851555945521740c7c8e71..7e55ce362c2ccd7bad01c2f1d35cc52f3ad454db 100644 (file)
@@ -126,7 +126,6 @@ REGISTER_STAT(NADE_BONUS, float)
 REGISTER_STAT(NADE_BONUS_TYPE, int)
 REGISTER_STAT(NADE_BONUS_SCORE, float)
 REGISTER_STAT(NADE_DARKNESS_TIME, float)
-REGISTER_STAT(PLASMA, int)
 REGISTER_STAT(FROZEN, int)
 REGISTER_STAT(REVIVE_PROGRESS, float)
 REGISTER_STAT(ROUNDLOST, int)
index 255a921f039a6f3a6da69e7c42f47d661e5d19c5..66735dd2f6cd6cc22dfee7349088bfa6adf6771a 100644 (file)
@@ -206,7 +206,6 @@ int GetAmmoStat(Resource ammotype)
                case RES_BULLETS: return STAT_NAILS;
                case RES_ROCKETS: return STAT_ROCKETS;
                case RES_CELLS: return STAT_CELLS;
-               case RES_PLASMA: return STAT_PLASMA.m_id;
                case RES_FUEL: return STAT_FUEL.m_id;
                default: return -1;
        }
index 9684c26a1c9b2e532d79ddfec702efcd6f37d433..41dd23dc3effd6713b989b5a0411a5147ecfd9fd 100644 (file)
@@ -53,7 +53,6 @@ bool havocbot_goalrating_item_can_be_left_to_teammate(entity this, entity player
        if (GetResource(item, RES_BULLETS) && GetResource(player, RES_BULLETS) <= GetResource(this, RES_BULLETS)) {return true;}
        if (GetResource(item, RES_ROCKETS) && GetResource(player, RES_ROCKETS) <= GetResource(this, RES_ROCKETS)) {return true;}
        if (GetResource(item, RES_CELLS) && GetResource(player, RES_CELLS) <= GetResource(this, RES_CELLS)) {return true;}
-       if (GetResource(item, RES_PLASMA) && GetResource(player, RES_PLASMA) <= GetResource(this, RES_PLASMA)) {return true;}
 
        return false;
 };
index f7c55af4c2b2b7ebd7c2ea3745e4c8d5a48efab4..7e58bc1e7bec3f97093747880fe2ea6ea71afa76 100644 (file)
@@ -151,7 +151,6 @@ float CheatImpulse(entity this, int imp)
                        SetResource(this.personal, RES_ROCKETS, GetResource(this, RES_ROCKETS));
                        SetResource(this.personal, RES_BULLETS, GetResource(this, RES_BULLETS));
                        SetResource(this.personal, RES_CELLS, GetResource(this, RES_CELLS));
-                       SetResource(this.personal, RES_PLASMA, GetResource(this, RES_PLASMA));
                        SetResource(this.personal, RES_SHELLS, GetResource(this, RES_SHELLS));
                        SetResource(this.personal, RES_FUEL, GetResource(this, RES_FUEL));
                        SetResource(this.personal, RES_HEALTH, max(1, GetResource(this, RES_HEALTH)));
@@ -209,7 +208,6 @@ float CheatImpulse(entity this, int imp)
                                SetResource(this, RES_ROCKETS, GetResource(this.personal, RES_ROCKETS));
                                SetResource(this, RES_BULLETS, GetResource(this.personal, RES_BULLETS));
                                SetResource(this, RES_CELLS, GetResource(this.personal, RES_CELLS));
-                               SetResource(this, RES_PLASMA, GetResource(this.personal, RES_PLASMA));
                                SetResource(this, RES_SHELLS, GetResource(this.personal, RES_SHELLS));
                                SetResource(this, RES_FUEL, GetResource(this.personal, RES_FUEL));
                                SetResource(this, RES_HEALTH, GetResource(this.personal, RES_HEALTH));
index 4ee80ef3c59c96475e2b83ab1d06e1ee7638358f..38137e6a53211d12c96f75283a4d0cc3e837e965 100644 (file)
@@ -560,7 +560,6 @@ void GiveWarmupResources(entity this)
        SetResource(this, RES_BULLETS, warmup_start_ammo_nails);
        SetResource(this, RES_ROCKETS, warmup_start_ammo_rockets);
        SetResource(this, RES_CELLS, warmup_start_ammo_cells);
-       SetResource(this, RES_PLASMA, warmup_start_ammo_plasma);
        SetResource(this, RES_FUEL, warmup_start_ammo_fuel);
        SetResource(this, RES_HEALTH, warmup_start_health);
        SetResource(this, RES_ARMOR, warmup_start_armorvalue);
@@ -624,7 +623,6 @@ void PutPlayerInServer(entity this)
                SetResource(this, RES_BULLETS, start_ammo_nails);
                SetResource(this, RES_ROCKETS, start_ammo_rockets);
                SetResource(this, RES_CELLS, start_ammo_cells);
-               SetResource(this, RES_PLASMA, start_ammo_plasma);
                SetResource(this, RES_FUEL, start_ammo_fuel);
                SetResource(this, RES_HEALTH, start_health);
                SetResource(this, RES_ARMOR, start_armorvalue);
@@ -1792,7 +1790,6 @@ void SpectateCopy(entity this, entity spectatee)
        this.armortype = spectatee.armortype;
        SetResourceExplicit(this, RES_ARMOR, GetResource(spectatee, RES_ARMOR));
        SetResourceExplicit(this, RES_CELLS, GetResource(spectatee, RES_CELLS));
-       SetResourceExplicit(this, RES_PLASMA, GetResource(spectatee, RES_PLASMA));
        SetResourceExplicit(this, RES_SHELLS, GetResource(spectatee, RES_SHELLS));
        SetResourceExplicit(this, RES_BULLETS, GetResource(spectatee, RES_BULLETS));
        SetResourceExplicit(this, RES_ROCKETS, GetResource(spectatee, RES_ROCKETS));
index 4a48af4cbf46dc70bf5dff2ab5190cc39f8bba4f..c868eeee2fe1f701d90ec3b7a0f19f4d4ef10166 100644 (file)
@@ -152,7 +152,6 @@ void target_init_use(entity this, entity actor, entity trigger)
                        SetResource(actor, RES_BULLETS, 0);
                        SetResource(actor, RES_ROCKETS, 0);
                        SetResource(actor, RES_CELLS, 0);
-                       SetResource(actor, RES_PLASMA, 0);
                        SetResource(actor, RES_FUEL, 0);
 
                        STAT(WEAPONS, actor) = WEPSET(SHOTGUN);
@@ -163,7 +162,6 @@ void target_init_use(entity this, entity actor, entity trigger)
                        SetResource(actor, RES_BULLETS, start_ammo_nails);
                        SetResource(actor, RES_ROCKETS, start_ammo_rockets);
                        SetResource(actor, RES_CELLS, start_ammo_cells);
-                       SetResource(actor, RES_PLASMA, start_ammo_plasma);
                        SetResource(actor, RES_FUEL, start_ammo_fuel);
 
                        STAT(WEAPONS, actor) = start_weapons;
index 62d13fb27d1733f32ba7d79e1278edb5962b21ad..6adc4f9b439d88c2fbd97d20adad62d6157db77f 100644 (file)
@@ -555,7 +555,6 @@ bool Item_GiveTo(entity item, entity player)
        pickedup |= Item_GiveAmmoTo(item, player, RES_BULLETS, g_pickup_nails_max);
        pickedup |= Item_GiveAmmoTo(item, player, RES_ROCKETS, g_pickup_rockets_max);
        pickedup |= Item_GiveAmmoTo(item, player, RES_CELLS, g_pickup_cells_max);
-       pickedup |= Item_GiveAmmoTo(item, player, RES_PLASMA, g_pickup_plasma_max);
        pickedup |= Item_GiveAmmoTo(item, player, RES_FUEL, g_pickup_fuel_max);
        if (item.itemdef.instanceOfWeaponPickup)
        {
@@ -1413,7 +1412,6 @@ spawnfunc(target_items)
                res = GetResource(this, RES_BULLETS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "nails");
                res = GetResource(this, RES_ROCKETS); if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "rockets");
                res = GetResource(this, RES_CELLS);   if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "cells");
-               res = GetResource(this, RES_PLASMA);  if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "plasma");
                res = GetResource(this, RES_FUEL);    if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "fuel");
                res = GetResource(this, RES_HEALTH);  if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "health");
                res = GetResource(this, RES_ARMOR);   if(res != 0) str = sprintf("%s %s%d %s", str, valueprefix, max(0, res), "armor");
@@ -1605,7 +1603,6 @@ float GiveItems(entity e, float beginarg, float endarg)
        //PREGIVE_STATUSEFFECT(e, STATUSEFFECT_Superweapons);
        PREGIVE_RESOURCE(e, RES_BULLETS);
        PREGIVE_RESOURCE(e, RES_CELLS);
-       PREGIVE_RESOURCE(e, RES_PLASMA);
        PREGIVE_RESOURCE(e, RES_SHELLS);
        PREGIVE_RESOURCE(e, RES_ROCKETS);
        PREGIVE_RESOURCE(e, RES_FUEL);
@@ -1653,7 +1650,6 @@ float GiveItems(entity e, float beginarg, float endarg)
                                //FOREACH(StatusEffect, it.instanceOfBuff, got += GiveBuff(e, it, op, val));
                        case "allammo":
                                got += GiveResourceValue(e, RES_CELLS, op, val);
-                               got += GiveResourceValue(e, RES_PLASMA, op, val);
                                got += GiveResourceValue(e, RES_SHELLS, op, val);
                                got += GiveResourceValue(e, RES_BULLETS, op, val);
                                got += GiveResourceValue(e, RES_ROCKETS, op, val);
@@ -1694,9 +1690,6 @@ float GiveItems(entity e, float beginarg, float endarg)
                        case "cells":
                                got += GiveResourceValue(e, RES_CELLS, op, val);
                                break;
-                       case "plasma":
-                               got += GiveResourceValue(e, RES_PLASMA, op, val);
-                               break;
                        case "shells":
                                got += GiveResourceValue(e, RES_SHELLS, op, val);
                                break;
@@ -1748,7 +1741,6 @@ float GiveItems(entity e, float beginarg, float endarg)
        POSTGIVE_STATUSEFFECT(e, STATUSEFFECT_Invisibility, SND_POWERUP, SND_POWEROFF);
        POSTGIVE_RESOURCE(e, RES_BULLETS, 0, SND_ITEMPICKUP, SND_Null);
        POSTGIVE_RESOURCE(e, RES_CELLS, 0, SND_ITEMPICKUP, SND_Null);
-       POSTGIVE_RESOURCE(e, RES_PLASMA, 0, SND_ITEMPICKUP, SND_Null);
        POSTGIVE_RESOURCE(e, RES_SHELLS, 0, SND_ITEMPICKUP, SND_Null);
        POSTGIVE_RESOURCE(e, RES_ROCKETS, 0, SND_ITEMPICKUP, SND_Null);
        POSTGIVE_RES_ROT(e, RES_FUEL, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, SND_ITEMPICKUP, SND_Null);
index 34155a4d3c908335832d2f245073f92bebe033b8..2e911e4c3064ed01bec172146a075aefc1d94dcc 100644 (file)
@@ -256,7 +256,7 @@ MUTATOR_HOOKABLE(WeaponRateFactor, EV_WeaponRateFactor);
     /**/
 MUTATOR_HOOKABLE(WeaponSpeedFactor, EV_WeaponSpeedFactor);
 
-/** adjusts {warmup_}start_{items,weapons,ammo_{cells,plasma,rockets,nails,shells,fuel}} */
+/** adjusts {warmup_}start_{items,weapons,ammo_{cells,rockets,nails,shells,fuel}} */
 MUTATOR_HOOKABLE(SetStartItems, EV_NO_ARGS);
 
 /** called every frame. customizes the waypoint for spectators */
index 914b91966222ba995c8e05fcf511a358269b47f3..8ce5c570b9dcc1ed462cbc2fbce883524bfdbef7 100644 (file)
@@ -123,7 +123,6 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
                                case RES_BULLETS: ammo = cvar("g_pickup_nails_weapon");   break;
                                case RES_ROCKETS: ammo = cvar("g_pickup_rockets_weapon"); break;
                                case RES_CELLS:   ammo = cvar("g_pickup_cells_weapon");   break;
-                               case RES_PLASMA:  ammo = cvar("g_pickup_plasma_weapon");  break;
                                case RES_FUEL:    ammo = cvar("g_pickup_fuel_weapon");    break;
                        }
                }
index 175f8d6834ea20d836a64ebc3079c0822dfb6ba2..68f279bed5a559ce14c964ef73f70621bf0b26ab 100644 (file)
@@ -1948,7 +1948,6 @@ void readplayerstartcvars()
        start_ammo_nails = 0;
        start_ammo_rockets = 0;
        start_ammo_cells = 0;
-       start_ammo_plasma = 0;
        if (random_start_ammo == NULL)
        {
                random_start_ammo = new_pure(random_start_ammo);
@@ -2071,20 +2070,17 @@ void readplayerstartcvars()
        start_ammo_nails = cvar("g_start_ammo_nails");
        start_ammo_rockets = cvar("g_start_ammo_rockets");
        start_ammo_cells = cvar("g_start_ammo_cells");
-       start_ammo_plasma = cvar("g_start_ammo_plasma");
        start_ammo_fuel = cvar("g_start_ammo_fuel");
        random_start_weapons_count = cvar("g_random_start_weapons_count");
        SetResource(random_start_ammo, RES_SHELLS, cvar("g_random_start_shells"));
        SetResource(random_start_ammo, RES_BULLETS, cvar("g_random_start_bullets"));
        SetResource(random_start_ammo, RES_ROCKETS, cvar("g_random_start_rockets"));
        SetResource(random_start_ammo, RES_CELLS, cvar("g_random_start_cells"));
-       SetResource(random_start_ammo, RES_PLASMA, cvar("g_random_start_plasma"));
 
        warmup_start_ammo_shells = start_ammo_shells;
        warmup_start_ammo_nails = start_ammo_nails;
        warmup_start_ammo_rockets = start_ammo_rockets;
        warmup_start_ammo_cells = start_ammo_cells;
-       warmup_start_ammo_plasma = start_ammo_plasma;
        warmup_start_ammo_fuel = start_ammo_fuel;
        warmup_start_health = start_health;
        warmup_start_armorvalue = start_armorvalue;
@@ -2098,7 +2094,6 @@ void readplayerstartcvars()
                warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
                warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
                warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
-               warmup_start_ammo_plasma = cvar("g_warmup_start_ammo_plasma");
                warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
                warmup_start_health = cvar("g_warmup_start_health");
                warmup_start_armorvalue = cvar("g_warmup_start_armor");
@@ -2133,19 +2128,16 @@ void readplayerstartcvars()
        start_ammo_nails = max(0, start_ammo_nails);
        start_ammo_rockets = max(0, start_ammo_rockets);
        start_ammo_cells = max(0, start_ammo_cells);
-       start_ammo_plasma = max(0, start_ammo_plasma);
        start_ammo_fuel = max(0, start_ammo_fuel);
        SetResource(random_start_ammo, RES_SHELLS, max(0, GetResource(random_start_ammo, RES_SHELLS)));
        SetResource(random_start_ammo, RES_BULLETS, max(0, GetResource(random_start_ammo, RES_BULLETS)));
        SetResource(random_start_ammo, RES_ROCKETS, max(0, GetResource(random_start_ammo, RES_ROCKETS)));
        SetResource(random_start_ammo, RES_CELLS, max(0, GetResource(random_start_ammo, RES_CELLS)));
-       SetResource(random_start_ammo, RES_PLASMA, max(0, GetResource(random_start_ammo, RES_PLASMA)));
 
        warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
        warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
        warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
        warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
-       warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
        warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
 }
 
@@ -2210,8 +2202,6 @@ void readlevelcvars()
        g_pickup_rockets_max = cvar("g_pickup_rockets_max");
        g_pickup_cells = cvar("g_pickup_cells");
        g_pickup_cells_max = cvar("g_pickup_cells_max");
-       g_pickup_plasma = cvar("g_pickup_plasma");
-       g_pickup_plasma_max = cvar("g_pickup_plasma_max");
        g_pickup_fuel = cvar("g_pickup_fuel");
        g_pickup_fuel_jetpack = cvar("g_pickup_fuel_jetpack");
        g_pickup_fuel_max = cvar("g_pickup_fuel_max");
index 024a36da92151959605eff839cd4687cd3b53db7..9a07bb60dc87da155775b5c6586a9f81551bbc8b 100644 (file)
@@ -76,7 +76,6 @@ float g_pickup_shells_max;
 float g_pickup_nails_max;
 float g_pickup_rockets_max;
 float g_pickup_cells_max;
-float g_pickup_plasma_max;
 float g_pickup_fuel_max;
 float g_pickup_weapons_anyway;
 float g_weaponarena;
@@ -92,7 +91,6 @@ float start_ammo_shells;
 float start_ammo_nails;
 float start_ammo_rockets;
 float start_ammo_cells;
-float start_ammo_plasma;
 float start_ammo_fuel;
 /// \brief Number of random start weapons to give to players.
 int random_start_weapons_count;
@@ -111,7 +109,6 @@ float warmup_start_ammo_shells;
 float warmup_start_ammo_nails;
 float warmup_start_ammo_rockets;
 float warmup_start_ammo_cells;
-float warmup_start_ammo_plasma;
 float warmup_start_ammo_fuel;
 float warmup_start_health;
 float warmup_start_armorvalue;
index 47611a9e23a5120f20b3663a4abcbd501ec6e58e..592cfc837cf3ba74930702286ff99d43bd8c585b 100644 (file)
@@ -14,7 +14,6 @@ set g_random_items_replace_item_shells "random" "Classnames to replace shells wi
 set g_random_items_replace_item_bullets "random" "Classnames to replace bullets with."
 set g_random_items_replace_item_rockets "random" "Classnames to replace rockets with."
 set g_random_items_replace_item_cells "random" "Classnames to replace cells with."
-set g_random_items_replace_item_plasma "random" "Classnames to replace plasma with."
 set g_random_items_replace_item_fuel "random" "Classnames to replace fuel with."
 set g_random_items_replace_weapon_blaster "random" "Classnames to replace blaster with."
 set g_random_items_replace_weapon_shotgun "random" "Classnames to replace shotgun with."
@@ -66,7 +65,6 @@ set g_random_items_item_shells_probability 1 "Probability of random shells spawn
 set g_random_items_item_bullets_probability 1 "Probability of random bullets spawning in the map."
 set g_random_items_item_rockets_probability 1 "Probability of random rockets spawning in the map."
 set g_random_items_item_cells_probability 1 "Probability of random cells spawning in the map."
-set g_random_items_item_plasma_probability 0 "Probability of random plasma spawning in the map."
 set g_random_items_item_fuel_probability 0 "Probability of random fuel spawning in the map."
 set g_random_items_weapon_blaster_probability 0 "Probability of random blaster spawning in the map."
 set g_random_items_weapon_shotgun_probability 0 "Probability of random shotgun spawning in the map."
@@ -128,7 +126,6 @@ set g_random_loot_item_shells_probability 1 "Probability of random shells spawni
 set g_random_loot_item_bullets_probability 1 "Probability of random bullets spawning as loot."
 set g_random_loot_item_rockets_probability 1 "Probability of random rockets spawning as loot."
 set g_random_loot_item_cells_probability 1 "Probability of random cells spawning as loot."
-set g_random_loot_item_plasma_probability 0 "Probability of random plasma spawning as loot."
 set g_random_loot_item_fuel_probability 0 "Probability of random fuel spawning as loot."
 set g_random_loot_weapon_blaster_probability 0 "Probability of random blaster spawning as loot."
 set g_random_loot_weapon_shotgun_probability 0 "Probability of random shotgun spawning as loot."
index b6ee3cd8ae597e31e38b5141b03724a036edb188..c5c58d581df6e61126ba3f52812f9c4d8becac6e 100644 (file)
@@ -22,17 +22,6 @@ a_cells_luma
        }
 }
 
-a_plasma_luma
-{
-       deformVertexes autosprite
-       cull none
-       nopicmip
-       {
-               map models/items/a_plasma_luma
-               blendfunc blend
-       }
-}
-
 a_rockets_luma
 {
        deformVertexes autosprite