Revert "Merge branch 'Isometric-Dev' into master"

This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
-42
View File
@@ -1,42 +0,0 @@
require("_Global")
function map_briefing()
PlayMovie("SOVIET1")
SetBriefingText("Objective 1: Capture the allied communication center.\nObjective 2: Ensure your engineers dont die.\nObjective 3: Ensure your radar domes survive.\n")
end
function map_start()
GiveSpecialWeapon(SpecialWeapons.Paratroops, Houses.USSR, 1)
ToggleFireSale(Houses.GREECE, 0) -- Disable fire sale for the AI, otherwise it sells the radar dome we're trying to capture :)
end
function map_frame()
local numTeslaTanks = 0
-- Check to make sure there are two radar domes in the map, if not the player lost.
if not (CountBuildings(BuildingTypes.DOME) == 2) then
Lose(Houses.USSR)
end
-- Ensure USSR has atleast 1 engineer, and if not ussr has two radar domes
if CountInfantry(InfantryTypes.E6, Houses.USSR) == 0 then
if not (CountBuildings(BuildingTypes.DOME, Houses.USSR) == 2) then
Lose(Houses.USSR)
end
end
-- Check to see if the soviets have two radar domes, if so the player has won.
if CountBuildings(BuildingTypes.DOME, Houses.USSR) == 2 then
ToggleFireSale(Houses.GREECE, 1) -- Renable the fire sale for the AI
Win(Houses.USSR)
end
numTeslaTanks = CountUnits(VehicleTypes.TESLATANK)
if numTeslaTanks == 0 then
PlaySpeech(11) -- Reinforcements have arrived
CreateVehicle(VehicleTypes.TESLATANK,Houses.USSR,5833)
CreateVehicle(VehicleTypes.TESLATANK,Houses.USSR,5577)
CreateVehicle(VehicleTypes.TESLATANK,Houses.USSR,5706)
CreateVehicle(VehicleTypes._4TNK,Houses.USSR,5831)
end
end
+1 -7
View File
@@ -144,13 +144,7 @@
-- Counterstrike only:
ANT1=14, -- First ant type
ANT2=15, -- Second ant type
ANT3=16, -- Third ant type
-- Aftermath
CHRONOTANK=17, -- Chrono shifting tank
TESLATANK=18, -- Tesla Tank
MAD=19,
DEMOTRUNK
ANT3=16 -- Third ant type
}
-- *********************************************************