From 2725e2927a1595c7b100d942d1f14146252adeb7 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Thu, 25 Jun 2026 04:46:40 -0400 Subject: feat: who, global chat, removed redundant YAML IDs --- data/objects/1002_crowd.yaml | 18 ------------------ data/objects/1002_pilot.yaml | 10 ---------- data/objects/1002_shuttle.yaml | 9 --------- data/objects/adamantite_rock.yaml | 1 - data/objects/allotment_patch.yaml | 1 - data/objects/anglerfish_spot.yaml | 1 - data/objects/anvil.yaml | 1 - data/objects/aps_tower.yaml | 1 - data/objects/bait_fishing_spot.yaml | 1 - data/objects/bank_booth.yaml | 1 - data/objects/bio_altar.yaml | 1 - data/objects/blood_altar.yaml | 1 - data/objects/cage_fishing_spot.yaml | 1 - data/objects/chaos_altar.yaml | 1 - data/objects/charging_station.yaml | 1 - data/objects/clay_rock.yaml | 1 - data/objects/coal_rock.yaml | 1 - data/objects/cooking_range.yaml | 1 - data/objects/copper_rock.yaml | 1 - data/objects/cosmic_altar.yaml | 1 - data/objects/death_altar.yaml | 1 - data/objects/eco_altar.yaml | 1 - data/objects/estate_directory.yaml | 1 - data/objects/fence_post.yaml | 1 - data/objects/fire.yaml | 1 - data/objects/flower_patch.yaml | 1 - data/objects/fly_fishing_spot.yaml | 1 - data/objects/furnace.yaml | 1 - data/objects/gold_rock.yaml | 1 - data/objects/harpoon_fishing_spot.yaml | 1 - data/objects/herb_patch.yaml | 1 - data/objects/hydro_altar.yaml | 1 - data/objects/iron_gate.yaml | 1 - data/objects/iron_rock.yaml | 1 - data/objects/law_altar.yaml | 1 - data/objects/lumby_fountain.yaml | 1 - data/objects/magic_tree.yaml | 1 - data/objects/mahogany_tree.yaml | 1 - data/objects/maple_tree.yaml | 1 - data/objects/market_stall.yaml | 1 - data/objects/mithril_rock.yaml | 1 - data/objects/nature_altar.yaml | 1 - data/objects/net_fishing_spot.yaml | 1 - data/objects/netrunner.yaml | 1 - data/objects/oak_tree.yaml | 1 - data/objects/pottery_oven.yaml | 1 - data/objects/pottery_wheel.yaml | 1 - data/objects/redwood_tree.yaml | 1 - data/objects/rock_outcrop.yaml | 1 - data/objects/runite_rock.yaml | 1 - data/objects/sacred_eel_spot.yaml | 1 - data/objects/scrap_pile.yaml | 1 - data/objects/sheep.yaml | 1 - data/objects/silver_rock.yaml | 1 - data/objects/simple_rock.yaml | 1 - data/objects/solar_altar.yaml | 1 - data/objects/spinning_wheel.yaml | 1 - data/objects/swamp_fishing_spot.yaml | 1 - data/objects/teak_tree.yaml | 1 - data/objects/terminal_advanced.yaml | 1 - data/objects/terminal_basic.yaml | 1 - data/objects/terminal_secure.yaml | 1 - data/objects/tin_rock.yaml | 1 - data/objects/tool_shed.yaml | 1 - data/objects/tree.yaml | 1 - data/objects/tutorial_lever.yaml | 1 - data/objects/unique/1001_sign.yaml | 24 ++++++++++++++++++++++++ data/objects/unique/1002_crowd.yaml | 17 +++++++++++++++++ data/objects/unique/1002_pilot.yaml | 9 +++++++++ data/objects/unique/1002_shuttle.yaml | 8 ++++++++ data/objects/willow_tree.yaml | 1 - data/objects/workbench.yaml | 1 - data/objects/yew_tree.yaml | 1 - 73 files changed, 58 insertions(+), 103 deletions(-) delete mode 100644 data/objects/1002_crowd.yaml delete mode 100644 data/objects/1002_pilot.yaml delete mode 100644 data/objects/1002_shuttle.yaml create mode 100644 data/objects/unique/1001_sign.yaml create mode 100644 data/objects/unique/1002_crowd.yaml create mode 100644 data/objects/unique/1002_pilot.yaml create mode 100644 data/objects/unique/1002_shuttle.yaml (limited to 'data/objects') diff --git a/data/objects/1002_crowd.yaml b/data/objects/1002_crowd.yaml deleted file mode 100644 index 8f8f099..0000000 --- a/data/objects/1002_crowd.yaml +++ /dev/null @@ -1,18 +0,0 @@ -id: 1002_crowd -name: crowd of people -aliases: [people, crowd, group, passengers] -hidden: true -descriptions: - - condition: - all_of: - - player_flag: denali_intro_done - not: true - - player_flag: denali_lined_up - text: "The passengers have sorted themselves into a single-file line, tickets clutched in hand, shuffling toward the craft." - - condition: - all_of: - - player_flag: denali_intro_done - not: true - - player_flag: denali_lined_up - not: true - text: "A couple dozen anxious passengers mill about the pad, glancing between you and the small building to the north." diff --git a/data/objects/1002_pilot.yaml b/data/objects/1002_pilot.yaml deleted file mode 100644 index 61264b2..0000000 --- a/data/objects/1002_pilot.yaml +++ /dev/null @@ -1,10 +0,0 @@ -id: 1002_pilot -name: pilot -hidden: true -descriptions: - - condition: - all_of: - - player_flag: denali_intro_done - not: true - - player_flag: denali_lined_up - text: "The shuttle pilot stands by the hatch in a faded flight suit, waving passengers into line and checking tickets with a practiced eye." diff --git a/data/objects/1002_shuttle.yaml b/data/objects/1002_shuttle.yaml deleted file mode 100644 index 6ac3a90..0000000 --- a/data/objects/1002_shuttle.yaml +++ /dev/null @@ -1,9 +0,0 @@ -id: 1002_shuttle -name: landing craft -aliases: [shuttle, ship] -hidden: true -descriptions: - - condition: - player_flag: denali_intro_done - not: true - text: "The battered landing craft that carried you down still ticks and steams as it cools on the pad." diff --git a/data/objects/adamantite_rock.yaml b/data/objects/adamantite_rock.yaml index 4869a77..b7d03bf 100644 --- a/data/objects/adamantite_rock.yaml +++ b/data/objects/adamantite_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 95 -id: adamantite_rock name: adamantite rock diff --git a/data/objects/allotment_patch.yaml b/data/objects/allotment_patch.yaml index 1074abe..c028ab6 100644 --- a/data/objects/allotment_patch.yaml +++ b/data/objects/allotment_patch.yaml @@ -1,4 +1,3 @@ -id: allotment_patch name: allotment patch color: "94" hidden: false diff --git a/data/objects/anglerfish_spot.yaml b/data/objects/anglerfish_spot.yaml index 4829307..b1d132b 100644 --- a/data/objects/anglerfish_spot.yaml +++ b/data/objects/anglerfish_spot.yaml @@ -19,5 +19,4 @@ gather: per_level: 0.005 tools: - fishing_rod -id: anglerfish_spot name: anglerfish spot diff --git a/data/objects/anvil.yaml b/data/objects/anvil.yaml index ab5a79f..af6e88b 100644 --- a/data/objects/anvil.yaml +++ b/data/objects/anvil.yaml @@ -1,4 +1,3 @@ -id: anvil name: anvil color: "250" description: "A heavy iron anvil for hammering metal into shape." diff --git a/data/objects/aps_tower.yaml b/data/objects/aps_tower.yaml index 8f2548e..3993f66 100644 --- a/data/objects/aps_tower.yaml +++ b/data/objects/aps_tower.yaml @@ -1,4 +1,3 @@ -id: aps_tower name: APS Tower color: "33" description: "A tall, skeletal metal tower with a pulsing cyan beacon at its apex. A datapad sync panel glows softly at the base." diff --git a/data/objects/bait_fishing_spot.yaml b/data/objects/bait_fishing_spot.yaml index 8e506a8..a6a27cd 100644 --- a/data/objects/bait_fishing_spot.yaml +++ b/data/objects/bait_fishing_spot.yaml @@ -29,5 +29,4 @@ gather: per_level: 0.005 tools: - fishing_rod -id: bait_fishing_spot name: bait fishing spot diff --git a/data/objects/bank_booth.yaml b/data/objects/bank_booth.yaml index 0cc9fc7..eefda88 100644 --- a/data/objects/bank_booth.yaml +++ b/data/objects/bank_booth.yaml @@ -1,4 +1,3 @@ -id: bank_booth name: bank booth color: "226" description: "A sleek terminal with a biometric scanner. You can deposit or withdraw items here. Type 'bank' to access it." diff --git a/data/objects/bio_altar.yaml b/data/objects/bio_altar.yaml index 37618bc..2ae480e 100644 --- a/data/objects/bio_altar.yaml +++ b/data/objects/bio_altar.yaml @@ -1,4 +1,3 @@ -id: bio_altar name: bio altar color: "196" description: "A sinister altar of red biological interfaces. Place scrap here with a bio identifier to produce biojunk. Type 'id' to begin." diff --git a/data/objects/blood_altar.yaml b/data/objects/blood_altar.yaml index 49b6beb..fb051bc 100644 --- a/data/objects/blood_altar.yaml +++ b/data/objects/blood_altar.yaml @@ -1,4 +1,3 @@ -id: blood_altar name: blood altar color: "124" description: "A pulsing altar of {124 bold}crimson crystal{/}, warm to the touch. Place scrap here with a blood identifier to produce bloodjunk. Type 'id' to begin." diff --git a/data/objects/cage_fishing_spot.yaml b/data/objects/cage_fishing_spot.yaml index 691bb54..ef8e359 100644 --- a/data/objects/cage_fishing_spot.yaml +++ b/data/objects/cage_fishing_spot.yaml @@ -18,5 +18,4 @@ gather: per_level: 0.005 tools: - lobster_pot -id: cage_fishing_spot name: cage fishing spot diff --git a/data/objects/chaos_altar.yaml b/data/objects/chaos_altar.yaml index 384105f..89088c7 100644 --- a/data/objects/chaos_altar.yaml +++ b/data/objects/chaos_altar.yaml @@ -1,4 +1,3 @@ -id: chaos_altar name: chaos altar color: "226" description: "A crackling altar of {226 bold}chaotic energy{/}. Place scrap here with a chaos identifier to produce chaosjunk. Type 'id' to begin." diff --git a/data/objects/charging_station.yaml b/data/objects/charging_station.yaml index ef63c7d..e4199f1 100644 --- a/data/objects/charging_station.yaml +++ b/data/objects/charging_station.yaml @@ -1,4 +1,3 @@ -id: charging_station name: Charging Station description: "A humming terminal with exposed capacitor banks. Its indicator light pulses with stored energy. You could recharge your battery here." inroom_description: "A charging station hums quietly against the wall." diff --git a/data/objects/clay_rock.yaml b/data/objects/clay_rock.yaml index 70cfc4e..b2131e6 100644 --- a/data/objects/clay_rock.yaml +++ b/data/objects/clay_rock.yaml @@ -20,5 +20,4 @@ gather: tools: - pickaxe xp: 5 -id: clay_rock name: clay rock diff --git a/data/objects/coal_rock.yaml b/data/objects/coal_rock.yaml index f033965..6c4b0c6 100644 --- a/data/objects/coal_rock.yaml +++ b/data/objects/coal_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 50 -id: coal_rock name: coal rock diff --git a/data/objects/cooking_range.yaml b/data/objects/cooking_range.yaml index f70b7fd..d19c790 100644 --- a/data/objects/cooking_range.yaml +++ b/data/objects/cooking_range.yaml @@ -1,4 +1,3 @@ -id: cooking_range name: cooking range color: "253" description: "A sturdy iron range with multiple burners. Perfect for cooking." diff --git a/data/objects/copper_rock.yaml b/data/objects/copper_rock.yaml index aa2a5cc..a81c164 100644 --- a/data/objects/copper_rock.yaml +++ b/data/objects/copper_rock.yaml @@ -24,5 +24,4 @@ gather: tools: - pickaxe xp: 17 -id: copper_rock name: copper rock diff --git a/data/objects/cosmic_altar.yaml b/data/objects/cosmic_altar.yaml index 11ba761..3990cdf 100644 --- a/data/objects/cosmic_altar.yaml +++ b/data/objects/cosmic_altar.yaml @@ -1,4 +1,3 @@ -id: cosmic_altar name: cosmic altar color: "201" description: "A floating altar of {201 bold}shimmering pink crystal{/}, surrounded by pinpricks of light like distant stars. Place scrap here with a cosmic identifier to produce cosmicjunk. Type 'id' to begin." diff --git a/data/objects/death_altar.yaml b/data/objects/death_altar.yaml index 89bfd87..39190a5 100644 --- a/data/objects/death_altar.yaml +++ b/data/objects/death_altar.yaml @@ -1,4 +1,3 @@ -id: death_altar name: death altar color: "52" description: "A silent altar of {52 bold}dark obsidian{/}, cold to the touch. Place scrap here with a death identifier to produce deathjunk. Type 'id' to begin." diff --git a/data/objects/eco_altar.yaml b/data/objects/eco_altar.yaml index 18c90cf..28d3353 100644 --- a/data/objects/eco_altar.yaml +++ b/data/objects/eco_altar.yaml @@ -1,4 +1,3 @@ -id: eco_altar name: eco altar color: "34" description: "A thrumming altar of green organic circuits. Place scrap here with an eco identifier to produce ecojunk. Type 'id' to begin." diff --git a/data/objects/estate_directory.yaml b/data/objects/estate_directory.yaml index 3c1ecec..930e6cd 100644 --- a/data/objects/estate_directory.yaml +++ b/data/objects/estate_directory.yaml @@ -1,4 +1,3 @@ -id: estate_directory name: Estate Directory color: "39" description: "A holographic terminal displaying property records. The screen glows with a soft cyan light." diff --git a/data/objects/fence_post.yaml b/data/objects/fence_post.yaml index 11f6160..cc92425 100644 --- a/data/objects/fence_post.yaml +++ b/data/objects/fence_post.yaml @@ -1,4 +1,3 @@ -id: fence_post name: fence post color: "137" hidden: true diff --git a/data/objects/fire.yaml b/data/objects/fire.yaml index 864b7a8..85043f8 100644 --- a/data/objects/fire.yaml +++ b/data/objects/fire.yaml @@ -1,4 +1,3 @@ -id: fire name: fire color: "208" hidden: false diff --git a/data/objects/flower_patch.yaml b/data/objects/flower_patch.yaml index 6d4ee70..c7268b8 100644 --- a/data/objects/flower_patch.yaml +++ b/data/objects/flower_patch.yaml @@ -1,4 +1,3 @@ -id: flower_patch name: flower patch color: "213" hidden: false diff --git a/data/objects/fly_fishing_spot.yaml b/data/objects/fly_fishing_spot.yaml index 88fc61b..8d12a80 100644 --- a/data/objects/fly_fishing_spot.yaml +++ b/data/objects/fly_fishing_spot.yaml @@ -29,5 +29,4 @@ gather: per_level: 0.005 tools: - fly_rod -id: fly_fishing_spot name: fly fishing spot diff --git a/data/objects/furnace.yaml b/data/objects/furnace.yaml index 29a8552..ed25583 100644 --- a/data/objects/furnace.yaml +++ b/data/objects/furnace.yaml @@ -1,4 +1,3 @@ -id: furnace name: furnace color: "196" description: "A blazing hot furnace for smelting ores into bars." diff --git a/data/objects/gold_rock.yaml b/data/objects/gold_rock.yaml index cc3c816..6eea033 100644 --- a/data/objects/gold_rock.yaml +++ b/data/objects/gold_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 65 -id: gold_rock name: gold rock diff --git a/data/objects/harpoon_fishing_spot.yaml b/data/objects/harpoon_fishing_spot.yaml index 2a059e9..625235a 100644 --- a/data/objects/harpoon_fishing_spot.yaml +++ b/data/objects/harpoon_fishing_spot.yaml @@ -28,5 +28,4 @@ gather: per_level: 0.005 tools: - harpoon -id: harpoon_fishing_spot name: harpoon fishing spot diff --git a/data/objects/herb_patch.yaml b/data/objects/herb_patch.yaml index 81acaf3..7ba0b25 100644 --- a/data/objects/herb_patch.yaml +++ b/data/objects/herb_patch.yaml @@ -1,4 +1,3 @@ -id: herb_patch name: herb patch color: "28" hidden: false diff --git a/data/objects/hydro_altar.yaml b/data/objects/hydro_altar.yaml index ced7c4d..4f4d433 100644 --- a/data/objects/hydro_altar.yaml +++ b/data/objects/hydro_altar.yaml @@ -1,4 +1,3 @@ -id: hydro_altar name: hydro altar color: "39" description: "A pulsing altar of blue crystalline conduits. Place scrap here with a hydro identifier to produce hydrojunk. Type 'id' to begin." diff --git a/data/objects/iron_gate.yaml b/data/objects/iron_gate.yaml index 8193f0a..9ed87d4 100644 --- a/data/objects/iron_gate.yaml +++ b/data/objects/iron_gate.yaml @@ -1,7 +1,6 @@ color: "250" description: A heavy iron gate. It looks like it can be pushed open. hidden: true -id: iron_gate name: iron gate use_interactions: - condition: diff --git a/data/objects/iron_rock.yaml b/data/objects/iron_rock.yaml index b66bd03..c78312d 100644 --- a/data/objects/iron_rock.yaml +++ b/data/objects/iron_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 35 -id: iron_rock name: iron rock diff --git a/data/objects/law_altar.yaml b/data/objects/law_altar.yaml index 870f6e8..955ff9e 100644 --- a/data/objects/law_altar.yaml +++ b/data/objects/law_altar.yaml @@ -1,4 +1,3 @@ -id: law_altar name: law altar color: "27" description: "An imposing altar of {27 bold}pristine blue stone{/}, inscribed with orderly geometric patterns. Place scrap here with a law identifier to produce lawjunk. Type 'id' to begin." diff --git a/data/objects/lumby_fountain.yaml b/data/objects/lumby_fountain.yaml index 1c5fd94..ec7a04c 100644 --- a/data/objects/lumby_fountain.yaml +++ b/data/objects/lumby_fountain.yaml @@ -1,4 +1,3 @@ -id: lumby_fountain name: town fountain color: "81" description: "Clear water sparkles in the sunlight." diff --git a/data/objects/magic_tree.yaml b/data/objects/magic_tree.yaml index 7e1a37b..c6ee43a 100644 --- a/data/objects/magic_tree.yaml +++ b/data/objects/magic_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 250 -id: magic_tree name: magic tree diff --git a/data/objects/mahogany_tree.yaml b/data/objects/mahogany_tree.yaml index 5e84b2b..1d8d486 100644 --- a/data/objects/mahogany_tree.yaml +++ b/data/objects/mahogany_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 125 -id: mahogany_tree name: mahogany tree diff --git a/data/objects/maple_tree.yaml b/data/objects/maple_tree.yaml index 1c11e82..6bb41de 100644 --- a/data/objects/maple_tree.yaml +++ b/data/objects/maple_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 100 -id: maple_tree name: maple tree diff --git a/data/objects/market_stall.yaml b/data/objects/market_stall.yaml index a94d5cb..e438898 100644 --- a/data/objects/market_stall.yaml +++ b/data/objects/market_stall.yaml @@ -1,4 +1,3 @@ -id: market_stall name: Market Stall description: "A wooden stall piled with food and sundries. The vendor doesn't seem particularly attentive." color: "179" diff --git a/data/objects/mithril_rock.yaml b/data/objects/mithril_rock.yaml index ffd2a74..f79d205 100644 --- a/data/objects/mithril_rock.yaml +++ b/data/objects/mithril_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 80 -id: mithril_rock name: mithril rock diff --git a/data/objects/nature_altar.yaml b/data/objects/nature_altar.yaml index 2f102ed..1dd2f56 100644 --- a/data/objects/nature_altar.yaml +++ b/data/objects/nature_altar.yaml @@ -1,4 +1,3 @@ -id: nature_altar name: nature altar color: "46" description: "A verdant altar of {46 bold}living green stone{/}, covered in moss and tiny flowers. Place scrap here with a nature identifier to produce naturejunk. Type 'id' to begin." diff --git a/data/objects/net_fishing_spot.yaml b/data/objects/net_fishing_spot.yaml index 11263a9..e5d7d03 100644 --- a/data/objects/net_fishing_spot.yaml +++ b/data/objects/net_fishing_spot.yaml @@ -40,5 +40,4 @@ gather: tools: - small_net - big_net -id: net_fishing_spot name: net fishing spot diff --git a/data/objects/netrunner.yaml b/data/objects/netrunner.yaml index dcb7d40..21049e9 100644 --- a/data/objects/netrunner.yaml +++ b/data/objects/netrunner.yaml @@ -1,6 +1,5 @@ color: "39" description: A wiry figure hunched over a custom rig, fingers dancing across holographic keys. Cables snake from the back of their neck into the terminal. They glance up at you with augmented eyes. -id: netrunner inroom_description: A {39}Netrunner{/} sits cross-legged on the floor, wired into the network. name: Netrunner talk: diff --git a/data/objects/oak_tree.yaml b/data/objects/oak_tree.yaml index 0d42dab..40d1cd2 100644 --- a/data/objects/oak_tree.yaml +++ b/data/objects/oak_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 37 -id: oak_tree name: oak tree diff --git a/data/objects/pottery_oven.yaml b/data/objects/pottery_oven.yaml index c86e409..52c920b 100644 --- a/data/objects/pottery_oven.yaml +++ b/data/objects/pottery_oven.yaml @@ -1,4 +1,3 @@ -id: pottery_oven name: pottery oven color: "196" description: "A kiln for firing pottery." diff --git a/data/objects/pottery_wheel.yaml b/data/objects/pottery_wheel.yaml index cc2e225..feaac95 100644 --- a/data/objects/pottery_wheel.yaml +++ b/data/objects/pottery_wheel.yaml @@ -1,4 +1,3 @@ -id: pottery_wheel name: pottery wheel color: "173" description: "A foot-powered pottery wheel for shaping clay." diff --git a/data/objects/redwood_tree.yaml b/data/objects/redwood_tree.yaml index cf16e86..a5861fb 100644 --- a/data/objects/redwood_tree.yaml +++ b/data/objects/redwood_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 380 -id: redwood_tree name: redwood tree diff --git a/data/objects/rock_outcrop.yaml b/data/objects/rock_outcrop.yaml index 57b71d8..e11423b 100644 --- a/data/objects/rock_outcrop.yaml +++ b/data/objects/rock_outcrop.yaml @@ -1,4 +1,3 @@ -id: rock_outcrop name: rock outcrop color: "248" hidden: true diff --git a/data/objects/runite_rock.yaml b/data/objects/runite_rock.yaml index abfb06c..b44c5f8 100644 --- a/data/objects/runite_rock.yaml +++ b/data/objects/runite_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 125 -id: runite_rock name: runite rock diff --git a/data/objects/sacred_eel_spot.yaml b/data/objects/sacred_eel_spot.yaml index 07c1388..ab351ee 100644 --- a/data/objects/sacred_eel_spot.yaml +++ b/data/objects/sacred_eel_spot.yaml @@ -19,5 +19,4 @@ gather: per_level: 0.005 tools: - fishing_rod -id: sacred_eel_spot name: sacred eel spot diff --git a/data/objects/scrap_pile.yaml b/data/objects/scrap_pile.yaml index 27481a7..71752a6 100644 --- a/data/objects/scrap_pile.yaml +++ b/data/objects/scrap_pile.yaml @@ -15,5 +15,4 @@ gather: tools: - pickaxe xp: 5 -id: scrap_pile name: scrap pile diff --git a/data/objects/sheep.yaml b/data/objects/sheep.yaml index 865c20e..aff4f52 100644 --- a/data/objects/sheep.yaml +++ b/data/objects/sheep.yaml @@ -20,6 +20,5 @@ gather: tools: - shears xp: 0 -id: sheep inroom_description: A fluffy sheep is wandering around here. name: sheep diff --git a/data/objects/silver_rock.yaml b/data/objects/silver_rock.yaml index 9cc7d22..7f16598 100644 --- a/data/objects/silver_rock.yaml +++ b/data/objects/silver_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 40 -id: silver_rock name: silver rock diff --git a/data/objects/simple_rock.yaml b/data/objects/simple_rock.yaml index 4c03308..85ecb2e 100644 --- a/data/objects/simple_rock.yaml +++ b/data/objects/simple_rock.yaml @@ -1,4 +1,3 @@ -id: simple_rock name: rock formation color: "248" hidden: true diff --git a/data/objects/solar_altar.yaml b/data/objects/solar_altar.yaml index fd67f27..84f8e4e 100644 --- a/data/objects/solar_altar.yaml +++ b/data/objects/solar_altar.yaml @@ -1,4 +1,3 @@ -id: solar_altar name: solar altar color: "220" description: "A humming altar of golden circuitry. Place scrap here with a solar identifier to produce solarjunk. Type 'id' to begin." diff --git a/data/objects/spinning_wheel.yaml b/data/objects/spinning_wheel.yaml index 683f0b6..96ff1cb 100644 --- a/data/objects/spinning_wheel.yaml +++ b/data/objects/spinning_wheel.yaml @@ -1,4 +1,3 @@ -id: spinning_wheel name: spinning wheel color: "130" description: "A wooden spinning wheel for spinning wool and flax." diff --git a/data/objects/swamp_fishing_spot.yaml b/data/objects/swamp_fishing_spot.yaml index e05b424..5747753 100644 --- a/data/objects/swamp_fishing_spot.yaml +++ b/data/objects/swamp_fishing_spot.yaml @@ -24,5 +24,4 @@ gather: per_level: 0.005 tools: - fishing_rod -id: swamp_fishing_spot name: swamp fishing spot diff --git a/data/objects/teak_tree.yaml b/data/objects/teak_tree.yaml index f234f17..d84d785 100644 --- a/data/objects/teak_tree.yaml +++ b/data/objects/teak_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 85 -id: teak_tree name: teak tree diff --git a/data/objects/terminal_advanced.yaml b/data/objects/terminal_advanced.yaml index ca2cde7..467168d 100644 --- a/data/objects/terminal_advanced.yaml +++ b/data/objects/terminal_advanced.yaml @@ -1,4 +1,3 @@ -id: terminal_advanced name: advanced terminal color: "33" description: "A sleek terminal with a holographic display. Encrypted data streams flow across the screen in complex patterns. {33}[Level 20 Hacking]{/}" diff --git a/data/objects/terminal_basic.yaml b/data/objects/terminal_basic.yaml index 3e1b35a..162e1e7 100644 --- a/data/objects/terminal_basic.yaml +++ b/data/objects/terminal_basic.yaml @@ -1,4 +1,3 @@ -id: terminal_basic name: basic terminal color: "40" description: "A battered terminal with a cracked screen. Faded text scrolls across the display -- it looks like it's running some kind of legacy intrusion detection system. {40}[Level 1 Hacking]{/}" diff --git a/data/objects/terminal_secure.yaml b/data/objects/terminal_secure.yaml index f196a86..91282e5 100644 --- a/data/objects/terminal_secure.yaml +++ b/data/objects/terminal_secure.yaml @@ -1,4 +1,3 @@ -id: terminal_secure name: secure terminal color: "196" description: "A heavily reinforced terminal embedded in the wall. Warning glyphs pulse across its surface. A bluffing protocol runs on loop -- it's probing you as much as you're probing it. {196}[Level 40 Hacking]{/}" diff --git a/data/objects/tin_rock.yaml b/data/objects/tin_rock.yaml index baa5caf..bf60388 100644 --- a/data/objects/tin_rock.yaml +++ b/data/objects/tin_rock.yaml @@ -19,5 +19,4 @@ gather: tools: - pickaxe xp: 17 -id: tin_rock name: tin rock diff --git a/data/objects/tool_shed.yaml b/data/objects/tool_shed.yaml index 9b59682..583becb 100644 --- a/data/objects/tool_shed.yaml +++ b/data/objects/tool_shed.yaml @@ -1,7 +1,6 @@ color: "94" description: A small shed for storing farming tools. Talk to it to store or retrieve tools. hidden: false -id: tool_shed inroom_description: A weathered tool shed stands against the wall. name: tool shed talk: diff --git a/data/objects/tree.yaml b/data/objects/tree.yaml index 1d4bdee..5e14733 100644 --- a/data/objects/tree.yaml +++ b/data/objects/tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 25 -id: tree name: tree diff --git a/data/objects/tutorial_lever.yaml b/data/objects/tutorial_lever.yaml index 894dd07..35886f6 100644 --- a/data/objects/tutorial_lever.yaml +++ b/data/objects/tutorial_lever.yaml @@ -1,4 +1,3 @@ -id: tutorial_lever name: stone lever color: "250" hidden: true diff --git a/data/objects/unique/1001_sign.yaml b/data/objects/unique/1001_sign.yaml new file mode 100644 index 0000000..83b6a9c --- /dev/null +++ b/data/objects/unique/1001_sign.yaml @@ -0,0 +1,24 @@ +name: sign +hidden: true +description: |- + We hope you enjoy your trip on our shuttle. Your pilot is [TYLER]. + + When you arrive at your final destination, please be aware of the following basic commands: + + {11 bold}Movement:{/} {10}north{/}, {10}south{/}, {10}east{/}, {10}west{/}, {10}up{/}, {10}down{/} + {11 bold}Look:{/} {10}look{/}, {10}look {/}, and {10}map{/} + {11 bold}Items:{/} {10}inv{/} to see your 28-slot inventory + {10}get {/}, {10}drop {/}, {10}wear {/}, {10}remove {/} + {10}use on {/} + {10}eq{/} for equiped gear + {11 bold}Comms:{/} {10}talk {/} for NPC chat + {10}say {/} and {10}global {/} for human chat + {11 bold}Character:{/} {10}score{/} and {10}skills{/} for stats. + {11 bold}Combat{/} {10}attack {/} + {11 bold}Skills{/} Many skills have shortcuts like {10}mine{/}, {10}fish{/}, or {10}chop{/} + {11 bold}Options{/} {10}options{/} for a list of account options + {10}options {/} to change an option + + Type {12 bold}what{/} for a list of possible common actions + + Make sure to check the {10}help{/} pages, especially {10}help newplayer{/}! diff --git a/data/objects/unique/1002_crowd.yaml b/data/objects/unique/1002_crowd.yaml new file mode 100644 index 0000000..7ce41f2 --- /dev/null +++ b/data/objects/unique/1002_crowd.yaml @@ -0,0 +1,17 @@ +name: crowd of people +aliases: [people, crowd, group, passengers] +hidden: true +descriptions: + - condition: + all_of: + - player_flag: denali_intro_done + not: true + - player_flag: denali_lined_up + text: "The passengers have sorted themselves into a single-file line, tickets clutched in hand, shuffling toward the craft." + - condition: + all_of: + - player_flag: denali_intro_done + not: true + - player_flag: denali_lined_up + not: true + text: "A couple dozen anxious passengers mill about the pad, glancing between you and the small building to the north." diff --git a/data/objects/unique/1002_pilot.yaml b/data/objects/unique/1002_pilot.yaml new file mode 100644 index 0000000..edf3a20 --- /dev/null +++ b/data/objects/unique/1002_pilot.yaml @@ -0,0 +1,9 @@ +name: pilot +hidden: true +descriptions: + - condition: + all_of: + - player_flag: denali_intro_done + not: true + - player_flag: denali_lined_up + text: "The shuttle pilot stands by the hatch in a faded flight suit, waving passengers into line and checking tickets with a practiced eye." diff --git a/data/objects/unique/1002_shuttle.yaml b/data/objects/unique/1002_shuttle.yaml new file mode 100644 index 0000000..03296b3 --- /dev/null +++ b/data/objects/unique/1002_shuttle.yaml @@ -0,0 +1,8 @@ +name: landing craft +aliases: [shuttle, ship] +hidden: true +descriptions: + - condition: + player_flag: denali_intro_done + not: true + text: "The battered landing craft that carried you down still ticks and steams as it cools on the pad." diff --git a/data/objects/willow_tree.yaml b/data/objects/willow_tree.yaml index a4db0cf..3bd8574 100644 --- a/data/objects/willow_tree.yaml +++ b/data/objects/willow_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 67 -id: willow_tree name: willow tree diff --git a/data/objects/workbench.yaml b/data/objects/workbench.yaml index d3dd396..cea484f 100644 --- a/data/objects/workbench.yaml +++ b/data/objects/workbench.yaml @@ -1,4 +1,3 @@ -id: workbench name: workbench color: "172" description: "A sturdy wooden workbench covered in sawdust, nails, and blueprints. The surface is worn from years of crafting." diff --git a/data/objects/yew_tree.yaml b/data/objects/yew_tree.yaml index b521052..4b2b2f3 100644 --- a/data/objects/yew_tree.yaml +++ b/data/objects/yew_tree.yaml @@ -21,5 +21,4 @@ gather: tools: - axe xp: 175 -id: yew_tree name: yew tree -- cgit v1.2.3