From 0511563e35195e9dba9a5232e31993a9d6bfbf66 Mon Sep 17 00:00:00 2001 From: Sarra Date: Mon, 11 Jan 2021 17:45:54 -0500 Subject: [PATCH 1/4] moth glider --- assets/common/items/glider/glider_moth.ron | 10 ++++++++++ assets/common/loot_tables/loot_table_cave_large.ron | 1 + assets/voxygen/item_image_manifest.ron | 4 ++++ assets/voxygen/voxel/glider/glider_moth.vox | 3 +++ assets/voxygen/voxel/humanoid_glider_manifest.ron | 4 ++++ 5 files changed, 22 insertions(+) create mode 100644 assets/common/items/glider/glider_moth.ron create mode 100644 assets/voxygen/voxel/glider/glider_moth.vox diff --git a/assets/common/items/glider/glider_moth.ron b/assets/common/items/glider/glider_moth.ron new file mode 100644 index 0000000000..28a214c3dc --- /dev/null +++ b/assets/common/items/glider/glider_moth.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Green Luna", + description: "The delicate wings flutter faintly.", + kind: Glider( + ( + kind: "MothLuna", + ), + ), + quality: High, +) diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index 0b17d53617..d464e8482c 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -6,6 +6,7 @@ (0.1, "common.items.glider.glider_blue"), (0.1, "common.items.glider.glider_morpho"), (0.1, "common.items.glider.glider_monarch"), + (0.1, "common.items.glider.glider_moth"), (0.05, "common.items.armor.ring.ring_gold_0"), // swords (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 371885dddc..ead12cf68a 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1636,6 +1636,10 @@ "voxel.glider.glider_butterfly2", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, ), + Glider("MothLuna"): VoxTrans( + "voxel.glider.glider_moth", + (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, + ), Glider("SandRaptor"): VoxTrans( "voxel.glider.glider_sandraptor", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, diff --git a/assets/voxygen/voxel/glider/glider_moth.vox b/assets/voxygen/voxel/glider/glider_moth.vox new file mode 100644 index 0000000000..8d8b8d688b --- /dev/null +++ b/assets/voxygen/voxel/glider/glider_moth.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af5a580ad386333b52a5d83ebf9beb6827408922313587a80cff4cd23867fc4e +size 10064 diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index f64d093d32..9c6d2a4648 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -20,6 +20,10 @@ vox_spec: ("glider.glider_butterfly2", (-26.0, -25.0, -5.0)), color: None ), + "MothLuna": ( + vox_spec: ("glider.glider_moth", (-26.0, -25.0, -5.0)), + color: None + ), "SandRaptor": ( vox_spec: ("glider.glider_sandraptor", (-26.0, -25.0, -5.0)), color: None From 14b344469a431d462d8643fefbf260bac9281519 Mon Sep 17 00:00:00 2001 From: Sarra Date: Tue, 12 Jan 2021 15:20:11 -0500 Subject: [PATCH 2/4] basic gliders --- .../common/items/glider/glider_basic_red.ron | 10 ++++++++++ .../items/glider/glider_basic_white.ron | 10 ++++++++++ assets/common/recipe_book.ron | 20 +++++++++++++++++++ assets/voxygen/item_image_manifest.ron | 8 ++++++++ .../voxygen/voxel/glider/glider_basic_red.vox | 3 +++ .../voxel/glider/glider_basic_white.vox | 3 +++ .../voxel/humanoid_glider_manifest.ron | 8 ++++++++ 7 files changed, 62 insertions(+) create mode 100644 assets/common/items/glider/glider_basic_red.ron create mode 100644 assets/common/items/glider/glider_basic_white.ron create mode 100644 assets/voxygen/voxel/glider/glider_basic_red.vox create mode 100644 assets/voxygen/voxel/glider/glider_basic_white.vox diff --git a/assets/common/items/glider/glider_basic_red.ron b/assets/common/items/glider/glider_basic_red.ron new file mode 100644 index 0000000000..63fdaedcbc --- /dev/null +++ b/assets/common/items/glider/glider_basic_red.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Red Cloth Glider", + description: "Simple, but classy.", + kind: Glider( + ( + kind: "RedCloth", + ), + ), + quality: Moderate, +) diff --git a/assets/common/items/glider/glider_basic_white.ron b/assets/common/items/glider/glider_basic_white.ron new file mode 100644 index 0000000000..c9249f2ab1 --- /dev/null +++ b/assets/common/items/glider/glider_basic_white.ron @@ -0,0 +1,10 @@ +ItemDef( + name: "Plain Cloth Glider", + description: "Simple, but classy.", + kind: Glider( + ( + kind: "PlainCloth", + ), + ), + quality: Moderate, +) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index d849655475..a4430afe41 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -154,6 +154,26 @@ ("common.items.crafting_ing.honey", 1), ], ), + "Plain Cloth Glider": ( + ("common.items.glider.glider_basic_white", 1), + [ + ("common.items.crafting_ing.twigs", 5), + ("common.items.crafting_ing.cloth_scraps", 10), + ("common.items.ore.velorite", 3), + ("common.items.crafting_tools.craftsman_hammer", 0), + ("common.items.crafting_tools.sewing_set", 0), + ], + ), + "Red Cloth Glider": ( + ("common.items.glider.glider_basic_red", 1), + [ + ("common.items.crafting_ing.twigs", 5), + ("common.items.crafting_ing.cloth_scraps_red", 10), + ("common.items.ore.velorite", 3), + ("common.items.crafting_tools.craftsman_hammer", 0), + ("common.items.crafting_tools.sewing_set", 0), + ], + ), "Leaves Glider": ( ("common.items.glider.glider_leaves", 1), [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ead12cf68a..2f2ce8aa90 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1624,6 +1624,14 @@ "voxel.glider.glider_starter", (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), + Glider("PlainCloth"): VoxTrans( + "voxel.glider.glider_basic_white", + (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, + ), + Glider("RedCloth"): VoxTrans( + "voxel.glider.glider_basic_red", + (-2.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, + ), Glider("Blue0"): VoxTrans( "voxel.glider.glider_blue", (6.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 1.1, diff --git a/assets/voxygen/voxel/glider/glider_basic_red.vox b/assets/voxygen/voxel/glider/glider_basic_red.vox new file mode 100644 index 0000000000..3cdabce61f --- /dev/null +++ b/assets/voxygen/voxel/glider/glider_basic_red.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fb2d561de7fd67c22a1fddef673c24bbfb2f03a1e92ee22aa416c398c3a8e69 +size 6168 diff --git a/assets/voxygen/voxel/glider/glider_basic_white.vox b/assets/voxygen/voxel/glider/glider_basic_white.vox new file mode 100644 index 0000000000..59d94e2278 --- /dev/null +++ b/assets/voxygen/voxel/glider/glider_basic_white.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1098606a3283f2b46e0f500d79d1c0fda4466743448971205738631fa5938e6 +size 6168 diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index 9c6d2a4648..5c46bd7af7 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -8,6 +8,14 @@ vox_spec: ("glider.glider_starter", (-15.0, -5.0, -5.0)), color: None ), + "PlainCloth": ( + vox_spec: ("glider.glider_basic_white", (-25.0, -20.0, -5.0)), + color: None + ), + "RedCloth": ( + vox_spec: ("glider.glider_basic_red", (-25.0, -20.0, -5.0)), + color: None + ), "Blue0": ( vox_spec: ("glider.glider_blue", (-26.0, -26.0, -5.0)), color: None From 7c23f97d89a85645f951726abeeae748947b3d76 Mon Sep 17 00:00:00 2001 From: Sarra Date: Wed, 10 Feb 2021 20:14:50 -0500 Subject: [PATCH 3/4] tweaked a few things with the moth glider --- assets/common/items/glider/glider_basic_red.ron | 2 +- assets/common/recipe_book.ron | 4 ++-- assets/voxygen/voxel/glider/glider_moth.vox | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/common/items/glider/glider_basic_red.ron b/assets/common/items/glider/glider_basic_red.ron index 63fdaedcbc..ec778d7356 100644 --- a/assets/common/items/glider/glider_basic_red.ron +++ b/assets/common/items/glider/glider_basic_red.ron @@ -1,6 +1,6 @@ ItemDef( name: "Red Cloth Glider", - description: "Simple, but classy.", + description: "A simple glider, but with a striking red color.", kind: Glider( ( kind: "RedCloth", diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index a4430afe41..bebe0f9ca0 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -158,8 +158,8 @@ ("common.items.glider.glider_basic_white", 1), [ ("common.items.crafting_ing.twigs", 5), + ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_ing.cloth_scraps", 10), - ("common.items.ore.velorite", 3), ("common.items.crafting_tools.craftsman_hammer", 0), ("common.items.crafting_tools.sewing_set", 0), ], @@ -169,7 +169,7 @@ [ ("common.items.crafting_ing.twigs", 5), ("common.items.crafting_ing.cloth_scraps_red", 10), - ("common.items.ore.velorite", 3), + ("common.items.crafting_ing.leather_scraps", 5), ("common.items.crafting_tools.craftsman_hammer", 0), ("common.items.crafting_tools.sewing_set", 0), ], diff --git a/assets/voxygen/voxel/glider/glider_moth.vox b/assets/voxygen/voxel/glider/glider_moth.vox index 8d8b8d688b..607699f11f 100644 --- a/assets/voxygen/voxel/glider/glider_moth.vox +++ b/assets/voxygen/voxel/glider/glider_moth.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af5a580ad386333b52a5d83ebf9beb6827408922313587a80cff4cd23867fc4e +oid sha256:1ca23ee9430820423233b88cfe4050d5730bfb0da1548215f4bd513b892ad095 size 10064 From 8ac23ffcc21e70d5206b0bdbc6b7f23258b756fd Mon Sep 17 00:00:00 2001 From: Sarra Date: Thu, 11 Feb 2021 09:29:26 -0500 Subject: [PATCH 4/4] fit models, adjusted drop rates --- assets/common/loot_tables/loot_table_cave_large.ron | 6 +++--- assets/voxygen/voxel/glider/glider_butterfly1.vox | 2 +- assets/voxygen/voxel/glider/glider_butterfly2.vox | 2 +- assets/voxygen/voxel/glider/glider_moth.vox | 2 +- assets/voxygen/voxel/humanoid_glider_manifest.ron | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index d464e8482c..bb5f5a7043 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -4,9 +4,9 @@ (2.0, "common.items.crafting_ing.cloth_scraps"), (1.0, "common.items.crafting_ing.empty_vial"), (0.1, "common.items.glider.glider_blue"), - (0.1, "common.items.glider.glider_morpho"), - (0.1, "common.items.glider.glider_monarch"), - (0.1, "common.items.glider.glider_moth"), + (0.05, "common.items.glider.glider_morpho"), + (0.05, "common.items.glider.glider_monarch"), + (0.05, "common.items.glider.glider_moth"), (0.05, "common.items.armor.ring.ring_gold_0"), // swords (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"), diff --git a/assets/voxygen/voxel/glider/glider_butterfly1.vox b/assets/voxygen/voxel/glider/glider_butterfly1.vox index 780bf8d98e..0e287049a1 100644 --- a/assets/voxygen/voxel/glider/glider_butterfly1.vox +++ b/assets/voxygen/voxel/glider/glider_butterfly1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a0f12a94565b0fc207a64963caa25638f6df007ffe14989809c247a259265e5 +oid sha256:3c14cc15cefd079a57b54adb82b3afc47b062ea63cebe126d065ead7ecdd2bff size 9880 diff --git a/assets/voxygen/voxel/glider/glider_butterfly2.vox b/assets/voxygen/voxel/glider/glider_butterfly2.vox index 373cf350bc..b7288e571c 100644 --- a/assets/voxygen/voxel/glider/glider_butterfly2.vox +++ b/assets/voxygen/voxel/glider/glider_butterfly2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e0a48a5fc4f7f8feca4fad16c60f5fe7de95c6137f3b570a7bad77b4e353122 +oid sha256:506e5f9533c9991fabdb2e68048407da40c175b09e748b4120492de720565150 size 9880 diff --git a/assets/voxygen/voxel/glider/glider_moth.vox b/assets/voxygen/voxel/glider/glider_moth.vox index 607699f11f..00270ec93d 100644 --- a/assets/voxygen/voxel/glider/glider_moth.vox +++ b/assets/voxygen/voxel/glider/glider_moth.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca23ee9430820423233b88cfe4050d5730bfb0da1548215f4bd513b892ad095 +oid sha256:5adb90a06571c93788ae938ebaef4d45955522bce62140e85fc3fc98f9d86c7b size 10064 diff --git a/assets/voxygen/voxel/humanoid_glider_manifest.ron b/assets/voxygen/voxel/humanoid_glider_manifest.ron index 5c46bd7af7..4c1672e0f2 100644 --- a/assets/voxygen/voxel/humanoid_glider_manifest.ron +++ b/assets/voxygen/voxel/humanoid_glider_manifest.ron @@ -21,15 +21,15 @@ color: None ), "ButterflyMorpho": ( - vox_spec: ("glider.glider_butterfly1", (-26.0, -25.0, -5.0)), + vox_spec: ("glider.glider_butterfly1", (-26.0, -13.0, -5.0)), color: None ), "ButterflyMonarch": ( - vox_spec: ("glider.glider_butterfly2", (-26.0, -25.0, -5.0)), + vox_spec: ("glider.glider_butterfly2", (-26.0, -13.0, -5.0)), color: None ), "MothLuna": ( - vox_spec: ("glider.glider_moth", (-26.0, -25.0, -5.0)), + vox_spec: ("glider.glider_moth", (-26.0, -22.0, -5.0)), color: None ), "SandRaptor": (