From ed1ccf98f2022195562256dee6aac9c6ffa0d429 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 25 Mar 2009 18:31:05 +0000 Subject: [PATCH] r6277 | div0 | 2009-03-24 16:24:18 +0100 (Tue, 24 Mar 2009) | 2 lines campaign rename r6278 | div0 | 2009-03-24 18:26:57 +0100 (Tue, 24 Mar 2009) | 3 lines - add a "forbidden" flag to mapinfo that's stronger than hidden, and set it for turret_test and walker_pathtest2 - move gun down by 2 more units when in shootfromcenter mode r6279 | div0 | 2009-03-24 20:22:55 +0100 (Tue, 24 Mar 2009) | 2 lines comment-only changes, updated locations that refer to effects r6280 | m0rfar | 2009-03-24 21:29:17 +0100 (Tue, 24 Mar 2009) | 1 line Add glowmaps to the OLD ctf flag skins. To simulate the old fullbright style. r6281 | m0rfar | 2009-03-24 22:03:30 +0100 (Tue, 24 Mar 2009) | 1 line invisibility was too strong imo. raised alpha to 0.15 r6282 | div0 | 2009-03-25 11:03:01 +0100 (Wed, 25 Mar 2009) | 2 lines swap silvercity with strength (skill difference) r6283 | div0 | 2009-03-25 19:22:11 +0100 (Wed, 25 Mar 2009) | 2 lines nixnex: remove non-normal weapons git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@6284 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .patchsets | 2 +- data/defaultNexuiz.cfg | 6 +- data/effectinfo.txt | 101 ++++++++++++------ .../{campaign.txt => campaignNexuiz25.txt} | 6 +- data/maps/turret_test.mapinfo | 2 +- data/maps/walker_pathtest2.mapinfo | 11 ++ data/models/domination/dom_axe_glow.tga | Bin 0 -> 556 bytes data/models/domination/dom_bolt_glow.tga | Bin 0 -> 2092 bytes data/qcsrc/common/gamecommand.qc | 4 +- data/qcsrc/common/mapinfo.qc | 4 + data/qcsrc/common/mapinfo.qh | 1 + data/qcsrc/menu/nexuiz/maplist.c | 4 +- data/qcsrc/server/bots.qc | 1 - data/qcsrc/server/cl_weapons.qc | 2 + data/qcsrc/server/g_world.qc | 18 ++-- data/qcsrc/server/gamecommand.qc | 8 +- data/qcsrc/server/miscfunctions.qc | 4 +- 17 files changed, 111 insertions(+), 63 deletions(-) rename data/maps/{campaign.txt => campaignNexuiz25.txt} (98%) create mode 100644 data/maps/walker_pathtest2.mapinfo create mode 100644 data/models/domination/dom_axe_glow.tga create mode 100644 data/models/domination/dom_bolt_glow.tga diff --git a/.patchsets b/.patchsets index 8b863107d..a67ea591e 100644 --- a/.patchsets +++ b/.patchsets @@ -1,2 +1,2 @@ master = svn://svn.icculus.org/nexuiz/trunk -revisions_applied = 1-6039,6044-6275 +revisions_applied = 1-6039,6044-6283 diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 586735080..71f23d65c 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -406,7 +406,7 @@ set g_minstagib 0 "enable minstagib" set g_minstagib_extralives 2 "how many extra lives you will get per powerup" set g_minstagib_ammo_start 10 "starting ammo" set g_minstagib_ammo_drop 5 "how much ammo you'll get for weapons or cells" -set g_minstagib_invis_alpha 0.05 +set g_minstagib_invis_alpha 0.15 set g_minstagib_speed_jumpheight 1.8 set g_minstagib_speed_moverate 1.25 set g_vampire 0 @@ -952,8 +952,8 @@ set quit_and_redirect "" "set to an IP to redirect all players at the end of the // singleplayer campaign set g_campaign 0 -seta g_campaign_name "" -seta g_campaign_index 0 +seta g_campaign_name "Nexuiz25" +set g_campaign_index 0 set g_campaign_skill 0 alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0" diff --git a/data/effectinfo.txt b/data/effectinfo.txt index cbde8b164..0f70d15f6 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -4,6 +4,7 @@ // used in qcsrc/server/bots.qc: te_wizspike(org) // used in qcsrc/server/bots.qc: //te_wizspike(e.origin) // used in qcsrc/server/bots.qc: //te_wizspike(e.nearestwaypoint.wpnearestpoint) +// used in qcsrc/server/havocbot.qc: // te_wizspike(newgoal.origin) effect TE_WIZSPIKE countabsolute 1 type static @@ -31,6 +32,7 @@ velocityjitter 32 32 32 // used in qcsrc/server/bots.qc: te_knightspike(start) // used in qcsrc/server/bots.qc: te_knightspike(org) // used in qcsrc/server/bots.qc: te_knightspike(org) +// used in qcsrc/server/w_seeker.qc: te_knightspike(org2) effect TE_KNIGHTSPIKE countabsolute 1 type decal @@ -237,7 +239,7 @@ velocityjitter 64 64 64 // used in qcsrc/server/bots.qc: //te_gunshot(org) // used in qcsrc/server/bots.qc: te_gunshot(org) // used in qcsrc/server/bots.qc: te_gunshot(org) -// used in qcsrc/server/bots.qc: te_gunshot(org) +// used in qcsrc/server/bots.qc: // te_gunshot(org) // used in qcsrc/server/bots.qc: //te_gunshot(end) effect TE_GUNSHOT countabsolute 1 @@ -315,7 +317,7 @@ velocityjitter 128 128 128 // mortar/hagar explosion (smaller than rocket) // decal -// used nowhere in code +// used in qcsrc/server/cl_client.qc: te_explosion(org) effect TE_EXPLOSION countabsolute 1 type decal @@ -596,6 +598,7 @@ velocityjitter 0 0 256 // nex beam // used in qcsrc/server/w_minstanex.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos) +// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos) effect TE_TEI_G3 countabsolute 1 type beam @@ -740,9 +743,8 @@ velocityjitter 512 512 512 // bloody impact effect indicating damage -// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200)) -// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("blood"), hitloc, force, bound(0, damage, 200)) -// used in qcsrc/server/g_violence.qc: pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10) +// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10) +// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("blood"), org, vel, amount * 16) effect blood count 0.333 type blood @@ -766,8 +768,8 @@ originjitter 11 11 11 // player teleport effect -// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1) -// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1) +// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1) +// used in qcsrc/server/t_teleporters.qc: pointparticles(particleeffectnum("teleport"), to + v_forward * 32, '0 0 0', 1) effect teleport count 1000 type spark @@ -820,7 +822,6 @@ velocitymultiplier 0.5 // func_stardust effect, used in some maps to indicate teleporters -// used in qcsrc/server/assault.qc: //self.effects = EF_STARDUST // used in qcsrc/server/g_triggers.qc: self.effects = EF_STARDUST // used in qcsrc/server/portals.qc: portal.effects = EF_STARDUST | EF_BLUE effect EF_STARDUST @@ -869,6 +870,8 @@ lightcolor 2 2 2 +// used in qcsrc/server/w_hlac.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) +// used in qcsrc/server/w_hlac.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) // used in qcsrc/server/w_laser.qc: pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) effect laser_muzzleflash count 1 @@ -888,7 +891,8 @@ lightcolor 3 0.1 0.1 // decal -// used in qcsrc/server/w_laser.qc: pointparticles(particleeffectnum("laser_impact"), org2, normal * 1000, 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("laser_impact"), org2, backoff * 1000, 1) effect laser_impact countabsolute 1 type decal @@ -933,6 +937,7 @@ sizeincrease 6 +// used in qcsrc/server/w_campingrifle.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1) // used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo")) // used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo")) effect shotgun_muzzleflash @@ -967,7 +972,7 @@ airfriction 5 // shotgun pellet impact // decal -// used in qcsrc/server/w_common.qc: pointparticles(particleeffectnum("shotgun_impact"), trace_endpos, trace_plane_normal * 1000, 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("shotgun_impact"), org2, backoff * 1000, 1) effect shotgun_impact countabsolute 1 type decal @@ -1049,7 +1054,8 @@ airfriction 12 // decal // used in qcsrc/server/cl_client.qc: //pointparticles(particleeffectnum("machinegun_impact"), self.origin + self.view_ofs + '0 0 7', '0 0 0', 1) -// used in qcsrc/server/w_common.qc: pointparticles(particleeffectnum("machinegun_impact"), trace_endpos, trace_plane_normal * 1000, 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("machinegun_impact"), org2, backoff * 1000, 1) effect machinegun_impact countabsolute 1 type decal @@ -1134,9 +1140,7 @@ airfriction 12 // hagar trail // smoke -// used in qcsrc/server/w_hagar.qc: missile.modelflags = MF_GRENADE -// used in qcsrc/server/w_hagar.qc: missile.modelflags = MF_GRENADE -// used in qcsrc/server/w_porto.qc: gren.modelflags = MF_GRENADE +// used nowhere in code effect TR_GRENADE trailspacing 6 type alphastatic @@ -1181,9 +1185,7 @@ velocityjitter 16 16 16 // mortar trail // smoke -// used in qcsrc/server/w_grenadelauncher.qc: gren.modelflags = MF_TRACER2 -// used in qcsrc/server/w_grenadelauncher.qc: gren.modelflags = MF_TRACER2 -// used in qcsrc/server/w_hook.qc: gren.modelflags = MF_TRACER2 +// used nowhere in code effect TR_KNIGHTSPIKE // used for MF_TRACER2 notunderwater trailspacing 5 @@ -1224,8 +1226,7 @@ velocityjitter 16 16 16 // decal -// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1) -// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1) effect grenade_explode countabsolute 1 type decal @@ -1342,7 +1343,7 @@ airfriction 12 // electro trail // glowing vapor trail -// used nowhere in code +// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to) effect TR_NEXUIZPLASMA trailspacing 2 type static @@ -1374,7 +1375,7 @@ velocityjitter 50 50 50 // decal -// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1) effect electro_impact countabsolute 1 type decal @@ -1421,7 +1422,7 @@ originjitter 20 20 20 velocityjitter 320 320 320 // decal -// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1) effect electro_ballexplode countabsolute 1 type decal @@ -1466,7 +1467,7 @@ velocityjitter 32 32 32 // decal -// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1) effect electro_combo countabsolute 1 type decal @@ -1552,7 +1553,7 @@ airfriction 12 // crylink impact effect // decal -// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_impact"), self.origin, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1) effect crylink_impact countabsolute 1 type decal @@ -1601,7 +1602,7 @@ velocityjitter 32 32 32 // used in qcsrc/server/w_minstanex.qc: pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_nex.qc: pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) +// used in qcsrc/client/particles.qc: pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1) effect nex_muzzleflash count 10 type smoke @@ -1638,7 +1639,7 @@ airfriction 9 //size 6 6 //alpha 128 128 192 // nex beam: ring smoke -// used in qcsrc/server/w_nex.qc: trailparticles(world, particleeffectnum("nex_beam"), w_shotorg, trace_endpos) +// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos) effect nex_beam trailspacing 32 color 0x1680A0 0x1680A0 @@ -1680,8 +1681,8 @@ type snow // nex impact // decal -// used in qcsrc/server/w_minstanex.qc: pointparticles(particleeffectnum("nex_impact"), trace_endpos - w_shotdir * 6, '0 0 0', 1) -// used in qcsrc/server/w_nex.qc: pointparticles(particleeffectnum("nex_impact"), trace_endpos - w_shotdir * 6, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1) effect nex_impact countabsolute 1 type decal @@ -1738,6 +1739,7 @@ airfriction 9 // used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) // used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) +// used in qcsrc/server/w_seeker.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) effect hagar_muzzleflash count 4 type smoke @@ -1796,8 +1798,9 @@ airfriction 12 // decal -// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) -// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) effect hagar_explode countabsolute 1 type decal @@ -1978,9 +1981,11 @@ velocitymultiplier -0.31 // rocket explosion (bigger than mortar and hagar) // decal +// used in qcsrc/server/cl_impulse.qc: pointparticles(particleeffectnum("rocket_explode"), org, '0 0 0', 1) // used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1) // used in qcsrc/server/portals.qc: pointparticles(particleeffectnum("rocket_explode"), portal.origin + v_forward * 16, v_forward * 1024, 4) -// used in qcsrc/server/w_rocketlauncher.qc: pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1) +// used in qcsrc/server/steerlib.qc: pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1) effect rocket_explode countabsolute 1 type decal @@ -2312,7 +2317,7 @@ velocitymultiplier 100 // bigger crylink impact effect // decal -// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_impactbig"), self.origin, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1) effect crylink_impactbig countabsolute 1 type decal @@ -2361,7 +2366,7 @@ velocityjitter 256 256 256 // Zero-violence effects // impact effect indicating damage -// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("damage_hit"), hitloc, force, bound(0, damage, 200)) +// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("damage_hit"), org, vel, amount * 16) effect damage_hit tex 48 55 count 1 @@ -2404,9 +2409,9 @@ velocityjitter 256 256 256 // effect for removing player model // "teleport" -// used in qcsrc/server/cl_player.qc: pointparticles(particleeffectnum("damage_dissolve"), self.origin, force, 1) // large sparks +// used in qcsrc/client/gibs.qc: pointparticles(particleeffectnum("damage_dissolve"), org, vel, amount) effect damage_dissolve tex 48 55 count 30 @@ -2448,6 +2453,7 @@ liquidfriction 6 velocityjitter 512 512 512 // decal +// used in qcsrc/server/g_triggers.qc: self.cnt = particleeffectnum("laser_deadly") // used in qcsrc/server/g_triggers.qc: self.cnt = particleeffectnum("laser_deadly") effect laser_deadly countabsolute 1 @@ -2535,7 +2541,7 @@ color 0x7cbaff 0xcfd1ff velocitymultiplier 2 // decal -// used in qcsrc/server/w_hook.qc: pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1) +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hookbomb_explode"), org2, '0 0 0', 1) effect hookbomb_explode count 50 type static @@ -2586,6 +2592,7 @@ airfriction 2 // smoke +// used nowhere in code effect EF_MGTURRETTRAIL notunderwater trailspacing 2 @@ -2610,6 +2617,7 @@ velocityjitter 16 16 16 //fire_big //fire +// used nowhere in code effect fire_big //notunderwater count 52 @@ -2639,6 +2647,7 @@ bounce 2 //red_flare //smoke +// used nowhere in code effect red_flare type alphastatic count 21 @@ -2654,6 +2663,7 @@ bounce 1 //blue_flare //smoke +// used nowhere in code effect blue_flare type alphastatic count 21 @@ -2669,6 +2679,7 @@ bounce 1 //smoke_ring //smoke +// used nowhere in code effect smoke_ring type smoke count 90 @@ -2686,6 +2697,7 @@ notunderwater //smoke_large //smoke +// used nowhere in code effect smoke_large type alphastatic count 50 @@ -2702,6 +2714,7 @@ bounce 1.1 notunderwater //sparks +// used nowhere in code effect sparks count 30 type spark @@ -2717,6 +2730,7 @@ velocitymultiplier 1.5 airfriction 3 //sparks +// used nowhere in code effect electricity_sparks count 70 type spark @@ -2732,6 +2746,7 @@ velocitymultiplier 0.5 airfriction 3 //steam, it needs direction +// used nowhere in code effect steam effect steam type smoke @@ -2750,6 +2765,7 @@ bounce 1.1 notunderwater // smoke emiter +// used nowhere in code effect smoking count 20 type alphastatic @@ -2766,6 +2782,7 @@ velocityjitter 5 5 20 airfriction -1 //golden dust (create it once per second to cover large area in small yellow particles) +// used nowhere in code effect goldendust count 50 type snow @@ -2781,6 +2798,7 @@ velocityjitter 0.1 0.1 0.1 //velocitymultiplier -20 //airfriction -0.1 +// used nowhere in code effect healing_fx count 50 type spark @@ -2796,6 +2814,7 @@ velocityjitter 50 50 0 //velocitymultiplier 20 airfriction -0.5 +// used nowhere in code effect armorrepair_fx count 50 type spark @@ -2811,6 +2830,7 @@ velocityjitter 50 50 0 //velocitymultiplier 20 airfriction -0.5 +// used nowhere in code effect ammoregen_fx count 50 type spark @@ -2827,6 +2847,7 @@ velocityjitter 50 50 0 airfriction -0.5 // red-yellow flame like fx +// used nowhere in code effect rage count 5 type smoke @@ -2841,6 +2862,7 @@ velocityjitter 25 25 25 airfriction 2 // pieces of glass or ice falling on the floor +// used nowhere in code effect iceorglass count 30 type alphastatic @@ -2857,6 +2879,7 @@ velocityjitter 100 100 100 airfriction 3 // cover small area in poison gas, spawn it once per second +// used nowhere in code effect poisonfield count 30 type smoke @@ -2872,6 +2895,7 @@ velocityjitter 5 5 5 airfriction 1 // cover small area in icy mist, spawn it once per second +// used nowhere in code effect icefield count 20 type smoke @@ -2899,6 +2923,7 @@ originjitter 333 333 0 // cover very small area in flames, spawn it 3 times per second (or more often to get better looking fire at cost of fps hit ) // flames that go up +// used nowhere in code effect firefield count 200 type smoke @@ -2936,6 +2961,7 @@ originjitter 180 180 0 //flamethrower, spawn it as fast as you can 20 times per second or more, it needs direction //fast fire +// used nowhere in code effect flamethrower count 6 type smoke @@ -3008,6 +3034,7 @@ airfriction 1 // port-o-launch trail // glowing vapor trail +// used nowhere in code effect TR_WIZSPIKE trailspacing 2 type static @@ -3038,6 +3065,7 @@ velocityjitter 50 50 50 // TAG trail // glowing vapor trail +// used nowhere in code effect TR_VORESPIKE trailspacing 2 type static @@ -3066,6 +3094,7 @@ airfriction 12 originjitter 1 1 1 velocityjitter 50 50 50 +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1) effect flac_explode countabsolute 1 type decal @@ -3153,6 +3182,8 @@ velocityjitter 256 256 256 // bullet trail (somewhat like a tracer) +// used in qcsrc/server/w_common.qc: zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity) +// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("tr_bullet"), from, to) effect tr_bullet trailspacing 128 type spark diff --git a/data/maps/campaign.txt b/data/maps/campaignNexuiz25.txt similarity index 98% rename from data/maps/campaign.txt rename to data/maps/campaignNexuiz25.txt index 6863ec4dc..4262164ca 100644 --- a/data/maps/campaign.txt +++ b/data/maps/campaignNexuiz25.txt @@ -1,4 +1,4 @@ -"//campaign:Nexuiz Campaign" +"//campaign:Nexuiz 2.5 Campaign" "//game","mapname","bots","skill","frag","mutator-sets","description","long description" "dm","runningman_1on1remix",1,1,10,,"DM: Running Man (1on1)","Welcome to the Nexuiz Campaign!\n\nFirst of all, you're going to learn the controls of the game by playing an easy 1on1 deathmatch against a single unskilled bot.\n\nFirst one to kill the other 10 times wins." "dm","darkzone",2,2,15,,"DM: Q1DM6 Remake","On this remake of a beloved level from the original Quake(r) from id Software, you'll face two bots on a somewhat higher skill level.\n\n15 frags will make you a winner here." @@ -10,12 +10,12 @@ "tdm","aggressor",3,3,20,,"TDM: Aggressor","Now that you are getting the hang of team deathmatch, let's increase the skill of the bots.\n\nTry to keep them from fragging you!" "tdm","downer",5,4,30,,"TDM: Downer","A relatively small map, and more bots, may make this interesting.\n\nWill the adrenaline make you stronger or weaker?" "tdm","warfare",3,5,30,,"TDM: Warfare","Greetings to Orbb, who was on this map before you!\n\nFor some contrast, you're now facing only few bots on a larger map. You should know what to do now.\n\nOf course, always avoid hitting team mates, as that damage reflects back to you.\n\nThis is the final TDM match; if you win, you may be interested in joining the Nexuiz Ladder to compare your strength with the one of other players." -"dm","silvercity",5,4,30,"g_minstagib 1; sv_gravity 200","SPECIAL: SilverCity","You now know MinstaGib... so let's combine it with low gravity!\n\nYou'll feel like you're floating in this huge outdoor arena." +"dm","strength",4,5,20,"g_weaponarena most","SPECIAL: Strength","Most Weapons: in this mutator, you are given almost all weapons, and infinite ammo. Have fun with your bots..." "kh","stormkeep",5,3,500,"g_keyhunt_teams 2","KH: Stormkeep","In Key Hunt, your goal is to collect the keys from the other teams. You must bring all keys together to get 100 points, and the game will end at 500." "kh","aneurysm",5,4,600,"g_keyhunt_teams 3","KH: Aneurysm","On this industrial arena, you are fighting two other teams. As before, you must bring all keys together, for 200 points this time. The total you have to reach is 600." "kh","bleach",8,5,1000,"g_keyhunt_teams 3","KH: Bleach","Three Teams Eight Bots.\n\nDo your best.\n\nOver." "kh","dieselpower",3,6,500,"g_keyhunt_teams 2","KH: Diesel Power","A large map, and just two bots per team, 4 total. You'll be running around the map all the time, so learn doing it fast.\n\nBy the way, Key Hunt can be played online on quite some servers. You should be ready for online KH play after this match." -"dm","strength",4,6,20,"g_weaponarena most","SPECIAL: Strength","Most Weapons: in this mutator, you are given almost all weapons, and infinite ammo. Have fun with your bots..." +"dm","silvercity",5,4,30,"g_minstagib 1; sv_gravity 200","SPECIAL: SilverCity","You now know MinstaGib... so let's combine it with low gravity!\n\nYou'll feel like you're floating in this huge outdoor arena." "ctf","basementctf",1,4,100,,"CTF: Basement","Welcome to the Capture The Flag game mode. Here, you are supposed to take the enemy flag, and bring it back to yours.\n\nAlso, you have to prevent the enemy from doing the same, as you can only capture his flag when your flag is still at your base.\n\nLet's start out easy, with a single bot in the enemy team. 100 points win." "ctf","runningmanctf",3,5,100,,"CTF: Running Man","Now that you have played a simple CTF match, let's try one with team mates.\n\nDo not shoot your team mate, and let him protect you while you carry the flag back home." "ctf","bloodprisonctf",5,6,150,,"CTF: Blood Prison","Let's try the same with a total of 6 players." diff --git a/data/maps/turret_test.mapinfo b/data/maps/turret_test.mapinfo index 5072c785d..495c1bbed 100644 --- a/data/maps/turret_test.mapinfo +++ b/data/maps/turret_test.mapinfo @@ -11,4 +11,4 @@ type kh 1000 20 3 // optional: settemp_for_type (all|gametypename) cvarname value // optional: clientsettemp_for_type (all|gametypename) cvarname value // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z -hidden +forbidden diff --git a/data/maps/walker_pathtest2.mapinfo b/data/maps/walker_pathtest2.mapinfo new file mode 100644 index 000000000..ec5ec9f27 --- /dev/null +++ b/data/maps/walker_pathtest2.mapinfo @@ -0,0 +1,11 @@ +title +description <DESCRIPTION> +author <AUTHOR> +cdtrack 2 +// uncomment this if you added weapon pickups: has weapons +// optional: fog density red green blue alpha mindist maxdist +// optional: settemp_for_type (all|gametypename) cvarname value +// optional: clientsettemp_for_type (all|gametypename) cvarname value +// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z +// optional: hidden +forbidden diff --git a/data/models/domination/dom_axe_glow.tga b/data/models/domination/dom_axe_glow.tga new file mode 100644 index 0000000000000000000000000000000000000000..d6e94cf07ec8dba8c7fa60d7d0a43d61272a4c43 GIT binary patch literal 556 vcmZQz;9`J*28IR(35Nd-45N4ihXE`#gan1UhIs~i`upidxOw`x>M;NS+b_kA literal 0 HcmV?d00001 diff --git a/data/models/domination/dom_bolt_glow.tga b/data/models/domination/dom_bolt_glow.tga new file mode 100644 index 0000000000000000000000000000000000000000..d5d36ee4c8ac15a0e79de19d412fea0bee3b2dff GIT binary patch literal 2092 zcmZQz;9`ISMg~R+hW`u<`$zF;7>uTY(KIlc21e7sXc`z<X#mz52nh;x4f724^!L+^ LaP#zW)nfnvOoD+u literal 0 HcmV?d00001 diff --git a/data/qcsrc/common/gamecommand.qc b/data/qcsrc/common/gamecommand.qc index f219d988c..74703cf26 100644 --- a/data/qcsrc/common/gamecommand.qc +++ b/data/qcsrc/common/gamecommand.qc @@ -126,9 +126,9 @@ float GameCommand_Generic(string command) { MapInfo_Enumerate(); if(cvar("g_maplist_allow_hidden")) - i = 0; + i = MAPINFO_FLAG_FORBIDDEN; else - i = MAPINFO_FLAG_HIDDEN; + i = MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN; MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, i, 0); n = tokenizebyseparator(cvar_string("g_maplist"), " "); s2 = ""; diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc index 19db1e59d..1ec2534d0 100644 --- a/data/qcsrc/common/mapinfo.qc +++ b/data/qcsrc/common/mapinfo.qc @@ -657,6 +657,10 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype { MapInfo_Map_flags |= MAPINFO_FLAG_HIDDEN; } + else if(t == "forbidden") + { + MapInfo_Map_flags |= MAPINFO_FLAG_FORBIDDEN; + } else if(t == "type") { t = car(s); s = cdr(s); diff --git a/data/qcsrc/common/mapinfo.qh b/data/qcsrc/common/mapinfo.qh index 636c43b25..c217cbf12 100644 --- a/data/qcsrc/common/mapinfo.qh +++ b/data/qcsrc/common/mapinfo.qh @@ -14,6 +14,7 @@ float MAPINFO_TYPE_ALL = 65535; // this has to include all above bi float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually +float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps float MapInfo_count; diff --git a/data/qcsrc/menu/nexuiz/maplist.c b/data/qcsrc/menu/nexuiz/maplist.c index c9a5d52f3..51f5f4aee 100644 --- a/data/qcsrc/menu/nexuiz/maplist.c +++ b/data/qcsrc/menu/nexuiz/maplist.c @@ -202,7 +202,7 @@ void refilterNexuizMapList(entity me) float gt, f; gt = MapInfo_CurrentGametype(); f = MapInfo_CurrentFeatures(); - MapInfo_FilterGametype(gt, f, 0, MAPINFO_FLAG_HIDDEN, 0); + MapInfo_FilterGametype(gt, f, 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0); me.nItems = MapInfo_count; for(i = 0; i < MapInfo_count; ++i) draw_PreloadPicture(strcat("/maps/", MapInfo_BSPName_ByID(i))); @@ -235,7 +235,7 @@ void MapList_All(entity btn, entity me) { float i; string s; - MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MAPINFO_FLAG_HIDDEN, 0); // all + MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0); // all s = ""; for(i = 0; i < MapInfo_count; ++i) s = strcat(s, " ", MapInfo_BSPName_ByID(i)); diff --git a/data/qcsrc/server/bots.qc b/data/qcsrc/server/bots.qc index d41dfe9c0..2c28d9071 100644 --- a/data/qcsrc/server/bots.qc +++ b/data/qcsrc/server/bots.qc @@ -1727,7 +1727,6 @@ float bot_aimdir(vector v, float maxfiredeviation) { local float dist, delta_t, blend; local vector desiredang, diffang; - local float delta_t; //dprint("aim ", self.netname, ": old:", vtos(self.v_angle)); // make sure v_angle is sane first diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index 3be408992..e21760d09 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -401,6 +401,8 @@ void Nixnex_ChooseNextWeapon() e = get_weaponinfo(j); if(!e.weapons) // skip dummies continue; + if not(e.spawnflags & WEPSPAWNFLAG_NORMAL) + continue; RandomSelection_Add(world, j, 1, 0); } nixnex_nextweapon = RandomSelection_chosen_float; diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 989b8e65f..5f4095657 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -146,7 +146,7 @@ void GotoFirstMap() cvar_set("g_maplist_index", ftos(n - 1)); // jump to map 0 in GotoNextMap MapInfo_Enumerate(); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 0); if(!DoNextMapOverride()) GotoNextMap(); @@ -361,7 +361,7 @@ void spawnfunc___init_dedicated_server(void) g_maplist_allow_hidden = cvar("g_maplist_allow_hidden"); MapInfo_Enumerate(); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 0); } void Map_MarkAsRecent(string m); @@ -541,7 +541,7 @@ void spawnfunc_worldspawn (void) orig_slowmo = cvar("slowmo"); MapInfo_Enumerate(); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1); if(whichpack(strcat("maps/", mapname, ".cfg")) != "") { @@ -599,7 +599,7 @@ void spawnfunc_worldspawn (void) for(i = 0, j = 0; i < MapInfo_count; ++i) { if(MapInfo_Get_ByID(i)) - if not(MapInfo_Map_flags & MAPINFO_FLAG_HIDDEN) + if not(MapInfo_Map_flags & (MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN)) { if(mod(i, 2)) col = "^2"; @@ -905,7 +905,7 @@ void Maplist_Init() if(Map_Count == 0) { bprint( "Maplist is empty! Resetting it to default map list.\n" ); - cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN)); + cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN)); if(cvar("g_maplist_shuffle")) ShuffleMaplist(); localcmd("\nmenu_cmd sync\n"); @@ -1025,7 +1025,7 @@ void GotoNextMap() if(allowReset) { bprint( "Maplist contains no single playable map! Resetting it to default map list.\n" ); - cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN)); + cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN)); if(cvar("g_maplist_shuffle")) ShuffleMaplist(); localcmd("\nmenu_cmd sync\n"); @@ -2059,7 +2059,7 @@ void MapVote_Init() if(mapvote_count == 0) { bprint( "Maplist contains no single playable map! Resetting it to default map list.\n" ); - cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN)); + cvar_set("g_maplist", MapInfo_ListAllowedMaps(0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN)); if(cvar("g_maplist_shuffle")) ShuffleMaplist(); localcmd("\nmenu_cmd sync\n"); @@ -2387,7 +2387,7 @@ void MapVote_Start() return; MapInfo_Enumerate(); - if(MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1)) + if(MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1)) mapvote_run = TRUE; } void MapVote_Think() @@ -2526,7 +2526,7 @@ void RestoreGame() // Mapinfo MapInfo_Shutdown(); MapInfo_Enumerate(); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN), 1); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? 0 : MAPINFO_FLAG_HIDDEN) | MAPINFO_FLAG_FORBIDDEN, 1); } void SV_Shutdown() diff --git a/data/qcsrc/server/gamecommand.qc b/data/qcsrc/server/gamecommand.qc index e482e9db5..acd81039f 100644 --- a/data/qcsrc/server/gamecommand.qc +++ b/data/qcsrc/server/gamecommand.qc @@ -564,7 +564,7 @@ void make_mapinfo_Think() if(MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1)) { print("Done rebuiling mapinfos.\n"); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0); remove(self); } else @@ -652,17 +652,17 @@ void GameCommand(string command) if(t) { MapInfo_SwitchGameType(t); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, MAPINFO_FLAG_HIDDEN, 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, MAPINFO_FLAG_HIDDEN | MAPINFO_FLAG_FORBIDDEN, 0); if(MapInfo_count > 0) { bprint("Game type successfully switched to ", s, "\n"); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0); } else { bprint("Cannot use this game type: no map for it found\n"); MapInfo_SwitchGameType(tsave); - MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0), 0); + MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), 0, (g_maplist_allow_hidden ? MAPINFO_FLAG_HIDDEN : 0) | MAPINFO_FLAG_FORBIDDEN, 0); } } else diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 66d5f497f..231ec10ae 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -2033,7 +2033,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual) if(visual) { vecs_y = 0; - vecs_z -= 2; + vecs_z -= 4; } else { @@ -2044,7 +2044,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual) else if (cvar("g_shootfromcenter")) { vecs_y = 0; - vecs_z -= 2; + vecs_z -= 4; } return vecs; } -- 2.39.2