From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 24 Oct 2012 11:06:01 +0000 (+0200)
Subject: A @!#%'n Klein Bottle. Model by CuBeOwL ;)
X-Git-Tag: xonotic-v0.7.0~202
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f9437c7cb2f7f18a2e9019aef93b3c8f7bc62ab9;p=xonotic%2Fxonotic-data.pk3dir.git

A @!#%'n Klein Bottle. Model by CuBeOwL ;)

Also, deleted old and now unused tuba sounds.
---

diff --git a/models/weapons/h_kleinbottle.iqm b/models/weapons/h_kleinbottle.iqm
new file mode 100644
index 000000000..523ef998a
Binary files /dev/null and b/models/weapons/h_kleinbottle.iqm differ
diff --git a/models/weapons/h_kleinbottle.iqm.framegroups b/models/weapons/h_kleinbottle.iqm.framegroups
new file mode 100644
index 000000000..0a59625b6
--- /dev/null
+++ b/models/weapons/h_kleinbottle.iqm.framegroups
@@ -0,0 +1,4 @@
+1 8 20 0 // fire
+9 5 20 0 // fire2
+15 200 20 1 // idle
+215 40 20 0 // reload
diff --git a/models/weapons/v_kleinbottle.md3 b/models/weapons/v_kleinbottle.md3
new file mode 100644
index 000000000..b42affbb4
Binary files /dev/null and b/models/weapons/v_kleinbottle.md3 differ
diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 2fea077c5..a22347fe3 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,6 +1,6 @@
 #define TUBA_MIN -18
 #define TUBA_MAX  27
-#define TUBA_INSTRUMENTS 2
+#define TUBA_INSTRUMENTS 3
 
 #define TUBA_STARTNOTE(i,n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
 .float note; // note
diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index f19a50208..999749b3e 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -130,6 +130,9 @@ void W_Tuba_NoteOff()
 				case 1:
 					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Accordeon: ^7", s, "\n"));
 					break;
+				case 2:
+					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Klein Bottle: ^7", s, "\n"));
+					break;
 			}
 		}
 	}
@@ -374,9 +377,10 @@ float w_tuba(float req)
 		precache_model ("models/weapons/g_tuba.md3");
 		precache_model ("models/weapons/v_tuba.md3");
 		precache_model ("models/weapons/h_tuba.iqm");
-		precache_model ("models/weapons/g_akordeon.md3");
 		precache_model ("models/weapons/v_akordeon.md3");
 		precache_model ("models/weapons/h_akordeon.iqm");
+		precache_model ("models/weapons/v_kleinbottle.md3");
+		precache_model ("models/weapons/h_kleinbottle.iqm");
 
 		//float i;
 		//for(i = -18; i <= +27; ++i)
@@ -400,6 +404,10 @@ float w_tuba(float req)
 					self.weaponname = "akordeon";
 					break;
 				case 1:
+					self.tuba_instrument = 2;
+					self.weaponname = "kleinbottle";
+					break;
+				case 2:
 					self.tuba_instrument = 0;
 					self.weaponname = "tuba";
 					break;
@@ -447,6 +455,9 @@ float w_tuba(float req)
 			case 1: // Accordeon
 				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
 				break;
+			case 2: // Klein Bottle
+				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Klein Bottle");
+				break;
 		}
 	}
 	else if (req == WR_KILLMESSAGE)
@@ -468,6 +479,9 @@ float w_tuba(float req)
 			case 1: // Accordeon
 				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
 				break;
+			case 2: // Klein Bottle
+				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Klein Bottle");
+				break;
 		}
 	}
 	return TRUE;
