Update r6maps to newest version

.travis.yml

@@ -1,12 +1,21 @@
 language: node_js
 node_js:
-- 4.3.1
-sudo: false
-script:
-- npm run test
-env:
-  global:
-branches:
-  except:
-  #Stops ci from running on tag commits and branches
-  - "/^v?[0-9]+\\.[0-9]+\\.[0-9]+.*$/"
+  - "10"
+
+cache: npm
+
+jobs:
+  include:
+    - stage: test
+      script: npm run test
+    - stage: deploy
+      if: branch = master
+      before_script: gem install sass
+      script: npm run build
+      deploy:
+        provider: pages
+        local_dir: site
+        github_token: $GITHUB_TOKEN
+        skip_cleanup: true
+        on:
+          branch: master

README.md

@@ -6,22 +6,11 @@
 r6maps.com is designed to be a quick reference for Rainbow Six Siege maps.  Please see the about.html page for more details.
 
 ## Running locally
-
-### Dependencies
-- [npm/Nodejs](https://www.npmjs.com/get-npm)
-    + [UglifyJS3](https://www.npmjs.com/package/uglifyjs) for cli (Try `npm install uglify-js -g`)
-- [Ruby](https://www.ruby-lang.org/en/)
-    + [gem](https://rubygems.org/pages/download)
-    + sass (`gem install sass`)
-
-To check the dependencies, just type `uglifyjs` or `scss`. If the program waits for input, your dependencies are installed correctly. (`uglifyjs` might already be installed from `npm install`, see below).
-
-### Building and running
 - Install npm and install packages: `npm install`
 - General build: `npm run build`
     + Builds js and scss into the `site` folder.
     + Check `package.json` for more particular scripts.
-- File watches are also available (see `packages.json`)
+- File watchers are also available (see `packages.json`)
 - To run, locate `site/index.html` and open it.
 
 ## Things to work on

dev/js/lang-terms/lang-terms.de.js

@@ -482,50 +482,16 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           marketRooftops: 'Markt-Dächer'
         },
         hereford: {
-          spawnTrainingCourse: 'Ausbildungsparcours',
-          spawnParking: 'Parkplatz',
-          spawnShootingRange: 'SchieBplatz',
-          armory: 'Waffenlager',
-          lockers: 'Spinde',
-          corridor: 'Korridor',
+          shootingRange: 'SchieBplatz',
           mainStairs: 'Haupt-<br/>treppe',
-          maintenanceArea: 'Wartungs-<br/>bereich',
-          briefingRoom: 'Briefing-<br/>Raum',
-          basementEntrance: 'Keller-<br/>eingang',
           garage: 'Garage',
-          TVRoom: 'Fernsehraum',
-          garageCorridor: 'Garagenkorridor',
           kitchen: 'Küche',
-          corridor1: 'Korridor<br/>1',
           diningRoom: 'Ess-<Br/>zimmer',
-          pianoLounge: 'Klavier-Lounge',
-          office: 'Büro',
           masterBedroom: 'Haupt-<br/>schlafzimmer',
-          backAccess: 'Hinterein-<br/>gang',
           laundryRoom: 'Wasch-<br/>küche',
           bathroom: 'Toilette',
-          kidsBedroom: 'Kinder-<br/>schlafzimmer',
-          ballisticMatDepot: 'Ballistikmatten-<br/>Depot',
-          storage: 'Lager',
-          storageCorridor: 'Lager-<br/>korridor',
-          dummyDepot: 'Attrappendepot',
           workshop: 'Arbeitsraum',
-          shootingRangeEastEntrance: 'SchieBplatz<br/>Osteingang',
-          shootingRangeWestEntrance: 'SchieBplatz<br/>Westeingang',
-          tireSetting: 'Reifenstapel',
-          observationRamp: 'Beobachtungs-plattform',
-          barracks: 'Kaserne',
-          busBackAlley: 'Bus-<br/>Hintergasse',
-          rappelTower: 'Abseilturm',
-          terrace: 'Terrasse',
-          frontAccess: 'Vordereingang',
-          chapelGate: 'Kapellentor',
-          forkliftArea: 'Gabelstapler-<br/>Bereich',
-          sideStairsAlley: 'Seitentreppen-<br/>gasse',
-          sideStairs: 'Seiten-<br/>treppen',
-          garageTop: 'Garagendach',
-          rooftop: 'Dach',
-          parkingEntrance: 'Parkplatz-einfahrt'
+          rooftop: 'Dach'
         },
         house: {
           spawnConstructionSite: 'Baustelle',
@@ -568,27 +534,15 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           rooftop: 'Dach'
         },
         kafe: {
-          spawnRiverDocks: 'Fluss-Docks',
-          spawnChristmasMarket: 'Weihnachtsmarkt',
-          spawnPark: 'Parkgasse',
+          riverDocks: 'Fluss-Docks',
+          christmasMarket: 'Weihnachtsmarkt',
+          park: 'Parkgasse',
           laundryRoom: 'Waschküche',
-          frontStairs: 'Vordere<br/>Treppe',
           bakery: 'Bäckerei',
-          bakeryKitchen: 'Bäckerei<br/>Küche',
-          kitchenPrep: 'Küche<br/>vorbereitung',
-          kitchenGrill: 'Küchengrill',
-          kitchenPickUp: 'Küchen-<br/>ausgabe',
-          coldRoom: 'Kühl-<br/>raum',
           diningRoom: 'Esszimmer',
-          backStairs: 'Hintere<br/>Treppe',
-          coldRoomCorridor: 'Kühl-<br/>raum-<br/>korridor',
-          VIPSection: 'VIP-<br/>Bereich',
-          barStairs: 'Bar-<br/>Treppe',
-          storage: 'Lager',
           museumEntrance: 'Museums-<br/>eingang',
           miningRoom: 'Bergbauraum',
           trainMuseum: 'Bahnmuseum',
-          pillarDiningRoom: 'Säulen-Speisezimmer',
           mainCorridor: 'Haupt-<br/>korridor',
           readingRoomCorridor: 'Lesezimmer-korridor',
           readingRoom: 'Lesezimmer',
@@ -598,7 +552,6 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           bar: 'Bar',
           barBackstore: 'Bar-<br/>Lager',
           washrooms: 'Toilette',
-          washroomCorridor: 'Korridor Toilette',
           cocktailLounge: 'Cocktail-<br/>Lounge',
           cocktailLoungeEntrance: 'Cocktail-<br/>Lounge-<br/>Eingang',
           westMainStreet: 'Westliche Hauptstraße',
@@ -609,66 +562,35 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
           cafeRoofTop: 'Café-Dach',
           terrace: 'Terrasse',
           backAlley: 'Seitengasse',
-          garrage: 'Garage',
-          parkAlley: 'Parkgasse'
+          garage: 'Garage'
         },
         kanal: {
-          spawnFloatingDock: 'Schwimm-Dock',
-          spawnSailboats: 'Segelboote',
-          spawnConstructionSite: 'Baustelle',
-          boatGarage: 'Bootsgarage',
-          boatSupplies: 'Bootsvorräte',
+          floatingDock: 'Schwimm-Dock',
+          sailboats: 'Segelboote',
+          constructionSite: 'Baustelle',
           pipes: 'Undichte Rohre',
-          boatSuppliesHallway: 'Boots-<br/>borräte-<br/>Gang',
           lockerRoom: 'Umkleideraum',
-          coastGuardStairs: 'Küstenwache-<br/>Treppe',
-          showers: 'Duschen',
-          loadingDock: 'Laderampe',
-          machineHallway: 'Maschinen-<br/>Gang',
-          controlCenterStairs: 'Kontroll-<br/>zentrum-<br/>Treppe',
-          holdingRoom: 'Güterraum',
-          holdingRoomHallway: 'Güterraum-<br/>Gang',
-          radio: 'Funk',
-          coastGuardOffice: 'Küstenwache<br/>Büro',
           archives: 'Archiv',
-          coastGuardHall: 'Küsten-<br/>wache<br/>Gang',
-          mainEntrance: 'Haupt-<br/>eingang',
           lounge: 'Lounge',
-          bridge: 'Brücke',
           modelRoom: 'Modellraum',
           securityRoom: 'Sicherheits-<br/>raum',
           projectorRoom: 'Projektorraum',
-          mapsOffice: 'Kartenbüro',
-          mapsOfficeHallway: 'Kartenbüro-<br/>Gang',
           kitchen: 'Küche',
-          cafeteria: 'Cafeteria',
-          plantsHallway: 'Pflanzengang',
-          thirdFloorExit: 'Ausgang<br/>zweiter<br/>Stock',
           controlRoom: 'Kontrollraum',
-          electricRoom: 'Elektrik',
           controlRoomHallway: 'Kontrollraum-Gang',
           serverRoom: 'Server-<br/>Raum',
-          lockgate: 'Schleusentor',
+          lockGate: 'Schleusentor',
           quayContainers: 'Kai-Container',
-          lockgateTunnel: 'Schleusentor-<br/>Tunnel',
-          waterWalkway: 'Steg',
-          quayConstruction: 'Kai-<br/>Baustelle',
-          constructionSite: 'Baustelle',
+          lockGateTunnel: 'Schleusentor-<br/>Tunnel',
           constructionEntrance: 'Baustellen-<br/>eingang',
           parkingAlley: 'Parkplatzgasse',
           parkingEntrance: 'Parkplatz-<br/>einfahrt',
           middleRoad: 'Mittlere<br/>Straße',
           forkliftAlley: 'Gabelstapler-<br/>Gasse',
           frontLawn: 'Vorgarten',
-          basementStairs: 'Kellertreppe',
           coastGuardRoof: 'Küstenwache-<br/>Dache',
-          roofBrickPile: 'Ziegelhaufen<br/>Dach',
           balcony: 'Balkon',
-          controlCenterRoof: 'Kontrollzentrum-<br/>Dach',
-          dockStairs: 'Dock-Treppe',
-          parking: 'Parkplatz',
-          boatCrane: 'Bootskran',
-          mapArchives: 'Karten-<br/>archiv'
+          parking: 'Parkplatz'
         },
         oregon: {
           spawnJunkyard: 'Schrottplatz',

dev/js/lang-terms/lang-terms.es.js

@@ -489,50 +489,16 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           marketRooftops: 'Tejados del<br/>mercado'
         },
         hereford: {
-          spawnTrainingCourse: 'Pista de entrenamiento',
-          spawnParking: 'Aparcamiento',
-          spawnShootingRange: 'Galería de tiro',
-          armory: 'Armería',
-          lockers: 'Taquillas',
-          corridor: 'Pasillo',
+          shootingRange: 'Galería de tiro',
           mainStairs: 'Escalera<br/>principal',
-          maintenanceArea: 'Zona de<br/>mantenimiento',
-          briefingRoom: 'Sala de<br/>informes',
-          basementEntrance: 'Entrada al sótano',
           garage: 'Garage',
-          TVRoom: 'Sala<br/>de TV',
-          garageCorridor: 'Pasillo del garage',
           kitchen: 'Cocina',
-          corridor1: 'Pasillo 1',
           diningRoom: 'Comedor',
-          pianoLounge: 'Sala de<br/>piano',
-          office: 'Oficina',
           masterBedroom: 'Habitación<br/>principal',
-          backAccess: 'Acceso<br/>posterior',
           laundryRoom: 'Lavandería',
           bathroom: 'Baño',
-          kidsBedroom: 'Cuarto de<br/>los niños',
-          ballisticMatDepot: 'Depósito de<br/>mantas antibalas',
-          storage: 'Almacén',
-          storageCorridor: 'Pasillo<br/>al almacén',
-          dummyDepot: 'Deposito<br/>de dummies',
           workshop: 'Taller',
-          shootingRangeEastEntrance: 'Acceso este a<br/>galería de tiro',
-          shootingRangeWestEntrance: 'Acceso oeste a<br/>galería de tiro',
-          tireSetting: 'Montaje de neumaticos',
-          observationRamp: 'Rampa de observación',
-          barracks: 'Barracones',
-          busBackAlley: 'Callejón<br/>trasero<br/>autobús',
-          rappelTower: 'Torre<br/>de rapel',
-          terrace: 'Terraza',
-          frontAccess: 'Acceso frontal',
-          chapelGate: 'Puerta de<br/>la capilla',
-          forkliftArea: 'Zona de<br/>carretilla elevadora',
-          sideStairsAlley: 'Callejón de la<br/>escalera lateral',
-          sideStairs: 'Escaleras<br/>laterales',
-          garageTop: 'Parte superior<br/>del garage',
-          rooftop: 'Tejado',
-          parkingEntrance: 'Entrada al<br/>aparcamiento'
+          rooftop: 'Tejado'
         },
         house: {
           spawnConstructionSite: 'Zona de obras',
@@ -575,87 +541,43 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           rooftop: 'Tejado'
         },
         kanal: {
-          spawnFloatingDock: 'Embarcadero',
-          spawnSailboats: 'Veleros',
-          spawnConstructionSite: 'Zona de obras',
-          boatGarage: 'Garage de<br/>barcas',
-          boatSupplies: 'Suministros<br/>de barcas',
+          floatingDock: 'Embarcadero',
+          sailboats: 'Veleros',
+          constructionSite: 'Zona de obras',
           pipes: 'Tuberias que<br/>rezuman',
-          boatSuppliesHallway: 'Pasillo de<br/>suministros<br/>de barcas',
           lockerRoom: 'Taquillas',
-          coastGuardStairs: 'Escaleras de<br/>guardacostas',
-          showers: 'Duchas',
-          showersCorridor: 'Pasillo a<br/>las duchas',
-          loadingDock: 'Muelle de<br/>carga',
-          machineHallway: 'Pasillo de<br/>maquinaria',
-          controlCenterStairs: 'Escalera<br/>al centro<br/>de control',
-          holdingRoom: 'Depósito<br/>temporal',
-          holdingRoomHallway: 'Pasillo a<br/>depósito<br/>temporal',
-          radio: 'Sala de<br/>radio',
-          coastGuardOffice: 'Oficina del<br/>guardacostas',
           archives: 'Archivo',
-          coastGuardHall: 'Pasillo de<br/>guardacostas',
-          mainEntrance: 'Entrada<br/>principal',
           lounge: 'Sala de<br/>espera',
-          bridge: 'Puente',
           modelRoom: 'Sala de<br/>modelos',
           securityRoom: 'Sala de<br/>seguridad',
           projectorRoom: 'Sala del<br/>proyector',
-          mapsOffice: 'Oficina<br/>de mapas',
-          mapsOfficeHallway: 'Pasillo a<br/>la oficina<br/>de mapas',
           kitchen: 'Cocina',
-          cafeteria: 'Cafetería',
-          plantsHallway: 'Pasillo<br/>de plantas',
-          thirdFloorExit: 'Salida de<br/>la tercera<br/>planta',
           controlRoom: 'Sala de<br/>control',
-          electricRoom: 'Cuarto<br/>eléctrico',
           controlRoomHallway: 'Pasillo<br/>a la sala<br/>de control',
           serverRoom: 'Sala del<br/>servidor',
-          lockgate: 'Compuerta',
+          lockGate: 'Compuerta',
           quayContainers: 'Contenedores<br/>del muelledw',
-          lockgateTunnel: 'Tunel de las<br/>compuertas',
-          waterWalkway: 'Paserela<br/>del agua',
-          quayConstruction: 'Zona de obras<br/>en el muelle',
-          constructionSite: 'Zona de<br/>obras',
+          lockGateTunnel: 'Tunel de las<br/>compuertas',
           constructionEntrance: 'Entrada a la<br/>zona de obras',
           parkingAlley: 'Callejón del<br/>aparcamiento',
           parkingEntrance: 'Entrada al<br/>aparcamiento',
           middleRoad: 'Carretera<br/>central',
           forkliftAlley: 'Callejón<br/>carretilla<br/>elevadora',
           frontLawn: 'Césped<br/>delantero',
-          basementStairs: 'Escaleras<br/>sótano',
           coastGuardRoof: 'Tejado de<br/>guardacostas',
-          bridgeRoof: 'Techo<br/>del puente',
-          roofBrickPile: 'Pila ladrillos<br/>del tejado',
           balcony: 'Balcón',
-          controlCenterRoof: 'Tejado<br/>del centro<br/>de control',
-          dockStairs: 'Escalera del<br/>embarcadero',
-          parking: 'Aparcamiento',
-          boatCrane: 'Grua de barcas',
-          mapArchives: 'Archivo<br/>de mapas'
+          parking: 'Aparcamiento'
         },
         kafe: {
-          spawnRiverDocks: 'Embarcadero del río',
-          spawnChristmasMarket: 'Mercadillo navideño',
-          spawnPark: 'Callejón del parque',
+          riverDocks: 'Embarcadero del río',
+          christmasMarket: 'Mercadillo navideño',
+          park: 'Callejón del parque',
           laundryRoom: 'Sala de<br/>lavandería',
-          frontStairs: 'Escalera<br/>frontal',
           bakery: 'Obrador de<br/>pastelería',
-          bakeryKitchen: 'Cocina del<br/>obrador',
-          kitchenPrep: 'Preparación<br/>de cocina',
-          kitchenGrill: 'Parrilla de<br/>la cocina',
-          kitchenPickUp: 'Recogida<br/>de la cocina',
-          coldRoom: 'Cámara fría',
           diningRoom: 'Comedor',
-          backStairs: 'Escalera<br/>trasera',
-          coldRoomCorridor: 'Pasillo a la<br/>cámara fría',
-          VIPSection: 'Sección<br/>VIP',
-          barStairs: 'Escalera<br/>del bar',
-          storage: 'Almacén',
           museumEntrance: 'Entrada<br/>al museo',
           miningRoom: 'Sala de minería',
           trainMuseum: 'Museo del tren',
-          pillarDiningRoom: 'Comedor de<br/>las columnas',
           mainCorridor: 'Pasillo<br/>principal',
           readingRoomCorridor: 'Pasillo a la<br/>sala de lectura',
           readingRoom: 'Sala de<br/>lectura',
@@ -665,7 +587,6 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           bar: 'Bar',
           barBackstore: 'Parte trasera<br/>del bar',
           washrooms: 'Lavavos',
-          washroomCorridor: 'Pasillo de<br/>los baños',
           cocktailLounge: 'Sala de<br/>cócteles',
           cocktailLoungeEntrance: 'Entrada<br/>a la sala<br/>de cócteles',
           westMainStreet: 'Calle principal<br/>zona oeste',
@@ -676,8 +597,7 @@ var R6MLangTermsSpanish = (function(R6MLangTerms, undefined) {
           cafeRoofTop: 'Parte alta del<br/>tejado del café',
           terrace: 'Terraza',
           backAlley: 'Callejón trasero',
-          garrage: 'Garage',
-          parkAlley: 'Callejón<br/>del parque'
+          garage: 'Garage'
         },
         oregon: {
           spawnJunkyard: 'Desguace',