Merge pull request #821 from KaiserMaus/Mech-Paint

Дополнительная покраска Гигакс

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl

@@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase }
 ent-MechPaintGygaxOld = { ent-MechPaintBase }
     .suffix = DEBUG, Gygax, Old
     .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxBlack = { ent-MechPaintBase }
+    .suffix = DEBUG, Gygax, Black
+    .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxWhite = { ent-MechPaintBase }
+    .suffix = DEBUG, Gygax, White
+    .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxPirate = { ent-MechPaintBase }
+    .suffix = DEBUG, Gygax, Pirate
+    .desc = { ent-MechPaintBase.desc }
 ent-MechPaintDurandUnathi = { ent-MechPaintBase }
     .suffix = DEBUG, Durand, Unathi
     .desc = { ent-MechPaintBase.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/mech_spray_paint.ftl

@@ -27,6 +27,15 @@ ent-MechPaintGygaxMolot = { ent-MechPaintBase }
 ent-MechPaintGygaxOld = { ent-MechPaintBase }
     .suffix = ДЕБАГ, Гигакс, Old
     .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxBlack = { ent-MechPaintBase }
+    .suffix = ДЕБАГ, Гигакс, Черный
+    .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxWhite = { ent-MechPaintBase }
+    .suffix = ДЕБАГ, Гигакс, Белый
+    .desc = { ent-MechPaintBase.desc }
+ent-MechPaintGygaxPirate = { ent-MechPaintBase }
+    .suffix = ДЕБАГ, Гигакс, Пираты
+    .desc = { ent-MechPaintBase.desc }
 ent-MechPaintDurandUnathi = { ent-MechPaintBase }
     .suffix = ДЕБАГ, Дюранд, Unathi
     .desc = { ent-MechPaintBase.desc }

Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml

@@ -287,6 +287,11 @@
     soundOnReflect: /Audio/Weapons/block_metal1.ogg
     reflects:
     - NonEnergy
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - Ripley
   - type: MobThresholds
     currentThresholdState : Alive
     thresholds:

Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml

@@ -283,7 +283,67 @@
           True: {state: "pobeda"}
           False: {state: "pobeda-cap"}
 
-#Gegax-Pirate
+# Gygax-Black
+- type: entity
+  parent: MechPaintBase
+  suffix: DEBUG, Gygax, Contraband
+  id: MechPaintGygaxBlack
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
+    state: syndiegax-cap
+    layers:
+      - state: syndiegax-cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: Item
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
+    heldPrefix: syndiegax
+  - type: MechPaint
+    used: false
+    whitelist:
+      tags:
+        - Gygax
+    baseState: gygax_black
+    openState: gygax_black-open
+    brokenState: gygax_black-broken
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "syndiegax"}
+          False: {state: "syndiegax-cap"}
+
+# Gygax-White
+- type: entity
+  parent: MechPaintBase
+  suffix: DEBUG, Gygax, Legal
+  id: MechPaintGygaxWhite
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
+    state: gygax-white-cap
+    layers:
+      - state: gygax-white-cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: Item
+    sprite: _Sunrise/Objects/Fun/mech_spraycans/gygax.rsi
+    heldPrefix: gygax-white
+  - type: MechPaint
+    used: false
+    whitelist:
+      tags:
+        - Gygax
+    baseState: gygax_white
+    openState: gygax_white-open
+    brokenState: gygax_white-broken
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "gygax-white"}
+          False: {state: "gygax-white-cap"}
+
+#Gygax-Pirate
 - type: entity
   parent: MechPaintBase
   suffix: DEBUG, Gygax, Pirate

Resources/Textures/Objects/Specific/Mech/gygax.rsi/meta.json

@@ -144,7 +144,7 @@
           0.3,
           0.4,
           0.5,
-          0.3
+          0.3 
         ]
       ]
     },
@@ -183,8 +183,7 @@
           0.5,
           0.3,
           0.5,
-          0.3,
-          0.5
+          0.3
         ]
       ]
     },