r159 - in trunk/basezym: . maps models scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Aug 22 01:10:44 EDT 2008
Author: Vermeulen
Date: 2008-08-22 01:10:44 -0400 (Fri, 22 Aug 2008)
New Revision: 159
Added:
trunk/basezym/models/pcore.tga
trunk/basezym/models/plasma.mdl
trunk/basezym/models/plasmatrail.mdl
trunk/basezym/models/ptrail.tga
Modified:
trunk/basezym/csprogs.dat
trunk/basezym/default.cfg
trunk/basezym/effectinfo.txt
trunk/basezym/maps/campaign.txt
trunk/basezym/maps/facing_worlds_nex2.ent
trunk/basezym/scripts/leiprojectile.shader
Log:
Nothing to see here
Modified: trunk/basezym/csprogs.dat
===================================================================
(Binary files differ)
Modified: trunk/basezym/default.cfg
===================================================================
--- trunk/basezym/default.cfg 2008-06-20 02:18:47 UTC (rev 158)
+++ trunk/basezym/default.cfg 2008-08-22 05:10:44 UTC (rev 159)
@@ -152,10 +152,12 @@
seta menu_maxplayers 8 // maxplayers value when the menu starts a game
alias menu_sync "menu_cmd sync"
+alias menu_showinfoscreen "menu_cmd directmenu InfoScreen"
alias menu_showclassselect "menu_cmd directmenu ClassSelect"
alias menu_showteamselect "menu_cmd directmenu TeamSelect"
bind f5 menu_showteamselect
bind f6 menu_showclassselect
+bind f7 menu_showinfoscreen
seta _teams_available 3
seta _classes_available 15
@@ -186,7 +188,7 @@
seta g_teams 1
seta g_teams_spawnspots 1
seta g_teams_friendlyfire 0
-seta g_teams_forcecolors 1
+seta g_teams_forcecolors 0
seta g_teams_flags 1
seta g_teams_flags_reward 5
seta g_teams_flags_teamreward 2
@@ -236,6 +238,7 @@
seta g_class0_weapon2 6
seta g_class0_item1 5
+// NOW BEGINS THE 4 MP CLASSES **********************************
// CLASS1**********************************
seta g_class1_name "Enforcer"
seta g_class1_model "models/players/msoldier"
@@ -258,7 +261,7 @@
seta g_class1_mass 90
seta g_class1_bloodtype 1
seta g_class1_gibtype 1
-seta g_class1_weapon1 3
+seta g_class1_weapon1 1
seta g_class1_weapon2 4
seta g_class1_weapon3 6
seta g_class1_item1 5
@@ -285,11 +288,10 @@
seta g_class2_mass 90
seta g_class2_bloodtype 1
seta g_class2_gibtype 1
-seta g_class2_weapon1 1
-seta g_class2_weapon2 7
-seta g_class2_weapon3 8
-seta g_class2_item1 2
-seta g_class2_item2 4
+seta g_class2_weapon1 2
+seta g_class2_weapon2 5
+seta g_class2_weapon3 9
+seta g_class2_item1 4
// class3**********************************
seta g_class3_name "Techie"
@@ -313,8 +315,8 @@
seta g_class3_mass 90
seta g_class3_bloodtype 1
seta g_class3_gibtype 1
-seta g_class3_weapon1 2
-seta g_class3_weapon2 9
+seta g_class3_weapon1 1
+seta g_class3_weapon2 7
seta g_class3_item1 3
seta g_class3_item2 1
@@ -340,8 +342,9 @@
seta g_class4_mass 90
seta g_class4_bloodtype 1
seta g_class4_gibtype 1
-seta g_class4_weapon1 6
-seta g_class4_item1 2
+seta g_class4_weapon1 3
+seta g_class4_weapon2 8
+seta g_class4_item1 3
//
// THE REST OF THE CLASSES ARE AI CLASSES
@@ -352,7 +355,7 @@
seta g_class5_model "models/players/soldier"
seta g_class5_boxmin "-16 -16 -24"
seta g_class5_boxmax "16 16 24"
-seta g_class5_scaleratio 1.5
+seta g_class5_scaleratio 1.3
seta g_class5_viewofs "0 0 22"
seta g_class5_weaponofs "0 4 16"
seta g_class5_healthstart 100
@@ -377,7 +380,7 @@
seta g_class6_model "models/players/spy"
seta g_class6_boxmin "-16 -16 -24"
seta g_class6_boxmax "16 16 24"
-seta g_class6_scaleratio 1
+seta g_class6_scaleratio 1.3
seta g_class6_viewofs "0 0 22"
seta g_class6_weaponofs "0 4 16"
seta g_class6_healthstart 200
@@ -456,9 +459,9 @@
seta g_class9_scaleratio 1
seta g_class9_viewofs "0 0 22"
seta g_class9_weaponofs "0 4 16"
-seta g_class9_healthstart 200
+seta g_class9_healthstart 100
seta g_class9_healthmax 0
-seta g_class9_shieldstart 500
+seta g_class9_shieldstart 100
seta g_class9_shieldmax 0
seta g_class9_regenrate 0
seta g_class9_regenmax 0
@@ -514,8 +517,8 @@
// ITEM3**********************************
seta g_item3 "Air Cannon"
-seta g_item3_quantitymax 10
-seta g_item3_rechargerate 0.02
+seta g_item3_quantitymax 5
+seta g_item3_rechargerate 0
seta g_item3_ammo1projflags 3
seta g_item3_ammo1fireflags 2
seta g_item3_ammo1exloflags 0
@@ -536,8 +539,8 @@
// ITEM4**********************************
seta g_item4 "Hook"
-seta g_item4_quantitymax 10
-seta g_item4_rechargerate 1
+seta g_item4_quantitymax 1
+seta g_item4_rechargerate 0.005
seta g_item4_ammo1projflags 8
seta g_item4_ammo1fireflags 10
seta g_item4_ammo1exloflags 0
@@ -563,13 +566,9 @@
seta g_item5_ammo1noprojectile 1
seta g_item5_ammo1fireflags 16
-
// AMMO1**********************************
-seta g_ammo1_name "Metal Clip"
-seta g_ammo1_pickupmodel "models/ammo/a_metal.md3"
-seta g_ammo1_pickupsound "items/pickupammo.wav"
-seta g_ammo1_quantitymax 150
-seta g_ammo1_modelcolormod "3 3 0.3"
+seta g_ammo1_name "Metal"
+seta g_ammo1_quantitymax 1
// AMMO2**********************************
seta g_ammo2_name "Energy Clip"
@@ -578,14 +577,14 @@
seta g_ammo2_quantitymax 150
seta g_ammo2_modelcolormod "0.1 0.1 3"
-// AMMO4**********************************
+// AMMO3**********************************
seta g_ammo3_name "Explosives Clip"
seta g_ammo3_pickupmodel "models/ammo/a_explosives.md3"
seta g_ammo3_pickupsound "items/pickupammo.wav"
seta g_ammo3_quantitymax 150
seta g_ammo3_modelcolormod "3 0.1 0.1"
-// AMMO5**********************************
+// AMMO4**********************************
seta g_ammo4_name "Superweapons"
seta g_ammo4_quantitymax 50
@@ -601,11 +600,10 @@
seta g_weap1_pickupmodel "models/items/assaultrailgun_pickup.md3"
seta g_weap1_viewmodeloffset "10 4 -10"
seta g_weap1_modelscale "0.5"
-seta g_weap1_rechargerate 1
seta g_weap1_ammotype 1
-seta g_weap1_ammomax 50
-seta g_weap1_ammoinventorymax 200
+seta g_weap1_ammomax 1
+seta g_weap1_ammoinventorymax 1
seta g_weap1_ammo1projflags 9
seta g_weap1_ammo1fireflags 4
@@ -616,7 +614,7 @@
seta g_weap1_ammo1firesound "weapons/assaultrailgun_bulletfire1.wav"
seta g_weap1_ammo1numberof 1
seta g_weap1_ammo1recoil 1
-seta g_weap1_ammo1mintofire 1
+seta g_weap1_ammo1mintofire 0
seta g_weap1_ammo1lifetime 10
seta g_weap1_ammo1tracer 1
seta g_weap1_ammo1tracermodel "models/weapons/assaultrailgun_tracer.mdl"
@@ -633,7 +631,7 @@
seta g_weap1_ammo2firesound "weapons/assaultrailgun_bulletfire1.wav"
seta g_weap1_ammo2numberof 1
seta g_weap1_ammo2recoil 1
-seta g_weap1_ammo2mintofire 1
+seta g_weap1_ammo2mintofire 0
seta g_weap1_ammo2lifetime 10
seta g_weap1_ammo2tracer 1
seta g_weap1_ammo2tracermodel "models/weapons/assaultrailgun_tracer.mdl"
@@ -648,10 +646,11 @@
seta g_weap2_pickupmodel "models/items/shotgun_pickup.md3"
seta g_weap2_viewmodeloffset "10 4 -10"
seta g_weap2_modelscale "0.5"
+seta g_weap2_rechargerate 0
seta g_weap2_ammotype 1
-seta g_weap2_ammomax 50
-seta g_weap2_ammoinventorymax 200
+seta g_weap2_ammomax 1
+seta g_weap2_ammoinventorymax 1
seta g_weap2_ammo1projflags 9
seta g_weap2_ammo1fireflags 0
@@ -662,7 +661,7 @@
seta g_weap2_ammo1firesound "weapons/shotgun_fire.ogg"
seta g_weap2_ammo1numberof 5
seta g_weap2_ammo1recoil 1
-seta g_weap2_ammo1mintofire 1
+seta g_weap2_ammo1mintofire 0
seta g_weap2_ammo1lifetime 10
seta g_weap2_ammo1tracer 1
seta g_weap2_ammo1tracermodel "models/weapons/assaultrailgun_tracer.mdl"
@@ -682,8 +681,8 @@
seta g_weap3_modelscale "0.5"
seta g_weap3_ammotype 1
-seta g_weap3_ammomax 50
-seta g_weap3_ammoinventorymax 200
+seta g_weap3_ammomax 1
+seta g_weap3_ammoinventorymax 1
seta g_weap3_ammo1projflags 1
seta g_weap3_ammo1fireflags 0
@@ -694,10 +693,10 @@
seta g_weap3_ammo1firesound "weapons/minigun_bulletfire1.wav"
seta g_weap3_ammo1numberof 1
seta g_weap3_ammo1recoil 1
-seta g_weap3_ammo1mintofire 0.2
+seta g_weap3_ammo1mintofire 0
seta g_weap3_ammo1lifetime 10
-seta g_weap3_ammo1tracer 0.3
-seta g_weap3_ammo1tracermodel "models/weapons/minigun_tracer.mdl"
+seta g_weap3_ammo1tracer 1
+seta g_weap3_ammo1tracermodel "models/weapons/assaultrailgun_tracer.mdl"
seta g_weap3_ammo1modelscale 1
seta g_weap3_ammo1viewmodelpush "-1 0 0"
seta g_weap3_fire1 "0 0 20"
@@ -756,7 +755,6 @@
// WEAPON2**********************************
-// CURRENTLY NOT USED
seta g_weap5 "Mortar"
seta g_weap5_model "models/items/assaultrailgun.md3"
seta g_weap5_viewmodel "models/items/assaultrailgun.md3"
@@ -767,6 +765,21 @@
seta g_weap5_ammomax 50
seta g_weap5_ammoinventorymax 200
+seta g_weap5_ammo1projflags 259
+seta g_weap5_ammo1fireflags 0
+seta g_weap5_ammo1explflags 1
+seta g_weap5_ammo1damage "90 35000 30"
+seta g_weap5_ammo1speeds "1500 160 200"
+seta g_weap5_ammo1model "models/weapons/hagar_rocket.md3"
+seta g_weap5_ammo1firesound "weapons/mortar_fire.ogg"
+seta g_weap5_ammo1numberof 1
+seta g_weap5_ammo1recoil 2
+seta g_weap5_ammo1mintofire 1
+seta g_weap5_ammo1lifetime 10
+seta g_weap5_ammo1tracer 0
+seta g_weap5_ammo1tracermodel ""
+seta g_weap5_ammo1modelscale 1
+seta g_weap5_ammo1viewmodelpush "-3 0 0"
seta g_weap5_fire1 "0 0 2"
seta g_weap5_fire2 "0 0 5"
@@ -984,40 +997,41 @@
seta g_ai_weap1 "Soldier"
seta g_ai_weap1_model "models/items/plasma.md3"
seta g_ai_weap1_ammomax 500
-seta g_ai_weap1_ammo1projflags 12
-seta g_ai_weap1_ammo1fireflags 0
-seta g_ai_weap1_ammo1explflags 16
+seta g_ai_weap1_ammo1projflags 9
+seta g_ai_weap1_ammo1fireflags 1
+seta g_ai_weap1_ammo1explflags 128
seta g_ai_weap1_ammo1damage "10 5000 50"
-seta g_ai_weap1_ammo1speeds "2000 0 250"
-seta g_ai_weap1_ammo1model "models/weapons/plasma_bullet.mdl"
+seta g_ai_weap1_ammo1speeds "1500 0 50"
+seta g_ai_weap1_ammo1model "models/plasmatrail.mdl"
seta g_ai_weap1_ammo1firesound "weapons/plasma_fire.wav"
seta g_ai_weap1_ammo1explodesound "weapons/plasma_explode.wav"
+seta g_ai_weap1_ammo1modelscale 2
seta g_ai_weap1_ammo1numberof 1
seta g_ai_weap1_ammo1recoil 0
seta g_ai_weap1_ammo1mintofire 1
seta g_ai_weap1_ammo1lifetime 10
-seta g_ai_weap1_ammo1colormod "0 0 10"
-seta g_ai_weap1_fire1 "0 0 1.5"
+seta g_ai_weap1_ammo1colormod "1 1 1"
+seta g_ai_weap1_fire1 "0 0 3"
// WEAPON2**********************************
seta g_ai_weap2 "Spy's Plasma"
-seta g_ai_weap2_model "models/items/plasma.md3"
+seta g_ai_weap2_model "models/items/mortar.md3"
seta g_ai_weap2_ammomax 500
-seta g_ai_weap2_ammo1projflags 12
-seta g_ai_weap2_ammo1fireflags 0
-seta g_ai_weap2_ammo1explflags 16
-seta g_ai_weap2_ammo1damage "10 5000 50"
-seta g_ai_weap2_ammo1speeds "2000 0 250"
-seta g_ai_weap2_ammo1model "models/weapons/plasma_bullet.mdl"
-seta g_ai_weap2_ammo1firesound "weapons/plasma_fire.wav"
-seta g_ai_weap2_ammo1explodesound "weapons/plasma_explode.wav"
+seta g_ai_weap2_ammo1projflags 2
+seta g_ai_weap2_ammo1fireflags 1
+seta g_ai_weap2_ammo1explflags 1
+seta g_ai_weap2_ammo1damage "60 50000 75"
+seta g_ai_weap2_ammo1speeds "800 200 0"
+seta g_ai_weap2_ammo1model "models/weapons/grenade.md3"
+seta g_ai_weap2_ammo1firesound "weapons/mortar_fire.ogg"
+seta g_ai_weap2_ammo1modelscale 2
seta g_ai_weap2_ammo1numberof 1
seta g_ai_weap2_ammo1recoil 0
seta g_ai_weap2_ammo1mintofire 1
-seta g_ai_weap2_ammo1lifetime 10
-seta g_ai_weap2_ammo1colormod "0 10 10"
-seta g_ai_weap2_fire1 "0 0 3"
+seta g_ai_weap2_ammo1lifetime 2
+seta g_ai_weap2_ammo1colormod "1 1 1"
+seta g_ai_weap2_fire1 "0 0 1"
Modified: trunk/basezym/effectinfo.txt
===================================================================
--- trunk/basezym/effectinfo.txt 2008-06-20 02:18:47 UTC (rev 158)
+++ trunk/basezym/effectinfo.txt 2008-08-22 05:10:44 UTC (rev 159)
@@ -1,3 +1,53 @@
+
+// bigger crylink impact effect
+// decal
+effect crylink_impactbig
+countabsolute 1
+type decal
+tex 47 47
+size 24 24
+alpha 256 256 0
+originjitter 12 12 12
+//lightradius 200
+//lightradiusfade 800
+//lightcolor 3.2 0.4 4
+// purple flare effect
+effect crylink_impactbig
+countabsolute 1
+type static
+tex 39 39
+color 0x504060 0x504060
+size 24 24
+alpha 256 256 512
+// purple sparks
+effect crylink_impactbig
+count 80
+type spark
+tex 41 41
+color 0xA040C0 0xA040C0
+bounce 2
+size 6 6
+alpha 256 256 1024
+velocityjitter 512 512 512
+// purple splash
+effect crylink_impactbig
+count 3
+type static
+color 0xE070FF 0xE070FF
+size 16 16
+alpha 256 256 512
+velocityjitter 32 32 32
+// purple splash
+effect crylink_impactbig
+count 6
+type static
+color 0xE070FF 0xE070FF
+size 16 16
+alpha 256 256 1024
+velocityjitter 256 256 256
+
+
+
// nex explosion
// decal
effect nex_explode
Modified: trunk/basezym/maps/campaign.txt
===================================================================
--- trunk/basezym/maps/campaign.txt 2008-06-20 02:18:47 UTC (rev 158)
+++ trunk/basezym/maps/campaign.txt 2008-08-22 05:10:44 UTC (rev 159)
@@ -4,6 +4,7 @@
"dm","facing_worlds_nex2","0","0","0",,"Facing Worlds","Capture the Flag testing map ported from Nexuiz, for use with testing, will not appear in final game."
//"dm","greatwall_remix","0","0","0",,"Great Wall","Capture the Flag testing map ported from Nexuiz, for use with testing, will not appear in final game."
"dm","zym_dm1","0","0","0",,"Zym_dm1","Work in progress DM map by Strahlemann."
+"dm","arahia_v2","0","0","0",,"arahia_v2","Terrain map."
//"dm","zymoticwork","0","0","0",,"Zymoticwork","Old map."
//"dm","aitest","0","0","0",,"Aitest","Old map."
//"dm","zym_map3_gameplaytest","0","0","0",,"Gameplaytest","Old map."
\ No newline at end of file
Modified: trunk/basezym/maps/facing_worlds_nex2.ent
===================================================================
--- trunk/basezym/maps/facing_worlds_nex2.ent 2008-06-20 02:18:47 UTC (rev 158)
+++ trunk/basezym/maps/facing_worlds_nex2.ent 2008-08-22 05:10:44 UTC (rev 159)
@@ -11,11 +11,11 @@
"origin" "2392 -576 56"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1976 72 56"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1816 72 56"
}
{
@@ -24,7 +24,7 @@
"origin" "2000 -736 128"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1560 -352 1744"
}
{
@@ -36,7 +36,7 @@
"origin" "1664 -288 368"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1280 -288 592"
}
{
@@ -112,11 +112,11 @@
"targetname" "mortar_red"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-5048 -552 56"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-4888 -552 56"
}
{
@@ -256,11 +256,11 @@
"angle" "225"
}
{
-"classname" "item_ammo3"
+"classname" "item_ammo2"
"origin" "2584 256 16"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "2584 -832 16"
}
{
@@ -394,7 +394,7 @@
"netname" "^1RED base^7"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1280 -480 592"
}
{
@@ -448,7 +448,7 @@
"origin" "2240 706 60"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "2576 -320 16"
}
{
@@ -632,19 +632,19 @@
"netname" "^7ASTEROID, ^4BLUE, ^7right side"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-4632 -120 1744"
}
{
-"classname" "item_ammo3"
+"classname" "item_ammo2"
"origin" "-5656 -728 16"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-5656 360 16"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-5648 -152 16"
}
{
@@ -652,7 +652,7 @@
"origin" "1168 -864 16"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "1168 288 16"
}
{
@@ -708,7 +708,7 @@
"origin" "-4240 384 16"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-4240 -768 16"
}
{
@@ -780,11 +780,11 @@
"origin" "-5344 256 56"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-4352 -192 592"
}
{
-"classname" "item_ammo1"
+"classname" "item_ammo3"
"origin" "-4352 0 592"
}
{
Added: trunk/basezym/models/pcore.tga
===================================================================
(Binary files differ)
Property changes on: trunk/basezym/models/pcore.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/basezym/models/plasma.mdl
===================================================================
(Binary files differ)
Property changes on: trunk/basezym/models/plasma.mdl
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/basezym/models/plasmatrail.mdl
===================================================================
(Binary files differ)
Property changes on: trunk/basezym/models/plasmatrail.mdl
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/basezym/models/ptrail.tga
===================================================================
(Binary files differ)
Property changes on: trunk/basezym/models/ptrail.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/basezym/scripts/leiprojectile.shader
===================================================================
--- trunk/basezym/scripts/leiprojectile.shader 2008-06-20 02:18:47 UTC (rev 158)
+++ trunk/basezym/scripts/leiprojectile.shader 2008-08-22 05:10:44 UTC (rev 159)
@@ -18,6 +18,26 @@
}
}
+models/plastrail
+{
+ cull disable
+ {
+ map models/ptrail.tga
+ blendfunc add
+ rgbGen identity
+ }
+}
+
+models/plascore
+{
+ deformVertexes autosprite
+ {
+ map models/pcore.tga
+ blendfunc add
+ rgbGen identity
+ }
+}
+
models/bultrail
{
cull disable
More information about the zymotic-commits
mailing list