Initial support for Team Arena uberweapons

Phantom Nailgun, Laser Prox Launcher, and Infinity Chaingun
EmeraldTiger · Apr 2, 2019 · af52bb7 · af52bb7
1 parent f53c375
commit af52bb7
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 2 deletions.
diff --git a/ioq3-master/code/cgame/cg_event.c b/ioq3-master/code/cgame/cg_event.c
@@ -376,6 +376,26 @@ static void CG_Obituary( entityState_t *ent ) {
 			message = "tried to invade";
 			message2 = "'s personal space";
 			break;
+		case MOD_PHANTOM_NAIL:
+			message = "was nailed by";
+			message2 = "'s Phantom Nailgun";
+			break;
+		case MOD_PHANTOM_NAIL_PHASED:
+			message = "thought they could take cover from";
+			message2 = "'s Phantom Nailgun";
+			break;
+		case MOD_LASER_PROXIMITY_MINE:
+			message = "was too close to";
+			message2 = "'s Laser Prox Mine";
+			break;
+		case MOD_LASER_PROXIMITY_MINE_REMOTE:
+			message = "wasn't fast enough to avoid";
+			message2 = "'s Laser Prox Mine probe";
+			break;
+		case MOD_INFINITY_CHAINGUN:
+			message = "'s flesh was transmuted by";
+			message2 = "'s Infinity Chaingun";
+			break;
 		default:
 			message = "was killed by";
 			break;

diff --git a/ioq3-master/code/cgame/cg_weapons.c b/ioq3-master/code/cgame/cg_weapons.c
@@ -1532,6 +1532,15 @@ char* CG_DrawUberNames(void) {
 		case WP_BFG:
 			return "BFG30K";
 			break;
+		case WP_NAILGUN:
+			return "Phantom Nailgun";
+			break;
+		case WP_PROX_LAUNCHER:
+			return "Laser Prox Launcher";
+			break;
+		case WP_CHAINGUN:
+			return "Infinity Chaingun";
+			break;
 		default:
 			return "invalid";
 			break;

diff --git a/ioq3-master/code/game/bg_public.h b/ioq3-master/code/game/bg_public.h
@@ -661,7 +661,13 @@ typedef enum {
 	MOD_PROXIMITY_MINE,
 	MOD_KAMIKAZE,
 	MOD_JUICED,
-	MOD_GRAPPLE
+	MOD_GRAPPLE,
+	// UBER ARENA 0.5
+	MOD_PHANTOM_NAIL,
+	MOD_PHANTOM_NAIL_PHASED,
+	MOD_LASER_PROXIMITY_MINE,
+	MOD_LASER_PROXIMITY_MINE_REMOTE,
+	MOD_INFINITY_CHAINGUN,
 } meansOfDeath_t;
 
 

diff --git a/ioq3-master/code/game/g_local.h b/ioq3-master/code/game/g_local.h
@@ -280,7 +280,11 @@ typedef struct {
 #define COUNTER_RAIL		WP_RAILGUN - 1
 #define COUNTER_PLASMA		WP_PLASMAGUN - 1
 #define COUNTER_BFG			WP_BFG - 1
-#define	MAX_COUNTERS		10
+#define COUNTER_GRAPPLE		WP_GRAPPLING_HOOK - 1 // there's no uber grappling hook (yet, anyway...), we're just doing this to preserve functionality for TA uberweapons
+#define COUNTER_NAIL		WP_NAILGUN - 1
+#define COUNTER_PROX		WP_PROX_LAUNCHER - 1
+#define COUNTER_CHAINGUN	WP_CHAINGUN - 1
+#define	MAX_COUNTERS		14
 
 
 // this structure is cleared on each ClientSpawn(),