Ticket #3168: t3168_preparative_cleanup_v1.patch
File t3168_preparative_cleanup_v1.patch, 4.6 KB (added by , 9 years ago) |
---|
-
binaries/data/mods/public/gui/session/menu.js
const MENU_SPEED = 1.2; 31 31 32 32 // Trade menu: available resources and step for probability changes 33 33 const RESOURCES = ["food", "wood", "stone", "metal"]; 34 34 const STEP = 5; 35 35 36 var isMenuOpen = false; 37 var menu; 38 39 var isDiplomacyOpen = false; 40 var isTradeOpen = false; 36 var g_IsMenuOpen = false; 37 var g_IsDiplomacyOpen = false; 38 var g_IsTradeOpen = false; 41 39 42 40 // Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui. 43 41 var flushTributing = function() {}; 44 42 45 43 // Ignore size defined in XML and set the actual menu size here 46 44 function initMenuPosition() 47 45 { 48 menu = Engine.GetGUIObjectByName("menu"); 49 menu.size = INITIAL_MENU_POSITION; 46 Engine.GetGUIObjectByName("menu").size = INITIAL_MENU_POSITION; 50 47 } 51 48 52 49 53 50 // ============================================================================= 54 51 // Overall Menu 55 52 // ============================================================================= 56 53 // 57 54 // Slide menu 58 55 function updateMenuPosition(dt) 59 56 { 60 if (isMenuOpen) 57 var menu = Engine.GetGUIObjectByName("menu"); 58 if (g_IsMenuOpen) 61 59 { 62 60 var maxOffset = END_MENU_POSITION - menu.size.bottom; 63 61 if (maxOffset > 0) 64 62 { 65 63 var offset = Math.min(MENU_SPEED * dt, maxOffset); … … function updateMenuPosition(dt) 84 82 } 85 83 86 84 // Opens the menu by revealing the screen which contains the menu 87 85 function openMenu() 88 86 { 89 isMenuOpen = true;87 g_IsMenuOpen = true; 90 88 } 91 89 92 90 // Closes the menu and resets position 93 91 function closeMenu() 94 92 { 95 isMenuOpen = false;93 g_IsMenuOpen = false; 96 94 } 97 95 98 96 function toggleMenu() 99 97 { 100 if ( isMenuOpen == true)98 if (g_IsMenuOpen) 101 99 closeMenu(); 102 100 else 103 101 openMenu(); 104 102 } 105 103 … … function tributeResource(data) 261 259 Engine.PostNetworkCommand({"type": "tribute", "player": data.player, "amounts": data.amounts}); 262 260 } 263 261 264 262 function openDiplomacy() 265 263 { 266 if ( isTradeOpen)264 if (g_IsTradeOpen) 267 265 closeTrade(); 268 isDiplomacyOpen = true;266 g_IsDiplomacyOpen = true; 269 267 270 268 let we = Engine.GetPlayerID(); 271 269 272 270 // Get offset for one line 273 271 let onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size; … … function openDiplomacy() 370 368 Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false; 371 369 } 372 370 373 371 function closeDiplomacy() 374 372 { 375 isDiplomacyOpen = false;373 g_IsDiplomacyOpen = false; 376 374 Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = true; 377 375 } 378 376 379 377 function toggleDiplomacy() 380 378 { 381 if ( isDiplomacyOpen)379 if (g_IsDiplomacyOpen) 382 380 closeDiplomacy(); 383 381 else 384 382 openDiplomacy(); 385 383 } 386 384 387 385 function openTrade() 388 386 { 389 if ( isDiplomacyOpen)387 if (g_IsDiplomacyOpen) 390 388 closeDiplomacy(); 391 isTradeOpen = true;389 g_IsTradeOpen = true; 392 390 393 391 var updateButtons = function() 394 392 { 395 393 for (var res in button) 396 394 { … … function openTrade() 597 595 Engine.GetGUIObjectByName("tradeDialogPanel").hidden = false; 598 596 } 599 597 600 598 function closeTrade() 601 599 { 602 isTradeOpen = false;600 g_IsTradeOpen = false; 603 601 Engine.GetGUIObjectByName("tradeDialogPanel").hidden = true; 604 602 } 605 603 606 604 function toggleTrade() 607 605 { 608 if ( isTradeOpen)606 if (g_IsTradeOpen) 609 607 closeTrade(); 610 608 else 611 609 openTrade(); 612 610 } 613 611 -
binaries/data/mods/public/gui/session/messages.js
function handleNotifications() 196 196 function updateDiplomacy() 197 197 { 198 198 g_Players = getPlayerData(g_PlayerAssignments); 199 199 200 200 // If the diplomacy panel is open refresh it. 201 if ( isDiplomacyOpen)201 if (g_IsDiplomacyOpen) 202 202 openDiplomacy(); 203 203 } 204 204 205 205 function updateTimeNotifications() 206 206 { -
binaries/data/mods/public/gui/session/session.js
function onTick() 408 408 409 409 var now = new Date(); 410 410 var tickLength = new Date() - lastTickTime; 411 411 lastTickTime = now; 412 412 413 check PlayerState();413 checkGameEnded(); 414 414 while (true) 415 415 { 416 416 var message = Engine.PollNetworkClient(); 417 417 if (!message) 418 418 break; … … function onTick() 448 448 449 449 // Clear renamed entities list 450 450 Engine.GuiInterfaceCall("ClearRenamedEntities"); 451 451 } 452 452 453 function check PlayerState()453 function checkGameEnded() 454 454 { 455 455 // Once the game ends, we're done here. 456 456 if (g_GameEnded || g_IsObserver) 457 457 return; 458 458