Khopa
cf583bcd55
Merge branch 'master' into develop
...
# Conflicts:
# changelog.md
# game/db.py
# game/game.py
# game/income.py
# game/theater/theatergroundobject.py
# game/version.py
# qt_ui/windows/finances/QFinancesMenu.py
2021-01-05 19:50:29 +01:00
Dan Albert
98ac4bd5c8
Fix generator -> group conversion when buying SAM.
...
Fixes https://github.com/Khopa/dcs_liberation/issues/664
Fixes https://github.com/Khopa/dcs_liberation/issues/665
2020-12-26 02:23:15 -08:00
Dan Albert
85619b156d
Support groups for SAM templates.
...
It's only possible to control emissions for the group as a whole, so
Skynet needs PDs to be in separate groups from the main part of the SAM
for PD to operate correctly.
https://github.com/Khopa/dcs_liberation/issues/429
https://github.com/Khopa/dcs_liberation/issues/470
2020-12-24 16:09:42 -08:00
Khopa
e1009bdafa
Fixed ships group that could be replaced by sam site. Removed the possibility to disband ship groups for now.
2020-12-24 16:09:13 +01:00
Dan Albert
edba923f2f
Fix budget update for non-base SAMs.
...
Just emit the signal to update the budget rather than trying to figure
out the heirarchy of the UI.
Fixes https://github.com/Khopa/dcs_liberation/issues/581
(cherry picked from commit 7d907aac0f644f55bda42ec916eb2be054aefcf5)
2020-12-14 17:41:14 -08:00
Dan Albert
7d907aac0f
Fix budget update for non-base SAMs.
...
Just emit the signal to update the budget rather than trying to figure
out the heirarchy of the UI.
Fixes https://github.com/Khopa/dcs_liberation/issues/581
2020-12-14 17:00:56 -08:00
root0fall
8b49752401
refresh budget after purchase from subwindow
...
fixes https://github.com/Khopa/dcs_liberation/issues/221
2020-12-08 20:47:02 +08:00
Dan Albert
0e807d84c2
Differentiate required long and medium range SAMs.
...
To improve IADS design in campaigns, this differentiates required long
and medium range SAMs. SAMs that must be long range SAMs are defined by
SA-10 or Patriot launchers, while medium range SAMs are defined by SA-2,
SA-3, or Hawk launchers.
Long range SAMs positions will only be populated by long range SAMs
(Patriots and SA-10s), and not all factions have those available. Medium
range SAMs currently comprise all air defenses that are not long range
SAMs, so if the faction includes flak guns in their `sams` property then
flak guns may be spawned at medium range SAM locations.
Base defenses and random SAM locations continue to use either type of
SAM.
2020-11-26 19:48:14 -08:00
Khopa
398fa1e73d
Fixed warehouse building not generating any rewards
2020-11-21 18:31:12 +01:00
Dan Albert
ae68a35a1a
Remove save compat since it's breaking anyway.
...
Removal of old paths/names for things that no longer exist.
2020-11-20 17:06:01 -08:00
Ignacio Muñoz Fernandez
1553e5efd5
chore: syntax cleaning and redundant variable cleanup
2020-11-20 02:57:23 -08:00
Ignacio Muñoz Fernandez
0f1b396dd2
chore: variable name changes
2020-11-20 02:57:23 -08:00
Ignacio Muñoz Fernandez
976ee51bf5
feat: Added Financial Income to GroundObjectMenu building window
2020-11-20 02:57:23 -08:00
Khopa
c96b5cf4d7
Fixed bug when buying armor at base
2020-09-25 00:25:20 +02:00
Khopa
0e2a449553
Fixes to Buy/Sell sam UI
2020-09-23 00:39:01 +02:00
Khopa
4031c9b978
Possible to sell/buy units at SAM location and in airports.
2020-09-19 17:11:43 +02:00
Khopa
e210dcb4df
Added disband menu in ground object menu.
2020-09-19 14:02:53 +02:00
Khopa
21c355bc9f
Fix small issue with ground object menu when the ground object is empty.
2020-08-24 21:34:24 +02:00
Khopa
4b2804427e
Possible to replace SAM, possible to see building recon images on ground site.
2020-08-23 18:25:23 +02:00
Khopa
bcae51cc92
Added possibility to repair SAM sites (WIP)
2020-08-23 13:43:33 +02:00
