From c9fa80e00e544ae087026fac88772a57c17bea61 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 30 Oct 2024 13:08:03 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=80=D0=B6=D0=B0=20=D0=9F=D0=A0=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Structures/Machines/lathe.yml | 30 +++-- Resources/Prototypes/Research/arsenal.yml | 4 +- .../_Sunrise/Catalog/uplink_catalog.yml | 34 ++--- .../Entities/Objects/Fun/mech_spray_paint.yml | 24 ++-- .../Guns/Ammunition/Projectiles/rifle.yml | 4 +- Resources/Prototypes/_Sunrise/Maps/cog.yml | 38 +++++- Resources/Prototypes/_Sunrise/Maps/oasis.yml | 36 ++++- Resources/Prototypes/_Sunrise/Maps/reach.yml | 4 +- Resources/Prototypes/_Sunrise/Maps/train.yml | 3 +- .../_Sunrise/Recipes/Lathes/security.yml | 126 ++++++++++++++++++ 10 files changed, 240 insertions(+), 63 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e8f4c1a1458..c3947b97bf8 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -939,20 +939,6 @@ - SpeedLoaderMagnumUranium - TelescopicShield - TimerTrigger - - BaseMagazinePistolCaselessRifleExtended - - MagazinePPSH41Extended - - MagazineMP5Extended - - MagazineMP7Extended - - MagazineP90Extended - - MagazineM16A4Extended - - MagazineAR18Extended - - MagazineM28Extended - - MagazineG36Extended - - MagazineFamasExtended - - MagazineV31Extended - - MagazineBauer127Extended - - MagazineBR64Extended - - MagazineDragunovExtended - Truncheon - VoiceTrigger - WeaponAdvancedLaser @@ -961,6 +947,7 @@ - WeaponLaserCannon - WeaponLaserCarbine - WeaponXrayCannon + # Sunrise-Start - WeaponMechCombatImmolationGun # Sunrise - Mechs - WeaponMechCombatSolarisLaser # Sunrise - Mechs - WeaponMechCombatFiredartLaser # Sunrise - Mechs @@ -975,6 +962,21 @@ - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine - ClothingShoesBootsMagCombat # Sunrise - Combat Magboots + - BaseMagazinePistolCaselessRifleExtended + - MagazinePPSH41Extended + - MagazineMP5Extended + - MagazineMP7Extended + - MagazineP90Extended + - MagazineM16A4Extended + - MagazineAR18Extended + - MagazineM28Extended + - MagazineG36Extended + - MagazineFamasExtended + - MagazineV31Extended + - MagazineBauer127Extended + - MagazineBR64Extended + - MagazineDragunovExtended + # Sunrise-End - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 2c225fb9e98..4eef7ea0feb 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -205,7 +205,7 @@ id: Gygax name: research-technology-gygax icon: - sprite: Objects/Specific/Mech/mecha.rsi + sprite: Objects/Specific/Mech/gygax.rsi state: gygax discipline: Arsenal tier: 2 @@ -287,7 +287,7 @@ id: Durand name: research-technology-durand icon: - sprite: Objects/Specific/Mech/mecha.rsi + sprite: Objects/Specific/Mech/durand.rsi state: durand discipline: Arsenal tier: 3 diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 459d64ff824..ae93a8fdbad 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -377,7 +377,7 @@ Telecrystal: 11 categories: - UplinkWeaponry - + - type: listing id: UplinkHypo name: uplink-hypo-name @@ -391,7 +391,7 @@ Telecrystal: 4 categories: - UplinkChemicals - + - type: listing id: UplinkPolytrinicAcidChemistryBottle name: uplink-polytrinic-acid-chemistry-bottle-name @@ -404,7 +404,7 @@ Telecrystal: 8 categories: - UplinkChemicals - + - type: listing id: UplinkExplosiveCollarsKit name: uplink-exp-collars-kit-name @@ -420,7 +420,7 @@ conditions: - !type:StoreWhitelistCondition blacklist: - + - type: listing id: UplinkBouquet name: uplink-bouquet-name @@ -433,14 +433,14 @@ Telecrystal: 1 categories: - UplinkPointless - + # Mechs - type: listing id: UplinkDarkGygax name: uplink-mech-teleporter-assault-name description: uplink-mech-teleporter-assault-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax } + icon: { sprite: /Textures/Objects/Specific/Mech/gygax.rsi, state: darkgygax } productEntity: CrateCybersunDarkGygaxBundle cost: Telecrystal: 65 @@ -451,12 +451,12 @@ whitelist: tags: - NukeOpsUplink - + - type: listing - id: UplinkRover + id: UplinkDarkDurand name: uplink-mech-teleporter-medium-name description: uplink-mech-teleporter-medium-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: rover } + icon: { sprite: /Textures/Objects/Specific/Mech/durand.rsi, state: darkdurand } productEntity: CrateCybersunRoverBundle cost: Telecrystal: 75 @@ -483,9 +483,9 @@ whitelist: tags: - NukeOpsUplink - + # Mechs equipment - + - type: listing id: UplinkMechImmolationGun name: uplink-mech-equipment-immolation-gun-name @@ -501,7 +501,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechTeslaCannon name: uplink-mech-equipment-tesla-cannon-name @@ -517,7 +517,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechShotgun name: uplink-mech-equipment-shotgun-name @@ -533,7 +533,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechShotgunIncendiary name: uplink-mech-equipment-shotgun-incendiary-name @@ -549,7 +549,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechUltraRifle name: uplink-mech-equipment-ultra-rifle-name @@ -565,7 +565,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechIon name: uplink-mech-equipment-ion-name @@ -581,7 +581,7 @@ whitelist: tags: - NukeOpsUplink - + - type: listing id: UplinkMechAMLG90 name: uplink-mech-equipment-amlg90-name diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml index cf8e32c12b9..8e29c9ca410 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml @@ -47,7 +47,7 @@ - type: entity parent: MechPaintBase suffix: DEBUG, Ripley, Aluminizer - id: MechPaintClarkeOrangey + id: MechPaintRipleyAluminizer components: - type: Sprite sprite: _Sunrise/Objects/Fun/mech_spraycans/ripley.rsi @@ -72,7 +72,7 @@ enum.OpenableVisuals.Layer: True: {state: "aluminizer"} False: {state: "aluminizer-cap"} - + # Ripley-Combat Ripley - type: entity parent: MechPaintBase @@ -102,7 +102,7 @@ enum.OpenableVisuals.Layer: True: {state: "combat-ripley"} False: {state: "combat-ripley-cap"} - + # Ripley-Firestarter - type: entity parent: MechPaintBase @@ -132,7 +132,7 @@ enum.OpenableVisuals.Layer: True: {state: "firestarter"} False: {state: "firestarter-cap"} - + # Ripley-Hauler - type: entity parent: MechPaintBase @@ -162,7 +162,7 @@ enum.OpenableVisuals.Layer: True: {state: "hauler"} False: {state: "hauler-cap"} - + # Ripley-Reaper - type: entity parent: MechPaintBase @@ -192,7 +192,7 @@ enum.OpenableVisuals.Layer: True: {state: "reaper"} False: {state: "reaper-cap"} - + # Ripley-Zairjah - type: entity parent: MechPaintBase @@ -282,7 +282,7 @@ enum.OpenableVisuals.Layer: True: {state: "pobeda"} False: {state: "pobeda-cap"} - + #Gygax-Old - type: entity @@ -312,7 +312,7 @@ enum.OpenableVisuals.Layer: True: {state: "spray_colors" , color: "#ed5f3b"} False: {state: "spray_cap_colors" , color: "#ed5f3b"} - + #Durand-Unathi - type: entity @@ -342,7 +342,7 @@ enum.OpenableVisuals.Layer: True: {state: "kharn"} False: {state: "kharn-cap"} - + #Durand-Shire - type: entity @@ -372,7 +372,7 @@ enum.OpenableVisuals.Layer: True: {state: "shire"} False: {state: "shire-cap"} - + #Durand-Dollhouse - type: entity @@ -402,7 +402,7 @@ enum.OpenableVisuals.Layer: True: {state: "dollhouse"} False: {state: "dollhouse-cap"} - + #Durand-Executor - type: entity @@ -431,4 +431,4 @@ enum.OpenableVisuals.Opened: enum.OpenableVisuals.Layer: True: {state: "executioner"} - False: {state: "executioner-cap"} \ No newline at end of file + False: {state: "executioner-cap"} diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 15faafe6ce9..f9c44476678 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -18,11 +18,11 @@ - type: Projectile damage: types: - Piercing: 10 + Piercing: 1 - type: ExplodeOnTrigger - type: Explosive explosionType: Default - maxIntensity: 3 + maxIntensity: 1 intensitySlope: 1 totalIntensity: 1 maxTileBreak: 0 diff --git a/Resources/Prototypes/_Sunrise/Maps/cog.yml b/Resources/Prototypes/_Sunrise/Maps/cog.yml index 77d5a892c10..20fa2dd53bf 100644 --- a/Resources/Prototypes/_Sunrise/Maps/cog.yml +++ b/Resources/Prototypes/_Sunrise/Maps/cog.yml @@ -27,31 +27,30 @@ Chaplain: [ 1, 1 ] Reporter: [ 2, 2 ] Librarian: [ 1, 1 ] - ServiceWorker: [ 3, 3 ] - Zookeeper: [ 1, 1 ] + ServiceWorker: [ -1, -1 ] + Zookeeper: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 4, 4 ] - TechnicalAssistant: [ 3, 3 ] + TechnicalAssistant: [ -1, -1 ] #medical ChiefMedicalOfficer: [ 1, 1 ] Chemist: [ 3, 3 ] MedicalDoctor: [ 4, 4 ] - MedicalIntern: [ 3, 3 ] + MedicalIntern: [ -1, -1 ] Psychologist: [ 1, 1 ] Paramedic: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] Scientist: [ 5, 5 ] - ResearchAssistant: [ 3, 3 ] + ResearchAssistant: [ -1, -1 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + SecurityCadet: [ -1, -1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -90,3 +89,28 @@ SeniorOfficer: [ 1, 1 ] # Sunrise-Science Roboticist: [ 2, 2 ] + # Sunrise-Command + Adjutant: [ 1, 1 ] + NanoTrasenRepresentative: [ 1, 1 ] + - type: StationGoal + goals: + - Shuttle + - Singularity + - SolarPanels + - Artifacts + - Bank + - Zoo + - MiningOutpost + - Tesla + - XenobiologyRepair + - VirusologyAmbusol + - Containment + - WeaponsSecurity + - MaintsRepair + - DormsBuild + - BattleShuttle + - Transit + - NukeRoom + - Permabrig + - Farm + diff --git a/Resources/Prototypes/_Sunrise/Maps/oasis.yml b/Resources/Prototypes/_Sunrise/Maps/oasis.yml index 9d2cc8f6085..0278fe49b27 100644 --- a/Resources/Prototypes/_Sunrise/Maps/oasis.yml +++ b/Resources/Prototypes/_Sunrise/Maps/oasis.yml @@ -25,33 +25,31 @@ Janitor: [ 3, 3 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - ServiceWorker: [ 2, 2 ] + ServiceWorker: [ -1, -1 ] Zookeeper: [ 1, 1 ] Reporter: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] AtmosphericTechnician: [ 3, 3 ] StationEngineer: [ 5, 5 ] - TechnicalAssistant: [ 4, 4 ] + TechnicalAssistant: [ -1, -1 ] #medical ChiefMedicalOfficer: [ 1, 1 ] Chemist: [ 2, 2 ] MedicalDoctor: [ 6, 6 ] Paramedic: [ 2, 2 ] - MedicalIntern: [ 4, 4 ] + MedicalIntern: [ -1, -1 ] Psychologist: [ 1, 1 ] #science ResearchDirector: [ 1, 1 ] Scientist: [ 5, 5 ] - ResearchAssistant: [ 6, 6 ] - StationAi: [ 1, 1 ] - Borg: [ 2, 2 ] + ResearchAssistant: [ -1, -1 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] - SecurityCadet: [ 4, 4 ] + SecurityCadet: [ -1, -1 ] #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -89,3 +87,27 @@ SeniorOfficer: [ 1, 1 ] # Sunrise-Science Roboticist: [ 2, 2 ] + # Sunrise-Command + Adjutant: [ 1, 1 ] + NanoTrasenRepresentative: [ 1, 1 ] + - type: StationGoal + goals: + - Shuttle + - Singularity + - SolarPanels + - Artifacts + - Bank + - Zoo + - MiningOutpost + - Tesla + - XenobiologyRepair + - VirusologyAmbusol + - Containment + - WeaponsSecurity + - MaintsRepair + - DormsBuild + - BattleShuttle + - Transit + - NukeRoom + - Permabrig + - Farm diff --git a/Resources/Prototypes/_Sunrise/Maps/reach.yml b/Resources/Prototypes/_Sunrise/Maps/reach.yml index bfec9b828ed..906fbad7969 100644 --- a/Resources/Prototypes/_Sunrise/Maps/reach.yml +++ b/Resources/Prototypes/_Sunrise/Maps/reach.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: SunriseReach mapName: 'Reach' mapPath: /Maps/_Sunrise/Station/reach.yml @@ -40,6 +40,8 @@ ServiceWorker: [ -1, -1 ] IAA: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] + # Sunrise-Adjutant + Adjutant: [ 1, 1 ] - type: StationGoal goals: - Shuttle diff --git a/Resources/Prototypes/_Sunrise/Maps/train.yml b/Resources/Prototypes/_Sunrise/Maps/train.yml index cfe65ff6de7..e21f7a61c48 100644 --- a/Resources/Prototypes/_Sunrise/Maps/train.yml +++ b/Resources/Prototypes/_Sunrise/Maps/train.yml @@ -22,7 +22,6 @@ Captain: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] NanoTrasenRepresentative: [ 1, 1 ] - Adjutant: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] Chef: [ 2, 2 ] @@ -90,6 +89,8 @@ SecurityCombatBorg: [ 2, 2 ] # Sunrise-Civillian Barber: [ 1, 1 ] + # Sunrise-Adjutant + Adjutant: [ 1, 1 ] - type: StationGoal goals: - Shuttle diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml index e15b9d202ea..1e29b9ed727 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml @@ -329,3 +329,129 @@ Plastic: 500 Plasma: 300 Silver: 200 + +- type: latheRecipe + id: BaseMagazinePistolCaselessRifleExtended + result: BaseMagazinePistolCaselessRifleExtended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazinePPSH41Extended + result: MagazinePPSH41Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineMP5Extended + result: MagazineMP5Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineMP7Extended + result: MagazineMP7Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineP90Extended + result: MagazineP90Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineM16A4Extended + result: MagazineM16A4Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineAR18Extended + result: MagazineAR18Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineM28Extended + result: MagazineM28Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineG36Extended + result: MagazineG36Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineFamasExtended + result: MagazineFamasExtended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineV31Extended + result: MagazineV31Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineBauer127Extended + result: MagazineBauer127Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineBR64Extended + result: MagazineBR64Extended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 + +- type: latheRecipe + id: MagazineDragunovExtended + result: MagazineDragunovExtended + category: Weapons + completetime: 12 + materials: + Steel: 3000 + Plastic: 3000 From 7456d4c48c91a06f073b00646f835601f4f88b9d Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 30 Oct 2024 13:11:00 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?= =?UTF-8?q?=D0=BB=20Crysis2AICostume?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index dafb2271cc5..33f4921724c 100644 --- a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml +++ b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml @@ -453,7 +453,7 @@ sex: Male speaker: crysis2_ai_costume provider: sunrise - roundStart: true + roundStart: false sponsorOnly: true - type: ttsVoice