From e1df2a4a9946cbf0614d1a0cc9a122d62fd4ca95 Mon Sep 17 00:00:00 2001 From: Espen Killi Date: Fri, 30 Nov 2018 01:27:49 +0100 Subject: [PATCH] Syntax corrections --- FSBaseMission.lua | 24 +- FSCareerMissionInfo.lua | 8 +- GameSettings.lua | 100 +- MoneyType.lua | 124 +- animals/CrowsWildlife.lua | 138 +- animals/WildlifeSpawner.lua | 6 +- animals/shop/AnimalController.lua | 2 +- economy/EconomyManager.lua | 8 +- farm/Farm.lua | 72 +- farm/FarmStats.lua | 4 +- farm/FinanceStats.lua | 56 +- g_currentMission/landscapingController.lua | 164 +- gui/AchievementsScreen.lua | 10 +- gui/AnimalScreen.lua | 64 +- gui/CareerScreen.lua | 32 +- gui/CharacterCreationScreen.lua | 28 +- gui/ControlsController.lua | 20 +- gui/CreateGameScreen.lua | 24 +- gui/CreditsScreen.lua | 10 +- gui/DifficultyScreen.lua | 6 +- gui/InGameMenu.lua | 162 +- gui/InGameMenuAnimalsFrame.lua | 150 +- gui/InGameMenuContractsFrame.lua | 56 +- gui/InGameMenuFinancesFrame.lua | 28 +- gui/InGameMenuGameSettingsFrame.lua | 62 +- gui/InGameMenuGeneralSettingsFrame.lua | 56 +- gui/InGameMenuHelpFrame.lua | 14 +- gui/InGameMenuMapFrame.lua | 200 +- gui/InGameMenuMultiplayerFarmsFrame.lua | 38 +- gui/InGameMenuMultiplayerUsersFrame.lua | 102 +- gui/InGameMenuPricesFrame.lua | 48 +- gui/InGameMenuStatisticsFrame.lua | 10 +- gui/InGameMenuTutorialFrame.lua | 6 +- gui/InGameMenuVehiclesFrame.lua | 32 +- gui/JoinGameScreen.lua | 24 +- gui/LandscapingScreen.lua | 48 +- gui/LandscapingScreenController.lua | 44 +- gui/MPLoadingScreen.lua | 14 +- gui/MainScreen.lua | 32 +- gui/MapSelectionScreen.lua | 14 +- gui/ModSelectionScreen.lua | 28 +- gui/MultiplayerScreen.lua | 2 +- gui/PlacementScreen.lua | 2 +- gui/PlacementScreenController.lua | 32 +- gui/ServerDetailScreen.lua | 32 +- gui/SettingsAdvancedFrame.lua | 36 +- gui/SettingsConsoleFrame.lua | 28 +- gui/SettingsControlsFrame.lua | 78 +- gui/SettingsDeviceFrame.lua | 72 +- gui/SettingsDisplayFrame.lua | 18 +- gui/SettingsGeneralFrame.lua | 24 +- gui/SettingsScreen.lua | 48 +- gui/ShopCategoriesFrame.lua | 12 +- gui/ShopConfigScreen.lua | 4 +- gui/ShopController.lua | 58 +- gui/ShopItemsFrame.lua | 60 +- gui/ShopMenu.lua | 122 +- gui/TutorialScreen.lua | 12 +- gui/base/FocusManager.lua | 222 +- gui/base/Gui.lua | 76 +- gui/base/GuiSoundPlayer.lua | 24 +- gui/base/GuiTopDownCamera.lua | 8 +- gui/base/MapOverlayGenerator.lua | 86 +- gui/base/Overlay.lua | 14 +- gui/base/SettingsModel.lua | 118 +- gui/base/TabbedMenu.lua | 26 +- gui/base/TweenSequence.lua | 28 +- gui/dialogs/AnimalDialog.lua | 2 +- gui/dialogs/ColorPickerDialog.lua | 4 +- gui/dialogs/DirectSellDialog.lua | 28 +- gui/dialogs/EditFarmDialog.lua | 20 +- gui/dialogs/MessageDialog.lua | 2 +- gui/dialogs/SellItemDialog.lua | 6 +- gui/dialogs/ServerSettingsDialog.lua | 12 +- gui/dialogs/SiloDialog.lua | 6 +- gui/dialogs/TransferMoneyDialog.lua | 2 +- gui/dialogs/UnBanDialog.lua | 18 +- gui/dialogs/YesNoDialog.lua | 4 +- gui/elements/BoxLayoutElement.lua | 4 +- gui/elements/DialogElement.lua | 10 +- gui/elements/TextElement.lua | 4 +- gui/hud/AchievementMessage.lua | 22 +- gui/hud/ChatWindow.lua | 6 +- gui/hud/ContextActionDisplay.lua | 36 +- gui/hud/FieldInfoDisplay.lua | 58 +- gui/hud/FillLevelsDisplay.lua | 20 +- gui/hud/GameInfoDisplay.lua | 108 +- gui/hud/GamePausedDisplay.lua | 2 +- gui/hud/HUD.lua | 40 +- gui/hud/HUDElement.lua | 2 +- gui/hud/HUDFrameElement.lua | 4 +- gui/hud/HUDPopupMessage.lua | 38 +- gui/hud/IngameMap.lua | 34 +- gui/hud/InputHelpDisplay.lua | 42 +- gui/hud/MapHotspot.lua | 50 +- gui/hud/MixerWagonHUDExtension.lua | 4 +- gui/hud/SideNotification.lua | 2 +- gui/hud/SpeakerDisplay.lua | 20 +- gui/hud/SpeedMeterDisplay.lua | 136 +- gui/hud/TopNotification.lua | 32 +- gui/hud/VehicleSchemaDisplay.lua | 2 +- input/Binding.lua | 6 +- input/InputAction.lua | 30 +- input/InputBinding.lua | 374 +-- input/InputDevice.lua | 42 +- input/InputDisplayManager.lua | 20 +- input/InputEvent.lua | 26 +- input/InputHelpElement.lua | 48 +- misc/AutoSaveManager.lua | 6 +- misc/GamingStationManager.lua | 20 +- misc/HelpLineManager.lua | 2 +- network/EventIds.lua | 2005 +--------------- network/NetworkUtil.lua | 6 +- network/ObjectIds.lua | 2409 +------------------- placeables/Placeable.lua | 48 +- player/Player.lua | 12 +- player/PlayerModelManager.lua | 4 +- shop/StoreManager.lua | 8 +- terrainDeformation/Landscaping.lua | 14 +- utils/HTMLUtil.lua | 154 +- utils/RaycastUtil.lua | 40 +- vehicles/VehicleDebug.lua | 54 +- vehicles/VehicleSchemaOverlayData.lua | 14 +- vehicles/WheelsUtil.lua | 70 +- 124 files changed, 2563 insertions(+), 6939 deletions(-) diff --git a/FSBaseMission.lua b/FSBaseMission.lua index 23477ed..e29d0d5 100644 --- a/FSBaseMission.lua +++ b/FSBaseMission.lua @@ -1,33 +1,33 @@ FSBaseMission = {} FSBaseMission.INGAME_NOTIFICATION_OK = { - 1 = 0.097600 - 2 = 0.624000 - 3 = 0.000000 + 1 = 0.097600, + 2 = 0.624000, + 3 = 0.000000, 4 = 1.000000 } FSBaseMission.DEBUG_SHOW_FIELDSTATUS_SIZE = 5.000000 FSBaseMission.USER_STATE_SYNCHRONIZING = 2.000000 FSBaseMission.INGAME_NOTIFICATION_CRITICAL = { - 1 = 0.930100 - 2 = 0.287400 - 3 = 0.013000 + 1 = 0.930100, + 2 = 0.287400, + 3 = 0.013000, 4 = 1.000000 } FSBaseMission.USER_STATE_LOADING = 1.000000 FSBaseMission.RADIO_ALWAYS = 3.000000 FSBaseMission.USER_STATE_CONNECTED = 3.000000 FSBaseMission.INGAME_NOTIFICATION_GREATDEMAND = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 } FSBaseMission.USER_STATE_INGAME = 4.000000 FSBaseMission.INGAME_NOTIFICATION_INFO = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 } FSBaseMission.LIMITED_OBJECT_TYPE_BALE = 1.000000 diff --git a/FSCareerMissionInfo.lua b/FSCareerMissionInfo.lua index 9f2a808..fc8aab8 100644 --- a/FSCareerMissionInfo.lua +++ b/FSCareerMissionInfo.lua @@ -1,15 +1,15 @@ FSCareerMissionInfo = {} FSCareerMissionInfo.BUY_PRICE_MULTIPLIER = { - 1 = 0.500000 - 2 = 0.750000 + 1 = 0.500000, + 2 = 0.750000, 3 = 1.000000 } FSCareerMissionInfo.MaxSavegameSize = 26214400.000000 FSCareerMissionInfo.SavegameRevision = 2.000000 FSCareerMissionInfo.SELL_PRICE_MULTIPLIER = { - 1 = 2.000000 - 2 = 1.500000 + 1 = 2.000000, + 2 = 1.500000, 3 = 1.000000 } diff --git a/GameSettings.lua b/GameSettings.lua index ec89d6c..a9de537 100644 --- a/GameSettings.lua +++ b/GameSettings.lua @@ -1,56 +1,56 @@ GameSettings = {} GameSettings.SETTING = { - USE_COLORBLIND_MODE = "useColorblindMode" - PLAYER_HAIR_INDEX = "playerHairIndex" - MP_LANGUAGE = "mpLanguage" - SHOW_FIELD_INFO = "showFieldInfo" - SHOW_HELP_ICONS = "showHelpIcons" - VOLUME_MASTER = "masterVolume" - RADIO_IS_ACTIVE = "radioIsActive" - PLAYER_ACCESSORY_INDEX = "playerAccessoryIndex" - RESET_CAMERA = "resetCamera" - IS_SOUND_PLAYER_STREAM_ACCESS_ALLOWED = "isSoundPlayerStreamAccessAllowed" - CAMERA_SENSITIVITY = "cameraSensitivity" - NICKNAME = "nickname" - IS_HEAD_TRACKING_ENABLED = "isHeadTrackingEnabled" - HORSE_ABANDON_TIMER_DURATION = "horseAbandonTimerDuration" - JOYSTICK_VIBRATION_ENABLED = "joystickVibrationEnabled" - UI_SCALE = "uiScale" - STEERING_BACK_SPEED = "steeringBackSpeed" - DEFAULT_SERVER_PORT = "defaultServerPort" - FOV_Y = "fovY" - LIGHTS_PROFILE = "lightsProfile" - VOLUME_MUSIC = "musicVolume" - MOTOR_STOP_TIMER_DURATION = "motorStopTimerDuration" - RADIO_VEHICLE_ONLY = "radioVehicleOnly" - REAL_BEACON_LIGHTS = "realBeaconLights" - INGAME_MAP_FILTER = "ingameMapFilter" - USE_FAHRENHEIT = "useFahrenheit" - PLAYER_BODY_INDEX = "playerBodyIndex" - USE_WORLD_CAMERA = "useWorldCamera" - IS_TRAIN_TABBABLE = "isTrainTabbable" - PLAYER_JACKET_INDEX = "playerJacketIndex" - EASY_ARM_CONTROL = "easyArmControl" - VEHICLE_ARM_SENSITIVITY = "vehicleArmSensitivity" - INVERT_Y_LOOK = "invertYLook" - INGAME_MAP_STATE = "ingameMapState" - USE_MILES = "useMiles" - INPUT_HELP_MODE = "inputHelpMode" - VOLUME_ENVIRONMENT = "environmentVolume" - GAMEPAD_ENABLED_SET_BY_USER = "gamepadEnabledSetByUser" - MAX_NUM_MIRRORS = "maxNumMirrors" - PLAYER_MODEL_INDEX = "playerModelIndex" - PLAYER_COLOR_INDEX = "playerColorIndex" - IS_GAMEPAD_ENABLED = "isGamepadEnabled" - VOLUME_GUI = "volumeGUI" - PLAYER_HAT_INDEX = "playerHatIndex" - SHOW_HELP_MENU = "showHelpMenu" - VOLUME_RADIO = "radioVolume" - HEAD_TRACKING_ENABLED_SET_BY_USER = "headTrackingEnabledSetByUser" - MONEY_UNIT = "moneyUnit" - USE_ACRE = "useAcre" - SHOW_TRIGGER_MARKER = "showTriggerMarker" + USE_COLORBLIND_MODE = "useColorblindMode", + PLAYER_HAIR_INDEX = "playerHairIndex", + MP_LANGUAGE = "mpLanguage", + SHOW_FIELD_INFO = "showFieldInfo", + SHOW_HELP_ICONS = "showHelpIcons", + VOLUME_MASTER = "masterVolume", + RADIO_IS_ACTIVE = "radioIsActive", + PLAYER_ACCESSORY_INDEX = "playerAccessoryIndex", + RESET_CAMERA = "resetCamera", + IS_SOUND_PLAYER_STREAM_ACCESS_ALLOWED = "isSoundPlayerStreamAccessAllowed", + CAMERA_SENSITIVITY = "cameraSensitivity", + NICKNAME = "nickname", + IS_HEAD_TRACKING_ENABLED = "isHeadTrackingEnabled", + HORSE_ABANDON_TIMER_DURATION = "horseAbandonTimerDuration", + JOYSTICK_VIBRATION_ENABLED = "joystickVibrationEnabled", + UI_SCALE = "uiScale", + STEERING_BACK_SPEED = "steeringBackSpeed", + DEFAULT_SERVER_PORT = "defaultServerPort", + FOV_Y = "fovY", + LIGHTS_PROFILE = "lightsProfile", + VOLUME_MUSIC = "musicVolume", + MOTOR_STOP_TIMER_DURATION = "motorStopTimerDuration", + RADIO_VEHICLE_ONLY = "radioVehicleOnly", + REAL_BEACON_LIGHTS = "realBeaconLights", + INGAME_MAP_FILTER = "ingameMapFilter", + USE_FAHRENHEIT = "useFahrenheit", + PLAYER_BODY_INDEX = "playerBodyIndex", + USE_WORLD_CAMERA = "useWorldCamera", + IS_TRAIN_TABBABLE = "isTrainTabbable", + PLAYER_JACKET_INDEX = "playerJacketIndex", + EASY_ARM_CONTROL = "easyArmControl", + VEHICLE_ARM_SENSITIVITY = "vehicleArmSensitivity", + INVERT_Y_LOOK = "invertYLook", + INGAME_MAP_STATE = "ingameMapState", + USE_MILES = "useMiles", + INPUT_HELP_MODE = "inputHelpMode", + VOLUME_ENVIRONMENT = "environmentVolume", + GAMEPAD_ENABLED_SET_BY_USER = "gamepadEnabledSetByUser", + MAX_NUM_MIRRORS = "maxNumMirrors", + PLAYER_MODEL_INDEX = "playerModelIndex", + PLAYER_COLOR_INDEX = "playerColorIndex", + IS_GAMEPAD_ENABLED = "isGamepadEnabled", + VOLUME_GUI = "volumeGUI", + PLAYER_HAT_INDEX = "playerHatIndex", + SHOW_HELP_MENU = "showHelpMenu", + VOLUME_RADIO = "radioVolume", + HEAD_TRACKING_ENABLED_SET_BY_USER = "headTrackingEnabledSetByUser", + MONEY_UNIT = "moneyUnit", + USE_ACRE = "useAcre", + SHOW_TRIGGER_MARKER = "showTriggerMarker", VOLUME_VEHICLE = "vehicleVolume" } function GameSettings:getTableValue() end diff --git a/MoneyType.lua b/MoneyType.lua index b91fdb8..7563e45 100644 --- a/MoneyType.lua +++ b/MoneyType.lua @@ -2,158 +2,158 @@ MoneyType = {} MoneyType.LAST_ID = 31.000000 MoneyType.FIELD_BUY = { - statistic = "fieldPurchase" - title = "finance_fieldPurchase" + statistic = "fieldPurchase", + title = "finance_fieldPurchase", id = 18.000000 } MoneyType.PROPERTY_MAINTENANCE = { - statistic = "propertyMaintenance" - title = "finance_propertyMaintenance" + statistic = "propertyMaintenance", + title = "finance_propertyMaintenance", id = 24.000000 } MoneyType.SOLD_ANIMALS = { - statistic = "soldAnimals" - title = "finance_soldAnimals" + statistic = "soldAnimals", + title = "finance_soldAnimals", id = 11.000000 } MoneyType.SHOP_VEHICLE_SELL = { - statistic = "soldVehicles" - title = "finance_soldVehicles" + statistic = "soldVehicles", + title = "finance_soldVehicles", id = 3.000000 } MoneyType.LOAN = { - statistic = "loan" - title = "finance_other" + statistic = "loan", + title = "finance_other", id = 26.000000 } MoneyType.OTHER = { - statistic = "other" - title = "finance_other" + statistic = "other", + title = "finance_other", id = 1.000000 } MoneyType.TRANSFER = { - statistic = "other" - title = "finance_transfer" + statistic = "other", + title = "finance_transfer", id = 31.000000 } MoneyType.SOLD_WOOD = { - statistic = "soldWood" - title = "finance_soldWood" + statistic = "soldWood", + title = "finance_soldWood", id = 28.000000 } MoneyType.SHOP_VEHICLE_LEASE = { - statistic = "newVehiclesCost" - title = "finance_vehicleLeasingCost" + statistic = "newVehiclesCost", + title = "finance_vehicleLeasingCost", id = 4.000000 } MoneyType.SOLD_MILK = { - statistic = "soldMilk" - title = "finance_soldMilk" + statistic = "soldMilk", + title = "finance_soldMilk", id = 7.000000 } MoneyType.SOLD_BALES = { - statistic = "soldBales" - title = "finance_soldBales" + statistic = "soldBales", + title = "finance_soldBales", id = 29.000000 } MoneyType.FIELD_SELL = { - statistic = "fieldSelling" - title = "finance_fieldSelling" + statistic = "fieldSelling", + title = "finance_fieldSelling", id = 19.000000 } MoneyType.PROPERTY_INCOME = { - statistic = "propertyIncome" - title = "finance_propertyIncome" + statistic = "propertyIncome", + title = "finance_propertyIncome", id = 25.000000 } MoneyType.PURCHASE_FERTILIZER = { - statistic = "purchaseFertilizer" - title = "finance_purchaseFertilizer" + statistic = "purchaseFertilizer", + title = "finance_purchaseFertilizer", id = 15.000000 } MoneyType.ANIMAL_UPKEEP = { - statistic = "animalUpkeep" - title = "finance_animalUpkeep" + statistic = "animalUpkeep", + title = "finance_animalUpkeep", id = 13.000000 } MoneyType.PURCHASE_FUEL = { - statistic = "purchaseFuel" - title = "finance_purchaseFuel" + statistic = "purchaseFuel", + title = "finance_purchaseFuel", id = 16.000000 } MoneyType.LEASING_COSTS = { - statistic = "vehicleLeasingCost" - title = "finance_vehicleLeasingCost" + statistic = "vehicleLeasingCost", + title = "finance_vehicleLeasingCost", id = 20.000000 } MoneyType.INCOME_BGA = { - statistic = "incomeBga" - title = "finance_incomeBga" + statistic = "incomeBga", + title = "finance_incomeBga", id = 27.000000 } MoneyType.PURCHASE_SAPLINGS = { - statistic = "purchaseSaplings" - title = "finance_purchaseSaplings" + statistic = "purchaseSaplings", + title = "finance_purchaseSaplings", id = 17.000000 } MoneyType.SHOP_PROPERTY_SELL = { - statistic = "soldBuildings" - title = "finance_soldBuildings" + statistic = "soldBuildings", + title = "finance_soldBuildings", id = 6.000000 } MoneyType.VEHICLE_REPAIR = { - statistic = "vehicleRunningCost" - title = "finance_vehicleRunningCost" + statistic = "vehicleRunningCost", + title = "finance_vehicleRunningCost", id = 23.000000 } MoneyType.LOAN_INTEREST = { - statistic = "loanInterest" - title = "finance_loanInterest" + statistic = "loanInterest", + title = "finance_loanInterest", id = 21.000000 } MoneyType.PURCHASE_SEEDS = { - statistic = "purchaseSeeds" - title = "finance_purchaseSeeds" + statistic = "purchaseSeeds", + title = "finance_purchaseSeeds", id = 14.000000 } MoneyType.AI = { - statistic = "wagePayment" - title = "finance_wagePayment" + statistic = "wagePayment", + title = "finance_wagePayment", id = 9.000000 } MoneyType.BOUGHT_MATERIALS = { - statistic = "expenses" - title = "finance_other" + statistic = "expenses", + title = "finance_other", id = 30.000000 } MoneyType.HARVEST_INCOME = { - statistic = "harvestIncome" - title = "finance_harvestIncome" + statistic = "harvestIncome", + title = "finance_harvestIncome", id = 8.000000 } MoneyType.SHOP_PROPERTY_BUY = { - statistic = "constructionCost" - title = "finance_constructionCost" + statistic = "constructionCost", + title = "finance_constructionCost", id = 5.000000 } MoneyType.NEW_ANIMALS_COST = { - statistic = "newAnimalsCost" - title = "finance_newAnimalsCost" + statistic = "newAnimalsCost", + title = "finance_newAnimalsCost", id = 12.000000 } MoneyType.SHOP_VEHICLE_BUY = { - statistic = "newVehiclesCost" - title = "finance_newVehiclesCost" + statistic = "newVehiclesCost", + title = "finance_newVehiclesCost", id = 2.000000 } MoneyType.MISSIONS = { - statistic = "missionIncome" - title = "finance_missionIncome" + statistic = "missionIncome", + title = "finance_missionIncome", id = 10.000000 } MoneyType.VEHICLE_RUNNING_COSTS = { - statistic = "vehicleRunningCost" - title = "finance_vehicleRunningCost" + statistic = "vehicleRunningCost", + title = "finance_vehicleRunningCost", id = 22.000000 } diff --git a/animals/CrowsWildlife.lua b/animals/CrowsWildlife.lua index 3dc50e4..11d4a6c 100644 --- a/animals/CrowsWildlife.lua +++ b/animals/CrowsWildlife.lua @@ -5,108 +5,108 @@ CrowsWildlife.classId = 24.000000 CrowsWildlife.CROW_STATES = { 1 = { class = { - activate = function() end - superClass = function() end - new = function() end - isa = function() end - copy = function() end + activate = function() end, + superClass = function() end, + new = function() end, + isa = function() end, + copy = function() end, class = function() end - } + }, id = 'default' - } + }, 2 = { class = { - copy = function() end - activate = function() end - superClass = function() end - new = function() end - deactivate = function() end - isa = function() end - update = function() end + copy = function() end, + activate = function() end, + superClass = function() end, + new = function() end, + deactivate = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'fly_glide' - } + }, 3 = { class = { - copy = function() end - activate = function() end - superClass = function() end - new = function() end - deactivate = function() end - isa = function() end - update = function() end + copy = function() end, + activate = function() end, + superClass = function() end, + new = function() end, + deactivate = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'fly' - } + }, 4 = { class = { - activate = function() end - superClass = function() end - new = function() end - copy = function() end - isa = function() end - update = function() end + activate = function() end, + superClass = function() end, + new = function() end, + copy = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'land' - } + }, 5 = { class = { - copy = function() end - activate = function() end - superClass = function() end - new = function() end - deactivate = function() end - isa = function() end - update = function() end + copy = function() end, + activate = function() end, + superClass = function() end, + new = function() end, + deactivate = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'takeOff' - } + }, 6 = { class = { - activate = function() end - superClass = function() end - new = function() end - copy = function() end - isa = function() end - update = function() end + activate = function() end, + superClass = function() end, + new = function() end, + copy = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'idle_walk' - } + }, 7 = { class = { - activate = function() end - superClass = function() end - new = function() end - copy = function() end - isa = function() end - update = function() end + activate = function() end, + superClass = function() end, + new = function() end, + copy = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'idle_eat' - } + }, 8 = { class = { - activate = function() end - superClass = function() end - new = function() end - copy = function() end - isa = function() end - update = function() end + activate = function() end, + superClass = function() end, + new = function() end, + copy = function() end, + isa = function() end, + update = function() end, class = function() end - } + }, id = 'idle_attention' } } CrowsWildlife.CROW_SOUND_STATES = { - NONE = 1.000000 - CALM_AIR = 3.000000 - CALM_GROUND = 2.000000 - BUSY = 4.000000 + NONE = 1.000000, + CALM_AIR = 3.000000, + CALM_GROUND = 2.000000, + BUSY = 4.000000, TAKEOFF = 5.000000 } diff --git a/animals/WildlifeSpawner.lua b/animals/WildlifeSpawner.lua index 45d4152..8a5faf3 100644 --- a/animals/WildlifeSpawner.lua +++ b/animals/WildlifeSpawner.lua @@ -1,9 +1,9 @@ WildlifeSpawner = {} WildlifeSpawner.DEBUGSHOWIDSTATES = { - MAX = 3.000000 - NONE = 1.000000 - SINGLE = 3.000000 + MAX = 3.000000, + NONE = 1.000000, + SINGLE = 3.000000, ALL = 2.000000 } diff --git a/animals/shop/AnimalController.lua b/animals/shop/AnimalController.lua index 0c5449e..b177599 100644 --- a/animals/shop/AnimalController.lua +++ b/animals/shop/AnimalController.lua @@ -2,7 +2,7 @@ AnimalController = {} AnimalController.MODE_DEALER_TRAILER = 1.000000 AnimalController.SYMBOL_L10N = { - DEALER = 'animals_dealer' + DEALER = 'animals_dealer', FARM = 'ui_farm' } AnimalController.MODE_FARM_TRAILER = 3.000000 diff --git a/economy/EconomyManager.lua b/economy/EconomyManager.lua index 49cbde7..260f69c 100644 --- a/economy/EconomyManager.lua +++ b/economy/EconomyManager.lua @@ -5,14 +5,14 @@ EconomyManager.CONFIG_CHANGE_PRICE = 1000.000000 EconomyManager.MAX_GREAT_DEMANDS = 3.000000 EconomyManager.DIRECT_SELL_MULTIPLIER = 1.200000 EconomyManager.PRICE_MULTIPLIER = { - 1 = 3.000000 - 2 = 1.800000 + 1 = 3.000000, + 2 = 1.800000, 3 = 1.000000 } EconomyManager.LIFETIME_OPERATINGTIME_RATIO = 0.083330 EconomyManager.COST_MULTIPLIER = { - 1 = 0.400000 - 2 = 0.700000 + 1 = 0.400000, + 2 = 0.700000, 3 = 1.000000 } EconomyManager.sendNumBits = 2.000000 diff --git a/farm/Farm.lua b/farm/Farm.lua index 49cd986..d735611 100644 --- a/farm/Farm.lua +++ b/farm/Farm.lua @@ -2,9 +2,9 @@ Farm = {} Farm.EQUITY_LOAN_RATIO = 0.800000 Farm.COLOR_SPECTATOR = { - 1 = 0.000000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 0.000000, + 2 = 0.000000, + 3 = 0.000000, 4 = 0.000000 } Farm.DEFAULT_PERMISSIONS = { @@ -14,51 +14,51 @@ Farm.NO_PERMISSIONS = { Farm.MAX_LOAN = 3000000.000000 Farm.COLORS = { 1 = { - 1 = 0.250000 - 2 = 1.000000 - 3 = 0.250000 + 1 = 0.250000, + 2 = 1.000000, + 3 = 0.250000, 4 = 1.000000 - } + }, 2 = { - 1 = 0.000000 - 2 = 0.044600 - 3 = 0.187000 + 1 = 0.000000, + 2 = 0.044600, + 3 = 0.187000, 4 = 1.000000 - } + }, 3 = { - 1 = 0.938600 - 2 = 0.467800 - 3 = 0.012300 + 1 = 0.938600, + 2 = 0.467800, + 3 = 0.012300, 4 = 1.000000 - } + }, 4 = { - 1 = 0.883200 - 2 = 0.163600 - 3 = 0.004600 + 1 = 0.883200, + 2 = 0.163600, + 3 = 0.004600, 4 = 1.000000 - } + }, 5 = { - 1 = 0.573200 - 2 = 0.005000 - 3 = 0.005000 + 1 = 0.573200, + 2 = 0.005000, + 3 = 0.005000, 4 = 1.000000 - } + }, 6 = { - 1 = 0.000000 - 2 = 0.234800 - 3 = 0.796900 + 1 = 0.000000, + 2 = 0.234800, + 3 = 0.796900, 4 = 1.000000 - } + }, 7 = { - 1 = 0.887900 - 2 = 0.054500 - 3 = 0.300500 + 1 = 0.887900, + 2 = 0.054500, + 3 = 0.300500, 4 = 1.000000 - } + }, 8 = { - 1 = 0.090800 - 2 = 0.004000 - 3 = 0.130100 + 1 = 0.090800, + 2 = 0.004000, + 3 = 0.130100, 4 = 1.000000 } } @@ -80,7 +80,7 @@ Farm.PERMISSIONS = { 11 = 'transferMoney', 12 = 'manageContracts', 13 = 'updateFarm', - 14 = 'manageContracting', + 14 = 'manageContracting' } Farm.className = 'Farm' Farm.MIN_LOAN = 500000.000000 @@ -97,7 +97,7 @@ Farm.PERMISSION = { BUY_VEHICLE = 'buyVehicle', CREATE_FIELDS = 'createFields', HIRE_ASSISTANT = 'hireAssistant', - MANAGE_CONTRACTS = 'manageContracts', + MANAGE_CONTRACTS = 'manageContracts' } function Farm:merge() end diff --git a/farm/FarmStats.lua b/farm/FarmStats.lua index 53c162d..65f17b2 100644 --- a/farm/FarmStats.lua +++ b/farm/FarmStats.lua @@ -5,7 +5,7 @@ FarmStats.HERO_STAT_NAMES = { 2 = 'moneyEarned', 3 = 'traveledDistance', 4 = 'completedMissions', - 5 = 'threshedHectares', + 5 = 'threshedHectares' } FarmStats.STAT_NAMES = { 1 = 'fuelUsage', @@ -46,7 +46,7 @@ FarmStats.STAT_NAMES = { 36 = 'cutTreeCount', 37 = 'woodTonsSold', 38 = 'treeTypesCut', - 39 = 'windTurbineCount', + 39 = 'windTurbineCount' } function FarmStats:changeFinanceStats() end diff --git a/farm/FinanceStats.lua b/farm/FinanceStats.lua index 62de43f..2978794 100644 --- a/farm/FinanceStats.lua +++ b/farm/FinanceStats.lua @@ -2,33 +2,33 @@ FinanceStats = {} FinanceStats.statNamesI18n = {} FinanceStats.statNameToIndex = { - soldBuildings = 6.000000 - harvestIncome = 23.000000 - newAnimalsCost = 3.000000 - purchaseSaplings = 21.000000 - soldVehicles = 2.000000 - soldWood = 14.000000 - purchaseFuel = 18.000000 - vehicleRunningCost = 9.000000 - soldBales = 15.000000 - purchaseWater = 22.000000 - propertyMaintenance = 12.000000 - loanInterest = 28.000000 - other = 27.000000 - soldAnimals = 4.000000 - constructionCost = 5.000000 - fieldSelling = 8.000000 - missionIncome = 25.000000 - newVehiclesCost = 1.000000 - wagePayment = 26.000000 - soldWool = 16.000000 - purchaseFertilizer = 20.000000 - soldMilk = 17.000000 - incomeBga = 24.000000 - propertyIncome = 13.000000 - purchaseSeeds = 19.000000 - vehicleLeasingCost = 10.000000 - animalUpkeep = 11.000000 + soldBuildings = 6.000000, + harvestIncome = 23.000000, + newAnimalsCost = 3.000000, + purchaseSaplings = 21.000000, + soldVehicles = 2.000000, + soldWood = 14.000000, + purchaseFuel = 18.000000, + vehicleRunningCost = 9.000000, + soldBales = 15.000000, + purchaseWater = 22.000000, + propertyMaintenance = 12.000000, + loanInterest = 28.000000, + other = 27.000000, + soldAnimals = 4.000000, + constructionCost = 5.000000, + fieldSelling = 8.000000, + missionIncome = 25.000000, + newVehiclesCost = 1.000000, + wagePayment = 26.000000, + soldWool = 16.000000, + purchaseFertilizer = 20.000000, + soldMilk = 17.000000, + incomeBga = 24.000000, + propertyIncome = 13.000000, + purchaseSeeds = 19.000000, + vehicleLeasingCost = 10.000000, + animalUpkeep = 11.000000, fieldPurchase = 7.000000 } FinanceStats.filledI18N = false @@ -60,7 +60,7 @@ FinanceStats.statNames = { 25 = 'missionIncome', 26 = 'wagePayment', 27 = 'other', - 28 = 'loanInterest', + 28 = 'loanInterest' } function FinanceStats:superClass() end function FinanceStats:merge() end diff --git a/g_currentMission/landscapingController.lua b/g_currentMission/landscapingController.lua index f359273..a3d3e94 100644 --- a/g_currentMission/landscapingController.lua +++ b/g_currentMission/landscapingController.lua @@ -1,96 +1,96 @@ g_currentMission.landscapingController = {} g_currentMission.landscapingController.farmlandManager = { - farmlandMapping = {} - loadedMapData = false - stateChangeListener = {} - localMapHeight = 0 - numberOfBits = 8 - sortedFarmlandIds = {} - localMapWidth = 0 + farmlandMapping = {}, + loadedMapData = false, + stateChangeListener = {}, + localMapHeight = 0, + numberOfBits = 8, + sortedFarmlandIds = {}, + localMapWidth = 0, farmlands = {} } g_currentMission.landscapingController.i3dManager = { - loadedMapData = false - sharedI3DFilesPendingCallbacks = {} + loadedMapData = false, + sharedI3DFilesPendingCallbacks = {}, sharedI3DFiles = {} } g_currentMission.landscapingController.ingameMap = { - playerMapArrowElement = {} - playerMapArrowOverlay = {} - mapElement = {} - mapFrameElement = {} - toggleSizeGlyphOffsetX = 0 - resizeTime = 100 - mapArrowWidth = 0.011718749912689 - coordOffsetY = 0.0055555555555556 - mapOverlay = {} - defaultPivotX = 0 - mapLabelText = 'MAP' - state = 0 - worldCenterOffsetX = 1024 - mapOffsetY = 0.0037037037037037 - mapArrowRedOverlay = {} - isVisible = true - mapOffsetX = 0.00039062499708962 - mapArrowYPos = 0.11990740740741 - centerXPos = 0 - mapAspectRatio = 1.2987012890252 - pivotY = 0 - mapToFrameDiffX = 0.00078124999417923 - mapArrowXPos = 0.062890624531428 - maxIconZoom = 1.4 - fontSize = 0.014814814814815 - mapToFrameDiffY = 0.0037037037037037 - pivotX = 0 - mapWidth = 0.11718749912689 - children = {} - mapLabelOffsetX = 0 - maxMapWidth = 0.27578125 - animation = {} - mapLabelOffsetY = 0.0027777777777778 - worldSizeX = 2048 - toggleMapSizeGlyph = {} - mapSizeY = 0.21388888888889 - hotspots = {} - mapLabelTextSize = 0.018518518518519 - mapVisWidth = 0.1 - mapSizeX = 0.11718749912689 - uiScale = 1 - mapAlpha = 1 - normalizedPlayerPosZ = 0 - inputDisplayManager = {} - playerNameOffsetY = 0.0037037037037037 - allowToggle = true - filter = {} -- table - selectHotspotTextSize = 0.014814814814815 - mapArrowHeight = 0.027777777777778 - centerZPos = 0 - playerFontSize = 0.011111111111111 - worldSizeZ = 2048 - mapUVs = {} -- table - mapVisWidthMin = 0.3 - minMapHeight = 0.21388888888889 - mapVisHeight = 0.077000000573695 - overlay = {} -- table - iconZoom = 1.4 - selectHotspotText = 'Select' - playerNameOffsetX = 0 - mapHeight = 0.21388888888889 - coordOffsetX = 0.0023437499825377 - minMapWidth = 0.11718749912689 - playerRotation = 0 - mapPosX = 0.01015624992433 - mapPosY = 0.026851851851852 - toggleSizeGlyphOffsetY = 0.0027777777777778 - maxMapVisWidth = 1 - maxMapHeight = 0.6537037037037 - resizeDir = 0 - worldCenterOffsetZ = 1024 - normalizedPlayerPosX = 0 - defaultPivotY = 0 + playerMapArrowElement = {}, + playerMapArrowOverlay = {}, + mapElement = {}, + mapFrameElement = {}, + toggleSizeGlyphOffsetX = 0, + resizeTime = 100, + mapArrowWidth = 0.011718749912689, + coordOffsetY = 0.0055555555555556, + mapOverlay = {}, + defaultPivotX = 0, + mapLabelText = 'MAP', + state = 0, + worldCenterOffsetX = 1024, + mapOffsetY = 0.0037037037037037, + mapArrowRedOverlay = {}, + isVisible = true, + mapOffsetX = 0.00039062499708962, + mapArrowYPos = 0.11990740740741, + centerXPos = 0, + mapAspectRatio = 1.2987012890252, + pivotY = 0, + mapToFrameDiffX = 0.00078124999417923, + mapArrowXPos = 0.062890624531428, + maxIconZoom = 1.4, + fontSize = 0.014814814814815, + mapToFrameDiffY = 0.0037037037037037, + pivotX = 0, + mapWidth = 0.11718749912689, + children = {}, + mapLabelOffsetX = 0, + maxMapWidth = 0.27578125, + animation = {}, + mapLabelOffsetY = 0.0027777777777778, + worldSizeX = 2048, + toggleMapSizeGlyph = {}, + mapSizeY = 0.21388888888889, + hotspots = {}, + mapLabelTextSize = 0.018518518518519, + mapVisWidth = 0.1, + mapSizeX = 0.11718749912689, + uiScale = 1, + mapAlpha = 1, + normalizedPlayerPosZ = 0, + inputDisplayManager = {}, + playerNameOffsetY = 0.0037037037037037, + allowToggle = true, + filter = {}, + selectHotspotTextSize = 0.014814814814815, + mapArrowHeight = 0.027777777777778, + centerZPos = 0, + playerFontSize = 0.011111111111111, + worldSizeZ = 2048, + mapUVs = {}, + mapVisWidthMin = 0.3, + minMapHeight = 0.21388888888889, + mapVisHeight = 0.077000000573695, + overlay = {}, + iconZoom = 1.4, + selectHotspotText = 'Select', + playerNameOffsetX = 0, + mapHeight = 0.21388888888889, + coordOffsetX = 0.0023437499825377, + minMapWidth = 0.11718749912689, + playerRotation = 0, + mapPosX = 0.01015624992433, + mapPosY = 0.026851851851852, + toggleSizeGlyphOffsetY = 0.0027777777777778, + maxMapVisWidth = 1, + maxMapHeight = 0.6537037037037, + resizeDir = 0, + worldCenterOffsetZ = 1024, + normalizedPlayerPosX = 0, + defaultPivotY = 0, minMapVisWidth = 0.3 } diff --git a/gui/AchievementsScreen.lua b/gui/AchievementsScreen.lua index b9b5552..26ee767 100644 --- a/gui/AchievementsScreen.lua +++ b/gui/AchievementsScreen.lua @@ -1,14 +1,14 @@ AchievementsScreen = {} AchievementsScreen.L10N_SYMBOL = { - STATS_VALUE = 'ui_achievementStatsValue' - BUTTON_CANCEL = 'button_cancel' + STATS_VALUE = 'ui_achievementStatsValue', + BUTTON_CANCEL = 'button_cancel', MESSAGE_SYNC_ACHIEVEMENTS = 'ui_achievementsSynchronizing' } AchievementsScreen.CONTROLS = { - LIST_SLIDER = 'listSlider' - LIST_ITEM_TEMPLATE = 'listTemplate' - STATS_VALUE = 'statsValue' + LIST_SLIDER = 'listSlider', + LIST_ITEM_TEMPLATE = 'listTemplate', + STATS_VALUE = 'statsValue', ACHIEVEMENT_LIST = 'achievementList' } function AchievementsScreen:onCreateAchievementDesc() end diff --git a/gui/AnimalScreen.lua b/gui/AnimalScreen.lua index 8a2ebba..641b1f8 100644 --- a/gui/AnimalScreen.lua +++ b/gui/AnimalScreen.lua @@ -1,44 +1,44 @@ AnimalScreen = {} AnimalScreen.CONTROLS = { - INFO_PRICE_TITLE = 'infoPriceTitle' - ANIMAL_TITLE = 'animalTitle' - INFO_TOTAL = 'infoTotal' - LIST_SOURCE = 'listSource' - BALANCE_TEXT = 'balanceElement' - LIST_TARGET = 'listTarget' - INFO_BUY_PRICE = 'infoBuyPrice' - BUTTON_APPLY = 'buttonApply' - ITEM_TEMPLATE_TARGET = 'itemTemplateTarget' - ITEM_TEMPLATE_SOURCE = 'itemTemplateSource' - HEADER_SOURCE = 'headerSource' - HEADER_TARGET = 'headerTarget' - INFO_FEE = 'infoFee' - ANIMAL_PRICE = 'animalPrice' - ANIMAL_ICON = 'animalIcon' - INFO_BOX = 'infoBox' - BALANCE_TITLE = 'balanceTitleElement' + INFO_PRICE_TITLE = 'infoPriceTitle', + ANIMAL_TITLE = 'animalTitle', + INFO_TOTAL = 'infoTotal', + LIST_SOURCE = 'listSource', + BALANCE_TEXT = 'balanceElement', + LIST_TARGET = 'listTarget', + INFO_BUY_PRICE = 'infoBuyPrice', + BUTTON_APPLY = 'buttonApply', + ITEM_TEMPLATE_TARGET = 'itemTemplateTarget', + ITEM_TEMPLATE_SOURCE = 'itemTemplateSource', + HEADER_SOURCE = 'headerSource', + HEADER_TARGET = 'headerTarget', + INFO_FEE = 'infoFee', + ANIMAL_PRICE = 'animalPrice', + ANIMAL_ICON = 'animalIcon', + INFO_BOX = 'infoBox', + BALANCE_TITLE = 'balanceTitleElement', INFO_SELL_PRICE = 'infoSellPrice' } AnimalScreen.PROFILE = { - POSITIVE_BALANCE = 'shopMoney' - NEGATIVE_BALANCE = 'shopMoneyNeg' + POSITIVE_BALANCE = 'shopMoney', + NEGATIVE_BALANCE = 'shopMoneyNeg', LIST_ITEM_NEUTRAL = 'shopCategoryItem' } AnimalScreen.SYMBOL_L10N = { - TEXT_LOAD = 'button_load' - ERROR_TRAILER_LEFT = 'animals_transportTargetLeftTrigger' - ERROR_ANIMAL_IN_USE = 'animals_inUse' - ERROR_CANNOT_ADD_TO_TRAILER = 'animals_canNotAddToTrailer' - ERROR_HUSBANDRY_FULL = 'animals_husbandryIsFull' - TEXT_PIECES = 'unit_pieces' - ERROR_NOT_SUPPORTED_BY_TRAILER = 'animals_animalNotSupportedByTrailer' - ERROR_NO_MONEY = 'animals_notEnoughMoney' - ERROR_TRAILER_FULL = 'animals_trailerIsFull' - TEXT_UNLOAD = 'button_unload' - TEXT_BUY = 'button_buy' - ERROR_NO_HUSBANDRY = 'animals_noHusbandryAvailable' - ERROR_INVALID_ANIMAL = 'animals_invalidAnimalType' + TEXT_LOAD = 'button_load', + ERROR_TRAILER_LEFT = 'animals_transportTargetLeftTrigger', + ERROR_ANIMAL_IN_USE = 'animals_inUse', + ERROR_CANNOT_ADD_TO_TRAILER = 'animals_canNotAddToTrailer', + ERROR_HUSBANDRY_FULL = 'animals_husbandryIsFull', + TEXT_PIECES = 'unit_pieces', + ERROR_NOT_SUPPORTED_BY_TRAILER = 'animals_animalNotSupportedByTrailer', + ERROR_NO_MONEY = 'animals_notEnoughMoney', + ERROR_TRAILER_FULL = 'animals_trailerIsFull', + TEXT_UNLOAD = 'button_unload', + TEXT_BUY = 'button_buy', + ERROR_NO_HUSBANDRY = 'animals_noHusbandryAvailable', + ERROR_INVALID_ANIMAL = 'animals_invalidAnimalType', TEXT_SELL = 'button_sell' } AnimalScreen.TRANSPORTATION_FEE = 200.000000 diff --git a/gui/CareerScreen.lua b/gui/CareerScreen.lua index ad43410..ad2a992 100644 --- a/gui/CareerScreen.lua +++ b/gui/CareerScreen.lua @@ -1,25 +1,25 @@ CareerScreen = {} CareerScreen.CONTROLS = { - BUTTON_START_PC = 'buttonStartPC' - BUTTON_DELETE_PC = 'buttonDeletePC' - LIST_ITEM_TEMPLATE = 'listItemTemplate' - LIST_SLIDER = 'listSlider' + BUTTON_START_PC = 'buttonStartPC', + BUTTON_DELETE_PC = 'buttonDeletePC', + LIST_ITEM_TEMPLATE = 'listItemTemplate', + LIST_SLIDER = 'listSlider', SAVEGAME_LIST = 'savegameList' } CareerScreen.LIST_TEMPLATE_ELEMENT_NAME = { - TEXT_BOX = 'textBox' - CREATE_DATE = 'createDate' - GAME_NAME = 'gameName' - GAME_ICON = 'gameIcon' - PLAYER_NAME = 'playerName' - TITLE = 'title' - DATA_BOX = 'dataBox' - DIFFICULTY = 'difficulty' - MAP_NAME = 'mapName' - INFO_TEXT = 'infoText' - MONEY = 'money' - TIME_PLAYED = 'timePlayed' + TEXT_BOX = 'textBox', + CREATE_DATE = 'createDate', + GAME_NAME = 'gameName', + GAME_ICON = 'gameIcon', + PLAYER_NAME = 'playerName', + TITLE = 'title', + DATA_BOX = 'dataBox', + DIFFICULTY = 'difficulty', + MAP_NAME = 'mapName', + INFO_TEXT = 'infoText', + MONEY = 'money', + TIME_PLAYED = 'timePlayed', CHARACTER = 'character' } CareerScreen.MISSING_MAP_ICON_PATH = 'dataS2/menu/hud/missingMap.png' diff --git a/gui/CharacterCreationScreen.lua b/gui/CharacterCreationScreen.lua index 9695832..75b01d1 100644 --- a/gui/CharacterCreationScreen.lua +++ b/gui/CharacterCreationScreen.lua @@ -1,20 +1,20 @@ CharacterCreationScreen = {} CharacterCreationScreen.CONTROLS = { - BUTTON_ROT_LEFT = 'buttonLeft' - VEST_OPTION = 'jacketOption' - EDIT_BUTTON = 'editButton' - COLOR_BUTTON_LAYOUT = 'colorButtonLayout' - CHARACTER_SETTINGS_LAYOUT = 'characterSettingsLayout' - CHANGE_NAME_BUTTON = 'changeNameButton' - CHARACTER_SCENE = 'sceneRender' - HAT_OPTION = 'hatOption' - BUTTON_ROT_RIGHT = 'buttonRight' - BODY_OPTION = 'bodyOption' - CONTINUE_BUTTON = 'continueButton' - GLASSES_OPTION = 'accessoryOption' - HAIR_OPTION = 'hairOption' - CHARACTER_NAME_INPUT = 'characterNameInput' + BUTTON_ROT_LEFT = 'buttonLeft', + VEST_OPTION = 'jacketOption', + EDIT_BUTTON = 'editButton', + COLOR_BUTTON_LAYOUT = 'colorButtonLayout', + CHARACTER_SETTINGS_LAYOUT = 'characterSettingsLayout', + CHANGE_NAME_BUTTON = 'changeNameButton', + CHARACTER_SCENE = 'sceneRender', + HAT_OPTION = 'hatOption', + BUTTON_ROT_RIGHT = 'buttonRight', + BODY_OPTION = 'bodyOption', + CONTINUE_BUTTON = 'continueButton', + GLASSES_OPTION = 'accessoryOption', + HAIR_OPTION = 'hairOption', + CHARACTER_NAME_INPUT = 'characterNameInput', COLOR_BUTTON_TEMPLATE = 'colorButtonTemplate' } CharacterCreationScreen.ROTATION_STEP_SIZE = 0.010000 diff --git a/gui/ControlsController.lua b/gui/ControlsController.lua index c73d115..3acd368 100644 --- a/gui/ControlsController.lua +++ b/gui/ControlsController.lua @@ -2,17 +2,17 @@ ControlsController = {} ControlsController.LOCKED_BINDINGS = { 1 = { - MENU = true - MENU_CANCEL = true - MENU_ACCEPT = true - MENU_BACK = true - MENU_AXIS_LEFT_RIGHT = true - MENU_PAGE_NEXT = true - MENU_AXIS_UP_DOWN = true - MENU_PAGE_PREV = true + MENU = true, + MENU_CANCEL = true, + MENU_ACCEPT = true, + MENU_BACK = true, + MENU_AXIS_LEFT_RIGHT = true, + MENU_PAGE_NEXT = true, + MENU_AXIS_UP_DOWN = true, + MENU_PAGE_PREV = true, MENU_ACTIVATE = true - } - 2 = {} + }, + 2 = {}, 3 = {} } diff --git a/gui/CreateGameScreen.lua b/gui/CreateGameScreen.lua index 708337c..b0ab83e 100644 --- a/gui/CreateGameScreen.lua +++ b/gui/CreateGameScreen.lua @@ -1,18 +1,18 @@ CreateGameScreen = {} CreateGameScreen.CONTROLS = { - CAPACITY_ELEMENT = 'capacityElement' - MULTIPLAYER_ELEMENT = 'multiplayerLanguageElement' - SERVER_NAME_ELEMENT = 'serverNameElement' - PORT_ELEMENT = 'portElement' - USE_UPNP_ELEMENT = 'useUpnpElement' - CHANGE_BUTTON = 'changeButton' - BUTTON_BOX = 'buttonBox' - AUTO_ACCEPT_ELEMENT = 'autoAcceptElement' - ALLOW_ONLY_FRIENDS_ELEMENT = 'allowOnlyFriendsElement' - AUTO_SAVE_ELEMENT = 'autoSaveElement' - PASSWORD_ELEMENT = 'passwordElement' - BANDWIDTH_ELEMENT = 'bandwidthElement' + CAPACITY_ELEMENT = 'capacityElement', + MULTIPLAYER_ELEMENT = 'multiplayerLanguageElement', + SERVER_NAME_ELEMENT = 'serverNameElement', + PORT_ELEMENT = 'portElement', + USE_UPNP_ELEMENT = 'useUpnpElement', + CHANGE_BUTTON = 'changeButton', + BUTTON_BOX = 'buttonBox', + AUTO_ACCEPT_ELEMENT = 'autoAcceptElement', + ALLOW_ONLY_FRIENDS_ELEMENT = 'allowOnlyFriendsElement', + AUTO_SAVE_ELEMENT = 'autoSaveElement', + PASSWORD_ELEMENT = 'passwordElement', + BANDWIDTH_ELEMENT = 'bandwidthElement', SETTINGS_BOX = 'settingsBox' } diff --git a/gui/CreditsScreen.lua b/gui/CreditsScreen.lua index 6f1cffd..12f580b 100644 --- a/gui/CreditsScreen.lua +++ b/gui/CreditsScreen.lua @@ -1,11 +1,11 @@ CreditsScreen = {} CreditsScreen.CONTROLS = { - CREDITS_BOX = 'creditsVisibilityBox' - CREDITS_PLACEHOLDER = 'creditsPlaceholder' - CREDITS_SEPARATOR_ELEMENT = 'creditsSeparatorElement' - LOGO = 'logo' - CREDITS_TEXT_ELEMENT = 'creditsTextElement' + CREDITS_BOX = 'creditsVisibilityBox', + CREDITS_PLACEHOLDER = 'creditsPlaceholder', + CREDITS_SEPARATOR_ELEMENT = 'creditsSeparatorElement', + LOGO = 'logo', + CREDITS_TEXT_ELEMENT = 'creditsTextElement', CREDITS_TITLE_ELEMENT = 'creditsTitleElement' } diff --git a/gui/DifficultyScreen.lua b/gui/DifficultyScreen.lua index d2c0c04..c4b9822 100644 --- a/gui/DifficultyScreen.lua +++ b/gui/DifficultyScreen.lua @@ -1,12 +1,12 @@ DifficultyScreen = {} DifficultyScreen.CONTROLS = { - LIST_ITEM_TEMPLATE = 'listItemTemplate' + LIST_ITEM_TEMPLATE = 'listItemTemplate', DIFFICULTY_LIST = 'difficultyList' } DifficultyScreen.LIST_TEMPLATE_ELEMENT_NAME = { - DESCRIPTION = 'description' - ICON = 'icon' + DESCRIPTION = 'description', + ICON = 'icon', TITLE = 'title' } diff --git a/gui/InGameMenu.lua b/gui/InGameMenu.lua index 5b28928..ca16c0c 100644 --- a/gui/InGameMenu.lua +++ b/gui/InGameMenu.lua @@ -2,125 +2,125 @@ InGameMenu = {} InGameMenu.TAB_UV = { FARMS = { - 1 = 585.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 585.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, CONTRACTS = { - 1 = 260.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 260.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, USERS = { - 1 = 910.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 910.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, ANIMALS = { - 1 = 195.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 195.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, TUTORIAL = { - 1 = 325.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 325.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, VEHICLES = { - 1 = 130.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 130.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, MAP = { - 1 = 0.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 0.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, GENERAL_SETTINGS = { - 1 = 65.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 65.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 } PRICES = { - 1 = 325.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 325.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, CONTROLS_SETTINGS = { - 1 = 130.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 130.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, GAME_SETTINGS = { - 1 = 0.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 0.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, STATISTICS = { - 1 = 520.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 520.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, FINANCES = { - 1 = 260.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 260.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, HELP = { - 1 = 455.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 455.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 } } InGameMenu.PROFILES = { - TAB_BAR_LIGHT = 'uiInGameMenuHeader' + TAB_BAR_LIGHT = 'uiInGameMenuHeader', TAB_BAR_DARK = 'uiInGameMenuHeaderDark' } InGameMenu.CONTROLS = { - PAGE_PRICES = 'pagePrices' - PAGE_CONTRACTS = 'pageContracts' - PAGE_STATISTICS = 'pageStatistics' - PAGE_MULTIPLAYER_FARMS = 'pageMultiplayerFarms' - PAGE_GARAGE_OVERVIEW = 'pageGarageOverview' - PAGE_MAP_OVERVIEW = 'pageMapOverview' - PAGE_ANIMALS = 'pageAnimals' - PAGE_FINANCES = 'pageFinances' - PAGE_HELP_LINE = 'pageHelpLine' - PAGE_SETTINGS_CONTROLS = 'pageSettingsControls' - PAGE_SETTINGS_GAME = 'pageSettingsGame' - PAGE_SETTINGS_GENERAL = 'pageSettingsGeneral' - PAGE_TUTORIAL = 'pageTutorial' + PAGE_PRICES = 'pagePrices', + PAGE_CONTRACTS = 'pageContracts', + PAGE_STATISTICS = 'pageStatistics', + PAGE_MULTIPLAYER_FARMS = 'pageMultiplayerFarms', + PAGE_GARAGE_OVERVIEW = 'pageGarageOverview', + PAGE_MAP_OVERVIEW = 'pageMapOverview', + PAGE_ANIMALS = 'pageAnimals', + PAGE_FINANCES = 'pageFinances', + PAGE_HELP_LINE = 'pageHelpLine', + PAGE_SETTINGS_CONTROLS = 'pageSettingsControls', + PAGE_SETTINGS_GAME = 'pageSettingsGame', + PAGE_SETTINGS_GENERAL = 'pageSettingsGeneral', + PAGE_TUTORIAL = 'pageTutorial', PAGE_MULTIPLAYER_USERS = 'pageMultiplayerUsers' } InGameMenu.L10N_SYMBOL = { - BUTTON_BACK = 'button_back' - SAVE_NO_DEVICE = 'ui_savegameSaveNoDevice' - NOT_SAVED = 'ui_savegameNotSaved' - END_TUTORIAL = 'ui_endTutorial' - BUTTON_CANCEL_GAME = 'button_cancelGame' - MASTER_SERVER_CONNECTION_LOST = 'ui_masterServerConnectionLost' - SAVE_NO_SPACE = 'ui_savegameSaveNoSpace' - SELECT_DEVICE = 'dialog_savegameSelectDevice' - BUTTON_SAVE_GAME = 'button_saveGame' - TUTORIAL_NOT_SAVED = 'ui_tutorialIsNotSaved' - SAVE_OVERWRITE = 'dialog_savegameOverwrite' - SAVING_CONTENT = 'ui_savingContent' - BUTTON_RESTART = 'button_restart' + BUTTON_BACK = 'button_back', + SAVE_NO_DEVICE = 'ui_savegameSaveNoDevice', + NOT_SAVED = 'ui_savegameNotSaved', + END_TUTORIAL = 'ui_endTutorial', + BUTTON_CANCEL_GAME = 'button_cancelGame', + MASTER_SERVER_CONNECTION_LOST = 'ui_masterServerConnectionLost', + SAVE_NO_SPACE = 'ui_savegameSaveNoSpace', + SELECT_DEVICE = 'dialog_savegameSelectDevice', + BUTTON_SAVE_GAME = 'button_saveGame', + TUTORIAL_NOT_SAVED = 'ui_tutorialIsNotSaved', + SAVE_OVERWRITE = 'dialog_savegameOverwrite', + SAVING_CONTENT = 'ui_savingContent', + BUTTON_RESTART = 'button_restart', END_WITHOUT_SAVING = 'ui_endWithoutSaving' } diff --git a/gui/InGameMenuAnimalsFrame.lua b/gui/InGameMenuAnimalsFrame.lua index 780dafa..df61f77 100644 --- a/gui/InGameMenuAnimalsFrame.lua +++ b/gui/InGameMenuAnimalsFrame.lua @@ -1,97 +1,97 @@ InGameMenuAnimalsFrame = {} InGameMenuAnimalsFrame.L10N_SYMBOL = { - FOOD_DESCRIPTION_SERIAL = 'animals_foodMixDescriptionSerial' - HORSE_DAILY_RIDING = 'ui_horseDailyRiding' - FOOD_DESCRIPTION_PARALLEL = 'animals_foodMixDescriptionParallel' - WATER = 'statistic_water' - DESC_CHICKEN = 'animals_descriptionChicken' - STRAW = 'statistic_strawStorage' - SET_MARKER = 'action_tag' - BUTTON_RENAME = 'button_rename' - DESC_HORSE = 'animals_descriptionHorse' - PROMPT_RENAME = 'ui_enterHorseName' - CLEANLINESS = 'statistic_cleanliness' - DESC_LIVESTOCK = 'animals_descriptionGeneric' - FOOD_MIX_EFFECTIVENESS = 'animals_foodMixEffectiveness' - BUTTON_HOTSPOT = 'button_showOnMap' - LIVESTOCK_PRODUCTIVITY = 'statistic_productivity' - FOOD_MIX_QUANITITY = 'animals_foodMixQuantity' - IME_PROMPT_RENAME = 'ui_horseName' - REMOVE_MARKER = 'action_untag' - BUTTON_CONFIRM = 'button_confirm' + FOOD_DESCRIPTION_SERIAL = 'animals_foodMixDescriptionSerial', + HORSE_DAILY_RIDING = 'ui_horseDailyRiding', + FOOD_DESCRIPTION_PARALLEL = 'animals_foodMixDescriptionParallel', + WATER = 'statistic_water', + DESC_CHICKEN = 'animals_descriptionChicken', + STRAW = 'statistic_strawStorage', + SET_MARKER = 'action_tag', + BUTTON_RENAME = 'button_rename', + DESC_HORSE = 'animals_descriptionHorse', + PROMPT_RENAME = 'ui_enterHorseName', + CLEANLINESS = 'statistic_cleanliness', + DESC_LIVESTOCK = 'animals_descriptionGeneric', + FOOD_MIX_EFFECTIVENESS = 'animals_foodMixEffectiveness', + BUTTON_HOTSPOT = 'button_showOnMap', + LIVESTOCK_PRODUCTIVITY = 'statistic_productivity', + FOOD_MIX_QUANITITY = 'animals_foodMixQuantity', + IME_PROMPT_RENAME = 'ui_horseName', + REMOVE_MARKER = 'action_untag', + BUTTON_CONFIRM = 'button_confirm', HORSE_FITNESS = 'ui_horseFitness' } InGameMenuAnimalsFrame.ANIMAL_PRODUCT_FILL_TYPES = { - EGG = 'EGG' - MILK = 'MILK' + EGG = 'EGG', + MILK = 'MILK', WOOL = 'WOOL' } InGameMenuAnimalsFrame.ELEMENT_NAME = { - ANIMAL_TYPE_ICON = 'animalTypeIcon' - ANIMAL_STATUS_VALUE_TEXT = 'animalStatusValue' - HUSBANDRY_NAME_TEXT = 'husbandryName' - ANIMAL_COUNT_TEXT = 'animalCount' - ANIMAL_NAME_TEXT = 'animalName' + ANIMAL_TYPE_ICON = 'animalTypeIcon', + ANIMAL_STATUS_VALUE_TEXT = 'animalStatusValue', + HUSBANDRY_NAME_TEXT = 'husbandryName', + ANIMAL_COUNT_TEXT = 'animalCount', + ANIMAL_NAME_TEXT = 'animalName', ANIMAL_STATUS_LABEL_TEXT = 'animalStatusLabel' } InGameMenuAnimalsFrame.PROFILE = { STATUS_BAR_SMALL = { - LOW = 'ingameMenuAnimalsSmallStatusBarLow' - MEDIUM = 'ingameMenuAnimalsSmallStatusBarMedium' + LOW = 'ingameMenuAnimalsSmallStatusBarLow', + MEDIUM = 'ingameMenuAnimalsSmallStatusBarMedium', HIGH = 'ingameMenuAnimalsSmallStatusBar' - } - HEADER_LIST_ITEM = 'ingameMenuAnimalsListHeader' + }, + HEADER_LIST_ITEM = 'ingameMenuAnimalsListHeader', STATUS_BAR_LARGE = { - LOW = 'ingameMenuAnimalsLargeStatusBarLow' - MEDIUM = 'ingameMenuAnimalsLargeStatusBarMedium' + LOW = 'ingameMenuAnimalsLargeStatusBarLow', + MEDIUM = 'ingameMenuAnimalsLargeStatusBarMedium', HIGH = 'ingameMenuAnimalsLargeStatusBar' } } InGameMenuAnimalsFrame.CONTROLS = { - ANIMALS_CONTAINER = 'animalsContainer' - HEALTH_VALUE_TEXT = 'healthValueText' - PRODUCTIVITY_BAR = 'productivityStatusBar' - REQUIREMENT_LABEL_TEXTS = 'requirementLabel' - LIVESTOCK_ATTRIBUTES = 'animalProductAttribute' - CLEANLINESS_BAR = 'cleanlinessStatusBar' - HEALTH_BAR = 'healthStatusBar' - DETAIL_DESCRIPTION_BOX = 'detailDescriptionBox' - CONDITION_LABEL_TEXTS = 'conditionLabel' - CONDITION_BARS = 'conditionStatusBar' - ANIMAL_LIST_HEADER_TEMPLATE = 'animalListHeaderTemplate' - ANIMAL_TYPE_COUNT_TEXT = 'animalDetailTypeCountText' - ANIMAL_DETAIL_HORSE = 'animalDetailHorseBox' - PRODUCTIVIY_VALUE_TEXT = 'productivityValueText' - ANIMAL_BOX_TEMPLATE = 'animalTemplate' - REQUIREMENT_BARS = 'requirementStatusBar' - DETAILS_BOX = 'detailsBox' - ANIMAL_LIST = 'animalList' - REQUIREMENT_VALUE_TEXTS = 'requirementValue' - REPRODUCTION_RATE_TEXT = 'animalReproductionRateText' - ANIMAL_TYPE_VALUE_TEXT = 'animalDetailTypeValueText' - LIVESTOCK_ATTRIBUTES_LAYOUT = 'livestockAttributesLayout' - DESCRIPTION_TEXT = 'detailDescriptionText' - FITNESS_BAR = 'fitnessStatusBar' - ANIMAL_LIST_BOX = 'animalsListBox' - ANIMAL_LIST_ROW_TEMPLATE = 'animalListItemTemplate' - DETAIL_INPUT_BOX = 'detailInputBox' - FITNESS_VALUE_TEXT = 'fitnessValueText' - LIVESTOCK_ATTRIBUTE_VALUES = 'animalProductText' - CLEANLINESS_VALUE_TEXT = 'cleanlinessValueText' - NO_HUSBANDRIES_TEXT = 'noHusbandriesBox' - CONDITIONS_HEADER = 'conditionsHeader' - ANIMAL_VALUE_TEXT = 'animalProductValue' - ANIMAL_TYPE_NAME_TEXT = 'animalDetailTypeNameText' - ANIMAL_TYPE_IMAGE = 'animalDetailTypeImage' - ANIMAL_DETAIL_LIVESTOCK = 'animalDetailLivestockBox' - TIME_UNTIL_REPRODUCTION_TEXT = 'animalTimeTillNextAnimalText' - LIVESTOCK_ATTRIBUTE_LABELS = 'animalProductLabel' - REQUIREMENT_ROWS = 'requirementRow' - REQUIREMENTS_LAYOUT = 'requirementsLayout' - FOOD_HEADER = 'foodHeader' - CONDITION_VALUE_TEXTS = 'conditionValue' - CONDITION_ROWS = 'conditionRow' + ANIMALS_CONTAINER = 'animalsContainer', + HEALTH_VALUE_TEXT = 'healthValueText', + PRODUCTIVITY_BAR = 'productivityStatusBar', + REQUIREMENT_LABEL_TEXTS = 'requirementLabel', + LIVESTOCK_ATTRIBUTES = 'animalProductAttribute', + CLEANLINESS_BAR = 'cleanlinessStatusBar', + HEALTH_BAR = 'healthStatusBar', + DETAIL_DESCRIPTION_BOX = 'detailDescriptionBox', + CONDITION_LABEL_TEXTS = 'conditionLabel', + CONDITION_BARS = 'conditionStatusBar', + ANIMAL_LIST_HEADER_TEMPLATE = 'animalListHeaderTemplate', + ANIMAL_TYPE_COUNT_TEXT = 'animalDetailTypeCountText', + ANIMAL_DETAIL_HORSE = 'animalDetailHorseBox', + PRODUCTIVIY_VALUE_TEXT = 'productivityValueText', + ANIMAL_BOX_TEMPLATE = 'animalTemplate', + REQUIREMENT_BARS = 'requirementStatusBar', + DETAILS_BOX = 'detailsBox', + ANIMAL_LIST = 'animalList', + REQUIREMENT_VALUE_TEXTS = 'requirementValue', + REPRODUCTION_RATE_TEXT = 'animalReproductionRateText', + ANIMAL_TYPE_VALUE_TEXT = 'animalDetailTypeValueText', + LIVESTOCK_ATTRIBUTES_LAYOUT = 'livestockAttributesLayout', + DESCRIPTION_TEXT = 'detailDescriptionText', + FITNESS_BAR = 'fitnessStatusBar', + ANIMAL_LIST_BOX = 'animalsListBox', + ANIMAL_LIST_ROW_TEMPLATE = 'animalListItemTemplate', + DETAIL_INPUT_BOX = 'detailInputBox', + FITNESS_VALUE_TEXT = 'fitnessValueText', + LIVESTOCK_ATTRIBUTE_VALUES = 'animalProductText', + CLEANLINESS_VALUE_TEXT = 'cleanlinessValueText', + NO_HUSBANDRIES_TEXT = 'noHusbandriesBox', + CONDITIONS_HEADER = 'conditionsHeader', + ANIMAL_VALUE_TEXT = 'animalProductValue', + ANIMAL_TYPE_NAME_TEXT = 'animalDetailTypeNameText', + ANIMAL_TYPE_IMAGE = 'animalDetailTypeImage', + ANIMAL_DETAIL_LIVESTOCK = 'animalDetailLivestockBox', + TIME_UNTIL_REPRODUCTION_TEXT = 'animalTimeTillNextAnimalText', + LIVESTOCK_ATTRIBUTE_LABELS = 'animalProductLabel', + REQUIREMENT_ROWS = 'requirementRow', + REQUIREMENTS_LAYOUT = 'requirementsLayout', + FOOD_HEADER = 'foodHeader', + CONDITION_VALUE_TEXTS = 'conditionValue', + CONDITION_ROWS = 'conditionRow', DETAIL_OUTPUT_BOX = 'detailOutputBox' } diff --git a/gui/InGameMenuContractsFrame.lua b/gui/InGameMenuContractsFrame.lua index 2273521..60c6d6b 100644 --- a/gui/InGameMenuContractsFrame.lua +++ b/gui/InGameMenuContractsFrame.lua @@ -1,37 +1,37 @@ InGameMenuContractsFrame = {} InGameMenuContractsFrame.CONTROLS = { - OWNER_OF_TEXT = 'ownerOfText' - REWARD_TEXT = 'rewardText' - TITLE_TEXT = 'titleText' - FARMER_IMAGE = 'farmerImage' - CONTRACTS_CONTAINER = 'contractsContainer' - TALLY_BOX = 'tallyBox' - USE_OWN_EQUIPMENT = 'useOwnEquipementText' - PROGRESS_TITLE_TEXT = 'progressTitleText' - CONTRACTS_LIST_ITEM_TEMPLATE = 'contractsListItemTemplate' - FARMER_NAME = 'farmerName' - PROGRESS_BAR_BG = 'progressBarBg' - PROGRESS_TEXT = 'progressText' - CONTRACTS_LIST = 'contractsList' - NO_CONTRACTS_BOX = 'noContractsBox' - CONTRACTS_LIST_BOX = 'contractsListBox' - PROGRESS_BAR = 'progressBar' - VEHICLE_TEMPLATE = 'vehicleTemplate' - ACTION_TEXT = 'actionText' - AREA_TEXT = 'areaText' - EXTRA_PROGRESS_TEXT = 'extraProgressText' - VEHICLES_BOX = 'vehiclesBox' - FARMER_BOX = 'farmerBox' - NPC_FIELD_BOX = 'npcFieldBox' - CONTRACT_TEXT = 'contractDescriptionText' - FIELD_BIG_TEXT = 'fieldBigText' - DETAILS_BOX = 'detailsBox' + OWNER_OF_TEXT = 'ownerOfText', + REWARD_TEXT = 'rewardText', + TITLE_TEXT = 'titleText', + FARMER_IMAGE = 'farmerImage', + CONTRACTS_CONTAINER = 'contractsContainer', + TALLY_BOX = 'tallyBox', + USE_OWN_EQUIPMENT = 'useOwnEquipementText', + PROGRESS_TITLE_TEXT = 'progressTitleText', + CONTRACTS_LIST_ITEM_TEMPLATE = 'contractsListItemTemplate', + FARMER_NAME = 'farmerName', + PROGRESS_BAR_BG = 'progressBarBg', + PROGRESS_TEXT = 'progressText', + CONTRACTS_LIST = 'contractsList', + NO_CONTRACTS_BOX = 'noContractsBox', + CONTRACTS_LIST_BOX = 'contractsListBox', + PROGRESS_BAR = 'progressBar', + VEHICLE_TEMPLATE = 'vehicleTemplate', + ACTION_TEXT = 'actionText', + AREA_TEXT = 'areaText', + EXTRA_PROGRESS_TEXT = 'extraProgressText', + VEHICLES_BOX = 'vehiclesBox', + FARMER_BOX = 'farmerBox', + NPC_FIELD_BOX = 'npcFieldBox', + CONTRACT_TEXT = 'contractDescriptionText', + FIELD_BIG_TEXT = 'fieldBigText', + DETAILS_BOX = 'detailsBox', CONTRACT_BOX = 'contractBox' } InGameMenuContractsFrame.BUTTON_STATE = { - ACTIVE = 1.000000 - FINISHED = 2.000000 + ACTIVE = 1.000000, + FINISHED = 2.000000, POSSIBLE = 0.000000 } diff --git a/gui/InGameMenuFinancesFrame.lua b/gui/InGameMenuFinancesFrame.lua index 757adb5..195bb03 100644 --- a/gui/InGameMenuFinancesFrame.lua +++ b/gui/InGameMenuFinancesFrame.lua @@ -1,29 +1,29 @@ InGameMenuFinancesFrame = {} InGameMenuFinancesFrame.DATA_BINDING = { - TYPE = 'costType' + TYPE = 'costType', DAY_TEMPLATE = 'day%s' } InGameMenuFinancesFrame.PROFILE = { - VALUE_CELL_NEUTRAL = 'ingameMenuFinancesRowCell' + VALUE_CELL_NEUTRAL = 'ingameMenuFinancesRowCell', VALUE_CELL_NEGATIVE = 'ingameMenuFinancesRowCellNegative' } InGameMenuFinancesFrame.CONTROLS = { - LOAN_TEXT = 'loanText' - TOTAL_TEXTS = 'totalText' - TABLE = 'financesTable' - HEADER_BOX = 'tableHeaderBox' - PAST_DAY_HEADERS = 'pastDayHeader' - TABLE_SLIDER = 'tableSlider' - BALANCE_TEXT = 'balanceText' - BALANCE_FOOTER = 'balanceFooter' + LOAN_TEXT = 'loanText', + TOTAL_TEXTS = 'totalText', + TABLE = 'financesTable', + HEADER_BOX = 'tableHeaderBox', + PAST_DAY_HEADERS = 'pastDayHeader', + TABLE_SLIDER = 'tableSlider', + BALANCE_TEXT = 'balanceText', + BALANCE_FOOTER = 'balanceFooter', MAIN_BOX = 'mainBox' } InGameMenuFinancesFrame.L10N_SYMBOL = { - TODAY = 'ui_today' - BUTTON_REPAY = 'button_repay5000' - BUTTON_BORROW = 'button_borrow5000' - CURRENCY = '$CURRENCY_SYMBOL' + TODAY = 'ui_today', + BUTTON_REPAY = 'button_repay5000', + BUTTON_BORROW = 'button_borrow5000', + CURRENCY = '$CURRENCY_SYMBOL', WEEK_DAY_TEMPLATE = 'ui_financesDay' } diff --git a/gui/InGameMenuGameSettingsFrame.lua b/gui/InGameMenuGameSettingsFrame.lua index bac9314..cbd413a 100644 --- a/gui/InGameMenuGameSettingsFrame.lua +++ b/gui/InGameMenuGameSettingsFrame.lua @@ -1,43 +1,43 @@ InGameMenuGameSettingsFrame = {} InGameMenuGameSettingsFrame.CONTROLS = { - CHECKBOX_HELPER_REFILL_SEED = 'checkHelperRefillSeed' - HELP_BOX_TEXT = 'gameSettingsHelpBoxText' - CHECKBOX_HELPER_REFILL_FUEL = 'checkHelperRefillFuel' - SETTINGS_CONTAINER = 'settingsContainer' - CHECKBOX_PLANT_WITHERING = 'checkPlantWithering' - BUTTON_PAUSE = 'buttonPauseGame' - CHECKBOX_FUEL_USAGE = 'checkFuelUsage' - CHECKBOX_PLANT_GROWTH_RATE = 'checkPlantGrowthRate' - CHECKBOX_DIRT = 'checkDirt' - CHECKBOX_LIME_REQUIRED = 'checkLimeRequired' - OPTION_AUTO_SAVE_INTERVAL = 'multiAutoSaveInterval' - TEXT_SAVEGAME_NAME = 'textSavegameName' - HELP_BOX = 'gameSettingsHelpBox' - CHECKBOX_WEEDS_ENABLED = 'checkWeedsEnabled' - CHECKBOX_TRAFFIC = 'checkTraffic' - CHECKBOX_STOP_AND_GO_BRAKING = 'checkStopAndGoBraking' - CHECKBOX_HELPER_REFILL_FERTILIZER = 'checkHelperRefillFertilizer' - CHECKBOX_FRUIT_DESTRUCTION = 'checkFruitDestruction' - CHECKBOX_AUTO_MOTOR_START = 'checkAutoMotorStart' - CHECKBOX_HELPER_REFILL_MANURE = 'checkHelperRefillManure' - CHECKBOX_PLOWING_REQUIRED = 'checkPlowingRequired' - OPTION_TIME_SCALE = 'multiTimeScale' - CHECKBOX_HELPER_REFILL_SLURRY = 'checkHelperRefillSlurry' + CHECKBOX_HELPER_REFILL_SEED = 'checkHelperRefillSeed', + HELP_BOX_TEXT = 'gameSettingsHelpBoxText', + CHECKBOX_HELPER_REFILL_FUEL = 'checkHelperRefillFuel', + SETTINGS_CONTAINER = 'settingsContainer', + CHECKBOX_PLANT_WITHERING = 'checkPlantWithering', + BUTTON_PAUSE = 'buttonPauseGame', + CHECKBOX_FUEL_USAGE = 'checkFuelUsage', + CHECKBOX_PLANT_GROWTH_RATE = 'checkPlantGrowthRate', + CHECKBOX_DIRT = 'checkDirt', + CHECKBOX_LIME_REQUIRED = 'checkLimeRequired', + OPTION_AUTO_SAVE_INTERVAL = 'multiAutoSaveInterval', + TEXT_SAVEGAME_NAME = 'textSavegameName', + HELP_BOX = 'gameSettingsHelpBox', + CHECKBOX_WEEDS_ENABLED = 'checkWeedsEnabled', + CHECKBOX_TRAFFIC = 'checkTraffic', + CHECKBOX_STOP_AND_GO_BRAKING = 'checkStopAndGoBraking', + CHECKBOX_HELPER_REFILL_FERTILIZER = 'checkHelperRefillFertilizer', + CHECKBOX_FRUIT_DESTRUCTION = 'checkFruitDestruction', + CHECKBOX_AUTO_MOTOR_START = 'checkAutoMotorStart', + CHECKBOX_HELPER_REFILL_MANURE = 'checkHelperRefillManure', + CHECKBOX_PLOWING_REQUIRED = 'checkPlowingRequired', + OPTION_TIME_SCALE = 'multiTimeScale', + CHECKBOX_HELPER_REFILL_SLURRY = 'checkHelperRefillSlurry', BOX_LAYOUT = 'boxLayout' } InGameMenuGameSettingsFrame.PROFILE = { - BUTTON_UNPAUSE = 'ingameMenuSettingsUnpauseButton' + BUTTON_UNPAUSE = 'ingameMenuSettingsUnpauseButton', BUTTON_PAUSE = 'ingameMenuSettingsPauseButton' } InGameMenuGameSettingsFrame.L10N_SYMBOL = { - USAGE_DEFAULT = 'setting_fuelUsageDefault' - GROWTH_RATE_TEMPLATE = 'setting_plantGrowthRateState' - OFF = 'ui_off' - PAUSE = 'input_PAUSE' - SUBSTITUTION_PREFIX = '$l10n_' - USAGE_LOW = 'setting_fuelUsageLow' - BUY = 'ui_buy' + USAGE_DEFAULT = 'setting_fuelUsageDefault', + GROWTH_RATE_TEMPLATE = 'setting_plantGrowthRateState', + OFF = 'ui_off', + PAUSE = 'input_PAUSE', + SUBSTITUTION_PREFIX = '$l10n_', + USAGE_LOW = 'setting_fuelUsageLow', + BUY = 'ui_buy', UNPAUSE = 'ui_unpause' } diff --git a/gui/InGameMenuGeneralSettingsFrame.lua b/gui/InGameMenuGeneralSettingsFrame.lua index 573fdce..5c74bdf 100644 --- a/gui/InGameMenuGeneralSettingsFrame.lua +++ b/gui/InGameMenuGeneralSettingsFrame.lua @@ -1,34 +1,34 @@ InGameMenuGeneralSettingsFrame = {} InGameMenuGeneralSettingsFrame.CONTROLS = { - OPTION_CAMERA_SENSITIVITY = 'multiCameraSensitivity' - OPTION_VOLUME_ENVIRONMENT = 'multiEnvironmentVolume' - CHECKBOX_IS_RADIO_VEHICLE_ONLY = 'checkIsRadioVehicleOnly' - BOX_LAYOUT = 'boxLayout' - HELP_BOX_TEXT = 'generalSettingsHelpBoxText' - OPTION_INPUT_HELP_MODE = 'multiInputHelpMode' - OPTION_VOLUME_GUI = 'multiVolumeGUI' - SETTINGS_CONTAINER = 'settingsContainer' - OPTION_STEERING_BACK_SPEED = 'multiSteeringBackSpeed' - CHECKBOX_IS_TRAIN_TABBABLE = 'checkIsTrainTabbable' - CHECKBOX_SHOW_TRIGGER_MARKER = 'checkShowTriggerMarker' - CHECKBOX_RESET_CAMERA = 'checkResetCamera' - HELP_BOX = 'generalSettingsHelpBox' - OPTION_VOLUME_MASTER = 'multiMasterVolume' - OPTION_MONEY_UNIT = 'multiMoneyUnit' - OPTION_VOLUME_VEHICLE = 'multiVehicleVolume' - OPTION_VEHICLE_ARM_SENSITIVITY = 'multiVehicleArmSensitivity' - CHECKBOX_HELP_ICONS = 'checkHelpIcons' - BUTTON_NATIVE_HELP = 'buttonNativeHelp' - CHECKBOX_USE_MILES = 'checkUseMiles' - OPTION_VOLUME_RADIO = 'multiRadioVolume' - CHECKBOX_COLORBLIND_MODE = 'checkColorBlindMode' - CHECKBOX_USE_ACRE = 'checkUseAcre' - CHECKBOX_INVERT_Y_LOOK = 'checkInvertYLook' - CHECKBOX_AUTO_HELP = 'checkAutoHelp' - CHECKBOX_USE_WORLD_CAMERA = 'checkUseWorldCamera' - CHECKBOX_USE_EASY_ARM_CONTROLER = 'checkUseEasyArmControl' - CHECKBOX_SHOW_FIELD_INFO = 'checkShowFieldInfo' + OPTION_CAMERA_SENSITIVITY = 'multiCameraSensitivity', + OPTION_VOLUME_ENVIRONMENT = 'multiEnvironmentVolume', + CHECKBOX_IS_RADIO_VEHICLE_ONLY = 'checkIsRadioVehicleOnly', + BOX_LAYOUT = 'boxLayout', + HELP_BOX_TEXT = 'generalSettingsHelpBoxText', + OPTION_INPUT_HELP_MODE = 'multiInputHelpMode', + OPTION_VOLUME_GUI = 'multiVolumeGUI', + SETTINGS_CONTAINER = 'settingsContainer', + OPTION_STEERING_BACK_SPEED = 'multiSteeringBackSpeed', + CHECKBOX_IS_TRAIN_TABBABLE = 'checkIsTrainTabbable', + CHECKBOX_SHOW_TRIGGER_MARKER = 'checkShowTriggerMarker', + CHECKBOX_RESET_CAMERA = 'checkResetCamera', + HELP_BOX = 'generalSettingsHelpBox', + OPTION_VOLUME_MASTER = 'multiMasterVolume', + OPTION_MONEY_UNIT = 'multiMoneyUnit', + OPTION_VOLUME_VEHICLE = 'multiVehicleVolume', + OPTION_VEHICLE_ARM_SENSITIVITY = 'multiVehicleArmSensitivity', + CHECKBOX_HELP_ICONS = 'checkHelpIcons', + BUTTON_NATIVE_HELP = 'buttonNativeHelp', + CHECKBOX_USE_MILES = 'checkUseMiles', + OPTION_VOLUME_RADIO = 'multiRadioVolume', + CHECKBOX_COLORBLIND_MODE = 'checkColorBlindMode', + CHECKBOX_USE_ACRE = 'checkUseAcre', + CHECKBOX_INVERT_Y_LOOK = 'checkInvertYLook', + CHECKBOX_AUTO_HELP = 'checkAutoHelp', + CHECKBOX_USE_WORLD_CAMERA = 'checkUseWorldCamera', + CHECKBOX_USE_EASY_ARM_CONTROLER = 'checkUseEasyArmControl', + CHECKBOX_SHOW_FIELD_INFO = 'checkShowFieldInfo', CHECKBOX_IS_RADIO_ACTIVE = 'checkIsRadioActive' } diff --git a/gui/InGameMenuHelpFrame.lua b/gui/InGameMenuHelpFrame.lua index f9bc978..e1e3d9c 100644 --- a/gui/InGameMenuHelpFrame.lua +++ b/gui/InGameMenuHelpFrame.lua @@ -1,13 +1,13 @@ InGameMenuHelpFrame = {} InGameMenuHelpFrame.CONTROLS = { - CATEGORY_TEMPLATE = 'helpLineListCategoryTemplate' - HELP_LINE_LIST = 'helpLineList' - HELP_LINE_TITLE_TEXT = 'helpLineTitleElement' - HELP_LINE_LIST_ITEM_TEMPLATE = 'helpLineListItemTemplate' - HELP_LINE_CONTENT_BOX = 'helpLineContentBox' - HELP_LINE_IMAGE = 'helpLineImageElement' - HELP_LINE_TEXT = 'helpLineTextElement' + CATEGORY_TEMPLATE = 'helpLineListCategoryTemplate', + HELP_LINE_LIST = 'helpLineList', + HELP_LINE_TITLE_TEXT = 'helpLineTitleElement', + HELP_LINE_LIST_ITEM_TEMPLATE = 'helpLineListItemTemplate', + HELP_LINE_CONTENT_BOX = 'helpLineContentBox', + HELP_LINE_IMAGE = 'helpLineImageElement', + HELP_LINE_TEXT = 'helpLineTextElement', HELP_CONTAINER = 'helpContainer' } InGameMenuHelpFrame.CATEGORY_CYCLE_COOLDOWN = 300.000000 diff --git a/gui/InGameMenuMapFrame.lua b/gui/InGameMenuMapFrame.lua index 660c81b..ea2c55a 100644 --- a/gui/InGameMenuMapFrame.lua +++ b/gui/InGameMenuMapFrame.lua @@ -1,92 +1,92 @@ InGameMenuMapFrame = {} InGameMenuMapFrame.HOTSPOT_VALID_CATEGORIES = { - 0 = true - 8 = true - 3 = true - 7 = true - 2 = true - 10 = true + 0 = true, + 8 = true, + 3 = true, + 7 = true, + 2 = true, + 10 = true, 9 = true } InGameMenuMapFrame.CLEAR_INPUT_ACTIONS = { - 1 = 'MENU_ACTIVATE' - 2 = 'MENU_CANCEL' - 3 = 'MENU_EXTRA_1' + 1 = 'MENU_ACTIVATE', + 2 = 'MENU_CANCEL', + 3 = 'MENU_EXTRA_1', 4 = 'MENU_EXTRA_2' } InGameMenuMapFrame.FRUIT_TYPE_BUTTON_ELEMENT = { - TYPE = 'cropTypeFilterText' - ICON = 'cropTypeFilterIcon' - COLOR = 'cropTypeFilterColor' + TYPE = 'cropTypeFilterText', + ICON = 'cropTypeFilterIcon', + COLOR = 'cropTypeFilterColor', BUTTON = 'cropTypeFilterButton' } InGameMenuMapFrame.MODE_FARMLANDS = 2.000000 InGameMenuMapFrame.PROFILE = { - MONEY_VALUE_NEUTRAL = 'ingameMenuMapMoneyValue' + MONEY_VALUE_NEUTRAL = 'ingameMenuMapMoneyValue', MONEY_VALUE_NEGATIVE = 'ingameMenuMapMoneyValueNegative' } InGameMenuMapFrame.L10N_SYMBOL = { - INPUT_MOVE_CURSOR = 'ui_ingameMenuMapMoveCursor' - DIALOG_VEHICLE_RESET_DONE = 'ui_vehicleResetDone' - DIALOG_VEHICLE_RESET_FAILED = 'ui_vehicleResetFailed' - DIALOG_BUY_FARMLAND_TITLE = 'shop_messageBuyFarmlandTitle' - MAP_SELECTOR_SOIL_STATES = 'ui_mapOverviewSoil' - MAP_SELECTOR_FRUIT_TYPES = 'ui_mapOverviewFruitTypes' - DIALOG_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionGeneral' - DIALOG_VEHICLE_RESET_CONFIRM = 'ui_wantToResetVehicleText' - SWITCH_OVERVIEW = 'ui_ingameMenuMapOverview' - SET_MARKER = 'action_tag' - INPUT_PAN_MAP = 'ui_ingameMenuMapPan' - DIALOG_BUY_FARMLAND_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuyFarmland' - DIALOG_SELL_FARMLAND_TITLE = 'shop_messageSellFarmlandTitle' - DIALOG_CANNOT_SELL_WTIH_PLACEABLES = 'shop_messageCannotSellFarmlandWithPlaceables' - DIALOG_VEHICLE_IN_USE = 'shop_messageReturnVehicleInUse' - DIALOG_SELL_FARMLAND = 'shop_messageSellFarmlandText' - DIALOG_BUY_FARMLAND = 'shop_messageBuyFarmlandText' - VEHICLE_RESET = 'button_reset' - SWITCH_FARMLANDS = 'ui_ingameMenuMapFarmlands' - REMOVE_MARKER = 'action_untag' - INPUT_ZOOM_MAP = 'ui_ingameMenuMapZoom' + INPUT_MOVE_CURSOR = 'ui_ingameMenuMapMoveCursor', + DIALOG_VEHICLE_RESET_DONE = 'ui_vehicleResetDone', + DIALOG_VEHICLE_RESET_FAILED = 'ui_vehicleResetFailed', + DIALOG_BUY_FARMLAND_TITLE = 'shop_messageBuyFarmlandTitle', + MAP_SELECTOR_SOIL_STATES = 'ui_mapOverviewSoil', + MAP_SELECTOR_FRUIT_TYPES = 'ui_mapOverviewFruitTypes', + DIALOG_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionGeneral', + DIALOG_VEHICLE_RESET_CONFIRM = 'ui_wantToResetVehicleText', + SWITCH_OVERVIEW = 'ui_ingameMenuMapOverview', + SET_MARKER = 'action_tag', + INPUT_PAN_MAP = 'ui_ingameMenuMapPan', + DIALOG_BUY_FARMLAND_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuyFarmland', + DIALOG_SELL_FARMLAND_TITLE = 'shop_messageSellFarmlandTitle', + DIALOG_CANNOT_SELL_WTIH_PLACEABLES = 'shop_messageCannotSellFarmlandWithPlaceables', + DIALOG_VEHICLE_IN_USE = 'shop_messageReturnVehicleInUse', + DIALOG_SELL_FARMLAND = 'shop_messageSellFarmlandText', + DIALOG_BUY_FARMLAND = 'shop_messageBuyFarmlandText', + VEHICLE_RESET = 'button_reset', + SWITCH_FARMLANDS = 'ui_ingameMenuMapFarmlands', + REMOVE_MARKER = 'action_untag', + INPUT_ZOOM_MAP = 'ui_ingameMenuMapZoom', MAP_SELECTOR_GROWTH_STATES = 'ui_mapOverviewGrowth' } InGameMenuMapFrame.CONTEXT_BOX_CORNER_ALIGNMENT = { - bottomLeft = 'topRight' - topLeft = 'bottomRight' - bottomRight = 'topLeft' + bottomLeft = 'topRight', + topLeft = 'bottomRight', + bottomRight = 'topLeft', topRight = 'bottomLeft' } InGameMenuMapFrame.CONTEXT_BOX_ORIENTATION = { - TOP_LEFT = 'topLeft' - BOTTOM_RIGHT = 'bottomRight' - BOTTOM_LEFT = 'bottomLeft' + TOP_LEFT = 'topLeft', + BOTTOM_RIGHT = 'bottomRight', + BOTTOM_LEFT = 'bottomLeft', TOP_RIGHT = 'topRight' } InGameMenuMapFrame.GLYPH_COLOR = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 } InGameMenuMapFrame.MAP_SOIL = 3.000000 InGameMenuMapFrame.HOTSPOT_FILTER_ICON_PROFILE = { false = { - 0 = 'ingameMenuMapFilterButtonIconOtherInactive' - 8 = 'ingameMenuMapFilterButtonIconTrailerInactive' - 3 = 'ingameMenuMapFilterButtonIconTippingInactive' - 7 = 'ingameMenuMapFilterButtonIconToolInactive' - 2 = 'ingameMenuMapFilterButtonIconFieldJobsInactive' - 10 = 'ingameMenuMapFilterButtonIconSteerableInactive' + 0 = 'ingameMenuMapFilterButtonIconOtherInactive', + 8 = 'ingameMenuMapFilterButtonIconTrailerInactive', + 3 = 'ingameMenuMapFilterButtonIconTippingInactive', + 7 = 'ingameMenuMapFilterButtonIconToolInactive', + 2 = 'ingameMenuMapFilterButtonIconFieldJobsInactive', + 10 = 'ingameMenuMapFilterButtonIconSteerableInactive', 9 = 'ingameMenuMapFilterButtonIconCombineInactive' - } + }, true = { - 0 = 'ingameMenuMapFilterButtonIconOther' - 8 = 'ingameMenuMapFilterButtonIconTrailer' - 3 = 'ingameMenuMapFilterButtonIconTipping' - 7 = 'ingameMenuMapFilterButtonIconTool' - 2 = 'ingameMenuMapFilterButtonIconFieldJobs' - 10 = 'ingameMenuMapFilterButtonIconSteerable' + 0 = 'ingameMenuMapFilterButtonIconOther', + 8 = 'ingameMenuMapFilterButtonIconTrailer', + 3 = 'ingameMenuMapFilterButtonIconTipping', + 7 = 'ingameMenuMapFilterButtonIconTool', + 2 = 'ingameMenuMapFilterButtonIconFieldJobs', + 10 = 'ingameMenuMapFilterButtonIconSteerable', 9 = 'ingameMenuMapFilterButtonIconCombine' } } @@ -97,54 +97,54 @@ InGameMenuMapFrame.MAP_FRUIT_TYPE = 1.000000 InGameMenuMapFrame.MAP_GROWTH = 2.000000 InGameMenuMapFrame.INPUT_CONTEXT_NAME = 'MENU_MAP_OVERVIEW' InGameMenuMapFrame.GLYPH_SIZE = { - 1 = 36.000000 + 1 = 36.000000, 2 = 36.000000 } InGameMenuMapFrame.MODE_OVERVIEW = 1.000000 InGameMenuMapFrame.CONTROLS = { - FILTER_BUTTON_TOOL = 'filterButtonTool' - GROWTH_STATE_FILTER_COLORS = 'growthStateFilterColor' - BUTTON_VISIT_PLACE = 'buttonVisitPlace' - FARMLAND_VALUE_TEXT = 'farmlandValueText' - BALANCE_TEXT = 'balanceText' - SOIL_STATE_FILTER_BUTTONS = 'soilStateFilterButton' - MAP_CONTROLS_DISPLAY = 'mapControls' - GROWTH_STATE_FILTER_BUTTONS = 'growthStateFilterButton' - SAFE_AREA = 'safeArea' - SOIL_STATE_FILTER_COLORS = 'soilStateFilterColor' - FILTER_BUTTON_VEHICLE = 'filterButtonVehicle' - CONTEXT_BOX_CORNER = 'contextBoxCorner' - CONTEXT_FARM = 'contextFarm' - BUTTON_ENTER_VEHICLE = 'buttonEnterVehicle' - FILTER_BOX = 'filterBox' - MOVE_GLYPH_PLACEHOLDER = 'mapMoveGlyphPlaceholder' - BUTTON_SELECT = 'buttonSelectIngame' - CONTEXT_BOX = 'contextBox' - BUTTON_BUY_FARMLAND = 'buttonBuyFarmland' - BUTTON_SET_MARKER = 'buttonSetMarker' - CROP_TYPE_FILTER_BOX = 'mapOverviewFruitTypeBox' - DYNAMIC_MAP_IMAGE_LOADING = 'dynamicMapImageLoading' - MAP_CURSOR = 'mapCursor' - MAP_OVERVIEW_SELECTOR = 'mapOverviewSelector' - BUTTON_BOX = 'buttonBox' - FILTER_BUTTON_TRAILER = 'filterButtonTrailer' - FARMLAND_VALUE_BOX = 'farmlandValueBox' - INGAME_MAP = 'ingameMap' - GROWTH_STATE_FILTER_BOX = 'mapOverviewGrowthBox' - BUTTON_LAYOUT = 'buttonLayout' - ZOOM_GLYPH_PLACEHOLDER = 'mapZoomGlyphPlaceholder' - BUTTON_SELL_FARMLAND = 'buttonSellFarmland' - GROWTH_STATE_FILTER_TEXTS = 'growthStateFilterText' - FILTER_BUTTON_FIELD_JOBS = 'filterButtonContracts' - SOIL_STATE_FILTER_TEXTS = 'soilStateFilterText' - BUTTON_SWITCH_MAP_MODE = 'buttonSwitchMapMode' - FILTER_PAGING = 'filterPaging' - CONTEXT_IMAGE = 'contextImage' - FILTER_BUTTON_TIPPING = 'filterButtonTipping' - CONTEXT_TEXT = 'contextText' - SOIL_STATE_FILTER_BOX = 'mapOverviewSoilBox' - FILTER_BUTTON_OTHER = 'filterButtonOther' - BUTTON_RESET_VEHICLE = 'buttonResetVehicle' + FILTER_BUTTON_TOOL = 'filterButtonTool', + GROWTH_STATE_FILTER_COLORS = 'growthStateFilterColor', + BUTTON_VISIT_PLACE = 'buttonVisitPlace', + FARMLAND_VALUE_TEXT = 'farmlandValueText', + BALANCE_TEXT = 'balanceText', + SOIL_STATE_FILTER_BUTTONS = 'soilStateFilterButton', + MAP_CONTROLS_DISPLAY = 'mapControls', + GROWTH_STATE_FILTER_BUTTONS = 'growthStateFilterButton', + SAFE_AREA = 'safeArea', + SOIL_STATE_FILTER_COLORS = 'soilStateFilterColor', + FILTER_BUTTON_VEHICLE = 'filterButtonVehicle', + CONTEXT_BOX_CORNER = 'contextBoxCorner', + CONTEXT_FARM = 'contextFarm', + BUTTON_ENTER_VEHICLE = 'buttonEnterVehicle', + FILTER_BOX = 'filterBox', + MOVE_GLYPH_PLACEHOLDER = 'mapMoveGlyphPlaceholder', + BUTTON_SELECT = 'buttonSelectIngame', + CONTEXT_BOX = 'contextBox', + BUTTON_BUY_FARMLAND = 'buttonBuyFarmland', + BUTTON_SET_MARKER = 'buttonSetMarker', + CROP_TYPE_FILTER_BOX = 'mapOverviewFruitTypeBox', + DYNAMIC_MAP_IMAGE_LOADING = 'dynamicMapImageLoading', + MAP_CURSOR = 'mapCursor', + MAP_OVERVIEW_SELECTOR = 'mapOverviewSelector', + BUTTON_BOX = 'buttonBox', + FILTER_BUTTON_TRAILER = 'filterButtonTrailer', + FARMLAND_VALUE_BOX = 'farmlandValueBox', + INGAME_MAP = 'ingameMap', + GROWTH_STATE_FILTER_BOX = 'mapOverviewGrowthBox', + BUTTON_LAYOUT = 'buttonLayout', + ZOOM_GLYPH_PLACEHOLDER = 'mapZoomGlyphPlaceholder', + BUTTON_SELL_FARMLAND = 'buttonSellFarmland', + GROWTH_STATE_FILTER_TEXTS = 'growthStateFilterText', + FILTER_BUTTON_FIELD_JOBS = 'filterButtonContracts', + SOIL_STATE_FILTER_TEXTS = 'soilStateFilterText', + BUTTON_SWITCH_MAP_MODE = 'buttonSwitchMapMode', + FILTER_PAGING = 'filterPaging', + CONTEXT_IMAGE = 'contextImage', + FILTER_BUTTON_TIPPING = 'filterButtonTipping', + CONTEXT_TEXT = 'contextText', + SOIL_STATE_FILTER_BOX = 'mapOverviewSoilBox', + FILTER_BUTTON_OTHER = 'filterButtonOther', + BUTTON_RESET_VEHICLE = 'buttonResetVehicle', FILTER_BUTTON_COMBINE = 'filterButtonCombine' } InGameMenuMapFrame.FRUITS_PER_PAGE = 15.000000 diff --git a/gui/InGameMenuMultiplayerFarmsFrame.lua b/gui/InGameMenuMultiplayerFarmsFrame.lua index 80ee6e6..8b1c233 100644 --- a/gui/InGameMenuMultiplayerFarmsFrame.lua +++ b/gui/InGameMenuMultiplayerFarmsFrame.lua @@ -1,34 +1,34 @@ InGameMenuMultiplayerFarmsFrame = {} InGameMenuMultiplayerFarmsFrame.PROFILE = { - FARM_ITEM_SELECTED = 'ingameMenuMPFarmsListItemSelected' + FARM_ITEM_SELECTED = 'ingameMenuMPFarmsListItemSelected', FARM_ITEM = 'ingameMenuMPFarmsListItem' } InGameMenuMultiplayerFarmsFrame.L10N_SYMBOL = { - WRONG_PASSWORD = 'ui_wrongPassword' - BUTTON_EDIT_FARM = 'button_mp_editFarm' - BUTTON_LEAVE_FARM = 'button_mp_leaveFarm' - BUTTON_CREATE_FARM = 'button_mp_createFarm' - PLAYER_COUNT = 'ui_players' - LEAVE_FARM_CONFIRM = 'ui_farmLeaveConfirmation' - BUTTON_DELETE_FARM = 'button_mp_deleteFarm' - BUTTON_JOIN_FARM = 'button_mp_joinFarm' + WRONG_PASSWORD = 'ui_wrongPassword', + BUTTON_EDIT_FARM = 'button_mp_editFarm', + BUTTON_LEAVE_FARM = 'button_mp_leaveFarm', + BUTTON_CREATE_FARM = 'button_mp_createFarm', + PLAYER_COUNT = 'ui_players', + LEAVE_FARM_CONFIRM = 'ui_farmLeaveConfirmation', + BUTTON_DELETE_FARM = 'button_mp_deleteFarm', + BUTTON_JOIN_FARM = 'button_mp_joinFarm', DELETE_FARM_CONFIRM = 'ui_farmDeleteConfirmation' } InGameMenuMultiplayerFarmsFrame.CONTROLS = { - NO_FARMS_BOX = 'noFarmsBox' - BUTTON_RIGHT = 'buttonRight' - BUTTON_LEFT = 'buttonLeft' - FARM_LIST = 'farmList' - FARM_ITEM_TEMPLATE = 'listTemplate' + NO_FARMS_BOX = 'noFarmsBox', + BUTTON_RIGHT = 'buttonRight', + BUTTON_LEFT = 'buttonLeft', + FARM_LIST = 'farmList', + FARM_ITEM_TEMPLATE = 'listTemplate', NEW_FARM_ITEM = 'newFarmItem' } InGameMenuMultiplayerFarmsFrame.ELEMENT_NAME = { - PLAYER_NAME_LAYOUT = 'playerNameLayout' - FARM_ICON = 'farmIcon' - PLAYER_NAME_TEMPLATE = 'playerNameTemplate' - FARM_NAME = 'farmName' - FARM_BALANCE = 'farmBalance' + PLAYER_NAME_LAYOUT = 'playerNameLayout', + FARM_ICON = 'farmIcon', + PLAYER_NAME_TEMPLATE = 'playerNameTemplate', + FARM_NAME = 'farmName', + FARM_BALANCE = 'farmBalance', PLAYER_COUNT = 'farmPlayerCount' } diff --git a/gui/InGameMenuMultiplayerUsersFrame.lua b/gui/InGameMenuMultiplayerUsersFrame.lua index c683cea..e7f555b 100644 --- a/gui/InGameMenuMultiplayerUsersFrame.lua +++ b/gui/InGameMenuMultiplayerUsersFrame.lua @@ -1,69 +1,69 @@ InGameMenuMultiplayerUsersFrame = {} InGameMenuMultiplayerUsersFrame.CONTROLS = { - BALANCE_TEXT = 'currentBalanceText' - TRADE_ANIMALS_PERMISSION = 'tradeAnimalsPermissionCheckbox' - CREATE_FIELDS_PERMISSION = 'createFieldsPermissionCheckbox' - BUY_PLACEABLE_PERMISSION = 'buyPlaceablePermissionCheckbox' - SELL_PLACEABLE_PERMISSION = 'sellPlaceablePermissionCheckbox' - PERMISSION_ROWS = 'permissionRow' - ACTION_BUTTON_KICK = 'kickButton' - RESET_VEHICLE_PERMISSION = 'resetVehiclePermissionCheckbox' - PERMISSIONS_BOX = 'permissionsBox' - BALANCE_LABEL = 'currentBalanceLabel' - BUY_VEHICLE_PERMISSION = 'buyVehiclePermissionCheckbox' - ACTION_BUTTON_BAN = 'banButton' - SELL_VEHICLE_PERMISSION = 'sellVehiclePermissionCheckbox' - USER_LIST = 'userList' - CONTAINER = 'container' - PLAYER_ROW_TEMPLATE = 'userListPlayerTemplate' - ACTION_BUTTON_TRANSFER = 'transferButton' - MANAGE_CONTRACTS_PERMISSION = 'manageMissionsPermissionCheckbox' - ACTION_BUTTON_CONTRACTOR = 'contractorButton' - HIRE_ASSISTANT_PERMISSION = 'hireAssistantPermissionCheckbox' - FARM_ROW_TEMPLATE = 'userListFarmTemplate' - ACTION_BUTTON_PROMOTE = 'promoteButton' - ACTIONS_BOX = 'actionsBox' + BALANCE_TEXT = 'currentBalanceText', + TRADE_ANIMALS_PERMISSION = 'tradeAnimalsPermissionCheckbox', + CREATE_FIELDS_PERMISSION = 'createFieldsPermissionCheckbox', + BUY_PLACEABLE_PERMISSION = 'buyPlaceablePermissionCheckbox', + SELL_PLACEABLE_PERMISSION = 'sellPlaceablePermissionCheckbox', + PERMISSION_ROWS = 'permissionRow', + ACTION_BUTTON_KICK = 'kickButton', + RESET_VEHICLE_PERMISSION = 'resetVehiclePermissionCheckbox', + PERMISSIONS_BOX = 'permissionsBox', + BALANCE_LABEL = 'currentBalanceLabel', + BUY_VEHICLE_PERMISSION = 'buyVehiclePermissionCheckbox', + ACTION_BUTTON_BAN = 'banButton', + SELL_VEHICLE_PERMISSION = 'sellVehiclePermissionCheckbox', + USER_LIST = 'userList', + CONTAINER = 'container', + PLAYER_ROW_TEMPLATE = 'userListPlayerTemplate', + ACTION_BUTTON_TRANSFER = 'transferButton', + MANAGE_CONTRACTS_PERMISSION = 'manageMissionsPermissionCheckbox', + ACTION_BUTTON_CONTRACTOR = 'contractorButton', + HIRE_ASSISTANT_PERMISSION = 'hireAssistantPermissionCheckbox', + FARM_ROW_TEMPLATE = 'userListFarmTemplate', + ACTION_BUTTON_PROMOTE = 'promoteButton', + ACTIONS_BOX = 'actionsBox', ACTION_BUTTON_REMOVE_FROM_FARM = 'removeButton' } InGameMenuMultiplayerUsersFrame.PROFILE = { - CURRENT_PLAYER_TEXT = 'ingameMenuMPUsersListRowTextCurrentPlayer' - BALANCE_POSITIVE = 'shopMoney' + CURRENT_PLAYER_TEXT = 'ingameMenuMPUsersListRowTextCurrentPlayer', + BALANCE_POSITIVE = 'shopMoney', BALANCE_NEGATIVE = 'shopMoneyNeg' } InGameMenuMultiplayerUsersFrame.L10N_SYMBOL = { - DIALOG_GRANT_CONTRACTOR_CONFIRM = 'ui_contractorGrantConfirm' - INFO_CANNOT_KICK_SERVER = 'ui_serverCannotBeKicked' - MONEY_BUTTON_TEMPLATE = 'button_mp_transferMoney' - DIALOG_REMOVE_CONFIRM = 'ui_removeFromFarmConfirm' - BUTTON_INVITE_FRIENDS = 'ui_inviteScreen' - BUTTON_ADMIN = 'button_adminLogin' - DIALOG_BAN_TITLE = 'ui_banTitle' - BUTTON_UNBAN = 'button_unban' - BUTTON_UNCONTRACT = 'button_mp_ungrant' - DIALOG_DENY_CONTRACTOR_CONFIRM = 'ui_contractorUngrantConfirm' - DIALOG_BAN_CONFIRM = 'ui_banConfirm' - BUTTON_CONTRACT = 'button_mp_grant' - DIALOG_CONTRACTOR_STATE_TITLE = 'ui_contractorStateChangeTitle' - DIALOG_PROMOTE_TITLE = 'ui_promoteToFarmManagerTitle' - PROMPT_ADMIN_PASSWORD = 'ui_enterAdminPassword' - DIALOG_PROMOTE_CONFIRM = 'ui_promoteToFarmManagerConfirm' - DIALOG_KICK_TITLE = 'ui_kickTitle' - BUTTON_SHOW_PROFILE = 'button_showProfile' - DIALOG_REMOVE_TITLE = 'ui_removeFromFarmTitle' - LABEL_ADMIN = 'ui_admin' - DIALOG_KICK_CONFIRM = 'ui_kickConfirm' - LABEL_FARM_MANAGER = 'ui_farmManager' + DIALOG_GRANT_CONTRACTOR_CONFIRM = 'ui_contractorGrantConfirm', + INFO_CANNOT_KICK_SERVER = 'ui_serverCannotBeKicked', + MONEY_BUTTON_TEMPLATE = 'button_mp_transferMoney', + DIALOG_REMOVE_CONFIRM = 'ui_removeFromFarmConfirm', + BUTTON_INVITE_FRIENDS = 'ui_inviteScreen', + BUTTON_ADMIN = 'button_adminLogin', + DIALOG_BAN_TITLE = 'ui_banTitle', + BUTTON_UNBAN = 'button_unban', + BUTTON_UNCONTRACT = 'button_mp_ungrant', + DIALOG_DENY_CONTRACTOR_CONFIRM = 'ui_contractorUngrantConfirm', + DIALOG_BAN_CONFIRM = 'ui_banConfirm', + BUTTON_CONTRACT = 'button_mp_grant', + DIALOG_CONTRACTOR_STATE_TITLE = 'ui_contractorStateChangeTitle', + DIALOG_PROMOTE_TITLE = 'ui_promoteToFarmManagerTitle', + PROMPT_ADMIN_PASSWORD = 'ui_enterAdminPassword', + DIALOG_PROMOTE_CONFIRM = 'ui_promoteToFarmManagerConfirm', + DIALOG_KICK_TITLE = 'ui_kickTitle', + BUTTON_SHOW_PROFILE = 'button_showProfile', + DIALOG_REMOVE_TITLE = 'ui_removeFromFarmTitle', + LABEL_ADMIN = 'ui_admin', + DIALOG_KICK_CONFIRM = 'ui_kickConfirm', + LABEL_FARM_MANAGER = 'ui_farmManager', INFO_CANNOT_BAN_SERVER = 'ui_serverCannotBeBanned' } InGameMenuMultiplayerUsersFrame.ELEMENT_NAME = { - ROW_FARM_COLOR = 'farmColor' - ROW_PLAYER_NAME = 'playerName' + ROW_FARM_COLOR = 'farmColor', + ROW_PLAYER_NAME = 'playerName', ROW_FARM_NAME = 'farmName' } InGameMenuMultiplayerUsersFrame.TRANSFER_AMOUNT = { - LARGE = 250000.000000 - MEDIUM = 50000.000000 + LARGE = 250000.000000, + MEDIUM = 50000.000000, SMALL = 5000.000000 } function InGameMenuMultiplayerUsersFrame:setupUserListFocusContext() end diff --git a/gui/InGameMenuPricesFrame.lua b/gui/InGameMenuPricesFrame.lua index d353356..cf6c2f5 100644 --- a/gui/InGameMenuPricesFrame.lua +++ b/gui/InGameMenuPricesFrame.lua @@ -1,42 +1,42 @@ InGameMenuPricesFrame = {} InGameMenuPricesFrame.DATA_BINDING = { - SILO_CAPACITY_LABEL = 'siloCapacityLabel' - SILO_CAPACITY_TEMPLATE = 'capacity%s' - PRICE_TEMPLATE = 'price%s' + SILO_CAPACITY_LABEL = 'siloCapacityLabel', + SILO_CAPACITY_TEMPLATE = 'capacity%s', + PRICE_TEMPLATE = 'price%s', SELLING_POINT = 'sellingPoint' } InGameMenuPricesFrame.MAX_NUM_PRICE_ROWS = 13.000000 InGameMenuPricesFrame.INPUT_CONTEXT_NAME = 'MENU_PRICES' InGameMenuPricesFrame.MAX_NUM_FILLTYPES = 7.000000 InGameMenuPricesFrame.CONTROLS = { - PRICES_TABLE = 'pricesTable' - PRICES_LIST_HORIZONTAL_SLIDER = 'pricesListSliderHorizontal' - PRICE_HEADERS = 'priceHeader' - MAIN_BOX = 'mainBox' - PRICES_LIST_VERTICAL_SLIDER = 'pricesListSlider' + PRICES_TABLE = 'pricesTable', + PRICES_LIST_HORIZONTAL_SLIDER = 'pricesListSliderHorizontal', + PRICE_HEADERS = 'priceHeader', + MAIN_BOX = 'mainBox', + PRICES_LIST_VERTICAL_SLIDER = 'pricesListSlider', TABLE_HEADER_BOX = 'tableHeaderBox' } InGameMenuPricesFrame.PROFILE = { - SILO_CAPACITY_VALUE = 'ingameMenuPriceRowSiloCapacityValue' - SILO_NAME_LAST_ROW = 'ingameMenuPriceRowSiloNameCellLastRow' - SELLING_POINT_CELL_NEUTRAL = 'ingameMenuPriceRowSellingPointCell' - PRICE_CELL_NEUTRAL = 'ingameMenuPriceRowPriceCell' - SELLING_POINT_CELL_NONE = 'ingameMenuPriceRowSellingPointCellNone' - SILO_LITERS_LAST_ROW = 'ingameMenuPriceRowSiloLitersLastRow' - SILO_LITERS = 'ingameMenuPriceRowSiloLiters' - PRICE_CELL_GREAT_DEMAND = 'ingameMenuPriceRowPriceCellGreatDemand' - LITERS_LAST_ROW = 'ingameMenuPriceRowLitersLastRow' - PRICE_CELL_TREND_DOWN = 'ingameMenuPriceRowPriceCellTrendDown' - LITERS = 'ingameMenuPriceRowLiters' - SILO_CAPACITY_LABEL = 'ingameMenuPriceRowSiloCapacity' - SILO_NAME = 'ingameMenuPriceRowSiloNameCell' - SELLING_POINT_CELL_TAGGED = 'ingameMenuPriceRowSellingPointCellTagged' + SILO_CAPACITY_VALUE = 'ingameMenuPriceRowSiloCapacityValue', + SILO_NAME_LAST_ROW = 'ingameMenuPriceRowSiloNameCellLastRow', + SELLING_POINT_CELL_NEUTRAL = 'ingameMenuPriceRowSellingPointCell', + PRICE_CELL_NEUTRAL = 'ingameMenuPriceRowPriceCell', + SELLING_POINT_CELL_NONE = 'ingameMenuPriceRowSellingPointCellNone', + SILO_LITERS_LAST_ROW = 'ingameMenuPriceRowSiloLitersLastRow', + SILO_LITERS = 'ingameMenuPriceRowSiloLiters', + PRICE_CELL_GREAT_DEMAND = 'ingameMenuPriceRowPriceCellGreatDemand', + LITERS_LAST_ROW = 'ingameMenuPriceRowLitersLastRow', + PRICE_CELL_TREND_DOWN = 'ingameMenuPriceRowPriceCellTrendDown', + LITERS = 'ingameMenuPriceRowLiters', + SILO_CAPACITY_LABEL = 'ingameMenuPriceRowSiloCapacity', + SILO_NAME = 'ingameMenuPriceRowSiloNameCell', + SELLING_POINT_CELL_TAGGED = 'ingameMenuPriceRowSellingPointCellTagged', PRICE_CELL_TREND_UP = 'ingameMenuPriceRowPriceCellTrendUp' } InGameMenuPricesFrame.L10N_SYMBOL = { - SILO_CAPACITY = 'ui_silos_totalCapacity' - REMOVE_MARKER = 'action_untag' + SILO_CAPACITY = 'ui_silos_totalCapacity', + REMOVE_MARKER = 'action_untag', SET_MARKER = 'action_tag' } diff --git a/gui/InGameMenuStatisticsFrame.lua b/gui/InGameMenuStatisticsFrame.lua index a84658c..766a439 100644 --- a/gui/InGameMenuStatisticsFrame.lua +++ b/gui/InGameMenuStatisticsFrame.lua @@ -1,14 +1,14 @@ InGameMenuStatisticsFrame = {} InGameMenuStatisticsFrame.CONTROLS = { - TABLES = 'statisticsTable' - STATS_BOX_TEMPLATE = 'statisticBoxElement' - STATS_CONTAINER = 'statsContainer' + TABLES = 'statisticsTable', + STATS_BOX_TEMPLATE = 'statisticBoxElement', + STATS_CONTAINER = 'statsContainer', TABLE_HEADER_BOXES = 'tableHeaderBox' } InGameMenuStatisticsFrame.DATA_BINDING = { - TOTAL_VALUE = 'total' - STAT_TYPE = 'stat' + TOTAL_VALUE = 'total', + STAT_TYPE = 'stat', SESSION_VALUE = 'session' } InGameMenuStatisticsFrame.NUM_ROWS = 13.000000 diff --git a/gui/InGameMenuTutorialFrame.lua b/gui/InGameMenuTutorialFrame.lua index ff9531b..15eb059 100644 --- a/gui/InGameMenuTutorialFrame.lua +++ b/gui/InGameMenuTutorialFrame.lua @@ -1,9 +1,9 @@ InGameMenuTutorialFrame = {} InGameMenuTutorialFrame.CONTROLS = { - TUTORIAL_LIST = 'tutorialList' - TUTORIAL_WRAPPER = 'mainFrameWrapper' - TUTORIAL_LIST_TEMPLATE = 'tutorialTemplate' + TUTORIAL_LIST = 'tutorialList', + TUTORIAL_WRAPPER = 'mainFrameWrapper', + TUTORIAL_LIST_TEMPLATE = 'tutorialTemplate', TUTORIAL_SLIDER = 'tutorialSlider' } diff --git a/gui/InGameMenuVehiclesFrame.lua b/gui/InGameMenuVehiclesFrame.lua index 044e01e..5bdf871 100644 --- a/gui/InGameMenuVehiclesFrame.lua +++ b/gui/InGameMenuVehiclesFrame.lua @@ -1,31 +1,31 @@ InGameMenuVehiclesFrame = {} InGameMenuVehiclesFrame.DATA_BINDING = { - ICON_AGE = 'iconAge' - ICON_OP_HOURS = 'iconOperatingHours' - DAMAGE = 'vehicleDamage' - ICON_LEASING = 'iconLeasing' - OP_HOURS = 'vehicleOperatingHours' - VALUE = 'vehicleValue' - ICON_VALUE = 'iconValue' - LEASING = 'vehicleLeasing' - AGE = 'vehicleAge' - NAME = 'vehicleName' + ICON_AGE = 'iconAge', + ICON_OP_HOURS = 'iconOperatingHours', + DAMAGE = 'vehicleDamage', + ICON_LEASING = 'iconLeasing', + OP_HOURS = 'vehicleOperatingHours', + VALUE = 'vehicleValue', + ICON_VALUE = 'iconValue', + LEASING = 'vehicleLeasing', + AGE = 'vehicleAge', + NAME = 'vehicleName', ICON_DAMAGE = 'iconDamage' } InGameMenuVehiclesFrame.PROFILE = { - ATTRIBUTE_CELL_NEUTRAL = 'ingameMenuVehicleRowAttributeCell' - ATTRIBUTE_ICON_CELL_NEUTRAL = 'ingameMenuVehicleRowAttributeIconCell' - ATTRIBUTE_CELL_NEGATIVE = 'ingameMenuVehicleRowAttributeCellNegative' + ATTRIBUTE_CELL_NEUTRAL = 'ingameMenuVehicleRowAttributeCell', + ATTRIBUTE_ICON_CELL_NEUTRAL = 'ingameMenuVehicleRowAttributeIconCell', + ATTRIBUTE_CELL_NEGATIVE = 'ingameMenuVehicleRowAttributeCellNegative', ATTRIBUTE_ICON_CELL_NEGATIVE = 'ingameMenuVehicleRowAttributeIconCellNegative' } InGameMenuVehiclesFrame.SCROLL_DELAY = 200.000000 InGameMenuVehiclesFrame.DAMAGE_NEGATIVE_THRESHOLD = 0.800000 InGameMenuVehiclesFrame.SELL_VALUE_NEGATIVE_FACTOR = 0.300000 InGameMenuVehiclesFrame.CONTROLS = { - VEHICLE_TABLE = 'vehicleTable' - GARAGE_LIST_SLIDER = 'garageListSlider' - MAIN_BOX = 'mainBox' + VEHICLE_TABLE = 'vehicleTable', + GARAGE_LIST_SLIDER = 'garageListSlider', + MAIN_BOX = 'mainBox', TABLE_HEADER_BOX = 'tableHeaderBox' } diff --git a/gui/JoinGameScreen.lua b/gui/JoinGameScreen.lua index e4d2623..7305b5b 100644 --- a/gui/JoinGameScreen.lua +++ b/gui/JoinGameScreen.lua @@ -1,18 +1,18 @@ JoinGameScreen = {} JoinGameScreen.CONTROLS = { - CAPACITY_ELEMENT = 'capacityElement' - SORT_BUTON = 'sortButton' - DETAIL_BUTTON = 'detailButtonElement' - SERVER_NAME_ELEMENT = 'serverNameElement' - CHANGE_BUTTON = 'changeButton' - SLIDER_ELEMENT = 'sliderElement' - START_BUTTON = 'startButtonElement' - MOD_DLC_ELEMENT = 'modDlcElement' - MAIN_BOX = 'mainBox' - SERVER_LIST = 'serverList' - NUM_SERVERS_TEXT = 'numServersText' - PASSWORD_ELEMENT = 'passwordElement' + CAPACITY_ELEMENT = 'capacityElement', + SORT_BUTON = 'sortButton', + DETAIL_BUTTON = 'detailButtonElement', + SERVER_NAME_ELEMENT = 'serverNameElement', + CHANGE_BUTTON = 'changeButton', + SLIDER_ELEMENT = 'sliderElement', + START_BUTTON = 'startButtonElement', + MOD_DLC_ELEMENT = 'modDlcElement', + MAIN_BOX = 'mainBox', + SERVER_LIST = 'serverList', + NUM_SERVERS_TEXT = 'numServersText', + PASSWORD_ELEMENT = 'passwordElement', BUTTON_BOX = 'buttonBox' } JoinGameScreen.DATA_BINDING_PLAYERS = 'dbPlayers' diff --git a/gui/LandscapingScreen.lua b/gui/LandscapingScreen.lua index ae87e82..a7965dc 100644 --- a/gui/LandscapingScreen.lua +++ b/gui/LandscapingScreen.lua @@ -2,40 +2,40 @@ LandscapingScreen = {} LandscapingScreen.ERROR_MESSAGE_FADE_DURATION = 500.000000 LandscapingScreen.CONTROLS = { - PAINT_ICON = 'paintModeIcon' - MODE_LIST = 'modeList' - BRUSH_SIZE_ITEM = 'brushSizeItem' - PAINT_ITEM = 'paintModeListItem' - SCULPT_ITEM = 'sculptModeListItem' - SETTINGS_BOX = 'settingsBox' - SCULPT_ICON = 'sculptModeIcon' - TEXTURE_IMAGE = 'paintTextureImage' - PAINT_FRAME = 'paintModeIconFrame' - SCULPT_FRAME = 'sculptModeIconFrame' - BRUSH_STRENGTH_ITEM = 'brushStrengthItem' - BRUSH_SIZE_VALUE = 'brushSizeValue' - BRUSH_STRENGTH_VALUE = 'brushStrengthValue' - MESSAGE_TEXT = 'messageText' - TEXTURE_LABEL = 'paintTextureLabel' - CROSSHAIR_ELEMENT = 'crossHairElement' + PAINT_ICON = 'paintModeIcon', + MODE_LIST = 'modeList', + BRUSH_SIZE_ITEM = 'brushSizeItem', + PAINT_ITEM = 'paintModeListItem', + SCULPT_ITEM = 'sculptModeListItem', + SETTINGS_BOX = 'settingsBox', + SCULPT_ICON = 'sculptModeIcon', + TEXTURE_IMAGE = 'paintTextureImage', + PAINT_FRAME = 'paintModeIconFrame', + SCULPT_FRAME = 'sculptModeIconFrame', + BRUSH_STRENGTH_ITEM = 'brushStrengthItem', + BRUSH_SIZE_VALUE = 'brushSizeValue', + BRUSH_STRENGTH_VALUE = 'brushStrengthValue', + MESSAGE_TEXT = 'messageText', + TEXTURE_LABEL = 'paintTextureLabel', + CROSSHAIR_ELEMENT = 'crossHairElement', TEXTURE_ITEM = 'paintMaterialItem' } LandscapingScreen.COLOR = { ERROR_MESSAGE_1 = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 0.250000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 0.250000, 4 = 1.000000 - } + }, ERROR_MESSAGE_2 = { - 1 = 0.750000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 0.750000, + 2 = 0.000000, + 3 = 0.000000, 4 = 1.000000 } } LandscapingScreen.PROFILE = { - MODE_SELECTED = 'landscapingModeSelectedFrame' + MODE_SELECTED = 'landscapingModeSelectedFrame', MODE_UNSELECTED = 'landscapingModeFrame' } LandscapingScreen.ERROR_MESSAGE_HIDE_MIN_DURATION = 200.000000 diff --git a/gui/LandscapingScreenController.lua b/gui/LandscapingScreenController.lua index c575e24..98cb998 100644 --- a/gui/LandscapingScreenController.lua +++ b/gui/LandscapingScreenController.lua @@ -2,40 +2,40 @@ LandscapingScreenController = {} LandscapingScreenController.INDICATOR_COLOR = { VALID = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 0.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, INVALID = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 0.000000, + 3 = 0.000000, 4 = 1.000000 } } LandscapingScreenController.MODE = { - PAINTING = 'PAINTING' + PAINTING = 'PAINTING', SCULPTING = 'SCULPTING' } LandscapingScreenController.L10N_SYMBOL = { - BUTTON_BACK = 'button_back' - ACTION_PAINT = 'action_terrainPaint' - ACTION_CHANGE_RADIUS = 'action_terrainChangeRadius' - ACTION_SUBTRACT = 'action_terrainLower' - ACTION_ADD = 'action_terrainRaise' - ACTION_FLATTEN = 'action_terrainFlatten' - ACTION_CHANGE_SHAPE = 'action_terrainChangeShape' - ACTION_CHANGE_STRENGTH = 'action_terrainChangeStrength' - ACTION_CHANGE_MODE = 'action_terrainChangeMode' - ACTION_SMOOTH = 'action_terrainSmooth' + BUTTON_BACK = 'button_back', + ACTION_PAINT = 'action_terrainPaint', + ACTION_CHANGE_RADIUS = 'action_terrainChangeRadius', + ACTION_SUBTRACT = 'action_terrainLower', + ACTION_ADD = 'action_terrainRaise', + ACTION_FLATTEN = 'action_terrainFlatten', + ACTION_CHANGE_SHAPE = 'action_terrainChangeShape', + ACTION_CHANGE_STRENGTH = 'action_terrainChangeStrength', + ACTION_CHANGE_MODE = 'action_terrainChangeMode', + ACTION_SMOOTH = 'action_terrainSmooth', ACTION_CYCLE_TEXTURE = 'action_terrainCycleGroundType' } LandscapingScreenController.SETTINGS = { - BRUSH_SHAPE = 2.000000 - BRUSH_SIZE = 3.000000 - TERRAIN_MATERIAL = 5.000000 - MODE = 1.000000 + BRUSH_SHAPE = 2.000000, + BRUSH_SIZE = 3.000000, + TERRAIN_MATERIAL = 5.000000, + MODE = 1.000000, BRUSH_STRENGTH = 4.000000 } LandscapingScreenController.SPHERE_INDICATOR_PATH = '$data/store/ui/sphere.i3d' diff --git a/gui/MPLoadingScreen.lua b/gui/MPLoadingScreen.lua index ef5cf64..f0059fe 100644 --- a/gui/MPLoadingScreen.lua +++ b/gui/MPLoadingScreen.lua @@ -1,13 +1,13 @@ MPLoadingScreen = {} MPLoadingScreen.CONTROLS = { - GAMEPLAY_HINT_TEXT = 'gameplayHintText' - BUTTON_OK_PC = 'buttonOkPC' - TIP_STATE_BOX = 'tipStateBox' - MAP_SELECTION_PREVIEW = 'mapSelectionPreview' - LOADING_STATUS_TEXT = 'loadingStatusText' - MPLOADING_ANIMATION = 'mpLoadingAnimation' - MAP_NAME_TEXT = 'mapNameText' + GAMEPLAY_HINT_TEXT = 'gameplayHintText', + BUTTON_OK_PC = 'buttonOkPC', + TIP_STATE_BOX = 'tipStateBox', + MAP_SELECTION_PREVIEW = 'mapSelectionPreview', + LOADING_STATUS_TEXT = 'loadingStatusText', + MPLOADING_ANIMATION = 'mpLoadingAnimation', + MAP_NAME_TEXT = 'mapNameText', BUTTON_DELETE_PC = 'buttonDeletePC' } diff --git a/gui/MainScreen.lua b/gui/MainScreen.lua index 2d9654d..7f4bff3 100644 --- a/gui/MainScreen.lua +++ b/gui/MainScreen.lua @@ -1,26 +1,26 @@ MainScreen = {} MainScreen.CONTROLS = { - BUTTON_NOTIFICATION_RIGHT = 'notificationButtonRight' - NOTIFICATION_TITLE = 'notificationTitle' - NOTIFICATION_BOX = 'notificationElement' - GAMER_TAG_ELEMENT = 'gamerTagElement' - NOTIFICATION_MESSAGE = 'notificationMessage' - BACKGROUND_IMAGE = 'backgroundImage' - BACKGROUND_TRACTOR = 'backgroundTractor' - LOGO = 'logo' - BACKGROUND_GLASSEDGE = 'glassEdgeOverlay' - BACKGROUND_BLURRY = 'backgroundBlurImage' - BUTTON_NOTIFICATION_OPEN = 'notificationButtonOpen' - NOTIFICATION_DATE = 'notificationDate' - BUTTON_NOTIFICATION_LEFT = 'notificationButtonLeft' - NOTIFICATION_INDEX_STATE = 'indexState' - BUTTON_BOX = 'buttonBox' + BUTTON_NOTIFICATION_RIGHT = 'notificationButtonRight', + NOTIFICATION_TITLE = 'notificationTitle', + NOTIFICATION_BOX = 'notificationElement', + GAMER_TAG_ELEMENT = 'gamerTagElement', + NOTIFICATION_MESSAGE = 'notificationMessage', + BACKGROUND_IMAGE = 'backgroundImage', + BACKGROUND_TRACTOR = 'backgroundTractor', + LOGO = 'logo', + BACKGROUND_GLASSEDGE = 'glassEdgeOverlay', + BACKGROUND_BLURRY = 'backgroundBlurImage', + BUTTON_NOTIFICATION_OPEN = 'notificationButtonOpen', + NOTIFICATION_DATE = 'notificationDate', + BUTTON_NOTIFICATION_LEFT = 'notificationButtonLeft', + NOTIFICATION_INDEX_STATE = 'indexState', + BUTTON_BOX = 'buttonBox', NOTIFICATION_IMAGE = 'notificationImage' } MainScreen.IMAGES = { 1 = { - filename = 'dataS2/menu/menuTractors/menuTractor_01.png' + filename = 'dataS2/menu/menuTractors/menuTractor_01.png', sizeFactor = 1.000000 } } diff --git a/gui/MapSelectionScreen.lua b/gui/MapSelectionScreen.lua index 9e4a9c1..104e296 100644 --- a/gui/MapSelectionScreen.lua +++ b/gui/MapSelectionScreen.lua @@ -1,13 +1,13 @@ MapSelectionScreen = {} MapSelectionScreen.CONTROLS = { - SELECTION_STATE_BOX = 'selectionStateBox' - SELECTOR_RIGHT_GP = 'selectorRightGamepad' - MAP_LIST_ITEM_TEMPLATE = 'listItemTemplate' - MAP_LIST = 'mapList' - MAP_SELECTOR = 'mapSelector' - MAP_SELECTION_TEXT = 'mapSelectionText' - SELECTOR_LEFT_GP = 'selectorLeftGamepad' + SELECTION_STATE_BOX = 'selectionStateBox', + SELECTOR_RIGHT_GP = 'selectorRightGamepad', + MAP_LIST_ITEM_TEMPLATE = 'listItemTemplate', + MAP_LIST = 'mapList', + MAP_SELECTOR = 'mapSelector', + MAP_SELECTION_TEXT = 'mapSelectionText', + SELECTOR_LEFT_GP = 'selectorLeftGamepad', MAP_SELECTION_TITLE = 'mapSelectionTitle' } function MapSelectionScreen:new() end diff --git a/gui/ModSelectionScreen.lua b/gui/ModSelectionScreen.lua index a58cff6..2e46750 100644 --- a/gui/ModSelectionScreen.lua +++ b/gui/ModSelectionScreen.lua @@ -1,26 +1,26 @@ ModSelectionScreen = {} ModSelectionScreen.L10N = { - DESELECT_ALL = 'button_deselectAll' - DESELECT = 'button_deselect' - SELECT = 'button_select' - BUTTON_CONTINUE = 'button_continue' - SELECT_ALL = 'button_selectAll' - ONLY_ZIP = 'ui_onlyForZipFiles' + DESELECT_ALL = 'button_deselectAll', + DESELECT = 'button_deselect', + SELECT = 'button_select', + BUTTON_CONTINUE = 'button_continue', + SELECT_ALL = 'button_selectAll', + ONLY_ZIP = 'ui_onlyForZipFiles', BUTTON_START = 'button_start' } ModSelectionScreen.CONTROLS = { - MOD_LIST_ITEM_TEMPLATE = 'listItemTemplate' - START_BUTTON = 'buttonStart' - SELECT_ALL_BUTTON = 'buttonSelectAll' - NO_MODS_DLCS_ELEMENT = 'noModsDLCsElement' - SELECT_BUTTON = 'buttonSelect' + MOD_LIST_ITEM_TEMPLATE = 'listItemTemplate', + START_BUTTON = 'buttonStart', + SELECT_ALL_BUTTON = 'buttonSelectAll', + NO_MODS_DLCS_ELEMENT = 'noModsDLCsElement', + SELECT_BUTTON = 'buttonSelect', MOD_LIST = 'modList' } ModSelectionScreen.LIST_TEMPLATE_ELEMENT_NAME = { - VERSION = 'version' - HASH = 'hash' - ICON = 'icon' + VERSION = 'version', + HASH = 'hash', + ICON = 'icon', TITLE = 'title' } diff --git a/gui/MultiplayerScreen.lua b/gui/MultiplayerScreen.lua index 9846527..f4e5641 100644 --- a/gui/MultiplayerScreen.lua +++ b/gui/MultiplayerScreen.lua @@ -1,7 +1,7 @@ MultiplayerScreen = {} MultiplayerScreen.CONTROLS = { - RENT_BUTTON = 'rentButton' + RENT_BUTTON = 'rentButton', NAT_WARNING = 'natWarning' } diff --git a/gui/PlacementScreen.lua b/gui/PlacementScreen.lua index e104ae5..955e56b 100644 --- a/gui/PlacementScreen.lua +++ b/gui/PlacementScreen.lua @@ -1,7 +1,7 @@ PlacementScreen = {} PlacementScreen.CONTROLS = { - MESSAGE_TEXT = 'messageText' + MESSAGE_TEXT = 'messageText', CROSSHAIR_ELEMENT = 'crossHairElement' } diff --git a/gui/PlacementScreenController.lua b/gui/PlacementScreenController.lua index 2cb2470..59132e1 100644 --- a/gui/PlacementScreenController.lua +++ b/gui/PlacementScreenController.lua @@ -1,25 +1,25 @@ PlacementScreenController = {} PlacementScreenController.MESSAGE = { - SELL_WARNING_INFO = 1.000000 - SELL_ITEM = 2.000000 - TOO_MANY_TREES = 5.000000 - NOT_ENOUGH_MONEY = 3.000000 + SELL_WARNING_INFO = 1.000000, + SELL_ITEM = 2.000000, + TOO_MANY_TREES = 5.000000, + NOT_ENOUGH_MONEY = 3.000000, NOT_ENOUGH_SLOTS = 4.000000 } PlacementScreenController.L10N_SYMBOL = { - ACTION_ROTATE_CAMERA = 'action_rotateCamera' - ACTION_MOVE = 'ui_movePlaceable' - WARNING_NOT_OWNED = 'warning_youDontOwnThisItem' - WARNING_NOT_ENOUGH_SLOTS = 'shop_messageNotEnoughSlotsToBuy' - WARNING_TOO_MANY_TREES = 'warning_tooManyTrees' - BUTTON_BACK = 'button_back' - BUTTON_SELL = 'button_sell' - WARNING_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuy' - ACTION_PLACEMENT_HEIGHT = 'action_changePlacementHeight' - BUTTON_BUY = 'button_buy' - ACTION_RESET_CAMERA = 'setting_resetUICamera' - ACTION_ROTATE_OBJECT = 'action_rotate' + ACTION_ROTATE_CAMERA = 'action_rotateCamera', + ACTION_MOVE = 'ui_movePlaceable', + WARNING_NOT_OWNED = 'warning_youDontOwnThisItem', + WARNING_NOT_ENOUGH_SLOTS = 'shop_messageNotEnoughSlotsToBuy', + WARNING_TOO_MANY_TREES = 'warning_tooManyTrees', + BUTTON_BACK = 'button_back', + BUTTON_SELL = 'button_sell', + WARNING_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuy', + ACTION_PLACEMENT_HEIGHT = 'action_changePlacementHeight', + BUTTON_BUY = 'button_buy', + ACTION_RESET_CAMERA = 'setting_resetUICamera', + ACTION_ROTATE_OBJECT = 'action_rotate', ACTION_ZOOM = 'action_cameraZoom' } diff --git a/gui/ServerDetailScreen.lua b/gui/ServerDetailScreen.lua index 90fa279..7347c94 100644 --- a/gui/ServerDetailScreen.lua +++ b/gui/ServerDetailScreen.lua @@ -1,22 +1,22 @@ ServerDetailScreen = {} ServerDetailScreen.CONTROLS = { - WARNING = 'warningElement' - NO_MODS_DLCS_ELEMENT = 'noModsDLCsElement' - SHOW_PROFILE_BUTTON = 'showProfileButton' - SERVER_NAME_TEXT = 'serverNameElement' - LANGUAGE_TEXT = 'languageElement' - GET_MODS_BUTTON = 'getModsButton' - START_ELEMENT = 'startElement' - MAP_ICON = 'mapIconElement' - WARNING_TEXT = 'warningTextElement' - MAP_TEXT = 'mapElement' - NUM_PLAYERS_TEXT = 'numPlayersElement' - MOD_LIST_ITEM_TEMPLATE = 'listItemTemplate' - HEADER_TEXT = 'headerText' - MAIN_BOX = 'mainBox' - PASSWORD_TEXT = 'passwordElement' - MOD_LIST = 'modList' + WARNING = 'warningElement', + NO_MODS_DLCS_ELEMENT = 'noModsDLCsElement', + SHOW_PROFILE_BUTTON = 'showProfileButton', + SERVER_NAME_TEXT = 'serverNameElement', + LANGUAGE_TEXT = 'languageElement', + GET_MODS_BUTTON = 'getModsButton', + START_ELEMENT = 'startElement', + MAP_ICON = 'mapIconElement', + WARNING_TEXT = 'warningTextElement', + MAP_TEXT = 'mapElement', + NUM_PLAYERS_TEXT = 'numPlayersElement', + MOD_LIST_ITEM_TEMPLATE = 'listItemTemplate', + HEADER_TEXT = 'headerText', + MAIN_BOX = 'mainBox', + PASSWORD_TEXT = 'passwordElement', + MOD_LIST = 'modList', PLAYER_CIRCLE = 'playerCircleElement' } diff --git a/gui/SettingsAdvancedFrame.lua b/gui/SettingsAdvancedFrame.lua index 18ea3dd..9c4326f 100644 --- a/gui/SettingsAdvancedFrame.lua +++ b/gui/SettingsAdvancedFrame.lua @@ -1,24 +1,24 @@ SettingsAdvancedFrame = {} SettingsAdvancedFrame.CONTROLS = { - ELEMENT_MAX_TIRE_TRACKS = 'maxTireTracksElement' - ELEMENT_MAX_LIGHTS = 'maxLightsElement' - ELEMENT_TERRAIN_QUALITY = 'terrainQualityElement' - ELEMENT_MSAA = 'msaaElement' - ELEMENT_VOLUME_MESH_TESSELLATION = 'volumeMeshTessellationElement' - ELEMENT_REAL_BEACON_LIGHTS = 'realBeaconLightsElement' - MAIN_CONTAINER = 'settingsContainer' - ELEMENT_TERRAIN_LOD_DISTANCE = 'terrainLODDistanceElement' - ELEMENT_MAX_MIRRORS = 'maxMirrorsElement' - ELEMENT_TEXTURE_FILTERING = 'textureFilteringElement' - ELEMENT_PERFORMANCE_CLASS = 'performanceClassElement' - ELEMENT_SHADOW_MAP_FILTERING = 'shadowMapFilteringElement' - ELEMENT_LOD_DISTANCE = 'lodDistanceElement' - ELEMENT_LIGHTS_PROFILE = 'lightsProfileElement' - ELEMENT_SHADOW_QUALITY = 'shadowQualityElement' - ELEMENT_OBJECT_DRAW_DISTANCE = 'objectDrawDistanceElement' - ELEMENT_SHADER_QUALITY = 'shaderQualityElement' - ELEMENT_TEXTURE_RESOLUTION = 'textureResolutionElement' + ELEMENT_MAX_TIRE_TRACKS = 'maxTireTracksElement', + ELEMENT_MAX_LIGHTS = 'maxLightsElement', + ELEMENT_TERRAIN_QUALITY = 'terrainQualityElement', + ELEMENT_MSAA = 'msaaElement', + ELEMENT_VOLUME_MESH_TESSELLATION = 'volumeMeshTessellationElement', + ELEMENT_REAL_BEACON_LIGHTS = 'realBeaconLightsElement', + MAIN_CONTAINER = 'settingsContainer', + ELEMENT_TERRAIN_LOD_DISTANCE = 'terrainLODDistanceElement', + ELEMENT_MAX_MIRRORS = 'maxMirrorsElement', + ELEMENT_TEXTURE_FILTERING = 'textureFilteringElement', + ELEMENT_PERFORMANCE_CLASS = 'performanceClassElement', + ELEMENT_SHADOW_MAP_FILTERING = 'shadowMapFilteringElement', + ELEMENT_LOD_DISTANCE = 'lodDistanceElement', + ELEMENT_LIGHTS_PROFILE = 'lightsProfileElement', + ELEMENT_SHADOW_QUALITY = 'shadowQualityElement', + ELEMENT_OBJECT_DRAW_DISTANCE = 'objectDrawDistanceElement', + ELEMENT_SHADER_QUALITY = 'shaderQualityElement', + ELEMENT_TEXTURE_RESOLUTION = 'textureResolutionElement', ELEMENT_FOLIAGE_DRAW_DISTANCE = 'foliageDrawDistanceElement' } SettingsAdvancedFrame.L10N_SYMBOL = { diff --git a/gui/SettingsConsoleFrame.lua b/gui/SettingsConsoleFrame.lua index 0b66c61..7f309bd 100644 --- a/gui/SettingsConsoleFrame.lua +++ b/gui/SettingsConsoleFrame.lua @@ -1,23 +1,23 @@ SettingsConsoleFrame = {} SettingsConsoleFrame.L10N_SYMBOL = { - SAVING_FINISHED = 'ui_savingFinished' - BUTTON_APPLY = 'button_apply' + SAVING_FINISHED = 'ui_savingFinished', + BUTTON_APPLY = 'button_apply', DOWNSAMPLED = 'setting_resolutionDownsampled' } SettingsConsoleFrame.CONTROLS = { - MAIN_CONTAINER = 'settingsContainer' - VOLUME_ENVIRONMENT = 'volumeEnvironmentElement' - VOLUME_GUI = 'volumeGUIElement' - ELEMENT_UI_SCALE = 'uiScaleElement' - ELEMENT_INVERT_Y = 'invertYLookElement' - ELEMENT_FOVY = 'fovyElement' - ELEMENT_RENDER_QUALITY = 'renderQualityElement' - VOLUME_RADIO = 'volumeRadioElement' - MAIN_BOX = 'boxLayout' - ELEMENT_DISPLAY_RESOLUTION = 'resolutionElement' - VOLUME_MASTER = 'masterVolumeElement' - VOLUME_MUSIC = 'musicVolumeElement' + MAIN_CONTAINER = 'settingsContainer', + VOLUME_ENVIRONMENT = 'volumeEnvironmentElement', + VOLUME_GUI = 'volumeGUIElement', + ELEMENT_UI_SCALE = 'uiScaleElement', + ELEMENT_INVERT_Y = 'invertYLookElement', + ELEMENT_FOVY = 'fovyElement', + ELEMENT_RENDER_QUALITY = 'renderQualityElement', + VOLUME_RADIO = 'volumeRadioElement', + MAIN_BOX = 'boxLayout', + ELEMENT_DISPLAY_RESOLUTION = 'resolutionElement', + VOLUME_MASTER = 'masterVolumeElement', + VOLUME_MUSIC = 'musicVolumeElement', VOLUME_VEHICLE = 'volumeVehicleElement' } diff --git a/gui/SettingsControlsFrame.lua b/gui/SettingsControlsFrame.lua index c9a88f8..596a422 100644 --- a/gui/SettingsControlsFrame.lua +++ b/gui/SettingsControlsFrame.lua @@ -1,60 +1,60 @@ SettingsControlsFrame = {} SettingsControlsFrame.KB_MOUSE_BOUND_CONTROLS = { - KEY_1 = 'key1' - ACTION = 'action' - KEY_2 = 'key2' + KEY_1 = 'key1', + ACTION = 'action', + KEY_2 = 'key2', MOUSE_BUTTON = 'mouseButton' } SettingsControlsFrame.GAMEPAD_BOUND_CONTROLS = { - ACTION = 'gamepadAction' - BUTTON_2 = 'gamepadButton2' + ACTION = 'gamepadAction', + BUTTON_2 = 'gamepadButton2', BUTTON_1 = 'gamepadButton1' } SettingsControlsFrame.L10N_TEMPLATE_SYMBOL = { 13 = 'ui_actionRemapped' } SettingsControlsFrame.CONTROLS_UI_STRINGS = { - 2 = 'ui_cannotMapMouseHere' - 5 = 'ui_pressMouseButtonToMap' - 12 = 'ui_axisAlreadyMapped' - 11 = 'ui_buttonAlreadyMapped' - 4 = 'ui_pressKeyToMap' - 10 = 'ui_buttonAlreadyMapped' - 9 = 'ui_keyAlreadyMapped' - 8 = 'ui_selectActionToRemap' - 3 = 'ui_cannotMapGamepadHere' - 7 = 'ui_pressESCToCancel' - 1 = 'ui_cannotMapKeyHere' + 2 = 'ui_cannotMapMouseHere', + 5 = 'ui_pressMouseButtonToMap', + 12 = 'ui_axisAlreadyMapped', + 11 = 'ui_buttonAlreadyMapped', + 4 = 'ui_pressKeyToMap', + 10 = 'ui_buttonAlreadyMapped', + 9 = 'ui_keyAlreadyMapped', + 8 = 'ui_selectActionToRemap', + 3 = 'ui_cannotMapGamepadHere', + 7 = 'ui_pressESCToCancel', + 1 = 'ui_cannotMapKeyHere', 6 = 'ui_pressGamepadButtonToMap' } SettingsControlsFrame.CONTROLS = { - KEYBOARD_HEADER_ICON = 'keyboardHeaderIcon' - GAMEPAD_PAGE = 'gamepadPage' - KEYBOARD_HIDDEN_BUTTON = 'keyboardHiddenButton' - GAMEPAD_HIDDEN_BUTTON = 'gamepadHiddenButton' - CONTROLS_MESSAGE_WARNING_ICON = 'controlsMessageWarningIcon' - CONTROLS_MESSAGE = 'controlsMessage' - GAMEPAD_HEADER_ICON = 'gamepadHeaderIcon' - KEYBOARD_HEADER_TEXT = 'keyboardHeaderText' - PAGING = 'pagingElement' - KB_MOUSE_PAGE = 'keyboardMousePage' - KB_MOUSE_TABLE = 'keyboardMouseTable' - GAMEPAD_HEADER_TEXT = 'gamepadHeaderText' + KEYBOARD_HEADER_ICON = 'keyboardHeaderIcon', + GAMEPAD_PAGE = 'gamepadPage', + KEYBOARD_HIDDEN_BUTTON = 'keyboardHiddenButton', + GAMEPAD_HIDDEN_BUTTON = 'gamepadHiddenButton', + CONTROLS_MESSAGE_WARNING_ICON = 'controlsMessageWarningIcon', + CONTROLS_MESSAGE = 'controlsMessage', + GAMEPAD_HEADER_ICON = 'gamepadHeaderIcon', + KEYBOARD_HEADER_TEXT = 'keyboardHeaderText', + PAGING = 'pagingElement', + KB_MOUSE_PAGE = 'keyboardMousePage', + KB_MOUSE_TABLE = 'keyboardMouseTable', + GAMEPAD_HEADER_TEXT = 'gamepadHeaderText', GAMEPAD_TABLE = 'gamepadTable' } SettingsControlsFrame.L10N_SYMBOL = { - DEFAULTS_LOADED = 'ui_loadedDefaultSettings' - SAVE_CHANGES_PROMPT = 'ui_saveChanges' - BUTTON_PROMPT = 'ui_pressGamepadButtonToMap' - BUTTON_RESET = 'button_reset' - MOUSE_PROMPT = 'ui_pressMouseButtonToMap' - BUTTON_GAMEPAD = 'ui_gamepad' - BUTTON_SAVE = 'button_saveControls' - KEY_PROMPT = 'ui_pressKeyToMap' - BUTTON_KEYBOARD = 'ui_keyboard' - SAVED_CHANGES_INFO = 'ui_savingFinished' - BUTTON_DEFAULTS = 'button_defaults' + DEFAULTS_LOADED = 'ui_loadedDefaultSettings', + SAVE_CHANGES_PROMPT = 'ui_saveChanges', + BUTTON_PROMPT = 'ui_pressGamepadButtonToMap', + BUTTON_RESET = 'button_reset', + MOUSE_PROMPT = 'ui_pressMouseButtonToMap', + BUTTON_GAMEPAD = 'ui_gamepad', + BUTTON_SAVE = 'button_saveControls', + KEY_PROMPT = 'ui_pressKeyToMap', + BUTTON_KEYBOARD = 'ui_keyboard', + SAVED_CHANGES_INFO = 'ui_savingFinished', + BUTTON_DEFAULTS = 'button_defaults', LOAD_DEFAULTS = 'ui_loadDefaultSettings' } diff --git a/gui/SettingsDeviceFrame.lua b/gui/SettingsDeviceFrame.lua index d752aed..5b46c6c 100644 --- a/gui/SettingsDeviceFrame.lua +++ b/gui/SettingsDeviceFrame.lua @@ -1,45 +1,45 @@ SettingsDeviceFrame = {} SettingsDeviceFrame.L10N_SYMBOL = { - GAMEPAD_AXIS = 'setting_gamepadAxis' - GAMEPAD_SENSITIVITY = 'setting_gamepadSensitivity' - DEVICE_MOUSE = 'ui_mouse' - GAMEPAD_DEADZONE = 'setting_gamepadDeadzone' - DEVICE_CONFIGURATION = 'ui_deviceConfiguration' - SWITCH_DEVICE = 'ui_switchDevice' - SAVING_FINISHED = 'ui_savingFinished' + GAMEPAD_AXIS = 'setting_gamepadAxis', + GAMEPAD_SENSITIVITY = 'setting_gamepadSensitivity', + DEVICE_MOUSE = 'ui_mouse', + GAMEPAD_DEADZONE = 'setting_gamepadDeadzone', + DEVICE_CONFIGURATION = 'ui_deviceConfiguration', + SWITCH_DEVICE = 'ui_switchDevice', + SAVING_FINISHED = 'ui_savingFinished', BUTTON_APPLY = 'button_apply' } SettingsDeviceFrame.CONTROLS = { - ELEMENT_SENSITIVITY_10 = 'sensitivityElement10' - ELEMENT_SENSITIVITY_3 = 'sensitivityElement3' - ELEMENT_DEADZONE_3 = 'deadzoneElement3' - ELEMENT_SENSITIVITY_1 = 'sensitivityElement1' - ELEMENT_SENSITIVITY_6 = 'sensitivityElement6' - MAIN_CONTAINER = 'settingsContainer' - ELEMENT_DEADZONE_6 = 'deadzoneElement6' - ELEMENT_SENSITIVITY_12 = 'sensitivityElement12' - ELEMENT_DEADZONE_11 = 'deadzoneElement11' - ELEMENT_SENSITIVITY_8 = 'sensitivityElement8' - ELEMENT_DEADZONE_8 = 'deadzoneElement8' - ELEMENT_DEADZONE_12 = 'deadzoneElement12' - ELEMENT_DEADZONE_9 = 'deadzoneElement9' - ELEMENT_TITLE = 'titleElement' - ELEMENT_DEADZONE_2 = 'deadzoneElement2' - ELEMENT_SENSITIVITY_MOUSE = 'sensitivityMouseElement' - ELEMENT_SENSITIVITY_13 = 'sensitivityElement13' - ELEMENT_SENSITIVITY_4 = 'sensitivityElement4' - ELEMENT_DEADZONE_4 = 'deadzoneElement4' - ELEMENT_SENSITIVITY_9 = 'sensitivityElement9' - ELEMENT_DEADZONE_5 = 'deadzoneElement5' - ELEMENT_SENSITIVITY_2 = 'sensitivityElement2' - ELEMENT_DEADZONE_13 = 'deadzoneElement13' - ELEMENT_DEADZONE_10 = 'deadzoneElement10' - ELEMENT_DEADZONE_7 = 'deadzoneElement7' - MAIN_BOX = 'boxLayout' - ELEMENT_SENSITIVITY_11 = 'sensitivityElement11' - ELEMENT_SENSITIVITY_5 = 'sensitivityElement5' - ELEMENT_DEADZONE_1 = 'deadzoneElement1' + ELEMENT_SENSITIVITY_10 = 'sensitivityElement10', + ELEMENT_SENSITIVITY_3 = 'sensitivityElement3', + ELEMENT_DEADZONE_3 = 'deadzoneElement3', + ELEMENT_SENSITIVITY_1 = 'sensitivityElement1', + ELEMENT_SENSITIVITY_6 = 'sensitivityElement6', + MAIN_CONTAINER = 'settingsContainer', + ELEMENT_DEADZONE_6 = 'deadzoneElement6', + ELEMENT_SENSITIVITY_12 = 'sensitivityElement12', + ELEMENT_DEADZONE_11 = 'deadzoneElement11', + ELEMENT_SENSITIVITY_8 = 'sensitivityElement8', + ELEMENT_DEADZONE_8 = 'deadzoneElement8', + ELEMENT_DEADZONE_12 = 'deadzoneElement12', + ELEMENT_DEADZONE_9 = 'deadzoneElement9', + ELEMENT_TITLE = 'titleElement', + ELEMENT_DEADZONE_2 = 'deadzoneElement2', + ELEMENT_SENSITIVITY_MOUSE = 'sensitivityMouseElement', + ELEMENT_SENSITIVITY_13 = 'sensitivityElement13', + ELEMENT_SENSITIVITY_4 = 'sensitivityElement4', + ELEMENT_DEADZONE_4 = 'deadzoneElement4', + ELEMENT_SENSITIVITY_9 = 'sensitivityElement9', + ELEMENT_DEADZONE_5 = 'deadzoneElement5', + ELEMENT_SENSITIVITY_2 = 'sensitivityElement2', + ELEMENT_DEADZONE_13 = 'deadzoneElement13', + ELEMENT_DEADZONE_10 = 'deadzoneElement10', + ELEMENT_DEADZONE_7 = 'deadzoneElement7', + MAIN_BOX = 'boxLayout', + ELEMENT_SENSITIVITY_11 = 'sensitivityElement11', + ELEMENT_SENSITIVITY_5 = 'sensitivityElement5', + ELEMENT_DEADZONE_1 = 'deadzoneElement1', ELEMENT_SENSITIVITY_7 = 'sensitivityElement7' } function SettingsDeviceFrame:new() end diff --git a/gui/SettingsDisplayFrame.lua b/gui/SettingsDisplayFrame.lua index 06c169e..8960ef9 100644 --- a/gui/SettingsDisplayFrame.lua +++ b/gui/SettingsDisplayFrame.lua @@ -1,18 +1,18 @@ SettingsDisplayFrame = {} SettingsDisplayFrame.CONTROLS = { - MAIN_CONTAINER = 'settingsContainer' - RESOLUTION_SCALE = 'resolutionScaleElement' - RESOLUTION = 'resolutionElement' - V_SYNC = 'vSyncElement' - BRIGHTNESS = 'brightnessElement' - ELEMENT_PERFORMANCE_CLASS = 'performanceClassElement' - WINDOW_MODE = 'windowModeElement' - UI_SCALE = 'uiScaleElement' + MAIN_CONTAINER = 'settingsContainer', + RESOLUTION_SCALE = 'resolutionScaleElement', + RESOLUTION = 'resolutionElement', + V_SYNC = 'vSyncElement', + BRIGHTNESS = 'brightnessElement', + ELEMENT_PERFORMANCE_CLASS = 'performanceClassElement', + WINDOW_MODE = 'windowModeElement', + UI_SCALE = 'uiScaleElement', FOV_Y = 'fovYElement' } SettingsDisplayFrame.L10N_SYMBOL = { - BUTTON_ADVANCED = 'setting_advanced' + BUTTON_ADVANCED = 'setting_advanced', BUTTON_APPLY = 'button_apply' } diff --git a/gui/SettingsGeneralFrame.lua b/gui/SettingsGeneralFrame.lua index 74fcba7..e260e17 100644 --- a/gui/SettingsGeneralFrame.lua +++ b/gui/SettingsGeneralFrame.lua @@ -1,18 +1,18 @@ SettingsGeneralFrame = {} SettingsGeneralFrame.CONTROLS = { - MAIN_CONTAINER = 'settingsContainer' - VOLUME_ENVIRONMENT = 'volumeEnvironmentElement' - VOLUME_GUI = 'volumeGUIElement' - HEAD_TRACKING = 'isHeadTrackingEnabledElement' - GAMEPAD_MODE = 'isGamepadEnabledElement' - MP_LANGUAGE = 'mpLanguageElement' - INPUT_HELP_MODE = 'inputHelpModeElement' - VOLUME_RADIO = 'volumeRadioElement' - LANGUAGE = 'languageElement' - VOLUME_MUSIC = 'musicVolumeElement' - VOLUME_MASTER = 'masterVolumeElement' - INVERT_Y_LOOK = 'invertYLookElement' + MAIN_CONTAINER = 'settingsContainer', + VOLUME_ENVIRONMENT = 'volumeEnvironmentElement', + VOLUME_GUI = 'volumeGUIElement', + HEAD_TRACKING = 'isHeadTrackingEnabledElement', + GAMEPAD_MODE = 'isGamepadEnabledElement', + MP_LANGUAGE = 'mpLanguageElement', + INPUT_HELP_MODE = 'inputHelpModeElement', + VOLUME_RADIO = 'volumeRadioElement', + LANGUAGE = 'languageElement', + VOLUME_MUSIC = 'musicVolumeElement', + VOLUME_MASTER = 'masterVolumeElement', + INVERT_Y_LOOK = 'invertYLookElement', VOLUME_VEHICLE = 'volumeVehicleElement' } SettingsGeneralFrame.L10N_SYMBOL = { diff --git a/gui/SettingsScreen.lua b/gui/SettingsScreen.lua index 5c08557..3a6f476 100644 --- a/gui/SettingsScreen.lua +++ b/gui/SettingsScreen.lua @@ -1,42 +1,42 @@ SettingsScreen = {} SettingsScreen.CONTROLS = { - PAGING_SETTINGS_CONSOLE = 'pageSettingsConsole' - PAGING_SETTINGS_GENERAL = 'pageSettingsGeneral' - PAGING_SETTINGS_DEVICE = 'pageSettingsDevice' - PAGING_SETTINGS_ADVANCED = 'pageSettingsAdvanced' - PAGING_SETTINGS_DISPLAY = 'pageSettingsDisplay' + PAGING_SETTINGS_CONSOLE = 'pageSettingsConsole', + PAGING_SETTINGS_GENERAL = 'pageSettingsGeneral', + PAGING_SETTINGS_DEVICE = 'pageSettingsDevice', + PAGING_SETTINGS_ADVANCED = 'pageSettingsAdvanced', + PAGING_SETTINGS_DISPLAY = 'pageSettingsDisplay', PAGING_SETTINGS_CONTROLS = 'pageSettingsControls' } SettingsScreen.TAB_UV = { GENERAL_SETTINGS = { - 1 = 0.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 0.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, CONSOLE_SETTINGS = { - 1 = 0.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 0.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, CONTROLS_SETTINGS = { - 1 = 130.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 130.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, DISPLAY_SETTINGS = { - 1 = 65.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 65.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, DEVICE_SETTINGS = { - 1 = 195.000000 - 2 = 209.000000 - 3 = 65.000000 + 1 = 195.000000, + 2 = 209.000000, + 3 = 65.000000, 4 = 65.000000 } } diff --git a/gui/ShopCategoriesFrame.lua b/gui/ShopCategoriesFrame.lua index 09a8e6b..07917be 100644 --- a/gui/ShopCategoriesFrame.lua +++ b/gui/ShopCategoriesFrame.lua @@ -1,15 +1,15 @@ ShopCategoriesFrame = {} ShopCategoriesFrame.CONTROLS = { - CATEGORY_TEMPLATE = 'categoryTemplate' - CATEGORY_LIST = 'categoryList' - BUTTON_RIGHT = 'buttonRight' - BUTTON_LEFT = 'buttonLeft' - CATEGORY_HEADER_TEXT = 'categoryHeaderText' + CATEGORY_TEMPLATE = 'categoryTemplate', + CATEGORY_LIST = 'categoryList', + BUTTON_RIGHT = 'buttonRight', + BUTTON_LEFT = 'buttonLeft', + CATEGORY_HEADER_TEXT = 'categoryHeaderText', CATEGORY_HEADER_ICON = 'categoryHeaderIcon' } ShopCategoriesFrame.PROFILE = { - LIST_ITEM_NEUTRAL = 'shopCategoryItem' + LIST_ITEM_NEUTRAL = 'shopCategoryItem', LIST_ITEM_SELECTED = 'shopCategoryItemSelected' } ShopCategoriesFrame.ICON_ELEMENT_NAME = 'categoryImage' diff --git a/gui/ShopConfigScreen.lua b/gui/ShopConfigScreen.lua index 8e53b0f..ad8c8e1 100644 --- a/gui/ShopConfigScreen.lua +++ b/gui/ShopConfigScreen.lua @@ -1,8 +1,8 @@ ShopConfigScreen = {} ShopConfigScreen.INITIAL_CAMERA_ROTATION = { - 1 = 0.000000 - 2 = -140.000000 + 1 = 0.000000, + 2 = -140.000000, 3 = 0.000000 } ShopConfigScreen.CONTROLS = { diff --git a/gui/ShopController.lua b/gui/ShopController.lua index ee0f9da..9ce07fc 100644 --- a/gui/ShopController.lua +++ b/gui/ShopController.lua @@ -1,38 +1,38 @@ ShopController = {} ShopController.L10N_SYMBOL = { - RETURN_VEHICLE_IN_USE = 'shop_messageReturnVehicleInUse' - RETURN_VEHICLE_SUCCESS = 'shop_messageReturnedVehicle' - SELL_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToSellVehicleText' - WARNING_NO_SPACE = 'shop_messageNoSpace' - SELL_VEHICLE_FAILED = 'shop_messageFailedToSellVehicle' - BUY_VEHICLE_SUCCESS = 'shop_messagePurchaseReady' - BUY_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToBuyVehicleText' - RETURNING_VEHICLE = 'shop_messageReturningVehicle' - BUY_CHAINSAW_THANKS = 'shop_messageThanksForBuying' - LEASE_VEHICLE_SUCCESS = 'shop_messageLeasingReady' - NO_PERMISSION = 'shop_messageNoPermissionGeneral' - RETURN_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToReturnVehicleText' - BUY_CHAINSAW_SUCCESS = 'shop_messageBoughtChainsaw' - CANNOT_SELL_TOUR_ITEMS = 'shop_messageTourItemsCannotBeSold' - BUY_ALREADY_OWNED = 'shop_messageAlreadyOwned' - BUY_CONFIRMATION = 'shop_doYouWantToBuy' - WARNING_TOO_MANY_PALLETS = 'warning_tooManyPallets' - BUYING_VEHICLE = 'shop_messageBuyingVehicle' - BUY_VEHICLE_FAILED_TO_LOAD = 'shop_messageFailedToLoadVehicle' - RETURN_VEHICLE_FAILED = 'shop_messageFailedToReturnVehicle' - LEASING_VEHICLE = 'shop_messageLeasingVehicle' - BUY_OBJECT_SUCCESS = 'shop_messageGardenCenterPurchaseReady' - WARNING_NOT_ENOUGH_SLOTS = 'shop_messageNotEnoughSlotsToBuy' - WARNING_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuy' - SELL_VEHICLE_SUCCESS = 'shop_messageSoldVehicle' - LOAD_OBJECT_FAILED = 'shop_messageFailedToLoadObject' - SELLING_VEHICLE = 'shop_messageSellingVehicle' - SELL_VEHICLE_IN_USE = 'shop_messageSellVehicleInUse' + RETURN_VEHICLE_IN_USE = 'shop_messageReturnVehicleInUse', + RETURN_VEHICLE_SUCCESS = 'shop_messageReturnedVehicle', + SELL_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToSellVehicleText', + WARNING_NO_SPACE = 'shop_messageNoSpace', + SELL_VEHICLE_FAILED = 'shop_messageFailedToSellVehicle', + BUY_VEHICLE_SUCCESS = 'shop_messagePurchaseReady', + BUY_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToBuyVehicleText', + RETURNING_VEHICLE = 'shop_messageReturningVehicle', + BUY_CHAINSAW_THANKS = 'shop_messageThanksForBuying', + LEASE_VEHICLE_SUCCESS = 'shop_messageLeasingReady', + NO_PERMISSION = 'shop_messageNoPermissionGeneral', + RETURN_VEHICLE_NO_PERMISSION = 'shop_messageNoPermissionToReturnVehicleText', + BUY_CHAINSAW_SUCCESS = 'shop_messageBoughtChainsaw', + CANNOT_SELL_TOUR_ITEMS = 'shop_messageTourItemsCannotBeSold', + BUY_ALREADY_OWNED = 'shop_messageAlreadyOwned', + BUY_CONFIRMATION = 'shop_doYouWantToBuy', + WARNING_TOO_MANY_PALLETS = 'warning_tooManyPallets', + BUYING_VEHICLE = 'shop_messageBuyingVehicle', + BUY_VEHICLE_FAILED_TO_LOAD = 'shop_messageFailedToLoadVehicle', + RETURN_VEHICLE_FAILED = 'shop_messageFailedToReturnVehicle', + LEASING_VEHICLE = 'shop_messageLeasingVehicle', + BUY_OBJECT_SUCCESS = 'shop_messageGardenCenterPurchaseReady', + WARNING_NOT_ENOUGH_SLOTS = 'shop_messageNotEnoughSlotsToBuy', + WARNING_NOT_ENOUGH_MONEY = 'shop_messageNotEnoughMoneyToBuy', + SELL_VEHICLE_SUCCESS = 'shop_messageSoldVehicle', + LOAD_OBJECT_FAILED = 'shop_messageFailedToLoadObject', + SELLING_VEHICLE = 'shop_messageSellingVehicle', + SELL_VEHICLE_IN_USE = 'shop_messageSellVehicleInUse', WARNING_TOO_MANY_PLACEABLES = 'warning_tooManyPlaceables' } ShopController.PROFILE = { - ICON_LEASED = 'shopListAttributeIconLeased' + ICON_LEASED = 'shopListAttributeIconLeased', ICON_OWNED = 'shopListAttributeIconOwned' } ShopController.MAX_ATTRIBUTES_PER_ROW = 5.000000 diff --git a/gui/ShopItemsFrame.lua b/gui/ShopItemsFrame.lua index 63da663..7b39785 100644 --- a/gui/ShopItemsFrame.lua +++ b/gui/ShopItemsFrame.lua @@ -1,39 +1,39 @@ ShopItemsFrame = {} ShopItemsFrame.CONTROLS = { - ITEM_BASE_INFO_TITLE = 'itemInfoTitle' - BASE_CATEGORY_LABEL = 'baseCategoryLabel' - ITEM_FUNCTION_TEXT = 'shopListAttributeInfo' - ATTRIBUTE_ICONS = 'attrIcon' - SHOP_SLOTS_TEXT = 'shopSlotsText' - DETAIL_BOX = 'detailBox' - CURRENT_BALANCE_TEXT = 'currentBalanceText' - ITEMS_LIST_TEMPLATE = 'itemTemplate' - ATTRIBUTE_ROW_LAYOUTS = 'attrRow' - CURRENT_BALANCE_LABEL = 'currentBalanceLabel' - BUTTON_RIGHT = 'buttonRight' - CATEGORY_LABEL = 'categoryLabel' - ITEM_BASE_INFO_LAYOUT = 'baseInfoLayout' - NAVIGATION_HEADER = 'navHeader' - ITEMS_HEADER_ICON = 'itemsHeaderIcon' - BUTTON_LEFT = 'buttonLeft' - ITEMS_LIST = 'itemsList' - SHOP_SLOTS_ICON = 'shopSlotsIcon' - ITEM_BASE_INFO_DESCRIPTION = 'itemInfoDescription' - ATTRIBUTE_VALUES = 'attrValue' - ITEMS_HEADER_TEXT = 'itemsHeaderText' - ITEM_FUNCTION_ICON = 'shopListAttributeInfoIcon' - FILL_TYPE_ICON_TEMPLATE = 'fruitIconTemplate' + ITEM_BASE_INFO_TITLE = 'itemInfoTitle', + BASE_CATEGORY_LABEL = 'baseCategoryLabel', + ITEM_FUNCTION_TEXT = 'shopListAttributeInfo', + ATTRIBUTE_ICONS = 'attrIcon', + SHOP_SLOTS_TEXT = 'shopSlotsText', + DETAIL_BOX = 'detailBox', + CURRENT_BALANCE_TEXT = 'currentBalanceText', + ITEMS_LIST_TEMPLATE = 'itemTemplate', + ATTRIBUTE_ROW_LAYOUTS = 'attrRow', + CURRENT_BALANCE_LABEL = 'currentBalanceLabel', + BUTTON_RIGHT = 'buttonRight', + CATEGORY_LABEL = 'categoryLabel', + ITEM_BASE_INFO_LAYOUT = 'baseInfoLayout', + NAVIGATION_HEADER = 'navHeader', + ITEMS_HEADER_ICON = 'itemsHeaderIcon', + BUTTON_LEFT = 'buttonLeft', + ITEMS_LIST = 'itemsList', + SHOP_SLOTS_ICON = 'shopSlotsIcon', + ITEM_BASE_INFO_DESCRIPTION = 'itemInfoDescription', + ATTRIBUTE_VALUES = 'attrValue', + ITEMS_HEADER_TEXT = 'itemsHeaderText', + ITEM_FUNCTION_ICON = 'shopListAttributeInfoIcon', + FILL_TYPE_ICON_TEMPLATE = 'fruitIconTemplate', ATTRIBUTE_BOXES = 'attrBox' } ShopItemsFrame.PROFILE = { - BALANCE_NEGATIVE = 'shopMoneyNeg' - BALANCE_POSITIVE = 'shopMoney' - ICON_FRUIT_TYPE = 'shopListAttributeFruitIcon' - LIST_ITEM_SELECTED = 'shopItemsListItemSelected' - ICON_FILL_TYPES_PLUS = 'shopListAttributeIconPlus' - LIST_ITEM_NEUTRAL = 'shopItemsListItem' - ICON_FILL_TYPES = 'shopListAttributeIconFillTypes' + BALANCE_NEGATIVE = 'shopMoneyNeg', + BALANCE_POSITIVE = 'shopMoney', + ICON_FRUIT_TYPE = 'shopListAttributeFruitIcon', + LIST_ITEM_SELECTED = 'shopItemsListItemSelected', + ICON_FILL_TYPES_PLUS = 'shopListAttributeIconPlus', + LIST_ITEM_NEUTRAL = 'shopItemsListItem', + ICON_FILL_TYPES = 'shopListAttributeIconFillTypes', ICON_SEED_FILL_TYPES = 'shopListAttributeIconSeeds' } ShopItemsFrame.SLOTS_USAGE_CRITICAL_THRESHOLD = 0.900000 diff --git a/gui/ShopMenu.lua b/gui/ShopMenu.lua index 466b075..87c8892 100644 --- a/gui/ShopMenu.lua +++ b/gui/ShopMenu.lua @@ -1,89 +1,89 @@ ShopMenu = {} ShopMenu.L10N_SYMBOL = { - REPAIR_DIALOG = 'ui_repairDialog' - BUTTON_DETAILS = 'button_detail' - BUTTON_RETURN = 'button_return' - HEADER_GARAGE_OWNED = 'ui_garageOwned' - HEADER_ANIMALS = 'category_animals' - BUTTON_GARAGE = 'button_garage' - OWNED_ITEMS = 'shop_ownedItems' - HEADER_PLACEABLES = 'category_placeables' - HEADER_OBJECTS = 'ui_objects' - LEASED_ITEMS = 'shop_leasedItems' - BUTTON_SHOP = 'ui_shop' - BUTTON_SELL = 'button_sell' - BUTTON_REPAIR = 'button_repair' - HEADER_SALES = 'category_sales' - HEADER_GARAGE_LEASED = 'ui_garageLeased' - NOT_ENOUGH_MONEY_BUY = 'shop_messageNotEnoughMoneyToBuy' - HEADER_BRANDS = 'ui_brands' - HEADER_TOOLS = 'ui_tools' - BUTTON_BACK = 'button_back' - BUTTON_CUSTOMIZE = 'button_configurate' - BUTTON_BUY = 'button_buy' - HEADER_VEHICLES = 'ui_vehicles' + REPAIR_DIALOG = 'ui_repairDialog', + BUTTON_DETAILS = 'button_detail', + BUTTON_RETURN = 'button_return', + HEADER_GARAGE_OWNED = 'ui_garageOwned', + HEADER_ANIMALS = 'category_animals', + BUTTON_GARAGE = 'button_garage', + OWNED_ITEMS = 'shop_ownedItems', + HEADER_PLACEABLES = 'category_placeables', + HEADER_OBJECTS = 'ui_objects', + LEASED_ITEMS = 'shop_leasedItems', + BUTTON_SHOP = 'ui_shop', + BUTTON_SELL = 'button_sell', + BUTTON_REPAIR = 'button_repair', + HEADER_SALES = 'category_sales', + HEADER_GARAGE_LEASED = 'ui_garageLeased', + NOT_ENOUGH_MONEY_BUY = 'shop_messageNotEnoughMoneyToBuy', + HEADER_BRANDS = 'ui_brands', + HEADER_TOOLS = 'ui_tools', + BUTTON_BACK = 'button_back', + BUTTON_CUSTOMIZE = 'button_configurate', + BUTTON_BUY = 'button_buy', + HEADER_VEHICLES = 'ui_vehicles', MESSAGE_NO_PERMISSION = 'shop_messageNoPermissionGeneral' } ShopMenu.TAB_UV = { GARAGE = { - 1 = 128.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 128.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, TOOLS = { - 1 = 715.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 715.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, LANDSCAPING = { - 1 = 0.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 0.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, ANIMALS = { - 1 = 195.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 195.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, BRANDS = { - 1 = 780.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 780.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, OBJECTS = { - 1 = 650.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 650.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, PLACEABLES = { - 1 = 585.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 585.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 - } + }, VEHICLES = { - 1 = 130.000000 - 2 = 144.000000 - 3 = 65.000000 + 1 = 130.000000, + 2 = 144.000000, + 3 = 65.000000, 4 = 65.000000 } } ShopMenu.CONTROLS = { - PAGE_SHOP_BRANDS = 'pageShopBrands' - PAGE_SHOP_GARAGE_LEASED = 'pageShopGarageLeased' - PAGE_SHOP_OBJECTS = 'pageShopObjects' - PAGE_SHOP_PLACEABLES = 'pageShopPlaceables' - PAGE_SHOP_TOOLS = 'pageShopTools' - PAGE_SHOP_ITEM_DETAILS = 'pageShopItemDetails' - PAGE_SHOP_LANDSCAPING = 'pageShopLandscaping' - PAGE_SHOP_VEHICLES = 'pageShopVehicles' + PAGE_SHOP_BRANDS = 'pageShopBrands', + PAGE_SHOP_GARAGE_LEASED = 'pageShopGarageLeased', + PAGE_SHOP_OBJECTS = 'pageShopObjects', + PAGE_SHOP_PLACEABLES = 'pageShopPlaceables', + PAGE_SHOP_TOOLS = 'pageShopTools', + PAGE_SHOP_ITEM_DETAILS = 'pageShopItemDetails', + PAGE_SHOP_LANDSCAPING = 'pageShopLandscaping', + PAGE_SHOP_VEHICLES = 'pageShopVehicles', PAGE_SHOP_GARAGE_OWNED = 'pageShopGarageOwned' } ShopMenu.BRAND_IMAGE_HEIGHT_WIDTH_RATIO = 0.500000 diff --git a/gui/TutorialScreen.lua b/gui/TutorialScreen.lua index 42f8adc..016e8ea 100644 --- a/gui/TutorialScreen.lua +++ b/gui/TutorialScreen.lua @@ -1,15 +1,15 @@ TutorialScreen = {} TutorialScreen.CONTROLS = { - TUTORIAL_LIST = 'tutorialList' - LIST_TEMPLATE = 'listItemTemplate' - SELECTOR_RIGHT = 'selectorRight' - STATS_VALUE = 'statsValue' + TUTORIAL_LIST = 'tutorialList', + LIST_TEMPLATE = 'listItemTemplate', + SELECTOR_RIGHT = 'selectorRight', + STATS_VALUE = 'statsValue', SELECTOR_LEFT = 'selectorLeft' } TutorialScreen.LIST_TEMPLATE_ELEMENT_NAME = { - DESCRIPTION = 'description' - ICON = 'icon' + DESCRIPTION = 'description', + ICON = 'icon', TITLE = 'title' } diff --git a/gui/base/FocusManager.lua b/gui/base/FocusManager.lua index 08016c0..329c7b7 100644 --- a/gui/base/FocusManager.lua +++ b/gui/base/FocusManager.lua @@ -1,110 +1,110 @@ FocusManager = {} FocusManager.guiFocusData = { - CharacterCreationScreen = - SettingsScreen = - SiloDialog = - GeneralSettingsFrame = - settingsConsole = - ingameMenuAnimals = - ingameMenuMultiplayerFarms = - MPLoadingScreen = - MultiplayerScreen = - StartupScreen = - ShopLandscapingFrame = - ConnectionFailedDialog = - PricesFrame = - settingsAdvanced = - vehicles = - ConnectToMasterServerScreen = - PasswordDialog = - TutorialScreen = - modHubItems = - LandscapingScreen = - modHubCategories = - SelectMasterServerScreen = - FinancesFrame = - settingsGeneral = - ingameMenuMultiplayerUsers = - JoinGameScreen = - SettingsDeviceFrame = - modHubLoading = - SettingsGeneralFrame = - garageOverview = - itemDetails = - MessageDialog = - TransferMoneyDialog = - SettingsControlsFrame = - ModHubLoadingFrame = - SettingsConsoleFrame = - objects = - ShopMenu = - settingsControls = - DirectSellDialog = - AnimalDialog = - ServerSettingsDialog = - PlacementScreen = - SleepDialog = - garageLeased = - DenyAcceptDialog = - ChatDialog = - settingsDisplay = - ModHubScreen = - ingameMenuGameStats = - InfoDialog = - ShopCategoriesFrame = - VoteDialog = - UnBanDialog = - garageOwned = - ingameMenuGameSettingsGame = - landscaping = - MainScreen = - placeables = - YesNoDialog = - SettingsAdvancedFrame = - ShopItemsFrame = - tools = - ingameMenuHelpLine = - SettingsDisplayFrame = - ColorPickerDialog = - ShopConfigScreen = - ModHubCategoriesFrame = - TutorialFrame = - CreditsScreen = - brands = - ingameMenuFinances = - modHubDetails = - EditFarmDialog = - ContractsFrame = - AnimalScreen = - CareerScreen = - AchievementsScreen = - StatisticsFrame = - ModHubItemsFrame = - CreateGameScreen = - settingsDevice = - ingameMenuGameSettingsGeneral = - ServerDetailScreen = - DifficultyScreen = - ingameMenuContracts = - GameSettingsFrame = - VehiclesFrame = - ingameMenuMapOverview = - tutorial = - MapSelectionScreen = - SellItemDialog = - TextInputDialog = - HelpFrame = - ModHubDetailsFrame = - ModSelectionScreen = - InGameMenu = - MapFrame = - ingameMenuPrices = - AnimalsFrame = - MultiplayerFarmsFrame = + CharacterCreationScreen = {}, + SettingsScreen = {}, + SiloDialog = {}, + GeneralSettingsFrame = {}, + settingsConsole = {}, + ingameMenuAnimals = {}, + ingameMenuMultiplayerFarms = {}, + MPLoadingScreen = {}, + MultiplayerScreen = {}, + StartupScreen = {}, + ShopLandscapingFrame = {}, + ConnectionFailedDialog = {}, + PricesFrame = {}, + settingsAdvanced = {}, + vehicles = {}, + ConnectToMasterServerScreen = {}, + PasswordDialog = {}, + TutorialScreen = {}, + modHubItems = {}, + LandscapingScreen = {}, + modHubCategories = {}, + SelectMasterServerScreen = {}, + FinancesFrame = {}, + settingsGeneral = {}, + ingameMenuMultiplayerUsers = {}, + JoinGameScreen = {}, + SettingsDeviceFrame = {}, + modHubLoading = {}, + SettingsGeneralFrame = {}, + garageOverview = {}, + itemDetails = {}, + MessageDialog = {}, + TransferMoneyDialog = {}, + SettingsControlsFrame = {}, + ModHubLoadingFrame = {}, + SettingsConsoleFrame = {}, + objects = {}, + ShopMenu = {}, + settingsControls = {}, + DirectSellDialog = {}, + AnimalDialog = {}, + ServerSettingsDialog = {}, + PlacementScreen = {}, + SleepDialog = {}, + garageLeased = {}, + DenyAcceptDialog = {}, + ChatDialog = {}, + settingsDisplay = {}, + ModHubScreen = {}, + ingameMenuGameStats = {}, + InfoDialog = {}, + ShopCategoriesFrame = {}, + VoteDialog = {}, + UnBanDialog = {}, + garageOwned = {}, + ingameMenuGameSettingsGame = {}, + landscaping = {}, + MainScreen = {}, + placeables = {}, + YesNoDialog = {}, + SettingsAdvancedFrame = {}, + ShopItemsFrame = {}, + tools = {}, + ingameMenuHelpLine = {}, + SettingsDisplayFrame = {}, + ColorPickerDialog = {}, + ShopConfigScreen = {}, + ModHubCategoriesFrame = {}, + TutorialFrame = {}, + CreditsScreen = {}, + brands = {}, + ingameMenuFinances = {}, + modHubDetails = {}, + EditFarmDialog = {}, + ContractsFrame = {}, + AnimalScreen = {}, + CareerScreen = {}, + AchievementsScreen = {}, + StatisticsFrame = {}, + ModHubItemsFrame = {}, + CreateGameScreen = {}, + settingsDevice = {}, + ingameMenuGameSettingsGeneral = {}, + ServerDetailScreen = {}, + DifficultyScreen = {}, + ingameMenuContracts = {}, + GameSettingsFrame = {}, + VehiclesFrame = {}, + ingameMenuMapOverview = {}, + tutorial = {}, + MapSelectionScreen = {}, + SellItemDialog = {}, + TextInputDialog = {}, + HelpFrame = {}, + ModHubDetailsFrame = {}, + ModSelectionScreen = {}, + InGameMenu = {}, + MapFrame = {}, + ingameMenuPrices = {}, + AnimalsFrame = {}, + MultiplayerFarmsFrame = {} } FocusManager.currentFocusData = { - focusElement + focusElement, idToElementMapping } FocusManager.TOP = 'top' @@ -121,19 +121,19 @@ FocusManager.isFocusLocked = false FocusManager.currentGui = 'MPLoadingScreen' FocusManager.focusSystemMadeChanges = false FocusManager.DIRECTION_VECTORS = { - right - bottom - left - top + right = {}, + bottom = {}, + left = {}, + top = {} } FocusManager.soundPlayer = { - soundManager - soundSamples + soundManager = {}, + soundSamples = {} } FocusManager.OPPOSING_DIRECTIONS = { - right = 'left' - bottom = 'top' - left = 'right' + right = 'left', + bottom = 'top', + left = 'right', top = 'bottom' } FocusManager.RIGHT = 'right' diff --git a/gui/base/Gui.lua b/gui/base/Gui.lua index 47c2fde..7aec9b1 100644 --- a/gui/base/Gui.lua +++ b/gui/base/Gui.lua @@ -3,53 +3,53 @@ Gui = {} Gui.GUI_PROFILE_BASE = 'baseReference' Gui.INPUT_CONTEXT_MENU = 'MENU' Gui.NAV_AXES = { - 1 = 'MENU_AXIS_LEFT_RIGHT' + 1 = 'MENU_AXIS_LEFT_RIGHT', 2 = 'MENU_AXIS_UP_DOWN' } Gui.INPUT_CONTEXT_DIALOG = 'DIALOG' Gui.ELEMENT_PROCESSING_FUNCTIONS = { - multiTextOption = function() end - checkedOption = function() end - button = function() end - slider = function() end + multiTextOption = function() end, + checkedOption = function() end, + button = function() end, + slider = function() end, frameReference = function() end } Gui.CONFIGURATION_CLASS_MAPPING = { - list = - bitmap = - slider = - table = - animation = - listItem = - ingameMap = - flowLayout = - boxLayout = - breadcrumbs = - render = - paging = - frameReference = - button = - timer = - text = - indexState = - textInput = - tableHeader = - multiTextOption = - toggleButton = - stableList = - video = - checkedOption = + list = {}, + bitmap = {}, + slider = {}, + table = {}, + animation = {}, + listItem = {}, + ingameMap = {}, + flowLayout = {}, + boxLayout = {}, + breadcrumbs = {}, + render = {}, + paging = {}, + frameReference = {}, + button = {}, + timer = {}, + text = {}, + indexState = {}, + textInput = {}, + tableHeader = {}, + multiTextOption = {}, + toggleButton = {}, + stableList = {}, + video = {}, + checkedOption = {} } Gui.NAV_ACTIONS = { - 1 = 'MENU_ACCEPT' - 2 = 'MENU_ACTIVATE' - 3 = 'MENU_CANCEL' - 4 = 'MENU_BACK' - 5 = 'MENU' - 6 = 'TOGGLE_STORE' - 7 = 'MENU_PAGE_PREV' - 8 = 'MENU_PAGE_NEXT' - 9 = 'MENU_EXTRA_1' + 1 = 'MENU_ACCEPT', + 2 = 'MENU_ACTIVATE', + 3 = 'MENU_CANCEL', + 4 = 'MENU_BACK', + 5 = 'MENU', + 6 = 'TOGGLE_STORE', + 7 = 'MENU_PAGE_PREV', + 8 = 'MENU_PAGE_NEXT', + 9 = 'MENU_EXTRA_1', 10 = 'MENU_EXTRA_2' } diff --git a/gui/base/GuiSoundPlayer.lua b/gui/base/GuiSoundPlayer.lua index 1fca03f..2570457 100644 --- a/gui/base/GuiSoundPlayer.lua +++ b/gui/base/GuiSoundPlayer.lua @@ -3,18 +3,18 @@ GuiSoundPlayer = {} GuiSoundPlayer.SOUND_SAMPLE_DEFINITIONS_XML_ROOT = 'GuiSoundSamples' GuiSoundPlayer.SOUND_SAMPLE_DEFINITIONS_PATH = 'dataS/gui/guiSoundSamples.xml' GuiSoundPlayer.SOUND_SAMPLES = { - ERROR = 'error' - TRANSACTION = 'transaction' - CONFIG_WRENCH = 'configWrench' - CLICK = 'click' - HOVER = 'hover' - NONE = '' - CONFIG_SPRAY = 'configSpray' - ACHIEVEMENT = 'achievement' - BACK = 'back' - PAGING = 'paging' - FAIL = 'fail' - SLIDER = 'slider' + ERROR = 'error', + TRANSACTION = 'transaction', + CONFIG_WRENCH = 'configWrench', + CLICK = 'click', + HOVER = 'hover', + NONE = '', + CONFIG_SPRAY = 'configSpray', + ACHIEVEMENT = 'achievement', + BACK = 'back', + PAGING = 'paging', + FAIL = 'fail', + SLIDER = 'slider', SUCCESS = 'success' } diff --git a/gui/base/GuiTopDownCamera.lua b/gui/base/GuiTopDownCamera.lua index 8fdd479..6b7fba8 100644 --- a/gui/base/GuiTopDownCamera.lua +++ b/gui/base/GuiTopDownCamera.lua @@ -3,10 +3,10 @@ GuiTopDownCamera = {} GuiTopDownCamera.ROTATION_RANGE_X = 15.000000 GuiTopDownCamera.ROTATION_SPEED = 0.000500 GuiTopDownCamera.L10N_SYMBOL = { - ACTION_ROTATE_CAMERA = 'action_rotateCamera' - ACTION_MOVE = 'ui_movePlaceable' - ACTION_ZOOM = 'action_cameraZoom' - ACTION_RESET_CAMERA = 'setting_resetUICamera' + ACTION_ROTATE_CAMERA = 'action_rotateCamera', + ACTION_MOVE = 'ui_movePlaceable', + ACTION_ZOOM = 'action_cameraZoom', + ACTION_RESET_CAMERA = 'setting_resetUICamera', ACTION_ROTATE_OBJECT = 'action_rotate' } GuiTopDownCamera.TERRAIN_BORDER = 40.000000 diff --git a/gui/base/MapOverlayGenerator.lua b/gui/base/MapOverlayGenerator.lua index f28d566..4b8738f 100644 --- a/gui/base/MapOverlayGenerator.lua +++ b/gui/base/MapOverlayGenerator.lua @@ -1,104 +1,104 @@ MapOverlayGenerator = {} MapOverlayGenerator.GROWTH_STATE_INDEX = { + CULTIVATED = 1.000000, + GROWING = 2.000000, + HARVEST = 3.000000, + HARVESTED = 4.000000, + PLOWED = 5.000000, + TOPPING = 6.000000, WITHERED = 7.000000 - PLOWED = 5.000000 - TOPPING = 6.000000 - HARVEST = 3.000000 - GROWING = 2.000000 - CULTIVATED = 1.000000 - HARVESTED = 4.000000 } MapOverlayGenerator.OVERLAY_TYPE = { + CROPS = 1.000000, + GROWTH = 2.000000, + SOIL = 3.000000, FARMLANDS = 4.000000 - GROWTH = 2.000000 - SOIL = 3.000000 - CROPS = 1.000000 } MapOverlayGenerator.FRUIT_COLORS_GROWING = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLORS_FERTILIZED = { - false = {} + false = {}, true = {} } MapOverlayGenerator.COLOR = { - FIELD_SELECTED = {} - FIELD_BORDER = {} + FIELD_SELECTED = {}, + FIELD_BORDER = {}, FIELD_UNOWNED = {} } MapOverlayGenerator.FRUIT_COLOR_DISABLED = { - 1 = 0.200000 - 2 = 0.200000 - 3 = 0.200000 + 1 = 0.200000, + 2 = 0.200000, + 3 = 0.200000, 4 = 1.000000 } MapOverlayGenerator.SOIL_STATE_INDEX = { - NEEDS_LIME = 4.000000 - WEEDS = 1.000000 - NEEDS_PLOWING = 3.000000 + NEEDS_LIME = 4.000000, + WEEDS = 1.000000, + NEEDS_PLOWING = 3.000000, FERTILIZED = 2.000000 } MapOverlayGenerator.FRUIT_COLOR_CULTIVATED = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLORS_HARVEST = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLOR_REMOVE_TOPS = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLOR_WITHERED = { - false = {} + false = {}, true = {} } MapOverlayGenerator.OVERLAY_RESOLUTION = { - FOLIAGE_STATE = {} + FOLIAGE_STATE = {}, FARMLANDS = {} } MapOverlayGenerator.FRUIT_COLOR_CUT = { - 1 = 0.264700 - 2 = 0.103800 - 3 = 0.358000 + 1 = 0.264700, + 2 = 0.103800, + 3 = 0.358000, 4 = 1.000000 } MapOverlayGenerator.FRUIT_COLOR_SOWN = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLOR_PLOWED = { - false = {} + false = {}, true = {} } MapOverlayGenerator.L10N_SYMBOL = { - GROWTH_MAP_HARVEST = 'ui_growthMapReadyToHarvest' - SOIL_MAP_FERTILIZED = 'ui_growthMapFertilized' - GROWTH_MAP_CULTIVATED = 'ui_growthMapCultivated' - GROWTH_MAP_PLOWED = 'ui_growthMapPlowed' - GROWTH_MAP_GROWING = 'ui_growthMapGrowing' - SOIL_MAP_NEED_PLOWING = 'ui_growthMapNeedsPlowing' - GROWTH_MAP_TOPPING = 'ui_growthMapReadyToPrepareForHarvest' - SOIL_MAP_NEED_LIME = 'ui_growthMapNeedsLime' - GROWTH_MAP_WITHERED = 'ui_growthMapWithered' + GROWTH_MAP_HARVEST = 'ui_growthMapReadyToHarvest', + SOIL_MAP_FERTILIZED = 'ui_growthMapFertilized', + GROWTH_MAP_CULTIVATED = 'ui_growthMapCultivated', + GROWTH_MAP_PLOWED = 'ui_growthMapPlowed', + GROWTH_MAP_GROWING = 'ui_growthMapGrowing', + SOIL_MAP_NEED_PLOWING = 'ui_growthMapNeedsPlowing', + GROWTH_MAP_TOPPING = 'ui_growthMapReadyToPrepareForHarvest', + SOIL_MAP_NEED_LIME = 'ui_growthMapNeedsLime', + GROWTH_MAP_WITHERED = 'ui_growthMapWithered', GROWTH_MAP_HARVESTED = 'ui_growthMapCutted' } MapOverlayGenerator.FRUIT_COLOR_NEEDS_LIME = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FRUIT_COLOR_NEEDS_PLOWING = { - false = {} + false = {}, true = {} } MapOverlayGenerator.FARMLANDS_ALPHA = 0.500000 MapOverlayGenerator.FRUIT_COLORS_DISABLED = { - 1 = {} - 2 = {} - 3 = {} + 1 = {}, + 2 = {}, + 3 = {}, 4 = {} } MapOverlayGenerator.FARMLANDS_BORDER_THICKNESS = 3.000000 diff --git a/gui/base/Overlay.lua b/gui/base/Overlay.lua index 68f7050..3d329ef 100644 --- a/gui/base/Overlay.lua +++ b/gui/base/Overlay.lua @@ -1,13 +1,13 @@ Overlay = {} Overlay.DEFAULT_UVS = { - 1 = 0.000000 - 2 = 0.000000 - 3 = 0.000000 - 4 = 1.000000 - 5 = 1.000000 - 6 = 0.000000 - 7 = 1.000000 + 1 = 0.000000, + 2 = 0.000000, + 3 = 0.000000, + 4 = 1.000000, + 5 = 1.000000, + 6 = 0.000000, + 7 = 1.000000, 8 = 1.000000 } diff --git a/gui/base/SettingsModel.lua b/gui/base/SettingsModel.lua index d99b4d7..006b891 100644 --- a/gui/base/SettingsModel.lua +++ b/gui/base/SettingsModel.lua @@ -1,68 +1,68 @@ SettingsModel = {} SettingsModel.SETTING = { - USE_COLORBLIND_MODE = 'useColorblindMode' - OBJECT_DRAW_DISTANCE = 'objectDrawDistance' - CONSOLE_RENDER_QUALITY = 'consoleRenderQuality' - MP_LANGUAGE = 'mpLanguage' - SHADER_QUALITY = 'shaderQuality' - SHOW_FIELD_INFO = 'showFieldInfo' - WINDOW_MODE = 'windowMode' - SHOW_HELP_ICONS = 'showHelpIcons' - VOLUME_MASTER = 'masterVolume' - RADIO_IS_ACTIVE = 'radioIsActive' - MAX_LIGHTS = 'maxLights' - RESET_CAMERA = 'resetCamera' - VOLUME_MESH_TESSELLATION = 'volumeMeshTessellation' - PERFORMANCE_CLASS = 'performanceClass' - MAX_MIRRORS = 'maxNumMirrors' - MSAA = 'msaa' - TEXTURE_FILTERING = 'textureFiltering' - STEERING_BACK_SPEED = 'steeringBackSpeed' - VEHICLE_ARM_SENSITIVITY = 'vehicleArmSensitivity' - CAMERA_SENSITIVITY = 'cameraSensitivity' - SHADOW_QUALITY = 'shadowQuality' - UI_SCALE = 'uiScale' - IS_TRAIN_TABBABLE = 'isTrainTabbable' - USE_WORLD_CAMERA = 'useWorldCamera' - FOV_Y = 'fovY' - LIGHTS_PROFILE = 'lightsProfile' - HEAD_TRACKING_ENABLED = 'isHeadTrackingEnabled' - RESOLUTION_SCALE = 'resolutionScale' - RESOLUTION = 'resolution' - REAL_BEACON_LIGHTS = 'realBeaconLights' - MONEY_UNIT = 'moneyUnit' - USE_FAHRENHEIT = 'useFahrenheit' - USE_ACRE = 'useAcre' - INPUT_HELP_MODE = 'inputHelpMode' - USE_MILES = 'useMiles' - GAMEPAD_ENABLED = 'isGamepadEnabled' - EASY_ARM_CONTROL = 'easyArmControl' - TERRAIN_LOD_DISTANCE = 'terrainLODDistance' - TEXTURE_RESOLUTION = 'textureResolution' - SHADOW_MAP_FILTERING = 'shadowMapFiltering' - LOD_DISTANCE = 'lodDistance' - FOLIAGE_DRAW_DISTANCE = 'foliageDrawDistance' - VOLUME_ENVIRONMENT = 'environmentVolume' - VOLUME_GUI = 'volumeGUI' - LANGUAGE = 'language' - RADIO_VEHICLE_ONLY = 'radioVehicleOnly' - V_SYNC = 'vSync' - SHOW_TRIGGER_MARKER = 'showTriggerMarker' - CONSOLE_RESOLUTION = 'consoleResolution' - INVERT_Y_LOOK = 'invertYLook' - SHOW_HELP_MENU = 'showHelpMenu' - VOLUME_RADIO = 'radioVolume' - MAX_TIRE_TRACKS = 'maxTireTracks' - VOLUME_MUSIC = 'musicVolume' - TERRAIN_QUALITY = 'terrainQuality' - BRIGHTNESS = 'brightness' + USE_COLORBLIND_MODE = 'useColorblindMode', + OBJECT_DRAW_DISTANCE = 'objectDrawDistance', + CONSOLE_RENDER_QUALITY = 'consoleRenderQuality', + MP_LANGUAGE = 'mpLanguage', + SHADER_QUALITY = 'shaderQuality', + SHOW_FIELD_INFO = 'showFieldInfo', + WINDOW_MODE = 'windowMode', + SHOW_HELP_ICONS = 'showHelpIcons', + VOLUME_MASTER = 'masterVolume', + RADIO_IS_ACTIVE = 'radioIsActive', + MAX_LIGHTS = 'maxLights', + RESET_CAMERA = 'resetCamera', + VOLUME_MESH_TESSELLATION = 'volumeMeshTessellation', + PERFORMANCE_CLASS = 'performanceClass', + MAX_MIRRORS = 'maxNumMirrors', + MSAA = 'msaa', + TEXTURE_FILTERING = 'textureFiltering', + STEERING_BACK_SPEED = 'steeringBackSpeed', + VEHICLE_ARM_SENSITIVITY = 'vehicleArmSensitivity', + CAMERA_SENSITIVITY = 'cameraSensitivity', + SHADOW_QUALITY = 'shadowQuality', + UI_SCALE = 'uiScale', + IS_TRAIN_TABBABLE = 'isTrainTabbable', + USE_WORLD_CAMERA = 'useWorldCamera', + FOV_Y = 'fovY', + LIGHTS_PROFILE = 'lightsProfile', + HEAD_TRACKING_ENABLED = 'isHeadTrackingEnabled', + RESOLUTION_SCALE = 'resolutionScale', + RESOLUTION = 'resolution', + REAL_BEACON_LIGHTS = 'realBeaconLights', + MONEY_UNIT = 'moneyUnit', + USE_FAHRENHEIT = 'useFahrenheit', + USE_ACRE = 'useAcre', + INPUT_HELP_MODE = 'inputHelpMode', + USE_MILES = 'useMiles', + GAMEPAD_ENABLED = 'isGamepadEnabled', + EASY_ARM_CONTROL = 'easyArmControl', + TERRAIN_LOD_DISTANCE = 'terrainLODDistance', + TEXTURE_RESOLUTION = 'textureResolution', + SHADOW_MAP_FILTERING = 'shadowMapFiltering', + LOD_DISTANCE = 'lodDistance', + FOLIAGE_DRAW_DISTANCE = 'foliageDrawDistance', + VOLUME_ENVIRONMENT = 'environmentVolume', + VOLUME_GUI = 'volumeGUI', + LANGUAGE = 'language', + RADIO_VEHICLE_ONLY = 'radioVehicleOnly', + V_SYNC = 'vSync', + SHOW_TRIGGER_MARKER = 'showTriggerMarker', + CONSOLE_RESOLUTION = 'consoleResolution', + INVERT_Y_LOOK = 'invertYLook', + SHOW_HELP_MENU = 'showHelpMenu', + VOLUME_RADIO = 'radioVolume', + MAX_TIRE_TRACKS = 'maxTireTracks', + VOLUME_MUSIC = 'musicVolume', + TERRAIN_QUALITY = 'terrainQuality', + BRIGHTNESS = 'brightness', VOLUME_VEHICLE = 'vehicleVolume' } SettingsModel.SETTING_CLASS = { - SAVE_NONE = 0.000000 - SAVE_GAMEPLAY_SETTINGS = 2.000000 - SAVE_ENGINE_QUALITY_SETTINGS = 1.000000 + SAVE_NONE = 0.000000, + SAVE_GAMEPLAY_SETTINGS = 2.000000, + SAVE_ENGINE_QUALITY_SETTINGS = 1.000000, SAVE_ALL = 3.000000 } diff --git a/gui/base/TabbedMenu.lua b/gui/base/TabbedMenu.lua index 525d002..8c2a817 100644 --- a/gui/base/TabbedMenu.lua +++ b/gui/base/TabbedMenu.lua @@ -1,27 +1,27 @@ TabbedMenu = {} TabbedMenu.PROFILE = { - PAGE_TAB = 'uiTabbedMenuPageTab' + PAGE_TAB = 'uiTabbedMenuPageTab', PAGE_TAB_ACTIVE = 'uiTabbedMenuPageTabActive' } TabbedMenu.CONTROLS = { - PAGING_TAB_LIST = 'pagingTabList' - MENU_BUTTONS = 'menuButton' - BUTTONS_PANEL = 'buttonsPanel' - PAGING_ELEMENT = 'pagingElement' - PAGING_TAB_TEMPLATE = 'pagingTabTemplate' - PAGING_BUTTON_LEFT = 'pagingButtonLeft' - PAGING_BUTTON_RIGHT = 'pagingButtonRight' + PAGING_TAB_LIST = 'pagingTabList', + MENU_BUTTONS = 'menuButton', + BUTTONS_PANEL = 'buttonsPanel', + PAGING_ELEMENT = 'pagingElement', + PAGING_TAB_TEMPLATE = 'pagingTabTemplate', + PAGING_BUTTON_LEFT = 'pagingButtonLeft', + PAGING_BUTTON_RIGHT = 'pagingButtonRight', HEADER = 'header' } TabbedMenu.PAGE_TAB_TEMPLATE_BUTTON_NAME = 'tabButton' TabbedMenu.MONEY_UPDATE_INTERVAL = 300.000000 TabbedMenu.DEFAULT_BUTTON_ACTIONS = { - MENU_ACTIVATE = true - MENU_CANCEL = true - MENU_EXTRA_1 = true - MENU_EXTRA_2 = true - MENU_BACK = true + MENU_ACTIVATE = true, + MENU_CANCEL = true, + MENU_EXTRA_1 = true, + MENU_EXTRA_2 = true, + MENU_BACK = true, MENU_ACCEPT = true } TabbedMenu.NO_BUTTON_INFO = {} diff --git a/gui/base/TweenSequence.lua b/gui/base/TweenSequence.lua index f9e76d2..31b7ee2 100644 --- a/gui/base/TweenSequence.lua +++ b/gui/base/TweenSequence.lua @@ -1,20 +1,20 @@ TweenSequence = {} TweenSequence.NO_SEQUENCE = { - elapsedTime = 0.000000 - insertCallback = function() end - callbacksCalled = {} - getFinished = function() end - insertInterval = function() end - addInterval = function() end - isFinished = true - isLooping = false - insertTween = function() end - callbackStates = {} - addCallback = function() end - totalDuration = 0.000000 - callbackInstants = {} - addTween = function() end + elapsedTime = 0.000000, + insertCallback = function() end, + callbacksCalled = {}, + getFinished = function() end, + insertInterval = function() end, + addInterval = function() end, + isFinished = true, + isLooping = false, + insertTween = function() end, + callbackStates = {}, + addCallback = function() end, + totalDuration = 0.000000, + callbackInstants = {}, + addTween = function() end, tweenUpdateRanges = {} } diff --git a/gui/dialogs/AnimalDialog.lua b/gui/dialogs/AnimalDialog.lua index a1ec82f..f13f4cd 100644 --- a/gui/dialogs/AnimalDialog.lua +++ b/gui/dialogs/AnimalDialog.lua @@ -1,7 +1,7 @@ AnimalDialog = {} AnimalDialog.CONTROLS = { - HUSBANDRIES_ELEMENT = 'husbandriesElement' + HUSBANDRIES_ELEMENT = 'husbandriesElement', HUSBANDRY_TEXT = 'husbandryText' } diff --git a/gui/dialogs/ColorPickerDialog.lua b/gui/dialogs/ColorPickerDialog.lua index 1bd3a74..f8c9247 100644 --- a/gui/dialogs/ColorPickerDialog.lua +++ b/gui/dialogs/ColorPickerDialog.lua @@ -1,8 +1,8 @@ ColorPickerDialog = {} ColorPickerDialog.CONTROLS = { - COLOR_NAME = 'colorName' - BUTTON_TEMPLATE = 'buttonTemplate' + COLOR_NAME = 'colorName', + BUTTON_TEMPLATE = 'buttonTemplate', BUTTON_LAYOUT = 'colorButtonLayout' } ColorPickerDialog.MAX_COLUMNS = 8.000000 diff --git a/gui/dialogs/DirectSellDialog.lua b/gui/dialogs/DirectSellDialog.lua index 2411e08..6495baf 100644 --- a/gui/dialogs/DirectSellDialog.lua +++ b/gui/dialogs/DirectSellDialog.lua @@ -1,20 +1,20 @@ DirectSellDialog = {} DirectSellDialog.CONTROLS = { - NAME_SEPARATOR_ELEMENT = 'dialogSeparator' - CONDITION_BAR = 'conditionBar' - TEXT_ELEMENT = 'dialogText' - SELL_BUTTON = 'sellButton' - IMAGE_ELEMENT = 'dialogImage' - INFO_ELEMENT = 'dialogInfo' - NAME_ELEMENT = 'dialogName' - CONDITION_BAR_BG = 'conditionBarBg' - CONFIG_BUTTON = 'configButton' - HEADER_TEXT = 'headerText' - REPAIR_BUTTON = 'repairButton' - VEHICLE_INFO_BOX = 'vehicleInfoBox' - PRICE_ELEMENT = 'priceText' - OPERATING_HOURS_TEXT = 'operatingHoursText' + NAME_SEPARATOR_ELEMENT = 'dialogSeparator', + CONDITION_BAR = 'conditionBar', + TEXT_ELEMENT = 'dialogText', + SELL_BUTTON = 'sellButton', + IMAGE_ELEMENT = 'dialogImage', + INFO_ELEMENT = 'dialogInfo', + NAME_ELEMENT = 'dialogName', + CONDITION_BAR_BG = 'conditionBarBg', + CONFIG_BUTTON = 'configButton', + HEADER_TEXT = 'headerText', + REPAIR_BUTTON = 'repairButton', + VEHICLE_INFO_BOX = 'vehicleInfoBox', + PRICE_ELEMENT = 'priceText', + OPERATING_HOURS_TEXT = 'operatingHoursText', AGE_TEXT = 'ageText' } diff --git a/gui/dialogs/EditFarmDialog.lua b/gui/dialogs/EditFarmDialog.lua index 5184c3b..c6a707f 100644 --- a/gui/dialogs/EditFarmDialog.lua +++ b/gui/dialogs/EditFarmDialog.lua @@ -1,19 +1,19 @@ EditFarmDialog = {} EditFarmDialog.L10N_SYMBOL = { - DEFAULT_FARM_NAME = 'ui_defaultFarmName' - TITLE_EDIT_FARM_TEMPLATE = 'ui_editFarm' - BUTTON_CREATE = 'button_mp_createFarm' - TITLE_CREATE_FARM = 'ui_createNewFarm' + DEFAULT_FARM_NAME = 'ui_defaultFarmName', + TITLE_EDIT_FARM_TEMPLATE = 'ui_editFarm', + BUTTON_CREATE = 'button_mp_createFarm', + TITLE_CREATE_FARM = 'ui_createNewFarm', BUTTON_CONFIRM = 'button_confirm' } EditFarmDialog.CONTROLS = { - COLOR_BUTTON_LAYOUT = 'colorButtonLayout' - FARM_PASSWORD_INPUT = 'farmPasswordInput' - TITLE_TEXT = 'titleText' - COLOR_PREVIEW = 'farmColorPreview' - DIALOG_BUTTON_LAYOUT = 'dialogButtonLayout' - FARM_NAME_INPUT = 'farmNameInput' + COLOR_BUTTON_LAYOUT = 'colorButtonLayout', + FARM_PASSWORD_INPUT = 'farmPasswordInput', + TITLE_TEXT = 'titleText', + COLOR_PREVIEW = 'farmColorPreview', + DIALOG_BUTTON_LAYOUT = 'dialogButtonLayout', + FARM_NAME_INPUT = 'farmNameInput', BUTTON_TEMPLATE = 'buttonTemplate' } EditFarmDialog.COLOR_ELEMENT_NAME = 'colorImage' diff --git a/gui/dialogs/MessageDialog.lua b/gui/dialogs/MessageDialog.lua index 9cf0191..8f868ed 100644 --- a/gui/dialogs/MessageDialog.lua +++ b/gui/dialogs/MessageDialog.lua @@ -1,7 +1,7 @@ MessageDialog = {} MessageDialog.CONTROLS = { - DIALOG_TEXT = 'dialogTextElement' + DIALOG_TEXT = 'dialogTextElement', DIALOG_FRAME = 'dialogElement' } diff --git a/gui/dialogs/SellItemDialog.lua b/gui/dialogs/SellItemDialog.lua index 3326591..451b407 100644 --- a/gui/dialogs/SellItemDialog.lua +++ b/gui/dialogs/SellItemDialog.lua @@ -1,9 +1,9 @@ SellItemDialog = {} SellItemDialog.CONTROLS = { - ITEM_PRICE = 'dialogItemPriceElement' - ITEM_NAME = 'dialogItemNameElement' - ITEM_IMAGE = 'dialogImageElement' + ITEM_PRICE = 'dialogItemPriceElement', + ITEM_NAME = 'dialogItemNameElement', + ITEM_IMAGE = 'dialogImageElement', HEADER_TEXT = 'headerText' } diff --git a/gui/dialogs/ServerSettingsDialog.lua b/gui/dialogs/ServerSettingsDialog.lua index 9f2208f..cf94ed2 100644 --- a/gui/dialogs/ServerSettingsDialog.lua +++ b/gui/dialogs/ServerSettingsDialog.lua @@ -1,12 +1,12 @@ ServerSettingsDialog = {} ServerSettingsDialog.CONTROLS = { - SERVER_NAME = 'serverNameElement' - SAVE_BUTTON = 'saveButton' - AUTO_ACCEPT = 'autoAcceptElement' - LAYOUT = 'boxLayout' - ALLOW_ONLY_FRIENDS = 'allowOnlyFriendsElement' - CHANGE_BUTTON = 'changeButton' + SERVER_NAME = 'serverNameElement', + SAVE_BUTTON = 'saveButton', + AUTO_ACCEPT = 'autoAcceptElement', + LAYOUT = 'boxLayout', + ALLOW_ONLY_FRIENDS = 'allowOnlyFriendsElement', + CHANGE_BUTTON = 'changeButton', PASSWORD = 'passwordElement' } diff --git a/gui/dialogs/SiloDialog.lua b/gui/dialogs/SiloDialog.lua index 066fc54..e8ef964 100644 --- a/gui/dialogs/SiloDialog.lua +++ b/gui/dialogs/SiloDialog.lua @@ -1,9 +1,9 @@ SiloDialog = {} SiloDialog.CONTROLS = { - MESSAGE_BACKGROUND = 'messageBackground' - FILL_TYPES_ELEMENT = 'fillTypesElement' - SILO_TEXT = 'siloText' + MESSAGE_BACKGROUND = 'messageBackground', + FILL_TYPES_ELEMENT = 'fillTypesElement', + SILO_TEXT = 'siloText', SILO_ICON = 'siloIcon' } diff --git a/gui/dialogs/TransferMoneyDialog.lua b/gui/dialogs/TransferMoneyDialog.lua index 401cf7d..b4b7c24 100644 --- a/gui/dialogs/TransferMoneyDialog.lua +++ b/gui/dialogs/TransferMoneyDialog.lua @@ -1,7 +1,7 @@ TransferMoneyDialog = {} TransferMoneyDialog.CONTROLS = { - CONSOLE_AMOUNT = 'consoleAmountText' + CONSOLE_AMOUNT = 'consoleAmountText', HEADER_TEXT = 'headerText' } diff --git a/gui/dialogs/UnBanDialog.lua b/gui/dialogs/UnBanDialog.lua index 6aeecc5..88480fb 100644 --- a/gui/dialogs/UnBanDialog.lua +++ b/gui/dialogs/UnBanDialog.lua @@ -1,18 +1,18 @@ UnBanDialog = {} UnBanDialog.CONTROLS = { - BUTTON_UNBAN_ALL = 'unBanAllButton' - BAN_LIST = 'banList' - DIALOG_FRAME = 'dialogElement' - BAN_LIST_ITEM_TEMPLATE = 'itemTemplate' - BUTTON_LAYOUT = 'buttonLayout' - BUTTON_BACK = 'backButton' - BUTTON_UNBAN = 'unBanButton' - DIALOG_TITLE = 'dialogTitleElement' + BUTTON_UNBAN_ALL = 'unBanAllButton', + BAN_LIST = 'banList', + DIALOG_FRAME = 'dialogElement', + BAN_LIST_ITEM_TEMPLATE = 'itemTemplate', + BUTTON_LAYOUT = 'buttonLayout', + BUTTON_BACK = 'backButton', + BUTTON_UNBAN = 'unBanButton', + DIALOG_TITLE = 'dialogTitleElement', LOADING_TEXT = 'loadingText' } UnBanDialog.ELEMENT_NAME = { - BAN_DATE = 'banDate' + BAN_DATE = 'banDate', USER_NAME = 'userName' } diff --git a/gui/dialogs/YesNoDialog.lua b/gui/dialogs/YesNoDialog.lua index 4b652b3..ec8b10e 100644 --- a/gui/dialogs/YesNoDialog.lua +++ b/gui/dialogs/YesNoDialog.lua @@ -1,8 +1,8 @@ YesNoDialog = {} YesNoDialog.CONTROLS = { - NO_BUTTON = 'noButton' - DIALOG_TITLE = 'dialogTitleElement' + NO_BUTTON = 'noButton', + DIALOG_TITLE = 'dialogTitleElement', YES_BUTTON = 'yesButton' } diff --git a/gui/elements/BoxLayoutElement.lua b/gui/elements/BoxLayoutElement.lua index 8b2990f..ec42518 100644 --- a/gui/elements/BoxLayoutElement.lua +++ b/gui/elements/BoxLayoutElement.lua @@ -5,7 +5,7 @@ BoxLayoutElement.ALIGN_LEFT = 0.000000 BoxLayoutElement.ALIGN_RIGHT = 2.000000 BoxLayoutElement.FLOW_NONE = 'none' BoxLayoutElement.FLOW_INDICES = { - vertical = {} + vertical = {}, horizontal = {} } BoxLayoutElement.ALIGN_CENTER = 1.000000 @@ -13,7 +13,7 @@ BoxLayoutElement.FLOW_DIRECTION_NEGATIVE = -1.000000 BoxLayoutElement.ALIGN_BOTTOM = 2.000000 BoxLayoutElement.FLOW_DIRECTION_POSITIVE = 1.000000 BoxLayoutElement.FLOW_LATERAL_TABLE = { - vertical = 'horizontal' + vertical = 'horizontal', horizontal = 'vertical' } BoxLayoutElement.LAYOUT_TOLERANCE = 0.100000 diff --git a/gui/elements/DialogElement.lua b/gui/elements/DialogElement.lua index 4a97992..6cfb24b 100644 --- a/gui/elements/DialogElement.lua +++ b/gui/elements/DialogElement.lua @@ -1,11 +1,11 @@ DialogElement = {} DialogElement.CONTROLS = { - ICON_QUESTION_ELEMENT = 'iconQuestionElement' - ICON_LOADING_ELEMENT = 'iconLoadingElement' - CIRCLE_ELEMENT = 'dialogCircle' - ICON_INFO_ELEMENT = 'iconInfoElement' - ICON_KEY_ELEMENT = 'iconKeyElement' + ICON_QUESTION_ELEMENT = 'iconQuestionElement', + ICON_LOADING_ELEMENT = 'iconLoadingElement', + CIRCLE_ELEMENT = 'dialogCircle', + ICON_INFO_ELEMENT = 'iconInfoElement', + ICON_KEY_ELEMENT = 'iconKeyElement', ICON_WARNING_ELEMENT = 'iconWarningElement' } DialogElement.DIALOG_CIRCLE_PROFILE = 'dialogCircle' diff --git a/gui/elements/TextElement.lua b/gui/elements/TextElement.lua index e7da65a..cc3798f 100644 --- a/gui/elements/TextElement.lua +++ b/gui/elements/TextElement.lua @@ -1,8 +1,8 @@ TextElement = {} TextElement.VERTICAL_ALIGNMENT = { - MIDDLE = 'middle' - BOTTOM = 'bottom' + MIDDLE = 'middle', + BOTTOM = 'bottom', TOP = 'top' } diff --git a/gui/hud/AchievementMessage.lua b/gui/hud/AchievementMessage.lua index 87bc26b..b5d7087 100644 --- a/gui/hud/AchievementMessage.lua +++ b/gui/hud/AchievementMessage.lua @@ -1,26 +1,26 @@ AchievementMessage = {} AchievementMessage.COLOR = { - ACHIEVEMENT_TEXT = {} - MESSAGE_TEXT = {} - ICON = {} + ACHIEVEMENT_TEXT = {}, + MESSAGE_TEXT = {}, + ICON = {}, TITLE_TEXT = {} } AchievementMessage.POSITION = { - SELF = {} - ICON = {} - TITLE_TEXT = {} - ACHIEVEMENT_TEXT = {} + SELF = {}, + ICON = {}, + TITLE_TEXT = {}, + ACHIEVEMENT_TEXT = {}, MESSAGE_TEXT = {} } AchievementMessage.TEXT_SIZE = { - MESSAGE = 22.500000 - TITLE = 30.000000 + MESSAGE = 22.500000, + TITLE = 30.000000, ACHIEVEMENT = 22.500000 } AchievementMessage.SIZE = { - SELF = {} - ICON = {} + SELF = {}, + ICON = {}, MESSAGE = {} } diff --git a/gui/hud/ChatWindow.lua b/gui/hud/ChatWindow.lua index 9c1e6e6..b7f7bb2 100644 --- a/gui/hud/ChatWindow.lua +++ b/gui/hud/ChatWindow.lua @@ -10,12 +10,12 @@ ChatWindow.DISPLAY_DURATION = 10000.000000 ChatWindow.MAX_NUM_MESSAGES = 10.000000 ChatWindow.SHADOW_OFFSET_FACTOR = 0.050000 ChatWindow.COLOR = { - BACKGROUND = {} - MESSAGE_SHADOW = {} + BACKGROUND = {}, + MESSAGE_SHADOW = {}, MESSAGE = {} } ChatWindow.POSITION = { - MESSAGE = {} + MESSAGE = {}, SELF = {} } ChatWindow.SIZE = { diff --git a/gui/hud/ContextActionDisplay.lua b/gui/hud/ContextActionDisplay.lua index 7342ca3..9d20f53 100644 --- a/gui/hud/ContextActionDisplay.lua +++ b/gui/hud/ContextActionDisplay.lua @@ -1,43 +1,43 @@ ContextActionDisplay = {} ContextActionDisplay.UV = { - tip = {} - fillBowl = {} - attach = {} - noDetach = {} + tip = {}, + fillBowl = {}, + attach = {}, + noDetach = {}, fuel = {} } ContextActionDisplay.CONTEXT_ICON = { - FILL_BOWL = 'fillBowl' - TIP = 'tip' - FUEL = 'fuel' - NO_DETACH = 'noDetach' + FILL_BOWL = 'fillBowl', + TIP = 'tip', + FUEL = 'fuel', + NO_DETACH = 'noDetach', ATTACH = 'attach' } ContextActionDisplay.MIN_DISPLAY_DURATION = 100.000000 ContextActionDisplay.TEXT_SIZE = { - ACTION_TEXT = 21.000000 + ACTION_TEXT = 21.000000, TARGET_TEXT = 30.000000 } ContextActionDisplay.OFFSET = { X = 37.500000 } ContextActionDisplay.SIZE = { - CONTEXT_ICON = {} - BACKGROUND = {} + CONTEXT_ICON = {}, + BACKGROUND = {}, INPUT_ICON = {} } ContextActionDisplay.COLOR = { - CONTEXT_ICON = {} - TARGET_TEXT = {} - INPUT_ICON = {} + CONTEXT_ICON = {}, + TARGET_TEXT = {}, + INPUT_ICON = {}, ACTION_TEXT = {} } ContextActionDisplay.POSITION = { - ACTION_TEXT = {} - TARGET_TEXT = {} - INPUT_ICON = {} - CONTEXT_ICON = {} + ACTION_TEXT = {}, + TARGET_TEXT = {}, + INPUT_ICON = {}, + CONTEXT_ICON = {}, BACKGROUND = {} } diff --git a/gui/hud/FieldInfoDisplay.lua b/gui/hud/FieldInfoDisplay.lua index cd4fee7..45a4b6d 100644 --- a/gui/hud/FieldInfoDisplay.lua +++ b/gui/hud/FieldInfoDisplay.lua @@ -1,50 +1,50 @@ FieldInfoDisplay = {} FieldInfoDisplay.L10N_SYMBOL = { - GROWTH_STATE_CUT = 'ui_growthMapCutted' - GROWTH_STATE_CAN_HARVEST = 'ui_growthMapReadyToHarvest' - GROWTH_STATE_NEED_PREP = 'ui_growthMapReadyToPrepareForHarvest' - DISPLAY_LABEL = 'ui_fieldInfo' - OWNER_NOBODY = 'fieldInfo_ownerNobody' - GROWTH_STATE_WITHERED = 'ui_growthMapWithered' - OWNER_YOU = 'fieldInfo_ownerYou' - FRUIT_TYPE = 'statistic_fillType' - NEED_LIME = 'ui_growthMapNeedsLime' - OWNED_BY = 'fieldInfo_ownedBy' - GROWTH_STATE_GROWING = 'ui_growthMapGrowing' - WEED = 'fillType_weed' - FIELD_STATE = 'ui_mapOverviewGrowth' - FERTILIZATION = 'ui_growthMapFertilized' + GROWTH_STATE_CUT = 'ui_growthMapCutted', + GROWTH_STATE_CAN_HARVEST = 'ui_growthMapReadyToHarvest', + GROWTH_STATE_NEED_PREP = 'ui_growthMapReadyToPrepareForHarvest', + DISPLAY_LABEL = 'ui_fieldInfo', + OWNER_NOBODY = 'fieldInfo_ownerNobody', + GROWTH_STATE_WITHERED = 'ui_growthMapWithered', + OWNER_YOU = 'fieldInfo_ownerYou', + FRUIT_TYPE = 'statistic_fillType', + NEED_LIME = 'ui_growthMapNeedsLime', + OWNED_BY = 'fieldInfo_ownedBy', + GROWTH_STATE_GROWING = 'ui_growthMapGrowing', + WEED = 'fillType_weed', + FIELD_STATE = 'ui_mapOverviewGrowth', + FERTILIZATION = 'ui_growthMapFertilized', NEED_PLOWING = 'ui_growthMapNeedsPlowing' } FieldInfoDisplay.LIME_REQUIRED_THRESHOLD = 0.250000 FieldInfoDisplay.SIZE = { - SELF = {} - ROW_LIST = {} - SEPARATOR = {} - ROW_LIST_MARGIN = {} + SELF = {}, + ROW_LIST = {}, + SEPARATOR = {}, + ROW_LIST_MARGIN = {}, ROW = {} } FieldInfoDisplay.POSITION = { - DISPLAY_LABEL = {} - TEXT_LEFT = {} + DISPLAY_LABEL = {}, + TEXT_LEFT = {}, TEXT_RIGHT = {} } FieldInfoDisplay.MAX_ROW_COUNT = 12.000000 FieldInfoDisplay.PLOWING_REQUIRED_THRESHOLD = 0.250000 FieldInfoDisplay.INFO_TYPE = { - PLOWING_STATE = 6.000000 - CUSTOM = 13.000000 - LIME_STATE = 7.000000 - WEED = 5.000000 - FIELD_STATE = 3.000000 - FRUIT_TYPE = 2.000000 - FERTILIZATION = 4.000000 + PLOWING_STATE = 6.000000, + CUSTOM = 13.000000, + LIME_STATE = 7.000000, + WEED = 5.000000, + FIELD_STATE = 3.000000, + FRUIT_TYPE = 2.000000, + FERTILIZATION = 4.000000, OWNER = 1.000000 } FieldInfoDisplay.COLOR = { - SEPARATOR = {} - TEXT_HIGHLIGHT = {} + SEPARATOR = {}, + TEXT_HIGHLIGHT = {}, TEXT_DEFAULT = {} } diff --git a/gui/hud/FillLevelsDisplay.lua b/gui/hud/FillLevelsDisplay.lua index fe19775..eb79a83 100644 --- a/gui/hud/FillLevelsDisplay.lua +++ b/gui/hud/FillLevelsDisplay.lua @@ -1,22 +1,22 @@ FillLevelsDisplay = {} FillLevelsDisplay.POSITION = { - FILL_TYPE_ICON = {} - FILL_TYPE_FRAME = {} - BACKGROUND = {} - FILL_LEVEL_TEXT = {} + FILL_TYPE_ICON = {}, + FILL_TYPE_FRAME = {}, + BACKGROUND = {}, + FILL_LEVEL_TEXT = {}, BAR = {} } FillLevelsDisplay.SIZE = { - FILL_TYPE_ICON = {} - BACKGROUND = {} - BAR = {} + FILL_TYPE_ICON = {}, + BACKGROUND = {}, + BAR = {}, FILL_TYPE_FRAME = {} } FillLevelsDisplay.COLOR = { - FILL_TYPE_ICON = {} - BAR_BACKGROUND = {} - FILL_LEVEL_TEXT = {} + FILL_TYPE_ICON = {}, + BAR_BACKGROUND = {}, + FILL_LEVEL_TEXT = {}, BAR_FILLED = {} } diff --git a/gui/hud/GameInfoDisplay.lua b/gui/hud/GameInfoDisplay.lua index 5301d60..c1495ee 100644 --- a/gui/hud/GameInfoDisplay.lua +++ b/gui/hud/GameInfoDisplay.lua @@ -1,33 +1,33 @@ GameInfoDisplay = {} GameInfoDisplay.SIZE = { - BOX_MARGIN = {} - CLOCK_HAND_LARGE = {} - TEMPERATURE_BOX = {} - WEATHER_ICON = {} - MONEY_ICON = {} - TUTORIAL_BOX = {} - TUTORIAL_PROGRESS_BAR = {} - TIME_BOX = {} - TEMPERATURE_ICON = {} - SEPARATOR = {} - TIME_SCALE_ARROW_FAST = {} - MONEY_BOX = {} - SELF = {} - WEATHER_BOX = {} - TIME_ICON = {} - CLOCK_HAND_SMALL = {} + BOX_MARGIN = {}, + CLOCK_HAND_LARGE = {}, + TEMPERATURE_BOX = {}, + WEATHER_ICON = {}, + MONEY_ICON = {}, + TUTORIAL_BOX = {}, + TUTORIAL_PROGRESS_BAR = {}, + TIME_BOX = {}, + TEMPERATURE_ICON = {}, + SEPARATOR = {}, + TIME_SCALE_ARROW_FAST = {}, + MONEY_BOX = {}, + SELF = {}, + WEATHER_BOX = {}, + TIME_ICON = {}, + CLOCK_HAND_SMALL = {}, TIME_SCALE_ARROW = {} } GameInfoDisplay.POSITION = { - TIME_SCALE_TEXT = {} - TIME_SCALE_ARROW = {} - MONEY_TEXT = {} - SELF = {} - TEMPERATURE_LOW = {} - TUTORIAL_TEXT = {} - TIME_TEXT = {} - TEMPERATURE_HIGH = {} + TIME_SCALE_TEXT = {}, + TIME_SCALE_ARROW = {}, + MONEY_TEXT = {}, + SELF = {}, + TEMPERATURE_LOW = {}, + TUTORIAL_TEXT = {}, + TIME_TEXT = {}, + TEMPERATURE_HIGH = {}, TUTORIAL_PROGRESS_BAR = {} } GameInfoDisplay.L10N_SYMBOL = { @@ -37,46 +37,46 @@ GameInfoDisplay.ANIMATION = { TUTORIAL_PROGRESS_BAR_FLASH = 250.000000 } GameInfoDisplay.COLOR = { - CLOCK_HAND_SMALL = {} - ICON_WEATHER_NEXT = {} - ICON = {} - CLOCK_HAND_LARGE = {} - SEPARATOR = {} - TUTORIAL_PROGRESS_BAR_HIGHLIGHT = {} - TUTORIAL_PROGRESS_BAR = {} + CLOCK_HAND_SMALL = {}, + ICON_WEATHER_NEXT = {}, + ICON = {}, + CLOCK_HAND_LARGE = {}, + SEPARATOR = {}, + TUTORIAL_PROGRESS_BAR_HIGHLIGHT = {}, + TUTORIAL_PROGRESS_BAR = {}, TEXT = {} } GameInfoDisplay.TEXT_SIZE = { - TUTORIAL = 21.000000 - TIME_SCALE = 14.500000 - MONEY = 21.000000 - TEMPERATURE = 21.000000 + TUTORIAL = 21.000000, + TIME_SCALE = 14.500000, + MONEY = 21.000000, + TEMPERATURE = 21.000000, TIME = 21.000000 } GameInfoDisplay.BOX_HEIGHT = 54.000000 GameInfoDisplay.PIVOT = { - CLOCK_HAND_SMALL = {} + CLOCK_HAND_SMALL = {}, CLOCK_HAND_LARGE = {} } GameInfoDisplay.UV = { - CLOCK_HAND_LARGE = {} - WEATHER_ICON_CLEAR = {} - WEATHER_ICON_HAIL = {} - TEMPERATURE_ICON_DROPPING = {} - WEATHER_ICON_SNOW = {} - MONEY_ICON = {} - TIME_ICON = {} - TEMPERATURE_ICON_STABLE = {} - TIME_SCALE_ARROW = {} - SEPARATOR = {} - TIME_SCALE_ARROW_FAST = {} - WEATHER_ICON_RAIN = {} - CLOCK_HAND_SMALL = {} - WEATHER_ICON_WINDY = {} - WEATHER_ICON_THUNDER = {} - WEATHER_ICON_FOG = {} - WEATHER_ICON_MIXED = {} - TEMPERATURE_ICON_RISING = {} + CLOCK_HAND_LARGE = {}, + WEATHER_ICON_CLEAR = {}, + WEATHER_ICON_HAIL = {}, + TEMPERATURE_ICON_DROPPING = {}, + WEATHER_ICON_SNOW = {}, + MONEY_ICON = {}, + TIME_ICON = {}, + TEMPERATURE_ICON_STABLE = {}, + TIME_SCALE_ARROW = {}, + SEPARATOR = {}, + TIME_SCALE_ARROW_FAST = {}, + WEATHER_ICON_RAIN = {}, + CLOCK_HAND_SMALL = {}, + WEATHER_ICON_WINDY = {}, + WEATHER_ICON_THUNDER = {}, + WEATHER_ICON_FOG = {}, + WEATHER_ICON_MIXED = {}, + TEMPERATURE_ICON_RISING = {}, WEATHER_ICON_CLOUDY = {} } diff --git a/gui/hud/GamePausedDisplay.lua b/gui/hud/GamePausedDisplay.lua index 4006241..19abffc 100644 --- a/gui/hud/GamePausedDisplay.lua +++ b/gui/hud/GamePausedDisplay.lua @@ -14,7 +14,7 @@ GamePausedDisplay.SIZE = { } GamePausedDisplay.SYNC_SPLASH_PATH = 'shared/splash.png' GamePausedDisplay.COLOR = { - TEXT = {} + TEXT = {}, BACKGROUND = {} } diff --git a/gui/hud/HUD.lua b/gui/hud/HUD.lua index a0125ef..497e471 100644 --- a/gui/hud/HUD.lua +++ b/gui/hud/HUD.lua @@ -1,38 +1,38 @@ HUD = {} HUD.GAME_INFO_PART = { - TIME = 2.000000 - NONE = 0.000000 - TUTORIAL = 16.000000 - MONEY = 1.000000 - TEMPERATURE = 4.000000 + TIME = 2.000000, + NONE = 0.000000, + TUTORIAL = 16.000000, + MONEY = 1.000000, + TEMPERATURE = 4.000000, WEATHER = 8.000000 } HUD.CONTEXT_PRIORITY = { - LOW = 1.000000 - MEDIUM = 2.000000 + LOW = 1.000000, + MEDIUM = 2.000000, HIGH = 3.000000 } HUD.COLOR = { - TUTORIAL_STATUS_VALUE = {} - FIELD_JOB_ICON = {} - BLINKING_WARNING = {} - BLINKING_WARNING_1 = {} - VEHICLE_NAME_SHADOW = {} - VEHICLE_NAME = {} - FRAME_BACKGROUND = {} - TUTORIAL_STATUS_BACKGROUND = {} - FIELD_JOB_TIME_BACKGROUND = {} - BLINKING_WARNING_2 = {} + TUTORIAL_STATUS_VALUE = {}, + FIELD_JOB_ICON = {}, + BLINKING_WARNING = {}, + BLINKING_WARNING_1 = {}, + VEHICLE_NAME_SHADOW = {}, + VEHICLE_NAME = {}, + FRAME_BACKGROUND = {}, + TUTORIAL_STATUS_BACKGROUND = {}, + FIELD_JOB_TIME_BACKGROUND = {}, + BLINKING_WARNING_2 = {}, RADIO_STREAM = {} } HUD.TEXT_SIZE = { - VEHICLE_NAME = 36.000000 + VEHICLE_NAME = 36.000000, BLINKING_WARNING = 24.000000 } HUD.ANIMATION = { - BLINKING_WARNING_TIME = 500.000000 - VEHICLE_NAME_FADE = 1000.000000 + BLINKING_WARNING_TIME = 500.000000, + VEHICLE_NAME_FADE = 1000.000000, VEHICLE_NAME_SHOW = 3000.000000 } HUD.UV = { diff --git a/gui/hud/HUDElement.lua b/gui/hud/HUDElement.lua index e215b0d..1922566 100644 --- a/gui/hud/HUDElement.lua +++ b/gui/hud/HUDElement.lua @@ -4,7 +4,7 @@ HUDElement.UV = { FILL = {} } HUDElement.TEXT_SIZE = { - DEFAULT_TEXT = '16' + DEFAULT_TEXT = '16', DEFAULT_TITLE = '20' } diff --git a/gui/hud/HUDFrameElement.lua b/gui/hud/HUDFrameElement.lua index d0b655c..2da1b7e 100644 --- a/gui/hud/HUDFrameElement.lua +++ b/gui/hud/HUDFrameElement.lua @@ -1,11 +1,11 @@ HUDFrameElement = {} HUDFrameElement.THICKNESS = { - BAR = 4.000000 + BAR = 4.000000, FRAME = 1.000000 } HUDFrameElement.COLOR = { - BAR = {} + BAR = {}, FRAME = {} } diff --git a/gui/hud/HUDPopupMessage.lua b/gui/hud/HUDPopupMessage.lua index 18c121a..2aad584 100644 --- a/gui/hud/HUDPopupMessage.lua +++ b/gui/hud/HUDPopupMessage.lua @@ -9,37 +9,37 @@ HUDPopupMessage.L10N_SYMBOL = { HUDPopupMessage.MIN_DURATION = 1000.000000 HUDPopupMessage.MAX_DURATION = 300000.000000 HUDPopupMessage.TEXT_SIZE = { - SKIP_TEXT = 18.000000 - TITLE = 20.000000 + SKIP_TEXT = 18.000000, + TITLE = 20.000000, TEXT = 16.000000 } HUDPopupMessage.UV = { BACKGROUND = {} } HUDPopupMessage.SIZE = { - SELF = {} - BORDER_PADDING = {} - SKIP_BUTTON = {} - INPUT_ROW = {} - SEPARATOR = {} + SELF = {}, + BORDER_PADDING = {}, + SKIP_BUTTON = {}, + INPUT_ROW = {}, + SEPARATOR = {}, INPUT_GLYPH = {} } HUDPopupMessage.POSITION = { - SELF = {} - SEPARATOR = {} - SKIP_BUTTON = {} - MESSAGE_TEXT = {} - INPUT_GLYPH = {} - INPUT_TEXT = {} + SELF = {}, + SEPARATOR = {}, + SKIP_BUTTON = {}, + MESSAGE_TEXT = {}, + INPUT_GLYPH = {}, + INPUT_TEXT = {}, INPUT_ROWS = {} } HUDPopupMessage.COLOR = { - SEPARATOR = {} - SKIP_TEXT = {} - INPUT_GLYPH = {} - INPUT_ROW = {} - BACKGROUND = {} - TITLE = {} + SEPARATOR = {}, + SKIP_TEXT = {}, + INPUT_GLYPH = {}, + INPUT_ROW = {}, + BACKGROUND = {}, + TITLE = {}, TEXT = {} } HUDPopupMessage.INPUT_CONTEXT_NAME = 'POPUP_MESSAGE' diff --git a/gui/hud/IngameMap.lua b/gui/hud/IngameMap.lua index 5564d92..783d18e 100644 --- a/gui/hud/IngameMap.lua +++ b/gui/hud/IngameMap.lua @@ -1,32 +1,32 @@ IngameMap = {} IngameMap.POSITION = { - MAP = {} - INPUT_ICON = {} - INFO_TEXT = {} - PLAYER_NAME = {} + MAP = {}, + INPUT_ICON = {}, + INFO_TEXT = {}, + PLAYER_NAME = {}, MAP_LABEL = {} } IngameMap.COLOR = { - LATENCY_BAD = {} - PLAYER_ARROW = {} - INPUT_ICON = {} - OTHER_ARROW = {} - LATENCY_MEDIUM = {} - LATENCY_GOOD = {} - MAP_LABEL = {} + LATENCY_BAD = {}, + PLAYER_ARROW = {}, + INPUT_ICON = {}, + OTHER_ARROW = {}, + LATENCY_MEDIUM = {}, + LATENCY_GOOD = {}, + MAP_LABEL = {}, COORDINATES_TEXT = {} } IngameMap.SIZE = { - MAP = {} - SELF = {} - INPUT_ICON = {} - OTHER_ARROW = {} - HOTSPOT = {} + MAP = {}, + SELF = {}, + INPUT_ICON = {}, + OTHER_ARROW = {}, + HOTSPOT = {}, PLAYER_ARROW = {} } IngameMap.TEXT_SIZE = { - GLYPH_TEXT = 16.000000 + GLYPH_TEXT = 16.000000, PLAYER_NAME = 12.000000 } IngameMap.MIN_MAP_HEIGHT = 231.000000 diff --git a/gui/hud/InputHelpDisplay.lua b/gui/hud/InputHelpDisplay.lua index df459c7..0e409eb 100644 --- a/gui/hud/InputHelpDisplay.lua +++ b/gui/hud/InputHelpDisplay.lua @@ -6,35 +6,35 @@ InputHelpDisplay.L10N_CONTROLS_LABEL = 'ui_controls' InputHelpDisplay.ENTRY_COUNT_CONSOLE = 8.000000 InputHelpDisplay.WIDTH = 465.000000 InputHelpDisplay.SIZE = { - HELP_ENTRY = {} - VERTICAL_SEPARATOR = {} - HEADER = {} - GAMEPAD_COMBO_BOX = {} - HORIZONTAL_SEPARATOR = {} - AXIS_ICON = {} - MOUSE_COMBO_BOX = {} - COMBO_GLYPH = {} + HELP_ENTRY = {}, + VERTICAL_SEPARATOR = {}, + HEADER = {}, + GAMEPAD_COMBO_BOX = {}, + HORIZONTAL_SEPARATOR = {}, + AXIS_ICON = {}, + MOUSE_COMBO_BOX = {}, + COMBO_GLYPH = {}, INPUT_GLYPH = {} } InputHelpDisplay.MIN_MAP_SPACING = 33.000000 InputHelpDisplay.HEADER_HEIGHT = 72.000000 InputHelpDisplay.POSITION = { - EXTRA_TEXT = {} - VEHICE_SCHEMA = {} - FRAME = {} - MOUSE_COMBO_SEPARATOR = {} - INPUT_GLYPH = {} - HELP_TEXT = {} - GAMEPAD_COMBO_SEPARATOR = {} - AXIS_ICON = {} + EXTRA_TEXT = {}, + VEHICE_SCHEMA = {}, + FRAME = {}, + MOUSE_COMBO_SEPARATOR = {}, + INPUT_GLYPH = {}, + HELP_TEXT = {}, + GAMEPAD_COMBO_SEPARATOR = {}, + AXIS_ICON = {}, CONTROLS_LABEL = {} } InputHelpDisplay.COLOR = { - HELP_TEXT = {} - INPUT_GLYPH = {} - SEPARATOR = {} - COMBO_GLYPH = {} - COMBO_GLYPH_PRESSED = {} + HELP_TEXT = {}, + INPUT_GLYPH = {}, + SEPARATOR = {}, + COMBO_GLYPH = {}, + COMBO_GLYPH_PRESSED = {}, CONTROLS_LABEL = {} } InputHelpDisplay.ENTRY_COUNT_PRIO_PC = 16.000000 diff --git a/gui/hud/MapHotspot.lua b/gui/hud/MapHotspot.lua index f4419dc..5365434 100644 --- a/gui/hud/MapHotspot.lua +++ b/gui/hud/MapHotspot.lua @@ -1,9 +1,9 @@ MapHotspot = {} MapHotspot.SELECTED_COLOR = { - 1 = 0.212200 - 2 = 0.527100 - 3 = 0.030700 + 1 = 0.212200, + 2 = 0.527100, + 3 = 0.030700, 4 = 1.000000 } MapHotspot.CATEGORY_TRIGGER = 3.000000 @@ -17,38 +17,38 @@ MapHotspot.CATEGORY_VEHICLE_STEERABLE = 10.000000 MapHotspot.CATEGORY_DEFAULT = 0.000000 MapHotspot.CATEGORY_MISSION = 2.000000 MapHotspot.DEFAULT_BG_COLOR = { - 1 = 0.007500 - 2 = 0.007500 - 3 = 0.007500 + 1 = 0.007500, + 2 = 0.007500, + 3 = 0.007500, 4 = 1.000000 } MapHotspot.CATEGORY_VEHICLE_COMBINE = 9.000000 MapHotspot.IMAGEFILENAMES = { - 1 = 'dataS2/menu/hud/mapHotspots_1024.png' - 2 = 'dataS2/menu/hud/mapHotspots_512.png' - 3 = 'dataS2/menu/hud/mapHotspots_256.png' - 4 = 'dataS2/menu/hud/mapHotspots_128.png' + 1 = 'dataS2/menu/hud/mapHotspots_1024.png', + 2 = 'dataS2/menu/hud/mapHotspots_512.png', + 3 = 'dataS2/menu/hud/mapHotspots_256.png', + 4 = 'dataS2/menu/hud/mapHotspots_128.png', 5 = 'dataS2/menu/hud/mapHotspots_64.png' } MapHotspot.COLOR = { INACTIVE = {} } MapHotspot.UV = { - NAVIGATION_POINTER = {} - CIRCLE = {} - TRAIN_SELLING_POINT = {} - FARM_HOUSE = {} - EXCLAMATION_MARK = {} - HIGHLIGHT_MARKER = {} - CHICKEN_PEN = {} - GAS_STATION = {} - COW_BARN = {} - SHEEP_MEADOW = {} - SELLING_POINT = {} - HELPER = {} - PIG_STABLE = {} - HORSE_STABLE = {} - ANIMAL_VENDOR = {} + NAVIGATION_POINTER = {}, + CIRCLE = {}, + TRAIN_SELLING_POINT = {}, + FARM_HOUSE = {}, + EXCLAMATION_MARK = {}, + HIGHLIGHT_MARKER = {}, + CHICKEN_PEN = {}, + GAS_STATION = {}, + COW_BARN = {}, + SHEEP_MEADOW = {}, + SELLING_POINT = {}, + HELPER = {}, + PIG_STABLE = {}, + HORSE_STABLE = {}, + ANIMAL_VENDOR = {}, SHOP = {} } diff --git a/gui/hud/MixerWagonHUDExtension.lua b/gui/hud/MixerWagonHUDExtension.lua index 69579ab..f7a0835 100644 --- a/gui/hud/MixerWagonHUDExtension.lua +++ b/gui/hud/MixerWagonHUDExtension.lua @@ -4,8 +4,8 @@ MixerWagonHUDExtension.UV = { RANGE_MARKER_ARROW = {} } MixerWagonHUDExtension.COLOR = { - STATUS_BAR_BAD = {} - STATUS_BAR_BG = {} + STATUS_BAR_BAD = {}, + STATUS_BAR_BG = {}, STATUS_BAR_GOOD = {} } diff --git a/gui/hud/SideNotification.lua b/gui/hud/SideNotification.lua index 6e40165..32e38bb 100644 --- a/gui/hud/SideNotification.lua +++ b/gui/hud/SideNotification.lua @@ -8,7 +8,7 @@ SideNotification.COLOR = { DEFAULT_BACKGROUND = {} } SideNotification.SIZE = { - NOTIFICATION_MARGIN = {} + NOTIFICATION_MARGIN = {}, SELF = {} } SideNotification.POSITION = { diff --git a/gui/hud/SpeakerDisplay.lua b/gui/hud/SpeakerDisplay.lua index dcaf39a..dbb084a 100644 --- a/gui/hud/SpeakerDisplay.lua +++ b/gui/hud/SpeakerDisplay.lua @@ -4,26 +4,26 @@ SpeakerDisplay.TEXT_SIZE = { NAME = 13.000000 } SpeakerDisplay.UV = { - LINE = {} + LINE = {}, SPEAKER_ICON = {} } SpeakerDisplay.SHADOW_OFFSET_FACTOR = 0.050000 SpeakerDisplay.POSITION = { - SPEAKER_ICON = {} - SELF_HORIZONTAL = {} - NAME = {} + SPEAKER_ICON = {}, + SELF_HORIZONTAL = {}, + NAME = {}, SELF = {} } SpeakerDisplay.SIZE = { - LINE = {} - SELF = {} + LINE = {}, + SELF = {}, SPEAKER_ICON = {} } SpeakerDisplay.COLOR = { - SPEAKER_ICON = {} - BACKGROUND_HIGH_CONTRAST = {} - BACKGROUND = {} - NAME = {} + SPEAKER_ICON = {}, + BACKGROUND_HIGH_CONTRAST = {}, + BACKGROUND = {}, + NAME = {}, NAME_SHADOW = {} } diff --git a/gui/hud/SpeedMeterDisplay.lua b/gui/hud/SpeedMeterDisplay.lua index 9ebe951..f196220 100644 --- a/gui/hud/SpeedMeterDisplay.lua +++ b/gui/hud/SpeedMeterDisplay.lua @@ -2,93 +2,93 @@ SpeedMeterDisplay = {} SpeedMeterDisplay.SPEED_GAUGE_FULL_ANGLE = 248.000000 SpeedMeterDisplay.SIZE = { - DAMAGE_LEVEL_ICON = {} - GAUGE_INDICATOR_LARGE = {} - GAUGE_INDICATOR_LARGE_RADIUS = {} - GAUGE_INDICATOR_SMALL_RADIUS = {} - SEPARATOR = {} - GAUGE_INDICATOR_SMALL = {} - OPERATING_TIME = {} - SIDE_GAUGE_RADIUS = {} - SPEED_GAUGE_RADIUS = {} - SIDE_GAUGE_SEGMENT = {} - FUEL_LEVEL_ICON = {} - SIDE_GAUGE_BACKGROUND = {} - SPEED_GAUGE_SEGMENT = {} - GAUGE_BACKGROUND = {} - SHADOW_BACKGROUND = {} + DAMAGE_LEVEL_ICON = {}, + GAUGE_INDICATOR_LARGE = {}, + GAUGE_INDICATOR_LARGE_RADIUS = {}, + GAUGE_INDICATOR_SMALL_RADIUS = {}, + SEPARATOR = {}, + GAUGE_INDICATOR_SMALL = {}, + OPERATING_TIME = {}, + SIDE_GAUGE_RADIUS = {}, + SPEED_GAUGE_RADIUS = {}, + SIDE_GAUGE_SEGMENT = {}, + FUEL_LEVEL_ICON = {}, + SIDE_GAUGE_BACKGROUND = {}, + SPEED_GAUGE_SEGMENT = {}, + GAUGE_BACKGROUND = {}, + SHADOW_BACKGROUND = {}, CRUISE_CONTROL = {} } SpeedMeterDisplay.COLOR = { - SPEED_GAUGE = {} - SEPARATOR = {} - SPEED_GAUGE_INDICATOR = {} - CRUISE_CONTROL_ON = {} - CRUISE_CONTROL_OFF = {} - FUEL_GAUGE_INDICATOR = {} - DAMAGE_GAUGE = {} - FUEL_GAUGE = {} - DAMAGE_GAUGE_INDICATOR = {} - SPEED_UNIT = {} - SPEED_TEXT = {} - SHADOW_BACKGROUND = {} + SPEED_GAUGE = {}, + SEPARATOR = {}, + SPEED_GAUGE_INDICATOR = {}, + CRUISE_CONTROL_ON = {}, + CRUISE_CONTROL_OFF = {}, + FUEL_GAUGE_INDICATOR = {}, + DAMAGE_GAUGE = {}, + FUEL_GAUGE = {}, + DAMAGE_GAUGE_INDICATOR = {}, + SPEED_UNIT = {}, + SPEED_TEXT = {}, + SHADOW_BACKGROUND = {}, DAMAGE_GAUGE_LOW = {} } SpeedMeterDisplay.ANGLE = { - SPEED_GAUGE_MIN = 3.743731 - SIDE_GAUGE_SEGMENT_FULL = 0.698132 - DAMAGE_GAUGE_MAX = 1.987930 - FUEL_GAUGE_MIN = 0.446804 - DAMAGE_GAUGE_MIN = 2.689552 - SIDE_GAUGE_SEGMENT_SMALLEST = 0.043633 - SPEED_GAUGE_SEGMENT_SMALLEST = 0.021642 - FUEL_GAUGE_MAX = 1.144936 - SPEED_GAUGE_SEGMENT_FULL = 0.432842 + SPEED_GAUGE_MIN = 3.743731, + SIDE_GAUGE_SEGMENT_FULL = 0.698132, + DAMAGE_GAUGE_MAX = 1.987930, + FUEL_GAUGE_MIN = 0.446804, + DAMAGE_GAUGE_MIN = 2.689552, + SIDE_GAUGE_SEGMENT_SMALLEST = 0.043633, + SPEED_GAUGE_SEGMENT_SMALLEST = 0.021642, + FUEL_GAUGE_MAX = 1.144936, + SPEED_GAUGE_SEGMENT_FULL = 0.432842, SPEED_GAUGE_MAX = -0.584685 } SpeedMeterDisplay.TEXT_SIZE = { - SPEED_UNIT = 16.000000 - SPEED = 48.000000 - OPERATING_TIME = 18.000000 + SPEED_UNIT = 16.000000, + SPEED = 48.000000, + OPERATING_TIME = 18.000000, CRUISE_CONTROL = 24.000000 } SpeedMeterDisplay.POSITION = { - GAUGE_CENTER = {} - GAUGE_BACKGROUND_RIGHT = {} - CRUISE_CONTROL_TEXT = {} - SEPARATOR = {} - OPERATING_TIME = {} - OPERATING_TIME_TEXT = {} - DAMAGE_LEVEL_ICON = {} - SPEED_METER = {} - FUEL_LEVEL_ICON = {} - GAUGE_BACKGROUND_LEFT = {} - SPEED_UNIT = {} - SPEED_TEXT = {} - GAUGE_BACKGROUND = {} + GAUGE_CENTER = {}, + GAUGE_BACKGROUND_RIGHT = {}, + CRUISE_CONTROL_TEXT = {}, + SEPARATOR = {}, + OPERATING_TIME = {}, + OPERATING_TIME_TEXT = {}, + DAMAGE_LEVEL_ICON = {}, + SPEED_METER = {}, + FUEL_LEVEL_ICON = {}, + GAUGE_BACKGROUND_LEFT = {}, + SPEED_UNIT = {}, + SPEED_TEXT = {}, + GAUGE_BACKGROUND = {}, CRUISE_CONTROL = {} } SpeedMeterDisplay.PIVOT = { - GAUGE_INDICATOR_SMALL = {} - GAUGE_INDICATOR_LARGE = {} - SPEED_GAUGE_SEGMENT_FULL = {} + GAUGE_INDICATOR_SMALL = {}, + GAUGE_INDICATOR_LARGE = {}, + SPEED_GAUGE_SEGMENT_FULL = {}, SIDE_GAUGE_SEGMENT_FULL = {} } SpeedMeterDisplay.SPEED_GAUGE_NUM_FULL_SEGMENTS = 10.000000 SpeedMeterDisplay.UV = { - DAMAGE_LEVEL_ICON = {} - GAUGE_INDICATOR_LARGE = {} - SIDE_GAUGE_SEGMENT_FULL = {} - SEPARATOR = {} - OPERATING_TIME = {} - SPEED_GAUGE_SEGMENT_FULL = {} - SIDE_GAUGE_SEGMENT = {} - GAUGE_SEGMENT = {} - FUEL_LEVEL_ICON = {} - GAUGE_BACKGROUND = {} - GAUGE_INDICATOR_SMALL = {} - SIDE_GAUGE_BACKGROUND = {} - SHADOW_BACKGROUND = {} + DAMAGE_LEVEL_ICON = {}, + GAUGE_INDICATOR_LARGE = {}, + SIDE_GAUGE_SEGMENT_FULL = {}, + SEPARATOR = {}, + OPERATING_TIME = {}, + SPEED_GAUGE_SEGMENT_FULL = {}, + SIDE_GAUGE_SEGMENT = {}, + GAUGE_SEGMENT = {}, + FUEL_LEVEL_ICON = {}, + GAUGE_BACKGROUND = {}, + GAUGE_INDICATOR_SMALL = {}, + SIDE_GAUGE_BACKGROUND = {}, + SHADOW_BACKGROUND = {}, CRUISE_CONTROL = {} } SpeedMeterDisplay.GAUGE_TEXTURE_SCALE = 0.600000 diff --git a/gui/hud/TopNotification.lua b/gui/hud/TopNotification.lua index 7ee47ea..16395fa 100644 --- a/gui/hud/TopNotification.lua +++ b/gui/hud/TopNotification.lua @@ -1,37 +1,37 @@ TopNotification = {} TopNotification.SIZE = { - ICON = {} + ICON = {}, SELF = {} } TopNotification.TEXT_SIZE = { - MAX_TEXT_WIDTH = 700.000000 - INFO = 16.000000 - TITLE = 36.000000 + MAX_TEXT_WIDTH = 700.000000, + INFO = 16.000000, + TITLE = 36.000000, TEXT = 22.000000 } TopNotification.POSITION = { - INFO_OFFSET = {} - SELF = {} - ICON = {} - TITLE_OFFSET = {} + INFO_OFFSET = {}, + SELF = {}, + ICON = {}, + TITLE_OFFSET = {}, TEXT_OFFSET = {} } TopNotification.UV = { - ICON_RADIO_STREAM = {} + ICON_RADIO_STREAM = {}, BACKGROUND = {} } TopNotification.COLOR = { - ICON = {} - TEXT_INFO = {} - TEXT_TITLE = {} - BACKGROUND = {} + ICON = {}, + TEXT_INFO = {}, + TEXT_TITLE = {}, + BACKGROUND = {}, TEXT_DESC = {} } TopNotification.NO_NOTIFICATION = { - duration = 0.000000 - title = '' - info = '' + duration = 0.000000, + title = '', + info = '', text = '' } TopNotification.DEFAULT_DURATION = 5000.000000 diff --git a/gui/hud/VehicleSchemaDisplay.lua b/gui/hud/VehicleSchemaDisplay.lua index 90b56d7..18413c7 100644 --- a/gui/hud/VehicleSchemaDisplay.lua +++ b/gui/hud/VehicleSchemaDisplay.lua @@ -4,7 +4,7 @@ VehicleSchemaDisplay.POSITION = { SELF_DOCKED = {} } VehicleSchemaDisplay.SIZE = { - ICON = {} + ICON = {}, SELF = {} } VehicleSchemaDisplay.MAX_SCHEMA_WIDTH = 180.000000 diff --git a/input/Binding.lua b/input/Binding.lua index 5d8612f..0719b05 100644 --- a/input/Binding.lua +++ b/input/Binding.lua @@ -4,15 +4,15 @@ Binding.PRESSED_MAGNITUDE_THRESHOLD = 0.500000 Binding.MAX_ALTERNATIVES_KB_MOUSE = 3.000000 Binding.MAX_ALTERNATIVES_GAMEPAD = 2.000000 Binding.INPUT_COMPONENT = { - NEGATIVE = '-' + NEGATIVE = '-', POSITIVE = '+' } Binding.PS_JAPAN_BUTTON_SWAP_MAP = { - BUTTON_3 = 'BUTTON_2' + BUTTON_3 = 'BUTTON_2', BUTTON_2 = 'BUTTON_3' } Binding.AXIS_COMPONENT = { - NEGATIVE = '-' + NEGATIVE = '-', POSITIVE = '+' } diff --git a/input/InputAction.lua b/input/InputAction.lua index b2d6d0b..322f7aa 100644 --- a/input/InputAction.lua +++ b/input/InputAction.lua @@ -14,7 +14,7 @@ InputAction.RADIO_PREVIOUS_ITEM = 'RADIO_PREVIOUS_ITEM' InputAction.CHANGE_DRIVING_DIRECTION = 'CHANGE_DRIVING_DIRECTION' InputAction.AXIS_CUTTER_REEL2 = 'AXIS_CUTTER_REEL2' InputAction.AXIS_TYPE = { - FULL = 'FULL' + FULL = 'FULL', HALF = 'HALF' } InputAction.ROTATE_OBJECT_LEFT_RIGHT = 'ROTATE_OBJECT_LEFT_RIGHT' @@ -25,8 +25,8 @@ InputAction.IMPLEMENT_EXTRA = 'IMPLEMENT_EXTRA' InputAction.TOGGLE_WORK_LIGHT_FRONT = 'TOGGLE_WORK_LIGHT_FRONT' InputAction.TOGGLE_MOTOR_STATE = 'TOGGLE_MOTOR_STATE' InputAction.CATEGORY = { - VEHICLE = 3.000000 - ONFOOT = 2.000000 + VEHICLE = 3.000000, + ONFOOT = 2.000000, SYSTEM = 1.000000 } InputAction.AXIS_LOOK_LEFTRIGHT_VEHICLE = 'AXIS_LOOK_LEFTRIGHT_VEHICLE' @@ -104,13 +104,13 @@ InputAction.WORKMODE_MIDDLE = 'WORKMODE_MIDDLE' InputAction.DEBUG_PLAYER_UP_DOWN = 'DEBUG_PLAYER_UP_DOWN' InputAction.EXCLUSIVE_ACTION_GROUPS = { MENU = { - 1 = 'MENU_ACCEPT' - 2 = 'MENU_ACTIVATE' - 3 = 'MENU_BACK' - 4 = 'MENU_CANCEL' - 5 = 'MENU_EXTRA_1' - 6 = 'MENU_EXTRA_2' - 7 = 'MENU_AXIS_LEFT_RIGHT' + 1 = 'MENU_ACCEPT', + 2 = 'MENU_ACTIVATE', + 3 = 'MENU_BACK', + 4 = 'MENU_CANCEL', + 5 = 'MENU_EXTRA_1', + 6 = 'MENU_EXTRA_2', + 7 = 'MENU_AXIS_LEFT_RIGHT', 8 = 'MENU_AXIS_UP_DOWN' } } @@ -127,11 +127,11 @@ InputAction.AXIS_PLACEMENT_ROTATE_CAMERA = 'AXIS_PLACEMENT_ROTATE_CAMERA' InputAction.AXIS_CUTTER_REEL = 'AXIS_CUTTER_REEL' InputAction.AXIS_CRANE_ARM2 = 'AXIS_CRANE_ARM2' InputAction.LINKED_ACTIONS = { - AXIS_LOOK_UPDOWN_VEHICLE = 'AXIS_LOOK_LEFTRIGHT_VEHICLE' - AXIS_LOOK_LEFTRIGHT_VEHICLE = 'AXIS_LOOK_UPDOWN_VEHICLE' - AXIS_LOOK_LEFTRIGHT_PLAYER = 'AXIS_LOOK_UPDOWN_PLAYER' - CAMERA_ZOOM_OUT = 'CAMERA_ZOOM_IN' - AXIS_LOOK_UPDOWN_PLAYER = 'AXIS_LOOK_LEFTRIGHT_PLAYER' + AXIS_LOOK_UPDOWN_VEHICLE = 'AXIS_LOOK_LEFTRIGHT_VEHICLE', + AXIS_LOOK_LEFTRIGHT_VEHICLE = 'AXIS_LOOK_UPDOWN_VEHICLE', + AXIS_LOOK_LEFTRIGHT_PLAYER = 'AXIS_LOOK_UPDOWN_PLAYER', + CAMERA_ZOOM_OUT = 'CAMERA_ZOOM_IN', + AXIS_LOOK_UPDOWN_PLAYER = 'AXIS_LOOK_LEFTRIGHT_PLAYER', CAMERA_ZOOM_IN = 'CAMERA_ZOOM_OUT' } InputAction.PREVIOUS_HANDTOOL = 'PREVIOUS_HANDTOOL' diff --git a/input/InputBinding.lua b/input/InputBinding.lua index d0f67b8..3ffbbd1 100644 --- a/input/InputBinding.lua +++ b/input/InputBinding.lua @@ -3,7 +3,7 @@ InputBinding = {} InputBinding.MESSAGE_PARAM_INPUT_MODE = { 3 = { 1 = 3.000000 - } + }, 2 = { 1 = 2.000000 } @@ -12,60 +12,60 @@ InputBinding.MESSAGE_PARAM_INPUT_MODE = { InputBinding.ORDERED_MOUSE_COMBOS = { 1 = { - mask = 1.000000 + mask = 1.000000, controls = 'MOUSE_ALT_COMMAND_BUTTON' - } + }, 2 = { - mask = 4.000000 + mask = 4.000000, controls = 'MOUSE_ALT_COMMAND3_BUTTON' - } + }, 3 = { - mask = 8.000000 + mask = 8.000000, controls = 'MOUSE_ALT_COMMAND4_BUTTON' - } + }, 4 = { - mask = 2.000000 + mask = 2.000000, controls = 'MOUSE_ALT_COMMAND2_BUTTON' } } InputBinding.ROOT_CONTEXT_NAME = 'ROOT' InputBinding.MOUSE_MOVE_BASE_FACTOR = 75.000000 InputBinding.MOUSE_AXES = { - AXIS_Y = 1.000000 + AXIS_Y = 1.000000, AXIS_X = 0.000000 } InputBinding.GAMEPAD_BUTTONS = { - BUTTON_9 = 8.000000 - BUTTON_23 = 22.000000 - BUTTON_2 = 1.000000 - BUTTON_32 = 31.000000 - BUTTON_29 = 28.000000 - BUTTON_19 = 18.000000 - BUTTON_22 = 21.000000 - BUTTON_12 = 11.000000 - BUTTON_27 = 26.000000 - BUTTON_17 = 16.000000 - BUTTON_6 = 5.000000 - BUTTON_20 = 19.000000 - BUTTON_10 = 9.000000 - BUTTON_31 = 30.000000 - BUTTON_4 = 3.000000 - BUTTON_16 = 15.000000 - BUTTON_30 = 29.000000 - BUTTON_1 = 0.000000 - BUTTON_24 = 23.000000 - BUTTON_14 = 13.000000 - BUTTON_7 = 6.000000 - BUTTON_21 = 20.000000 - BUTTON_8 = 7.000000 - BUTTON_3 = 2.000000 - BUTTON_5 = 4.000000 - BUTTON_26 = 25.000000 - BUTTON_28 = 27.000000 - BUTTON_18 = 17.000000 - BUTTON_25 = 24.000000 - BUTTON_15 = 14.000000 - BUTTON_13 = 12.000000 + BUTTON_9 = 8.000000, + BUTTON_23 = 22.000000, + BUTTON_2 = 1.000000, + BUTTON_32 = 31.000000, + BUTTON_29 = 28.000000, + BUTTON_19 = 18.000000, + BUTTON_22 = 21.000000, + BUTTON_12 = 11.000000, + BUTTON_27 = 26.000000, + BUTTON_17 = 16.000000, + BUTTON_6 = 5.000000, + BUTTON_20 = 19.000000, + BUTTON_10 = 9.000000, + BUTTON_31 = 30.000000, + BUTTON_4 = 3.000000, + BUTTON_16 = 15.000000, + BUTTON_30 = 29.000000, + BUTTON_1 = 0.000000, + BUTTON_24 = 23.000000, + BUTTON_14 = 13.000000, + BUTTON_7 = 6.000000, + BUTTON_21 = 20.000000, + BUTTON_8 = 7.000000, + BUTTON_3 = 2.000000, + BUTTON_5 = 4.000000, + BUTTON_26 = 25.000000, + BUTTON_28 = 27.000000, + BUTTON_18 = 17.000000, + BUTTON_25 = 24.000000, + BUTTON_15 = 14.000000, + BUTTON_13 = 12.000000, BUTTON_11 = 10.000000 } @@ -75,93 +75,93 @@ InputBinding.COMBO_MASK_MOUSE_COMMAND_4 = 8.000000 InputBinding.MOUSE_WHEEL_INPUT_FACTOR = 3.000000 InputBinding.GAMEPAD_COMBOS = { CONSOLE_ALT_COMMAND2_BUTTON = { - mask = 2.000000 + mask = 2.000000, controls = 'CONSOLE_ALT_COMMAND2_BUTTON' - } + }, CONSOLE_ALT_COMMAND3_BUTTON = { - mask = 4.000000 + mask = 4.000000, controls = 'CONSOLE_ALT_COMMAND3_BUTTON' - } + }, CONSOLE_ALT_COMMAND_BUTTON = { - mask = 1.000000 + mask = 1.000000, controls = 'CONSOLE_ALT_COMMAND_BUTTON' } } InputBinding.GAMEPAD_BUTTON_NAMES = { - 0 = 'BUTTON_1' - 2 = 'BUTTON_3' - 31 = 'BUTTON_32' - 12 = 'BUTTON_13' - 11 = 'BUTTON_12' - 27 = 'BUTTON_28' - 10 = 'BUTTON_11' - 9 = 'BUTTON_10' - 23 = 'BUTTON_24' - 8 = 'BUTTON_9' - 30 = 'BUTTON_31' - 19 = 'BUTTON_20' - 7 = 'BUTTON_8' - 1 = 'BUTTON_2' - 29 = 'BUTTON_30' - 6 = 'BUTTON_7' - 21 = 'BUTTON_22' - 26 = 'BUTTON_27' - 5 = 'BUTTON_6' - 25 = 'BUTTON_26' - 28 = 'BUTTON_29' - 4 = 'BUTTON_5' - 17 = 'BUTTON_18' - 24 = 'BUTTON_25' - 22 = 'BUTTON_23' - 18 = 'BUTTON_19' - 20 = 'BUTTON_21' - 3 = 'BUTTON_4' - 14 = 'BUTTON_15' - 16 = 'BUTTON_17' - 15 = 'BUTTON_16' + 0 = 'BUTTON_1', + 2 = 'BUTTON_3', + 31 = 'BUTTON_32', + 12 = 'BUTTON_13', + 11 = 'BUTTON_12', + 27 = 'BUTTON_28', + 10 = 'BUTTON_11', + 9 = 'BUTTON_10', + 23 = 'BUTTON_24', + 8 = 'BUTTON_9', + 30 = 'BUTTON_31', + 19 = 'BUTTON_20', + 7 = 'BUTTON_8', + 1 = 'BUTTON_2', + 29 = 'BUTTON_30', + 6 = 'BUTTON_7', + 21 = 'BUTTON_22', + 26 = 'BUTTON_27', + 5 = 'BUTTON_6', + 25 = 'BUTTON_26', + 28 = 'BUTTON_29', + 4 = 'BUTTON_5', + 17 = 'BUTTON_18', + 24 = 'BUTTON_25', + 22 = 'BUTTON_23', + 18 = 'BUTTON_19', + 20 = 'BUTTON_21', + 3 = 'BUTTON_4', + 14 = 'BUTTON_15', + 16 = 'BUTTON_17', + 15 = 'BUTTON_16', 13 = 'BUTTON_14' } InputBinding.MOUSE_AXIS_Y = 2.000000 InputBinding.GAMEPAD_DPAD = { - 17 = true - 16 = true - 15 = true + 17 = true, + 16 = true, + 15 = true, 18 = true } InputBinding.NO_ACTION_EVENTS = { } InputBinding.NO_REGISTRATION_CONTEXT = { - actionEvents = {} - previousContextName = '' - name = '' + actionEvents = {}, + previousContextName = '', + name = '', eventOrderCounter = 0.000000 } InputBinding.MOUSE_COMBO_AXIS_NAMES = { - MOUSE_BUTTON_MIDDLE = true - MOUSE_BUTTON_LEFT = true + MOUSE_BUTTON_MIDDLE = true, + MOUSE_BUTTON_LEFT = true, MOUSE_BUTTON_RIGHT = true } InputBinding.KB_MOUSE_INTERNAL_ID = 255.000000 InputBinding.PATHS = { - DEFAULT_BINDINGS_JOYSTICK = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Joystick.xml' - DEFAULT_BINDINGS_PS4 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml' - DEFAULT_BINDINGS_WHEEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Wheel.xml' - DEFAULT_BINDINGS_SAITEK_WHEEL_AND_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheelAndPanel.xml' - DEFAULT_BINDINGS_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SidePanel.xml' - DEFAULT_BINDINGS_XBOX = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml' - DEFAULT_BINDINGS_ANDROID = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefaultAndroid.xml' - DEFAULT_BINDINGS_KB_MOUSE = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_KeyboardMouse.xml' - DEFAULT_BINDINGS_SAITEK_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekPanel.xml' - DEFAULT_BINDINGS_GAMEPAD = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml' - DEFAULT_BINDINGS_SAITEK_WHEEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheel.xml' - USER_BINDINGS = 'C:/Users/.../Documents/My Games/FarmingSimulator2019/inputBinding.xml' - ACTION_DEFINITIONS = 'C:/.../Farming Simulator 19/dataS/inputActions.xml' - DEFAULT_BINDINGS_WHEEL_AND_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_WheelAndPanel.xml' + DEFAULT_BINDINGS_JOYSTICK = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Joystick.xml', + DEFAULT_BINDINGS_PS4 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml', + DEFAULT_BINDINGS_WHEEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Wheel.xml', + DEFAULT_BINDINGS_SAITEK_WHEEL_AND_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheelAndPanel.xml', + DEFAULT_BINDINGS_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SidePanel.xml', + DEFAULT_BINDINGS_XBOX = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml', + DEFAULT_BINDINGS_ANDROID = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefaultAndroid.xml', + DEFAULT_BINDINGS_KB_MOUSE = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_KeyboardMouse.xml', + DEFAULT_BINDINGS_SAITEK_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekPanel.xml', + DEFAULT_BINDINGS_GAMEPAD = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml', + DEFAULT_BINDINGS_SAITEK_WHEEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheel.xml', + USER_BINDINGS = 'C:/Users/.../Documents/My Games/FarmingSimulator2019/inputBinding.xml', + ACTION_DEFINITIONS = 'C:/.../Farming Simulator 19/dataS/inputActions.xml', + DEFAULT_BINDINGS_WHEEL_AND_PANEL = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_WheelAndPanel.xml', DEFAULT_BINDINGS_IOS = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefaultIOS.xml' } InputBinding.MOUSE_AXIS_NAMES = { - 0 = 'AXIS_X' + 0 = 'AXIS_X', 1 = 'AXIS_Y' } InputBinding.COMBO_MASK_CONSOLE_COMMAND_3 = 4.000000 @@ -169,12 +169,12 @@ InputBinding.INPUTTYPE_KEYBOARD = 1.000000 InputBinding.version = 4.000000 InputBinding.INPUTTYPE_MOUSE_AXIS = 4.000000 InputBinding.MOUSE_BUTTON_NAMES = { - 2 = 'MOUSE_BUTTON_MIDDLE' - 5 = 'MOUSE_BUTTON_WHEEL_DOWN' - 3 = 'MOUSE_BUTTON_RIGHT' - 7 = 'MOUSE_BUTTON_X2' - 1 = 'MOUSE_BUTTON_LEFT' - 4 = 'MOUSE_BUTTON_WHEEL_UP' + 2 = 'MOUSE_BUTTON_MIDDLE', + 5 = 'MOUSE_BUTTON_WHEEL_DOWN', + 3 = 'MOUSE_BUTTON_RIGHT', + 7 = 'MOUSE_BUTTON_X2', + 1 = 'MOUSE_BUTTON_LEFT', + 4 = 'MOUSE_BUTTON_WHEEL_UP', 6 = 'MOUSE_BUTTON_X1' } @@ -187,35 +187,35 @@ InputBinding.COMBO_MASK_CONSOLE_COMMAND_2 = 2.000000 InputBinding.ORDERED_GAMEPAD_COMBOS = { 1 = { - mask = 1.000000 + mask = 1.000000, controls = 'CONSOLE_ALT_COMMAND_BUTTON' - } + }, 2 = { - mask = 4.000000 + mask = 4.000000, controls = 'CONSOLE_ALT_COMMAND3_BUTTON' - } + }, 3 = { - mask = 2.000000 + mask = 2.000000, controls = 'CONSOLE_ALT_COMMAND2_BUTTON' } } InputBinding.INPUT_MODE_CHANGE_THRESHOLD = 0.500000 InputBinding.GAMEPAD_AXES = { - AXIS_4 = 3.000000 - AXIS_12 = 11.000000 - AXIS_1 = 0.000000 - AXIS_11 = 10.000000 - AXIS_6 = 5.000000 - HALF_AXIS_3 = 12.000000 - AXIS_3 = 2.000000 - AXIS_13 = 12.000000 - AXIS_8 = 7.000000 - HALF_AXIS_1 = 10.000000 - AXIS_5 = 4.000000 - HALF_AXIS_2 = 11.000000 - AXIS_2 = 1.000000 - AXIS_10 = 9.000000 - AXIS_7 = 6.000000 + AXIS_4 = 3.000000, + AXIS_12 = 11.000000, + AXIS_1 = 0.000000, + AXIS_11 = 10.000000, + AXIS_6 = 5.000000, + HALF_AXIS_3 = 12.000000, + AXIS_3 = 2.000000, + AXIS_13 = 12.000000, + AXIS_8 = 7.000000, + HALF_AXIS_1 = 10.000000, + AXIS_5 = 4.000000, + HALF_AXIS_2 = 11.000000, + AXIS_2 = 1.000000, + AXIS_10 = 9.000000, + AXIS_7 = 6.000000, AXIS_9 = 8.000000 } InputBinding.MOUSE_MOTION_SCALE_X_DEFAULT = 1.000000 @@ -223,49 +223,49 @@ InputBinding.COMBO_MASK_CONSOLE_COMMAND_1 = 1.000000 InputBinding.MOUSE_MOTION_SCALE_Y_DEFAULT = 1.000000 InputBinding.DEVICE_CATEGORY_DEFAULTS_PATHS = { - 0 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml' - 2 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Wheel.xml' - 5 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekPanel.xml' - 3 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Joystick.xml' - 255 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheelAndPanel.xml' - 1 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml' - 254 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_WheelAndPanel.xml' + 0 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml', + 2 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Wheel.xml', + 5 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekPanel.xml', + 3 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Joystick.xml', + 255 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheelAndPanel.xml', + 1 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_Gamepad.xml', + 254 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_WheelAndPanel.xml', 4 = 'C:/.../Farming Simulator 19/profileTemplate/inputBindingDefault_SaitekWheel.xml' } InputBinding.MOUSE_WHEEL = { - 5 = true + 5 = true, 4 = true } InputBinding.ALL_COMBOS = { 1 = { CONSOLE_ALT_COMMAND2_BUTTON = { - mask = 2.000000 + mask = 2.000000, controls = 'CONSOLE_ALT_COMMAND2_BUTTON' - } + }, CONSOLE_ALT_COMMAND3_BUTTON = { - mask = 4.000000 + mask = 4.000000, controls = 'CONSOLE_ALT_COMMAND3_BUTTON' - } + }, CONSOLE_ALT_COMMAND_BUTTON = { - mask = 1.000000 + mask = 1.000000, controls = 'CONSOLE_ALT_COMMAND_BUTTON' - } - } + }, + }, 2 = { MOUSE_ALT_COMMAND4_BUTTON = { - mask = 8.000000 + mask = 8.000000, controls = 'MOUSE_ALT_COMMAND4_BUTTON' - } + }, MOUSE_ALT_COMMAND_BUTTON = { - mask = 1.000000 + mask = 1.000000, controls = 'MOUSE_ALT_COMMAND_BUTTON' - } + }, MOUSE_ALT_COMMAND3_BUTTON = { - mask = 4.000000 + mask = 4.000000, controls = 'MOUSE_ALT_COMMAND3_BUTTON' - } + }, MOUSE_ALT_COMMAND2_BUTTON = { - mask = 2.000000 + mask = 2.000000, controls = 'MOUSE_ALT_COMMAND2_BUTTON' } } @@ -274,18 +274,18 @@ InputBinding.ALL_COMBOS = { InputBinding.INPUTTYPE_GAMEPAD = 5.000000 InputBinding.SYMBOL_AFFIX_NEGATIVE = '_2' InputBinding.GAMEPAD_AXIS_NAMES = { - 0 = 'AXIS_1' - 2 = 'AXIS_3' - 5 = 'AXIS_6' - 12 = 'HALF_AXIS_3' - 11 = 'HALF_AXIS_2' - 4 = 'AXIS_5' - 10 = 'HALF_AXIS_1' - 9 = 'AXIS_10' - 8 = 'AXIS_9' - 3 = 'AXIS_4' - 7 = 'AXIS_8' - 1 = 'AXIS_2' + 0 = 'AXIS_1', + 2 = 'AXIS_3', + 5 = 'AXIS_6', + 12 = 'HALF_AXIS_3', + 11 = 'HALF_AXIS_2', + 4 = 'AXIS_5', + 10 = 'HALF_AXIS_1', + 9 = 'AXIS_10', + 8 = 'AXIS_9', + 3 = 'AXIS_4', + 7 = 'AXIS_8', + 1 = 'AXIS_2', 6 = 'AXIS_7' } InputBinding.INPUTTYPE_MOUSE_BUTTON = 2.000000 @@ -294,32 +294,32 @@ InputBinding.MOUSE_AXIS_NONE = 0.000000 InputBinding.INPUTTYPE_NONE = 0.000000 InputBinding.GAMEPAD_COMBO_AXIS_NAMES = { - BUTTON_5 = true + BUTTON_5 = true, BUTTON_6 = true } InputBinding.MOUSE_COMBO_BINDINGS = { MOUSE_ALT_COMMAND4_BUTTON = { - 1 = 'MOUSE_BUTTON_LEFT' + 1 = 'MOUSE_BUTTON_LEFT', 2 = 'MOUSE_BUTTON_RIGHT' - } + }, MOUSE_ALT_COMMAND_BUTTON = { 1 = 'MOUSE_BUTTON_LEFT' - } + }, MOUSE_ALT_COMMAND3_BUTTON = { 1 = 'MOUSE_BUTTON_MIDDLE' - } + }, MOUSE_ALT_COMMAND2_BUTTON = { 1 = 'MOUSE_BUTTON_RIGHT' } } InputBinding.COMBO_MASK_MOUSE_COMMAND_3 = 4.000000 InputBinding.MOUSE_BUTTONS = { - MOUSE_BUTTON_MIDDLE = 2.000000 - MOUSE_BUTTON_WHEEL_UP = 4.000000 - MOUSE_BUTTON_RIGHT = 3.000000 - MOUSE_BUTTON_X2 = 7.000000 - MOUSE_BUTTON_LEFT = 1.000000 - MOUSE_BUTTON_X1 = 6.000000 + MOUSE_BUTTON_MIDDLE = 2.000000, + MOUSE_BUTTON_WHEEL_UP = 4.000000, + MOUSE_BUTTON_RIGHT = 3.000000, + MOUSE_BUTTON_X2 = 7.000000, + MOUSE_BUTTON_LEFT = 1.000000, + MOUSE_BUTTON_X1 = 6.000000, MOUSE_BUTTON_WHEEL_DOWN = 5.000000 } @@ -327,40 +327,40 @@ InputBinding.SYMBOL_AFFIX_POSITIVE = '_1' InputBinding.GAMEPAD_COMBO_BINDINGS = { CONSOLE_ALT_COMMAND2_BUTTON = { 1 = 'BUTTON_6' - } + }, CONSOLE_ALT_COMMAND3_BUTTON = { - 1 = 'BUTTON_5' + 1 = 'BUTTON_5', 2 = 'BUTTON_6' - } + }, CONSOLE_ALT_COMMAND_BUTTON = { 1 = 'BUTTON_5' } } InputBinding.DEVICE_CATEGORY_DEFAULT_LOAD_ORDER = { - 1 = 255.000000 - 2 = 254.000000 - 3 = 4.000000 - 4 = 2.000000 - 5 = 1.000000 - 6 = 0.000000 - 7 = 3.000000 + 1 = 255.000000, + 2 = 254.000000, + 3 = 4.000000, + 4 = 2.000000, + 5 = 1.000000, + 6 = 0.000000, + 7 = 3.000000, 8 = 5.000000 } InputBinding.MOUSE_COMBOS = { MOUSE_ALT_COMMAND4_BUTTON = { - mask = 8.000000 + mask = 8.000000, controls = 'MOUSE_ALT_COMMAND4_BUTTON' - } + }, MOUSE_ALT_COMMAND_BUTTON = { - mask = 1.000000 + mask = 1.000000, controls = 'MOUSE_ALT_COMMAND_BUTTON' - } + }, MOUSE_ALT_COMMAND3_BUTTON = { - mask = 4.000000 + mask = 4.000000, controls = 'MOUSE_ALT_COMMAND3_BUTTON' - } + }, MOUSE_ALT_COMMAND2_BUTTON = { - mask = 2.000000 + mask = 2.000000, controls = 'MOUSE_ALT_COMMAND2_BUTTON' } } diff --git a/input/InputDevice.lua b/input/InputDevice.lua index 6331a7f..4c6068d 100644 --- a/input/InputDevice.lua +++ b/input/InputDevice.lua @@ -1,36 +1,36 @@ InputDevice = {} InputDevice.NAMES = { - PS_GAMEPAD = 'DUALSHOCK(R)4' - XBOX_GAMEPAD = 'XINPUT_GAMEPAD' - SAITEK_WHEEL = 'Saitek Heavy Eqpt. Wheel & Pedal' + PS_GAMEPAD = 'DUALSHOCK(R)4', + XBOX_GAMEPAD = 'XINPUT_GAMEPAD', + SAITEK_WHEEL = 'Saitek Heavy Eqpt. Wheel & Pedal', SAITEK_PANEL = 'Saitek Side Panel Control Deck' } InputDevice.DEFAULT_DEVICE_CATEGORIES = { - WHEEL_DEFAULT = 2.000000 - GAMEPAD_DEFAULT = 1.000000 - KB_MOUSE_DEFAULT = 253.000000 - PANEL_DEFAULT = 5.000000 - FARM_WHEEL_DEFAULT = 4.000000 + WHEEL_DEFAULT = 2.000000, + GAMEPAD_DEFAULT = 1.000000, + KB_MOUSE_DEFAULT = 253.000000, + PANEL_DEFAULT = 5.000000, + FARM_WHEEL_DEFAULT = 4.000000, JOYSTICK_DEFAULT = 3.000000 } InputDevice.DEFAULT_DEVICE_NAMES = { - FARM_WHEEL_DEFAULT = 'FARM_WHEEL_DEFAULT' - JOYSTICK_DEFAULT = 'JOYSTICK_DEFAULT' - PANEL_DEFAULT = 'PANEL_DEFAULT' - WHEEL_DEFAULT = 'WHEEL_DEFAULT' - GAMEPAD_DEFAULT = 'GAMEPAD_DEFAULT' + FARM_WHEEL_DEFAULT = 'FARM_WHEEL_DEFAULT', + JOYSTICK_DEFAULT = 'JOYSTICK_DEFAULT', + PANEL_DEFAULT = 'PANEL_DEFAULT', + WHEEL_DEFAULT = 'WHEEL_DEFAULT', + GAMEPAD_DEFAULT = 'GAMEPAD_DEFAULT', KB_MOUSE_DEFAULT = 'KB_MOUSE_DEFAULT' } InputDevice.CATEGORY = { - FARMWHEEL_AND_PANEL = 255.000000 - WHEEL_AND_PANEL = 254.000000 - UNKNOWN = 0.000000 - JOYSTICK = 3.000000 - FARMPANEL = 5.000000 - KEYBOARD_MOUSE = 253.000000 - FARMWHEEL = 4.000000 - GAMEPAD = 1.000000 + FARMWHEEL_AND_PANEL = 255.000000, + WHEEL_AND_PANEL = 254.000000, + UNKNOWN = 0.000000, + JOYSTICK = 3.000000, + FARMPANEL = 5.000000, + KEYBOARD_MOUSE = 253.000000, + FARMWHEEL = 4.000000, + GAMEPAD = 1.000000, WHEEL = 2.000000 } diff --git a/input/InputDisplayManager.lua b/input/InputDisplayManager.lua index 9a508a6..492eac1 100644 --- a/input/InputDisplayManager.lua +++ b/input/InputDisplayManager.lua @@ -2,11 +2,11 @@ InputDisplayManager = {} InputDisplayManager.RESOLUTION_ATLAS_PATHS = { 1 = { - PATH = 'dataS2/menu/controllerSymbols1024.png' + PATH = 'dataS2/menu/controllerSymbols1024.png', MIN_HEIGHT = 0.000000 - } + }, 2 = { - PATH = 'dataS2/menu/controllerSymbols2048.png' + PATH = 'dataS2/menu/controllerSymbols2048.png', MIN_HEIGHT = 1080.000000 } } @@ -14,13 +14,13 @@ InputDisplayManager.SYMBOL_PREFIX_MOUSE = 'mouse_' InputDisplayManager.AXIS_ICON_DEFINITIONS_PATH = 'dataS/axisIcons.xml' InputDisplayManager.SYMBOL_PREFIX_XBOX = 'xbox_' InputDisplayManager.NO_HELP_ELEMENT = { - actionName = '' - separators = {} - actionName2 = '' - buttons = {} - textRight = '' - keys = {} - priority = 3.000000 + actionName = '', + separators = {}, + actionName2 = '', + buttons = {}, + textRight = '', + keys = {}, + priority = 3.000000, textLeft = '' } InputDisplayManager.AXIS_NAME_Y = 'Y' diff --git a/input/InputEvent.lua b/input/InputEvent.lua index ae2cfaf..329c6a7 100644 --- a/input/InputEvent.lua +++ b/input/InputEvent.lua @@ -1,19 +1,19 @@ InputEvent = {} InputEvent.NO_EVENT = { - actionName = '' - displayPriority = 5.000000 - orderValue = 0.000000 - callback = function() end - targetObject = {} - callbackState = 0.000000 - ignoreComboMask = false - triggerUp = false - id = '|table: 0x0b33e298|0' - triggerDown = false - isActive = false - hasFrameTriggered = false - displayIsVisible = true + actionName = '', + displayPriority = 5.000000, + orderValue = 0.000000, + callback = function() end, + targetObject = {}, + callbackState = 0.000000, + ignoreComboMask = false, + triggerUp = false, + id = '|table: 0x0b33e298|0', + triggerDown = false, + isActive = false, + hasFrameTriggered = false, + displayIsVisible = true, triggerAlways = false } function InputEvent:getIgnoreComboMask() end diff --git a/input/InputHelpElement.lua b/input/InputHelpElement.lua index 96e553e..63884d9 100644 --- a/input/InputHelpElement.lua +++ b/input/InputHelpElement.lua @@ -1,34 +1,34 @@ InputHelpElement = {} InputHelpElement.SEPARATOR = { - COMBO_INPUT = 2.000000 - NONE = 1.000000 + COMBO_INPUT = 2.000000, + NONE = 1.000000, ANY_INPUT = 3.000000 } InputHelpElement.AXIS_ICON = { - PIPE_ROTATE_Y = 'PIPE_ROTATE_Y' - CRANE_ARM1_ROTATE_Y = 'CRANE_ARM1_ROTATE_Y' - GRABBER_ROTATE_Y = 'GRABBER_ROTATE_Y' - CRANE_ARM1_ROTATE_X = 'CRANE_ARM1_ROTATE_X' - REEL_TRANSLATE_Y = 'REEL_TRANSLATE_Y' - IMPLEMENT_ATTACHER_ROTX = 'IMPLEMENT_ATTACHER_ROTX' - GRABBER_OPEN_CLOSE = 'GRABBER_OPEN_CLOSE' - FRONTLOADER_ARM_ROTATE = 'FRONTLOADER_ARM_ROTATE' - FRONTLOADER_ARM_ROTATE_TOOL = 'FRONTLOADER_ARM_ROTATE_TOOL' - REEL_TRANSLATE_X = 'REEL_TRANSLATE_X' - WORKING_WIDTH_TRANSLATE_X = 'WORKING_WIDTH_TRANSLATE_X' - SUPPORT_ARM_TRANSLATE_Y = 'SUPPORT_ARM_TRANSLATE_Y' - WHEEL_BASE_TRANSLATE_X = 'WHEEL_BASE_TRANSLATE_X' - CRANE_ARM1_TRANSLATE = 'CRANE_ARM1_TRANSLATE' - SPRAYER_ARM_TRANSLATE_Y = 'SPRAYER_ARM_TRANSLATE_Y' - TOP_DOOR_ROTATE = 'TOP_DOOR_ROTATE' - IMPLEMENT_ATTACHER_TRANS = 'IMPLEMENT_ATTACHER_TRANS' - TOOL_OPEN_CLOSE = 'TOOL_OPEN_CLOSE' - DRAWBAR_ROTATE_X = 'DRAWBAR_ROTATE_X' - CRANE_ARM2_TRANSLATE = 'CRANE_ARM2_TRANSLATE' - PIPE_END_ROTATE = 'PIPE_END_ROTATE' - CRANE_ARM2_ROTATE_X = 'CRANE_ARM2_ROTATE_X' + PIPE_ROTATE_Y = 'PIPE_ROTATE_Y', + CRANE_ARM1_ROTATE_Y = 'CRANE_ARM1_ROTATE_Y', + GRABBER_ROTATE_Y = 'GRABBER_ROTATE_Y', + CRANE_ARM1_ROTATE_X = 'CRANE_ARM1_ROTATE_X', + REEL_TRANSLATE_Y = 'REEL_TRANSLATE_Y', + IMPLEMENT_ATTACHER_ROTX = 'IMPLEMENT_ATTACHER_ROTX', + GRABBER_OPEN_CLOSE = 'GRABBER_OPEN_CLOSE', + FRONTLOADER_ARM_ROTATE = 'FRONTLOADER_ARM_ROTATE', + FRONTLOADER_ARM_ROTATE_TOOL = 'FRONTLOADER_ARM_ROTATE_TOOL', + REEL_TRANSLATE_X = 'REEL_TRANSLATE_X', + WORKING_WIDTH_TRANSLATE_X = 'WORKING_WIDTH_TRANSLATE_X', + SUPPORT_ARM_TRANSLATE_Y = 'SUPPORT_ARM_TRANSLATE_Y', + WHEEL_BASE_TRANSLATE_X = 'WHEEL_BASE_TRANSLATE_X', + CRANE_ARM1_TRANSLATE = 'CRANE_ARM1_TRANSLATE', + SPRAYER_ARM_TRANSLATE_Y = 'SPRAYER_ARM_TRANSLATE_Y', + TOP_DOOR_ROTATE = 'TOP_DOOR_ROTATE', + IMPLEMENT_ATTACHER_TRANS = 'IMPLEMENT_ATTACHER_TRANS', + TOOL_OPEN_CLOSE = 'TOOL_OPEN_CLOSE', + DRAWBAR_ROTATE_X = 'DRAWBAR_ROTATE_X', + CRANE_ARM2_TRANSLATE = 'CRANE_ARM2_TRANSLATE', + PIPE_END_ROTATE = 'PIPE_END_ROTATE', + CRANE_ARM2_ROTATE_X = 'CRANE_ARM2_ROTATE_X', CRANE_ARM2_ROTATE_TOOL = 'CRANE_ARM2_ROTATE_TOOL' } InputHelpElement.NO_DATA = {} diff --git a/misc/AutoSaveManager.lua b/misc/AutoSaveManager.lua index e6e9a0c..f2d7264 100644 --- a/misc/AutoSaveManager.lua +++ b/misc/AutoSaveManager.lua @@ -2,9 +2,9 @@ AutoSaveManager = {} AutoSaveManager.DEFAULT_INTERVAL = 15.000000 AutoSaveManager.INTERVAL_OPTIONS = { - 1 = 0.000000 - 2 = 5.000000 - 3 = 10.000000 + 1 = 0.000000, + 2 = 5.000000, + 3 = 10.000000, 4 = 15.000000 } diff --git a/misc/GamingStationManager.lua b/misc/GamingStationManager.lua index 05ba6d1..708196f 100644 --- a/misc/GamingStationManager.lua +++ b/misc/GamingStationManager.lua @@ -7,34 +7,34 @@ GamingStationManager.LOAD_OK = 0.000000 GamingStationManager.BIT_TO_BUTTON = { 2 = { button = 6.000000 - } + }, 5 = { button = 3.000000 - } + }, 4 = { button = 4.000000 - } + }, 17 = { button = 10.000000 - } + }, 8 = { button = 0.000000 - } + }, 16 = { button = 9.000000 - } + }, 3 = { button = 5.000000 - } + }, 7 = { button = 1.000000 - } + }, 1 = { button = 7.000000 - } + }, 15 = { button = 8.000000 - } + }, 6 = { button = 2.000000 } diff --git a/misc/HelpLineManager.lua b/misc/HelpLineManager.lua index 477d3e6..4694987 100644 --- a/misc/HelpLineManager.lua +++ b/misc/HelpLineManager.lua @@ -1,7 +1,7 @@ HelpLineManager = {} HelpLineManager.ITEM_TYPE = { - IMAGE = 'image' + IMAGE = 'image', TEXT = 'text' } diff --git a/network/EventIds.lua b/network/EventIds.lua index bf4db10..c15def6 100644 --- a/network/EventIds.lua +++ b/network/EventIds.lua @@ -99,15 +99,15 @@ EventIds.EVENT_CHAT = 3.000000 EventIds.EVENT_MASTER_USER_LOGIN = 179.000000 EventIds.eventClasses = { FS19_MoneyTool.AddMoneyEvent = { - readStream = function() end - isa = function() end - writeStream = function() end - eventId = 198.000000 - superClass = function() end - run = function() end - class = function() end - copy = function() end - emptyNew = function() end + readStream = function() end, + isa = function() end, + writeStream = function() end, + eventId = 198.000000, + superClass = function() end, + run = function() end, + class = function() end, + copy = function() end, + emptyNew = function() end, new = function() end } } @@ -184,1992 +184,7 @@ EventIds.EVENT_SEND_MONEY = 43.000000 EventIds.EVENT_ANIMATED_OBJECT = 105.000000 EventIds.EVENT_CONNECTION_REQUEST = 5.000000 EventIds.EVENT_SLEEP_RESPONSE = 36.000000 -EventIds.eventIdToClass = { - 1 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 1.000000 - emptyNew = function() end - copy = function() end - } - 2 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 2.000000 - emptyNew = function() end - copy = function() end - } - 3 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 3.000000 - emptyNew = function() end - copy = function() end - } - 4 = { - ANSWER_WRONG_PASSWORD = 2.000000 - run = function() end - copy = function() end - writeStream = function() end - isa = function() end - ANSWER_DENIED = 1.000000 - readStream = function() end - ANSWER_FULL = 3.000000 - ANSWER_OK = 0.000000 - superClass = function() end - ANSWER_ALWAYS_DENIED = 4.000000 - eventId = 4.000000 - class = function() end - emptyNew = function() end - new = function() end - } - 5 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 5.000000 - emptyNew = function() end - copy = function() end - } - 6 = { - readStream = function() end - isa = function() end - eventId = 6.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 8 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 8.000000 - emptyNew = function() end - copy = function() end - } - 9 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 9.000000 - emptyNew = function() end - copy = function() end - } - 10 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 10.000000 - emptyNew = function() end - copy = function() end - } - 11 = { - copy = function() end - run = function() end - class = function() end - SEND_BITS_FOG_STATE = 6.000000 - readStream = function() end - writeStream = function() end - eventId = 11.000000 - superClass = function() end - SEND_BITS_FOG_FACTOR = 3.000000 - SEND_BITS_FOG_DURATION = 4.000000 - isa = function() end - emptyNew = function() end - new = function() end - } - 12 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - newExitVehicle = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 12.000000 - emptyNew = function() end - new = function() end - } - 13 = { - readStream = function() end - isa = function() end - eventId = 13.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 14 = { - copy = function() end - isa = function() end - eventId = 14.000000 - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - sendEvent = function() end - emptyNew = function() end - new = function() end - } - 15 = { - new = function() end - isa = function() end - run = function() end - readStream = function() end - STATE = { - OK = 1.000000 - PASSWORD_REQUIRED = 2.000000 - } - SEND_NUM_BITS = 2.000000 - superClass = function() end - writeStream = function() end - copy = function() end - class = function() end - emptyNew = function() end - eventId = 15.000000 - } - 16 = { - readStream = function() end - isa = function() end - eventId = 16.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 17 = { - readStream = function() end - isa = function() end - eventId = 17.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 18 = { - readStream = function() end - isa = function() end - eventId = 18.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 19 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - readStream = function() end - superClass = function() end - class = function() end - NO_FARM = 126.000000 - eventId = 19.000000 - emptyNew = function() end - new = function() end - } - 20 = { - run = function() end - processReadData = function() end - copy = function() end - writeStream = function() end - PartSizeBits = 160000.000000 - readStream = function() end - newReceiving = function() end - delete = function() end - newAck = function() end - superClass = function() end - class = function() end - eventId = 20.000000 - isa = function() end - emptyNew = function() end - new = function() end - } - 21 = { - run = function() end - processReadData = function() end - copy = function() end - writeStream = function() end - PartSizeBits = 160000.000000 - readStream = function() end - newReceiving = function() end - delete = function() end - newAck = function() end - superClass = function() end - class = function() end - eventId = 21.000000 - isa = function() end - emptyNew = function() end - new = function() end - } - 22 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 22.000000 - emptyNew = function() end - copy = function() end - } - 24 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 24.000000 - emptyNew = function() end - copy = function() end - } - 25 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 25.000000 - emptyNew = function() end - copy = function() end - } - 26 = { - readStream = function() end - isa = function() end - eventId = 26.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 27 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - SEND_NUM_BITS = 5.000000 - superClass = function() end - readStream = function() end - class = function() end - eventId = 27.000000 - emptyNew = function() end - new = function() end - } - 28 = { - copy = function() end - isa = function() end - writeStream = function() end - SEND_NUM_BITS = 5.000000 - superClass = function() end - readStream = function() end - class = function() end - eventId = 28.000000 - emptyNew = function() end - new = function() end - } - 29 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 29.000000 - emptyNew = function() end - copy = function() end - } - 30 = { - copy = function() end - isa = function() end - eventId = 30.000000 - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - sendEvent = function() end - emptyNew = function() end - new = function() end - } - 31 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 31.000000 - emptyNew = function() end - new = function() end - } - 33 = { - readStream = function() end - isa = function() end - eventId = 33.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 34 = { - readStream = function() end - isa = function() end - eventId = 34.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 35 = { - readStream = function() end - isa = function() end - eventId = 35.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 36 = { - readStream = function() end - isa = function() end - eventId = 36.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 37 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 37.000000 - emptyNew = function() end - copy = function() end - } - 38 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 38.000000 - emptyNew = function() end - copy = function() end - } - 39 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 39.000000 - emptyNew = function() end - copy = function() end - } - 40 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 40.000000 - emptyNew = function() end - copy = function() end - } - 41 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 41.000000 - emptyNew = function() end - copy = function() end - } - 42 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 42.000000 - emptyNew = function() end - copy = function() end - } - 44 = { - SELL_SUCCESS = 0.000000 - copy = function() end - run = function() end - isa = function() end - newServerToClient = function() end - readStream = function() end - writeStream = function() end - SELL_NO_PERMISSION = 2.000000 - superClass = function() end - emptyNew = function() end - eventId = 44.000000 - class = function() end - SELL_VEHICLE_IN_USE = 1.000000 - new = function() end - } - 46 = { - readStream = function() end - isa = function() end - run = function() end - superClass = function() end - STATE_FAILED_TO_LOAD = 1.000000 - STATE_NOT_ENOUGH_MONEY = 4.000000 - copy = function() end - class = function() end - onVehicleBoughtCallback = function() end - writeStream = function() end - new = function() end - newServerToClient = function() end - eventId = 46.000000 - STATE_NO_SPACE = 2.000000 - STATE_SUCCESS = 0.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 3.000000 - } - 47 = { - readStream = function() end - isa = function() end - STATE_SUCCESS = 0.000000 - superClass = function() end - STATE_FAILED_TO_LOAD = 1.000000 - STATE_TERRAIN_DEFORMATION_FAILED = 5.000000 - copy = function() end - class = function() end - run = function() end - writeStream = function() end - new = function() end - newServerToClient = function() end - eventId = 47.000000 - STATE_NOT_ENOUGH_MONEY = 4.000000 - STATE_NO_SPACE = 2.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 3.000000 - } - 48 = { - run = function() end - writeStream = function() end - readStream = function() end - new = function() end - newServerToClient = function() end - isa = function() end - copy = function() end - eventId = 48.000000 - STATE_SUCCESS = 0.000000 - class = function() end - superClass = function() end - STATE_LIMIT_REACHED = 3.000000 - STATE_FAILED_TO_LOAD = 1.000000 - STATE_NOT_ENOUGH_MONEY = 4.000000 - emptyNew = function() end - STATE_NO_SPACE = 2.000000 - } - 49 = { - addHandTool = function() end - run = function() end - writeStream = function() end - new = function() end - readStream = function() end - class = function() end - newServerToClient = function() end - isa = function() end - STATE_SUCCESS = 0.000000 - copy = function() end - superClass = function() end - eventId = 49.000000 - STATE_FAILED_TO_LOAD = 2.000000 - STATE_NOT_ENOUGH_MONEY = 3.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 1.000000 - } - 50 = { - removeHandTool = function() end - run = function() end - writeStream = function() end - new = function() end - readStream = function() end - isa = function() end - newServerToClient = function() end - STATE_FAILED = 1.000000 - STATE_SUCCESS = 0.000000 - eventId = 50.000000 - superClass = function() end - copy = function() end - class = function() end - STATE_IN_USE = 3.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 2.000000 - } - 51 = { - run = function() end - writeStream = function() end - new = function() end - readStream = function() end - isa = function() end - newServerToClient = function() end - STATE_FAILED = 1.000000 - STATE_SUCCESS = 0.000000 - eventId = 51.000000 - superClass = function() end - copy = function() end - class = function() end - STATE_IN_USE = 3.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 2.000000 - } - 52 = { - run = function() end - writeStream = function() end - new = function() end - readStream = function() end - isa = function() end - newServerToClient = function() end - STATE_FAILED = 1.000000 - STATE_SUCCESS = 0.000000 - eventId = 52.000000 - superClass = function() end - copy = function() end - class = function() end - STATE_IN_USE = 3.000000 - emptyNew = function() end - STATE_NO_PERMISSION = 2.000000 - } - 53 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - readStream = function() end - newServerToClient = function() end - class = function() end - new = function() end - eventId = 53.000000 - emptyNew = function() end - superClass = function() end - } - 54 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 54.000000 - emptyNew = function() end - copy = function() end - } - 55 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 55.000000 - emptyNew = function() end - copy = function() end - } - 56 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 56.000000 - emptyNew = function() end - copy = function() end - } - 57 = { - readStream = function() end - isa = function() end - eventId = 57.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 59 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 59.000000 - emptyNew = function() end - copy = function() end - } - 60 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 60.000000 - emptyNew = function() end - copy = function() end - } - 61 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 61.000000 - emptyNew = function() end - copy = function() end - } - 62 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 62.000000 - emptyNew = function() end - copy = function() end - } - 63 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 63.000000 - emptyNew = function() end - copy = function() end - } - 64 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 64.000000 - emptyNew = function() end - copy = function() end - } - 65 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 65.000000 - emptyNew = function() end - copy = function() end - } - 66 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 66.000000 - emptyNew = function() end - copy = function() end - } - 67 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 67.000000 - emptyNew = function() end - copy = function() end - } - 68 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 68.000000 - emptyNew = function() end - copy = function() end - } - 69 = { - readStream = function() end - isa = function() end - eventId = 69.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 70 = { - readStream = function() end - isa = function() end - eventId = 70.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 71 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 71.000000 - emptyNew = function() end - copy = function() end - } - 72 = { - readStream = function() end - isa = function() end - eventId = 72.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 73 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 73.000000 - emptyNew = function() end - copy = function() end - } - 74 = { - readStream = function() end - isa = function() end - eventId = 74.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 75 = { - readStream = function() end - isa = function() end - eventId = 75.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 76 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 76.000000 - emptyNew = function() end - copy = function() end - } - 77 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - readStream = function() end - newServerToClient = function() end - class = function() end - new = function() end - eventId = 77.000000 - emptyNew = function() end - superClass = function() end - } - 80 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 80.000000 - emptyNew = function() end - copy = function() end - } - 81 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 81.000000 - emptyNew = function() end - copy = function() end - } - 82 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 82.000000 - emptyNew = function() end - copy = function() end - } - 84 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 84.000000 - emptyNew = function() end - copy = function() end - } - 86 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 86.000000 - emptyNew = function() end - copy = function() end - } - 88 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 88.000000 - emptyNew = function() end - copy = function() end - } - 89 = { - readStream = function() end - isa = function() end - eventId = 89.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 90 = { - readStream = function() end - isa = function() end - eventId = 90.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 91 = { - readStream = function() end - isa = function() end - eventId = 91.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 97 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 97.000000 - emptyNew = function() end - copy = function() end - } - 98 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 98.000000 - emptyNew = function() end - copy = function() end - } - 99 = { - readStream = function() end - isa = function() end - eventId = 99.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 105 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 105.000000 - emptyNew = function() end - copy = function() end - } - 106 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 106.000000 - emptyNew = function() end - copy = function() end - } - 107 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 107.000000 - emptyNew = function() end - copy = function() end - } - 108 = { - readStream = function() end - isa = function() end - eventId = 108.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 109 = { - readStream = function() end - isa = function() end - eventId = 109.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 110 = { - readStream = function() end - isa = function() end - eventId = 110.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 112 = { - readStream = function() end - isa = function() end - eventId = 112.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 113 = { - readStream = function() end - isa = function() end - eventId = 113.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 114 = { - readStream = function() end - isa = function() end - eventId = 114.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 118 = { - readStream = function() end - isa = function() end - eventId = 118.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 119 = { - readStream = function() end - isa = function() end - eventId = 119.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 123 = { - readStream = function() end - isa = function() end - eventId = 123.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 124 = { - readStream = function() end - isa = function() end - eventId = 124.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 126 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 126.000000 - emptyNew = function() end - copy = function() end - } - 127 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 127.000000 - emptyNew = function() end - copy = function() end - } - 129 = { - readStream = function() end - isa = function() end - writeStream = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 129.000000 - emptyNew = function() end - copy = function() end - } - 132 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 132.000000 - emptyNew = function() end - copy = function() end - } - 136 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 136.000000 - emptyNew = function() end - copy = function() end - } - 138 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 138.000000 - emptyNew = function() end - copy = function() end - } - 139 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 139.000000 - emptyNew = function() end - copy = function() end - } - 140 = { - readStream = function() end - isa = function() end - writeStream = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 140.000000 - emptyNew = function() end - copy = function() end - } - 141 = { - readStream = function() end - isa = function() end - eventId = 141.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 142 = { - readStream = function() end - isa = function() end - eventId = 142.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 144 = { - readStream = function() end - isa = function() end - eventId = 144.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 146 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 146.000000 - emptyNew = function() end - copy = function() end - } - 147 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 147.000000 - emptyNew = function() end - copy = function() end - } - 148 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 148.000000 - emptyNew = function() end - copy = function() end - } - 149 = { - readStream = function() end - isa = function() end - eventId = 149.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 150 = { - readStream = function() end - isa = function() end - eventId = 150.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 151 = { - readStream = function() end - isa = function() end - eventId = 151.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 152 = { - readStream = function() end - isa = function() end - runLocal = function() end - eventId = 152.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 153 = { - readStream = function() end - isa = function() end - runLocal = function() end - eventId = 153.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 154 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 154.000000 - emptyNew = function() end - copy = function() end - } - 155 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 155.000000 - emptyNew = function() end - copy = function() end - } - 156 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 156.000000 - emptyNew = function() end - copy = function() end - } - 157 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 157.000000 - emptyNew = function() end - copy = function() end - } - 158 = { - readStream = function() end - isa = function() end - eventId = 158.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 159 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 159.000000 - emptyNew = function() end - copy = function() end - } - 160 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 160.000000 - emptyNew = function() end - copy = function() end - } - 161 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 161.000000 - emptyNew = function() end - copy = function() end - } - 162 = { - readStream = function() end - isa = function() end - eventId = 162.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 163 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 163.000000 - emptyNew = function() end - copy = function() end - } - 164 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 164.000000 - emptyNew = function() end - copy = function() end - } - 165 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 165.000000 - emptyNew = function() end - copy = function() end - } - 166 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 166.000000 - emptyNew = function() end - copy = function() end - } - 167 = { - readStream = function() end - isa = function() end - writeStream = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 167.000000 - emptyNew = function() end - copy = function() end - } - 168 = { - readStream = function() end - isa = function() end - eventId = 168.000000 - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - sendEvent = function() end - emptyNew = function() end - copy = function() end - } - 169 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 169.000000 - emptyNew = function() end - new = function() end - } - 170 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 170.000000 - emptyNew = function() end - new = function() end - } - 171 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 171.000000 - emptyNew = function() end - new = function() end - } - 172 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 172.000000 - emptyNew = function() end - new = function() end - } - 173 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 173.000000 - emptyNew = function() end - new = function() end - } - 174 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 174.000000 - emptyNew = function() end - copy = function() end - } - 175 = { - writeStream = function() end - ACCESS_GRANTED = 0.000000 - new = function() end - run = function() end - isa = function() end - sendNumBits = 2.000000 - onAnswerOk = function() end - ACCESS_DENIED = 1.000000 - readStream = function() end - superClass = function() end - copy = function() end - NOT_SUPPORTED = 2.000000 - class = function() end - emptyNew = function() end - eventId = 175.000000 - } - 176 = { - copy = function() end - isa = function() end - run = function() end - writeStream = function() end - readStream = function() end - eventId = 176.000000 - class = function() end - sendCapNumBits = 4.000000 - new = function() end - emptyNew = function() end - superClass = function() end - } - 177 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 177.000000 - emptyNew = function() end - copy = function() end - } - 178 = { - readStream = function() end - isa = function() end - writeStream = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 178.000000 - emptyNew = function() end - copy = function() end - } - 182 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 182.000000 - emptyNew = function() end - copy = function() end - } - 184 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 184.000000 - emptyNew = function() end - copy = function() end - } - 185 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 185.000000 - emptyNew = function() end - new = function() end - } - 186 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 186.000000 - emptyNew = function() end - new = function() end - } - 187 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 187.000000 - emptyNew = function() end - new = function() end - } - 188 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 188.000000 - emptyNew = function() end - new = function() end - } - 189 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 189.000000 - emptyNew = function() end - new = function() end - } - 190 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 190.000000 - emptyNew = function() end - new = function() end - } - 191 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 191.000000 - emptyNew = function() end - new = function() end - } - 192 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 192.000000 - emptyNew = function() end - new = function() end - } - 193 = { - copy = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - readStream = function() end - class = function() end - eventId = 193.000000 - emptyNew = function() end - new = function() end - } - 194 = { - copy = function() end - superClass = function() end - isa = function() end - run = function() end - readStream = function() end - delete = function() end - writeStream = function() end - newServerToClient = function() end - class = function() end - new = function() end - eventId = 194.000000 - emptyNew = function() end - onSculptingFinished = function() end - } - 196 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 196.000000 - emptyNew = function() end - copy = function() end - } - 197 = { - readStream = function() end - isa = function() end - writeStream = function() end - run = function() end - superClass = function() end - class = function() end - new = function() end - eventId = 197.000000 - emptyNew = function() end - copy = function() end - } - 198 = { - readStream = function() end - isa = function() end - writeStream = function() end - eventId = 198.000000 - superClass = function() end - run = function() end - class = function() end - copy = function() end - emptyNew = function() end - new = function() end - } -} +EventIds.eventIdToClass = {} EventIds.EVENT_ENVIRONMENT_TIME = 8.000000 EventIds.EVENT_CHEAT_MONEY = 184.000000 EventIds.EVENT_VEHICLE_SET_BEACON_LIGHT = 59.000000 diff --git a/network/NetworkUtil.lua b/network/NetworkUtil.lua index 432052f..e1cf94f 100644 --- a/network/NetworkUtil.lua +++ b/network/NetworkUtil.lua @@ -1,9 +1,9 @@ NetworkUtil = {} NetworkUtil.BIT_TYPE_TO_NUM_BITS = { - 1 = 11.000000 - 2 = 16.000000 - 3 = 20.000000 + 1 = 11.000000, + 2 = 16.000000, + 3 = 20.000000, 4 = 32.000000 } diff --git a/network/ObjectIds.lua b/network/ObjectIds.lua index bb43722..0832854 100644 --- a/network/ObjectIds.lua +++ b/network/ObjectIds.lua @@ -7,2325 +7,6 @@ ObjectIds.OBJECT_BALE = 6.000000 ObjectIds.OBJECT_SILO_TRIGGER = 12.000000 ObjectIds.OBJECT_SILO_PLACEABLE = 47.000000 ObjectIds.OBJECT_ANIMAL_LOADING_TRIGGER = 10.000000 -ObjectIds.objectIdToClass = { - 1 = { - onEnter = function() end - consoleCommandToggleSuperStrongMode = function() end - getParentComponent = function() end - playHandToolStopSample = function() end - hasHandtoolEquipped = function() end - onLeave = function() end - onInputActivateHandtool = function() end - updateFX = function() end - onInputCycleHandTool = function() end - deleteVisuals = function() end - onInputCrouch = function() end - drawUIInfo = function() end - onPausGame = function() end - groundRaycastCallback = function() end - onInputEnter = function() end - onInputDebugFlyUpDown = function() end - checkObjectInRange = function() end - rotateObject = function() end - kinematicCollisionMask = 2148532228.000000 - onInputLookLeftRight = function() end - setFarm = function() end - onInputThrowObject = function() end - onInputToggleLight = function() end - setVisibility = function() end - updatePlayerStates = function() end - onInputInteract = function() end - COLLISIONMASK_TRIGGER = 1048576.000000 - onInputJump = function() end - onInputDebugFlyToggle = function() end - testScope = function() end - loadHandTool = function() end - updateInterpolation = function() end - deleteHandToolStopSample = function() end - draw = function() end - setWoodWorkVisibility = function() end - onInputRun = function() end - consoleCommandToggleWoodCuttingMaker = function() end - onPickedUpObjectJointBreak = function() end - setCuttingAnim = function() end - updateSound = function() end - resetBrake = function() end - loadVisuals = function() end - onInputLookUpDown = function() end - INPUT_ACTIVE_TYPE = { - IS_DEBUG = 5.000000 - STARTS_DISABLED = 1.000000 - STARTS_ENABLED = 2.000000 - IS_CARRYING = 4.000000 - IS_MOVEMENT = 3.000000 - } - MAX_PICKABLE_OBJECT_DISTANCE = 3.000000 - class = function() end - getIsInputAllowed = function() end - readUpdateStream = function() end - movementCollisionMask = 2148532255.000000 - load = function() end - removeActionEvents = function() end - moveToAbsoluteInternal = function() end - updatePlayHandToolStopSample = function() end - BUTTONSTATES = { - PRESSED = 2.000000 - RELEASED = 3.000000 - JUST_PRESSED = 1.000000 - } - pickUpObject = function() end - onLeaveVehicle = function() end - updateAnimationParameters = function() end - updateHandTools = function() end - consoleCommandToggleFlightAndNoHUDMode = function() end - new = function() end - onFarmChange = function() end - consoleCommandTogglePlayerDebug = function() end - setWalkingLock = function() end - onInputActivateObject = function() end - delete = function() end - updateKinematic = function() end - INPUT_CONTEXT_NAME = 'PLAYER' - getPositionData = function() end - updateTick = function() end - recordPositionInformation = function() end - update = function() end - updateWaterParms = function() end - getDesiredSpeed = function() end - consoleCommandReloadIKChains = function() end - loadHandToolStopSample = function() end - lockInput = function() end - deleteStartleAnimalData = function() end - resetInputsInformation = function() end - getUpdatePriority = function() end - throwObject = function() end - equipHandtool = function() end - MAX_PICKABLE_OBJECT_MASS = 0.200000 - movePlayer = function() end - getCurrentSurfaceSound = function() end - updateRotation = function() end - onInputMoveForward = function() end - moveTo = function() end - cameraBob = function() end - onInputRotateObjectHorizontally = function() end - calculate2DDotProductAgainstVelocity = function() end - pickUpObjectRaycastCallback = function() end - readStream = function() end - unequipHandtool = function() end - onInputRotateObjectVertically = function() end - deleteStartleAnimalSound = function() end - setLightIsActive = function() end - registerActionEvents = function() end - isa = function() end - superClass = function() end - onInputMoveSide = function() end - setRotation = function() end - PICKED_UP_OBJECTS = { - } - moveRootNodeToAbsolute = function() end - classId = 1.000000 - moveToExitPoint = function() end - mouseEvent = function() end - onGhostAdd = function() end - onGhostRemove = function() end - updateActionEvents = function() end - getEquippedHandtoolFilename = function() end - writeUpdateStream = function() end - setIKDirty = function() end - writeStream = function() end - className = 'Player' - updateNetworkMovementHistory = function() end - moveToAbsolute = function() end - copy = function() end - updateInterpolationTick = function() end - resetCameraInputsInformation = function() end - debugDraw = function() end - } - 2 = { - getLastSpeed = function() end - setMassDirty = function() end - unselectVehicle = function() end - onVehicleWakeUpCallback = function() end - setWorldPosition = function() end - PROPERTY_STATE_NONE = 0.000000 - getPrice = function() end - copy = function() end - getCanToggleSelectable = function() end - getRootVehicle = function() end - getReloadXML = function() end - addSubselection = function() end - getSpecValueSlots = function() end - getIsAIActive = function() end - registerSelectableObjects = function() end - doCollisionMaskCheck = function() end - deactivate = function() end - setAbsolutePosition = function() end - setComponentJointRotLimit = function() end - setComponentJointFrame = function() end - clearActionEventsTable = function() end - PROPERTY_STATE_OWNED = 1.000000 - load = function() end - getIsReadyForAutomatedTrainTravel = function() end - addNodeObjectMapping = function() end - registerInteractionFlag = function() end - saveStatsToXMLFile = function() end - getIsActive = function() end - loadSchemaOverlay = function() end - SPRING_SCALE = 10.000000 - addToPhysics = function() end - delete = function() end - getDailyUpkeep = function() end - INPUT_CONTEXT_NAME = 'VEHICLE' - updateTick = function() end - loadComponentJointFromXML = function() end - STATE_CHANGE_LOWER_ALL_IMPLEMENTS = 3.000000 - registerEvents = function() end - loadComponentFromXML = function() end - getName = function() end - raiseStateChange = function() end - getIsActiveForSound = function() end - setRelativePosition = function() end - setLoadingState = function() end - getActiveFarm = function() end - getSpecValueDailyUpkeep = function() end - updateSelectableObjects = function() end - getSpeedLimit = function() end - setSelectedVehicle = function() end - writeUpdateStream = function() end - className = 'Vehicle' - registerStateChange = function() end - getSelectedVehicle = function() end - selectVehicle = function() end - getParentComponent = function() end - getLimitedVehicleYPosition = function() end - STATE_CHANGE_ATTACH = 1.000000 - getCanBeReset = function() end - setSelectedObject = function() end - drawUIInfo = function() end - removeFromPhysics = function() end - getWorkLoad = function() end - PROPERTY_STATE_SHOP_CONFIG = 4.000000 - PROPERTY_STATE_MISSION = 3.000000 - getTotalMass = function() end - getTailwaterDepth = function() end - getSelectedObject = function() end - isa = function() end - STATE_CHANGE_AI_START_LINE = 6.000000 - draw = function() end - getSellPrice = function() end - STATE_CHANGE_MOTOR_TURN_ON = 4.000000 - hasInputConflictWithSelection = function() end - getIsSelected = function() end - INTERACTION_FLAG_NONE = 0.000000 - setOperatingTime = function() end - getAdditionalComponentMass = function() end - readUpdateStream = function() end - STATE_CHANGE_AI_END_LINE = 7.000000 - STATE_CHANGE_MOTOR_TURN_OFF = 5.000000 - STATE_CHANGE_DETACH = 2.000000 - new = function() end - getIsOperating = function() end - getIsOnField = function() end - getDistanceToNode = function() end - loadSpecValueCombinations = function() end - getSpecValueSpeedLimit = function() end - loadSpecValueSpeedLimit = function() end - getSpecValueWorkingWidth = function() end - STATE_CHANGE_FILLTYPE_CHANGE = 8.000000 - getSpecValueOperatingTime = function() end - addActionEvent = function() end - actionEventToggleSelection = function() end - registerFunctions = function() end - getFullName = function() end - getIsInUse = function() end - init = function() end - getOwner = function() end - interact = function() end - defaultLength = 8.000000 - addVehicleToAIImplementList = function() end - getCanBeSelected = function() end - writeStream = function() end - loadSpecValueWorkingWidth = function() end - loadFinished = function() end - getDeactivateOnLeave = function() end - getInteractionHelp = function() end - getCanBePickedUp = function() end - removeNodeObjectMapping = function() end - defaultWidth = 8.000000 - NUM_INTERACTION_FLAGS = 0.000000 - DAMAGED_SPEEDLIMIT_REDUCTION = 0.300000 - saveToXMLFile = function() end - updateActionEvents = function() end - getChildVehicles = function() end - createComponentJoint = function() end - setWorldPositionQuaternion = function() end - getAdditionalSchemaText = function() end - getIsLowered = function() end - PROPERTY_STATE_LEASED = 2.000000 - getRepairPrice = function() end - readStream = function() end - superClass = function() end - getUpdatePriority = function() end - removeActionEvents = function() end - getVehicleDamage = function() end - registerActionEvents = function() end - getOperatingTime = function() end - requestActionEventUpdate = function() end - setBroken = function() end - updateVehicleSpeed = function() end - getIsVehicleNode = function() end - dayChanged = function() end - classId = 2.000000 - updateMass = function() end - activate = function() end - removeActionEvent = function() end - getIsActiveForInput = function() end - prefixSchemaOverlayName = function() end - update = function() end - getSpecValueCombinations = function() end - getFillLevelInformation = function() end - getCanByMounted = function() end - updateEnd = function() end - class = function() end - doCheckSpeedLimit = function() end - setComponentJointTransLimit = function() end - NUM_STATE_CHANGES = 8.000000 - getSpecValueAge = function() end - debugNetworkUpdate = false - } - 3 = { - new = function() end - unregister = function() end - delete = function() end - clearDirtyFlags = function() end - register = function() end - updateTick = function() end - raiseActive = function() end - setOwnerFarmId = function() end - getNextDirtyFlag = function() end - copy = function() end - getOwnerFarmId = function() end - getUpdatePriority = function() end - readStream = function() end - testScope = function() end - raiseDirtyFlags = function() end - onMissionStarted = function() end - draw = function() end - superClass = function() end - classId = 3.000000 - removeDeleteListener = function() end - setOwner = function() end - onGhostAdd = function() end - onGhostRemove = function() end - mouseEvent = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Object' - resetObjectIds = function() end - updateEnd = function() end - nextObjectId = 4.000000 - update = function() end - addDeleteListener = function() end - isa = function() end - } - 4 = { - new = function() end - isa = function() end - delete = function() end - getDefaultRigidBodyType = function() end - superClass = function() end - updateMove = function() end - updateTick = function() end - onPhysicObjectWakeUpCallback = function() end - update = function() end - classId = 4.000000 - loadOnCreate = function() end - onGhostRemove = function() end - onGhostAdd = function() end - copy = function() end - setWorldPositionQuaternion = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'PhysicsObject' - getUpdatePriority = function() end - testScope = function() end - addChildsToNodeObject = function() end - setNodeId = function() end - readStream = function() end - getAllowsAutoDelete = function() end - } - 5 = { - unmount = function() end - getMeshNodes = function() end - new = function() end - mount = function() end - testScope = function() end - delete = function() end - superClass = function() end - unmountDynamic = function() end - updateTick = function() end - classId = 5.000000 - mountDynamic = function() end - dynamicMountTriggerCallback = function() end - copy = function() end - class = function() end - getUpdatePriority = function() end - className = 'MountableObject' - onDynamicMountJointBreak = function() end - setNodeId = function() end - getSupportsMountDynamic = function() end - isa = function() end - getAllowsAutoDelete = function() end - } - 6 = { - unmount = function() end - new = function() end - delete = function() end - getSupportsTensionBelts = function() end - loadFromMemory = function() end - loadFromXMLFile = function() end - setColor = function() end - copy = function() end - getFillLevel = function() end - setCanBeSold = function() end - getValue = function() end - getMeshNodes = function() end - readStream = function() end - mount = function() end - isa = function() end - superClass = function() end - createNode = function() end - classId = 6.000000 - getFillType = function() end - getTensionBeltNodeId = function() end - className = 'Bale' - load = function() end - class = function() end - getCanBeSold = function() end - readUpdateStream = function() end - writeStream = function() end - loadExtraAttributesFromXMLFile = function() end - setFillLevel = function() end - setWrappingState = function() end - saveToXMLFile = function() end - setNodeId = function() end - writeUpdateStream = function() end - applyExtraAttributes = function() end - } - 9 = { - getTensionBeltNodeId = function() end - getSupportsTensionBelts = function() end - loadFromMemory = function() end - new = function() end - load = function() end - class = function() end - setNodeId = function() end - copy = function() end - delete = function() end - className = 'MissionPhysicsObject' - superClass = function() end - writeStream = function() end - readStream = function() end - isa = function() end - createNode = function() end - classId = 9.000000 - } - 10 = { - onCreate = function() end - new = function() end - getAnimals = function() end - isa = function() end - showAnimalScreen = function() end - delete = function() end - onSelectedHusbandry = function() end - superClass = function() end - drawActivate = function() end - classId = 10.000000 - updateActivatableObject = function() end - triggerCallback = function() end - copy = function() end - class = function() end - onActivateObject = function() end - className = 'AnimalLoadingTrigger' - getIsActivatable = function() end - load = function() end - setLoadingTrailer = function() end - } - 11 = { - feed = function() end - new = function() end - delete = function() end - idleStay = function() end - updateTick = function() end - update = function() end - playerInteractionTriggerCallback = function() end - pet = function() end - copy = function() end - getUpdatePriority = function() end - saveToXMLFile = function() end - hourChanged = function() end - setVisibility = function() end - idleWander = function() end - followEntity = function() end - readStream = function() end - isa = function() end - superClass = function() end - onPlayerLeave = function() end - playerFarmChanged = function() end - classId = 11.000000 - teleportToSpawn = function() end - goToSpawn = function() end - onGhostAdd = function() end - onGhostRemove = function() end - resetSteeringParms = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - setName = function() end - isAbandoned = function() end - className = 'Dog' - fetchItem = function() end - load = function() end - loadFromXMLFile = function() end - testScope = function() end - } - 13 = { - getTarget = function() end - loadBaleTrigger = function() end - new = function() end - getFillUnitIndexFromNode = function() end - isa = function() end - getFillUnitExactFillRootNode = function() end - delete = function() end - getCustomDischargeNotAllowedWarning = function() end - superClass = function() end - getFillUnitSupportsFillType = function() end - loadFillTypes = function() end - getFillUnitFreeCapacity = function() end - update = function() end - classId = 13.000000 - getIsFillAllowedFromFarm = function() end - loadAvoidFillTypes = function() end - getIsFillTypeSupported = function() end - copy = function() end - getIsFillTypeAllowed = function() end - class = function() end - loadAcceptedToolType = function() end - getFillUnitAllowsFillType = function() end - getFillUnitSupportsToolType = function() end - load = function() end - baleTriggerCallback = function() end - setTarget = function() end - addFillUnitFillLevel = function() end - updateBales = function() end - className = 'UnloadTrigger' - getIsToolTypeAllowed = function() end - } - 14 = { - new = function() end - isa = function() end - delete = function() end - getFillTargetNode = function() end - superClass = function() end - onFillTypeSelection = function() end - drawActivate = function() end - classId = 14.000000 - setSource = function() end - setFillSoundIsPlaying = function() end - copy = function() end - getCurrentFillType = function() end - class = function() end - update = function() end - stopLoading = function() end - onActivateObject = function() end - className = 'LoadTrigger' - startLoading = function() end - setIsLoading = function() end - farmIdForFillableObject = function() end - getIsActivatable = function() end - loadTriggerCallback = function() end - load = function() end - } - 15 = { - new = function() end - isa = function() end - delete = function() end - superClass = function() end - loadFromXMLFile = function() end - getCapacity = function() end - hasFarmAccessToStorage = function() end - classId = 15.000000 - removeTargetStorage = function() end - getIsFillAllowedFromFarm = function() end - getIsFillTypeSupported = function() end - copy = function() end - addFillLevelFromTool = function() end - class = function() end - getIsToolTypeAllowed = function() end - getFillLevel = function() end - writeStream = function() end - className = 'UnloadingStation' - saveToXMLFile = function() end - load = function() end - getIsFillTypeAllowed = function() end - readStream = function() end - getFreeCapacity = function() end - addTargetStorage = function() end - } - 16 = { - setIsInGreatDemand = function() end - PRICE_HIGH = 4.000000 - new = function() end - getSupportsGreatDemand = function() end - setPriceMultiplier = function() end - addAcceptedFillType = function() end - PRICE_FALLING = 1.000000 - executePriceDrop = function() end - PRICE_LOW = 3.000000 - copy = function() end - doPriceDrop = function() end - PRICE_DROP_DELAY = 3600000.000000 - saveToXMLFile = function() end - getTotalReceived = function() end - addTargetStorage = function() end - getPriceMultiplier = function() end - readStream = function() end - isa = function() end - getIncomeNameForFillType = function() end - PRICE_GREAT_DEMAND = 5.000000 - getAppearsOnStats = function() end - superClass = function() end - getIsFillAllowedFromFarm = function() end - update = function() end - addFillLevelFromTool = function() end - updatePrices = function() end - classId = 16.000000 - getCurrentPricingTrend = function() end - initPricingDynamics = function() end - loadFromXMLFile = function() end - sellFillType = function() end - load = function() end - getIsFillTypeAllowed = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'SellingStation' - PRICE_CLIMBING = 2.000000 - class = function() end - getTotalPaid = function() end - updateTick = function() end - getFreeCapacity = function() end - getEffectiveFillTypePrice = function() end - } - 17 = { - new = function() end - class = function() end - getEffectiveFillTypePrice = function() end - getAppearsOnStats = function() end - isa = function() end - load = function() end - superClass = function() end - getSupportsGreatDemand = function() end - className = 'BgaSellStation' - copy = function() end - getCurrentPricingTrend = function() end - classId = 17.000000 - } - 18 = { - getProvidedFillTypes = function() end - getIsFillAllowedToFarm = function() end - new = function() end - addFillLevelToFillableObject = function() end - class = function() end - getIncomeNameForFillType = function() end - getAllFillLevels = function() end - className = 'BuyingStation' - load = function() end - superClass = function() end - isa = function() end - addSourceStorage = function() end - copy = function() end - update = function() end - classId = 18.000000 - } - 19 = { - getIsFillAllowedToFarm = function() end - new = function() end - isa = function() end - delete = function() end - superClass = function() end - loadFromXMLFile = function() end - updateProvidedFillTyes = function() end - getProvidedFillTypes = function() end - removeSourceStorage = function() end - copy = function() end - readStream = function() end - class = function() end - getSourceStorages = function() end - load = function() end - writeStream = function() end - className = 'LoadingStation' - saveToXMLFile = function() end - getAllFillLevels = function() end - addSourceStorage = function() end - classId = 19.000000 - hasFarmAccessToStorage = function() end - addFillLevelToFillableObject = function() end - } - 20 = { - loadFillTypes = function() end - new = function() end - addFillUnitFillLevel = function() end - class = function() end - copy = function() end - initFillTypesFromFoodGroups = function() end - updateAnimalPlaces = function() end - load = function() end - superClass = function() end - loadAnimalPlaces = function() end - className = 'UnloadFeedingTrough' - addFoodMixtureFillType = function() end - isa = function() end - classId = 20.000000 - } - 21 = { - setSource = function() end - fillLevelsChanged = function() end - new = function() end - writeStream = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - delete = function() end - load = function() end - superClass = function() end - readStream = function() end - className = 'FillLevelListener' - copy = function() end - isa = function() end - classId = 21.000000 - } - 22 = { - isAnimalDirty = function() end - getAnimals = function() end - getCanBeRidden = function() end - loadFromXMLFile = function() end - getSpecValueNumberAnimals = function() end - initPlaceableType = function() end - copy = function() end - isRideableInOnHusbandryGround = function() end - getSupportsSubType = function() end - getMaxNumAnimals = function() end - getTypedAnimals = function() end - updateGlobalProductionFactor = function() end - removeSingleAnimal = function() end - getConsumedFood = function() end - getFluidStatsText = function() end - hourChanged = function() end - getManureFilltypeInfo = function() end - canBuy = function() end - hasStraw = function() end - isa = function() end - getProductionFilltypeInfo = function() end - modulesFinalizePlacement = function() end - getHusbandryModule = function() end - getFoodProductionFactor = function() end - getLiquidManureFilltypeInfo = function() end - setModuleParameters = function() end - getReproductionTimePerDay = function() end - class = function() end - getGlobalDirtFactor = function() end - readUpdateStream = function() end - getAnimalSubTypeCount = function() end - collectPickObjects = function() end - getWaterFilltypeInfo = function() end - renameAnimal = function() end - finalizePlacement = function() end - new = function() end - getHusbandryId = function() end - getNumOfAnimals = function() end - update = function() end - minuteChanged = function() end - getMilkFilltypeInfo = function() end - getSpecValueAnimalFoodFillTypes = function() end - loadSpecValueAnimalFoodFillTypes = function() end - canBeSold = function() end - hasWater = function() end - onIntervalModulesUpdate = function() end - registerHusbandryToMission = function() end - loadSpecValueNumberAnimals = function() end - saveToXMLFile = function() end - isSimilarHusbandryRegistered = function() end - getFoodFilltypeInfo = function() end - getModuleByName = function() end - getSupportsRiding = function() end - getCanBePlacedAt = function() end - setAnimalDirt = function() end - getPalletsFilltypeInfo = function() end - addSingleAnimal = function() end - readStream = function() end - removeAnimals = function() end - getGlobalProductionFactor = function() end - cleanAnimal = function() end - removeRideable = function() end - GAME_LIMIT = 10.000000 - addRideable = function() end - superClass = function() end - getFilltype = function() end - addPendingAnimal = function() end - NO_FILLTYPE_INFOS = { - } - dayChanged = function() end - onSell = function() end - load = function() end - classId = 22.000000 - getAnimalName = function() end - addAnimals = function() end - getMinutesUntilNextAnimal = function() end - loadModules = function() end - getAnimalType = function() end - writeUpdateStream = function() end - writeStream = function() end - className = 'AnimalHusbandry' - getFoodSpillageFactor = function() end - getStrawFilltypeInfo = function() end - canAddMoreHusbandriesToGame = function() end - getModuleById = function() end - unregisterHusbandryToMission = function() end - delete = function() end - } - 23 = { - new = function() end - isa = function() end - delete = function() end - superClass = function() end - update = function() end - classId = 23.000000 - getIsInWater = function() end - removeFarAwayAnimals = function() end - copy = function() end - countSpawned = function() end - class = function() end - createAnimals = function() end - getClosestDistance = function() end - load = function() end - groundRaycastCallback = function() end - getTerrainHeightWithProps = function() end - className = 'LightWildlife' - removeAllAnimals = function() end - } - 24 = { - getAverageLocationOfIdleAnimals = function() end - treeSearchCallback = function() end - searchTree = function() end - new = function() end - isa = function() end - CROW_STATES = { - 1 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'default' - } - 2 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'fly_glide' - } - 3 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'fly' - } - 4 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'land' - } - 5 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'takeOff' - } - 6 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'idle_walk' - } - 7 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'idle_eat' - } - 8 = { - class = { -TABLE_EXCEED_DEPTH - } - id = 'idle_attention' - } - } - load = function() end - createAnimals = function() end - delete = function() end - className = 'CrowsWildlife' - superClass = function() end - CROW_SOUND_STATES = { - NONE = 1.000000 - CALM_AIR = 3.000000 - CALM_GROUND = 2.000000 - BUSY = 4.000000 - TAKEOFF = 5.000000 - } - class = function() end - copy = function() end - update = function() end - classId = 24.000000 - } - 25 = { - getValueScale = function() end - new = function() end - isa = function() end - getFillTypeIndex = function() end - delete = function() end - createFromFillType = function() end - superClass = function() end - clean = function() end - loadFromXMLFile = function() end - createFromXMLFile = function() end - getDirtScale = function() end - classId = 25.000000 - getOwner = function() end - readStream = function() end - getSubType = function() end - copy = function() end - getVisualId = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Animal' - saveToXMLFile = function() end - setVisualId = function() end - getValue = function() end - setOwner = function() end - setDirtScale = function() end - getIsInUse = function() end - } - 26 = { - getValueScale = function() end - new = function() end - isa = function() end - onFitnessChangedCallback = function() end - updateFitness = function() end - superClass = function() end - onLoadedRideable = function() end - loadFromXMLFile = function() end - deactivateRiding = function() end - getTodaysRidingTime = function() end - classId = 26.000000 - readStream = function() end - DAILY_TARGET_RIDING_TIME = 300000.000000 - setHealthScale = function() end - copy = function() end - setFitnessScale = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - setName = function() end - saveToXMLFile = function() end - getFitnessScale = function() end - getName = function() end - getHealthScale = function() end - DAILY_MINIMUM_RIDING_TIME = 60000.000000 - className = 'Horse' - } - 27 = { - getIsRideableSetupDone = function() end - isOnHusbandyGround = function() end - activateRiding = function() end - tryToFinishRideable = function() end - deactivateRiding = function() end - delete = function() end - superClass = function() end - loadFromXMLFile = function() end - classId = 27.000000 - onLoadedRideable = function() end - readStream = function() end - copy = function() end - onDirtChangedCallback = function() end - class = function() end - getCanBeRidden = function() end - new = function() end - writeStream = function() end - className = 'RideableAnimal' - saveToXMLFile = function() end - setVisualId = function() end - isa = function() end - finishRideable = function() end - setDirtScale = function() end - getIsInUse = function() end - } - 28 = { - onCreate = function() end - new = function() end - getInteractionPosition = function() end - delete = function() end - updateTick = function() end - update = function() end - STATE_FERMENTED = 2.000000 - getCanInteract = function() end - copy = function() end - saveToXMLFile = function() end - getCanOpenSilo = function() end - setState = function() end - readStream = function() end - clearSiloArea = function() end - isa = function() end - getCanCloseSilo = function() end - getIsCloserToFront = function() end - STATE_DRAIN = 3.000000 - superClass = function() end - switchFillTypeAtOffset = function() end - classId = 28.000000 - onChangedFillLevelCallback = function() end - STATE_CLOSED = 1.000000 - interactionTriggerCallback = function() end - COMPACTING_BASE_MASS = 5.000000 - className = 'BunkerSilo' - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - load = function() end - STATE_FILL = 0.000000 - openSilo = function() end - getBunkerAreaOffset = function() end - NUM_STATES = 4.000000 - updateFillLevel = function() end - loadFromXMLFile = function() end - } - 31 = { - setTrainSystem = function() end - new = function() end - class = function() end - registerFunctions = function() end - className = 'RailroadVehicle' - superClass = function() end - isa = function() end - copy = function() end - classId = 31.000000 - } - 32 = { - onCreate = function() end - removeUnloadingStation = function() end - new = function() end - addUnloadingStation = function() end - isa = function() end - getSupportedFillTypes = function() end - getFreeCapacity = function() end - delete = function() end - load = function() end - superClass = function() end - register = function() end - loadFromXMLFile = function() end - getCapacity = function() end - update = function() end - classId = 32.000000 - setOwnerFarmId = function() end - dayChanged = function() end - getIsFillTypeSupported = function() end - copy = function() end - getFillLevel = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Bga' - saveToXMLFile = function() end - setFillLevel = function() end - getFillTypeLiterPrice = function() end - updateTick = function() end - addDigestate = function() end - readStream = function() end - } - 34 = { - PREVIEW_RAMP_COLOR = { - 1 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 1.000000 - 4 = 1.000000 - } - 2 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 1.000000 - 4 = 1.000000 - } - 3 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 - 4 = 1.000000 - } - } - getTerrainModificationBlockingAreas = function() end - isInActionDistance = function() end - initPose = function() end - loadFromXMLFile = function() end - loadHotspotFromXML = function() end - initPlaceableType = function() end - onCreateGlowMaterial = function() end - getPrice = function() end - copy = function() end - getSpecValueIncomePerHour = function() end - setCollisionMask = function() end - getPositionSnapSize = function() end - isMapBound = function() end - hourChanged = function() end - clearFoliageAndTipAreas = function() end - canBuy = function() end - isa = function() end - getRotationSnapAngle = function() end - getSellPrice = function() end - deleteFinal = function() end - getPositionSnapOffset = function() end - getIsPlayerInRange = function() end - getNeedsSaving = function() end - alignToTerrain = function() end - loadAreasFromXML = function() end - load = function() end - collectPickObjects = function() end - setPlaceablePreviewState = function() end - PREVIEW_COLOR = { - 1 = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 0.000000 - 4 = 1.000000 - } - 2 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 0.000000 - 4 = 1.000000 - } - 3 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 - 4 = 1.000000 - } - } - finalizePlacement = function() end - setPreviewMaterials = function() end - new = function() end - loadSpecValueIncomePerHour = function() end - RAMP_PREVIEW_THICKNESS = 0.200000 - delete = function() end - getDailyUpkeep = function() end - updateTick = function() end - update = function() end - setOwnerFarmId = function() end - getIsAreaOwned = function() end - canBeSold = function() end - getName = function() end - loadAreaFromXML = function() end - PREVIEW_STATE = { - INVALID = 3.000000 - VALID = 2.000000 - CHECKING = 1.000000 - } - getCanBePlacedAt = function() end - getPlacementRotation = function() end - superClass = function() end - dayChanged = function() end - onSell = function() end - saveToXMLFile = function() end - createNode = function() end - readUpdateStream = function() end - loadFoliageAreaFromXML = function() end - class = function() end - writeUpdateStream = function() end - classId = 34.000000 - writeStream = function() end - className = 'Placeable' - onBuy = function() end - readStream = function() end - setTipOcclusionAreaDirty = function() end - getPlacementPosition = function() end - RAMP_PREVIEW_PATH = '$data/placeables/shared/rampPreview.i3d' - weatherChanged = function() end - } - 35 = { - finalizePlacement = function() end - readStream = function() end - isa = function() end - delete = function() end - initPose = function() end - loadFromXMLFile = function() end - createNode = function() end - classId = 35.000000 - copy = function() end - class = function() end - className = 'WindTurbinePlaceable' - writeStream = function() end - load = function() end - saveToXMLFile = function() end - update = function() end - superClass = function() end - hourChanged = function() end - new = function() end - updateHeadRotation = function() end - } - 36 = { - updateHeadRotation = function() end - new = function() end - isa = function() end - delete = function() end - initPose = function() end - loadFromXMLFile = function() end - createNode = function() end - deleteFinal = function() end - copy = function() end - class = function() end - superClass = function() end - update = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - classId = 36.000000 - readStream = function() end - hourChanged = function() end - className = 'SolarCollectorPlaceable' - finalizePlacement = function() end - } - 37 = { - new = function() end - class = function() end - delete = function() end - className = 'BeehivePlaceable' - superClass = function() end - isa = function() end - load = function() end - hourChanged = function() end - copy = function() end - classId = 37.000000 - } - 38 = { - finalizePlacement = function() end - readStream = function() end - setWaterTankFillLevel = function() end - isa = function() end - addFillLevelFromTool_OLD = function() end - delete = function() end - onWaterTankTrigger = function() end - superClass = function() end - removeWaterTrailer = function() end - loadFromXMLFile = function() end - addWaterTrailer = function() end - createNode = function() end - classId = 38.000000 - setManureFillLevel = function() end - getShowInfo = function() end - setIsWaterTankFilling = function() end - copy = function() end - getAllowFillTypeFromTool = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - update = function() end - updateTick = function() end - hourChanged = function() end - className = 'GreenhousePlaceable' - new = function() end - } - 39 = { - onHandtoolDelete = function() end - new = function() end - isa = function() end - delete = function() end - activateHandtool = function() end - superClass = function() end - updateTick = function() end - getIsActiveForInput = function() end - update = function() end - setIsTurnedOn = function() end - copy = function() end - class = function() end - canBeSold = function() end - classId = 39.000000 - getHighPressureWasherLoad = function() end - className = 'HighPressureWasher' - onDeactivate = function() end - load = function() end - getIsActiveForSound = function() end - readStream = function() end - onPlayerDelete = function() end - writeStream = function() end - } - 40 = { - finalizePlacement = function() end - saveToXMLFile = function() end - new = function() end - readStream = function() end - class = function() end - getNeedsSaving = function() end - copy = function() end - delete = function() end - className = 'TreePlaceable' - superClass = function() end - writeStream = function() end - loadFromXMLFile = function() end - isa = function() end - createNode = function() end - classId = 40.000000 - } - 41 = { - finalizePlacement = function() end - new = function() end - isa = function() end - delete = function() end - getSpecValueVolume = function() end - superClass = function() end - loadFromXMLFile = function() end - classId = 41.000000 - setOwnerFarmId = function() end - copy = function() end - loadSpecValueVolume = function() end - class = function() end - canBeSold = function() end - getCanBePlacedAt = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - onSell = function() end - readStream = function() end - initPlaceableType = function() end - className = 'SiloExtensionPlaceable' - PRICE_SELL_FACTOR = 0.600000 - } - 42 = { - finalizePlacement = function() end - new = function() end - class = function() end - copy = function() end - delete = function() end - className = 'WoodCrusherPlaceable' - superClass = function() end - onCrushedSplitShape = function() end - updateTick = function() end - isa = function() end - update = function() end - classId = 42.000000 - } - 43 = { - onUpdateEvent = function() end - readStream = function() end - isa = function() end - delete = function() end - superClass = function() end - updateTick = function() end - update = function() end - classId = 43.000000 - copy = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - load = function() end - collectPickObjects = function() end - className = 'HeatingPlantPlaceable' - new = function() end - } - 44 = { - setOwnerFarmId = function() end - new = function() end - class = function() end - delete = function() end - className = 'Workshop' - superClass = function() end - load = function() end - isa = function() end - copy = function() end - classId = 44.000000 - } - 45 = { - finalizePlacement = function() end - canBuy = function() end - new = function() end - isa = function() end - delete = function() end - unregisterDoghouseToMission = function() end - superClass = function() end - registerDoghouseToMission = function() end - loadFromXMLFile = function() end - isDoghouseRegistered = function() end - update = function() end - classId = 45.000000 - setOwnerFarmId = function() end - playerInteractionTriggerCallback = function() end - drawActivate = function() end - copy = function() end - getIsActivatable = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Doghouse' - saveToXMLFile = function() end - onActivateObject = function() end - drawDogName = function() end - setFoodVisibility = function() end - readStream = function() end - getCanBePlacedAt = function() end - } - 46 = { - new = function() end - class = function() end - delete = function() end - className = 'WaterTower' - superClass = function() end - load = function() end - isa = function() end - copy = function() end - classId = 46.000000 - } - 47 = { - finalizePlacement = function() end - new = function() end - isa = function() end - setAmount = function() end - delete = function() end - getSpecValueVolume = function() end - superClass = function() end - loadFromXMLFile = function() end - initPlaceableType = function() end - setOwnerFarmId = function() end - copy = function() end - loadSpecValueVolume = function() end - class = function() end - canBeSold = function() end - onSell = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - collectPickObjects = function() end - classId = 47.000000 - readStream = function() end - className = 'SiloPlaceable' - PRICE_SELL_FACTOR = 0.700000 - } - 48 = { - finalizePlacement = function() end - saveToXMLFile = function() end - new = function() end - load = function() end - class = function() end - readStream = function() end - writeStream = function() end - delete = function() end - className = 'SellingStationPlaceable' - superClass = function() end - collectPickObjects = function() end - loadFromXMLFile = function() end - isa = function() end - copy = function() end - classId = 48.000000 - } - 49 = { - finalizePlacement = function() end - new = function() end - class = function() end - readStream = function() end - writeStream = function() end - delete = function() end - className = 'BuyingStationPlaceable' - superClass = function() end - collectPickObjects = function() end - load = function() end - isa = function() end - copy = function() end - classId = 49.000000 - } - 50 = { - onCreate = function() end - registerActionEventsWhenInRange = function() end - new = function() end - updateActionEventTexts = function() end - isa = function() end - removeActionEvents = function() end - delete = function() end - superClass = function() end - loadFromXMLFile = function() end - update = function() end - classId = 50.000000 - setFrameValues = function() end - className = 'AnimatedObject' - triggerCallback = function() end - copy = function() end - setAnimTime = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - readStream = function() end - onAnimationInputToggle = function() end - hourChanged = function() end - loadFrameValues = function() end - onAnimationInputContinuous = function() end - } - 51 = { - onCreate = function() end - new = function() end - class = function() end - delete = function() end - className = 'AnimatedMapObject' - superClass = function() end - load = function() end - isa = function() end - copy = function() end - classId = 51.000000 - } - 52 = { - new = function() end - class = function() end - onDeleteObject = function() end - delete = function() end - load = function() end - superClass = function() end - className = 'VehiclePlaceable' - loadFromXMLFile = function() end - copy = function() end - isa = function() end - classId = 52.000000 - } - 53 = { - canBuy = function() end - new = function() end - isa = function() end - delete = function() end - getSpawnPoint = function() end - sleepingTriggerCallback = function() end - getIsActivatable = function() end - classId = 53.000000 - canPlaceHouse = function() end - getSpawnWorldPosition = function() end - copy = function() end - class = function() end - onActivateObject = function() end - className = 'FarmhousePlaceable' - drawActivate = function() end - load = function() end - getSleepCamera = function() end - superClass = function() end - getCanBePlacedAt = function() end - } - 55 = { - setIsTrainTabbable = function() end - new = function() end - getElectricitySplineLength = function() end - isa = function() end - onLoadFinished = function() end - getSplineLength = function() end - delete = function() end - onDeleteObject = function() end - superClass = function() end - load = function() end - loadFromXMLFile = function() end - removeSplinePositionUpdateListener = function() end - update = function() end - classId = 55.000000 - setSplineTime = function() end - updateTrainLength = function() end - readStream = function() end - copy = function() end - updateTrainPositionByLocomotiveSpeed = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'TrainPlaceable' - saveToXMLFile = function() end - addSplinePositionUpdateListener = function() end - getSplineTime = function() end - getElectricitySpline = function() end - setRequestedSplinePosition = function() end - updateTrainPositionByLocomotiveSplinePosition = function() end - } - 56 = { - new = function() end - isa = function() end - delete = function() end - superClass = function() end - woodTriggerCallback = function() end - getIsActivatable = function() end - classId = 56.000000 - copy = function() end - woodSellTriggerCallback = function() end - class = function() end - onActivateObject = function() end - className = 'WoodSellStationPlaceable' - sellWood = function() end - drawActivate = function() end - load = function() end - removeUpdateEventListener = function() end - calculateBaseValue = function() end - addUpdateEventListener = function() end - } - 57 = { - finalizePlacement = function() end - new = function() end - isa = function() end - delete = function() end - superClass = function() end - loadFromXMLFile = function() end - classId = 57.000000 - setOwnerFarmId = function() end - copy = function() end - class = function() end - writeStream = function() end - load = function() end - saveToXMLFile = function() end - collectPickObjects = function() end - onFarmlandStateChanged = function() end - updateOwnership = function() end - className = 'BgaPlaceable' - readStream = function() end - } - 58 = { - saveToXMLFile = function() end - finalizePlacement = function() end - load = function() end - new = function() end - onSell = function() end - class = function() end - writeStream = function() end - readStream = function() end - delete = function() end - className = 'BunkerSiloPlaceable' - superClass = function() end - collectPickObjects = function() end - loadFromXMLFile = function() end - isa = function() end - copy = function() end - classId = 58.000000 - } - 59 = { - new = function() end - isa = function() end - removeActionEvents = function() end - delete = function() end - getDailyUpkeep = function() end - onDeactivate = function() end - handToolTypes = { - chainsaw = { - isCuttingAllowed = function() end - updateDelimb = function() end - new = function() end - testTooLow = function() end - updateParticles = function() end - delete = function() end - onDeactivate = function() end - updateCuttingTimers = function() end - update = function() end - copy = function() end - resetTransitionState = function() end - calculateCutDuration = function() end - CAMERA_TRANSITION_STATES = { -TABLE_EXCEED_DEPTH - } - updateCuttingCamera = function() end - getLookAt = function() end - SOUND_STATES = { -TABLE_EXCEED_DEPTH - } - isa = function() end - registerActionEvents = function() end - updateCutRaycast = function() end - superClass = function() end - cutRaycastCallback = function() end - setCutting = function() end - classId = 60.000000 - class = function() end - getChainSpeedFactor = function() end - onInputRotate = function() end - onActivate = function() end - updateRingSelector = function() end - isBeingUsed = function() end - getCutShapeInformation = function() end - load = function() end - className = 'Chainsaw' - updateChainsawModel = function() end - getCutStartEnd = function() end - } - highPressureWasherLance = { - isBeingUsed = function() end - copy = function() end - isa = function() end - new = function() end - setIsWashing = function() end - class = function() end - cleanVehicle = function() end - washRaycastCallback = function() end - delete = function() end - load = function() end - superClass = function() end - onDeactivate = function() end - className = 'HighPressureWasherLance' - getIsActiveForInput = function() end - update = function() end - classId = 61.000000 - } - } - loadFromXMLFile = function() end - update = function() end - classId = 59.000000 - copy = function() end - class = function() end - registerActionEvents = function() end - isBeingUsed = function() end - onActivate = function() end - load = function() end - saveToXMLFile = function() end - dayChanged = function() end - getSellPrice = function() end - setHandNode = function() end - superClass = function() end - className = 'HandTool' - } - 60 = { - isCuttingAllowed = function() end - updateDelimb = function() end - new = function() end - testTooLow = function() end - updateParticles = function() end - delete = function() end - onDeactivate = function() end - updateCuttingTimers = function() end - update = function() end - copy = function() end - resetTransitionState = function() end - calculateCutDuration = function() end - CAMERA_TRANSITION_STATES = { - IN = 0.000000 - NONE = -1.000000 - OUT = 2.000000 - CUT = 1.000000 - } - updateCuttingCamera = function() end - getLookAt = function() end - SOUND_STATES = { - ACTIVE = 4.000000 - STOP = 2.000000 - QUICKTAP = 6.000000 - START = 1.000000 - IDLE = 3.000000 - CUT = 5.000000 - } - isa = function() end - registerActionEvents = function() end - updateCutRaycast = function() end - superClass = function() end - cutRaycastCallback = function() end - setCutting = function() end - classId = 60.000000 - class = function() end - getChainSpeedFactor = function() end - onInputRotate = function() end - onActivate = function() end - updateRingSelector = function() end - isBeingUsed = function() end - getCutShapeInformation = function() end - load = function() end - className = 'Chainsaw' - updateChainsawModel = function() end - getCutStartEnd = function() end - } - 61 = { - isBeingUsed = function() end - copy = function() end - isa = function() end - new = function() end - setIsWashing = function() end - class = function() end - cleanVehicle = function() end - washRaycastCallback = function() end - delete = function() end - load = function() end - superClass = function() end - onDeactivate = function() end - className = 'HighPressureWasherLance' - getIsActiveForInput = function() end - update = function() end - classId = 61.000000 - } - 62 = { - onCreate = function() end - new = function() end - class = function() end - load = function() end - copy = function() end - delete = function() end - className = 'Basketball' - superClass = function() end - writeStream = function() end - readStream = function() end - isa = function() end - createNode = function() end - classId = 62.000000 - } - 63 = { - reset = function() end - RESET_DISTANCE = 100.000000 - new = function() end - load = function() end - class = function() end - readStream = function() end - isa = function() end - delete = function() end - className = 'DogBall' - superClass = function() end - writeStream = function() end - updateTick = function() end - copy = function() end - createNode = function() end - classId = 63.000000 - } - 65 = { - readStream = function() end - isa = function() end - removeUnloadingStation = function() end - removeLoadingStation = function() end - delete = function() end - addLoadingStation = function() end - superClass = function() end - farmDestroyed = function() end - loadFromXMLFile = function() end - getCapacity = function() end - addUnloadingStation = function() end - classId = 65.000000 - getFillLevel = function() end - getSupportedFillTypes = function() end - getIsFillTypeSupported = function() end - copy = function() end - load = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Storage' - saveToXMLFile = function() end - empty = function() end - setFillLevel = function() end - hourChanged = function() end - getFreeCapacity = function() end - new = function() end - } - 66 = { - merge = function() end - getUserPermissions = function() end - farmPropertyChanged = function() end - new = function() end - getFarmhouse = function() end - getNumActivePlayers = function() end - getHandTools = function() end - COLOR_SPECTATOR = { - 1 = 0.000000 - 2 = 0.000000 - 3 = 0.000000 - 4 = 0.000000 - } - delete = function() end - setUserPermission = function() end - EQUITY_LOAN_RATIO = 0.800000 - loadFromXMLFile = function() end - calculateDailyLoanInterest = function() end - removeHandTool = function() end - updateLastNickname = function() end - copy = function() end - onUserQuitGame = function() end - getActiveUsers = function() end - canBeDestroyed = function() end - isUserFarmManager = function() end - DEFAULT_PERMISSIONS = { - } - NO_PERMISSIONS = { - } - saveToXMLFile = function() end - removeUser = function() end - addUser = function() end - addHandTool = function() end - hasHandtool = function() end - dayChanged = function() end - getLoan = function() end - getBalance = function() end - changeBalance = function() end - readStream = function() end - MAX_LOAN = 3000000.000000 - getSleepCamera = function() end - promoteUser = function() end - updateMaxLoan = function() end - getEquity = function() end - onUserJoinGame = function() end - getSpawnPoint = function() end - getIsContractingFor = function() end - COLORS = { - 1 = { - 1 = 0.250000 - 2 = 1.000000 - 3 = 0.250000 - 4 = 1.000000 - } - 2 = { - 1 = 0.000000 - 2 = 0.044600 - 3 = 0.187000 - 4 = 1.000000 - } - 3 = { - 1 = 0.938600 - 2 = 0.467800 - 3 = 0.012300 - 4 = 1.000000 - } - 4 = { - 1 = 0.883200 - 2 = 0.163600 - 3 = 0.004600 - 4 = 1.000000 - } - 5 = { - 1 = 0.573200 - 2 = 0.005000 - 3 = 0.005000 - 4 = 1.000000 - } - 6 = { - 1 = 0.000000 - 2 = 0.234800 - 3 = 0.796900 - 4 = 1.000000 - } - 7 = { - 1 = 0.887900 - 2 = 0.054500 - 3 = 0.300500 - 4 = 1.000000 - } - 8 = { - 1 = 0.090800 - 2 = 0.004000 - 3 = 0.130100 - 4 = 1.000000 - } - } - getColor = function() end - setIsContractingFor = function() end - classId = 66.000000 - demoteUser = function() end - setInitialEconomy = function() end - getNumPlayers = function() end - COLOR_SEND_NUM_BITS = 4.000000 - LOAN_INTEREST_RATE = 100.000000 - PERMISSIONS = { - 1 = 'buyVehicle' - 2 = 'sellVehicle' - 3 = 'buyPlaceable' - 4 = 'sellPlaceable' - 5 = 'manageContracts' - 6 = 'tradeAnimals' - 7 = 'createFields' - 8 = 'hireAssistant' - 9 = 'resetVehicle' - 10 = 'manageRights' - 11 = 'transferMoney' - 12 = 'manageContracts' - 13 = 'updateFarm' - 14 = 'manageContracting' - } - writeUpdateStream = function() end - readUpdateStream = function() end - writeStream = function() end - className = 'Farm' - resetToSingleplayer = function() end - superClass = function() end - class = function() end - MIN_LOAN = 500000.000000 - PERMISSION = { - MANAGE_RIGHTS = 'manageRights' - UPDATE_FARM = 'updateFarm' - MANAGE_CONTRACTING = 'manageContracting' - TRADE_ANIMALS = 'tradeAnimals' - TRANSFER_MONEY = 'transferMoney' - RESET_VEHICLE = 'resetVehicle' - SELL_VEHICLE = 'sellVehicle' - SELL_PLACEABLE = 'sellPlaceable' - BUY_PLACEABLE = 'buyPlaceable' - BUY_VEHICLE = 'buyVehicle' - CREATE_FIELDS = 'createFields' - HIRE_ASSISTANT = 'hireAssistant' - MANAGE_CONTRACTS = 'manageContracts' - } - isa = function() end - } - 67 = { - calculateStealingCost = function() end - new = function() end - delete = function() end - getCompletion = function() end - loadFromXMLFile = function() end - init = function() end - update = function() end - copy = function() end - getExtraProgressText = function() end - saveToXMLFile = function() end - readStream = function() end - getNPC = function() end - isa = function() end - validate = function() end - farmDestroyed = function() end - SUCCESS_FACTOR = 0.950000 - hasField = function() end - classId = 67.000000 - STATUS_STOPPED = 0.000000 - updateTick = function() end - start = function() end - getData = function() end - STATUS_FINISHED = 2.000000 - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - dismiss = function() end - className = 'AbstractMission' - writeStream = function() end - started = function() end - finish = function() end - hasLeasableVehicles = function() end - superClass = function() end - STATUS_RUNNING = 1.000000 - } - 68 = { - destroyMapMarker = function() end - new = function() end - isSpawnSpaceAvailable = function() end - REWARD_PER_HA = 800.000000 - delete = function() end - loadNextVehicleCallback = function() end - getCompletion = function() end - loadFromXMLFile = function() end - init = function() end - update = function() end - getMaxCutLiters = function() end - REIMBURSEMENT_FACTOR = 0.950000 - copy = function() end - loadNextVehicle = function() end - getFieldSize = function() end - hasLeasableVehicles = function() end - saveToXMLFile = function() end - FIELD_SIZE_MEDIUM = 1.500000 - resetField = function() end - readStream = function() end - getNPC = function() end - isa = function() end - canRunOnField = function() end - hasMapMarker = function() end - createMapMarkerAtSellingStation = function() end - calculateReimbursement = function() end - superClass = function() end - addToMissionMap = function() end - VEHICLE_USE_COST = 200.000000 - getVehicleGroup = function() end - hasField = function() end - classId = 68.000000 - calculateVehicleUseCost = function() end - calculateReward = function() end - onVehicleReset = function() end - finish = function() end - getFieldCompletion = function() end - class = function() end - getVehicleGroupFromIdentifier = function() end - started = function() end - dismiss = function() end - className = 'AbstractFieldMission' - removeAccess = function() end - completeField = function() end - writeStream = function() end - getVehicleVariant = function() end - FIELD_SIZE_LARGE = 5.000000 - start = function() end - } - 69 = { - validate = function() end - readStream = function() end - getStationName = function() end - isa = function() end - fillSold = function() end - canRunOnField = function() end - delete = function() end - getData = function() end - superClass = function() end - getCompletion = function() end - loadFromXMLFile = function() end - init = function() end - REWARD_PER_HA_HAY = 3000.000000 - classId = 69.000000 - SILAGE_VARIANT_CHANCE = 0.500000 - new = function() end - roundToWholeBales = function() end - copy = function() end - REWARD_PER_HA_SILAGE = 3300.000000 - class = function() end - update = function() end - partitionCompletion = function() end - writeStream = function() end - className = 'BaleMission' - saveToXMLFile = function() end - completeField = function() end - start = function() end - getVehicleVariant = function() end - FILL_SUCCESS_FACTOR = 0.900000 - updateRewardPerHa = function() end - } - 70 = { - validate = function() end - new = function() end - partitionCompletion = function() end - isa = function() end - getData = function() end - REWARD_PER_HA = 600.000000 - canRunOnField = function() end - className = 'CultivateMission' - superClass = function() end - completeField = function() end - finish = function() end - class = function() end - copy = function() end - classId = 70.000000 - } - 71 = { - REIMBURSEMENT_PER_HA = 950.000000 - copy = function() end - validate = function() end - isa = function() end - partitionCompletion = function() end - REWARD_PER_HA = 400.000000 - getData = function() end - className = 'FertilizeMission' - superClass = function() end - completeField = function() end - canRunOnField = function() end - new = function() end - class = function() end - classId = 71.000000 - } - 72 = { - calculateStealingCost = function() end - new = function() end - delete = function() end - getCompletion = function() end - loadFromXMLFile = function() end - init = function() end - update = function() end - copy = function() end - REWARD_PER_HA_SMALL = 4800.000000 - createModifiers = function() end - getExtraProgressText = function() end - fillSold = function() end - readStream = function() end - getStationName = function() end - isa = function() end - FAILURE_COST_OF_TOTAL = 0.950000 - superClass = function() end - getHighestSellPointPrice = function() end - start = function() end - classId = 72.000000 - validate = function() end - REWARD_PER_HA_WIDE = 1500.000000 - getData = function() end - getFruitInVehicles = function() end - class = function() end - FAILURE_COST_FACTOR = 0.100000 - partitionCompletion = function() end - writeStream = function() end - className = 'HarvestMission' - saveToXMLFile = function() end - completeField = function() end - finish = function() end - getVehicleVariant = function() end - canRunOnField = function() end - updateRewardPerHa = function() end - } - 73 = { - validate = function() end - new = function() end - partitionCompletion = function() end - isa = function() end - getData = function() end - REWARD_PER_HA = 1400.000000 - canRunOnField = function() end - className = 'PlowMission' - superClass = function() end - completeField = function() end - finish = function() end - class = function() end - copy = function() end - classId = 73.000000 - } - 74 = { - readStream = function() end - isa = function() end - REWARD_PER_HA = 1000.000000 - superClass = function() end - loadFromXMLFile = function() end - init = function() end - decideFruitType = function() end - classId = 74.000000 - validate = function() end - finish = function() end - getData = function() end - copy = function() end - canRunOnField = function() end - class = function() end - createModifier = function() end - partitionCompletion = function() end - writeStream = function() end - className = 'SowMission' - saveToXMLFile = function() end - completeField = function() end - updateReimbursement = function() end - getVehicleVariant = function() end - start = function() end - new = function() end - } - 75 = { - resetField = function() end - canRunOnField = function() end - getNewWeedState = function() end - isa = function() end - REWARD_PER_HA = 250.000000 - superClass = function() end - start = function() end - classId = 75.000000 - REIMBURSEMENT_PER_HA = 1000.000000 - getData = function() end - class = function() end - partitionCompletion = function() end - className = 'SprayMission' - completeField = function() end - validate = function() end - new = function() end - copy = function() end - } - 76 = { - getPickupTrigger = function() end - new = function() end - hasHotspots = function() end - delete = function() end - createHotspot = function() end - getCompletion = function() end - loadFromXMLFile = function() end - init = function() end - update = function() end - objectLeftTrigger = function() end - getTriggerInfo = function() end - getDropoffTrigger = function() end - REWARD_PER_METER = 0.200000 - destroyHotspots = function() end - createHotspots = function() end - updateTriggerVisibility = function() end - calculateReward = function() end - readStream = function() end - getNPC = function() end - isa = function() end - createObject = function() end - superClass = function() end - canRun = function() end - getData = function() end - getTriggerTitle = function() end - start = function() end - CONTRACT_DURATION = 115200000.000000 - objectEnteredTrigger = function() end - collisionTestCallback = function() end - isTriggerEmpty = function() end - finish = function() end - TEST_HEIGHT = 50.000000 - class = function() end - CONTRACT_DURATION_VAR = 57600000.000000 - copy = function() end - dismiss = function() end - className = 'TransportMission' - writeStream = function() end - NUM_OBJECTS_PER_DRIVE = 5.000000 - saveToXMLFile = function() end - loadObjects = function() end - REWARD_PER_OBJECT = 200.000000 - classId = 76.000000 - } - 77 = { - new = function() end - validate = function() end - isa = function() end - partitionCompletion = function() end - REWARD_PER_HA = 400.000000 - getData = function() end - className = 'WeedMission' - superClass = function() end - completeField = function() end - canRunOnField = function() end - class = function() end - copy = function() end - classId = 77.000000 - } - 78 = { - onCreate = function() end - new = function() end - isa = function() end - setEnabled = function() end - delete = function() end - superClass = function() end - onIndoorStateChanged = function() end - updateTick = function() end - update = function() end - classId = 78.000000 - reset = function() end - copy = function() end - class = function() end - writeUpdateStream = function() end - readUpdateStream = function() end - setNightTimeRange = function() end - className = 'TrafficSystem' - load = function() end - } - 139 = { - new = function() end - isa = function() end - delete = function() end - className = 'FillTriggerPlaceable' - superClass = function() end - load = function() end - class = function() end - copy = function() end - classId = 139.000000 - } -} ObjectIds.OBJECT_OBJECT = 3.000000 ObjectIds.OBJECT_ANIMAL = 25.000000 function ObjectIds:assignObjectClassId() end @@ -2394,14 +75,14 @@ ObjectIds.OBJECT_PLAYER = 1.000000 ObjectIds.OBJECT_UNLOADING_STATION = 15.000000 ObjectIds.objectClasses = { FillTriggerPlaceable = { - new = function() end - isa = function() end - delete = function() end - className = 'FillTriggerPlaceable' - superClass = function() end - load = function() end - class = function() end - copy = function() end + new = function() end, + isa = function() end, + delete = function() end, + className = 'FillTriggerPlaceable', + superClass = function() end, + load = function() end, + class = function() end, + copy = function() end, classId = 139.000000 } } @@ -2414,79 +95,7 @@ ObjectIds.OBJECT_RAILROADVEHICLE = 31.000000 ObjectIds.OBJECT_LOAD_TRIGGER = 14.000000 function ObjectIds:getObjectClassById() end ObjectIds.OBJECT_TREE_PLACEABLE = 40.000000 -ObjectIds.objectIdsUsed = { - 1 = true - 2 = true - 3 = true - 4 = true - 5 = true - 6 = true - 9 = true - 10 = true - 11 = true - 13 = true - 14 = true - 15 = true - 16 = true - 17 = true - 18 = true - 19 = true - 20 = true - 21 = true - 22 = true - 23 = true - 24 = true - 25 = true - 26 = true - 27 = true - 28 = true - 31 = true - 32 = true - 34 = true - 35 = true - 36 = true - 37 = true - 38 = true - 39 = true - 40 = true - 41 = true - 42 = true - 43 = true - 44 = true - 45 = true - 46 = true - 47 = true - 48 = true - 49 = true - 50 = true - 51 = true - 52 = true - 53 = true - 55 = true - 56 = true - 57 = true - 58 = true - 59 = true - 60 = true - 61 = true - 62 = true - 63 = true - 65 = true - 66 = true - 67 = true - 68 = true - 69 = true - 70 = true - 71 = true - 72 = true - 73 = true - 74 = true - 75 = true - 76 = true - 77 = true - 78 = true - 139 = true -} +ObjectIds.objectIdsUsed = {} ObjectIds.OBJECT_BUNKER_SILO = 28.000000 ObjectIds.MISSION_BALE = 69.000000 ObjectIds.OBJECT_DOG = 11.000000 diff --git a/placeables/Placeable.lua b/placeables/Placeable.lua index 80624e2..e2d1426 100644 --- a/placeables/Placeable.lua +++ b/placeables/Placeable.lua @@ -2,49 +2,49 @@ Placeable = {} Placeable.PREVIEW_RAMP_COLOR = { 1 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 - } + }, 2 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 - } + }, 3 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 0.000000, + 3 = 0.000000, 4 = 1.000000 } } Placeable.PREVIEW_COLOR = { 1 = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, 2 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 0.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, 3 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 0.000000, + 3 = 0.000000, 4 = 1.000000 } } Placeable.PREVIEW_STATE = { - INVALID = 3.000000 - VALID = 2.000000 + INVALID = 3.000000, + VALID = 2.000000, CHECKING = 1.000000 } diff --git a/player/Player.lua b/player/Player.lua index 67bd6c6..af9619b 100644 --- a/player/Player.lua +++ b/player/Player.lua @@ -6,17 +6,17 @@ Player.className = 'Player' Player.kinematicCollisionMask = 2148532228.000000 Player.COLLISIONMASK_TRIGGER = 1048576.000000 Player.INPUT_ACTIVE_TYPE = { - IS_DEBUG = 5.000000 - STARTS_DISABLED = 1.000000 - STARTS_ENABLED = 2.000000 - IS_CARRYING = 4.000000 + IS_DEBUG = 5.000000, + STARTS_DISABLED = 1.000000, + STARTS_ENABLED = 2.000000, + IS_CARRYING = 4.000000, IS_MOVEMENT = 3.000000 } Player.MAX_PICKABLE_OBJECT_DISTANCE = 3.000000 Player.movementCollisionMask = 2148532255.000000 Player.BUTTONSTATES = { - PRESSED = 2.000000 - RELEASED = 3.000000 + PRESSED = 2.000000, + RELEASED = 3.000000, JUST_PRESSED = 1.000000 } Player.INPUT_CONTEXT_NAME = 'PLAYER' diff --git a/player/PlayerModelManager.lua b/player/PlayerModelManager.lua index 747c8b5..d107c96 100644 --- a/player/PlayerModelManager.lua +++ b/player/PlayerModelManager.lua @@ -1,8 +1,8 @@ PlayerModelManager = {} PlayerModelManager.GENDERS = { - GENDER_MALE = 2.000000 - GENDER_FEMALE = 1.000000 + GENDER_MALE = 2.000000, + GENDER_FEMALE = 1.000000, GENDER_NONE = 0.000000 } PlayerModelManager.SEND_NUM_BITS = 2.000000 diff --git a/shop/StoreManager.lua b/shop/StoreManager.lua index c860731..aac2d88 100644 --- a/shop/StoreManager.lua +++ b/shop/StoreManager.lua @@ -1,10 +1,10 @@ StoreManager = {} StoreManager.CATEGORY_TYPE = { - VEHICLE = 'VEHICLE' - TOOL = 'TOOL' - NONE = '' - PLACEABLE = 'PLACEABLE' + VEHICLE = 'VEHICLE', + TOOL = 'TOOL', + NONE = '', + PLACEABLE = 'PLACEABLE', OBJECT = 'OBJECT' } diff --git a/terrainDeformation/Landscaping.lua b/terrainDeformation/Landscaping.lua index 682b732..d82c65d 100644 --- a/terrainDeformation/Landscaping.lua +++ b/terrainDeformation/Landscaping.lua @@ -3,22 +3,22 @@ Landscaping = {} Landscaping.MAX_SCULPT_EDGE_ANGLE = 1.047198 Landscaping.TERRAIN_UNIT = 2.000000 Landscaping.OPERATION = { - FLATTEN = 4.000000 - LOWER = 2.000000 - SMOOTH = 3.000000 + FLATTEN = 4.000000, + LOWER = 2.000000, + SMOOTH = 3.000000, RAISE = 1.000000 } Landscaping.SCULPT_BASE_COST_PER_M3 = 50.000000 Landscaping.OPERATION_NUM_SEND_BITS = 3.000000 Landscaping.BRUSH_SHAPE = { - CIRCLE = 2.000000 + CIRCLE = 2.000000, SQUARE = 1.000000 } Landscaping.BRUSH_SHAPE_NUM_SEND_BITS = 2.000000 Landscaping.OPERATION_HEIGHT_CHANGE_FACTOR_MAP = { - 4 = 0.000000 - 1 = 1.000000 - 2 =-1.000000 + 4 = 0.000000, + 1 = 1.000000, + 2 =-1.000000, 3 = 0.000000 } Landscaping.MAX_SCULPT_TOTAL_SLOPE_ANGLE = 1.308997 diff --git a/utils/HTMLUtil.lua b/utils/HTMLUtil.lua index e6628c6..5578b82 100644 --- a/utils/HTMLUtil.lua +++ b/utils/HTMLUtil.lua @@ -1,86 +1,86 @@ HTMLUtil = {} HTMLUtil.encodeEntities = { - æ = 'æ' - » = '»' - Ÿ = 'Ÿ' - ç = 'ç' - Ë = 'Ë' - Û = 'Û' - ë = 'ë' - û = 'û' - À = 'À' - ÿ = 'ÿ' - à = 'à' -  = 'Â' - < = '<' - ® = '®' - é = 'é' - > = '>' - â = 'â' - Ê = 'Ê' - ö = 'ö' - Î = 'Î' - ä = 'ä' - ê = 'ê' - ü = 'ü' - Ï = 'Ï' - ô = 'ô' - © = '©' - Ô = 'Ô' - î = 'î' - ù = 'ù' - È = 'È' - Œ = 'Œ' - ï = 'ï' - Æ = 'Æ' - É = 'É' - œ = 'œ' - è = 'è' - Ö = 'Ö' - Ç = 'Ç' - « = '«' + æ = 'æ', + » = '»', + Ÿ = 'Ÿ', + ç = 'ç', + Ë = 'Ë', + Û = 'Û', + ë = 'ë', + û = 'û', + À = 'À', + ÿ = 'ÿ', + à = 'à', +  = 'Â', + < = '<', + ® = '®', + é = 'é', + > = '>', + â = 'â', + Ê = 'Ê', + ö = 'ö', + Î = 'Î', + ä = 'ä', + ê = 'ê', + ü = 'ü', + Ï = 'Ï', + ô = 'ô', + © = '©', + Ô = 'Ô', + î = 'î', + ù = 'ù', + È = 'È', + Œ = 'Œ', + ï = 'ï', + Æ = 'Æ', + É = 'É', + œ = 'œ', + è = 'è', + Ö = 'Ö', + Ç = 'Ç', + « = '«', Ù = 'Ù' } HTMLUtil.decodeEntities = { - Yuml = 'Ÿ' - Ouml = 'Ö' - OElig = 'Œ' - uuml = 'ü' - ugrave = 'ù' - euml = 'ë' - amp = '&' - copy = '©' - ucirc = 'û' - ocirc = 'ô' - icirc = 'î' - reg = '®' - iuml = 'ï' - AElig = 'Æ' - oelig = 'œ' - agrave = 'à' - Agrave = 'À' - auml = 'ä' - Ecirc = 'Ê' - yuml = 'ÿ' - Acirc = 'Â' - raquo = '»' - egrave = 'è' - Egrave = 'È' - ouml = 'ö' - eacute = 'é' - aelig = 'æ' - ecirc = 'ê' - Icirc = 'Î' - Ucirc = 'Û' - laquo = '«' - Ugrave = 'Ù' - Iuml = 'Ï' - ccedil = 'ç' - Ccedil = 'Ç' - acirc = 'â' - Eacute = 'É' - Euml = 'Ë' + Yuml = 'Ÿ', + Ouml = 'Ö', + OElig = 'Œ', + uuml = 'ü', + ugrave = 'ù', + euml = 'ë', + amp = '&', + copy = '©', + ucirc = 'û', + ocirc = 'ô', + icirc = 'î', + reg = '®', + iuml = 'ï', + AElig = 'Æ', + oelig = 'œ', + agrave = 'à', + Agrave = 'À', + auml = 'ä', + Ecirc = 'Ê', + yuml = 'ÿ', + Acirc = 'Â', + raquo = '»', + egrave = 'è', + Egrave = 'È', + ouml = 'ö', + eacute = 'é', + aelig = 'æ', + ecirc = 'ê', + Icirc = 'Î', + Ucirc = 'Û', + laquo = '«', + Ugrave = 'Ù', + Iuml = 'Ï', + ccedil = 'ç', + Ccedil = 'Ç', + acirc = 'â', + Eacute = 'É', + Euml = 'Ë', Ocirc = 'Ô' } diff --git a/utils/RaycastUtil.lua b/utils/RaycastUtil.lua index b146d3c..3dffbbd 100644 --- a/utils/RaycastUtil.lua +++ b/utils/RaycastUtil.lua @@ -2,26 +2,26 @@ RaycastUtil = {} RaycastUtil.MASK_PUSHABLE_DYNAMIC_OBJECTS = 16789512.000000 RaycastUtil.MASK = { - KINEMATIC_OBJECTS_NO_COLLISION = 1073741824.000000 - TRAFFIC_VEHICLES_BLOCKING = 33554432.000000 - TRACTORS = 64.000000 - NON_PUSHABLE_1 = 2.000000 - NON_PUSHABLE_2 = 4.000000 - COMBINES = 128.000000 - AI_BLOCKING = 32.000000 - TRIGGER_ANIMALS = 268435456.000000 - TRAILERS = 256.000000 - TRIGGER_DYNAMIC_OBJECTS = 16777216.000000 - TRIGGER_TRACTORS = 2097152.000000 - TRIGGER_FORK = 134217728.000000 - STATIC_WORLD_1 = 8.000000 - TRIGGER_PLAYER = 1048576.000000 - DYNAMIC_OBJECT_MACHINES = 8192.000000 - STATIC_WORLD_2 = 16.000000 - TRIGGER_CUTTERS = 67108864.000000 - DYNAMIC_OBJECTS = 4096.000000 - TRIGGER_FILLABLES = 8388608.000000 - GROUND_TIP_BLOCKING = 524288.000000 + KINEMATIC_OBJECTS_NO_COLLISION = 1073741824.000000, + TRAFFIC_VEHICLES_BLOCKING = 33554432.000000, + TRACTORS = 64.000000, + NON_PUSHABLE_1 = 2.000000, + NON_PUSHABLE_2 = 4.000000, + COMBINES = 128.000000, + AI_BLOCKING = 32.000000, + TRIGGER_ANIMALS = 268435456.000000, + TRAILERS = 256.000000, + TRIGGER_DYNAMIC_OBJECTS = 16777216.000000, + TRIGGER_TRACTORS = 2097152.000000, + TRIGGER_FORK = 134217728.000000, + STATIC_WORLD_1 = 8.000000, + TRIGGER_PLAYER = 1048576.000000, + DYNAMIC_OBJECT_MACHINES = 8192.000000, + STATIC_WORLD_2 = 16.000000, + TRIGGER_CUTTERS = 67108864.000000, + DYNAMIC_OBJECTS = 4096.000000, + TRIGGER_FILLABLES = 8388608.000000, + GROUND_TIP_BLOCKING = 524288.000000, TRIGGER_COMBINES = 4194304.000000 } RaycastUtil.MASK_FILLABLES = 8397058.000000 diff --git a/vehicles/VehicleDebug.lua b/vehicles/VehicleDebug.lua index e0f9a1d..b6e9099 100644 --- a/vehicles/VehicleDebug.lua +++ b/vehicles/VehicleDebug.lua @@ -3,45 +3,45 @@ VehicleDebug = {} VehicleDebug.DEBUG_ATTRIBUTES = 3.000000 VehicleDebug.WORKAREA_COLORS = { 1 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 0.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, 2 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 0.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, 3 = { - 1 = 0.000000 - 2 = 0.000000 - 3 = 1.000000 + 1 = 0.000000, + 2 = 0.000000, + 3 = 1.000000, 4 = 1.000000 - } + }, 4 = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 0.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 0.000000, 4 = 1.000000 - } + }, 5 = { - 1 = 1.000000 - 2 = 0.000000 - 3 = 1.000000 + 1 = 1.000000, + 2 = 0.000000, + 3 = 1.000000, 4 = 1.000000 - } + }, 6 = { - 1 = 0.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 0.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 - } + }, 7 = { - 1 = 1.000000 - 2 = 1.000000 - 3 = 1.000000 + 1 = 1.000000, + 2 = 1.000000, + 3 = 1.000000, 4 = 1.000000 } } diff --git a/vehicles/VehicleSchemaOverlayData.lua b/vehicles/VehicleSchemaOverlayData.lua index e8ca41d..72279bf 100644 --- a/vehicles/VehicleSchemaOverlayData.lua +++ b/vehicles/VehicleSchemaOverlayData.lua @@ -1,13 +1,13 @@ VehicleSchemaOverlayData = {} VehicleSchemaOverlayData.SCHEMA_OVERLAY = { - DEFAULT_IMPLEMENT_SELECTED_ON = 'DEFAULT_IMPLEMENT_SELECTED_ON' - DEFAULT_VEHICLE_SELECTED = 'DEFAULT_VEHICLE_SELECTED' - DEFAULT_IMPLEMENT_SELECTED = 'DEFAULT_IMPLEMENT_SELECTED' - DEFAULT_VEHICLE = 'DEFAULT_VEHICLE' - DEFAULT_IMPLEMENT_ON = 'DEFAULT_IMPLEMENT_ON' - DEFAULT_VEHICLE_ON = 'DEFAULT_VEHICLE_ON' - DEFAULT_VEHICLE_SELECTED_ON = 'DEFAULT_VEHICLE_SELECTED_ON' + DEFAULT_IMPLEMENT_SELECTED_ON = 'DEFAULT_IMPLEMENT_SELECTED_ON', + DEFAULT_VEHICLE_SELECTED = 'DEFAULT_VEHICLE_SELECTED', + DEFAULT_IMPLEMENT_SELECTED = 'DEFAULT_IMPLEMENT_SELECTED', + DEFAULT_VEHICLE = 'DEFAULT_VEHICLE', + DEFAULT_IMPLEMENT_ON = 'DEFAULT_IMPLEMENT_ON', + DEFAULT_VEHICLE_ON = 'DEFAULT_VEHICLE_ON', + DEFAULT_VEHICLE_SELECTED_ON = 'DEFAULT_VEHICLE_SELECTED_ON', DEFAULT_IMPLEMENT = 'DEFAULT_IMPLEMENT' } diff --git a/vehicles/WheelsUtil.lua b/vehicles/WheelsUtil.lua index a0b2b13..91d9d53 100644 --- a/vehicles/WheelsUtil.lua +++ b/vehicles/WheelsUtil.lua @@ -3,61 +3,61 @@ WheelsUtil = {} WheelsUtil.tireTypes = { 1 = { frictionCoeffsWet = { - 1 = 1.050000 - 2 = 1.050000 - 3 = 1.000000 + 1 = 1.050000, + 2 = 1.050000, + 3 = 1.000000, 4 = 0.950000 - } - name = 'mud' + }, + name = 'mud', frictionCoeffs = { - 1 = 1.150000 - 2 = 1.150000 - 3 = 1.100000 + 1 = 1.150000, + 2 = 1.150000, + 3 = 1.100000, 4 = 1.100000 } - } + }, 2 = { frictionCoeffsWet = { - 1 = 1.050000 - 2 = 1.000000 - 3 = 0.950000 + 1 = 1.050000, + 2 = 1.000000, + 3 = 0.950000, 4 = 0.850000 - } - name = 'offRoad' + }, + name = 'offRoad', frictionCoeffs = { - 1 = 1.200000 - 2 = 1.150000 - 3 = 1.050000 + 1 = 1.200000, + 2 = 1.150000, + 3 = 1.050000, 4 = 1.000000 } - } + }, 3 = { frictionCoeffsWet = { - 1 = 1.150000 - 2 = 1.000000 - 3 = 0.850000 + 1 = 1.150000, + 2 = 1.000000, + 3 = 0.850000, 4 = 0.750000 - } - name = 'street' + }, + name = 'street', frictionCoeffs = { - 1 = 1.250000 - 2 = 1.150000 - 3 = 1.000000 + 1 = 1.250000, + 2 = 1.150000, + 3 = 1.000000, 4 = 0.900000 } - } + }, 4 = { frictionCoeffsWet = { - 1 = 1.050000 - 2 = 1.050000 - 3 = 1.050000 + 1 = 1.050000, + 2 = 1.050000, + 3 = 1.050000, 4 = 1.050000 - } - name = 'crawler' + }, + name = 'crawler', frictionCoeffs = { - 1 = 1.150000 - 2 = 1.150000 - 3 = 1.150000 + 1 = 1.150000, + 2 = 1.150000, + 3 = 1.150000, 4 = 1.150000 } }