X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_tuba.qc;h=15d4ef9d7deb44e9d6690fff01c77cbde572735d;hb=19ab1a2ba6824a03f8d263d27cc84dc7d54958ac;hp=1e47a3b3d1b36a512a910b793a02fc04be498de4;hpb=35398531db0c3d301cf1604d10dd79f4a7268655;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 1e47a3b3d..15d4ef9d7 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -12,25 +12,94 @@ REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKU
 .float tuba_lastnotes_cnt; // over
 .vector tuba_lastnotes[MAX_TUBANOTES];
 
-float W_Tuba_HasPlayed(entity pl, string melody)
+float W_Tuba_HasPlayed(entity pl, string melody, float instrument, float ignorepitch, float mintempo, float maxtempo)
 {
-	float i;
+	float i, j, mmin, mmax, nolength;
 	float n = tokenize_console(melody);
 	if(n > pl.tuba_lastnotes_cnt)
 		return FALSE;
+	float pitchshift = 0;
+
+	if(instrument >= 0)
+		if(pl.tuba_instrument != instrument)
+			return FALSE;
+
+	// verify notes...
+	nolength = FALSE;
 	for(i = 0; i < n; ++i)
 	{
 		vector v = pl.(tuba_lastnotes[mod(pl.tuba_lastnotes_last - i + MAX_TUBANOTES, MAX_TUBANOTES)]);
 		float ai = stof(argv(n - i - 1));
+		float np = floor(ai);
+		if(ai == np)
+			nolength = TRUE;
 		// n counts the last played notes BACKWARDS
 		// _x is start
 		// _y is end
 		// _z is note pitch
-		if(v_z != floor(ai))
+		if(ignorepitch && i == 0)
+		{
+			pitchshift = np - v_z;
+		}
+		else
+		{
+			if(v_z + pitchshift != np)
+				return FALSE;
+		}
+	}
+
+	// now we know the right NOTES were played
+	if(!nolength)
+	{
+		// verify rhythm...
+		float ti = 0;
+		if(maxtempo > 0)
+			mmin = 240 / maxtempo; // 60 = "0.25 means 1 sec", at 120 0.5 means 1 sec, at 240 1 means 1 sec
+		else
+			mmin = 0;
+		if(mintempo > 0)
+			mmax = 240 / mintempo; // 60 = "0.25 means 1 sec", at 120 0.5 means 1 sec, at 240 1 means 1 sec
+		else
+			mmax = 240; // you won't try THAT hard... (tempo 1)
+		//print(sprintf("initial tempo rules: %f %f\n", mmin, mmax));
+
+		for(i = 0; i < n; ++i)
+		{
+			vector vi = pl.(tuba_lastnotes[mod(pl.tuba_lastnotes_last - i + MAX_TUBANOTES, MAX_TUBANOTES)]);
+			float ai = stof(argv(n - i - 1));
+			ti -= 1 / (ai - floor(ai));
+			float tj = ti;
+			for(j = i+1; j < n; ++j)
+			{
+				vector vj = pl.(tuba_lastnotes[mod(pl.tuba_lastnotes_last - j + MAX_TUBANOTES, MAX_TUBANOTES)]);
+				float aj = stof(argv(n - j - 1));
+				tj -= (aj - floor(aj));
+
+				// note i should be at m*ti+b
+				// note j should be at m*tj+b
+				// so:
+				// we have a LINE l, so that
+				// vi_x <= l(ti) <= vi_y
+				// vj_x <= l(tj) <= vj_y
+				// what is m?
+
+				// vi_x <= vi_y <= vj_x <= vj_y
+				// ti <= tj
+				//print(sprintf("first note: %f to %f, should be %f\n", vi_x, vi_y, ti));
+				//print(sprintf("second note: %f to %f, should be %f\n", vj_x, vj_y, tj));
+				//print(sprintf("m1 = %f\n", (vi_x - vj_y) / (ti - tj)));
+				//print(sprintf("m2 = %f\n", (vi_y - vj_x) / (ti - tj)));
+				mmin = max(mmin, (vi_x - vj_y) / (ti - tj)); // lower bound
+				mmax = min(mmax, (vi_y - vj_x) / (ti - tj)); // upper bound
+			}
+		}
+
+		if(mmin > mmax) // rhythm fail
 			return FALSE;
-		// FIXME verify rhythm
 	}
+
 	pl.tuba_lastnotes_cnt = 0;
+
 	return TRUE;
 }
 
