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

Updated the Pretense script to version 1.3.8 - 3 Dec 2023 and MIST to version 4.5.122.

Browse Source
This commit is contained in:
MetalStormGhost 2023-12-06 16:38:25 +02:00
parent 00760b831e
commit 76bab86e67
3 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
game/pretense/pretenseluagenerator.py
View File

@ -828,7 +828,7 @@ class PretenseLuaGenerator(LuaGenerator):
return lua_string_connman return lua_string_connman
def generate_pretense_plugin_data(self) -> None: def generate_pretense_plugin_data(self) -> None:
self.inject_plugin_script("base", "mist_4_5_107.lua", "mist_4_5_107") self.inject_plugin_script("base", "mist_4_5_122.lua", "mist_4_5_122")
lua_string_config = "Config = Config or {}\n" lua_string_config = "Config = Config or {}\n"
@ -912,9 +912,6 @@ class PretenseLuaGenerator(LuaGenerator):
lua_string_zones += ( lua_string_zones += (
f"zones.{cp_name_trimmed}.keepActive = " + is_keep_active + "\n" f"zones.{cp_name_trimmed}.keepActive = " + is_keep_active + "\n"
) )
if cp.is_fleet:
lua_string_zones += self.generate_pretense_zone_sea(cp.name)
else:
lua_string_zones += self.generate_pretense_zone_land(cp.name) lua_string_zones += self.generate_pretense_zone_land(cp.name)
lua_string_connman = " cm = ConnectionManager:new()\n" lua_string_connman = " cm = ConnectionManager:new()\n"

4
resources/plugins/pretense/init_header.lua
View File

