X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=5f2dc5adbbf1a4ab01eb7ff64e06f2f8c0533e63;hb=ed623712a6dfd191c610cbb7b599226811ed814d;hp=f19a50208293073f1507fc4bf2beec258456fa13;hpb=dbcdd58814a7281aef637c8c07a02242331c4c86;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index f19a50208..5f2dc5adb 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;
 			}
 		}
 	}
@@ -145,6 +148,9 @@ float Tuba_GetNote(entity pl, float hittype)
 	if(pl.movement_x > 0) movestate += 3;
 	if(pl.movement_y < 0) movestate -= 1;
 	if(pl.movement_y > 0) movestate += 1;
+#ifdef GMQCC
+	note = 0;
+#endif
 	switch(movestate)
 	{
 	// layout: originally I wanted
@@ -374,9 +380,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 +407,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 +458,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 +482,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;