cool hat, delete cave arena (#256)

* hat and glasses

* delete cave arena

* Update default.yml

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -67,7 +67,6 @@ namespace Content.IntegrationTests.Tests
             //"Oasis"
 
             //CrystallPunk maps
-            "CaveArena",
             "AlchemyTest"
         };
 

Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml

@@ -25,8 +25,8 @@
 
 - type: entity
   parent: CP14ClothingEyesBase
-  id: CP14ClothingEyesGoldGlasses
-  name: gold glasses
+  id: CP14ClothingEyesGlasses
+  name: glasses
   description: Aristocratic, fancy.
   components:
   - type: Foldable
@@ -60,6 +60,18 @@
     sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
   - type: SolutionScanner
 
+- type: entity
+  parent: CP14ClothingEyesBase
+  id: CP14ClothingEyesAlchemyMonocle
+  name: alchemy monocle
+  description: Special magic infused monocle that allow you to clearly see the composition of any mixtures.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Eyes/alchemy_monocle.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Eyes/alchemy_monocle.rsi
+  - type: SolutionScanner
+
 - type: entity
   parent: CP14ClothingEyesBase
   id: CP14ClothingEyesThaumaturgyGlasses

Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml

@@ -23,4 +23,26 @@
   - type: Sprite
     sprite: _CP14/Clothing/Head/metalheadband.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Head/metalheadband.rsi
+    sprite: _CP14/Clothing/Head/metalheadband.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadTriangularHat
+  name: triangular hat
+  description: a big, pointy hat for those who like to look smart.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/triangularhat.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/triangularhat.rsi
+
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadTriangularHatGolden
+  name: golden triangular hat
+  description: a big, pointy hat for those who like to look smart. Decorated with a gold hoop.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/triangularhat_golden.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/triangularhat_golden.rsi

Resources/Prototypes/_CP14/Loadouts/Jobs/Mercenary/adventurer.yml

@@ -51,22 +51,22 @@
 # Eyes
 
 - type: loadout
-  id: CP14Monocle
-  equipment: CP14Monocle
+  id: CP14ClothingEyesMonocle
+  equipment: CP14ClothingEyesMonocle
 
 - type: startingGear
-  id: CP14Monocle
+  id: CP14ClothingEyesMonocle
   equipment:
     eyes: CP14ClothingEyesMonocle
 
 - type: loadout
-  id: CP14GoldGlasses
-  equipment: CP14GoldGlasses
+  id: CP14ClothingEyesGlasses
+  equipment: CP14ClothingEyesGlasses
 
 - type: startingGear
-  id: CP14GoldGlasses
+  id: CP14ClothingEyesGlasses
   equipment:
-    eyes: CP14ClothingEyesGoldGlasses
+    eyes: CP14ClothingEyesGlasses
 
 # Gloves
 
@@ -82,14 +82,32 @@
 # Head
 
 - type: loadout
-  id: CP14MetalHeadband
-  equipment: CP14MetalHeadband
+  id: CP14ClothingHeadMetalHeadband
+  equipment: CP14ClothingHeadMetalHeadband
 
 - type: startingGear
-  id: CP14MetalHeadband
+  id: CP14ClothingHeadMetalHeadband
   equipment:
     head: CP14ClothingHeadMetalHeadband
 
+- type: loadout
+  id: CP14ClothingHeadTriangularHat
+  equipment: CP14ClothingHeadTriangularHat
+
+- type: startingGear
+  id: CP14ClothingHeadTriangularHat
+  equipment:
+    head: CP14ClothingHeadTriangularHat
+
+- type: loadout
+  id: CP14ClothingHeadTriangularHatGolden
+  equipment: CP14ClothingHeadTriangularHatGolden
+
+- type: startingGear
+  id: CP14ClothingHeadTriangularHatGolden
+  equipment:
+    head: CP14ClothingHeadTriangularHatGolden
+
 # Mask
 
 - type: loadout

Resources/Prototypes/_CP14/Loadouts/loadout_groups.yml

@@ -14,8 +14,8 @@
   name: cp14-loadout-test-eyes
   minLimit: 0
   loadouts:
-  - CP14Monocle
-  - CP14GoldGlasses
+  - CP14ClothingEyesMonocle
+  - CP14ClothingEyesGlasses
 
 - type: loadoutGroup
   id: CP14TestGloves
@@ -29,7 +29,9 @@
   name: cp14-loadout-test-head
   minLimit: 0
   loadouts:
-  - CP14MetalHeadband
+  - CP14ClothingHeadMetalHeadband
+  - CP14ClothingHeadTriangularHat
+  - CP14ClothingHeadTriangularHatGolden
 
 - type: loadoutGroup
   id: CP14TestMask

Resources/Prototypes/_CP14/Maps/Pools/default.yml

@@ -1,5 +1,4 @@
 - type: gameMapPool
   id: CP14DefaultMapPool
   maps:
-   - CaveArena
    - AlchemyTest

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -1,18 +1,3 @@
-- type: gameMap
-  id: CaveArena
-  mapName: Cave Arena
-  mapPath: /Maps/_CP14/cave-arena.yml
-  minPlayers: 0
-  stations:
-    CaveArena:
-      stationProto: StandardStationArena
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "Cave Arena"
-        - type: StationJobs
-          availableJobs:
-            CP14Adventurer: [ -1, -1 ]
-
 - type: gameMap
   id: AlchemyTest
   mapName: Alchemy test

Resources/Textures/_CP14/Clothing/Eyes/alchemy_monocle.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "Created by KBAS5 and modified by TheShuEd & Jaraten",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-EYES",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/metalheadband.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "All rights reserved for the CrystallPunk14 project only",
-    "copyright": "CrystallPunk14, by KBAS5",
+    "copyright": "CrystallPunk14, by KBAS5, edited by TheShuEd",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/_CP14/Clothing/Head/triangularhat.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by TheShuEd",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Head/triangularhat_golden.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All rights reserved for the CrystallPunk14 project only",
+    "copyright": "CrystallPunk14, by TheShuEd",
+    "size": {
+        "x": 48,
+        "y": 48
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}