@ -487,10 +487,10 @@ presets = {
}, },
airdef = { airdef = {
bunker = Preset:new({ bunker = Preset:new({
display = 'Bunker', display = 'Excavator',
cost = 1500, cost = 1500,
type = 'upgrade', type = 'upgrade',
template = "bunker-1" template = "excavator"
}), }),
comCenter = Preset:new({ comCenter = Preset:new({
display = 'Command Center', display = 'Command Center',

36
resources/plugins/pretense/pretense_compiled.lua
View File

@ -709,8 +709,8 @@ do
if #targets > 0 then if #targets > 0 then
for _,tgt in ipairs(targets) do for _,tgt in ipairs(targets) do
if tgt.visible and tgt.object then if tgt.visible and tgt.object then
if tgt.object.getCoalition and tgt.object:getCoalition()~=frUnit:getCoalition() and if tgt.object.isExist and tgt.object:isExist() and tgt.object.getCoalition and tgt.object:getCoalition()~=frUnit:getCoalition() and
tgt.object.getCategory and tgt.object:getCategory() == 1 then Object.getCategory(tgt.object) == 1 then
local dist = mist.utils.get3DDist(frUnit:getPoint(), tgt.object:getPoint()) local dist = mist.utils.get3DDist(frUnit:getPoint(), tgt.object:getPoint())
if dist < 1000 then if dist < 1000 then
if not group.isstopped then if not group.isstopped then
@ -886,9 +886,9 @@ do
if #targets > 0 then if #targets > 0 then
for _,tgt in ipairs(targets) do for _,tgt in ipairs(targets) do
if tgt.visible and tgt.object and tgt.object.isExist and tgt.object:isExist() then if tgt.visible and tgt.object and tgt.object.isExist and tgt.object:isExist() then
if tgt.object.getCategory and tgt.object:getCategory() == Object.Category.UNIT and if Object.getCategory(tgt.object) == Object.Category.UNIT and
tgt.object.getCoalition and tgt.object:getCoalition()~=frUnit:getCoalition() and tgt.object.getCoalition and tgt.object:getCoalition()~=frUnit:getCoalition() and
tgt.object:getDesc().category == Unit.Category.GROUND_UNIT then Unit.getCategory(tgt.object) == Unit.Category.GROUND_UNIT then
local dist = mist.utils.get3DDist(frUnit:getPoint(), tgt.object:getPoint()) local dist = mist.utils.get3DDist(frUnit:getPoint(), tgt.object:getPoint())
if dist < 2000 then if dist < 2000 then
@ -6274,8 +6274,8 @@ do
if not player then return end if not player then return end
if event.id==world.event.S_EVENT_PLAYER_ENTER_UNIT then if event.id==world.event.S_EVENT_PLAYER_ENTER_UNIT then
if event.initiator and event.initiator:getCategory() == Object.Category.UNIT and if event.initiator and Object.getCategory(event.initiator) == Object.Category.UNIT and
(event.initiator:getDesc().category == Unit.Category.AIRPLANE or event.initiator:getDesc().category == Unit.Category.HELICOPTER) then (Unit.getCategory(event.initiator) == Unit.Category.AIRPLANE or Unit.getCategory(event.initiator) == Unit.Category.HELICOPTER) then
local pname = event.initiator:getPlayerName() local pname = event.initiator:getPlayerName()
if pname then if pname then
@ -7558,29 +7558,9 @@ do
TemplateDB.templates["tv-tower"] = { type="TV tower", category="Fortifications", shape="tele_bash", dataCategory=TemplateDB.type.static } TemplateDB.templates["tv-tower"] = { type="TV tower", category="Fortifications", shape="tele_bash", dataCategory=TemplateDB.type.static }
TemplateDB.templates["bunker-1"] = { type="Sandbox", category="Fortifications", dataCategory=TemplateDB.type.static }
TemplateDB.templates["command-center"] = { type=".Command Center", category="Fortifications", shape="ComCenter", dataCategory=TemplateDB.type.static } TemplateDB.templates["command-center"] = { type=".Command Center", category="Fortifications", shape="ComCenter", dataCategory=TemplateDB.type.static }
TemplateDB.templates["military-staff"] = { type="Military staff", category="Fortifications", shape="aviashtab", dataCategory=TemplateDB.type.static } TemplateDB.templates["military-staff"] = { type="Military staff", category="Fortifications", shape="aviashtab", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-tanker-seawisegiant"] = { type="Seawise_Giant", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-supply-tilde"] = { type="Ship_Tilde_Supply", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-landingship-samuelchase"] = { type="USS_Samuel_Chase", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-landingship-ropucha"] = { type="BDK-775", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-tanker-elnya"] = { type="ELNYA", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-landingship-lstmk2"] = { type="LST_Mk2", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-bulker-yakushev"] = { type="Dry-cargo ship-1", category="Ships", dataCategory=TemplateDB.type.static }
TemplateDB.templates["ship-cargo-ivanov"] = { type="Dry-cargo ship-2", category="Ships", dataCategory=TemplateDB.type.static }
end end
-----------------[[ END OF TemplateDB.lua ]]----------------- -----------------[[ END OF TemplateDB.lua ]]-----------------
@ -12357,7 +12337,7 @@ do
for _,m in pairs(self.activeMissions) do for _,m in pairs(self.activeMissions) do
if m.players[player] then if m.players[player] then
if m.state == Mission.states.active then if m.state == Mission.states.active then
if weapon:getDesc().category == Weapon.Category.BOMB then if Weapon.getCategory(weapon) == Weapon.Category.BOMB then
timer.scheduleFunction(function (params, time) timer.scheduleFunction(function (params, time)
if not params.weapon:isExist() then if not params.weapon:isExist() then
return nil -- weapon despawned return nil -- weapon despawned
@ -13209,7 +13189,7 @@ do
local detected = u:getController():getDetectedTargets(Controller.Detection.RADAR) local detected = u:getController():getDetectedTargets(Controller.Detection.RADAR)
for _,d in ipairs(detected) do for _,d in ipairs(detected) do
if d and d.object and d.object.isExist and d.object:isExist() and if d and d.object and d.object.isExist and d.object:isExist() and
d.object:getCategory() == Object.Category.UNIT and Object.getCategory(d.object) == Object.Category.UNIT and
d.object.getCoalition and d.object.getCoalition and
d.object:getCoalition() == self.tgtSide then d.object:getCoalition() == self.tgtSide then