Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refined tower #110

Merged
merged 4 commits into from
Dec 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions dev/js/lang-terms/lang-terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ var R6MLangTerms = (function(undefined) {
breakableWalls: 'Breakable walls',
breakableFloorTraps: 'Breakable floor traps',
ceilingHatches: 'Ceiling hatches',
lineOfSightWalls: 'Line of sight walls',
lineOfSightWalls: 'Line of sight or half walls',
lineOfSightFloors: 'Line of sight floors',
droneTunnels: 'Drone tunnels',
objectives: 'Objectives',
Expand Down Expand Up @@ -1048,17 +1048,18 @@ var R6MLangTerms = (function(undefined) {
village: 'Village'
},
tower: {
workInProgress: 'This is an initial version of Tower<br/>... it is a WORK IN PROGRESS. :)',
// EXT/Spawn
northRoof: 'North<br/>Roof',
southRoof: 'South<br/>Roof',
northRoof: 'North Roof',
northRoofNotShown: 'North Roof<br/>(not shown)',
southRoof: 'South Roof',
southRoofNotShown: 'South Roof<br/>(now shown)',
roofAccess: 'Roof<br/>Access',
// 3F
mezzanine: 'Mezzanine',
ventilation: 'Ventilation',
// 2F
centerAtrium: 'Center<br/>Atrium',
infoBooth: 'Info<br/>Booth',
infoBooth: 'Info Booth',
eastAtrium: 'East<br/>Atrium',
westAtrium: 'West<br/>Atrium',
eastBalcony: 'East<br/>Balcony',
Expand All @@ -1070,8 +1071,8 @@ var R6MLangTerms = (function(undefined) {
exhibitRoom: 'Exhibit<br/>Room',
lanternRoom: 'Lantern<br/>Room',
elevator: 'Elevator',
officesHallway: 'Offices<br/>Hallway',
exhibitHallway: 'Exhibit<br/>Hallway',
officesHallway: 'Offices Hallway',
exhibitHallway: 'Exhibit Hallway',
offices: 'Offices',
companyReception: 'Company<br/>Reception',
supplyRoom: 'Supply<br/>Room',
Expand All @@ -1080,27 +1081,31 @@ var R6MLangTerms = (function(undefined) {
bathroom: 'Bathroom',
serverRoom: 'Server<br/>Room',
// 2F to 1F Stairs
northStairs: 'North<br/>Stairs',
northStairs: 'North Stairs',
westStairs: 'West<br/>Stairs',
eastStairs: 'East<br/>Stairs',
// 1F
mainReception: 'Main<br/>Reception',
centerHallway: 'Center<br/>Hallway',
teaRoom: 'Tea<br/>Room',
teaRoom: 'Tea Room',
lounge: 'Lounge',
bar: 'Bar',
kitchen: 'Kitchen',
restaurant: 'Restaurant',
birdRoom: 'Bird<br/>Room',
restaurantReception: 'Restaurant<br/>Reception',
restaurantHallway: 'Restaurant<br/>Hallway',
barHallway: 'Bar<br/>Hallway',
restaurantHallway: 'Restaurant Hallway',
barHallway: 'Bar Hallway',
westObservatory: 'West<br/>Observatory',
bonsaiRoom: 'Bonsai<br/>Room',
traditionalHall: 'Traditional<br/>Hall',
traditionalHall: 'Traditional Hall',
gameRoom: 'Game<br/>Room',
eastObservatory: 'East<br/>Observatory',
fountain: 'Fountain'
fountain: 'Fountain',
//Air Ducts:
northAirDuct: 'North<br/>Air Duct',
eastAirDuct: 'East<br/>Air Duct',
westAirDuct: 'West<br/>Air Duct'
},
yacht: {
spawnSubmarine: 'Submarine',
Expand Down
248 changes: 195 additions & 53 deletions dev/js/main/main.map-data.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dev/js/main/main.map-render.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,11 @@ var R6MMainRender = (function($,window,document,R6MLangTerms,undefined) {
var getSpawnPointsHtml = function getSpawnPointsHtml(spawnPoints) {
var html = '',
inlineStyle = '',
classes = 'spawn-point ';
classes;

spawnPoints.forEach(function(spawnPoint) {
inlineStyle = getPositionStyle(spawnPoint);
classes = 'spawn-point ' + getCommonClasses(spawnPoint);
html += '<div style="' + inlineStyle + '" class="' + classes + '"><div class="spawn-wrapper"><div class="spawn-letter"><p>' + spawnPoint.letter + '</p></div><div class="spawn-description"><p>' + spawnPoint.description + '</p></div></div></div>';
});
return html;
Expand Down
Binary file added site/img/tower/tower-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-1@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-2@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-3@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-4@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-5@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-6@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site/img/tower/tower-camera-7@2x.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.