From ae380e96845dbce4e083f2bf655523cba816a383 Mon Sep 17 00:00:00 2001 From: darth Date: Wed, 17 Jan 2024 15:20:03 -0300 Subject: [PATCH 1/2] Corrected some codexes titles. Fixed alloy stair platform type. Added new energy wood based furniture. --- codex/legacy_codex/fuascendant1.codex | 4 +- codex/legacy_codex/fuascendant10.codex | 4 +- codex/legacy_codex/fuascendant2.codex | 4 +- codex/legacy_codex/fuascendant3.codex | 4 +- codex/legacy_codex/fuascendant4.codex | 4 +- codex/legacy_codex/fuascendant5.codex | 4 +- codex/legacy_codex/fuascendant6.codex | 4 +- codex/legacy_codex/fuascendant7.codex | 4 +- codex/legacy_codex/fuascendant8.codex | 4 +- codex/legacy_codex/fuascendant9.codex | 4 +- codex/legacy_codex/greenguardcodex1.codex | 4 +- codex/legacy_codex/greenguardcodex2.codex | 4 +- codex/legacy_codex/greenguardcodex3.codex | 4 +- codex/legacy_codex/greenguardcodex4.codex | 4 +- codex/legacy_codex/greenguardcodex5.codex | 4 +- codex/legacy_codex/greenguardcodex6.codex | 4 +- codex/legacy_codex/greenguardcodex7.codex | 4 +- items/materials/fukirhosstairs.matitem | 2 +- items/materials/fukirhosstairs2.matitem | 4 +- .../energywoodcabineta.frames | 11 +++++ .../energywoodcabineta.object | 37 ++++++++++++++ .../energywoodcabinet/energywoodcabineta.png | Bin .../energywoodcabinetaicon.png | Bin .../energywoodcabinetb.frames | 11 +++++ .../energywoodcabinetb.object | 37 ++++++++++++++ .../energywoodcabinet/energywoodcabinetb.png | Bin .../energywoodcabinetbicon.png | Bin .../energywoodcounter.frames | 10 ++++ .../energywoodcounter.object | 25 ++++++++++ .../energywoodcounter/energywoodcounter.png | Bin .../energywoodcountericon.png | Bin .../energywooddesk/energywooddesk.frames | 11 +++++ .../energywooddesk/energywooddesk.object | 46 ++++++++++++++++++ .../energywooddesk/energywooddesk.png | Bin .../energywooddesk/energywooddeskicon.png | Bin .../energywoodrack/energywoodrack.frames | 11 +++++ .../energywoodrack/energywoodrack.object | 25 ++++++++++ .../energywoodrack/energywoodrack.png | Bin .../energywoodrack/energywoodrackicon.png | Bin .../energywoodrack2/energywoodrack2.frames | 11 +++++ .../energywoodrack2/energywoodrack2.object | 25 ++++++++++ .../energywoodrack2/energywoodrack2.png | Bin .../energywoodrack2/energywoodrack2icon.png | Bin .../energywoodsmallcabinet.frames | 11 +++++ .../energywoodsmallcabinet.object | 37 ++++++++++++++ .../energywoodsmallcabinet.png | Bin .../energywoodsmallcabineticon.png | Bin .../energywoodtable/energywoodtable.frames | 10 ++++ .../energywoodtable/energywoodtable.object | 25 ++++++++++ .../energywoodtable/energywoodtable.png | Bin .../energywoodtable/energywoodtableicon.png | Bin .../energywoodtable2/energywoodtable2.frames | 10 ++++ .../energywoodtable2/energywoodtable2.object | 25 ++++++++++ .../energywoodtable2/energywoodtable2.png | Bin .../energywoodtable2/energywoodtable2icon.png | Bin .../energywood/energywoodcabineta.recipe | 11 +++++ .../energywood/energywoodcabinetb.recipe | 11 +++++ .../energywood/energywoodcounter.recipe | 11 +++++ .../energywood/energywooddesk.recipe | 11 +++++ .../energywood/energywoodrack.recipe | 8 +++ .../energywood/energywoodrack2.recipe | 7 +++ .../energywood/energywoodsmallcabinet.recipe | 11 +++++ .../energywood/energywoodtable.recipe | 11 +++++ .../energywood/energywoodtable2.recipe | 11 +++++ zb/researchTree/fu_craftsmanship.config | 14 ++++-- 65 files changed, 518 insertions(+), 40 deletions(-) create mode 100644 objects/energywood/energywoodcabinet/energywoodcabineta.frames create mode 100644 objects/energywood/energywoodcabinet/energywoodcabineta.object rename a_notyetadded/objects/approved/energywood/medievalcabineta.png => objects/energywood/energywoodcabinet/energywoodcabineta.png (100%) rename a_notyetadded/objects/approved/energywood/medievalcabinetaicon.png => objects/energywood/energywoodcabinet/energywoodcabinetaicon.png (100%) create mode 100644 objects/energywood/energywoodcabinet/energywoodcabinetb.frames create mode 100644 objects/energywood/energywoodcabinet/energywoodcabinetb.object rename a_notyetadded/objects/approved/energywood/medievalcabinetb.png => objects/energywood/energywoodcabinet/energywoodcabinetb.png (100%) rename a_notyetadded/objects/approved/energywood/medievalcabinetbicon.png => objects/energywood/energywoodcabinet/energywoodcabinetbicon.png (100%) create mode 100644 objects/energywood/energywoodcounter/energywoodcounter.frames create mode 100644 objects/energywood/energywoodcounter/energywoodcounter.object rename a_notyetadded/objects/approved/energywood/medievalcounter2.png => objects/energywood/energywoodcounter/energywoodcounter.png (100%) rename a_notyetadded/objects/approved/energywood/medievalcounter2icon.png => objects/energywood/energywoodcounter/energywoodcountericon.png (100%) create mode 100644 objects/energywood/energywooddesk/energywooddesk.frames create mode 100644 objects/energywood/energywooddesk/energywooddesk.object rename a_notyetadded/objects/approved/energywood/medievaldesk2.png => objects/energywood/energywooddesk/energywooddesk.png (100%) rename a_notyetadded/objects/approved/energywood/medievaldesk2icon.png => objects/energywood/energywooddesk/energywooddeskicon.png (100%) create mode 100644 objects/energywood/energywoodrack/energywoodrack.frames create mode 100644 objects/energywood/energywoodrack/energywoodrack.object rename a_notyetadded/objects/approved/energywood/dungeonweaponrack1.png => objects/energywood/energywoodrack/energywoodrack.png (100%) rename a_notyetadded/objects/approved/energywood/dungeonweaponrack1icon.png => objects/energywood/energywoodrack/energywoodrackicon.png (100%) create mode 100644 objects/energywood/energywoodrack2/energywoodrack2.frames create mode 100644 objects/energywood/energywoodrack2/energywoodrack2.object rename a_notyetadded/objects/approved/energywood/dungeonweaponrack2.png => objects/energywood/energywoodrack2/energywoodrack2.png (100%) rename a_notyetadded/objects/approved/energywood/dungeonweaponrack2icon.png => objects/energywood/energywoodrack2/energywoodrack2icon.png (100%) create mode 100644 objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.frames create mode 100644 objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object rename a_notyetadded/objects/approved/energywood/smallmedievalcabinet.png => objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.png (100%) rename a_notyetadded/objects/approved/energywood/smallmedievalcabineticon.png => objects/energywood/energywoodsmallcabinet/energywoodsmallcabineticon.png (100%) create mode 100644 objects/energywood/energywoodtable/energywoodtable.frames create mode 100644 objects/energywood/energywoodtable/energywoodtable.object rename a_notyetadded/objects/approved/energywood/medievaltable.png => objects/energywood/energywoodtable/energywoodtable.png (100%) rename a_notyetadded/objects/approved/energywood/medievaltableicon.png => objects/energywood/energywoodtable/energywoodtableicon.png (100%) create mode 100644 objects/energywood/energywoodtable2/energywoodtable2.frames create mode 100644 objects/energywood/energywoodtable2/energywoodtable2.object rename a_notyetadded/objects/approved/energywood/medievaltable2.png => objects/energywood/energywoodtable2/energywoodtable2.png (100%) rename a_notyetadded/objects/approved/energywood/medievaltable2icon.png => objects/energywood/energywoodtable2/energywoodtable2icon.png (100%) create mode 100644 recipes/furniture1/energywood/energywoodcabineta.recipe create mode 100644 recipes/furniture1/energywood/energywoodcabinetb.recipe create mode 100644 recipes/furniture1/energywood/energywoodcounter.recipe create mode 100644 recipes/furniture1/energywood/energywooddesk.recipe create mode 100644 recipes/furniture1/energywood/energywoodrack.recipe create mode 100644 recipes/furniture1/energywood/energywoodrack2.recipe create mode 100644 recipes/furniture1/energywood/energywoodsmallcabinet.recipe create mode 100644 recipes/furniture1/energywood/energywoodtable.recipe create mode 100644 recipes/furniture1/energywood/energywoodtable2.recipe diff --git a/codex/legacy_codex/fuascendant1.codex b/codex/legacy_codex/fuascendant1.codex index dd3b8ada346..16cec1ab0b6 100644 --- a/codex/legacy_codex/fuascendant1.codex +++ b/codex/legacy_codex/fuascendant1.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant10.codex b/codex/legacy_codex/fuascendant10.codex index b7ffc5fd1b4..ab4f6693b55 100644 --- a/codex/legacy_codex/fuascendant10.codex +++ b/codex/legacy_codex/fuascendant10.codex @@ -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.", diff --git a/codex/legacy_codex/fuascendant2.codex b/codex/legacy_codex/fuascendant2.codex index 7b6917b46cd..9d29e4d1e0b 100644 --- a/codex/legacy_codex/fuascendant2.codex +++ b/codex/legacy_codex/fuascendant2.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant3.codex b/codex/legacy_codex/fuascendant3.codex index 2cf8b361d91..daf643280e9 100644 --- a/codex/legacy_codex/fuascendant3.codex +++ b/codex/legacy_codex/fuascendant3.codex @@ -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..." diff --git a/codex/legacy_codex/fuascendant4.codex b/codex/legacy_codex/fuascendant4.codex index f03acec03cc..a788b9863d8 100644 --- a/codex/legacy_codex/fuascendant4.codex +++ b/codex/legacy_codex/fuascendant4.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant5.codex b/codex/legacy_codex/fuascendant5.codex index 4cf33bbae4e..9f5152014ea 100644 --- a/codex/legacy_codex/fuascendant5.codex +++ b/codex/legacy_codex/fuascendant5.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant6.codex b/codex/legacy_codex/fuascendant6.codex index 2b7b4f92a92..3938cba9c2e 100644 --- a/codex/legacy_codex/fuascendant6.codex +++ b/codex/legacy_codex/fuascendant6.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant7.codex b/codex/legacy_codex/fuascendant7.codex index cdad4704b22..e6cf4716e44 100644 --- a/codex/legacy_codex/fuascendant7.codex +++ b/codex/legacy_codex/fuascendant7.codex @@ -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." diff --git a/codex/legacy_codex/fuascendant8.codex b/codex/legacy_codex/fuascendant8.codex index 24aff7978ed..56ccb3212db 100644 --- a/codex/legacy_codex/fuascendant8.codex +++ b/codex/legacy_codex/fuascendant8.codex @@ -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.", diff --git a/codex/legacy_codex/fuascendant9.codex b/codex/legacy_codex/fuascendant9.codex index 2381543e350..aff62782739 100644 --- a/codex/legacy_codex/fuascendant9.codex +++ b/codex/legacy_codex/fuascendant9.codex @@ -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.", diff --git a/codex/legacy_codex/greenguardcodex1.codex b/codex/legacy_codex/greenguardcodex1.codex index a780b4a2a2b..3d9e3baae85 100644 --- a/codex/legacy_codex/greenguardcodex1.codex +++ b/codex/legacy_codex/greenguardcodex1.codex @@ -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.", diff --git a/codex/legacy_codex/greenguardcodex2.codex b/codex/legacy_codex/greenguardcodex2.codex index 3a39d71e876..2921b3e4d0e 100644 --- a/codex/legacy_codex/greenguardcodex2.codex +++ b/codex/legacy_codex/greenguardcodex2.codex @@ -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." ], diff --git a/codex/legacy_codex/greenguardcodex3.codex b/codex/legacy_codex/greenguardcodex3.codex index 624862e8cb1..86b5cb09783 100644 --- a/codex/legacy_codex/greenguardcodex3.codex +++ b/codex/legacy_codex/greenguardcodex3.codex @@ -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." diff --git a/codex/legacy_codex/greenguardcodex4.codex b/codex/legacy_codex/greenguardcodex4.codex index 60ccb16ad9d..1e58631a956 100644 --- a/codex/legacy_codex/greenguardcodex4.codex +++ b/codex/legacy_codex/greenguardcodex4.codex @@ -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." diff --git a/codex/legacy_codex/greenguardcodex5.codex b/codex/legacy_codex/greenguardcodex5.codex index e1d0536dcf6..69dc3ad5238 100644 --- a/codex/legacy_codex/greenguardcodex5.codex +++ b/codex/legacy_codex/greenguardcodex5.codex @@ -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.", diff --git a/codex/legacy_codex/greenguardcodex6.codex b/codex/legacy_codex/greenguardcodex6.codex index 4f4bde125e9..bfb20030ac0 100644 --- a/codex/legacy_codex/greenguardcodex6.codex +++ b/codex/legacy_codex/greenguardcodex6.codex @@ -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." diff --git a/codex/legacy_codex/greenguardcodex7.codex b/codex/legacy_codex/greenguardcodex7.codex index b0780949cd0..1c5c208a0c0 100644 --- a/codex/legacy_codex/greenguardcodex7.codex +++ b/codex/legacy_codex/greenguardcodex7.codex @@ -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?" diff --git a/items/materials/fukirhosstairs.matitem b/items/materials/fukirhosstairs.matitem index 8b2a0a070da..2033d0c2ea7 100644 --- a/items/materials/fukirhosstairs.matitem +++ b/items/materials/fukirhosstairs.matitem @@ -1,7 +1,7 @@ { "itemName" : "fukirhosstairs", "price" : 0, - "category" : "block", + "category" : "platform", "rarity" : "Common", "inventoryIcon" : "fukirhosstairs.png", "shortdescription" : "Alloy stairs", diff --git a/items/materials/fukirhosstairs2.matitem b/items/materials/fukirhosstairs2.matitem index 8086d523d7b..73a6cfbbc8d 100644 --- a/items/materials/fukirhosstairs2.matitem +++ b/items/materials/fukirhosstairs2.matitem @@ -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 diff --git a/objects/energywood/energywoodcabinet/energywoodcabineta.frames b/objects/energywood/energywoodcabinet/energywoodcabineta.frames new file mode 100644 index 00000000000..a5a3113465c --- /dev/null +++ b/objects/energywood/energywoodcabinet/energywoodcabineta.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [40, 24], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywoodcabinet/energywoodcabineta.object b/objects/energywood/energywoodcabinet/energywoodcabineta.object new file mode 100644 index 00000000000..60bd1c338da --- /dev/null +++ b/objects/energywood/energywoodcabinet/energywoodcabineta.object @@ -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:", + + "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.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 + +} diff --git a/a_notyetadded/objects/approved/energywood/medievalcabineta.png b/objects/energywood/energywoodcabinet/energywoodcabineta.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcabineta.png rename to objects/energywood/energywoodcabinet/energywoodcabineta.png diff --git a/a_notyetadded/objects/approved/energywood/medievalcabinetaicon.png b/objects/energywood/energywoodcabinet/energywoodcabinetaicon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcabinetaicon.png rename to objects/energywood/energywoodcabinet/energywoodcabinetaicon.png diff --git a/objects/energywood/energywoodcabinet/energywoodcabinetb.frames b/objects/energywood/energywoodcabinet/energywoodcabinetb.frames new file mode 100644 index 00000000000..2994e249808 --- /dev/null +++ b/objects/energywood/energywoodcabinet/energywoodcabinetb.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [40, 32], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywoodcabinet/energywoodcabinetb.object b/objects/energywood/energywoodcabinet/energywoodcabinetb.object new file mode 100644 index 00000000000..013c1ae4471 --- /dev/null +++ b/objects/energywood/energywoodcabinet/energywoodcabinetb.object @@ -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:", + + "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.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 + +} diff --git a/a_notyetadded/objects/approved/energywood/medievalcabinetb.png b/objects/energywood/energywoodcabinet/energywoodcabinetb.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcabinetb.png rename to objects/energywood/energywoodcabinet/energywoodcabinetb.png diff --git a/a_notyetadded/objects/approved/energywood/medievalcabinetbicon.png b/objects/energywood/energywoodcabinet/energywoodcabinetbicon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcabinetbicon.png rename to objects/energywood/energywoodcabinet/energywoodcabinetbicon.png diff --git a/objects/energywood/energywoodcounter/energywoodcounter.frames b/objects/energywood/energywoodcounter/energywoodcounter.frames new file mode 100644 index 00000000000..030b783e5c1 --- /dev/null +++ b/objects/energywood/energywoodcounter/energywoodcounter.frames @@ -0,0 +1,10 @@ +{ + + "frameGrid" : { + "size" : [32, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + } +} diff --git a/objects/energywood/energywoodcounter/energywoodcounter.object b/objects/energywood/energywoodcounter/energywoodcounter.object new file mode 100644 index 00000000000..c5dcff13a56 --- /dev/null +++ b/objects/energywood/energywoodcounter/energywoodcounter.object @@ -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:", + "imagePosition" : [-16, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ] +} diff --git a/a_notyetadded/objects/approved/energywood/medievalcounter2.png b/objects/energywood/energywoodcounter/energywoodcounter.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcounter2.png rename to objects/energywood/energywoodcounter/energywoodcounter.png diff --git a/a_notyetadded/objects/approved/energywood/medievalcounter2icon.png b/objects/energywood/energywoodcounter/energywoodcountericon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievalcounter2icon.png rename to objects/energywood/energywoodcounter/energywoodcountericon.png diff --git a/objects/energywood/energywooddesk/energywooddesk.frames b/objects/energywood/energywooddesk/energywooddesk.frames new file mode 100644 index 00000000000..910af9e9438 --- /dev/null +++ b/objects/energywood/energywooddesk/energywooddesk.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [48, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywooddesk/energywooddesk.object b/objects/energywood/energywooddesk/energywooddesk.object new file mode 100644 index 00000000000..0e2535eb04d --- /dev/null +++ b/objects/energywood/energywooddesk/energywooddesk.object @@ -0,0 +1,46 @@ +{ + "objectName" : "energywooddesk", + "colonyTags" : ["energywood","commerce","storage"], + "rarity" : "Common", + "objectType" : "container", + "tooltipKind" : "container", + "description" : "A nicely made energy wood desk.", + "shortdescription" : "Energy Wood Desk", + "race" : "generic", + "category" : "furniture", + "price" : 130, + "health" : 1.5, + + "inventoryIcon" : "energywooddeskicon.png", + "orientations" : [ + { + "image" : "energywooddesk.png:", + "imagePosition" : [-24, 0], + "direction" : "left", + "flipImages" : true, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform", + "collisionSpaces" : [ [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1] ] + }, + { + "image" : "energywooddesk.png:", + "imagePosition" : [-24, 0], + "direction" : "right", + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform", + "collisionSpaces" : [ [-3, 1], [-2, 1], [-1, 1], [0, 1], [1, 1], [2, 1] ] + } + ], + + "openSounds" : [ "/sfx/objects/woodenbox_open.ogg" ], + "closeSounds" : [ "/sfx/objects/woodenbox_close.ogg" ], + "slotCount" : 9, + "uiConfig" : "/interface/chests/chest.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 + +} diff --git a/a_notyetadded/objects/approved/energywood/medievaldesk2.png b/objects/energywood/energywooddesk/energywooddesk.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaldesk2.png rename to objects/energywood/energywooddesk/energywooddesk.png diff --git a/a_notyetadded/objects/approved/energywood/medievaldesk2icon.png b/objects/energywood/energywooddesk/energywooddeskicon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaldesk2icon.png rename to objects/energywood/energywooddesk/energywooddeskicon.png diff --git a/objects/energywood/energywoodrack/energywoodrack.frames b/objects/energywood/energywoodrack/energywoodrack.frames new file mode 100644 index 00000000000..f53a15e6f69 --- /dev/null +++ b/objects/energywood/energywoodrack/energywoodrack.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 32], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywoodrack/energywoodrack.object b/objects/energywood/energywoodrack/energywoodrack.object new file mode 100644 index 00000000000..ed2eb63dcc4 --- /dev/null +++ b/objects/energywood/energywoodrack/energywoodrack.object @@ -0,0 +1,25 @@ +{ + "objectName" : "energywoodrack", + "colonyTags" : [ "energywood", "storage" ], + "rarity" : "Common", + "description" : "A energy wood rack full of fairly dull iron swords.", + "shortdescription" : "Energy Wood Weapon Rack", + "race" : "generic", + "category" : "decorative", + "price" : 110, + + "inventoryIcon" : "energywoodrackicon.png", + "orientations" : [ + { + "dualImage" : "energywoodrack.png:", + + "imagePosition" : [-16, -0], + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + } + ] +} diff --git a/a_notyetadded/objects/approved/energywood/dungeonweaponrack1.png b/objects/energywood/energywoodrack/energywoodrack.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/dungeonweaponrack1.png rename to objects/energywood/energywoodrack/energywoodrack.png diff --git a/a_notyetadded/objects/approved/energywood/dungeonweaponrack1icon.png b/objects/energywood/energywoodrack/energywoodrackicon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/dungeonweaponrack1icon.png rename to objects/energywood/energywoodrack/energywoodrackicon.png diff --git a/objects/energywood/energywoodrack2/energywoodrack2.frames b/objects/energywood/energywoodrack2/energywoodrack2.frames new file mode 100644 index 00000000000..25e92972cad --- /dev/null +++ b/objects/energywood/energywoodrack2/energywoodrack2.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 24], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywoodrack2/energywoodrack2.object b/objects/energywood/energywoodrack2/energywoodrack2.object new file mode 100644 index 00000000000..f66a8c22cdd --- /dev/null +++ b/objects/energywood/energywoodrack2/energywoodrack2.object @@ -0,0 +1,25 @@ +{ + "objectName" : "energywoodrack2", + "colonyTags" : [ "energywood", "storage" ], + "rarity" : "Common", + "description" : "An empty energy wood rack.", + "shortdescription" : "Empty Energy Wood Weapon Rack", + "race" : "generic", + "category" : "decorative", + "price" : 110, + + "inventoryIcon" : "energywoodrack2icon.png", + "orientations" : [ + { + "dualImage" : "energywoodrack2.png:", + + "imagePosition" : [-16, -0], + "frames" : 1, + "animationCycle" : 1.0, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ] + + } + ] +} diff --git a/a_notyetadded/objects/approved/energywood/dungeonweaponrack2.png b/objects/energywood/energywoodrack2/energywoodrack2.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/dungeonweaponrack2.png rename to objects/energywood/energywoodrack2/energywoodrack2.png diff --git a/a_notyetadded/objects/approved/energywood/dungeonweaponrack2icon.png b/objects/energywood/energywoodrack2/energywoodrack2icon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/dungeonweaponrack2icon.png rename to objects/energywood/energywoodrack2/energywoodrack2icon.png diff --git a/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.frames b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.frames new file mode 100644 index 00000000000..25e92972cad --- /dev/null +++ b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.frames @@ -0,0 +1,11 @@ +{ + + "frameGrid" : { + "size" : [32, 24], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + + } +} diff --git a/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object new file mode 100644 index 00000000000..5059b124a4b --- /dev/null +++ b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object @@ -0,0 +1,37 @@ +{ + "objectName" : "energywoodsmallcabinet", + "colonyTags" : ["energywood","storage"], + "rarity" : "Common", + "objectType" : "container", + "tooltipKind" : "container", + "description" : "A charming and well-made energy wood small cabinet.", + "shortdescription" : "Energy Wood SmallCabinet", + "race" : "generic", + "category" : "storage", + "price" : 130, + "health" : 1.5, + + "inventoryIcon" : "energywoodsmallcabineticon.png", + "orientations" : [ + { + "dualImage" : "energywoodsmallcabinet.png:", + + "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.config", + "frameCooldown" : 5, + "autoCloseCooldown" : 3600 + +} diff --git a/a_notyetadded/objects/approved/energywood/smallmedievalcabinet.png b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/smallmedievalcabinet.png rename to objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.png diff --git a/a_notyetadded/objects/approved/energywood/smallmedievalcabineticon.png b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabineticon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/smallmedievalcabineticon.png rename to objects/energywood/energywoodsmallcabinet/energywoodsmallcabineticon.png diff --git a/objects/energywood/energywoodtable/energywoodtable.frames b/objects/energywood/energywoodtable/energywoodtable.frames new file mode 100644 index 00000000000..5c98ed43815 --- /dev/null +++ b/objects/energywood/energywoodtable/energywoodtable.frames @@ -0,0 +1,10 @@ +{ + + "frameGrid" : { + "size" : [48, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + } +} diff --git a/objects/energywood/energywoodtable/energywoodtable.object b/objects/energywood/energywoodtable/energywoodtable.object new file mode 100644 index 00000000000..2335b1d892e --- /dev/null +++ b/objects/energywood/energywoodtable/energywoodtable.object @@ -0,0 +1,25 @@ +{ + "objectName" : "energywoodtable", + "colonyTags" : ["energywood","commerce"], + "rarity" : "Common", + "category" : "furniture", + "price" : 110, + "description" : "A table made from energy wood.", + "shortdescription" : "Energy Wood Table", + "race" : "generic", + + "inventoryIcon" : "energywoodtableeicon.png", + "orientations" : [ + { + "dualImage" : "energywoodtable.png:", + "imagePosition" : [-24, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ] +} diff --git a/a_notyetadded/objects/approved/energywood/medievaltable.png b/objects/energywood/energywoodtable/energywoodtable.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaltable.png rename to objects/energywood/energywoodtable/energywoodtable.png diff --git a/a_notyetadded/objects/approved/energywood/medievaltableicon.png b/objects/energywood/energywoodtable/energywoodtableicon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaltableicon.png rename to objects/energywood/energywoodtable/energywoodtableicon.png diff --git a/objects/energywood/energywoodtable2/energywoodtable2.frames b/objects/energywood/energywoodtable2/energywoodtable2.frames new file mode 100644 index 00000000000..5c98ed43815 --- /dev/null +++ b/objects/energywood/energywoodtable2/energywoodtable2.frames @@ -0,0 +1,10 @@ +{ + + "frameGrid" : { + "size" : [48, 16], + "dimensions" : [1, 1], + "names" : [ + [ "default" ] + ] + } +} diff --git a/objects/energywood/energywoodtable2/energywoodtable2.object b/objects/energywood/energywoodtable2/energywoodtable2.object new file mode 100644 index 00000000000..fead920dffd --- /dev/null +++ b/objects/energywood/energywoodtable2/energywoodtable2.object @@ -0,0 +1,25 @@ +{ + "objectName" : "energywoodtable2", + "colonyTags" : ["energywood","commerce"], + "rarity" : "Common", + "category" : "furniture", + "price" : 110, + "description" : "An end table made from energy wood.", + "shortdescription" : "Energy Wood End Table", + "race" : "generic", + + "inventoryIcon" : "energywoodtable2icon.png", + "orientations" : [ + { + "dualImage" : "energywoodtable2.png:", + "imagePosition" : [-24, 0], + "frames" : 1, + "animationCycle" : 0.5, + + "spaceScan" : 0.1, + "anchors" : [ "bottom" ], + "collision" : "platform" + + } + ] +} diff --git a/a_notyetadded/objects/approved/energywood/medievaltable2.png b/objects/energywood/energywoodtable2/energywoodtable2.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaltable2.png rename to objects/energywood/energywoodtable2/energywoodtable2.png diff --git a/a_notyetadded/objects/approved/energywood/medievaltable2icon.png b/objects/energywood/energywoodtable2/energywoodtable2icon.png similarity index 100% rename from a_notyetadded/objects/approved/energywood/medievaltable2icon.png rename to objects/energywood/energywoodtable2/energywoodtable2icon.png diff --git a/recipes/furniture1/energywood/energywoodcabineta.recipe b/recipes/furniture1/energywood/energywoodcabineta.recipe new file mode 100644 index 00000000000..9da0e9a3f04 --- /dev/null +++ b/recipes/furniture1/energywood/energywoodcabineta.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 4 } + ], + "output" : { + "item" : "energywoodcabineta", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "storage", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodcabinetb.recipe b/recipes/furniture1/energywood/energywoodcabinetb.recipe new file mode 100644 index 00000000000..bcc65d3a87f --- /dev/null +++ b/recipes/furniture1/energywood/energywoodcabinetb.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 4 } + ], + "output" : { + "item" : "energywoodcabinetb", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "storage", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodcounter.recipe b/recipes/furniture1/energywood/energywoodcounter.recipe new file mode 100644 index 00000000000..50165532080 --- /dev/null +++ b/recipes/furniture1/energywood/energywoodcounter.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 3 } + ], + "output" : { + "item" : "energywoodcounter", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "decoration", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywooddesk.recipe b/recipes/furniture1/energywood/energywooddesk.recipe new file mode 100644 index 00000000000..6e510b7ed5b --- /dev/null +++ b/recipes/furniture1/energywood/energywooddesk.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 3 } + ], + "output" : { + "item" : "energywooddesk", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "decoration", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodrack.recipe b/recipes/furniture1/energywood/energywoodrack.recipe new file mode 100644 index 00000000000..0e5620da4aa --- /dev/null +++ b/recipes/furniture1/energywood/energywoodrack.recipe @@ -0,0 +1,8 @@ +{ + "input" : [ + { "item" : "energywood", "count" : 5 }, + { "item" : "ironbar", "count" : 1 } + ], + "output" : { "item" : "dungeonweaponrack1", "count" : 1 }, + "groups" : [ "craftingfurniture", "decoration", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodrack2.recipe b/recipes/furniture1/energywood/energywoodrack2.recipe new file mode 100644 index 00000000000..1143a209c23 --- /dev/null +++ b/recipes/furniture1/energywood/energywoodrack2.recipe @@ -0,0 +1,7 @@ +{ + "input" : [ + { "item" : "energywood", "count" : 5 } + ], + "output" : { "item" : "dungeonweaponrack2", "count" : 1 }, + "groups" : [ "craftingfurniture", "decoration", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodsmallcabinet.recipe b/recipes/furniture1/energywood/energywoodsmallcabinet.recipe new file mode 100644 index 00000000000..cfbb66265ae --- /dev/null +++ b/recipes/furniture1/energywood/energywoodsmallcabinet.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 4 } + ], + "output" : { + "item" : "energywoodsmallcabinet", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "storage", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodtable.recipe b/recipes/furniture1/energywood/energywoodtable.recipe new file mode 100644 index 00000000000..2a343b48dce --- /dev/null +++ b/recipes/furniture1/energywood/energywoodtable.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 4 } + ], + "output" : { + "item" : "energywoodtable", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "decoration", "all" ] +} \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodtable2.recipe b/recipes/furniture1/energywood/energywoodtable2.recipe new file mode 100644 index 00000000000..6f3816b3a24 --- /dev/null +++ b/recipes/furniture1/energywood/energywoodtable2.recipe @@ -0,0 +1,11 @@ +{ + "input" : [ + { "item" : "ironbar", "count" : 1 }, + { "item" : "energywood", "count" : 4 } + ], + "output" : { + "item" : "energywoodtable2", + "count" : 1 + }, + "groups" : [ "craftingfurniture2", "decoration", "all" ] +} \ No newline at end of file diff --git a/zb/researchTree/fu_craftsmanship.config b/zb/researchTree/fu_craftsmanship.config index 628d615301f..1b441b3fac2 100644 --- a/zb/researchTree/fu_craftsmanship.config +++ b/zb/researchTree/fu_craftsmanship.config @@ -200,7 +200,7 @@ "workbenchtungsten" : { "icon" : "/objects/tiered/tier2chair/tier2chairicon.png", "position" : [-160, 0], - "children" : [ "workbenchtitanium", "workbenchprecious", "workbenchlunari" ], + "children" : [ "workbenchtitanium", "workbenchprecious", "workbenchlunari", "workbenchenergywood" ], "price" : [ ["fuscienceresource", 150],["tungstenbar", 3]], "unlocks" : [ "tier2chair", "tier2door", "steelgirdir2", "fujaildoor", "fufrozendoor", "retexironblock", "tier2light", "apexshiplight", "tier2table", "tier2bed", "fridge", "minifridge", "futoolbox1", "futoolbox2", "medievalworkstation", "fulabslopedtile", "platematerial", "smoothmetal", "mediummetal", "fusteelgirdirmaterial", "chain", "fuslopedhazard", "tungstenplatform", "fuslopedtintedglass", "apexshipdetails", "slopedhullpanel", "apexshipwall", "apexshipsupport", "tinylocker", "fu_NFPA_gasoline", "fu_NFPA_precursor_fluid", "fu_NFPA_sulfuric", "fu_NFPA_uranium", "fu_staythefuckoutsign", "asphalt", "glowglassmaterial", "slopedglowglass", "slopedtintedglowglass", "fumetalpipe", "fufencesupport", "metallicbrick", "metallicbrick2", "metallicbrick3", "metallicslab", "fukirhosgirdir", "fukirhosgirdir2", "fukirhosmetalfloor", "fukirhosmetaltile", "fukirhosmetalwall", "fukirhosroof", "fukirhosstairs", "fukirhosstairs2", "fukirhossupport", "fukirhoswall", "fumetalbaseboard", "fukirhosslopedpanel", "outpostairlockrailhatchsmall", "protectorateplatform", "hylotlredalert", "hylotlswitch", "porthole", "lunarbaseplatform", "lunarbaseblock"] }, @@ -343,7 +343,6 @@ "children" : [ ], "price" : [ ["fuscienceresource", 150],["perfectlygenericitem", 3],["densealloy", 2]], "unlocks" : [ "fu_perfectbathtub", "fu_perfectbed", "fu_perfectbookcase", "fu_perfectcabinet", "fu_perfectceilinglamp", "fu_perfectchair", "fu_perfectcorner", "fu_perfectcouch", "fu_perfectcounter", "fu_perfectdesk", "fu_perfectdoor", "fu_perfectdresser", "fu_perfectendtable", "fu_perfectkitchensink", "fu_perfectlamp", "fu_perfectnightlamp", "fu_perfectshelf", "fu_perfectsink", "fu_perfectstand", "fu_perfectstool", "fu_perfectswitch", "fu_perfecttable", "fu_perfecttalllamp", "fu_perfecttoilet", "fu_perfectwallbutton", "fu_perfectwalllight", "perfectorgan", "fu_perfectarmchair"] - }, "workbenchpyreite" : { "icon" : "/objects/pyreite/pyreitechairicon.png", @@ -373,6 +372,13 @@ "price" : [ ["fuscienceresource", 150],["zerchesiumbar", 5],["solaricrystal", 2]], "unlocks" : [ "zerchesiumbed", "zerchesiumbookcase", "zerchesiumcabinet", "zerchesiumchair", "zerchesiumconsole", "zerchesiumcouch", "zerchesiumcratelarge", "zerchesiumcratesmall", "zerchesiumdesk", "zerchesiumdrawer", "zerchesiumendtable", "zerchesiumfridge", "zerchesiumlamplarge", "zerchesiumlampsmall", "zerchesiumlight", "zerchesiumlocker", "zerchesiumminifridge", "zerchesiumslidingdoor", "zerchesiumstool", "zerchesiumtable", "zerchbed", "zerchbookcase", "zerchcabinet", "zerchceilinglamp", "zerchchair", "zerchchestlarge", "zerchchestsmall", "zerchcouch", "zerchdesk", "zerchdesklamp", "zerchdrawers", "zerchendtable", "zerchfridge", "zerchminifridge", "zerchnightstand", "zerchstandinglamp", "zerchstool", "zerchtable", "zerchwalllamp"] }, + "workbenchenergywood" : { + "icon" : "/items/materials/energywood.png", + "position" : [-140, 75], + "children" : [ ], + "price" : [ ["fuscienceresource", 150],["energywood", 50]], + "unlocks" : [ "energywoodcabineta", "energywoodcabinetb", "energywoodcounter", "energywooddesk", "energywoodrack2", "energywoodrack", "energywoodsmallcabinet", "energywoodtable2", "energywoodtable"] + }, "workbenchtechy" : { "icon" : "/objects/pixelgoods/fuokeahitecharmchairicon.png", "position" : [-200, -140], @@ -579,6 +585,7 @@ "WORKBENCHTELEBRIUM" : "workbenchtelebrium", "WORKBENCHTRIANGULUM" : "workbenchtriangulum", "WORKBENCHZERCHESIUM" : "workbenchzerchesium", + "WORKBENCHENERGYWOOD" : "workbenchenergywood", "WORKBENCHNIGHTAR" : "workbenchnightar", "WORKBENCHNIGHTAR2" : "workbenchnightar2", "WORKBENCHPEGLACI" : "workbenchpeglaci", @@ -656,6 +663,7 @@ "workbenchtelebrium": [ "Telebrium Construction", "^orange;Tier 2^reset;\n\nYou've made a bunch of Telebrium-based furniture items."], "workbenchtriangulum": [ "Trianglium Construction", "^orange;Tier 4^reset;\n\nYou've turned Trianglium into some very triangular and pointy furniture."], "workbenchzerchesium": [ "Zerchesium Construction", "^orange;Tier 3^reset;\n\nYou've designed a whole bunch of Zerchesium-based furniture items."], + "workbenchenergywood": [ "Energy Wood Construction", "^orange;Tier 3^reset;\n\nYou've designed a whole bunch of EnergyWood-based furniture items."], "workbenchnightar": [ "Nightar Construction", "^orange;Tier 3^reset;\n\nYou've learned to imitate the Nightar building style, allowing you to create a lot of furniture and blocks of their design."], "workbenchnightar2": [ "Nightar Construction 2", "^orange;Tier 3^reset;\n\nAdditional elements of nightar design."], "workbenchpeglaci": [ "Peglaci Construction", "^orange;Tier 3^reset;\n\nLong ago, the Peglaci were a race of arctic carnivores, the apex predators of their world, until they were uplifted by a race they know only as the Wanderers. You've learned to replicate their unique crafting style, a mix of ice and lignin developed in their race's infancy and metallically augmented by gifted knkowledge."], @@ -703,7 +711,7 @@ }, "versions":{ - "fu_craftsmanship" : "0.247" + "fu_craftsmanship" : "0.248" }, "initiallyResearched" : { "fu_craftsmanship" : [ "BASICTRAINING" ] From 0d4b36a35cb7098e6e55d3cf2b4d38bd0fa64b9f Mon Sep 17 00:00:00 2001 From: darth Date: Wed, 17 Jan 2024 15:40:57 -0300 Subject: [PATCH 2/2] Fixed some typos. --- objects/energywood/energywoodrack/energywoodrack.object | 2 +- objects/energywood/energywoodrack2/energywoodrack2.object | 2 +- .../energywoodsmallcabinet/energywoodsmallcabinet.object | 2 +- objects/energywood/energywoodtable/energywoodtable.object | 2 +- recipes/furniture1/energywood/energywoodrack.recipe | 2 +- recipes/furniture1/energywood/energywoodrack2.recipe | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/objects/energywood/energywoodrack/energywoodrack.object b/objects/energywood/energywoodrack/energywoodrack.object index ed2eb63dcc4..375ca3e34a9 100644 --- a/objects/energywood/energywoodrack/energywoodrack.object +++ b/objects/energywood/energywoodrack/energywoodrack.object @@ -3,7 +3,7 @@ "colonyTags" : [ "energywood", "storage" ], "rarity" : "Common", "description" : "A energy wood rack full of fairly dull iron swords.", - "shortdescription" : "Energy Wood Weapon Rack", + "shortdescription" : "Energy Wood Rack", "race" : "generic", "category" : "decorative", "price" : 110, diff --git a/objects/energywood/energywoodrack2/energywoodrack2.object b/objects/energywood/energywoodrack2/energywoodrack2.object index f66a8c22cdd..447d460ce82 100644 --- a/objects/energywood/energywoodrack2/energywoodrack2.object +++ b/objects/energywood/energywoodrack2/energywoodrack2.object @@ -3,7 +3,7 @@ "colonyTags" : [ "energywood", "storage" ], "rarity" : "Common", "description" : "An empty energy wood rack.", - "shortdescription" : "Empty Energy Wood Weapon Rack", + "shortdescription" : "Empty Energy Wood Rack", "race" : "generic", "category" : "decorative", "price" : 110, diff --git a/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object index 5059b124a4b..f2f84de5a99 100644 --- a/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object +++ b/objects/energywood/energywoodsmallcabinet/energywoodsmallcabinet.object @@ -5,7 +5,7 @@ "objectType" : "container", "tooltipKind" : "container", "description" : "A charming and well-made energy wood small cabinet.", - "shortdescription" : "Energy Wood SmallCabinet", + "shortdescription" : "Energy Wood Small Cabinet", "race" : "generic", "category" : "storage", "price" : 130, diff --git a/objects/energywood/energywoodtable/energywoodtable.object b/objects/energywood/energywoodtable/energywoodtable.object index 2335b1d892e..5d27903adca 100644 --- a/objects/energywood/energywoodtable/energywoodtable.object +++ b/objects/energywood/energywoodtable/energywoodtable.object @@ -8,7 +8,7 @@ "shortdescription" : "Energy Wood Table", "race" : "generic", - "inventoryIcon" : "energywoodtableeicon.png", + "inventoryIcon" : "energywoodtableicon.png", "orientations" : [ { "dualImage" : "energywoodtable.png:", diff --git a/recipes/furniture1/energywood/energywoodrack.recipe b/recipes/furniture1/energywood/energywoodrack.recipe index 0e5620da4aa..341f8d75723 100644 --- a/recipes/furniture1/energywood/energywoodrack.recipe +++ b/recipes/furniture1/energywood/energywoodrack.recipe @@ -3,6 +3,6 @@ { "item" : "energywood", "count" : 5 }, { "item" : "ironbar", "count" : 1 } ], - "output" : { "item" : "dungeonweaponrack1", "count" : 1 }, + "output" : { "item" : "energywoodrack", "count" : 1 }, "groups" : [ "craftingfurniture", "decoration", "all" ] } \ No newline at end of file diff --git a/recipes/furniture1/energywood/energywoodrack2.recipe b/recipes/furniture1/energywood/energywoodrack2.recipe index 1143a209c23..cdd083a5f8e 100644 --- a/recipes/furniture1/energywood/energywoodrack2.recipe +++ b/recipes/furniture1/energywood/energywoodrack2.recipe @@ -2,6 +2,6 @@ "input" : [ { "item" : "energywood", "count" : 5 } ], - "output" : { "item" : "dungeonweaponrack2", "count" : 1 }, + "output" : { "item" : "energywoodrack2", "count" : 1 }, "groups" : [ "craftingfurniture", "decoration", "all" ] } \ No newline at end of file