BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed CapturePointSystem

Browse Source
This commit is contained in:
verysecrethero
2016-02-23 11:52:30 +01:00
parent bcc42a8cb7
commit f1d78ae790
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/CapturePointSystem.cpp
+4 -4
View File
@@ -147,12 +147,12 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
int currentTeam = 0; int currentTeam = 0;
bool canCapture = false; bool canCapture = false;
if (redTeamPlayersStandingInside > 0 && blueTeamPlayersStandingInside == 0) { if (redTeamPlayersStandingInside > 0 && blueTeamPlayersStandingInside == 0) {
timerDeltaChange = redTeamPlayersStandingInside*dt; timerDeltaChange = 3*redTeamPlayersStandingInside*dt;
currentTeam = redTeam; currentTeam = redTeam;
canCapture = nextPossibleCapturePoint["Red"] == capturePointNumber; canCapture = nextPossibleCapturePoint["Red"] == capturePointNumber;
} }
if (redTeamPlayersStandingInside == 0 && blueTeamPlayersStandingInside > 0) { if (redTeamPlayersStandingInside == 0 && blueTeamPlayersStandingInside > 0) {
timerDeltaChange = -blueTeamPlayersStandingInside*dt; timerDeltaChange = -3*blueTeamPlayersStandingInside*dt;
currentTeam = blueTeam; currentTeam = blueTeam;
canCapture = nextPossibleCapturePoint["Blue"] == capturePointNumber; canCapture = nextPossibleCapturePoint["Blue"] == capturePointNumber;
} }
@@ -170,8 +170,8 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange; cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
} }
//if capturePoint is owned by the team, and the other team has been trying to take it, then increase/decrease the timer towards 0.0 //if capturePoint is owned by the team, and the other team has been trying to take it, then increase/decrease the timer towards 0.0
if ((ownedBy == currentTeam && currentTeam == redTeam && (double)cCapturePoint["CaptureTimer"] < 0.0) || if ((ownedBy == currentTeam && currentTeam == redTeam && (double)cCapturePoint["CaptureTimer"] < captureTimeToTakeOver) ||
(ownedBy == currentTeam && currentTeam == blueTeam && (double)cCapturePoint["CaptureTimer"] > 0.0)) { (ownedBy == currentTeam && currentTeam == blueTeam && (double)cCapturePoint["CaptureTimer"] > -captureTimeToTakeOver)) {
cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange; cCapturePoint["CaptureTimer"] = (double)cCapturePoint["CaptureTimer"] + timerDeltaChange;
} }
//check if captureTimer > captureTimeToTakeOver and if so change owner and publish the eCaptured event //check if captureTimer > captureTimeToTakeOver and if so change owner and publish the eCaptured event
src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ bool AssaultWeaponBehaviour::shoot(double damage)
// Check for friendly fire // Check for friendly fire
if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)m_Player["Team"]["Team"]) { if ((ComponentInfo::EnumType)victim["Team"]["Team"] == (ComponentInfo::EnumType)m_Player["Team"]["Team"]) {
return false; damage = 1;
} }
// Deal damage! // Deal damage!