diff --git a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs index 8df91fd489..7b49ca4c30 100644 --- a/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs +++ b/Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs @@ -317,6 +317,7 @@ public sealed partial class CP14StationDemiplaneMapSystem : CP14SharedStationDem { "Danger", (node.Level + node.AdditionalLevel) * 0.2f }, { "GhostRoleDanger", node.Level * 0.2f }, { "Reward", Math.Max(node.Level * 0.2f, 0.5f) }, + { "Ore", Math.Max(node.Level * 0.2f, 0.5f) }, { "Fun", 1f }, { "Weather", 1f }, { "MapLight", 1f }, diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index fefcd53578..c2efdd1686 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -15,6 +15,10 @@ cp14-loadout-general-spells = Spells cp14-loadout-skill-tree = Specialization cp14-loadout-general-keys = Keys +# Adventurer + +cp14-loadout-adventurers-equip = Advenrurer weapons + # Apprentice cp14-loadout-apprentice-bundle = Apprentice bundle diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index abd16bfc7c..285016ce92 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -15,6 +15,10 @@ cp14-loadout-general-spells = Заклинания cp14-loadout-skill-tree = Специализация cp14-loadout-general-keys = Ключи +# Adventurer + +cp14-loadout-adventurers-equip = Оружие авантюриста + # Apprentice cp14-loadout-apprentice-bundle = Набор подмастерья diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml index f0182668ac..d441bb905e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml @@ -1,3 +1,18 @@ +- type: entity + id: CP14ModularIronRapier + parent: CP14ModularGripWooden + name: iron rapier + description: the gold standard of edged weapons. Medium length, comfortable grip. No frills. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronRapier + - type: entity id: CP14ModularGuildmasterRapier parent: CP14ModularGripGuildmaster diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml new file mode 100644 index 0000000000..776f2f5283 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml @@ -0,0 +1,14 @@ +- type: entity + id: CP14ModularIronSkimitar + parent: CP14ModularGripWooden + name: iron skimitar + description: the gold standard of edged weapons. Medium length, comfortable grip. No frills. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronSkimitar \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml new file mode 100644 index 0000000000..32cae6720e --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml @@ -0,0 +1,41 @@ +- type: loadoutGroup + id: CP14AdventureEquip + name: cp14-loadout-adventurers-equip + minLimit: 0 + maxLimit: 1 + loadouts: + - CP14ModularIronSkimitar + - CP14ModularIronSword + - CP14ModularIronRapier + - CP14BowCombat + +- type: loadout + id: CP14ModularIronSkimitar + dummyEntity: CP14ModularIronSkimitar + equipment: + belt2: CP14ModularIronSkimitar + skills: + - SkimitarMastery + +- type: loadout + id: CP14ModularIronSword + dummyEntity: CP14ModularIronSword + equipment: + belt2: CP14ModularIronSword + skills: + - SwordMastery + +- type: loadout + id: CP14ModularIronRapier + dummyEntity: CP14ModularIronRapier + equipment: + belt2: CP14ModularIronRapier + skills: + - RapierMastery + +- type: loadout + id: CP14BowCombat + dummyEntity: CP14BowCombat + equipment: + belt2: CP14ClothingBeltQuiverCopperArrow + neck: CP14BowCombat \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 22eb268648..3225e3cdb8 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -668,7 +668,6 @@ - CP14FluteInstrument - CP14LuteInstrument - CP14LyraInstrument - - CP14ClothingBeltQuiver - type: loadout id: CP14ManaOperationGlove @@ -760,11 +759,6 @@ back: - CP14FluteInstrument -- type: loadout - id: CP14ClothingBeltQuiver - equipment: - belt2: CP14ClothingBeltQuiver - # Keys - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 67397fd3fd..a6f8a9a9e4 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -1,6 +1,7 @@ - type: roleLoadout id: JobCP14Adventurer groups: + - CP14AdventureEquip - CP14GeneralHead - CP14GeneralOuterClothing - CP14GeneralEyes diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland_ring.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland_ring.yml deleted file mode 100644 index 1a8af09540..0000000000 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland_ring.yml +++ /dev/null @@ -1,113 +0,0 @@ -- type: cp14DemiplaneLocation - id: T1GrasslandIslandRing - levels: - min: 1 - max: 2 - icon: - sprite: _CP14/Interface/Misc/demiplane_locations.rsi - state: grassland_island - locationConfig: CP14DemiplaneGrasslandIslandRing - name: cp14-demiplane-location-grassland-island - tags: - - CP14DemiplaneOpenSky - - CP14DemiplaneHerbals - - CP14DemiplanePeacefulAnimals - components: - - type: MapLight - ambientLightColor: "#BFEEFFFF" - - type: CP14CloudShadows - - type: Biome - template: CP14SandOceanFill - - type: SunShadow - - type: SunShadowCycle - - type: Roof - -- type: dungeonConfig - id: CP14DemiplaneGrasslandIslandRing - layers: - # Masks - - !type:PrototypeDunGen - proto: CP14DemiplaneGrasslandIslandRingFloorMaskSand - - !type:PrototypeDunGen - proto: CP14DemiplaneGrasslandIslandRingFloorMaskGrass - - !type:PrototypeDunGen - proto: CP14DemiplaneGrasslandIslandRingFloorMaskSand2 - - !type:PrototypeDunGen - proto: CP14DemiplaneGrasslandIslandRingFloorMaskWater - # Biomes - - !type:BiomeDunGen - biomeTemplate: CP14GrasslandTestResult - tileMask: - - CP14FloorGrass - -- type: dungeonConfig - id: CP14DemiplaneGrasslandIslandRingFloorMaskSand - layers: - - !type:NoiseDistanceDunGen - size: 210, 210 - distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.7 - layers: - - tile: CP14FloorSand - threshold: 0.50 - noise: - frequency: 0.005 - noiseType: OpenSimplex2 - fractalType: FBm - octaves: 5 - lacunarity: 2 - gain: 0.5 - -- type: dungeonConfig - id: CP14DemiplaneGrasslandIslandRingFloorMaskGrass - layers: - - !type:NoiseDistanceDunGen - size: 190, 190 - distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.7 - layers: - - tile: CP14FloorGrass - threshold: 0.50 - noise: - frequency: 0.005 - noiseType: OpenSimplex2 - fractalType: FBm - octaves: 5 - lacunarity: 2 - gain: 0.5 - -- type: dungeonConfig - id: CP14DemiplaneGrasslandIslandRingFloorMaskSand2 - layers: - - !type:NoiseDistanceDunGen - size: 120, 120 - distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.7 - layers: - - tile: CP14FloorSand - threshold: 0.50 - noise: - frequency: 0.005 - noiseType: OpenSimplex2 - fractalType: FBm - octaves: 5 - lacunarity: 2 - gain: 0.5 - -- type: dungeonConfig - id: CP14DemiplaneGrasslandIslandRingFloorMaskWater - layers: - - !type:NoiseDistanceDunGen - size: 110, 110 - distanceConfig: !type:DunGenEuclideanSquaredDistance - blendWeight: 0.7 - layers: - - tile: Space - threshold: 0.50 - noise: - frequency: 0.005 - noiseType: OpenSimplex2 - fractalType: FBm - octaves: 5 - lacunarity: 2 - gain: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml similarity index 93% rename from Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml rename to Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml index 9b2e319da6..21c0d12464 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/ores.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml @@ -4,11 +4,11 @@ id: IronOre levels: min: 1 - max: 7 + max: 10 name: cp14-modifier-iron-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneOpenSky @@ -25,11 +25,11 @@ id: IronOreUnderground levels: min: 1 - max: 7 + max: 10 name: cp14-modifier-iron-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneUnderground @@ -46,11 +46,11 @@ id: CopperOre levels: min: 1 - max: 2 + max: 5 name: cp14-modifier-copper-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneOpenSky @@ -67,11 +67,11 @@ id: CopperOreUnderground levels: min: 1 - max: 2 + max: 5 name: cp14-modifier-copper-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneUnderground @@ -89,12 +89,12 @@ - type: cp14DemiplaneModifier id: GoldOre levels: - min: 4 - max: 5 + min: 2 + max: 10 name: cp14-modifier-gold-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneOpenSky @@ -110,12 +110,12 @@ - type: cp14DemiplaneModifier id: GoldOreUnderground levels: - min: 4 - max: 5 + min: 2 + max: 10 name: cp14-modifier-gold-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneUnderground @@ -131,12 +131,12 @@ - type: cp14DemiplaneModifier id: MithrilOre levels: - min: 5 + min: 3 max: 10 name: cp14-modifier-mithril-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneOpenSky @@ -152,12 +152,12 @@ - type: cp14DemiplaneModifier id: MithrilOreUnderground levels: - min: 5 + min: 3 max: 10 name: cp14-modifier-mithril-ore unique: false categories: - Reward: 0.25 + Ore: 0.25 requiredTags: - CP14DemiplaneOres - CP14DemiplaneUnderground diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml index 082788b723..02e5f13efe 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml @@ -7,6 +7,9 @@ - type: cp14DemiplaneModifierCategory id: Reward +- type: cp14DemiplaneModifierCategory + id: Ore + - type: cp14DemiplaneModifierCategory id: Fun diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Special/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Special/misc.yml index 9eb84e9cb4..68aa286e98 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Special/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Special/misc.yml @@ -1,55 +1,71 @@ +- type: cp14SpecialDemiplane + id: Ensure4Entry1 + levels: + min: 1 + max: 1 + +- type: cp14SpecialDemiplane + id: Ensure4Entry2 + levels: + min: 1 + max: 1 + +- type: cp14SpecialDemiplane + id: Ensure4Entry3 + levels: + min: 1 + max: 1 + +- type: cp14SpecialDemiplane + id: Ensure4Entry4 + levels: + min: 1 + max: 1 + - type: cp14SpecialDemiplane id: Test levels: min: 5 max: 5 - location: T1GrasslandIsland - type: cp14SpecialDemiplane id: Test2 levels: min: 5 max: 5 - location: T1Caves - type: cp14SpecialDemiplane id: Test3 levels: min: 5 max: 5 - location: T1IceCaves - type: cp14SpecialDemiplane id: Test4 levels: min: 5 max: 5 - location: T1MagmaCaves - type: cp14SpecialDemiplane id: Test5 levels: min: 5 max: 5 - location: T1SnowIsland - type: cp14SpecialDemiplane id: Test6 levels: min: 5 max: 5 - location: T1SnowIsland - type: cp14SpecialDemiplane id: Test7 levels: min: 9 max: 10 - location: T1MagmaCaves - type: cp14SpecialDemiplane id: Test8 levels: min: 9 - max: 10 - location: T1Wastelands \ No newline at end of file + max: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml index e5a327698d..9131884a4f 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml @@ -6,6 +6,10 @@ startingGear: CP14GuardGear icon: "CP14JobIconGuard" supervisors: cp14-job-supervisors-guard-commander + special: + - !type:CP14LearnSkillsSpecial + skills: + - SwordMastery - type: startingGear id: CP14GuardGear diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml index b219a955bb..35d89483f4 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml @@ -15,6 +15,10 @@ - !type:DepartmentTimeRequirement department: CP14Guard time: 3600 # 1 hours + special: + - !type:CP14LearnSkillsSpecial + skills: + - SwordMastery - type: startingGear id: CP14GuardCommanderGear diff --git a/Resources/Prototypes/_CP14/Skill/martial_arts.yml b/Resources/Prototypes/_CP14/Skill/martial_arts.yml index 2a54ec4ab9..f7f3b8c8bc 100644 --- a/Resources/Prototypes/_CP14/Skill/martial_arts.yml +++ b/Resources/Prototypes/_CP14/Skill/martial_arts.yml @@ -7,6 +7,8 @@ icon: sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi state: preview + restrictions: + - !type:Impossible - type: cp14Skill id: RapierMastery @@ -17,6 +19,8 @@ icon: sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi state: preview + restrictions: + - !type:Impossible - type: cp14Skill id: SkimitarMastery @@ -26,4 +30,6 @@ tree: MartialArts icon: sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: preview \ No newline at end of file + state: preview + restrictions: + - !type:Impossible \ No newline at end of file