Added hands field to all ron files of weapons.

Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
This commit is contained in:
Sam 2021-02-12 01:15:53 -05:00
parent d4f509b3d0
commit 341affdae2
184 changed files with 340 additions and 319 deletions

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Sword,
hands: TwoHand,
stats: (
equip_time_millis: 0,
power: 1000.0,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Debug,
hands: TwoHand,
stats: (
equip_time_millis: 0,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Staff,
hands: TwoHand,
stats: (
equip_time_millis: 300,
power: 3.0,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Staff,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Staff,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Sword,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Sword,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(BeastClaws),
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadLowBasic),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadLowBreathe),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadLowQuick),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadLowRanged),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadLowTail),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadMedBasic),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadMedCharge),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadMedHoof),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadMedJump),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadMedQuick),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(QuadSmallBasic),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(StoneGolemFist),
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(TheropodBasic),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -4,6 +4,7 @@ ItemDef(
kind: Tool(
(
kind: Unique(TheropodBird),
hands: TwoHand,
stats: (
equip_time_millis: 10,
power: 1.00,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy\'s veins.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A fine quality metal alloy axe.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The lustrous bluish gray axe provides a certain stylish class to the weapon.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Heavy iron hammered into rough blades, a simple tool for killing.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Heavy iron axe, likely created for ritual execution.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The iron axe head is split into two distinct curves, giving it a unique appearance.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Tried and true iron armaments, mass produced for killing.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This axe has a heavy iron head used to cleave nearly anything.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A simple dual bitted iron forged axe.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Double bitted axe head, decorated iron construction.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Several sharp axe heads forged with points to mimic animal fangs.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Strikes from this axe look like wolf bites in flesh.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Etched axe head decorated with malachite on the blades to provide magical properties.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 2.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A rough cut axe created by orcs to cleave beasts in two.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Every dent tells the story of a chopped tree.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Well crafted metal alloy axe that slices more cleanly than its iron counterparts.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Double bitted, well polished, and spiked axe head.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A simple metal alloy axe.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The blade of this steel axe is forged in a manner to resemble a crescent moon.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The blade of this axe resembles a full moon.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Druidic rituals formed this axe in the dark of night. Made to look like the wings of an owl swooping in on a kill.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This axe is designed to mimic the playing card suit, swiftly slicing through the air.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Rough cut axe of dwarven origin, it\'s very old, but still usable.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Light elven axe, scratched from eons of use. Still usable in some manner.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "There\'s nothing too remarkable about this old axe.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.",
kind: Tool((
kind: Axe,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "You don\'t recognize the creature these horns belong to.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Has an insignia on it.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.75,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "There\'s a new leaf starting to grow.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.25,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The wood still seems alive.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Infused with Velorite power.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 2.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "You can sense power resting in the bow.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 2.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Someone carved their initials into it.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "It\'s been well used.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "It\'s hard to pull all the way back.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Strips of leather are wrapped around the handle.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Works on the ground too.",
kind: Tool((
kind: Bow,
hands: TwoHand,
stats: (
equip_time_millis: 400,
power: 0.75,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Opens letters quickly.",
kind: Tool((
kind: Dagger,
hands: OneHand,
stats: (
equip_time_millis: 0,
power: 1.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool((
kind: Dagger,
hands: OneHand,
stats: (
equip_time_millis: 0,
power: 2.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Easily concealed.",
kind: Tool((
kind: Dagger,
hands: OneHand,
stats: (
equip_time_millis: 300,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This item may grant abilities, but is invisible",
kind: Tool((
kind: Empty,
hands: OneHand,
stats: (
equip_time_millis: 200,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A heavy hammer forged from a simple metal alloy.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The entire head of this club is forged from bronze alloy.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The bluish gray tinge to the metal of this hammer head provides a slight classiness to the weapon.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The decorative hooked head of this mace is formed from a bluish gray metal.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.6,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This belonged to an evil Cult Leader.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 2.0,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The head is barely secured.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 0.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Breaks bones like sticks and stones.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 0.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This heavy, solid chunk iron hammer head is simple and brutal in its design.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This heavy, square iron hammer is designed for squashing heads like watermelons.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A decorative iron mace, great for smashing.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The decorative iron mace has a crowning tip on top.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Worn head shows that this hammer had been used for many years to make other weapons, now relegated to being a weapon in its own right.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A hybrid fusion of a warhammer and a polearm.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A rough shaped iron hammer with spikes for added destruction.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This hammer has a spike on the opposite end, making it dangerous when swung either direction.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.2,

View File

@ -1,17 +1,16 @@
ItemDef(
name: "Mjolnir",
description: "It's crackling with lightning.",
kind: Tool(
(
kind: Hammer,
stats: (
equip_time_millis: 500,
power: 4.00,
poise_strength: 2.0,
speed: 0.5
),
)
),
description: "It\'s crackling with lightning.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 4.0,
poise_strength: 2.0,
speed: 0.5,
),
)),
quality: Legendary,
tags: [],
)

View File

@ -3,6 +3,7 @@ ItemDef(
description: "You feel an evil presence in the hammer.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "There are strange runes inscribed into it.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.8,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "\'Property of...\' The rest is missing.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 0.5,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "While lighter and more durable than its iron counterparts, it is nonetheless just as deadly.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "The lighter attributes of the metal alloy are barely noticed when forged into such a wide hammer head.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A heavy and wide baton made of a durable metal alloy, decorated with spikes.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A heavy, spiked steel ball tip provides a great smashing weapon.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "This destructive hammer was likely wielded by a vicious killer.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "A spiked ball designed to resemble the stars lining the night sky.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 1.4,

View File

@ -3,6 +3,7 @@ ItemDef(
description: "Bloodied stone tied to a branch, simple but functional as a weapon.",
kind: Tool((
kind: Hammer,
hands: TwoHand,
stats: (
equip_time_millis: 500,
power: 0.7,

Some files were not shown because too many files have changed in this diff Show More