fixed a number of issues: user directory on different drive, carrier ops, multiplayer debriefing parser, multiplayer mission generation; added su25

This commit is contained in:
Vasyl Horbachenko
2018-07-05 02:42:46 +03:00
parent fa55ae1fcc
commit 32fb5ad0e2
8 changed files with 130 additions and 28 deletions

View File

@@ -54,6 +54,7 @@ PRICES = {
F_15C: 24,
# bomber
Su_25: 15,
Su_25T: 13,
L_39ZA: 10,
Su_34: 18,
@@ -150,6 +151,7 @@ UNIT_BY_TASK = {
AV8BNA,
A_10A,
A_10C,
Su_25,
Su_25T,
Su_34,
Ka_50,
@@ -235,6 +237,7 @@ UNIT_BY_COUNTRY = {
C_101CC,
AJS37,
F_5E_3,
Su_25,
Su_27,
Su_33,
MiG_15bis,
@@ -279,7 +282,6 @@ UNIT_BY_COUNTRY = {
F_15C,
FA_18C_hornet,
AJS37,
F_5E_3,
M_2000C,
MiG_21Bis,
MiG_15bis,
@@ -361,7 +363,7 @@ PLANE_PAYLOAD_OVERRIDES = {
Aircraft livery overrides. Syntax as follows:
`Identifier`: "LiveryName",
`Identifier` is aircraft identifier (as used troughout the file) and "LiveryName" (with double quotes)
is livery name as found in mission editor.
"""

View File

@@ -26,7 +26,7 @@ class GroundInterceptEvent(Event):
return super(GroundInterceptEvent, self).threat_description
def __str__(self):
return "Fontline CAS from {} at {}".format(self.from_cp, self.to_cp)
return "Frontline CAS from {} at {}".format(self.from_cp, self.to_cp)
def is_successfull(self, debriefing: Debriefing):
total_targets = sum(self.targets.values())

View File

@@ -1,4 +1,5 @@
from dcs.terrain import Terrain
from dcs.lua.parse import loads
from userdata.debriefing import *
@@ -61,7 +62,11 @@ class Operation:
self.extra_aagen = ExtraAAConflictGenerator(mission, conflict, self.game, player_name, enemy_name)
def prepare(self, terrain: Terrain, is_quick: bool):
with open("resources/default_options.lua", "r") as f:
options_dict = loads(f.read())["options"]
self.mission = dcs.Mission(terrain)
self.mission.options.load_from_dict(options_dict)
self.is_quick = is_quick
if is_quick: