Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xenofriends #145

Merged
merged 35 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
05ba255
adding Friendly Xeno pets
fenndragon Aug 23, 2024
a503213
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 23, 2024
3b2d113
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 23, 2024
0cfaeb1
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 23, 2024
da18fef
Update xenopet.yml
fenndragon Aug 24, 2024
c9c8867
Delete Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml
fenndragon Aug 24, 2024
18591a6
sprites
fenndragon Aug 24, 2024
0301635
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 24, 2024
1a4a0bf
Update xenopet.yml
fenndragon Aug 24, 2024
9aea99a
xeno sprites
fenndragon Aug 24, 2024
bc863fd
Delete Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml
fenndragon Aug 24, 2024
3731124
Update xenopet.yml
fenndragon Aug 24, 2024
5cef420
Update xenopet.yml
fenndragon Aug 24, 2024
5dd893f
Update xenopet.yml
fenndragon Aug 26, 2024
371073f
patriarch edit
fenndragon Aug 27, 2024
61cb6f2
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 27, 2024
02ac80f
Update meta.json
fenndragon Aug 27, 2024
26419f0
Update xenopet.yml
fenndragon Aug 27, 2024
3090f3f
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
a7561a7
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
44e7f86
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
2710f53
Delete patriarch.rsi directory
fenndragon Aug 27, 2024
7764766
Delete subject7355.rsi directory
fenndragon Aug 27, 2024
4d73f92
Merge branch 'Fansana:master' into Xenospawners
fenndragon Aug 27, 2024
138175a
Update xenopet.yml
fenndragon Aug 27, 2024
7847434
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
0e154ef
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
1e26797
Update Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
fenndragon Aug 27, 2024
546ed6f
Update xenopet.yml
fenndragon Aug 27, 2024
0f9ba17
Update xeno.yml
fenndragon Aug 27, 2024
fbd6b8b
Merge branch 'Fansana:master' into Xenospawners
fenndragon Sep 2, 2024
c101d27
Update xenopet.yml
fenndragon Sep 2, 2024
0aef6d8
Update xenopet.yml
fenndragon Sep 2, 2024
28f6660
Merge branch 'Fansana:master' into Xenospawners
fenndragon Sep 4, 2024
af9752d
Merge branch 'Fansana:master' into Xenospawners
fenndragon Sep 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Resources/Prototypes/Floof/Entities/Mobs/NPCs/Xeno.yml

This file was deleted.

308 changes: 308 additions & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/NPCs/xenopet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,308 @@
- type: entity
name: basic
id: MobSpaceFriend
parent: MobXenoRounyNPC
description: It looks friendly. Why don't you give it a hug?
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: MovementAlwaysTouching
- type: MeleeWeapon
soundHit:
path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
angle: 0
animation: WeaponArcClaw
damage:
types:
Blunt: 5
Slash: 5
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
- type: Puller
needsHands: false
- type: GhostTakeoverAvailable
fenndragon marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: Neutral Rouny
id: MobXenoNeutralRouny
parent: MobSpaceFriend
description: They mostly come at night. Mostly.
components:
- type: NpcFactionMember
factions:
- Passive
- type: LanguageKnowledge
speaks:
- Xeno
understands:
- Xeno
- GalacticCommon

- type: entity
name: Neutral Praetorian
id: MobXenoNeutralPraetorian
parent: MobXenoPraetorianNPC
description: They mostly come at night. Mostly.
components:
- type: NpcFactionMember
factions:
- Passive
- type: Puller
needsHands: false
- type: LanguageKnowledge
speaks:
- Xeno
understands:
- Xeno
- GalacticCommon

- type: entity
name: Neutral Drone
id: MobXenoNeutralDrone
parent: MobXenoDroneNPC
description: They mostly come at night. Mostly.
components:
- type: LanguageKnowledge
speaks:
- Xeno
understands:
- Xeno
- GalacticCommon
fenndragon marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: Neutral Ravager
id: MobXenoNeutralRavager
parent: MobXenoRavagerNPC
description: They mostly come at night. Mostly.
components:
- type: NpcFactionMember
factions:
- Passive
- type: LanguageKnowledge
speaks:
- Xeno
understands:
- Xeno
- GalacticCommon

