Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot.

4 files changed, 10 insertions, 21 deletions

diff --git a/assets/models/weapons/abuildupg/flash0.wav b/assets/models/weapons/abuild/flash0.wav
index 97e12c9..97e12c9 100644
--- a/assets/models/weapons/abuildupg/flash0.wav
+++ b/assets/models/weapons/abuild/flash0.wav
diff --git a/assets/models/weapons/abuildupg/impactflesh0.wav b/assets/models/weapons/abuild/impactflesh0.wav
index 53476e8..53476e8 100644
--- a/assets/models/weapons/abuildupg/impactflesh0.wav
+++ b/assets/models/weapons/abuild/impactflesh0.wav
diff --git a/assets/models/weapons/abuild/weapon.cfg b/assets/models/weapons/abuild/weapon.cfg
index 46cfdaa..a359c2e 100644
--- a/assets/models/weapons/abuild/weapon.cfg
+++ b/assets/models/weapons/abuild/weapon.cfg
@@ -5,7 +5,15 @@ icon              icons/icona_builder
 
 secondary
 {
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
+  flashSound        0 models/weapons/abuild/flash0.wav
+  impactFleshSound  0 models/weapons/abuild/impactflesh0.wav
   alwaysImpact
 }
+
+tertiary
+{
+  missileModel      models/weapons/level3upg/missile.md3
+
+  impactMark        64 granger_spit
+  impactSound       0 sound/misc/organic_bounce.wav
+}
diff --git a/assets/models/weapons/abuildupg/weapon.cfg b/assets/models/weapons/abuildupg/weapon.cfg
deleted file mode 100644
index 45d154c..0000000
--- a/assets/models/weapons/abuildupg/weapon.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-disableIn3rdPerson
-crosshair         15 gfx/2d/crosshair-alien_s
-
-icon              icons/icona_builder
-
-secondary
-{
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
-  alwaysImpact
-}
-
-tertiary
-{
-  missileModel      models/weapons/level3upg/missile.md3
-
-  impactMark        64 granger_spit
-  impactSound       0 sound/misc/organic_bounce.wav
-}