Permalink
Browse files

Merge branch 'master' into patch-7

  • Loading branch information...
CommonPlayer committed Nov 16, 2018
2 parents d6cbc75 + ab7a281 commit cb33fd858b6076580ec75fde69515f21d703928b
Showing 362 changed files with 7,018 additions and 5,603 deletions.
@@ -1 +1 @@
VERSION{v11.18}
VERSION{v12.03}
@@ -117,7 +117,7 @@ function UnitDef_Post(name, uDef)
--
if uDef.builder == true and uDef.sounds then
uDef.sounds.build = "miscfx/buildstart-mechanical.wav"
uDef.sounds.build = "miscfx/buildstart-nano.wav"
end
--------------------------------------------------------------------------------
@@ -187,7 +187,7 @@ function WeaponDef_Post(name, wDef)
wDef.targetborder = tonumber(wDef.customparams.targetborderoverride)
end
-- weapon reloadTime and stockpileTime were seperated in 77b1
-- weapon reloadTime and stockpileTime were separated in 77b1
if (tobool(wDef.stockpile) and (wDef.stockpiletime==nil)) then
wDef.stockpiletime = wDef.reloadtime
--wDef.reloadtime = 2 -- 2 seconds
@@ -205,6 +205,8 @@ function WeaponDef_Post(name, wDef)
wDef.edgeeffectiveness = 1
end
--Override map gravity for all weapons
wDef.mygravity = 0.14
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
-- Set up params for Point Defense turrets
@@ -23,6 +23,16 @@ local Sounds = {
in3d = true,
maxconcurrent = 1,
},
buildmechanical = {
--- new since 89.0
--- you can overwrite the fallback profile here (used when no corresponding SoundItem is defined for a sound)
file = "sounds/miscfx/buildstart-nano.wav",
--gainmod = 0.35,
--pitchmod = 0.05,
--pitch = 0.7,
in3d = true,
maxconcurrent = 1,
},
airraider = {
--- new since 89.0
@@ -25,7 +25,11 @@ Shared.buildList = {
[[ebox]],
[[ehbotengineer]],
[[eorb]],
[[ecommander]],
-- [[ecommander]],
}
Shared.buildListChicken = {
[[croost]]
}
local turrets = {
@@ -76,247 +80,35 @@ end
Shared.buildListAIOverseer = {
------------- Basic
[[escoutdrone]],
[[eartyturret_up3]],
[[ejammerai]],
[[eorb_up1]],
[[eorb_up2]],
[[eorb_up3]],
[[etech1ai]],
[[etech2ai]],
[[etech3ai]],
[[emetalextractor_up1]],
[[emetalextractor_up2]],
[[emetalextractor_up3]],
[[eunitfactoryai]],
[[eantinukeai]],
[[elobberai]],
[[esiloai]],
[[eturretheavyai]],
[[eturretheavyai_up3]],
[[eturretlightai]],
[[eturretlightai_up3]],
[[emetalextractor]],
[[elifterai]],
[[eaiturret]],
[[ehbotfac]],
[[eminifac]],
[[ebasefactory]],
[[eamphibfac]],
[[eairplant]],
[[etech1]],
[[emetalextractor]],
[[esolar2]],
[[egeothermal]],
[[efusion2]],
[[estorage]],
[[eradar2]],
[[ejammer2]],
[[ekmar]],
[[emine]],
[[elightturret2]],
[[eheavyturret2]],
[[elaserbattery]],
[[eartyturret]],
[[euwturret]],
-- [[euwturret]],
[[eshieldgen]],
[[esilo]],
[[emine]],
[[escoutdrone]],
[[ebox]],
[[ehbotengineer]],
[[eorb]],
[[ebox]],
[[ehbotfac]],
[[eminifac]],
[[ebasefactory]],
[[eamphibfac]],
[[eairplant]],
----------------- Upgrade 0
[[eairemp]],
[[edrone]],
[[elighttank3]],
[[eriottank2]],
[[eheavytank3]],
[[emissiletank]],
[[eartytank]],
[[elacerator]],
[[eamphibbuggy]],
[[eamphibriot]],
[[eamphibneedle]],
[[eamphibmedtank]],
[[eamphibrock]],
[[eamphibarty]],
[[eamphibleveler]],
[[eallterrlight]],
[[eallterrriot]],
[[eallterrmed]],
[[eallterrheavy]],
[[eallterrassault]],
[[eallterranarchid]],
[[eallterrshield]],
[[escout]],
[[efighter]],
[[egunship2]],
[[ebomber]],
[[etransport]],
[[ehbotpeewee]],
[[ehbotthud]],
[[ehbotsniper]],
[[ehbotrocko]],
[[eorbai]],
[[ekrow]],
[[edrone]],
[[ehbotkarganneth]],
----------------- Upgrade 1
[[eairemp_up1]],
[[edrone_up1]],
[[elighttank3_up1]],
[[eriottank2_up1]],
[[eheavytank3_up1]],
[[emissiletank_up1]],
[[eartytank_up1]],
[[elacerator_up1]],
[[eamphibbuggy_up1]],
[[eamphibriot_up1]],
[[eamphibneedle_up1]],
[[eamphibmedtank_up1]],
[[eamphibrock_up1]],
[[eamphibarty_up1]],
[[eamphibleveler_up1]],
[[eallterrlight_up1]],
[[eallterrriot_up1]],
[[eallterrmed_up1]],
[[eallterrheavy_up1]],
[[eallterrassault_up1]],
[[eallterranarchid_up1]],
[[eallterrshield_up1]],
[[escout_up1]],
[[efighter_up1]],
[[egunship2_up1]],
[[ebomber_up1]],
[[etransport_up1]],
[[ehbotpeewee_up1]],
[[ehbotthud_up1]],
[[ehbotsniper_up1]],
[[ehbotrocko_up1]],
[[ekrow_up1]],
[[ehbotkarganneth_up1]],
----------------- Upgrade 2
[[eairemp_up2]],
[[edrone_up2]],
[[elighttank3_up2]],
[[eriottank2_up2]],
[[eheavytank3_up2]],
[[emissiletank_up2]],
[[eartytank_up2]],
[[elacerator_up2]],
[[eamphibbuggy_up2]],
[[eamphibriot_up2]],
[[eamphibneedle_up2]],
[[eamphibmedtank_up2]],
[[eamphibrock_up2]],
[[eamphibarty_up2]],
[[eamphibleveler_up2]],
[[eallterrlight_up2]],
[[eallterrriot_up2]],
[[eallterrmed_up2]],
[[eallterrheavy_up2]],
[[eallterrassault_up2]],
[[eallterranarchid_up2]],
[[eallterrshield_up2]],
[[escout_up2]],
[[efighter_up2]],
[[egunship2_up2]],
[[ebomber_up2]],
[[etransport_up2]],
[[ehbotpeewee_up2]],
[[ehbotthud_up2]],
[[ehbotsniper_up2]],
[[ehbotrocko_up2]],
[[ekrow_up2]],
[[ehbotkarganneth_up2]],
----------------- Upgrade 3
[[eairemp_up3]],
[[edrone_up3]],
[[elighttank3_up3]],
[[eriottank2_up3]],
[[eheavytank3_up3]],
[[emissiletank_up3]],
[[eartytank_up3]],
[[elacerator_up3]],
[[eamphibbuggy_up3]],
[[eamphibriot_up3]],
[[eamphibneedle_up3]],
[[eamphibmedtank_up3]],
[[eamphibrock_up3]],
[[eamphibarty_up3]],
[[eamphibleveler_up3]],
[[eallterrlight_up3]],
[[eallterrriot_up3]],
[[eallterrmed_up3]],
[[eallterrheavy_up3]],
[[eallterrassault_up3]],
[[eallterranarchid_up3]],
[[eallterrshield_up3]],
[[escout_up3]],
[[efighter_up3]],
[[egunship2_up3]],
[[ebomber_up3]],
[[etransport_up3]],
[[ehbotpeewee_up3]],
[[ehbotthud_up3]],
[[ehbotsniper_up3]],
[[ehbotrocko_up3]],
[[ekrow_up3]],
[[ehbotkarganneth_up3]],
----------------- Chickens
[[chickeneco]],
[[chicken_dodo1]],
[[chicken_dodo2]],
[[chicken1]],
[[chicken1b]],
[[chicken1c]],
[[chicken1d]],
[[chicken1x]],
[[chicken1y]],
[[chicken1z]],
[[chicken2]],
[[chicken2b]],
[[chickena1]],
[[chickena1b]],
[[chickena1c]],
[[chickena2]],
[[chickena2b]],
[[chickenc1]],
[[chickenc2]],
[[chickenc3]],
[[chickenc3b]],
[[chickenc3c]],
[[chickend1]],
[[chickenf1]],
[[chickenf1b]],
[[chickenf2]],
[[chickenh1]],
[[chickenh1b]],
[[chickenh2]],
[[chickenh3]],
[[chickenh4]],
[[chickenh5]],
[[chickenp1]],
[[chickenr1]],
[[chickenr2]],
[[chickenr3]],
[[chickens1]],
[[chickens2]],
[[chickens3]],
[[chickenw1]],
[[chickenw1b]],
[[chickenw1c]],
[[chickenw1d]],
[[chickenw2]],
[[e_chickenq]],
[[epic_chickenq]],
[[h_chickenq]],
[[n_chickenq]],
[[ve_chickenq]],
[[vh_chickenq]],
[[roost]],
-- [[ecommander]],
}
-----------------------------
@@ -411,8 +203,8 @@ Shared.buildListAllTerrainFactory = {
[[eallterrmed]],
[[eallterrheavy]],
[[eallterrassault]],
[[eallterranarchid]],
[[eallterrshield]],
[[eallterranarchid]],
}
Shared.buildListAllTerrainFactory_up1 = {
@@ -421,8 +213,8 @@ Shared.buildListAllTerrainFactory_up1 = {
[[eallterrmed_up1]],
[[eallterrheavy_up1]],
[[eallterrassault_up1]],
[[eallterranarchid_up1]],
[[eallterrshield_up1]],
[[eallterranarchid_up1]],
}
Shared.buildListAllTerrainFactory_up2 = {
@@ -431,8 +223,8 @@ Shared.buildListAllTerrainFactory_up2 = {
[[eallterrmed_up2]],
[[eallterrheavy_up2]],
[[eallterrassault_up2]],
[[eallterranarchid_up2]],
[[eallterrshield_up2]],
[[eallterranarchid_up2]],
}
Shared.buildListAllTerrainFactory_up3 = {
@@ -441,8 +233,8 @@ Shared.buildListAllTerrainFactory_up3 = {
[[eallterrmed_up3]],
[[eallterrheavy_up3]],
[[eallterrassault_up3]],
[[eallterranarchid_up3]],
[[eallterrshield_up3]],
[[eallterranarchid_up3]],
}
--
--
Oops, something went wrong.

0 comments on commit cb33fd8

Please sign in to comment.