- type: inventoryTemplate
id: friendxeno
slots:
- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
- name: pocket1
slotTexture: pocket
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,4
displayName: Pocket 1
stripHidden: false
fenndragon marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
name: Friend-Shaped
parent: MobSpaceFriend
id: MobXenoFriendShaped
description: A very clearly friend-shaped Xeno.
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Xenos/rouny.rsi
scale: 0.7, 0.7
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
- type: Inventory
speciesId: rouny
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
templateId: friendxeno
- type: Puller
needsHands: false
- type: IdExaminable
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: Grammar
attributes:
proper: true
gender: male
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg

- type: entity
name: Patriach
parent: MobXenoNeutralPraetorian
id: MobXenoPatriarch
description: A not entirely clearly friend-shaped Xeno.
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Sprite
drawdepth: Mobs
sprite: Floof/Mobs/Animals/patriarch.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: patriarch
- type: DamageStateVisuals
states:
Alive:
Base: patriarch
Critical:
Base: patriarch_crit
Dead:
Base: patriarch_dead
- type: Inventory
speciesId: praetorian
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
templateId: friendxeno
- type: IdExaminable
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: Grammar
attributes:
proper: true
gender: male
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg

- type: entity
name: FXES
parent: MobXenoNeutralDrone
id: MobXenoFXES
description: A very clearly friend-shaped Xeno.
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Inventory
speciesId: drone
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
templateId: friendxeno
- type: Puller
needsHands: false
- type: IdExaminable
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: Grammar
attributes:
proper: true
gender: male
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg

- type: entity
name: Hell-Shaped
parent: MobXenoNeutralRavager
id: MobXenoHellShaped
description: A very clearly friend-shaped Xeno.
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Inventory
speciesId: ravager
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
templateId: friendxeno
- type: Puller
needsHands: false
- type: IdExaminable
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: Grammar
attributes:
proper: true
gender: male
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg

- type: entity
name: FXE Subject 7355
parent: MobXenoNeutralRavager
id: MobXenoSubjectTess
description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation.
components:
- type: NpcFactionMember
factions:
- PetsNT
- type: Sprite
drawdepth: Mobs
sprite: Floof/Mobs/Animals/subject7355.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: subject7355
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
state: glow
shader: unshaded
- type: PointLight
radius: 2
energy: .5
color: "#639fff"
- type: DamageStateVisuals
states:
Alive:
Base: subject7355
Critical:
Base: subject7355_crit
Dead:
Base: subject7355_dead
- type: Inventory
speciesId: ravager
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
templateId: friendxeno
- type: Puller
needsHands: false
- type: IdExaminable
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
- key: enum.StrippingUiKey.Key
type: StrippableBoundUserInterface
- type: Grammar
attributes:
proper: true
gender: male
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg
24 changes: 24 additions & 0 deletions Resources/Textures/Floof/Mobs/Animals/patriarch.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi edited by Fenndragon",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "patriarch",
"directions": 4
},
{
"name": "patriarch_sleeping"
},
{
"name": "patriarch_crit"
},
{
"name": "patriarch_dead"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions Resources/Textures/Floof/Mobs/Animals/subject7355.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "subject7355",
"directions": 4
},
{
"name": "glow",
"directions": 4
},
{
"name": "subject7355_sleeping"
},
{
"name": "subject7355_crit"
},
{
"name": "subject7355_dead"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions patriarch.rsi/meta.json
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi",
"size": {
"x": 64,
"y": 64
},
"states": [
{
"name": "patriarch",
"directions": 4
},
{
"name": "patriarch_sleeping"
},
{
"name": "patriarch_crit"
},
{
"name": "patriarch_dead"
}
]
}
Binary file added patriarch.rsi/patriarch.png
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patriarch.rsi/patriarch_crit.png
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patriarch.rsi/patriarch_dead.png
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added patriarch.rsi/patriarch_sleeping.png
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subject7355.rsi/glow.png
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading