diff --git a/main/models/b_armory.mdl b/main/models/b_armory.mdl index 453fbf59..28d9b088 100644 Binary files a/main/models/b_armory.mdl and b/main/models/b_armory.mdl differ diff --git a/main/models/b_infportal.mdl b/main/models/b_infportal.mdl index cb97ef05..3477d17d 100644 Binary files a/main/models/b_infportal.mdl and b/main/models/b_infportal.mdl differ diff --git a/main/models/b_infportalt.mdl b/main/models/b_infportalt.mdl index 5b0e549e..b8da0884 100644 Binary files a/main/models/b_infportalt.mdl and b/main/models/b_infportalt.mdl differ diff --git a/main/models/b_phasegate.mdl b/main/models/b_phasegate.mdl index a4b49886..c0fc7ed0 100644 Binary files a/main/models/b_phasegate.mdl and b/main/models/b_phasegate.mdl differ diff --git a/main/models/b_resourcetower.mdl b/main/models/b_resourcetower.mdl index eb09ec4d..5ad72746 100644 Binary files a/main/models/b_resourcetower.mdl and b/main/models/b_resourcetower.mdl differ diff --git a/main/models/b_siege.mdl b/main/models/b_siege.mdl index b82bff3b..a0eb42c8 100644 Binary files a/main/models/b_siege.mdl and b/main/models/b_siege.mdl differ diff --git a/main/models/b_turretfactory.mdl b/main/models/b_turretfactory.mdl index 0685baca..b4a7665d 100644 Binary files a/main/models/b_turretfactory.mdl and b/main/models/b_turretfactory.mdl differ diff --git a/main/models/co_sava/brokenresourcetower.mdl b/main/models/co_sava/brokenresourcetower.mdl new file mode 100644 index 00000000..940913f9 Binary files /dev/null and b/main/models/co_sava/brokenresourcetower.mdl differ diff --git a/main/models/ns_machina/machinahead.mdl b/main/models/ns_machina/machinahead.mdl new file mode 100644 index 00000000..7cab4d73 Binary files /dev/null and b/main/models/ns_machina/machinahead.mdl differ diff --git a/main/models/ns_machina/machinahead_stars.mdl b/main/models/ns_machina/machinahead_stars.mdl new file mode 100644 index 00000000..1d0f6fcd Binary files /dev/null and b/main/models/ns_machina/machinahead_stars.mdl differ diff --git a/main/models/ns_machina/machinarocks.mdl b/main/models/ns_machina/machinarocks.mdl new file mode 100644 index 00000000..b4b47220 Binary files /dev/null and b/main/models/ns_machina/machinarocks.mdl differ diff --git a/main/models/ns_machina/machinaship.mdl b/main/models/ns_machina/machinaship.mdl new file mode 100644 index 00000000..d937bfeb Binary files /dev/null and b/main/models/ns_machina/machinaship.mdl differ diff --git a/main/models/ns_machina/machinaship_add.mdl b/main/models/ns_machina/machinaship_add.mdl new file mode 100644 index 00000000..07eb41a4 Binary files /dev/null and b/main/models/ns_machina/machinaship_add.mdl differ diff --git a/main/models/ns_machina/machinasun.mdl b/main/models/ns_machina/machinasun.mdl new file mode 100644 index 00000000..7667638d Binary files /dev/null and b/main/models/ns_machina/machinasun.mdl differ diff --git a/main/models/ns_machina/machinatsa.mdl b/main/models/ns_machina/machinatsa.mdl new file mode 100644 index 00000000..5eb9eb6e Binary files /dev/null and b/main/models/ns_machina/machinatsa.mdl differ diff --git a/main/models/player/alien1/alien1.mdl b/main/models/player/alien1/alien1.mdl index 988965ad..439cf750 100644 Binary files a/main/models/player/alien1/alien1.mdl and b/main/models/player/alien1/alien1.mdl differ diff --git a/main/sprites/weapon_acidrocketgun.txt b/main/sprites/weapon_acidrocketgun.txt index f466956a..e6d3f572 100644 --- a/main/sprites/weapon_acidrocketgun.txt +++ b/main/sprites/weapon_acidrocketgun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 0 180 80 20 -weapon_s 320 320w-s 0 180 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw4 0 90 170 45 -weapon_s 640 640aw4-s 0 90 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw1 0 0 40 40 -crosshair_2 320 xhairaw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw1 0 0 40 40 -crosshair_2 640 xhairaw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw1 40 0 50 50 -crosshair_2 800 xhairaw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw1 90 0 64 64 -crosshair_2 1024 xhairaw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw1 154 0 80 80 -crosshair_2 1280 xhairaw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 0 180 80 20 +weapon_s 320 320w-s 0 180 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw4 0 90 170 45 +weapon_s 640 640aw4-s 0 90 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_0 320 xhairacid 0 0 128 128 +crosshair_1 320 xhairaw1 0 0 40 40 +crosshair_2 320 xhairaw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw1 0 0 40 40 +crosshair_2 640 xhairaw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw1 40 0 50 50 +crosshair_2 800 xhairaw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw1 90 0 64 64 +crosshair_2 1024 xhairaw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw1 154 0 80 80 +crosshair_2 1280 xhairaw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_bilebombgun.txt b/main/sprites/weapon_bilebombgun.txt index 5d03ea89..9a853bf7 100644 --- a/main/sprites/weapon_bilebombgun.txt +++ b/main/sprites/weapon_bilebombgun.txt @@ -5,7 +5,7 @@ ammo 320 320hud2 0 16 18 18 weapon 640 640aw4 0 0 170 45 weapon_s 640 640aw4-s 0 0 170 45 ammo 640 640hud7 0 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 +crosshair_0 640 xhairbile 0 0 128 64 crosshair_1 320 xhairal1-1 0 0 256 256 crosshair_2 320 xhairal2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 @@ -25,4 +25,4 @@ crosshair_4 1024 xhairmw4 90 0 64 64 crosshair_1 1280 xhairal1-4 0 0 256 256 crosshair_2 1280 xhairal2-4 0 0 256 256 crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_bite2gun.txt b/main/sprites/weapon_bite2gun.txt index 7ec48e1e..b5e7ec66 100644 --- a/main/sprites/weapon_bite2gun.txt +++ b/main/sprites/weapon_bite2gun.txt @@ -1,27 +1,27 @@ 26 -weapon 320 320w 0 120 80 20 -weapon_s 320 320w-s 0 120 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw1 0 180 170 45 -weapon_s 640 640aw1-s 0 180 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 0 120 80 20 +weapon_s 320 320w-s 0 120 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw1 0 180 170 45 +weapon_s 640 640aw1-s 0 180 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_bitegun.txt b/main/sprites/weapon_bitegun.txt index 222f7a6e..8c4b5820 100644 --- a/main/sprites/weapon_bitegun.txt +++ b/main/sprites/weapon_bitegun.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 0 60 80 20 -weapon_s 320 320w-s 0 60 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw1 0 45 170 45 -weapon_s 640 640aw1-s 0 45 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_1 320 xhairaw3 0 0 40 40 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 0 60 80 20 +weapon_s 320 320w-s 0 60 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw1 0 45 170 45 +weapon_s 640 640aw1-s 0 45 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_blink.txt b/main/sprites/weapon_blink.txt index 68977ba6..19350d0f 100644 --- a/main/sprites/weapon_blink.txt +++ b/main/sprites/weapon_blink.txt @@ -5,7 +5,6 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw3 0 45 170 45 weapon_s 640 640aw3-s 0 45 170 45 ammo 640 640hud7 96 96 24 24 - crosshair_1 320 xhairal1-1 0 0 256 256 crosshair_2 320 xhairal2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_charge.txt b/main/sprites/weapon_charge.txt index 196d51fc..ad764303 100644 --- a/main/sprites/weapon_charge.txt +++ b/main/sprites/weapon_charge.txt @@ -5,7 +5,6 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw2 0 90 170 45 weapon_s 640 640aw2-s 0 90 170 45 ammo 640 640hud7 96 96 24 24 - crosshair_1 320 xhairal1-1 0 0 256 256 crosshair_2 320 xhairal2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_claws.txt b/main/sprites/weapon_claws.txt index 3b16e5ff..1009a995 100644 --- a/main/sprites/weapon_claws.txt +++ b/main/sprites/weapon_claws.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 80 140 80 20 -weapon_s 320 320w-s 80 140 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw1 0 135 170 45 -weapon_s 640 640aw1-s 0 135 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_1 320 xhairaw3 0 0 40 40 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 80 140 80 20 +weapon_s 320 320w-s 80 140 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw1 0 135 170 45 +weapon_s 640 640aw1-s 0 135 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_devour.txt b/main/sprites/weapon_devour.txt index 2f499c6d..b86c483c 100644 --- a/main/sprites/weapon_devour.txt +++ b/main/sprites/weapon_devour.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 0 20 80 20 -weapon_s 320 320w-s 0 20 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw2 0 135 170 45 -weapon_s 640 640aw2-s 0 135 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw1 0 0 40 40 -crosshair_2 320 xhairaw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw1 0 0 40 40 -crosshair_2 640 xhairaw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw1 40 0 50 50 -crosshair_2 800 xhairaw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw1 90 0 64 64 -crosshair_2 1024 xhairaw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw1 154 0 80 80 -crosshair_2 1280 xhairaw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 0 20 80 20 +weapon_s 320 320w-s 0 20 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw2 0 135 170 45 +weapon_s 640 640aw2-s 0 135 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw1 0 0 40 40 +crosshair_2 320 xhairaw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw1 0 0 40 40 +crosshair_2 640 xhairaw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw1 40 0 50 50 +crosshair_2 800 xhairaw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw1 90 0 64 64 +crosshair_2 1024 xhairaw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw1 154 0 80 80 +crosshair_2 1280 xhairaw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_divinewind.txt b/main/sprites/weapon_divinewind.txt index 25ab4a4c..193837dd 100644 --- a/main/sprites/weapon_divinewind.txt +++ b/main/sprites/weapon_divinewind.txt @@ -5,7 +5,6 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw3 0 135 170 45 weapon_s 640 640aw3-s 0 135 170 45 ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 crosshair_1 320 xhairax1-1 0 0 256 256 crosshair_2 320 xhairax2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_grenade.txt b/main/sprites/weapon_grenade.txt index 9a1cb864..be8a720e 100644 --- a/main/sprites/weapon_grenade.txt +++ b/main/sprites/weapon_grenade.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 160 160 80 20 -weapon_s 320 320w-s 160 160 80 20 -ammo 320 640hud7 72 96 24 24 -weapon 640 640mw1 0 180 170 45 -weapon_s 640 640mw1-s 0 180 170 45 -ammo 640 640hud7 72 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 0 40 40 -crosshair_2 320 xhairmw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw1 0 0 40 40 -crosshair_2 640 xhairmw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw1 40 0 50 50 -crosshair_2 800 xhairmw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw1 90 0 64 64 -crosshair_2 1024 xhairmw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw1 154 0 80 80 -crosshair_2 1280 xhairmw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 160 80 20 +weapon_s 320 320w-s 160 160 80 20 +ammo 320 640hud7 72 96 24 24 +weapon 640 640mw1 0 180 170 45 +weapon_s 640 640mw1-s 0 180 170 45 +ammo 640 640hud7 72 96 24 24 +crosshair_1 320 xhairmw1 0 0 40 40 +crosshair_2 320 xhairmw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw1 0 0 40 40 +crosshair_2 640 xhairmw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw1 40 0 50 50 +crosshair_2 800 xhairmw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw1 90 0 64 64 +crosshair_2 1024 xhairmw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw1 154 0 80 80 +crosshair_2 1280 xhairmw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_grenadegun.txt b/main/sprites/weapon_grenadegun.txt index afd05fcd..de727e34 100644 --- a/main/sprites/weapon_grenadegun.txt +++ b/main/sprites/weapon_grenadegun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 160 120 80 20 -weapon_s 320 320w-s 160 120 80 20 -ammo 320 640hud7 72 96 24 24 -weapon 640 640mw1 0 0 170 45 -weapon_s 640 640mw1-s 0 0 170 45 -ammo 640 640hud7 72 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairgl140 0 0 40 0 -crosshair_2 320 xhairgl240 0 0 40 0 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairgl140 0 0 40 0 -crosshair_2 640 xhairgl240 0 0 40 0 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairgl140 0 0 50 0 -crosshair_2 800 xhairgl240 0 0 50 0 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairgl164 0 0 64 0 -crosshair_2 1024 xhairgl264 0 0 64 0 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairgl180 0 0 80 0 -crosshair_2 1280 xhairgl280 0 0 80 0 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 120 80 20 +weapon_s 320 320w-s 160 120 80 20 +ammo 320 640hud7 72 96 24 24 +weapon 640 640mw1 0 0 170 45 +weapon_s 640 640mw1-s 0 0 170 45 +ammo 640 640hud7 72 96 24 24 +crosshair_0 320 xhairgl 0 0 64 0 +crosshair_1 320 xhairgl140 0 0 40 0 +crosshair_2 320 xhairgl240 0 0 40 0 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairgl140 0 0 40 0 +crosshair_2 640 xhairgl240 0 0 40 0 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairgl140 0 0 50 0 +crosshair_2 800 xhairgl240 0 0 50 0 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairgl164 0 0 64 0 +crosshair_2 1024 xhairgl264 0 0 64 0 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairgl180 0 0 80 0 +crosshair_2 1280 xhairgl280 0 0 80 0 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_healingspray.txt b/main/sprites/weapon_healingspray.txt index 43869e68..08f131bb 100644 --- a/main/sprites/weapon_healingspray.txt +++ b/main/sprites/weapon_healingspray.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 0 200 80 20 -weapon_s 320 320w-s 0 200 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw4 0 135 170 45 -weapon_s 640 640aw4-s 0 135 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_1 320 xhairaw3 0 0 40 40 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 0 200 80 20 +weapon_s 320 320w-s 0 200 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw4 0 135 170 45 +weapon_s 640 640aw4-s 0 135 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_heavymachinegun.txt b/main/sprites/weapon_heavymachinegun.txt index a8137034..1c47c52f 100644 --- a/main/sprites/weapon_heavymachinegun.txt +++ b/main/sprites/weapon_heavymachinegun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 160 100 80 20 -weapon_s 320 320w-s 160 100 80 20 -ammo 320 640hud7 0 96 24 24 -weapon 640 640mw2 0 45 170 45 -weapon_s 640 640mw2-s 0 45 170 45 -ammo 640 640hud7 0 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 160 40 40 -crosshair_2 320 xhairmw2 0 160 40 40 -crosshair_3 320 xhairmw3 0 160 40 40 -crosshair_4 320 xhairmw4 0 160 40 40 -crosshair_1 640 xhairmw1 0 160 40 40 -crosshair_2 640 xhairmw2 0 160 40 40 -crosshair_3 640 xhairmw3 0 160 40 40 -crosshair_4 640 xhairmw4 0 160 40 40 -crosshair_1 800 xhairmw1 40 160 50 50 -crosshair_2 800 xhairmw2 40 160 50 50 -crosshair_3 800 xhairmw3 40 160 50 50 -crosshair_4 800 xhairmw4 40 160 50 50 -crosshair_1 1024 xhairmw1 90 160 64 64 -crosshair_2 1024 xhairmw2 90 160 64 64 -crosshair_3 1024 xhairmw3 90 160 64 64 -crosshair_4 1024 xhairmw4 90 160 64 64 -crosshair_1 1280 xhairmw1 154 160 80 80 -crosshair_2 1280 xhairmw2 154 160 80 80 -crosshair_3 1280 xhairmw3 154 160 80 80 -crosshair_4 1280 xhairmw4 154 160 80 80 +weapon 320 320w 160 100 80 20 +weapon_s 320 320w-s 160 100 80 20 +ammo 320 640hud7 0 96 24 24 +weapon 640 640mw2 0 45 170 45 +weapon_s 640 640mw2-s 0 45 170 45 +ammo 640 640hud7 0 96 24 24 +crosshair_0 320 xhairhmg 0 0 64 64 +crosshair_1 320 xhairmw1 0 160 40 40 +crosshair_2 320 xhairmw2 0 160 40 40 +crosshair_3 320 xhairmw3 0 160 40 40 +crosshair_4 320 xhairmw4 0 160 40 40 +crosshair_1 640 xhairmw1 0 160 40 40 +crosshair_2 640 xhairmw2 0 160 40 40 +crosshair_3 640 xhairmw3 0 160 40 40 +crosshair_4 640 xhairmw4 0 160 40 40 +crosshair_1 800 xhairmw1 40 160 50 50 +crosshair_2 800 xhairmw2 40 160 50 50 +crosshair_3 800 xhairmw3 40 160 50 50 +crosshair_4 800 xhairmw4 40 160 50 50 +crosshair_1 1024 xhairmw1 90 160 64 64 +crosshair_2 1024 xhairmw2 90 160 64 64 +crosshair_3 1024 xhairmw3 90 160 64 64 +crosshair_4 1024 xhairmw4 90 160 64 64 +crosshair_1 1280 xhairmw1 154 160 80 80 +crosshair_2 1280 xhairmw2 154 160 80 80 +crosshair_3 1280 xhairmw3 154 160 80 80 +crosshair_4 1280 xhairmw4 154 160 80 80 diff --git a/main/sprites/weapon_hivegun.txt b/main/sprites/weapon_hivegun.txt index 867e2d57..04a12886 100644 --- a/main/sprites/weapon_hivegun.txt +++ b/main/sprites/weapon_hivegun.txt @@ -2,7 +2,6 @@ weapon 320 320hud1 0 200 80 20 weapon_s 320 320hud1 0 220 80 20 ammo 320 640hud7 96 96 24 24 -crosshair_0 320 crosshairs 24 0 24 24 weapon 640 640mw1 0 180 170 45 weapon_s 640 640mw1-s 0 180 170 45 -ammo 640 640hud7 96 96 24 24 \ No newline at end of file +ammo 640 640hud7 96 96 24 24 diff --git a/main/sprites/weapon_knife.txt b/main/sprites/weapon_knife.txt index 32705d05..f6498bbb 100644 --- a/main/sprites/weapon_knife.txt +++ b/main/sprites/weapon_knife.txt @@ -1,29 +1,28 @@ 27 -weapon 320 320w 160 140 80 20 -weapon_s 320 320w-s 160 140 80 20 -ammo 320 320hud2 0 16 18 18 -weapon 640 640mw1 0 135 170 45 -weapon_s 640 640mw1-s 0 135 170 45 -ammo 640 640hud7 0 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 0 40 40 -crosshair_2 320 xhairmw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw1 0 0 40 40 -crosshair_2 640 xhairmw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw1 40 0 50 50 -crosshair_2 800 xhairmw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw1 90 0 64 64 -crosshair_2 1024 xhairmw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw1 154 0 80 80 -crosshair_2 1280 xhairmw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 140 80 20 +weapon_s 320 320w-s 160 140 80 20 +ammo 320 320hud2 0 16 18 18 +weapon 640 640mw1 0 135 170 45 +weapon_s 640 640mw1-s 0 135 170 45 +ammo 640 640hud7 0 72 24 24 +crosshair_1 320 xhairmw1 0 0 40 40 +crosshair_2 320 xhairmw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw1 0 0 40 40 +crosshair_2 640 xhairmw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw1 40 0 50 50 +crosshair_2 800 xhairmw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw1 90 0 64 64 +crosshair_2 1024 xhairmw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw1 154 0 80 80 +crosshair_2 1280 xhairmw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_leap.txt b/main/sprites/weapon_leap.txt index 89af4185..5eb1ad43 100644 --- a/main/sprites/weapon_leap.txt +++ b/main/sprites/weapon_leap.txt @@ -5,7 +5,6 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw1 0 0 170 45 weapon_s 640 640aw1-s 0 0 170 45 ammo 640 640hud7 96 96 24 24 - crosshair_1 320 xhairal1-1 0 0 256 256 crosshair_2 320 xhairal2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_machinegun.txt b/main/sprites/weapon_machinegun.txt index 3f815d97..ce7534bb 100644 --- a/main/sprites/weapon_machinegun.txt +++ b/main/sprites/weapon_machinegun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 160 0 80 20 -weapon_s 320 320w-s 160 0 80 20 -ammo 320 640hud7 48 72 24 24 -weapon 640 640mw2 0 180 170 45 -weapon_s 640 640mw2-s 0 180 170 45 -ammo 640 640hud7 48 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw5 0 0 40 40 -crosshair_2 320 xhairmw6 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw5 0 0 40 40 -crosshair_2 640 xhairmw6 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw5 40 0 50 50 -crosshair_2 800 xhairmw6 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw5 90 0 64 64 -crosshair_2 1024 xhairmw6 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw5 154 0 80 80 -crosshair_2 1280 xhairmw6 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 0 80 20 +weapon_s 320 320w-s 160 0 80 20 +ammo 320 640hud7 48 72 24 24 +weapon 640 640mw2 0 180 170 45 +weapon_s 640 640mw2-s 0 180 170 45 +ammo 640 640hud7 48 72 24 24 +crosshair_0 320 xhairmg 0 0 64 64 +crosshair_1 320 xhairmw5 0 0 40 40 +crosshair_2 320 xhairmw6 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw5 0 0 40 40 +crosshair_2 640 xhairmw6 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw5 40 0 50 50 +crosshair_2 800 xhairmw6 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw5 90 0 64 64 +crosshair_2 1024 xhairmw6 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw5 154 0 80 80 +crosshair_2 1280 xhairmw6 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_metabolize.txt b/main/sprites/weapon_metabolize.txt index 84662c5d..bd794ebc 100644 --- a/main/sprites/weapon_metabolize.txt +++ b/main/sprites/weapon_metabolize.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 0 200 80 20 -weapon_s 320 320w-s 0 200 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw3 0 180 170 45 -weapon_s 640 640aw3-s 0 180 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw3 0 0 40 40 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 0 200 80 20 +weapon_s 320 320w-s 0 200 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw3 0 180 170 45 +weapon_s 640 640aw3-s 0 180 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_mine.txt b/main/sprites/weapon_mine.txt index 4422cb64..2ec0eeb3 100644 --- a/main/sprites/weapon_mine.txt +++ b/main/sprites/weapon_mine.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 160 40 80 20 -weapon_s 320 320w-s 160 40 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640mw2 0 0 170 45 -weapon_s 640 640mw2-s 0 0 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 0 40 40 -crosshair_2 320 xhairmw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw1 0 0 40 40 -crosshair_2 640 xhairmw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw1 40 0 50 50 -crosshair_2 800 xhairmw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw1 90 0 64 64 -crosshair_2 1024 xhairmw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw1 154 0 80 80 -crosshair_2 1280 xhairmw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 40 80 20 +weapon_s 320 320w-s 160 40 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640mw2 0 0 170 45 +weapon_s 640 640mw2-s 0 0 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairmw1 0 0 40 40 +crosshair_2 320 xhairmw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw1 0 0 40 40 +crosshair_2 640 xhairmw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw1 40 0 50 50 +crosshair_2 800 xhairmw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw1 90 0 64 64 +crosshair_2 1024 xhairmw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw1 154 0 80 80 +crosshair_2 1280 xhairmw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_nukegun.txt b/main/sprites/weapon_nukegun.txt index bef9e749..97504b90 100644 --- a/main/sprites/weapon_nukegun.txt +++ b/main/sprites/weapon_nukegun.txt @@ -2,7 +2,6 @@ weapon 320 320hud1 0 200 80 20 weapon_s 320 320hud1 0 220 80 20 ammo 320 640hud7 96 96 24 24 -crosshair_0 320 crosshairs 24 0 24 24 weapon 640 640hud1 0 0 170 45 weapon_s 640 640hud4 0 0 170 45 ammo 640 640hud7 96 96 24 24 diff --git a/main/sprites/weapon_parasite.txt b/main/sprites/weapon_parasite.txt index 15aef9b3..b36c3c10 100644 --- a/main/sprites/weapon_parasite.txt +++ b/main/sprites/weapon_parasite.txt @@ -1,26 +1,26 @@ 25 -weapon 320 320w 80 80 80 20 -weapon_s 320 320w-s 80 80 80 20 -weapon 640 640aw3 0 0 170 45 -weapon_s 640 640aw3-s 0 0 170 45 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw1 0 0 40 40 -crosshair_2 320 xhairaw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw1 0 0 40 40 -crosshair_2 640 xhairaw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw1 40 0 50 50 -crosshair_2 800 xhairaw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw1 90 0 64 64 -crosshair_2 1024 xhairaw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw1 154 0 80 80 -crosshair_2 1280 xhairaw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 80 80 80 20 +weapon_s 320 320w-s 80 80 80 20 +weapon 640 640aw3 0 0 170 45 +weapon_s 640 640aw3-s 0 0 170 45 +crosshair_0 320 xhairpara 0 0 128 128 +crosshair_1 320 xhairaw1 0 0 40 40 +crosshair_2 320 xhairaw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw1 0 0 40 40 +crosshair_2 640 xhairaw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw1 40 0 50 50 +crosshair_2 800 xhairaw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw1 90 0 64 64 +crosshair_2 1024 xhairaw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw1 154 0 80 80 +crosshair_2 1280 xhairaw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_pistol.txt b/main/sprites/weapon_pistol.txt index 6ec0ae4c..41685b54 100644 --- a/main/sprites/weapon_pistol.txt +++ b/main/sprites/weapon_pistol.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 160 60 80 20 -weapon_s 320 320w-s 160 60 80 20 -ammo 320 640hud7 24 72 24 24 -weapon 640 640mw1 0 90 170 45 -weapon_s 640 640mw1-s 0 90 170 45 -ammo 640 640hud7 24 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 0 40 40 -crosshair_2 320 xhairmw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw1 0 0 40 40 -crosshair_2 640 xhairmw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw1 40 0 50 50 -crosshair_2 800 xhairmw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw1 90 0 64 64 -crosshair_2 1024 xhairmw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw1 154 0 80 80 -crosshair_2 1280 xhairmw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 60 80 20 +weapon_s 320 320w-s 160 60 80 20 +ammo 320 640hud7 24 72 24 24 +weapon 640 640mw1 0 90 170 45 +weapon_s 640 640mw1-s 0 90 170 45 +ammo 640 640hud7 24 72 24 24 +crosshair_0 320 xhairp 0 0 64 64 +crosshair_1 320 xhairmw1 0 0 40 40 +crosshair_2 320 xhairmw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw1 0 0 40 40 +crosshair_2 640 xhairmw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw1 40 0 50 50 +crosshair_2 800 xhairmw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw1 90 0 64 64 +crosshair_2 1024 xhairmw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw1 154 0 80 80 +crosshair_2 1280 xhairmw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_primalscream.txt b/main/sprites/weapon_primalscream.txt index e533e666..9dac7ad5 100644 --- a/main/sprites/weapon_primalscream.txt +++ b/main/sprites/weapon_primalscream.txt @@ -5,7 +5,6 @@ ammo 320 320hud2 0 16 18 18 weapon 640 640aw2 0 180 170 45 weapon_s 640 640aw2-s 0 180 170 45 ammo 640 640hud7 0 72 24 24 - crosshair_1 320 xhairaps1-1 0 0 256 256 crosshair_2 320 xhairaps2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 @@ -18,11 +17,11 @@ crosshair_1 800 xhairaps1-2 0 0 256 256 crosshair_2 800 xhairaps2-2 0 0 256 256 crosshair_3 800 xhairmw3 40 0 50 50 crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaps1-3 0 0 256 256 -crosshair_2 1024 xhairaps2-3 0 0 256 256 +crosshair_1 1024 xhairaps1-3 0 0 256 256 +crosshair_2 1024 xhairaps2-3 0 0 256 256 crosshair_3 1024 xhairmw3 90 0 64 64 crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaps1-4 0 0 256 256 -crosshair_2 1280 xhairaps2-4 0 0 256 256 +crosshair_1 1280 xhairaps1-4 0 0 256 256 +crosshair_2 1280 xhairaps2-4 0 0 256 256 crosshair_3 1280 xhairmw3 154 0 80 80 crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_shotgun.txt b/main/sprites/weapon_shotgun.txt index ec4a41dc..530ca15d 100644 --- a/main/sprites/weapon_shotgun.txt +++ b/main/sprites/weapon_shotgun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 160 80 80 20 -weapon_s 320 320w-s 160 80 80 20 -ammo 320 640hud7 0 72 24 24 -weapon 640 640mw2 0 135 170 45 -weapon_s 640 640mw2-s 0 135 170 45 -ammo 640 640hud7 0 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 80 40 40 -crosshair_2 320 xhairmw2 0 80 40 40 -crosshair_3 320 xhairmw3 0 80 40 40 -crosshair_4 320 xhairmw4 0 80 40 40 -crosshair_1 640 xhairmw1 0 80 40 40 -crosshair_2 640 xhairmw2 0 80 40 40 -crosshair_3 640 xhairmw3 0 80 40 40 -crosshair_4 640 xhairmw4 0 80 40 40 -crosshair_1 800 xhairmw1 40 80 50 50 -crosshair_2 800 xhairmw2 40 80 50 50 -crosshair_3 800 xhairmw3 40 80 50 50 -crosshair_4 800 xhairmw4 40 80 50 50 -crosshair_1 1024 xhairmw1 90 80 64 64 -crosshair_2 1024 xhairmw2 90 80 64 64 -crosshair_3 1024 xhairmw3 90 80 64 64 -crosshair_4 1024 xhairmw4 90 80 64 64 -crosshair_1 1280 xhairmw1 154 80 80 80 -crosshair_2 1280 xhairmw2 154 80 80 80 -crosshair_3 1280 xhairmw3 154 80 80 80 -crosshair_4 1280 xhairmw4 154 80 80 80 +weapon 320 320w 160 80 80 20 +weapon_s 320 320w-s 160 80 80 20 +ammo 320 640hud7 0 72 24 24 +weapon 640 640mw2 0 135 170 45 +weapon_s 640 640mw2-s 0 135 170 45 +ammo 640 640hud7 0 72 24 24 +crosshair_0 320 xhairsg 0 0 64 64 +crosshair_1 320 xhairmw1 0 80 40 40 +crosshair_2 320 xhairmw2 0 80 40 40 +crosshair_3 320 xhairmw3 0 80 40 40 +crosshair_4 320 xhairmw4 0 80 40 40 +crosshair_1 640 xhairmw1 0 80 40 40 +crosshair_2 640 xhairmw2 0 80 40 40 +crosshair_3 640 xhairmw3 0 80 40 40 +crosshair_4 640 xhairmw4 0 80 40 40 +crosshair_1 800 xhairmw1 40 80 50 50 +crosshair_2 800 xhairmw2 40 80 50 50 +crosshair_3 800 xhairmw3 40 80 50 50 +crosshair_4 800 xhairmw4 40 80 50 50 +crosshair_1 1024 xhairmw1 90 80 64 64 +crosshair_2 1024 xhairmw2 90 80 64 64 +crosshair_3 1024 xhairmw3 90 80 64 64 +crosshair_4 1024 xhairmw4 90 80 64 64 +crosshair_1 1280 xhairmw1 154 80 80 80 +crosshair_2 1280 xhairmw2 154 80 80 80 +crosshair_3 1280 xhairmw3 154 80 80 80 +crosshair_4 1280 xhairmw4 154 80 80 80 diff --git a/main/sprites/weapon_spikegun.txt b/main/sprites/weapon_spikegun.txt index dc42890f..51e385a6 100644 --- a/main/sprites/weapon_spikegun.txt +++ b/main/sprites/weapon_spikegun.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 80 120 80 20 -weapon_s 320 320w-s 80 120 80 20 -ammo 320 320hud2 0 16 18 18 -weapon 640 640aw2 0 0 170 45 -weapon_s 640 640aw2-s 0 0 170 45 -ammo 640 640hud7 0 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw1 0 0 40 40 -crosshair_2 320 xhairaw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw1 0 0 40 40 -crosshair_2 640 xhairaw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw1 40 0 50 50 -crosshair_2 800 xhairaw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw1 90 0 64 64 -crosshair_2 1024 xhairaw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw1 154 0 80 80 -crosshair_2 1280 xhairaw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 80 120 80 20 +weapon_s 320 320w-s 80 120 80 20 +ammo 320 320hud2 0 16 18 18 +weapon 640 640aw2 0 0 170 45 +weapon_s 640 640aw2-s 0 0 170 45 +ammo 640 640hud7 0 72 24 24 +crosshair_0 320 xhairalien 0 0 128 128 +crosshair_1 320 xhairaw1 0 0 40 40 +crosshair_2 320 xhairaw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw1 0 0 40 40 +crosshair_2 640 xhairaw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw1 40 0 50 50 +crosshair_2 800 xhairaw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw1 90 0 64 64 +crosshair_2 1024 xhairaw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw1 154 0 80 80 +crosshair_2 1280 xhairaw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_spit.txt b/main/sprites/weapon_spit.txt index 67584094..832f58ed 100644 --- a/main/sprites/weapon_spit.txt +++ b/main/sprites/weapon_spit.txt @@ -1,28 +1,28 @@ 27 -weapon 320 320w 0 160 80 20 -weapon_s 320 320w-s 0 160 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw1 0 90 170 45 -weapon_s 640 640aw1-s 0 90 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaw1 0 0 40 40 -crosshair_2 320 xhairaw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw1 0 0 40 40 -crosshair_2 640 xhairaw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw1 40 0 50 50 -crosshair_2 800 xhairaw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw1 90 0 64 64 -crosshair_2 1024 xhairaw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw1 154 0 80 80 -crosshair_2 1280 xhairaw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +weapon 320 320w 0 160 80 20 +weapon_s 320 320w-s 0 160 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw1 0 90 170 45 +weapon_s 640 640aw1-s 0 90 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_0 320 xhairspit 0 0 64 64 +crosshair_1 320 xhairaw1 0 0 40 40 +crosshair_2 320 xhairaw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw1 0 0 40 40 +crosshair_2 640 xhairaw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw1 40 0 50 50 +crosshair_2 800 xhairaw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw1 90 0 64 64 +crosshair_2 1024 xhairaw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw1 154 0 80 80 +crosshair_2 1280 xhairaw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_spore.txt b/main/sprites/weapon_spore.txt index e15ad482..75328606 100644 --- a/main/sprites/weapon_spore.txt +++ b/main/sprites/weapon_spore.txt @@ -5,7 +5,7 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640mw2 0 90 170 45 weapon_s 640 640mw2-s 0 90 170 45 ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 +crosshair_0 320 xhairalien 0 0 128 128 crosshair_1 320 xhairas1-1 0 0 256 256 crosshair_2 320 xhairas2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_stomp.txt b/main/sprites/weapon_stomp.txt index af06b373..1f7edbd8 100644 --- a/main/sprites/weapon_stomp.txt +++ b/main/sprites/weapon_stomp.txt @@ -1,27 +1,27 @@ 26 -weapon 320 320w 80 60 80 20 -weapon_s 320 320w-s 80 60 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw4 0 45 170 45 -weapon_s 640 640aw4-s 0 45 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 80 60 80 20 +weapon_s 320 320w-s 80 60 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw4 0 45 170 45 +weapon_s 640 640aw4-s 0 45 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_swipe.txt b/main/sprites/weapon_swipe.txt index 7808ec99..1560a4c9 100644 --- a/main/sprites/weapon_swipe.txt +++ b/main/sprites/weapon_swipe.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 80 0 80 20 -weapon_s 320 320w-s 80 0 80 20 -ammo 320 640hud7 96 96 24 24 -weapon 640 640aw4 0 180 170 45 -weapon_s 640 640aw4-s 0 180 170 45 -ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 24 24 24 24 -crosshair_1 320 xhairaw3 0 0 40 40 -crosshair_2 320 xhairaw4 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaw3 0 0 40 40 -crosshair_2 640 xhairaw4 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaw3 40 0 50 50 -crosshair_2 800 xhairaw4 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaw3 90 0 64 64 -crosshair_2 1024 xhairaw4 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaw3 154 0 80 80 -crosshair_2 1280 xhairaw4 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 80 0 80 20 +weapon_s 320 320w-s 80 0 80 20 +ammo 320 640hud7 96 96 24 24 +weapon 640 640aw4 0 180 170 45 +weapon_s 640 640aw4-s 0 180 170 45 +ammo 640 640hud7 96 96 24 24 +crosshair_1 320 xhairaw3 0 0 40 40 +crosshair_2 320 xhairaw4 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairaw3 0 0 40 40 +crosshair_2 640 xhairaw4 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairaw3 40 0 50 50 +crosshair_2 800 xhairaw4 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaw3 90 0 64 64 +crosshair_2 1024 xhairaw4 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaw3 154 0 80 80 +crosshair_2 1280 xhairaw4 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 diff --git a/main/sprites/weapon_umbra.txt b/main/sprites/weapon_umbra.txt index fbb8ac19..5d1bc26e 100644 --- a/main/sprites/weapon_umbra.txt +++ b/main/sprites/weapon_umbra.txt @@ -5,7 +5,7 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw3 0 90 170 45 weapon_s 640 640aw3-s 0 90 170 45 ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 +crosshair_0 320 xhairalien 0 0 128 128 crosshair_1 320 xhairau1-1 0 0 256 256 crosshair_2 320 xhairau2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 diff --git a/main/sprites/weapon_webspinner.txt b/main/sprites/weapon_webspinner.txt index d2aafc3b..756127c7 100644 --- a/main/sprites/weapon_webspinner.txt +++ b/main/sprites/weapon_webspinner.txt @@ -5,24 +5,24 @@ ammo 320 640hud7 96 96 24 24 weapon 640 640aw2 0 45 170 45 weapon_s 640 640aw2-s 0 45 170 45 ammo 640 640hud7 96 96 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairaweb1-1 0 0 256 256 -crosshair_2 320 xhairaweb2-1 0 0 256 256 +crosshair_0 320 xhairweb 0 0 64 64 +crosshair_1 320 xhairaweb1-1 0 0 256 256 +crosshair_2 320 xhairaweb2-1 0 0 256 256 crosshair_3 320 xhairmw3 0 0 40 40 crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairaweb1-1 0 0 256 256 -crosshair_2 640 xhairaweb2-1 0 0 256 256 +crosshair_1 640 xhairaweb1-1 0 0 256 256 +crosshair_2 640 xhairaweb2-1 0 0 256 256 crosshair_3 640 xhairmw3 0 0 40 40 crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairaweb1-2 0 0 256 256 -crosshair_2 800 xhairaweb2-2 0 0 256 256 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairaweb1-3 0 0 256 256 -crosshair_2 1024 xhairaweb2-3 0 0 256 256 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairaweb1-4 0 0 256 256 -crosshair_2 1280 xhairaweb2-4 0 0 256 256 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file +crosshair_1 800 xhairaweb1-2 0 0 256 256 +crosshair_2 800 xhairaweb2-2 0 0 256 256 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairaweb1-3 0 0 256 256 +crosshair_2 1024 xhairaweb2-3 0 0 256 256 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairaweb1-4 0 0 256 256 +crosshair_2 1280 xhairaweb2-4 0 0 256 256 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80 \ No newline at end of file diff --git a/main/sprites/weapon_welder.txt b/main/sprites/weapon_welder.txt index f1090b71..aea7f9d0 100644 --- a/main/sprites/weapon_welder.txt +++ b/main/sprites/weapon_welder.txt @@ -1,28 +1,27 @@ 26 -weapon 320 320w 160 20 80 20 -weapon_s 320 320w-s 160 20 80 20 -ammo 320 640hud7 0 72 24 24 -weapon 640 640mw1 0 45 170 45 -weapon_s 640 640mw1-s 0 45 170 45 -ammo 640 640hud7 0 72 24 24 -crosshair_0 320 nl_crosshairs 72 0 24 24 -crosshair_1 320 xhairmw1 0 0 40 40 -crosshair_2 320 xhairmw2 0 0 40 40 -crosshair_3 320 xhairmw3 0 0 40 40 -crosshair_4 320 xhairmw4 0 0 40 40 -crosshair_1 640 xhairmw1 0 0 40 40 -crosshair_2 640 xhairmw2 0 0 40 40 -crosshair_3 640 xhairmw3 0 0 40 40 -crosshair_4 640 xhairmw4 0 0 40 40 -crosshair_1 800 xhairmw1 40 0 50 50 -crosshair_2 800 xhairmw2 40 0 50 50 -crosshair_3 800 xhairmw3 40 0 50 50 -crosshair_4 800 xhairmw4 40 0 50 50 -crosshair_1 1024 xhairmw1 90 0 64 64 -crosshair_2 1024 xhairmw2 90 0 64 64 -crosshair_3 1024 xhairmw3 90 0 64 64 -crosshair_4 1024 xhairmw4 90 0 64 64 -crosshair_1 1280 xhairmw1 154 0 80 80 -crosshair_2 1280 xhairmw2 154 0 80 80 -crosshair_3 1280 xhairmw3 154 0 80 80 -crosshair_4 1280 xhairmw4 154 0 80 80 +weapon 320 320w 160 20 80 20 +weapon_s 320 320w-s 160 20 80 20 +ammo 320 640hud7 0 72 24 24 +weapon 640 640mw1 0 45 170 45 +weapon_s 640 640mw1-s 0 45 170 45 +ammo 640 640hud7 0 72 24 24 +crosshair_1 320 xhairmw1 0 0 40 40 +crosshair_2 320 xhairmw2 0 0 40 40 +crosshair_3 320 xhairmw3 0 0 40 40 +crosshair_4 320 xhairmw4 0 0 40 40 +crosshair_1 640 xhairmw1 0 0 40 40 +crosshair_2 640 xhairmw2 0 0 40 40 +crosshair_3 640 xhairmw3 0 0 40 40 +crosshair_4 640 xhairmw4 0 0 40 40 +crosshair_1 800 xhairmw1 40 0 50 50 +crosshair_2 800 xhairmw2 40 0 50 50 +crosshair_3 800 xhairmw3 40 0 50 50 +crosshair_4 800 xhairmw4 40 0 50 50 +crosshair_1 1024 xhairmw1 90 0 64 64 +crosshair_2 1024 xhairmw2 90 0 64 64 +crosshair_3 1024 xhairmw3 90 0 64 64 +crosshair_4 1024 xhairmw4 90 0 64 64 +crosshair_1 1280 xhairmw1 154 0 80 80 +crosshair_2 1280 xhairmw2 154 0 80 80 +crosshair_3 1280 xhairmw3 154 0 80 80 +crosshair_4 1280 xhairmw4 154 0 80 80