Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Replace Ifrit with Tribarine Being #196

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Replace Ifrit with Tribarine Being #196

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4962e5
replace mysta's ifrit with tribarine being
leonardo-dabepis Sep 23, 2023
aab812f
Update familiars.yml
leonardo-dabepis Sep 23, 2023
91acd88
fixed folder capitalization issue but at what cost
leonardo-dabepis Sep 28, 2023
11209da
Merge branch 'master' into spicy-triangle
leonardo-dabepis Sep 28, 2023
78089fa
Update Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta…
leonardo-dabepis Oct 3, 2023
13c0b80
Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/met…
leonardo-dabepis Oct 3, 2023
b05870a
Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Cha…
leonardo-dabepis Oct 3, 2023
8307b07
Merge branch 'master' into spicy-triangle
leonardo-dabepis Oct 3, 2023
621be5d
Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/met…
leonardo-dabepis Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 13 additions & 10 deletions Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
- type: entity
parent: SimpleSpaceMobBase
id: MobIfritFamiliar
name: Ifrit
description: The mystagogue's servant.
name: Tribarine Being
description: The mystagogue's servant, summoned from a different spacial dimension. It is difficult to look at and has the tendency to light things on fire.
components:
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Guardians/guardians.rsi
sprite: DeltaV/Mobs/Aliens/Golems/triangle.rsi
Copy link
Contributor

@FluffiestFloof FluffiestFloof Sep 23, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Folder is DeltaV/Mobs/Aliens/golems/triangle.rsi but game is looking for DeltaV/Mobs/Aliens/Golems/triangle.rsi

Casual capitalization issue

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay I think I fixed it but I couldn't figure out how to make changes without changing the actual files in the folders, so I was forced to add a new Secret Character

layers:
- state: magic_base
- state: triangle_base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: magic_flare
- state: triangle_flare
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
color: "#40a7d7"
shader: unshaded
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.BaseUnshaded:
magic_flare: Sixteen
triangle_flare: Emagged
- type: PointLight
radius: 2
color: "#2F0A28"
- type: Fixtures
fixtures:
fix1:
Expand Down Expand Up @@ -93,13 +96,13 @@
- type: entity
parent: WelderExperimental
id: WelderIfrit
name: ifrit hand
description: The welding hand of an ifrit.
name: Tribarine Flame Array
description: Orbs of fire that the Tribar can use to weld things.
components:
- type: Sprite
sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi
sprite: DeltaV/Objects/Tools/triangle_spice.rsi
- type: Item
sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi
sprite: DeltaV/Objects/Tools/triangle_spice.rsi
- type: SolutionContainerManager
solutions:
Welder:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
- type: entity
parent: Bible
id: BibleMystagogue
name: book of mysteries
description: The mystagogue's holy book.
name: field guide to advanced anomalous sciences
leonardo-dabepis marked this conversation as resolved.
Show resolved Hide resolved
description: A book issued to all mystagogues, meant to prepare them for some of the more advanced concepts in epistemics. Now including a tutorial on summoning Tribarine Beings!
components:
- type: Summonable
specialItem: SpawnPointGhostIfrit
- type: Sprite
sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi
sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi
state: icon
- type: Item
size: 15
sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi
sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi
4 changes: 2 additions & 2 deletions Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
- type: entity
id: SpawnPointGhostIfrit
name: ghost role spawn point
suffix: Ifrit
suffix: Tribar
parent: MarkerBase
noSpawn: true
components:
- type: GhostRoleMobSpawner
prototype: MobIfritFamiliar
- type: GhostRole
name: Mystagogue's Ifrit
name: Mystagogue's Tribarine Being
description: Obey the mystagogue. Defend the oracle.
rules: You are a servant of the mystagogue. Obey them directly.
- type: Sprite
Expand Down
Binary file added Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What? lmao

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's the only way I could update the error with the folder names PLEASE i swear I'm not joking

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I've had a similar issue, should be able to delete it after the renaming commit lol

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't delete her. She won't let me. She's too powerful.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 61 additions & 0 deletions Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "triangle_base",
"directions": 4
},
{
"name": "triangle_flare",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
leonardo-dabepis marked this conversation as resolved.
Show resolved Hide resolved
]
}
]
}
Binary file added Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rces/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ces/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "welder_flame"
},
{
"name": "inhand-left"
},
{
"name": "inhand-right"
},
{
"name": "inhand-left-flame",
"directions": 4,
"delays": [
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
]
leonardo-dabepis marked this conversation as resolved.
Show resolved Hide resolved
]
},
{
"name": "inhand-right-flame",
"directions": 4,
"delays": [
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
],
[
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13,
0.13
]
leonardo-dabepis marked this conversation as resolved.
Show resolved Hide resolved
]
}
]
}
Binary file added Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.