Добавил расу аркан

space-sunrise · Nov 27, 2024 · 8086258 · 8086258
1 parent 5d034f8
commit 8086258
Show file tree

Hide file tree

Showing 48 changed files with 848 additions and 16 deletions.
diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -6538,3 +6538,10 @@
     type: Tweak
   id: 452
   time: '2024-11-26T20:19:52.663602+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0440\u0430\u0441\
+      \u0430 \u0410\u0440\u043A\u0430\u043D."
+    type: Add
+  id: 453
+  time: '2024-11-27T02:44:31.150357+00:00'
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/markings/demon.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/markings/demon.ftl
@@ -0,0 +1,15 @@
+marking-DemomTail1 = острый конец, хвост
+marking-DemomTailLong = длинный и пушистый, хвост
+marking-DemomTailUp = длинный и пушистый, хвост (приподнят)
+marking-DemonCowEars = коровьи ушки, уши
+marking-DemonEars = демонические ушки, уши
+marking-DemonCowHorns = коровьи рожки, рога
+marking-DemonHornsDeer = оленьи рожки, рога
+marking-DemonHornsSmall = небольшие рожки, рога
+marking-DemonChestCowSpots = коровьи пятна, грудь
+marking-DemonChestGuard = пятна защитника, грудь
+marking-DemonChestLinesEmperos = императорские линии, грудь
+marking-DemonChestQueenLines = королевские линии, грудь
+marking-DemonChestTreeLines = древесные линии, грудь
+marking-DemonChestTrinitySpots = метки суккуба, грудь
+marking-DemonGoatee = Козья бородка
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/species/species.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/species/species.ftl
@@ -4,3 +4,4 @@ species-name-swine = Троттин
 species-name-tajaran = Таяран
 species-name-predator = Яутжа
 species-name-xeno = Ксеноморф
+species-name-demon = Аркана
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1541,21 +1541,21 @@
         components:
           - SurplusBundle
 
-- type: listing
-  id: UplinkDeathAcidifierImplanter
-  name: uplink-death-acidifier-implant-name
-  description: uplink-death-acidifier-implant-desc
-  icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib }
-  productEntity: DeathAcidifierImplanter
-  cost:
-    Telecrystal: 4
-  categories:
-    - UplinkImplants
-  conditions:
-    - !type:StoreWhitelistCondition
-      whitelist:
-        tags:
-          - NukeOpsUplink
+#- type: listing
+#  id: UplinkDeathAcidifierImplanter
+#  name: uplink-death-acidifier-implant-name
+#  description: uplink-death-acidifier-implant-desc
+#  icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib }
+#  productEntity: DeathAcidifierImplanter
+#  cost:
+#    Telecrystal: 4
+#  categories:
+#    - UplinkImplants
+#  conditions:
+#    - !type:StoreWhitelistCondition
+#      whitelist:
+#        tags:
+#          - NukeOpsUplink
 
 - type: listing
   id: UplinkUplinkImplanter # uplink uplink real

diff --git a/Resources/Prototypes/Entities/Mobs/Player/demon.yml b/Resources/Prototypes/Entities/Mobs/Player/demon.yml
@@ -0,0 +1,34 @@
+- type: entity
+  save: false
+  name: Urisst' Mzhand Demon
+  parent: BaseMobDemon
+  id: MobDemon
+  components:
+    - type: CombatMode
+    - type: InteractionPopup
+      successChance: 1
+      interactSuccessString: hugging-success-generic
+      interactSuccessSound: /Audio/Effects/thudswoosh.ogg
+      messagePerceivedByOthers: hugging-success-generic-others
+    - type: MindContainer
+      showExamineInfo: true
+    - type: Input
+      context: "human"
+    - type: MobMover
+    - type: InputMover
+    - type: Alerts
+    - type: Eye
+    - type: CameraRecoil
+    - type: Examiner
+    - type: CanHostGuardian
+    - type: NpcFactionMember
+      factions:
+        - NanoTrasen
+    - type: Respirator
+      damage:
+       types:
+        Asphyxiation: 1.0
+      damageRecovery:
+        types:
+          Asphyxiation: -1.0
+#Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/Entities/Mobs/Species/demon.yml
@@ -0,0 +1,66 @@
+- type: entity
+  save: false
+  name: Urisst' Mzhand Demon
+  parent: BaseMobSpeciesOrganic
+  id: BaseMobDemon
+  abstract: true
+  components:
+  - type: HumanoidAppearance
+    species: Demon
+  - type: Hunger
+  - type: Thirst
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: full_m
+  - type: Sprite
+    netsync: false
+    noRot: true
+    drawdepth: Mobs
+  - type: Body
+    prototype: Demon
+    requiredLegs: 2
+  - type: Speech
+    speechSounds: Lizard
+  - type: Vocal
+    sounds:
+      Male: MaleHuman
+      Female: FemaleHuman
+      Unsexed: FemaleHuman
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Demon
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+      path: /Audio/Weapons/pierce.ogg
+    angle: 30
+    animation: WeaponArcPunch
+    damage:
+      types:
+        Piercing: 5
+  - type: Temperature
+    heatDamageThreshold: 400
+    coldDamageThreshold: 193  #starting temperature damage treshold
+    currentTemperature: 310.15
+    specificHeat: 46
+    coldDamage:
+      types:
+        Cold : 0.1 #per second, scales with temperature & other constants
+    heatDamage:
+      types:
+        Heat : 0.3 #per second, scales with temperature & other constants
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2.5
+    baseSprintSpeed : 4.5
+  - type: Perishable
+
+- type: entity
+  save: false
+  name: Urist McHands
+  parent: MobHumanDummy
+  id: MobDemonDummy
+  categories: [ HideSpawnMenu ]
+  description: A dummy reptilian meant to be used in character setup.
+  components:
+  - type: HumanoidAppearance
+    species: Demon
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -226,7 +226,7 @@
         - Syndicate
       - type: AutoImplant
         implants:
