X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fonslaught%2Fsv_onslaught.qc;h=0a2aeb11c7145cc274833ba548d55b5ede68511f;hb=8c094d930e9ef51767384452f80a3bccdc6fd38d;hp=9992a37f4ce032faa7f25549728ff5d3303846a2;hpb=2bef06fcd0faafa3d550dd49559e301b2722303e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 9992a37f4..0a2aeb11c 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -68,7 +68,7 @@ void ons_CaptureShield_Touch(entity this, entity toucher)
 	vector mymid = (this.absmin + this.absmax) * 0.5;
 	vector theirmid = (toucher.absmin + toucher.absmax) * 0.5;
 
-	Damage(toucher, this, this, 0, DEATH_HURTTRIGGER.m_id, mymid, normalize(theirmid - mymid) * ons_captureshield_force);
+	Damage(toucher, this, this, 0, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, mymid, normalize(theirmid - mymid) * ons_captureshield_force);
 
 	if(IS_REAL_CLIENT(toucher))
 	{
@@ -381,7 +381,7 @@ int ons_ControlPoint_Attackable(entity cp, int teamnumber)
 	return 0;
 }
 
-void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
 {
 	if(damage <= 0) { return; }
 
@@ -426,8 +426,8 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker
 		pointparticles(EFFECT_ROCKET_EXPLODE, this.origin, '0 0 0', 1);
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_CPDESTROYED), this.owner.message, attacker.netname);
 
-		PlayerScore_Add(attacker, SP_ONS_TAKES, 1);
-		PlayerScore_Add(attacker, SP_SCORE, 10);
+		GameRules_scoring_add(attacker, ONS_TAKES, 1);
+		GameRules_scoring_add(attacker, SCORE, 10);
 
 		this.owner.goalentity = NULL;
 		this.owner.islinked = false;
@@ -479,7 +479,7 @@ void ons_ControlPoint_Icon_Think(entity this)
 		this.SendFlags |= CPSF_STATUS;
 		if(this.health <= 0)
 		{
-			ons_ControlPoint_Icon_Damage(this, this, this, 1, 0, this.origin, '0 0 0');
+			ons_ControlPoint_Icon_Damage(this, this, this, 1, 0, DMG_NOWEP, this.origin, '0 0 0');
 			return;
 		}
 	}
@@ -555,8 +555,8 @@ void ons_ControlPoint_Icon_BuildThink(entity this)
 			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ONSLAUGHT_CAPTURE, this.owner.ons_toucher.netname, this.owner.message);
 			Send_Notification(NOTIF_ALL_EXCEPT, this.owner.ons_toucher, MSG_CENTER, APP_TEAM_NUM(this.owner.ons_toucher.team, CENTER_ONS_CAPTURE_TEAM), this.owner.message);
 			Send_Notification(NOTIF_ONE, this.owner.ons_toucher, MSG_CENTER, CENTER_ONS_CAPTURE, this.owner.message);
-			PlayerScore_Add(this.owner.ons_toucher, SP_ONS_CAPS, 1);
-			PlayerTeamScore_AddScore(this.owner.ons_toucher, 10);
+			GameRules_scoring_add(this.owner.ons_toucher, ONS_CAPS, 1);
+			GameRules_scoring_add_team(this.owner.ons_toucher, SCORE, 10);
 		}
 
 		this.owner.ons_toucher = NULL;
@@ -868,7 +868,7 @@ void ons_camSetup(entity this)
 	WriteAngle(MSG_ALL, cam.angles_z);
 }
 
-void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
 {
 	if(damage <= 0) return;
 	if(warmup_stage || game_stopped) return;
@@ -911,7 +911,7 @@ void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float d
 		else
 		{
 			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_GENDESTROYED));
-			PlayerScore_Add(attacker, SP_SCORE, 100);
+			GameRules_scoring_add(attacker, SCORE, 100);
 		}
 		this.iscaptured = false;
 		this.islinked = false;
@@ -1155,7 +1155,7 @@ bool Onslaught_CheckWinner()
 			else
 				d = d * tmp_entity.max_health / max(30, 60 * autocvar_timelimit_suddendeath);
 
-			Damage(tmp_entity, tmp_entity, tmp_entity, d, DEATH_HURTTRIGGER.m_id, tmp_entity.origin, '0 0 0');
+			Damage(tmp_entity, tmp_entity, tmp_entity, d, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, tmp_entity.origin, '0 0 0');
 
 			tmp_entity.sprite.SendFlags |= 16;
 
@@ -1488,7 +1488,7 @@ void havocbot_role_ons_offense(entity this)
 	if(this.havocbot_attack_time>time)
 		return;
 
-	if (this.bot_strategytime < time)
+	if (navigation_goalrating_timeout(this))
 	{
 		navigation_goalrating_start(this);
 		havocbot_goalrating_enemyplayers(this, 20000, this.origin, 650);
@@ -1497,7 +1497,7 @@ void havocbot_role_ons_offense(entity this)
 		havocbot_goalrating_ons_offenseitems(this, 10000, this.origin, 10000);
 		navigation_goalrating_end(this);
 
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
+		navigation_goalrating_timeout_set(this);
 	}
 }
 
@@ -2174,11 +2174,11 @@ void ons_ScoreRules()
 	if(c2 >= 0) teams |= BIT(1);
 	if(c3 >= 0) teams |= BIT(2);
 	if(c4 >= 0) teams |= BIT(3);
-	ScoreRules_basics(teams, SFL_SORT_PRIO_PRIMARY, 0, true);
-	ScoreInfo_SetLabel_TeamScore  (ST_ONS_CAPS,     "destroyed", SFL_SORT_PRIO_PRIMARY);
-	ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS,    "caps",      SFL_SORT_PRIO_SECONDARY);
-	ScoreInfo_SetLabel_PlayerScore(SP_ONS_TAKES,	"takes",     0);
-	ScoreRules_basics_end();
+	GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, 0, {
+	    field_team(ST_ONS_CAPS, "destroyed", SFL_SORT_PRIO_PRIMARY);
+	    field(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY);
+	    field(SP_ONS_TAKES,	"takes", 0);
+	});
 }
 
 void ons_DelayedInit(entity this) // Do this check with a delay so we can wait for teams to be set up