weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'khopa/master' into develop

Browse Source
This commit is contained in:
Khopa 2020-09-28 00:21:33 +02:00
commit 8709ea948f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gen/airsupportgen.py
View File

@ -65,7 +65,7 @@ class AirSupportConflictGenerator:
tanker_position = player_cp.position.point_from_heading(tanker_heading, TANKER_DISTANCE) tanker_position = player_cp.position.point_from_heading(tanker_heading, TANKER_DISTANCE)
tanker_group = self.mission.refuel_flight( tanker_group = self.mission.refuel_flight(
country=self.mission.country(self.game.player_country), country=self.mission.country(self.game.player_country),
name=namegen.next_tanker_name(self.mission.country(self.game.player_country)), name=namegen.next_tanker_name(self.mission.country(self.game.player_country), tanker_unit_type),
airport=None, airport=None,
plane_type=tanker_unit_type, plane_type=tanker_unit_type,
position=tanker_position, position=tanker_position,

4
gen/naming.py
View File

@ -61,9 +61,9 @@ class NameGenerator:
self.number += 1 self.number += 1
return "awacs|{}|{}|0|".format(country.id, self.number) return "awacs|{}|{}|0|".format(country.id, self.number)
def next_tanker_name(self, country): def next_tanker_name(self, country, unit_type):
self.number += 1 self.number += 1
return "tanker|{}|{}|0|".format(country.id, self.number) return "tanker|{}|{}|0|{}".format(country.id, self.number, db.unit_type_name(unit_type))
def next_carrier_name(self, country): def next_carrier_name(self, country):
self.number += 1 self.number += 1