Merge pull request #7418 from Mailaender/movie-list-removal
Removed the unused movie lists
This commit is contained in:
Matthias Mailänder
@@ -22,7 +22,6 @@ namespace OpenRA
|
||||
public readonly IReadOnlyDictionary<string, SoundInfo> Voices;
|
||||
public readonly IReadOnlyDictionary<string, SoundInfo> Notifications;
|
||||
public readonly IReadOnlyDictionary<string, MusicInfo> Music;
|
||||
public readonly IReadOnlyDictionary<string, string> Movies;
|
||||
public readonly IReadOnlyDictionary<string, TileSet> TileSets;
|
||||
public readonly IReadOnlyDictionary<string, SequenceProvider> Sequences;
|
||||
|
||||
@@ -32,7 +31,6 @@ namespace OpenRA
|
||||
IDictionary<string, SoundInfo> voices,
|
||||
IDictionary<string, SoundInfo> notifications,
|
||||
IDictionary<string, MusicInfo> music,
|
||||
IDictionary<string, string> movies,
|
||||
IDictionary<string, TileSet> tileSets,
|
||||
IDictionary<string, SequenceProvider> sequences)
|
||||
{
|
||||
@@ -41,7 +39,6 @@ namespace OpenRA
|
||||
Voices = new ReadOnlyDictionary<string, SoundInfo>(voices);
|
||||
Notifications = new ReadOnlyDictionary<string, SoundInfo>(notifications);
|
||||
Music = new ReadOnlyDictionary<string, MusicInfo>(music);
|
||||
Movies = new ReadOnlyDictionary<string, string>(movies);
|
||||
TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
|
||||
Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,6 @@ namespace OpenRA
|
||||
readonly Dictionary<string, SoundInfo> voiceCache = new Dictionary<string, SoundInfo>();
|
||||
readonly Dictionary<string, SoundInfo> notificationCache = new Dictionary<string, SoundInfo>();
|
||||
readonly Dictionary<string, MusicInfo> musicCache = new Dictionary<string, MusicInfo>();
|
||||
readonly Dictionary<string, string> movieCache = new Dictionary<string, string>();
|
||||
readonly Dictionary<string, TileSet> tileSetCache = new Dictionary<string, TileSet>();
|
||||
readonly Dictionary<string, SequenceCache> sequenceCaches = new Dictionary<string, SequenceCache>();
|
||||
|
||||
@@ -56,7 +55,6 @@ namespace OpenRA
|
||||
Dictionary<string, SoundInfo> voices;
|
||||
Dictionary<string, SoundInfo> notifications;
|
||||
Dictionary<string, MusicInfo> music;
|
||||
Dictionary<string, string> movies;
|
||||
Dictionary<string, TileSet> tileSets;
|
||||
|
||||
using (new PerfTimer("Actors"))
|
||||
@@ -69,14 +67,12 @@ namespace OpenRA
|
||||
notifications = LoadYamlRules(notificationCache, m.Notifications, map.NotificationDefinitions, (k, _) => new SoundInfo(k.Value));
|
||||
using (new PerfTimer("Music"))
|
||||
music = LoadYamlRules(musicCache, m.Music, new List<MiniYamlNode>(), (k, _) => new MusicInfo(k.Key, k.Value));
|
||||
using (new PerfTimer("Movies"))
|
||||
movies = LoadYamlRules(movieCache, m.Movies, new List<MiniYamlNode>(), (k, v) => k.Value.Value);
|
||||
using (new PerfTimer("TileSets"))
|
||||
tileSets = LoadTileSets(tileSetCache, sequenceCaches, m.TileSets);
|
||||
|
||||
var sequences = sequenceCaches.ToDictionary(kvp => kvp.Key, kvp => new SequenceProvider(kvp.Value, map));
|
||||
|
||||
return new Ruleset(actors, weapons, voices, notifications, music, movies, tileSets, sequences);
|
||||
return new Ruleset(actors, weapons, voices, notifications, music, tileSets, sequences);
|
||||
}
|
||||
|
||||
Dictionary<string, T> LoadYamlRules<T>(
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace OpenRA
|
||||
public readonly string[]
|
||||
Folders, Rules, ServerTraits,
|
||||
Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
|
||||
Weapons, Voices, Notifications, Music, Movies, Translations, TileSets,
|
||||
Weapons, Voices, Notifications, Music, Translations, TileSets,
|
||||
ChromeMetrics, MapCompatibility, Missions;
|
||||
|
||||
public readonly IReadOnlyDictionary<string, string> Packages;
|
||||
@@ -77,7 +77,6 @@ namespace OpenRA
|
||||
Voices = YamlList(yaml, "Voices", true);
|
||||
Notifications = YamlList(yaml, "Notifications", true);
|
||||
Music = YamlList(yaml, "Music", true);
|
||||
Movies = YamlList(yaml, "Movies", true);
|
||||
Translations = YamlList(yaml, "Translations", true);
|
||||
TileSets = YamlList(yaml, "TileSets", true);
|
||||
ChromeMetrics = YamlList(yaml, "ChromeMetrics", true);
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
banner.vqa:gdi banner unfolding
|
||||
bcanyon.vqa:orca flying through canyon
|
||||
bkground.vqa:background on the conflict
|
||||
bombaway.vqa:planes airstriking base
|
||||
bombflee.vqa:running away from bombers
|
||||
burdet1.vqa:greg burdette reports 1
|
||||
burdet2.vqa:greg burdette reports 2
|
||||
cc2tease.vqa:c&c 2 teaser
|
||||
consyard.vqa:construction yard unfolding
|
||||
desolat.vqa:deserted village
|
||||
dino.vqa:dino movie
|
||||
flag.vqa:flag being raised
|
||||
flyy.vqa:apachie shooting apc
|
||||
forestkl.vqa:guy killing another guy in the forest
|
||||
gameover.vqa:tanks going onto plane tank store being locked up
|
||||
gdi1.vqa:capture the beachead
|
||||
gdi10.vqa:play with the orcas
|
||||
gdi11.vqa:find delphi
|
||||
gdi12.vqa:get mobius
|
||||
gdi13.vqa:destroy bio lab
|
||||
gdi14.vqa:destroy nod forces
|
||||
gdi15.vqa:destroy nod base
|
||||
gdi2.vqa:destroy nod refinery
|
||||
gdi3.vqa:destroy sam sites
|
||||
gdi3lose.vqa:apachie blowing up tank
|
||||
gdi4a.vqa:capture the village
|
||||
gdi4b.vqa:recapture the convoy
|
||||
gdi5.vqa:repair gdi base
|
||||
gdi6.vqa:destroy nod base
|
||||
gdi7.vqa:finish nod base
|
||||
gdi8a.vqa:repair gdi equipment
|
||||
gdi8b.vqa:protect mobieus
|
||||
gdi9.vqa:destroy bunkers
|
||||
gdiend1.vqa:gdi end no ion cannon
|
||||
gdiend2.vqa:gdi end with ion cannon
|
||||
gdifina.vqa:missiles shoot temple
|
||||
gdifinb.vqa:temple is ion cannoned
|
||||
gdilose.vqa:gdi logo being turned into nod logo
|
||||
generic.vqa:kane ordering nod to look for dinos
|
||||
gunboat.vqa:gunboat blowing up turret
|
||||
hellvaly.vqa:valley filled with tiberium
|
||||
intro2.vqa:c&c intro movie
|
||||
landing.vqa:hovercrafts landing
|
||||
logo.vqa:westwood logo
|
||||
napalm.vqa:planes blowing up mobile hq
|
||||
nitejump.vqa:soldiers infiltrating base
|
||||
nod1.vqa:kill village chief
|
||||
nodflees.vqa:nod soldiers runnning away
|
||||
nodlose.vqa:nod logo turning into gdi logo
|
||||
nodsweep.vqa:nod forces assaulting village
|
||||
paratrop.vqa:paratroopers
|
||||
pintle.vqa:helicopter being shot down
|
||||
planecra.vqa:transport plane crashing
|
||||
podium.vqa:gdi person at press confrence
|
||||
retro.vqa:rescue mission
|
||||
sabotage.vqa:sabotage
|
||||
samdie.vqa:sam site being blown up
|
||||
samsite.vqa:sam site firing
|
||||
seige.vqa:siege on base
|
||||
tbrinfo1.vqa:tiberium info 1
|
||||
tbrinfo2.vqa:tiberium info 2
|
||||
tbrinfo3.vqa:tiberium info 3
|
||||
trailer.vqa:red alert preview
|
||||
turtkill.vqa:turret being blown up in the forest
|
||||
visor.vqa:change of plan
|
||||
@@ -1,61 +0,0 @@
|
||||
airstrk.vqa:guys spotting enemy base for planes
|
||||
akira.vqa:nod base being ion cannoned
|
||||
banner.vqa:gdi banner unfolding
|
||||
bcanyon.vqa:orca flying through canyon
|
||||
bombaway.vqa:planes airstriking base
|
||||
bombflee.vqa:running away from bombers
|
||||
cc2tease.vqa:c&c 2 teaser
|
||||
consyard.vqa:construction yard unfolding
|
||||
desflees.vqa:guys running away from tanks in the desert
|
||||
deskill.vqa:guy killing another guy in the desert
|
||||
dessweep.vqa:tanks moving into a desert town
|
||||
dino.vqa:dino movie
|
||||
flag.vqa:flag being raised
|
||||
forestkl.vqa:guy killing another guy in the forest
|
||||
gameover.vqa:tanks going onto plane tank store being locked up
|
||||
gdi1.vqa:capture the beachead
|
||||
generic.vqa:kane ordering nod to look for dinos
|
||||
insites.vqa:sam site shooting plane
|
||||
intro2.vqa:c&c intro movie
|
||||
kanepre.vqa:kane's intro to tiberium
|
||||
landing.vqa:hovercrafts landing
|
||||
logo.vqa:westwood logo
|
||||
nod1.vqa:kill village chief
|
||||
nod10a.vqa:kill scientist
|
||||
nod10b.vqa:destroy mammoth tank
|
||||
nod11.vqa:recapture stealth tank
|
||||
nod12.vqa:capture communications center
|
||||
nod13.vqa:remove gdi bases
|
||||
nod1pre.vqa:static to nod logo
|
||||
nod2.vqa:setup a base
|
||||
nod3.vqa:free the prisoners
|
||||
nod4a.vqa:destroy village
|
||||
nod4b.vqa:eliminate the gdi
|
||||
nod5.vqa:destroy the airbase
|
||||
nod6.vqa:get detonator
|
||||
nod7a.vqa:destroy village
|
||||
nod7b.vqa:capture orca
|
||||
nod8.vqa:capture gdi base
|
||||
nod9.vqa:reinforce base
|
||||
nodend1.vqa:destroying the effiel tower
|
||||
nodend2.vqa:destroying the white house
|
||||
nodend3.vqa:destroying big ben
|
||||
nodend4.vqa:destroying the gate
|
||||
nodfinal.vqa:nod getting the ion cannon
|
||||
nodlose.vqa:nod logo turning into gdi logo
|
||||
nuke.vqa:nuclear expolsion
|
||||
obel.vqa:obelisk of light
|
||||
refint.vqa:interior of tiberium refinery
|
||||
retro.vqa:rescue mission
|
||||
samsite.vqa:sam site firing
|
||||
seige.vqa:siege on base
|
||||
sethpre.vqa:background on the brotherhood
|
||||
spycrash.vqa:spyplane crash
|
||||
stealth.vqa:stealth tank
|
||||
sundial.vqa:sundial being blown up
|
||||
tankgo.vqa:tanks rolling through the desert
|
||||
tankkill.vqa:tank being blown up
|
||||
tiberfx.vqa:the effects of tiberium
|
||||
trailer.vqa:red alert preview
|
||||
trtkil_d.vqa:turret being blown up in the desert
|
||||
visor.vqa:change of plan
|
||||
@@ -113,8 +113,6 @@ TileSize: 32,32
|
||||
Music:
|
||||
./mods/d2k/music.yaml
|
||||
|
||||
Movies:
|
||||
|
||||
Translations:
|
||||
./mods/d2k/languages/english.yaml
|
||||
|
||||
|
||||
@@ -126,10 +126,6 @@ TileSets:
|
||||
Music:
|
||||
./mods/ra/music.yaml
|
||||
|
||||
Movies:
|
||||
./mods/ra/movies1.yaml
|
||||
./mods/ra/movies2.yaml
|
||||
|
||||
Translations:
|
||||
./mods/ra/languages/english.yaml
|
||||
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
aagun.vqa: a.a. gun shooting yak
|
||||
aftrmath.vqa: iron curtain destroyed
|
||||
ally1.vqa: get einstien
|
||||
ally2.vqa: clear the way for the convoy
|
||||
ally4.vqa: close the mountain pass
|
||||
ally5.vqa: rescue tanya
|
||||
ally6.vqa: find the iron curtain
|
||||
ally8.vqa: protect the tech centre
|
||||
ally9.vqa: rescue kosygin
|
||||
ally10.vqa: stop nukes
|
||||
ally10b.vqa: deactivate launch terminals
|
||||
ally11.vqa: clear the river
|
||||
ally12.vqa: infiltrate tech centers
|
||||
ally14.vqa: final assult on moscow
|
||||
allyend.vqa: stalin is dead
|
||||
allymorf.vqa: allied logo
|
||||
apcescpe.vqa: apc running away
|
||||
assess.vqa: allied found iron curtain
|
||||
battle.vqa: destroyed vechicles
|
||||
binoc.vqa: guy viewing tanks through binoculars
|
||||
bmap.vqa: dagger falls on map of europe & europe turns red
|
||||
brdgtilt.vqa: a bridge
|
||||
cronfail.vqa: chronosphere test failed
|
||||
crontest.vqa: chronosphere test ok
|
||||
destroyr.vqa: allied destroyers
|
||||
dud.vqa: dud missile in london
|
||||
elevator.vqa: inside soviet elevator
|
||||
flare.vqa: flare man
|
||||
frozen.vqa: frozen soldier
|
||||
grvestne.vqa: tanya adams r.i.p.
|
||||
landing.vqa: helicopter landing outside soviet base
|
||||
masasslt.vqa: assault on moscow
|
||||
mcv.vqa: mcv drives up
|
||||
mcv_land.vqa: helicopter lands near mcv
|
||||
montpass.vqa: truck drives over sign
|
||||
oildrum.vqa: artillery blows up barrels
|
||||
overrun.vqa: soldiers nearly run over
|
||||
prolog.vqa: einstien eliminating hitler
|
||||
redintro.vqa: red alert intro sequence
|
||||
shipsink.vqa: ship sinking
|
||||
shorbom1.vqa: ships attacking base
|
||||
shorbom2.vqa: ships attacking base again
|
||||
shorbomb.vqa: ships attacking another base
|
||||
snowbomb.vqa: base being blown up in the snow
|
||||
soviet1.vqa: kill the civillians
|
||||
sovtstar.vqa: soviets logo
|
||||
spy.vqa: spy infiltrating building
|
||||
tanya1.vqa: tanya being interrogated
|
||||
tanya2.vqa: tanya has been rescued
|
||||
toofar.vqa: bridge being blown up
|
||||
trinity.vqa: paris being nuked
|
||||
@@ -1,55 +0,0 @@
|
||||
aagun.vqa:a.a. gun shooting yak
|
||||
airfield.vqa:yak squadren
|
||||
ally1.vqa:get einstien
|
||||
allymorf.vqa:allied logo
|
||||
averted.vqa:meltdown averted
|
||||
beachead.vqa:transport beach landing
|
||||
bmap.vqa:dagger falls on map of europe & europe turns red
|
||||
bombrun.vqa:badger blows up powerplant
|
||||
countdwn.vqa:meltedown imminent
|
||||
cronfail.vqa:chronosphere test failed
|
||||
double.vqa:2 construction yards
|
||||
dpthchrg.vqa:boat blows up sub
|
||||
execute.vqa:spy being shot
|
||||
flare.vqa:flare man
|
||||
landing.vqa:helicopter landing outside soviet base
|
||||
mcvbrdge.vqa:mcv crossing bridge
|
||||
mig.vqa:mig blows up apc
|
||||
movingin.vqa:troups moving in
|
||||
mtnkfact.vqa:mammoth tank factory
|
||||
nukestok.vqa:nuclear mushroom cloud
|
||||
onthprwl.vqa:sub moving underwater
|
||||
periscop.vqa:sub firing on boat
|
||||
prolog.vqa:einstien eliminating hitler
|
||||
radrraid.vqa:heavy tanks attacking base
|
||||
redintro.vqa:red alert intro sequence
|
||||
search.vqa:intruders detceted
|
||||
sfrozen.vqa:frozen soviet soldier
|
||||
sitduck.vqa:ship blowing up
|
||||
slntsrvc.vqa:sub on sea bed
|
||||
snowbomb.vqa:base being blown up in the snow
|
||||
snstrafe.vqa:planes strafing vilage
|
||||
sovbatl.vqa:destroyed soviet vechicles
|
||||
sovcemet.vqa:graveyard
|
||||
sovfinal.vqa:stalin in london
|
||||
soviet1.vqa:kill the civillians
|
||||
soviet10.vqa:keep the convoy safe
|
||||
soviet11.vqa:cut off the boats
|
||||
soviet12.vqa:capture the chronosphere
|
||||
soviet13.vqa:do not loose the chronosphere
|
||||
soviet14.vqa:final assult on london
|
||||
soviet2.vqa:guard the base
|
||||
soviet3.vqa:kill the spy
|
||||
soviet4.vqa:cut the communications
|
||||
soviet5.vqa:capture communications centre
|
||||
soviet6.vqa:guard the convoy
|
||||
soviet7.vqa:infiltrate the reactor
|
||||
soviet8.vqa:capture the island
|
||||
soviet9.vqa:reclaim the truck
|
||||
sovmcv.vqa:soviet mcv drives up
|
||||
sovtstar.vqa:soviets logo
|
||||
spotter.vqa:soldiers being viewed through binoculars
|
||||
strafe.vqa:strafe of tanks
|
||||
take_off.vqa:helicopter taking off
|
||||
tesla.vqa:tesla coil destroying tank
|
||||
v2rocket.vqa:v2 rocket launcher launching
|
||||
@@ -159,8 +159,6 @@ SubCells:
|
||||
Music:
|
||||
./mods/ts/music.yaml
|
||||
|
||||
Movies:
|
||||
|
||||
Translations:
|
||||
./mods/ts/languages/english.yaml
|
||||
|
||||
|
||||
Reference in New Issue
Block a user