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

Added new energy wood based furniture. Small fixes. #3531

Merged
merged 2 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant1.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant1",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 1",
"description" : "The Ascendant's Tale 1",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_1.png",
"contentPages" : [

"Finally, the day has come. I have been chosen. Chosen to begin my training, to become what I have always aspired to be. Strangers and friends have walked this path before me, and they have all failed. I will not.",

"I've prepared for this. All my life I've prepared. My body is at its peak; I can endure the Ascendant training, I can display glory and honour, and I can please Kluex. I know it. My family supports me, my friends support me, the only thing left is to get my head down and do this."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant10.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant10",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 10",
"description" : "The Ascendant's Tale 10",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_10.png",
"contentPages" : [

"Hish'eth was right. Why settle for joining Kluex, IF I survive? Once I leap off the tower, I have no way to give myself an advantage. It all rests in the hands of Kluex. I don't like those odds. I control my own destiny.",

"Hish'eth gave me a datapad with co-ordinates on it. I believe it to be a sector somewhere in Hylotl space. 'Go here,' he said. 'Go here and follow your true destiny' - and then he was gone.",
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant2.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant2",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 2",
"description" : "The Ascendant's Tale 2",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_2.png",
"contentPages" : [

"Physical training began today. Myself and five other Avian youths. Obstacle courses, races, all manner of challenges. At the end of the day, we were awarded a score. I came top of my class! I was so proud.",

"As expected, my peers accepted their loss graciously, and we all retired to the mess hall for dinner. It was a pleasant feast; a reward for our first day of the trials, perhaps. I feel so at home here, amongst likeminded Flightless, no talk of the Grounded, just devotion to Kluex."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant3.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant3",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 3",
"description" : "The Ascendant's Tale 3",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_3.png",
"contentPages" : [

"Last night I lay awake in my bunk. Suddenly, rough hands grabbed me. A hand pressed to my mouth. 'Stop making us look bad,' a voice whispered. It was too dark to see my antagonists. I tried to fight back, but they held me down.",

"The next day I woke up and all my clothes had been shredded. Clearly I was mistaken to trust my peers. Their facade is just that; a false friendship masking severe competitiveness. Well, if that's how they're going to play it, I can play rough too. I was not going to fall back on my family's money, but needs must..."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant4.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant4",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 4",
"description" : "The Ascendant's Tale 4",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_4.png",
"contentPages" : [

"Our Clipped Council liaison came by today, and a well-placed bribe ensured I won't have to be sharing a room with the others. No more worrying about late-night visits. Next, I sent word to my man outside the village; he is to deliver a message of great importance.",

"Then, our mental training began. I outclassed the others with ease, as I knew I would. My mind is the sharpest it has ever been. I could see them staring at me, angrily, just willing me to succeed, planning what they'd do to me when I did. They're going to have a rude awakening."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant5.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant5",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 5",
"description" : "The Ascendant's Tale 5",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_5.png",
"contentPages" : [

"Finally, my contraband package arrived. Delivered in the dead of night by my manservant. It did not disappoint. Greenfinger of the Floran truly is a master when it comes to alchemical formulas. I took one sip and already I could feel my strength boosting, my body hardening.",

"Tomorrow, we begin sparring practise. I pity the foolish Avians who will get in my way. They're going to experience a side of me they've never seen before. A dark, angry side. And it will be glorious."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant6.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant6",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 6",
"description" : "The Ascendant's Tale 6",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_6.png",
"contentPages" : [

"Never before have I felt so powerful, so unstoppable. We took to the gladiatorial arena, and I threw down against opponent after opponent. When I was done, my entire class lay sprawled on the floor around me, groaning, looking at me with malice in their eyes. They are weak, pathetic.",

"My joy was short-lived, however. I returned to the dorms to find my secret stash disturbed, my bottles of precious enhancement gone. A red feather sat in their place. An accident or a defiant message? I knew who was responsible. Larbeaks, perhaps the strongest Avian in the class besides me. She's been gunning for me since day one."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant7.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant7",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 7",
"description" : "The Ascendant's Tale 7",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_7.png",
"contentPages" : [

"To become a Sunborn, one must be cunning as well as strong. Without my formula, Larbeaks has an edge over me. Perhaps she will take it herself. I cannot risk this. My manservant has been sent off-world, to make contact with a certain Helion.",

"Dealing with Helions is always risky business. My mother would often hire one of these creatures to keep political rivals in their place, but this is my first time. I admit, I feel something of a thrill."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant8.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant8",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 8",
"description" : "The Ascendant's Tale 8",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_8.png",
"contentPages" : [

"My manservant returned. Well, my manservant WAS returned. Thankfully, none of my peers saw me take delivery of the crate, or dispose of the remains. I was expecting this, of course; Helions are known to shoot the messenger. It proves that we the clients are committed, knowing we are sending a trusted employee to their doom.",

"Barbaric but necessary. So my contract was accepted, and now I have to wait. Helions are known for their promptness. The assassin could be here any day. Maybe they already are. Their stealth capabilities are unrivalled. It's somewhat disconcerting.",
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/fuascendant9.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "fuascendant9",
"species" : "avian",
"title" : "Ascendant's Tale",
"title" : "Ascendant's Tale 9",
"description" : "The Ascendant's Tale 9",
"icon" : "/codex/legacy_codex_images/ascendant's_tale_9.png",
"contentPages" : [

"It is done. Larbeaks is no more. Nobody suspects a thing. And yet I am shaken, concerned. You see, the Helion visited me after the kill. This is unheard of. Almost never do the Helion reveal themselves to their clients. And yet, I woke up in the night to feel a hand on my shoulder.",

"The Helion was not what I expected. He was soft-spoken, calm. His name is Hish'eth and he said I knew my mother. That he'd been there when she died. I asked him if that meant what I thought it meant. He shook his head, and I thought I could detect a sadness in his eyes.",
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex1.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex1",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 1",
"description" : "A Greenguard's Journal 1",
"icon" : "/codex/legacy_codex_images/greenguardcodex1.png",
"contentPages" : [

"So here I am, finally assigned to The Dust. My mother is a state, of course. 'The Greenguard is no place for a literate Floran!' she cried. But she was wrong. Oh, was she wrong.",

"For moons I longed for the solitude, the darkness of The Dust, and when my transfer request was approved, I celebrated. Down here, in the darkness, amongst the universe's most unfortunate souls, I finally feel like I'm not alone any more.",
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex2.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex2",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 2",
"description" : "A Greenguard's Journal 2",
"icon" : "/codex/legacy_codex_images/greenguardcodex2.png",
"contentPages" : [

"Deep in the bowels of this place, I met a most curious Avian, who has rejected the teachings of her species and defied her gods. We spoke of freedom, and free will, and choice, and the soul. She gave me much to ponder over. Then one of my Greenguard peers threw a bucket of swill in her face. Perhaps there is meaning in this. I shall muse on it as I sleep tonight."

],
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex3.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex3",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 3",
"description" : "A Greenguard's Journal 3",
"icon" : "/codex/legacy_codex_images/greenguardcodex3.png",
"contentPages" : [

"Perhaps my only reservation about being stationed in The Dust is the elders' insistence on transferring us regularly between outposts. It's to stop Greenguards becoming attached to prisoners, they say, although the chances of some of my peers developing any kind of emotional bond is next to zero.",

"The journey between outposts is stressful, particularly with the Drysap working its magic. But this is the price I must pay to follow my dreams."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex4.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex4",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 4",
"description" : "A Greenguard's Journal 4",
"icon" : "/codex/legacy_codex_images/greenguardcodex4.png",
"contentPages" : [

"I lie awake at night in my cool, dark quarters, the sound of wailing echoing through the prison corridors, and I begin to question. Why do we hunt? Why do we kill? What drives us to be the species that we are? We are the trees, uprooted. The bushes, animated.",

"The flowers and plants given sentience. Nature is gentle but cruel. Are we the cruel face of Nature itself? Or are we something more? From the seeds we plant, a universe will sprout. We are the oaken soldiers."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex5.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex5",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 5",
"description" : "A Greenguard's Journal 5",
"icon" : "/codex/legacy_codex_images/greenguardcodex5.png",
"contentPages" : [

"Upon re-reading my previous journal entry, I became alarmed and then afraid. Memories are growing hazy, as if there's a cold, hard knot of wood in my brain, tugging at my thoughts. I had my third Drysap treatment today. The doctor had to force the needle in.",

"Afterwards she looked at me and hissed, as if she no longer recognised me as one of her own.",
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex6.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex6",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 6",
"description" : "A Greenguard's Journal 6",
"icon" : "/codex/legacy_codex_images/greenguardcodex6.png",
"contentPages" : [

"I dream of oaken soldiers once more. Who is this army that sprawls before me? I feel a stiffening in my limbs as I wake. I think The Dust is getting to me. I require Drysap treatment once a week now, and even then it does little to ease my discomfort.",

"Today I killed a prisoner. I pushed him down the stairs on the way to dinner. The other guards cheered and hooted, but I felt no such pleasure. The thrill of the hunt is gone from me. I should set a torch to them and see how well they hunt then."
Expand Down
4 changes: 2 additions & 2 deletions codex/legacy_codex/greenguardcodex7.codex
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"id" : "greenguardcodex7",
"species" : "floran",
"title" : "Greenguard Journal",
"title" : "Greenguard Journal 7",
"description" : "A Greenguard's Journal 7",
"icon" : "/codex/legacy_codex_images/greenguardcodex7.png",
"contentPages" : [

"Soon they will come for me, but who shall reach me first? My kin, with their spears and knives, baying for blood? Or the oaken soldiers, marching to reclaim me, to bring me back into their fold.",

"My superiors demand recompense. Recompense for what I've done. That terrible, unspeakable thing which breaks every Floran code, that which even in my distant state, I cannot bring myself to mention. Who will find me first?"
Expand Down
2 changes: 1 addition & 1 deletion items/materials/fukirhosstairs.matitem
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"itemName" : "fukirhosstairs",
"price" : 0,
"category" : "block",
"category" : "platform",
"rarity" : "Common",
"inventoryIcon" : "fukirhosstairs.png",
"shortdescription" : "Alloy stairs",
Expand Down
4 changes: 2 additions & 2 deletions items/materials/fukirhosstairs2.matitem
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"itemName" : "fukirhosstairs2",
"price" : 0,
"category" : "block",
"category" : "platform",
"rarity" : "Common",
"inventoryIcon" : "fukirhosstairs2.png",
"shortdescription" : "Alloy stairs",
"shortdescription" : "Alloy red stairs",
"description" : "A sturdy looking metal stair.",

"materialId" : 6017
Expand Down
11 changes: 11 additions & 0 deletions objects/energywood/energywoodcabinet/energywoodcabineta.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{

"frameGrid" : {
"size" : [40, 24],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
]

}
}
37 changes: 37 additions & 0 deletions objects/energywood/energywoodcabinet/energywoodcabineta.object
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"objectName" : "energywoodcabineta",
"colonyTags" : ["energywood","storage"],
"rarity" : "Common",
"objectType" : "container",
"tooltipKind" : "container",
"description" : "A charming and well-made energy wood cabinet.",
"shortdescription" : "Energy Wood Cabinet",
"race" : "generic",
"category" : "storage",
"price" : 130,
"health" : 1.5,

"inventoryIcon" : "energywoodcabinetaicon.png",
"orientations" : [
{
"dualImage" : "energywoodcabineta.png:<color>",

"imagePosition" : [-8, 0],
"frames" : 1,
"animationCycle" : 1.0,

"spaceScan" : 0.1,
"anchors" : [ "bottom" ],
"collision" : "platform"

}
],

"openSounds" : [ "/sfx/objects/woodendoor_open.ogg" ],
"closeSounds" : [ "/sfx/objects/woodendoor_close.ogg" ],
"slotCount" : 24,
"uiConfig" : "/interface/chests/chest<slots>.config",
"frameCooldown" : 5,
"autoCloseCooldown" : 3600

}
11 changes: 11 additions & 0 deletions objects/energywood/energywoodcabinet/energywoodcabinetb.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{

"frameGrid" : {
"size" : [40, 32],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
]

}
}
37 changes: 37 additions & 0 deletions objects/energywood/energywoodcabinet/energywoodcabinetb.object
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"objectName" : "energywoodcabinetb",
"colonyTags" : ["energywood","storage"],
"rarity" : "Common",
"objectType" : "container",
"tooltipKind" : "container",
"description" : "A charming and well-made energy wood big cabinet.",
"shortdescription" : "Energy Wood Big Cabinet",
"race" : "generic",
"category" : "storage",
"price" : 130,
"health" : 1.5,

"inventoryIcon" : "energywoodcabinetbicon.png",
"orientations" : [
{
"dualImage" : "energywoodcabinetb.png:<color>",

"imagePosition" : [-8, 0],
"frames" : 1,
"animationCycle" : 1.0,

"spaceScan" : 0.1,
"anchors" : [ "bottom" ],
"collision" : "platform"

}
],

"openSounds" : [ "/sfx/objects/woodendoor_open.ogg" ],
"closeSounds" : [ "/sfx/objects/woodendoor_close.ogg" ],
"slotCount" : 24,
"uiConfig" : "/interface/chests/chest<slots>.config",
"frameCooldown" : 5,
"autoCloseCooldown" : 3600

}
10 changes: 10 additions & 0 deletions objects/energywood/energywoodcounter/energywoodcounter.frames
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{

"frameGrid" : {
"size" : [32, 16],
"dimensions" : [1, 1],
"names" : [
[ "default" ]
]
}
}
25 changes: 25 additions & 0 deletions objects/energywood/energywoodcounter/energywoodcounter.object
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"objectName" : "energywoodcounter",
"colonyTags" : ["energywood","commerce"],
"rarity" : "Common",
"category" : "furniture",
"price" : 105,
"description" : "An energy wood counter.",
"shortdescription" : "Energy Wood Counter",
"race" : "generic",

"inventoryIcon" : "energywoodcountericon.png",
"orientations" : [
{
"dualImage" : "energywoodcounter.png:<color>",
"imagePosition" : [-16, 0],
"frames" : 1,
"animationCycle" : 0.5,

"spaceScan" : 0.1,
"anchors" : [ "bottom" ],
"collision" : "platform"

}
]
}
Loading
Loading