Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Next update #105

Merged
merged 2 commits into from
Jun 19, 2019
Merged

Next update #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5c735
Vehicle Classes Fix
y0014984 Jun 19, 2019
da4e7e5
Removed Date from Headline
y0014984 Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions addons/pps_main/functions/fn_dialogUpdate.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ _answer addPublicVariableEventHandler
_countEventsTotal = _broadcastVariableValue select 8;
_filteredPlayers = _broadcastVariableValue select 9;

_isEvent = PPS_isEvent;
_activeEventName = PPS_eventName;
_activeEventStartTime = +PPS_eventStartTime;

_statusServer = false;
Expand Down Expand Up @@ -216,8 +214,6 @@ _answer addPublicVariableEventHandler
_eventStopButton = (findDisplay 14984) displayCtrl 1607;
_eventContinueButton = (findDisplay 14984) displayCtrl 1606;
_eventDeleteButton = (findDisplay 14984) displayCtrl 1608;
_eventEditBox = (findDisplay 14984) displayCtrl 1603;
_eventEditBox ctrlSetText _activeEventName;
_continueButton = (findDisplay 14984) displayCtrl 1606;
_trackStatisticsButton = (findDisplay 14984) displayCtrl 1604;
_promoteButton = (findDisplay 14984) displayCtrl 1610;
Expand Down Expand Up @@ -253,7 +249,7 @@ _answer addPublicVariableEventHandler

_noEvent = localize "STR_PPS_Main_Dialog_No_Event";

if (_isEvent) then
if (PPS_isEvent) then
{
{
if(_x < 10) then
Expand All @@ -274,7 +270,7 @@ _answer addPublicVariableEventHandler
_timeZone = PPS_TimeZone;
if (PPS_SummerTime) then {_timeZone = _timeZone + 1;};
_headlineText ctrlSetBackgroundColor [0.5, 0, 0, 1];
_headlineText ctrlSetText format [localize "STR_PPS_Main_Dialog_Head_Time", _activeEventName, _year, _month, _day, _hours, _minutes, _seconds, _timeZone];
_headlineText ctrlSetText format [localize "STR_PPS_Main_Dialog_Head_Time", PPS_eventName, _hours, _minutes, _seconds, _timeZone];
}
else
{
Expand Down Expand Up @@ -331,9 +327,6 @@ _answer addPublicVariableEventHandler
_isAdmin = _broadcastVariableValue select 2;
_isAdminLoggedIn = _broadcastVariableValue select 3;
_filteredEvents = _broadcastVariableValue select 4;

_isEvent = PPS_isEvent;
_activeEventName = PPS_eventName;

_eventsListBox = (findDisplay 14984) displayCtrl 1501;
lbClear _eventsListBox;
Expand All @@ -359,7 +352,7 @@ _answer addPublicVariableEventHandler
_index = _eventsListBox lbAdd format ["%1-%2-%3 %4 (%5 min.)", _year, _month, _day, _dbEventName, _dbEventDuration];
_eventsListBox lbSetData [_index, _dbEventId];

if(_isEvent &&(_dbEventName == _activeEventName)) then
if(PPS_isEvent &&(_dbEventId == PPS_eventId)) then
{
_eventsListBox lbSetColor [_index, [1, 0.5, 0.5, 1]];
_eventsListBox lbSetCurSel _index;
Expand Down
40 changes: 8 additions & 32 deletions addons/pps_main/functions/fn_playerInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,10 +428,6 @@ while {true} do
_timeTruckGunner = 0;
_timeTruckCommander = 0;
_timeTruckPassenger = 0;
_timeMotorcycleDriver = 0;
_timeMotorcycleGunner = 0;
_timeMotorcycleCommander = 0;
_timeMotorcyclePassenger = 0;
_timeHelicopterDriver = 0;
_timeHelicopterGunner = 0;
_timeHelicopterCommander = 0;
Expand All @@ -444,10 +440,6 @@ while {true} do
_timeShipGunner = 0;
_timeShipCommander = 0;
_timeShipPassenger = 0;
_timeBoatDriver = 0;
_timeBoatGunner = 0;
_timeBoatCommander = 0;
_timeBoatPassenger = 0;

_timeVehicleLightOn = 0;
_timeVehicleLaser = 0;
Expand Down Expand Up @@ -546,22 +538,18 @@ while {true} do

switch (true) do
{
case ((_vehiclePlayer isKindOf "Car") && ((driver _vehiclePlayer) == player)):{_timeCarDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((gunner _vehiclePlayer) == player)):{_timeCarGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((commander _vehiclePlayer) == player)):{_timeCarCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeCarPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Tank") && ((driver _vehiclePlayer) == player)):{_timeTankDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Tank") && ((gunner _vehiclePlayer) == player)):{_timeTankGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Tank") && ((commander _vehiclePlayer) == player)):{_timeTankCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Tank") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeTankPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck") && ((driver _vehiclePlayer) == player)):{_timeTruckDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck") && ((gunner _vehiclePlayer) == player)):{_timeTruckGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck") && ((commander _vehiclePlayer) == player)):{_timeTruckCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeTruckPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Motorcycle") && ((driver _vehiclePlayer) == player)):{_timeMotorcycleDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Motorcycle") && ((gunner _vehiclePlayer) == player)):{_timeMotorcycleGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Motorcycle") && ((commander _vehiclePlayer) == player)):{_timeMotorcycleCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Motorcycle") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeMotorcyclePassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck_F") && ((driver _vehiclePlayer) == player)):{_timeTruckDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck_F") && ((gunner _vehiclePlayer) == player)):{_timeTruckGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck_F") && ((commander _vehiclePlayer) == player)):{_timeTruckCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Truck_F") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeTruckPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((driver _vehiclePlayer) == player)):{_timeCarDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((gunner _vehiclePlayer) == player)):{_timeCarGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((commander _vehiclePlayer) == player)):{_timeCarCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Car") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeCarPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Helicopter") && ((driver _vehiclePlayer) == player)):{_timeHelicopterDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Helicopter") && ((gunner _vehiclePlayer) == player)):{_timeHelicopterGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Helicopter") && ((commander _vehiclePlayer) == player)):{_timeHelicopterCommander = PPS_UpdateInterval};
Expand All @@ -574,10 +562,6 @@ while {true} do
case ((_vehiclePlayer isKindOf "Ship") && ((gunner _vehiclePlayer) == player)):{_timeShipGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Ship") && ((commander _vehiclePlayer) == player)):{_timeShipCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Ship") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeShipPassenger = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Boat") && ((driver _vehiclePlayer) == player)):{_timeBoatDriver = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Boat") && ((gunner _vehiclePlayer) == player)):{_timeBoatGunner = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Boat") && ((commander _vehiclePlayer) == player)):{_timeBoatCommander = PPS_UpdateInterval};
case ((_vehiclePlayer isKindOf "Boat") && ((_vehiclePlayer getCargoIndex player) != -1)):{_timeBoatPassenger = PPS_UpdateInterval};
};

