From 453e9bb161198b5fd3014de23488a15a89a904f2 Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 9 Dec 2024 14:37:09 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8[Core]=F0=9F=9A=86=F0=9F=94=A5=20Railw?= =?UTF-8?q?ay=20rescue=20DE=F0=9F=94=A5=F0=9F=9A=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✨[Core]🚔Police Swift Water Rescue🚤 Beginnings --- src/i18n/de_DE.ts | 3 ++ src/i18n/de_DE/buildings.ts | 30 +++++++++-- src/i18n/de_DE/equipment.ts | 13 +++++ src/i18n/de_DE/schoolings.ts | 6 +++ src/i18n/de_DE/vehicles.ts | 52 +++++++++++++++++++ src/i18n/en_US/buildings.ts | 32 ++++++++++-- src/i18n/en_US/vehicles.ts | 52 +++++++++++++++++++ .../extendedCallWindow/i18n/de_DE.json | 7 ++- .../extendedCallWindow/i18n/de_DE.root.json | 3 +- src/modules/missionHelper/i18n/de_DE.json | 2 + 10 files changed, 190 insertions(+), 10 deletions(-) diff --git a/src/i18n/de_DE.ts b/src/i18n/de_DE.ts index 9ee4e4c1dd..d283b480f8 100644 --- a/src/i18n/de_DE.ts +++ b/src/i18n/de_DE.ts @@ -108,6 +108,7 @@ export default { Logistikfahrzeuge: [104, 105, 106, 107], Netzersatzanlagen: [111, 113], Verpflegung: [138, 139, 140, 141], + Bahnrettung: [162, 163, 164] }, color: '#ff2d2d', }, @@ -273,6 +274,8 @@ export default { 'Kraftwerk', 'Werksgelände', 'Seilbahn', + 'Brücke', + 'U-Bahn Station', ], only_alliance_missions: [41, 43, 59, 75, 99, 207, 221, 222, 256, 350], transfer_missions: [147, 613], diff --git a/src/i18n/de_DE/buildings.ts b/src/i18n/de_DE/buildings.ts index 4c8d836751..5de5fdc520 100644 --- a/src/i18n/de_DE/buildings.ts +++ b/src/i18n/de_DE/buildings.ts @@ -44,7 +44,7 @@ export default { parkingLotReservations: [ [ 47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, - 142, + 142, 164 ], ], cannotDisable: true, @@ -72,7 +72,7 @@ export default { 47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, ], parkingLotReservations: [ - [47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, 142], + [47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, 142, 164], ], cannotDisable: true, unlockedVehiclesOnReservedLotsOnly: true, @@ -129,7 +129,7 @@ export default { parkingLotReservations: [ [ 47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, - 142, + 142, 164 ], ], cannotDisable: true, @@ -186,7 +186,7 @@ export default { 47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, ], parkingLotReservations: [ - [47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, 142], + [47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, 142, 164], ], cannotDisable: true, unlockedVehiclesOnReservedLotsOnly: true, @@ -229,6 +229,16 @@ export default { }, 5 ), + { + caption: 'Drohneneinheit', + credits: 150_000, + coins: 25, + duration: '5 Tage', + isVehicleExtension: true, + givesParkingLots: 1, + parkingLotReservations: [[162, 163]], + unlocksVehicleTypes: [162, 163, 164], + }, ], storageUpgrades: { initial_containers: { @@ -1462,7 +1472,7 @@ export default { parkingLotReservations: [ [ 47, 48, 49, 54, 62, 71, 77, 78, 108, 116, 117, 119, - 142, + 142, 164 ], ], cannotDisable: true, @@ -1564,6 +1574,16 @@ export default { }, 2 ), + { + caption: 'Drohneneinheit', + credits: 150_000, + coins: 25, + duration: '5 Tage', + isVehicleExtension: true, + givesParkingLots: 1, + parkingLotReservations: [[162, 163]], + unlocksVehicleTypes: [162, 163, 164], + }, ], storageUpgrades: { initial_containers: { diff --git a/src/i18n/de_DE/equipment.ts b/src/i18n/de_DE/equipment.ts index cead0892d0..14d6dc880c 100644 --- a/src/i18n/de_DE/equipment.ts +++ b/src/i18n/de_DE/equipment.ts @@ -154,4 +154,17 @@ export default registerEquipment({ }, }, }, + railway_fire: { + id: 'railway_fire', + caption: 'RC-Modul: Schiene', + size: 20, + credits: 15000, + coins: 15, + staff: { + min: 2, + training: { + Feuerwehr: 'railway_fire', + }, + }, + }, }); diff --git a/src/i18n/de_DE/schoolings.ts b/src/i18n/de_DE/schoolings.ts index 8b8a751ad2..12080141a5 100644 --- a/src/i18n/de_DE/schoolings.ts +++ b/src/i18n/de_DE/schoolings.ts @@ -110,6 +110,12 @@ export default { staffList: 'Verpflegungshelfer', key: 'care_service_equipment', }, + { + caption: 'Bahnrettung', + duration: '3 Tage', + staffList: 'Bahnrettung', + key: 'railway_fire', + }, ], Polizei: [ { diff --git a/src/i18n/de_DE/vehicles.ts b/src/i18n/de_DE/vehicles.ts index 50bfdfc54e..80d74abb9a 100644 --- a/src/i18n/de_DE/vehicles.ts +++ b/src/i18n/de_DE/vehicles.ts @@ -2692,4 +2692,56 @@ export default { icon: 'helicopter', possibleBuildings: [28], }, + 162: { + caption: 'RW-Schiene', + color: '#992b22', + credits: 18_500, + coins: 25, + staff: { + min: 1, + max: 3, + training: { + Feuerwehr: { + railway_fire: { + all: true, + }, + }, + }, + }, + icon: 'truck', + possibleBuildings: [25], + }, + 163: { + caption: 'HLF Schiene', + color: '#992b22', + credits: 30_000, + coins: 25, + staff: { + min: 1, + max: 9, + training: { + Feuerwehr: { + railway_fire: { + all: true, + }, + }, + }, + }, + icon: 'truck', + possibleBuildings: [0, 18], + waterTank: 1460, + pumpCapacity: 2400, + pumpType: 'fire', + }, + 164: { + caption: 'AB-Schiene', + color: '#992b22', + credits: 25_000, + coins: 25, + staff: { min: 0, max: 0 }, + icon: 'square', + possibleBuildings: [0, 18], + isTrailer: true, + tractiveVehicles: [46], + }, } satisfies Record; diff --git a/src/i18n/en_US/buildings.ts b/src/i18n/en_US/buildings.ts index 705436162c..dab570e7a9 100644 --- a/src/i18n/en_US/buildings.ts +++ b/src/i18n/en_US/buildings.ts @@ -593,6 +593,19 @@ export default { unlocksVehicleTypes: [108], parkingLotReservations: [[108]], }, + { + caption: 'Police Water Rescue', + credits: 200_000, + coins: 25, + duration: '7 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [110, 111, 112], + parkingLotReservations: [ + [110, 111, 112], + [110, 111, 112], + ], + }, ], levelcost: ['1. 10.000', '2. 50.000', '3.-39. 100.000'], maxBuildings: 'no limit', @@ -613,11 +626,11 @@ export default { coins: 50, credits: 1_000_000, levelPrices: { - credits: [], - coins: [], + credits: [...Array(6).fill(1_000_000)], + coins: [...Array(6).fill(50)], }, extensions: [], - levelcost: [], + levelcost: ['1.-7. 1.000.000 Credits / 50 Coins'], maxBuildings: 'see specials', maxLevel: 0, special: @@ -1115,6 +1128,19 @@ export default { unlocksVehicleTypes: [108], parkingLotReservations: [[108]], }, + { + caption: 'Police Water Rescue', + credits: 200_000, + coins: 25, + duration: '7 Days', + isVehicleExtension: true, + givesParkingLots: 2, + unlocksVehicleTypes: [110, 111, 112], + parkingLotReservations: [ + [110, 111, 112], + [110, 111, 112], + ], + }, ], levelcost: [ '1. 10.000', diff --git a/src/i18n/en_US/vehicles.ts b/src/i18n/en_US/vehicles.ts index b85b0d2998..7eaa4154b2 100644 --- a/src/i18n/en_US/vehicles.ts +++ b/src/i18n/en_US/vehicles.ts @@ -1723,4 +1723,56 @@ export default { icon: 'car-side', possibleBuildings: [0, 3, 13, 14, 16], }, + 110: { + caption: 'Tactical Rescue Truck with Boat', + color: '#4282f0', + credits: 35_000, + coins: 30, + staff: { + min: 2, + max: 4, + training: { + Police: { + swat: { + all: true, + }, + tactical_medic: { + all: true, + }, + }, + }, + }, + icon: 'car-side', + possibleBuildings: [5, 15], + }, + 111: { + caption: 'Police Water Rescue Boat Trailer', + color: '#4282f0', + credits: 6_000, + coins: 12, + staff: { + min: 0, + max: 0, + }, + icon: 'car-side', + possibleBuildings: [5, 15], + isTrailer: true, + tractiveVehicles: [10, 16, 19, 26, 47, 56, 86, 90], + special: "Needed towing vehicle (Patrol car, K-9 Unit, Police Crew Carrier, Police Supervisor / Sheriff Unit, Warden's Truck, SWAT Armoured Vehicle, SWAT SUV, Tactical Rescue Truck)", + }, + 112: { + caption: 'Police Water Rescue Double Boat Trailer', + color: '#4282f0', + credits: 60_000, + coins: 25, + staff: { + min: 0, + max: 0, + }, + icon: 'car-side', + possibleBuildings: [5, 15], + isTrailer: true, + tractiveVehicles: [10, 16, 19, 26, 47, 56, 86, 90], + special: "Needed towing vehicle (Patrol car, K-9 Unit, Police Crew Carrier, Police Supervisor / Sheriff Unit, Warden's Truck, SWAT Armoured Vehicle, SWAT SUV, Tactical Rescue Truck), Transporting 2 Light Boats", + }, } satisfies Record; diff --git a/src/modules/extendedCallWindow/i18n/de_DE.json b/src/modules/extendedCallWindow/i18n/de_DE.json index f99b53cacf..3c83a48659 100644 --- a/src/modules/extendedCallWindow/i18n/de_DE.json +++ b/src/modules/extendedCallWindow/i18n/de_DE.json @@ -269,7 +269,7 @@ { "texts": ["MTW FGr K"], "vehicles": [148] }, { "texts": ["Lüfter"], "vehicles": [114, 115, 116] }, { - "equipment": ["drone"], + "equipment": ["drone", "mountain_drone"], "texts": ["Drohneneinheit", "Drohneneinheiten"], "vehicles": [125, 126, 127, 128, 129] }, @@ -302,6 +302,11 @@ "Seenotrettungsboote oder Seenotrettungskreuzer" ], "vehicles": [159, 160] + }, + { + "equipment": ["railway_fire"], + "texts": ["Bahnrettungsfahrzeug", "Bahnrettungsfahrzeuge"], + "vehicles": [162, 163, 164] } ], "water": "l. Wasser" diff --git a/src/modules/extendedCallWindow/i18n/de_DE.root.json b/src/modules/extendedCallWindow/i18n/de_DE.root.json index 802f71ca81..09b5d6038f 100644 --- a/src/modules/extendedCallWindow/i18n/de_DE.root.json +++ b/src/modules/extendedCallWindow/i18n/de_DE.root.json @@ -229,7 +229,8 @@ 2, 3, 4, 5, 10, 11, 12, 13, 14, 15, 16, 27, 33, 34, 36, 46, 47, 48, 49, 53, 54, 57, 62, 71, 75, 76, 77, 78, 83, 84, 85, 86, 104, 105, 106, 108, 111, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 126, 128, 129, 138, 139, 140, 141, 142, 143 + 119, 120, 121, 126, 128, 129, 138, 139, 140, 141, 142, 143, + 162, 163, 164 ] }, { diff --git a/src/modules/missionHelper/i18n/de_DE.json b/src/modules/missionHelper/i18n/de_DE.json index c9ec9fd54e..272439dc61 100644 --- a/src/modules/missionHelper/i18n/de_DE.json +++ b/src/modules/missionHelper/i18n/de_DE.json @@ -63,6 +63,7 @@ "police_motorcycle": "Polizei-Motorradstaffel | Polizei-Motorradstaffeln", "police_service_group_leader": "Dienstgruppenleitung-Erweiterung | Dienstgruppenleitung-Erweiterungen", "police_stations": "Polizeiwache | Polizeiwachen", + "railway_fire": "Bahnrettungs-Erweiterung | Bahnrettungs-Erweiterungen", "rescue_dog_units": "Rettungshundestaffel | Rettungshundestaffeln", "rescue_stations": "Rettungswache | Rettungswachen", "riot_unit_count": "Zug der 1. Hundertschaft | Züge der 1. Hundertschaft", @@ -147,6 +148,7 @@ "police_motorcycle": "Polizeimotorrad | Polizeimotorräder", "police_service_group_leader": "Funkstreifenwagen (DGL)", "pump": "Schmutzwasserpumpe | Schmutzwasserpumpen", + "railway_fire": "Bahnrettungsfahrzeug | Bahnrettungsfahrzeuge", "rescue_dog_units": "Rettungshundestaffel | Rettungshundestaffeln", "rettungstreppe": "Rettungstreppe | Rettungstreppen", "seg_elw": "ELW 1 (SEG)",