worked on ammo shaders

added flame_ammo to entities.def

baseq3r/scripts/ammo.shader

@@ -184,3 +184,26 @@ models/powerups/ammo/bfgammo2
 	}
 }
 
+//8. Flamethrower
+models/powerups/ammo/flameammo
+{
+	{
+		map models/powerups/ammo/ammobox.tga
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/ammo/ammolights.tga
+		blendfunc blend
+		rgbGen const ( 0 0.4 1 )
+		alphaGen wave sawtooth 0 1 0 1 
+	}
+}
+
+models/powerups/ammo/flameammo2
+{
+	{
+		map models/powerups/ammo/flmeammo2.tga
+		rgbGen identity
+	}
+}
+

engine/code/qcommon/files.c

@@ -207,8 +207,8 @@ typedef struct
 const purePak_t com_purePaks[] =
 {
 	{BASEGAME, "assets0", 2287396504u},
-//  {BASEGAME, "qvm", 1155730186u},
+    {BASEGAME, "qvm", 1155730186u},
-  {BASEGAME, "textures", 25205174u},
+    {BASEGAME, "textures", 25205174u},
   
 
 #if 0

engine/code/qcommon/q_shared.h

@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.1.0 r223"
+#define PRODUCT_VERSION "v0.0.1.2 r229"
 #endif
 
 #ifndef PRODUCT_DATE

q3rallycode.ppr

@@ -858,58 +858,18 @@ q3rallycode
 		engine\resync_svn.sh
 		engine\cross-make-mingw64.sh
 [Open project files]
-0=engine\code\game\g_combat.c
+0=engine\code\qcommon\q_shared.h
-1=engine\code\game\g_mover.c
+1=engine\code\qcommon\files.c
-2=engine\code\game\g_spawn.c
+2=engine\code\qcommon\qcommon.h
-3=engine\code\cgame\cg_draw.c
-4=engine\code\cgame\cg_local.h
-5=engine\code\cgame\cg_view.c
-6=engine\code\cgame\cg_info.c
-7=engine\code\q3_ui\ui_rally_servers.c
-8=engine\code\q3_ui\ui_splevel.c
-9=engine\code\q3_ui\ui_rally_startserver.c
-10=engine\code\game\bg_public.h
-11=engine\code\game\g_public.h
-12=engine\code\qcommon\q_shared.h
 [Selected Project Files]
 Main=
-Selected=engine\code\qcommon\q_shared.h
+Selected=engine\code\qcommon\files.c
-[engine\code\game\g_combat.c]
-TopLine=922
-Caret=1,940
-[engine\code\game\g_mover.c]
-TopLine=1889
-Caret=1,1907
-[engine\code\game\g_spawn.c]
-TopLine=219
-Caret=1,237
-[engine\code\cgame\cg_draw.c]
-TopLine=3288
-Caret=1,3306
-[engine\code\cgame\cg_local.h]
-TopLine=1502
-Caret=1,1517
-[engine\code\cgame\cg_view.c]
-TopLine=717
-Caret=1,760
-[engine\code\cgame\cg_info.c]
-TopLine=156
-Caret=1,171
-[engine\code\q3_ui\ui_rally_servers.c]
-TopLine=539
-Caret=1,554
-[engine\code\q3_ui\ui_splevel.c]
-TopLine=620
-Caret=1,623
-[engine\code\q3_ui\ui_rally_startserver.c]
-TopLine=1875
-Caret=61,1901
-[engine\code\game\bg_public.h]
-TopLine=1
-Caret=1,1
-[engine\code\game\g_public.h]
-TopLine=149
-Caret=1,1
 [engine\code\qcommon\q_shared.h]
 TopLine=55
-Caret=39,70
+Caret=40,70
+[engine\code\qcommon\files.c]
+TopLine=194
+Caret=5,211
+[engine\code\qcommon\qcommon.h]
+TopLine=357
+Caret=79,708

tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def

@@ -247,6 +247,32 @@ model="models/powerups/ammo/railgunam.md3"*/
 
 //=============================================================================
 
+/*QUAKED ammo_flame (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED
+Flamethrower ammo. Gives the player 50 by default.
+-------- KEYS --------
+wait : time in seconds before item respawns after being picked up (default 40, -1 = never respawn).
+random : random time variance in seconds added or subtracted from "wait" delay (default 0 - see Notes).
+count: sets the amount of ammo given to the player when picked up (default 10).
+team : set this to team items. Teamed items will respawn randomly after team master is picked up (see Notes).
+target : picking up the item will trigger the entity this points to.
+target2 : picking up the item will trigger the entity this points to.
+targetname : a target_give entity can point to this for respawn freebies.
+targetname2 : a target_give entity can point to this for respawn freebies.
+notfree : when set to 1, entity will not spawn in "Free for all" and "Tournament" modes.
+notteam : when set to 1, entity will not spawn in "Teamplay" and "CTF" modes.
+notsingle : when set to 1, entity will not spawn in Single Player mode.
+notbot : used to make an item invisible for bot attraction.
+-------- SPAWNFLAGS --------
+SUSPENDED : item will spawn where it was placed in map and won't drop to the floor.
+-------- NOTES --------
+The amount of time it takes for an item in the team to respawn is determined by the "wait" value of the item that was picked up previously. So if one of the items in the team has it's "wait" key set to -1 (never respawn), the random respawning cycle of the teamed items will stop after that item is picked up.
+
+When the random key is set, its value is used to calculate a minimum and a maximum delay. The final time delay will be a random value anywhere between the minimum and maximum values: (min delay = wait - random) (max delay = wait + random).
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/powerups/ammo/flameam.md3"*/
+
+//=============================================================================
+
 FUNC_* ENTITIES
 
 //=============================================================================
@@ -2456,6 +2482,32 @@ When the random key is set, its value is used to calculate a minimum and a maxim
 -------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
 model="models/weapons2/shotgun/shotgun.md3"*/
 
+//=============================================================================
+
+/*QUAKED weapon_flamethrower (1 0 .5) (-16 -16 -16) (16 16 16) SUSPENDED
+Flamethrower.
+-------- KEYS --------
+wait : time in seconds before item respawns after being picked up (default 5, -1 = never respawn).
+random : random time variance in seconds added or subtracted from "wait" delay (default 0 - see Notes).
+count: sets the amount of ammo given to the player when weapon is picked up (default 10).
+team : set this to team items. Teamed items will respawn randomly after team master is picked up (see Notes).
+target : picking up the item will trigger the entity this points to.
+target2 : picking up the item will trigger the entity this points to.
+targetname : a target_give entity can point to this for respawn freebies.
+targetname2 : a target_give entity can point to this for respawn freebies.
+notfree : when set to 1, entity will not spawn in "Free for all" and "Tournament" modes.
+notteam : when set to 1, entity will not spawn in "Teamplay" and "CTF" modes.
+notsingle : when set to 1, entity will not spawn in Single Player mode.
+notbot : used to make an item invisible for bot attraction.
+-------- SPAWNFLAGS --------
+SUSPENDED : item will spawn where it was placed in map and won't drop to the floor.
+-------- NOTES --------
+The amount of time it takes for an item in the team to respawn is determined by the "wait" value of the item that was picked up previously. So if one of the items in the team has it's "wait" key set to -1 (never respawn), the random respawning cycle of the teamed items will stop after that item is picked up.
+
+When the random key is set, its value is used to calculate a minimum and a maximum delay. The final time delay will be a random value anywhere between the minimum and maximum values: (min delay = wait - random) (max delay = wait + random).
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/weapons2/flamethrower/flamethrower.md3"*/
+
 //
 =================================
 Q3Rally Entities