Windows + weapon shiny (#536)

* add wooden window crafting

* weapon resprite

* Update anvil.yml

* Update walls.yml

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml

@@ -10,15 +10,16 @@
   components:
   - type: Item
     size: Normal
+    storedRotation: 45
     shape:
     - 0,0,2,0
-    - 1,1,1,2
+    - 1,1,1,1
     sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi
     state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: 300
+    wideAnimationRotation: 135
     damage:
       types:
         Piercing: 5

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml

@@ -9,6 +9,9 @@
   components:
   - type: Item
     size: Normal
+    storedRotation: 45 
+    shape:
+    - 0,0,0,2
     sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml

@@ -23,7 +23,7 @@
     angle: 120
     attackRate: 0.7
     range: 1.6
-    wideAnimationRotation: 320
+    wideAnimationRotation: 135
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml

@@ -7,7 +7,10 @@
   description: an extremely simple and effective weapon - a long straight and heavy stick.
   components:
   - type: Item
-    size: Ginormous
+    size: Normal
+    storedRotation: 45
+    shape:
+    - 0,0,0,3
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi
     layers:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml

@@ -13,7 +13,9 @@
   components:
   - type: Item
     size: Normal
-    storedRotation: -45 
+    shape:
+    - 0,0,0,1
+    storedRotation: 45
   - type: Clothing
     equipDelay: 0.25
     unequipDelay: 0.25
@@ -29,7 +31,7 @@
   - type: MeleeWeapon
     angle: 60
     attackRate: 1.8
-    wideAnimationRotation: 225
+    wideAnimationRotation: 135
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
@@ -42,4 +44,4 @@
     offset: 0.15,0.15
     removalTime: 1
   - type: ThrowingAngle
-    angle: 225
+    angle: 135

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml

@@ -10,6 +10,14 @@
   components:
   - type: Item
     size: Normal
+  - type: Clothing
+    equipDelay: 0.25
+    unequipDelay: 0.25
+    sprite: _CP14/Objects/Weapons/Melee/Dagger/dagger.rsi
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - belt
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Melee/Mace/mace.rsi
     layers:
@@ -19,7 +27,7 @@
     angle: 100
     attackRate: 0.9
     range: 1.5
-    wideAnimationRotation: 205
+    wideAnimationRotation: 135
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml

@@ -12,7 +12,7 @@
     state: icon
   - type: Item
     sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi
-    size: Ginormous
+    size: Normal
   - type: Blocking
     passiveBlockModifier:
       coefficients:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml

@@ -12,7 +12,6 @@
   components:
   - type: Item
     size: Normal
-    storedRotation: -45 
   - type: Clothing
     equipDelay: 0.45
     unequipDelay: 0.45
@@ -29,7 +28,7 @@
     angle: 80
     range: 1.1
     attackRate: 1.5
-    wideAnimationRotation: 225
+    wideAnimationRotation: 135
     wideAnimation: CP14WeaponArcSlash
     cPAnimationLength: 0.18
     damage:

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml

@@ -10,8 +10,10 @@
   description: A weapon that has done its duty since the age of the giants.
   components:
   - type: Item
-    storedRotation: 0
-    size: Large
+    size: Normal
+    storedRotation: 45 
+    shape:
+    - 0,0,0,3
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Melee/ThrowableSpear/throwableSpear.rsi
     layers:
@@ -31,14 +33,14 @@
     cPAnimationOffset: -1.3
   - type: EmbeddableProjectile
     offset: 0.15,0.15
-    removalTime: 1.5
+    removalTime: 1
   - type: ThrowingAngle
-    angle: 245
+    angle: 135
   - type: DamageOtherOnHit
     damage:
       types:
         Piercing: 18
-  - type: DamageOnLand
-    damage:
-      types:
-        Piercing: 18
+  #- type: DamageOnLand
+  #  damage:
+  #    types:
+  #      Piercing: 18

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml

@@ -10,7 +10,9 @@
   components:
   - type: Item
     size: Normal
-    storedRotation: -45 
+    storedRotation: 45 
+    shape:
+    - 0,0,0,2
   - type: Clothing
     equipDelay: 0.45
     unequipDelay: 0.45

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml

@@ -23,7 +23,7 @@
     angle: 120
     attackRate: 0.7
     range: 1.8
-    wideAnimationRotation: 205
+    wideAnimationRotation: 135
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
@@ -71,7 +71,6 @@
     angle: 110
     attackRate: 0.6
     range: 1.4
-    wideAnimationRotation: 205
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:

Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml

@@ -149,9 +149,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Construction
-    graph: CP14WallWood
-    node: WallCardboard
   - type: CP14WallpaperHolder
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml

@@ -78,3 +78,6 @@
     sprite: _CP14/Structures/Windows/wooden_window.rsi
   - type: Icon
     sprite: _CP14/Structures/Windows/wooden_window.rsi
+  - type: Construction
+    graph: CP14WallWood
+    node: WindowWooden

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml

@@ -315,11 +315,10 @@
       maxCount: 6
       groups:
       - id: CP14MobDinoSmallHydra
-        amount: 3
-
+        amount: 2
 
 - type: cp14DemiplaneModifier
-  id: MonsterMole
+  id: EnemyMole
   difficulty: 0.5
   requiredTags:
   - CP14DemiplaneUnderground
@@ -329,7 +328,7 @@
       maxCount: 6
       groups:
       - id: CP14MobMonsterMole
-        amount: 3
+        amount: 1
 
 - type: cp14DemiplaneModifier
   id: EnemyMagmawind

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml

@@ -25,10 +25,6 @@
           steps:
             - tool: Screwing #TODO - new tool
               doAfter: 1
-        - to: WallCardboard
-          steps:
-            - tool: CP14Hammering
-              doAfter: 2
         - to: WallWooden
           steps:
             - material: CP14WoodenPlanks
@@ -39,14 +35,11 @@
               doAfter: 1
             - tool: CP14Hammering
               doAfter: 2
-              
-    - node: WallCardboard
-      entity: CP14WallCardboard
-      edges:
-        - to: FrameWooden
+        - to: WindowWooden
           steps:
-            - tool: CP14Hammering
-              doAfter: 2
+            - material: CP14GlassSheet
+              amount: 2
+              doAfter: 1
               
     - node: WallWooden
       entity: CP14WallWooden
@@ -54,4 +47,7 @@
         - to: FrameWooden
           steps:
             - tool: CP14Hammering
-              doAfter: 2
+              doAfter: 2
+              
+    - node: WindowWooden
+      entity: CP14WindowWooden

Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

@@ -1,21 +1,3 @@
-- type: construction
-  crystallPunkAllowed: true
-  name: Cardboard wall
-  description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries.
-  id: CP14CardboardWall
-  graph: CP14WallWood
-  startNode: start
-  targetNode: WallCardboard
-  category: construction-category-structures
-  icon:
-    sprite: _CP14/Structures/Walls/cardboard_wall.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
   crystallPunkAllowed: true
   name: Wooden wall
@@ -34,6 +16,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  crystallPunkAllowed: true
+  name: Wooden window
+  description: A wooden wall with a glass window in it.
+  id: CP14WindowWooden
+  graph: CP14WallWood
+  startNode: start
+  targetNode: WindowWooden
+  category: construction-category-structures
+  icon:
+    sprite: _CP14/Structures/Windows/wooden_window.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   crystallPunkAllowed: true
   name: Earth cliffs

Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml

@@ -206,4 +206,12 @@
   craftTime: 2
   stacks:
     CP14CopperBar: 6
-  result: CP14ClothingCloakBrassArmor
+  result: CP14ClothingCloakBrassArmor
+
+- type: CP14Recipe
+  id: CP14Crossbolt
+  tag: CP14RecipeAnvil
+  craftTime: 1
+  stacks:
+    CP14CopperBar: 1
+  result: CP14Crossbolt

Resources/Textures/_CP14/Objects/Weapons/Melee/Mace/mace.rsi/meta.json

@@ -17,6 +17,14 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
     }
   ]
 }