if (isLightOn (vehicle player)) then {_timeVehicleLightOn = PPS_UpdateInterval;};
Expand Down Expand Up @@ -692,10 +676,6 @@ while {true} do
["timeTruckGunner", _timeTruckGunner, 1, 1, "STR_PPS_Main_Statistics_Time_Truck_Gunner", "A3"],
["timeTruckCommander", _timeTruckCommander, 1, 1, "STR_PPS_Main_Statistics_Time_Truck_Commander", "A3"],
["timeTruckPassenger", _timeTruckPassenger, 1, 1, "STR_PPS_Main_Statistics_Time_Truck_Passenger", "A3"],
["timeMotorcycleDriver", _timeMotorcycleDriver, 1, 1, "STR_PPS_Main_Statistics_Time_Motorcycle_Driver", "A3"],
["timeMotorcycleGunner", _timeMotorcycleGunner, 1, 1, "STR_PPS_Main_Statistics_Time_Motorcycle_Gunner", "A3"],
["timeMotorcycleCommander", _timeMotorcycleCommander, 1, 1, "STR_PPS_Main_Statistics_Time_Motorcycle_Commander", "A3"],
["timeMotorcyclePassenger", _timeMotorcyclePassenger, 1, 1, "STR_PPS_Main_Statistics_Time_Motorcycle_Passenger", "A3"],
["timeHelicopterDriver", _timeHelicopterDriver, 1, 1, "STR_PPS_Main_Statistics_Time_Helicopter_Driver", "A3"],
["timeHelicopterGunner", _timeHelicopterGunner, 1, 1, "STR_PPS_Main_Statistics_Time_Helicopter_Gunner", "A3"],
["timeHelicopterCommander", _timeHelicopterCommander, 1, 1, "STR_PPS_Main_Statistics_Time_Helicopter_Commander", "A3"],
Expand All @@ -708,10 +688,6 @@ while {true} do
["timeShipGunner", _timeShipGunner, 1, 1, "STR_PPS_Main_Statistics_Time_Ship_Gunner", "A3"],
["timeShipCommander", _timeShipCommander, 1, 1, "STR_PPS_Main_Statistics_Time_Ship_Commander", "A3"],
["timeShipPassenger", _timeShipPassenger, 1, 1, "STR_PPS_Main_Statistics_Time_Ship_Passenger", "A3"],
["timeBoatDriver", _timeBoatDriver, 1, 1, "STR_PPS_Main_Statistics_Time_Boat_Driver", "A3"],
["timeBoatGunner", _timeBoatGunner, 1, 1, "STR_PPS_Main_Statistics_Time_Boat_Gunner", "A3"],
["timeBoatCommander", _timeBoatCommander, 1, 1, "STR_PPS_Main_Statistics_Time_Boat_Commander", "A3"],
["timeBoatPassenger", _timeBoatPassenger, 1, 1, "STR_PPS_Main_Statistics_Time_Boat_Passenger", "A3"],
["timeVehicleLightOn", _timeVehicleLightOn, 1, 1, "STR_PPS_Main_Statistics_Time_Vehicle_Light_On", "A3"],
["timeVehicleLaser", _timeVehicleLaser, 1, 1, "STR_PPS_Main_Statistics_Time_Vehicle_Laser_On", "A3"],
["timeVehicleCollisionLightOn", _timeVehicleCollisionLightOn, 1, 1, "STR_PPS_Main_Statistics_Time_Vehicle_Collision_Light_On", "A3"],
Expand Down
36 changes: 2 additions & 34 deletions addons/pps_main/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<German>PERSISTENT PLAYER STATISTICS - laufendes Event: %1</German>
</Key>
<Key ID="STR_PPS_Main_Dialog_Head_Time">
<English>PERSISTENT PLAYER STATISTICS - Event in Progress: %1 (Start Time %2-%3-%4 %5:%6:%7 UTC+%8)</English>
<German>PERSISTENT PLAYER STATISTICS - laufendes Event: %1 (Startzeit %2-%3-%4 %5:%6:%7 UTC+%8)</German>
<English>PERSISTENT PLAYER STATISTICS - Event in Progress: %1 (Start Time %2:%3:%4 UTC+%5)</English>
<German>PERSISTENT PLAYER STATISTICS - laufendes Event: %1 (Startzeit %2:%3:%4 UTC+%5)</German>
</Key>
<Key ID="STR_PPS_Main_Dialog_No_Event">
<English>None</English>
Expand Down Expand Up @@ -428,22 +428,6 @@
<English>Time Truck Passenger: %2 hrs (%3%1)</English>
<German>Zeit in LKW als Passagier: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Motorcycle_Driver">
<English>Time Motorcycle Driver: %2 hrs (%3%1)</English>
<German>Zeit in Motorrad als Fahrer: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Motorcycle_Gunner">
<English>Time Motorcycle Gunner: %2 hrs (%3%1)</English>
<German>Zeit in Motorrad als Schütze: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Motorcycle_Commander">
<English>Time Motorcycle Commander: %2 hrs (%3%1)</English>
<German>Zeit in Motorrad als Kommandeur: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Motorcycle_Passenger">
<English>Time Motorcycle Passenger: %2 hrs (%3%1)</English>
<German>Zeit in Motorrad als Passagier: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Helicopter_Driver">
<English>Time Helicopter Driver: %2 hrs (%3%1)</English>
<German>Zeit in Helikopter als Fahrer: %2 Std. (%3%1)</German>
Expand Down Expand Up @@ -492,22 +476,6 @@
<English>Time Ship Passenger: %2 hrs (%3%1)</English>
<German>Zeit in Schiff als Passagier: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Boat_Driver">
<English>Time Boat Driver: %2 hrs (%3%1)</English>
<German>Zeit in Boot als Fahrer: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Boat_Gunner">
<English>Time Boat Gunner: %2 hrs (%3%1)</English>
<German>Zeit in Boot als Schütze: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Boat_Commander">
<English>Time Boat Commander: %2 hrs (%3%1)</English>
<German>Zeit in Boot als Kommandeur: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Boat_Passenger">
<English>Time Boat Passenger: %2 hrs (%3%1)</English>
<German>Zeit in Boot als Passagier: %2 Std. (%3%1)</German>
</Key>
<Key ID="STR_PPS_Main_Statistics_Time_Vehicle_Light_On">
<English>Time Vehicle Light On: %2 hrs (%3%1)</English>
<German>Zeit in Fahrzeug mit Scheinwerfern an: %2 Std. (%3%1)</German>
Expand Down