-        - DeathAcidifierImplant
+        - MacroBombImplant # Sunrise-Edit
       - type: RandomMetadata
         nameSegments:
         - names_ninja_title

diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/demon.yml b/Resources/Prototypes/_Sunrise/Body/Organs/demon.yml
@@ -0,0 +1,15 @@
+- type: entity
+  id: OrganDemonStomach
+  parent: OrganAnimalStomach
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Stomach
diff --git a/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml b/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml
@@ -0,0 +1,193 @@
+# TODO: Add descriptions (many)
+# TODO BODY: Part damage
+- type: entity
+  id: PartDemon
+  parent: BaseItem
+  name: "demon body part"
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: Biological
+  - type: BodyPart
+  - type: ContainerContainer
+    containers:
+      bodypart: !type:Container
+        ents: []
+  - type: Tag
+    tags:
+      - Trash
+
+- type: entity
+  id: TorsoDemon
+  name: "demon torso"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "torso_m"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "torso_m"
+  - type: BodyPart
+    partType: Torso
+
+- type: entity
+  id: HeadDemon
+  name: "demon head"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "head_m"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "head_m"
+  - type: BodyPart
+    partType: Head
+    vital: true
+  - type: Input
+    context: "ghost"
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 0
+    baseSprintSpeed: 0
+  - type: InputMover
+  - type: GhostOnMove
+  - type: Tag
+    tags:
+      - Head
+
+- type: entity
+  id: LeftArmDemon
+  name: "left demon arm"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_arm"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_arm"
+  - type: BodyPart
+    partType: Arm
+    symmetry: Left
+
+- type: entity
+  id: RightArmDemon
+  name: "right demon arm"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_arm"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_arm"
+  - type: BodyPart
+    partType: Arm
+    symmetry: Right
+
+- type: entity
+  id: LeftHandDemon
+  name: "left demon hand"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_hand"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_hand"
+  - type: BodyPart
+    partType: Hand
+    symmetry: Left
+
+- type: entity
+  id: RightHandDemon
+  name: "right demon hand"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_hand"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_hand"
+  - type: BodyPart
+    partType: Hand
+    symmetry: Right
+
+- type: entity
+  id: LeftLegDemon
+  name: "left demon leg"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_leg"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_leg"
+  - type: BodyPart
+    partType: Leg
+    symmetry: Left
+  - type: MovementBodyPart
+    walkSpeed : 2.5
+    sprintSpeed : 4.5
+
+- type: entity
+  id: RightLegDemon
+  name: "right demon leg"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_leg"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_leg"
+  - type: BodyPart
+    partType: Leg
+    symmetry: Right
+  - type: MovementBodyPart
+    walkSpeed : 2.5
+    sprintSpeed : 4.5
+
+- type: entity
+  id: LeftFootDemon
+  name: "left demon foot"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_foot"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "l_foot"
+  - type: BodyPart
+    partType: Foot
+    symmetry: Left
+
+- type: entity
+  id: RightFootDemon
+  name: "right demon foot"
+  parent: PartDemon
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_foot"
+  - type: Icon
+    sprite: _Sunrise/Mobs/Species/Demon/parts.rsi
+    state: "r_foot"
+  - type: BodyPart
+    partType: Foot
+    symmetry: Right