Skip to content

Commit

Permalink
GUI: Update game data position of right menu is closed, Database: (RE…
Browse files Browse the repository at this point in the history 
…2) Add WIP BioRand objectives, update some map names and use open / close quotes
  • Loading branch information
@themitosan
themitosan committed Dec 19, 2023
1 parent 8b098a0 commit a7b3a62
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
3 changes: 2 additions & 1 deletion App/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ label {
}
.BTN_APP_DRAG:hover {
background-color: #fff3;
backdrop-filter: blur(4px);
backdrop-filter: blur(10px);
}
.BTN_APP_DRAG:active {
color: #fff;
Expand All @@ -220,6 +220,7 @@ label {
z-index: 2;
opacity: 0;
width: auto;
app-region: drag;
padding: 10px;
min-width: 190px;
position: absolute;
Expand Down
34 changes: 19 additions & 15 deletions App/js/database.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ temp_DATABASE = {
'R502': {name: 'Ladder Room', location: 'Laboratory B2', haveItemBox: !0, canSave: !1, gameStart: !1, gameEnd: !1},
'R503': {name: 'Lab Stairs', location: 'Laboratory B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R504': {name: 'Conference Room', location: 'Laboratory B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R505': {name: '\"O\" Passage', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R505': {name: '‟O” Passage', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R506': {name: 'Small Laboratory', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R507': {name: 'Lab Mortuary', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R508': {name: '\"MO Disk\" Corridor', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R508': {name: '‟MO Disk” Corridor', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R509': {name: 'Private Room A', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R50A': {name: 'Private Room B', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R50B': {name: 'Cell Corridor', location: 'Laboratory B3', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand Down Expand Up @@ -206,7 +206,11 @@ temp_DATABASE = {

// BioHazard 2
bio2: {
bioRandObjectives: {},
bioRandObjectives: {
'R505': { endsOn: 'R607', applyDistance: !1 },
'R111': { endsOn: null, applyDistance: !1 },
'R303': { endsOn: null, applyDistance: !1 },
},
rdt: {

'0000': {name: 'Unknown Map', location: 'Unknown', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand All @@ -230,7 +234,7 @@ temp_DATABASE = {
'R110': {name: 'R.P.D. Hall 2F', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R111': {name: 'Clock Tower', location: 'Police Station 3F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R112': {name: 'R.P.D. Library', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R113': {name: '\"T\" Corridor', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R113': {name: '‟T” Corridor', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R114': {name: 'S.T.A.R.S. Corridor', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R115': {name: 'S.T.A.R.S. Room', location: 'Police Station 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R116': {name: 'East Stairs', location: 'Police Station 1F / 2F', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand Down Expand Up @@ -263,7 +267,7 @@ temp_DATABASE = {
'R212': {name: 'Manhole Back Alley', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R213': {name: 'Boiler Room', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R214': {name: 'Weapon Storage', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R215': {name: 'Morgue', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R215': {name: 'R.P.D. Morgue', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R216': {name: 'Underground Car Park', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R219': {name: 'Detention Corridor', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R21A': {name: 'R.P.D. Kennel', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand All @@ -272,31 +276,31 @@ temp_DATABASE = {
'R300': {name: 'Chief Secret Lab', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R301': {name: 'Detention Cells', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R302': {name: 'Septic Passage', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R303': {name: 'XD-R 10A \"H\" Room (Boss)', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R304': {name: 'XD-R 10A \"H\" Exit', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R303': {name: 'XD-R 10A H” Room (Boss)', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R304': {name: 'XD-R 10A H” Exit', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R305': {name: 'Septic Pool', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R306': {name: 'Septic Box Room', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R307': {name: 'Construction Site', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R308': {name: 'Hidden Passageway', location: 'Police Station B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R309': {name: 'Cave \"L\" Passage', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R309': {name: 'Cave ‟L” Passage', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R30A': {name: 'XD-R Gate 2 Exit', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R30B': {name: 'Septic \"L\" Passage', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R30B': {name: 'Septic ‟L” Passage', location: 'Sewage Disposal', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R30C': {name: 'Septic West Save Room', location: 'Sewage Disposal', haveItemBox: !0, canSave: !0, gameStart: !1, gameEnd: !1},
'R30D': {name: 'Septic East Save Room', location: 'Sewage Disposal', haveItemBox: !0, canSave: !0, gameStart: !1, gameEnd: !1},

'R400': {name: 'Fork Tunnel', location: 'Sewer B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R401': {name: 'South Office Save Room', location: 'Sewer B1', haveItemBox: !0, canSave: !0, gameStart: !1, gameEnd: !1},
'R402': {name: 'Sewer L-Passageway', location: 'Sewer B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R403': {name: 'North Office Save Room', location: 'Sewer B1', haveItemBox: !0, canSave: !0, gameStart: !1, gameEnd: !1},
'R404': {name: '\"T\" Passageway', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R404': {name: '‟T” Passageway', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R405': {name: 'Sewer Left Canal', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R407': {name: 'Sewer Right Canal', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R408': {name: 'Bridge 1F', location: 'Sewer B2', haveItemBox: !1, canSave: !0, gameStart: !1, gameEnd: !1},
'R409': {name: 'Bridge 2F', location: 'Sewer B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40A': {name: 'Gas Tunnel', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40B': {name: 'Hidden Tunnel', location: 'Sewer B1', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40C': {name: 'Dump Gathering', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40D': {name: 'Cave \"L\" Corridor', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40D': {name: 'Cave ‟L” Corridor', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40E': {name: 'Underground Access', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40F': {name: 'Ventilation Duct', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R410': {name: 'Alligator Pool', location: 'Sewer B2', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand Down Expand Up @@ -327,15 +331,15 @@ temp_DATABASE = {
'R60C': {name: 'Right Passage', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R60D': {name: 'Frozen Room', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R60E': {name: 'Lab Long Stairs', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R60F': {name: '\"G\" Capsule', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R60F': {name: '‟G” Capsule', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R610': {name: 'Comp. Tomography Scan Room', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R611': {name: 'Main Shaft (Escape)', location: 'Laboratory B4', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R612': {name: 'Lab Control Room', location: 'Laboratory B5', haveItemBox: !0, canSave: !0, gameStart: !1, gameEnd: !1},
'R613': {name: 'Lab Server Room', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R614': {name: '\"T\" Passageway', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R614': {name: '‟T” Passageway', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R615': {name: 'P-4 Laboratory', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R616': {name: 'Warehouse Front', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R617': {name: '\"G\" Warehouse', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R617': {name: '‟G” Warehouse', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},

'R700': {name: 'Train Station Entrance', location: 'Laboratory B5', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !0},
'R701': {name: 'Train Station Platform', location: 'Laboratory B5', haveItemBox: !0, canSave: !1, gameStart: !1, gameEnd: !1},
Expand Down Expand Up @@ -470,7 +474,7 @@ temp_DATABASE = {
'R40B': {name: 'Laboratory 2', location: 'Hospital', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40C': {name: 'Park Entrance', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40D': {name: 'Water Pump Puzzle', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40E': {name: 'Park \"L\" Bridge', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40E': {name: 'Park ‟L” Bridge', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R40F': {name: 'Park Exit', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R410': {name: 'Sewer Passage', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
'R411': {name: 'Graveyard', location: 'Park', haveItemBox: !1, canSave: !1, gameStart: !1, gameEnd: !1},
Expand Down
3 changes: 3 additions & 0 deletions App/js/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ temp_OPTIONS = {
// Update BioRand objective
updateBioRandObjective: function(mapName, parent){

// Variables
var cPrev,
bRandDb,
cObjective,
Expand Down Expand Up @@ -129,6 +130,7 @@ temp_OPTIONS = {
'transition-duration': '0.1s'
};
TMS.css('APP_DRAG_BAR', dragBarCss);
TMS.css('APP_GAME_DATA', {'top': '60px'});
TMS.css('APP_DRAG_BAR_ACTIONS', dragBarCss);
TMS.css('MENU_TOP_BG', {
'top': '20px',
Expand Down Expand Up @@ -174,6 +176,7 @@ temp_OPTIONS = {
'transition-duration': '1s'
};
TMS.css('APP_DRAG_BAR', dragBarCss);
TMS.css('APP_GAME_DATA', {'top': '74px'});
TMS.css('APP_DRAG_BAR_ACTIONS', dragBarCss);

// Hide right menu
Expand Down
11 changes: 5 additions & 6 deletions compile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@

module.exports = {

// Get JSON files
packageJson: require('./package.json'),

// Compiler data
nwFlavor: void 0,
nwVersion: void 0,

// Require nw-builder
// Require nw-builder and get JSON files
nwBuilder: require('nw-builder'),
packageJson: require('./package.json'),

// Start compiler
run: function(){
Expand Down Expand Up @@ -45,7 +43,7 @@ module.exports = {
fs.unlinkSync('hash.inc');

// Log data before builder setup
console.info('INFO - Running compiler\n\nVersion: ' + this.nwVersion + '\nFlavor: ' + this.nwFlavor);
console.info(`INFO - Running compiler\n\nVersion: ${this.nwVersion}\nFlavor: ${this.nwFlavor}`);

// Setup nw-builder
const compileData = new this.nwBuilder({
Expand Down Expand Up @@ -87,8 +85,9 @@ module.exports = {
fs.writeFileSync('hash.inc', '', 'utf8');

// Get licence and readme files
const license = fs.readFileSync('./LICENSE', 'utf8'),
const
readme = fs.readFileSync('./README.md', 'utf8'),
license = fs.readFileSync('./LICENSE', 'utf8'),
help = fs.readFileSync('./help.txt', 'utf8');

// Run nw-builder
Expand Down

0 comments on commit a7b3a62

Please sign in to comment.