@@ -47,9 +116,25 @@ void W_Tuba_NoteOff()
 		self.owner.tuba_note = world;
 		self.owner.tuba_lastnotes_cnt = bound(0, self.owner.tuba_lastnotes_cnt + 1, MAX_TUBANOTES);
 
-		// debug
-		if(W_Tuba_HasPlayed(self.owner, "4 0 4 2"))
-			dprint("Someone knows how to play Loom!\n");
+		string s;
+		s = trigger_magicear_processmessage_forallears(self.owner, 0, world, string_null);
+		if(s != "")
+		{
+			// simulate a server message
+			switch(self.tuba_instrument)
+			{
+				default:
+				case 0: // Tuba
+					bprint(strcat("\{1}\{13}* ^3", self.owner.netname, "^3 played on the @!#%'n Tuba: ^7", s, "\n"));
+					break;
+				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;
+			}
+		}
 	}
 	remove(self);
 }
@@ -63,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
@@ -78,6 +166,7 @@ float Tuba_GetNote(entity pl, float hittype)
 		case 2: note = -5; break; // G
 		case 3: note = -4; break; // G#
 		case 4: note = +5; break; // e#
+		default:
 		case 5: note =  0; break; // c
 		case 6: note = +2; break; // d
 		case 7: note = +3; break; // eb
@@ -97,7 +186,7 @@ float Tuba_GetNote(entity pl, float hittype)
 	// that way, holes in the range of notes are "plugged"
 	if(teamplay)
 	{
-		if(pl.team == COLOR_TEAM2 || pl.team == COLOR_TEAM4)
+		if(pl.team == FL_TEAM_2 || pl.team == FL_TEAM_4)
 			note += 3;
 	}
 	else
@@ -291,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)
@@ -317,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;
@@ -331,6 +425,24 @@ float w_tuba(float req)
 		return TRUE; // TODO use fuel?
 	else if (req == WR_CHECKAMMO2)
 		return TRUE; // TODO use fuel?
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_BOUNCE)
+			return WEAPON_ACCORDEON_SUICIDE;
+		else if(w_deathtype & HITTYPE_HEADSHOT)
+			return WEAPON_KLEINBOTTLE_SUICIDE;
+		else
+			return WEAPON_TUBA_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		if(w_deathtype & HITTYPE_BOUNCE)
+			return WEAPON_ACCORDEON_MURDER;
+		else if(w_deathtype & HITTYPE_HEADSHOT)
+			return WEAPON_KLEINBOTTLE_MURDER;
+		else
+			return WEAPON_TUBA_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -345,48 +457,6 @@ float w_tuba(float req)
 	{
 		// nothing to do
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
-		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		if(w_deathtype & HITTYPE_HEADSHOT)
-			instr |= 4;
-		switch(instr)
-		{
-			default:
-			case 0: // Tuba
-				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Tuba");
-				break;
-			case 1: // Accordeon
-				w_deathtypestring = _("%s hurt his own ears with the @!#%%'n Accordeon");
-				break;
-		}
-	}
-	else if (req == WR_KILLMESSAGE)
-	{
-		float instr;
-		instr = 0;
-		if(w_deathtype & HITTYPE_SECONDARY)
-			instr |= 1;
-		if(w_deathtype & HITTYPE_BOUNCE)
-			instr |= 2;
-		if(w_deathtype & HITTYPE_HEADSHOT)
-			instr |= 4;
-		switch(instr)
-		{
-			default:
-			case 0: // Tuba
-				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Tuba");
-				break;
-			case 1: // Accordeon
-				w_deathtypestring = _("%s died of %s's great playing on the @!#%%'n Accordeon");
-				break;
-		}
-	}
 	return TRUE;
 }
 #endif