Новый спрайт людей (#28)

* new race

* remove old races

Resources/Prototypes/Body/Parts/human.yml

@@ -15,6 +15,7 @@
         Quantity: 10
 
 - type: entity
+  noSpawn: true
   id: TorsoHuman
   name: "human torso"
   parent: [PartHuman, BaseTorso]
@@ -31,6 +32,7 @@
         Quantity: 20
 
 - type: entity
+  noSpawn: true
   id: HeadHuman
   name: "human head"
   parent: [PartHuman, BaseHead]
@@ -47,6 +49,7 @@
         Quantity: 10
 
 - type: entity
+  noSpawn: true
   id: LeftArmHuman
   name: "left human arm"
   parent: [PartHuman, BaseLeftArm]
@@ -56,6 +59,7 @@
     state: "l_arm"
 
 - type: entity
+  noSpawn: true
   id: RightArmHuman
   name: "right human arm"
   parent: [PartHuman, BaseRightArm]
@@ -65,6 +69,7 @@
     state: "r_arm"
 
 - type: entity
+  noSpawn: true
   id: LeftHandHuman
   name: "left human hand"
   parent: [PartHuman, BaseLeftHand]
@@ -74,6 +79,7 @@
     state: "l_hand"
 
 - type: entity
+  noSpawn: true
   id: RightHandHuman
   name: "right human hand"
   parent: [PartHuman, BaseRightHand]
@@ -83,6 +89,7 @@
     state: "r_hand"
 
 - type: entity
+  noSpawn: true
   id: LeftLegHuman
   name: "left human leg"
   parent: [PartHuman, BaseLeftLeg]
@@ -92,6 +99,7 @@
     state: "l_leg"
 
 - type: entity
+  noSpawn: true
   id: RightLegHuman
   name: "right human leg"
   parent: [PartHuman, BaseRightLeg]
@@ -101,6 +109,7 @@
     state: "r_leg"
 
 - type: entity
+  noSpawn: true
   id: LeftFootHuman
   name: "left human foot"
   parent: [PartHuman, BaseLeftFoot]
@@ -110,6 +119,7 @@
     state: "l_foot"
 
 - type: entity
+  noSpawn: true
   id: RightFootHuman
   name: "right human foot"
   parent: [PartHuman, BaseRightFoot]

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -1,11 +1,13 @@
 - type: entity
   save: false
+  noSpawn: true
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
 
 #Syndie
 - type: entity
+  noSpawn: true
   parent: MobHuman
   id: MobHumanSyndicateAgentBase
   name: syndicate agent
@@ -20,6 +22,7 @@
       - Syndicate
 
 - type: entity
+  noSpawn: true
   parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgent
   name: syndicate agent
@@ -31,6 +34,7 @@
       giveObjectives: false
 
 - type: entity
+  noSpawn: true
   parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
   suffix: Human, NukeOps

Resources/Prototypes/Species/arachnid.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Arachnid
   name: species-name-arachnid
-  roundStart: true
+  roundStart: false
   prototype: MobArachnid
   sprites: MobArachnidSprites
   defaultSkinTone: "#385878"

Resources/Prototypes/Species/diona.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Diona
   name: species-name-diona
-  roundStart: true
+  roundStart: false
   prototype: MobDiona
   sprites: MobDionaSprites
   defaultSkinTone: "#cdb369"

Resources/Prototypes/Species/dwarf.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Dwarf
   name: species-name-dwarf
-  roundStart: true
+  roundStart: false
   prototype: MobDwarf
   sprites: MobHumanSprites
   markingLimits: MobHumanMarkingLimits

Resources/Prototypes/Species/human.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Human
   name: species-name-human
-  roundStart: true
+  roundStart: false
   prototype: MobHuman
   sprites: MobHumanSprites
   markingLimits: MobHumanMarkingLimits

Resources/Prototypes/Species/moth.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Moth
   name: species-name-moth
-  roundStart: true
+  roundStart: false
   prototype: MobMoth
   sprites: MobMothSprites
   defaultSkinTone: "#ffda93"

Resources/Prototypes/Species/reptilian.yml

@@ -1,7 +1,7 @@
 - type: species
   id: Reptilian
   name: species-name-reptilian
-  roundStart: true
+  roundStart: false
   prototype: MobReptilian
   sprites: MobReptilianSprites
   defaultSkinTone: "#34a223"

Resources/Prototypes/Species/slime.yml

@@ -1,7 +1,7 @@
 - type: species
   id: SlimePerson
   name: species-name-slime
-  roundStart: true
+  roundStart: false
   prototype: MobSlimePerson
   sprites: MobSlimeSprites
   defaultSkinTone: "#b8b8b8"

Resources/Prototypes/_CP14/Body/Parts/human.yml

@@ -0,0 +1,70 @@
+
+- type: entity
+  id: CPTorsoHuman
+  parent: TorsoHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPHeadHuman
+  parent: HeadHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPLeftArmHuman
+  parent: LeftArmHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPRightArmHuman
+  parent: RightArmHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPLeftHandHuman
+  parent: LeftHandHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPRightHandHuman
+  parent: RightHandHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPLeftLegHuman
+  parent: LeftLegHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPRightLegHuman
+  parent: RightLegHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPLeftFootHuman
+  parent: LeftFootHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+
+- type: entity
+  id: CPRightFootHuman
+  parent: RightFootHuman
+  components:
+  - type: Sprite
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi

Resources/Prototypes/_CP14/Body/Prototypes/human.yml

@@ -0,0 +1,49 @@
+- type: body
+  id: CPHuman
+  name: "человек"
+  root: torso
+  slots:
+    head:
+      part: CPHeadHuman
+      connections:
+      - torso
+      organs:
+        brain: OrganHumanBrain
+        eyes: OrganHumanEyes
+    torso:
+      part: TorsoHuman
+      connections:
+      - right_arm
+      - left_arm
+      - right_leg
+      - left_leg
+      organs:
+        heart: OrganHumanHeart
+        lungs: OrganHumanLungs
+        stomach: OrganHumanStomach
+        liver: OrganHumanLiver
+        kidneys: OrganHumanKidneys
+    right_arm:
+      part: CPRightArmHuman
+      connections:
+      - right_hand
+    left_arm:
+      part: CPLeftArmHuman
+      connections:
+      - left_hand
+    right_hand:
+      part: CPRightHandHuman
+    left_hand:
+      part: CPLeftHandHuman
+    right_leg:
+      part: CPRightLegHuman
+      connections:
+      - right_foot
+    left_leg:
+      part: CPLeftLegHuman
+      connections:
+      - left_foot
+    right_foot:
+      part: CPRightFootHuman
+    left_foot:
+      part: CPLeftFootHuman

Resources/Prototypes/_CP14/Entities/Mobs/Player/human.yml

@@ -0,0 +1,4 @@
+- type: entity
+  save: false
+  parent: CPBaseMobHuman
+  id: CPMobHuman

Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml

@@ -0,0 +1,22 @@
+# Anything human specific (e.g. UI, input) goes under MobHuman
+- type: entity
+  parent: BaseMobSpeciesOrganic
+  id: CPBaseMobHuman
+  name: человеческая оболочка
+  abstract: true
+  components:
+  - type: HumanoidAppearance
+    species: CPHuman
+  - type: Hunger
+  - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: full
+  - type: Thirst
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatHuman
+      amount: 5
+  - type: Body
+    prototype: CPHuman
+    requiredLegs: 2

Resources/Prototypes/_CP14/Species/human.yml

@@ -0,0 +1,126 @@
+- type: species
+  id: CPHuman
+  name: species-name-human
+  roundStart: true
+  prototype: CPMobHuman
+  sprites: CPMobHumanSprites
+  markingLimits: MobHumanMarkingLimits
+  dollPrototype: MobHumanDummy
+  skinColoration: HumanToned
+
+- type: speciesBaseSprites
+  id: CPMobHumanSprites
+  sprites:
+    Head: CPMobHumanHead
+    Hair: MobHumanoidAnyMarking
+    FacialHair: MobHumanoidAnyMarking
+    Snout: MobHumanoidAnyMarking
+    Chest: CPMobHumanTorso
+    Eyes: CPMobHumanoidEyes
+    LArm: CPMobHumanLArm
+    RArm: CPMobHumanRArm
+    LHand: CPMobHumanLHand
+    RHand: CPMobHumanRHand
+    LLeg: CPMobHumanLLeg
+    RLeg: CPMobHumanRLeg
+    LFoot: CPMobHumanLFoot
+    RFoot: CPMobHumanRFoot
+
+
+
+- type: humanoidBaseSprite
+  id: CPMobHumanoidEyes
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Customization/eyes.rsi
+    state: eyes
+
+- type: humanoidBaseSprite
+  id: CPMobHumanoidAnyMarking
+
+- type: humanoidBaseSprite
+  id: CPMobHumanoidMarkingMatchSkin
+  markingsMatchSkin: true
+
+- type: humanoidBaseSprite
+  id: CPMobHumanHead
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: head_m
+
+- type: humanoidBaseSprite
+  id: CPMobHumanHeadMale
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: head_m
+
+- type: humanoidBaseSprite
+  id: CPMobHumanHeadFemale
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: head_f
+
+- type: humanoidBaseSprite
+  id: CPMobHumanTorso
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: torso_m
+
+- type: humanoidBaseSprite
+  id: CPMobHumanTorsoMale
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: torso_m
+
+- type: humanoidBaseSprite
+  id: CPMobHumanTorsoFemale
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: torso_f
+
+- type: humanoidBaseSprite
+  id: CPMobHumanLLeg
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: l_leg
+
+- type: humanoidBaseSprite
+  id: CPMobHumanLArm
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: l_arm
+
+- type: humanoidBaseSprite
+  id: CPMobHumanLHand
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: l_hand
+
+- type: humanoidBaseSprite
+  id: CPMobHumanLFoot
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: l_foot
+
+- type: humanoidBaseSprite
+  id: CPMobHumanRLeg
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: r_leg
+
+- type: humanoidBaseSprite
+  id: CPMobHumanRArm
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: r_arm
+
+- type: humanoidBaseSprite
+  id: CPMobHumanRHand
+  baseSprite:
+    sprite:  CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: r_hand
+
+- type: humanoidBaseSprite
+  id: CPMobHumanRFoot
+  baseSprite:
+    sprite: CrystallPunk/Mobs/Species/Human/parts.rsi
+    state: r_foot

Resources/Textures/CrystallPunk/Mobs/Customization/eyes.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "eyes",
+      "directions": 4
+    },
+    {
+      "name": "no_eyes"
+    }
+  ]
+}

Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "head_f",
+      "directions": 4
+    },
+    {
+      "name": "head_m",
+      "directions": 4
+    },
+    {
+      "name": "l_arm",
+      "directions": 4
+    },
+    {
+      "name": "l_foot",
+      "directions": 4
+    },
+    {
+      "name": "l_hand",
+      "directions": 4
+    },
+    {
+      "name": "l_leg",
+      "directions": 4
+    },
+    {
+      "name": "r_arm",
+      "directions": 4
+    },
+    {
+      "name": "r_foot",
+      "directions": 4
+    },
+    {
+      "name": "r_hand",
+      "directions": 4
+    },
+    {
+      "name": "r_leg",
+      "directions": 4
+    },
+    {
+      "name": "torso_f",
+      "directions": 4
+    },
+    {
+      "name": "torso_m",
+      "directions": 4
+    }
+  ]
+}