diff --git a/sound/weapons/tuba2_loopnote-12.ogg b/sound/weapons/tuba2_loopnote-12.ogg
new file mode 100644
index 000000000..f01bd0874
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-12.ogg differ
diff --git a/sound/weapons/tuba2_loopnote-18.ogg b/sound/weapons/tuba2_loopnote-18.ogg
new file mode 100644
index 000000000..e1ca02b0f
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-18.ogg differ
diff --git a/sound/weapons/tuba2_loopnote-6.ogg b/sound/weapons/tuba2_loopnote-6.ogg
new file mode 100644
index 000000000..411cec7b5
Binary files /dev/null and b/sound/weapons/tuba2_loopnote-6.ogg differ
diff --git a/sound/weapons/tuba2_loopnote0.ogg b/sound/weapons/tuba2_loopnote0.ogg
new file mode 100644
index 000000000..4924d5915
Binary files /dev/null and b/sound/weapons/tuba2_loopnote0.ogg differ
diff --git a/sound/weapons/tuba2_loopnote12.ogg b/sound/weapons/tuba2_loopnote12.ogg
new file mode 100644
index 000000000..13b7c7fe6
Binary files /dev/null and b/sound/weapons/tuba2_loopnote12.ogg differ
diff --git a/sound/weapons/tuba2_loopnote18.ogg b/sound/weapons/tuba2_loopnote18.ogg
new file mode 100644
index 000000000..20a29c265
Binary files /dev/null and b/sound/weapons/tuba2_loopnote18.ogg differ
diff --git a/sound/weapons/tuba2_loopnote24.ogg b/sound/weapons/tuba2_loopnote24.ogg
new file mode 100644
index 000000000..0e497b573
Binary files /dev/null and b/sound/weapons/tuba2_loopnote24.ogg differ
diff --git a/sound/weapons/tuba2_loopnote6.ogg b/sound/weapons/tuba2_loopnote6.ogg
new file mode 100644
index 000000000..652d51229
Binary files /dev/null and b/sound/weapons/tuba2_loopnote6.ogg differ
diff --git a/sound/weapons/tuba_loopnote-1.ogg b/sound/weapons/tuba_loopnote-1.ogg
deleted file mode 100644
index e296fe42b..000000000
Binary files a/sound/weapons/tuba_loopnote-1.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-10.ogg b/sound/weapons/tuba_loopnote-10.ogg
deleted file mode 100644
index e14fca603..000000000
Binary files a/sound/weapons/tuba_loopnote-10.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-11.ogg b/sound/weapons/tuba_loopnote-11.ogg
deleted file mode 100644
index e220a8a01..000000000
Binary files a/sound/weapons/tuba_loopnote-11.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-13.ogg b/sound/weapons/tuba_loopnote-13.ogg
deleted file mode 100644
index 4545f5071..000000000
Binary files a/sound/weapons/tuba_loopnote-13.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-14.ogg b/sound/weapons/tuba_loopnote-14.ogg
deleted file mode 100644
index ec0e27a39..000000000
Binary files a/sound/weapons/tuba_loopnote-14.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-15.ogg b/sound/weapons/tuba_loopnote-15.ogg
deleted file mode 100644
index 2a540b0bd..000000000
Binary files a/sound/weapons/tuba_loopnote-15.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-16.ogg b/sound/weapons/tuba_loopnote-16.ogg
deleted file mode 100644
index 9f0b1c876..000000000
Binary files a/sound/weapons/tuba_loopnote-16.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-17.ogg b/sound/weapons/tuba_loopnote-17.ogg
deleted file mode 100644
index 6fbb1fc36..000000000
Binary files a/sound/weapons/tuba_loopnote-17.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-2.ogg b/sound/weapons/tuba_loopnote-2.ogg
deleted file mode 100644
index 6089e4e9a..000000000
Binary files a/sound/weapons/tuba_loopnote-2.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-3.ogg b/sound/weapons/tuba_loopnote-3.ogg
deleted file mode 100644
index 8299e6a15..000000000
Binary files a/sound/weapons/tuba_loopnote-3.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-4.ogg b/sound/weapons/tuba_loopnote-4.ogg
deleted file mode 100644
index fe452d1f6..000000000
Binary files a/sound/weapons/tuba_loopnote-4.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-5.ogg b/sound/weapons/tuba_loopnote-5.ogg
deleted file mode 100644
index 48f412bc2..000000000
Binary files a/sound/weapons/tuba_loopnote-5.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-7.ogg b/sound/weapons/tuba_loopnote-7.ogg
deleted file mode 100644
index a71c9d9ba..000000000
Binary files a/sound/weapons/tuba_loopnote-7.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-8.ogg b/sound/weapons/tuba_loopnote-8.ogg
deleted file mode 100644
index 45c7aad61..000000000
Binary files a/sound/weapons/tuba_loopnote-8.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote-9.ogg b/sound/weapons/tuba_loopnote-9.ogg
deleted file mode 100644
index 6bad19965..000000000
Binary files a/sound/weapons/tuba_loopnote-9.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote1.ogg b/sound/weapons/tuba_loopnote1.ogg
deleted file mode 100644
index 43c7f66f9..000000000
Binary files a/sound/weapons/tuba_loopnote1.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote10.ogg b/sound/weapons/tuba_loopnote10.ogg
deleted file mode 100644
index a2e99dfe4..000000000
Binary files a/sound/weapons/tuba_loopnote10.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote11.ogg b/sound/weapons/tuba_loopnote11.ogg
deleted file mode 100644
index f9af7b0f7..000000000
Binary files a/sound/weapons/tuba_loopnote11.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote13.ogg b/sound/weapons/tuba_loopnote13.ogg
deleted file mode 100644
index ab865ac7d..000000000
Binary files a/sound/weapons/tuba_loopnote13.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote14.ogg b/sound/weapons/tuba_loopnote14.ogg
deleted file mode 100644
index 42b649a92..000000000
Binary files a/sound/weapons/tuba_loopnote14.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote15.ogg b/sound/weapons/tuba_loopnote15.ogg
deleted file mode 100644
index 4d8ba65ff..000000000
Binary files a/sound/weapons/tuba_loopnote15.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote16.ogg b/sound/weapons/tuba_loopnote16.ogg
deleted file mode 100644
index fe5ea3aa2..000000000
Binary files a/sound/weapons/tuba_loopnote16.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote17.ogg b/sound/weapons/tuba_loopnote17.ogg
deleted file mode 100644
index 6351e3637..000000000
Binary files a/sound/weapons/tuba_loopnote17.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote19.ogg b/sound/weapons/tuba_loopnote19.ogg
deleted file mode 100644
index 56052bb8d..000000000
Binary files a/sound/weapons/tuba_loopnote19.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote2.ogg b/sound/weapons/tuba_loopnote2.ogg
deleted file mode 100644
index 3945ca139..000000000
Binary files a/sound/weapons/tuba_loopnote2.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote20.ogg b/sound/weapons/tuba_loopnote20.ogg
deleted file mode 100644
index 0eabe0231..000000000
Binary files a/sound/weapons/tuba_loopnote20.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote21.ogg b/sound/weapons/tuba_loopnote21.ogg
deleted file mode 100644
index aa28b41c8..000000000
Binary files a/sound/weapons/tuba_loopnote21.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote22.ogg b/sound/weapons/tuba_loopnote22.ogg
deleted file mode 100644
index 621e82fc5..000000000
Binary files a/sound/weapons/tuba_loopnote22.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote23.ogg b/sound/weapons/tuba_loopnote23.ogg
deleted file mode 100644
index 6edc26226..000000000
Binary files a/sound/weapons/tuba_loopnote23.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote25.ogg b/sound/weapons/tuba_loopnote25.ogg
deleted file mode 100644
index d6b30440f..000000000
Binary files a/sound/weapons/tuba_loopnote25.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote26.ogg b/sound/weapons/tuba_loopnote26.ogg
deleted file mode 100644
index 648f21755..000000000
Binary files a/sound/weapons/tuba_loopnote26.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote27.ogg b/sound/weapons/tuba_loopnote27.ogg
deleted file mode 100644
index c5ddb4f1c..000000000
Binary files a/sound/weapons/tuba_loopnote27.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote3.ogg b/sound/weapons/tuba_loopnote3.ogg
deleted file mode 100644
index 5ef1ce898..000000000
Binary files a/sound/weapons/tuba_loopnote3.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote4.ogg b/sound/weapons/tuba_loopnote4.ogg
deleted file mode 100644
index 90ca19cb0..000000000
Binary files a/sound/weapons/tuba_loopnote4.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote5.ogg b/sound/weapons/tuba_loopnote5.ogg
deleted file mode 100644
index 11512d1c6..000000000
Binary files a/sound/weapons/tuba_loopnote5.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote7.ogg b/sound/weapons/tuba_loopnote7.ogg
deleted file mode 100644
index 3138f29ec..000000000
Binary files a/sound/weapons/tuba_loopnote7.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote8.ogg b/sound/weapons/tuba_loopnote8.ogg
deleted file mode 100644
index d2a4e48bf..000000000
Binary files a/sound/weapons/tuba_loopnote8.ogg and /dev/null differ
diff --git a/sound/weapons/tuba_loopnote9.ogg b/sound/weapons/tuba_loopnote9.ogg
deleted file mode 100644
index 9dd8c8697..000000000
Binary files a/sound/weapons/tuba_loopnote9.ogg and /dev/null differ