summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/bg_misc.c38
-rw-r--r--src/game/g_buildable.c2
-rw-r--r--src/game/tremulous.h6
3 files changed, 24 insertions, 22 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 2b51efbc..028e440d 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -41,8 +41,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.5f, //float minNormal;
qtrue, //qboolean invertNormal;
@@ -72,8 +72,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -103,8 +103,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -134,8 +134,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
500, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qtrue, //qboolean invertNormal;
@@ -165,8 +165,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- TRAPPER_REPEAT, //int turretFireSpeed;
TRAPPER_RANGE, //int turretRange;
+ TRAPPER_REPEAT, //int turretFireSpeed;
WP_LOCKBLOB_LAUNCHER, //weapon_t turretProjType;
0.0f, //float minNormal;
qtrue, //qboolean invertNormal;
@@ -196,8 +196,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
OVERMIND_ATTACK_REPEAT,//int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -227,8 +227,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
150, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qtrue, //qboolean invertNormal;
@@ -258,8 +258,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
-1, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.5f, //float minNormal;
qtrue, //qboolean invertNormal;
@@ -289,8 +289,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -320,8 +320,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -351,8 +351,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -384,8 +384,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
50, //int nextthink;
- MGTURRET_REPEAT, //int turretFireSpeed;
MGTURRET_RANGE, //int turretRange;
+ MGTURRET_REPEAT, //int turretFireSpeed;
WP_MACHINEGUN, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -415,8 +415,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
150, //int nextthink;
- TESLAGEN_REPEAT, //int turretFireSpeed;
TESLAGEN_RANGE, //int turretRange;
+ TESLAGEN_REPEAT, //int turretFireSpeed;
WP_TESLAGEN, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -446,8 +446,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -477,8 +477,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -508,8 +508,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -539,8 +539,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
-1, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -570,8 +570,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
@@ -601,8 +601,8 @@ buildableAttributes_t bg_buildableList[ ] =
( 1 << WP_HBUILD2 ), //weapon_t buildWeapon;
BANIM_IDLE1, //int idleAnim;
100, //int nextthink;
- 0, //int turretFireSpeed;
0, //int turretRange;
+ 0, //int turretFireSpeed;
WP_NONE, //weapon_t turretProjType;
0.707f, //float minNormal;
qfalse, //qboolean invertNormal;
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 059cff1f..867804fd 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2163,6 +2163,8 @@ qboolean G_ValidateBuild( gentity_t *ent, buildable_t buildable )
G_buildItem( ent, buildable, origin, ent->s.apos.trBase );
return qtrue;
}
+
+ return qfalse;
}
/*
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index de1ee3d4..d100ccaf 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -32,7 +32,7 @@
#define ABUILDER_BASE_DELAY 10000
#define ABUILDER_ADV_DELAY 5000
-#define SOLDIER_BITE_DMG ADM(100)
+#define SOLDIER_BITE_DMG ADM(75)
#define SOLDIER_BITE_RANGE 32.0f
#define SOLDIER_BITE_REPEAT 500
@@ -413,12 +413,12 @@
#define MGTURRET_BP 80
#define MGTURRET_HEALTH HBHM(100)
#define MGTURRET_SPLASHDAMAGE 50
-#define MGTURRET_SPLASHRADIUS 100
+#define MGTURRET_SPLASHRADIUS 1000
#define MGTURRET_ANGULARSPEED 20 //degrees/think ~= 200deg/sec
#define MGTURRET_ACCURACYTOLERANCE MGTURRET_ANGULARSPEED / 2 //angular difference for turret to fire
#define MGTURRET_VERTICALCAP 30 // +/- maximum pitch
#define MGTURRET_REPEAT 50
-#define MGTURRET_RANGE 300
+#define MGTURRET_RANGE 200
#define TESLAGEN_BP 100
#define TESLAGEN_HEALTH HBHM(200)
generated by cgit (git 2.34.1) at 2024-11-15 12:52:44 +0000