From 9f6d126dfea8e23ea1766ef06d3ae0464e1b9bec Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 15 Oct 2022 01:09:25 +0000 Subject: Full magic SFX set, dart animation for flar/phlex, custom ingrav part… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- effects.xml | 128 +++++++++++----------- graphics/particles/dart.particle.xml | 8 ++ graphics/particles/dart.png | Bin 0 -> 4275 bytes graphics/particles/electricity.yellow.persist.xml | 17 +++ graphics/particles/electricity.yellow.xml | 17 +++ graphics/particles/levelup.particle.xml | 2 +- graphics/particles/lightning1.xml | 15 ++- graphics/particles/lightning2.xml | 15 ++- graphics/particles/lightning3.xml | 15 ++- graphics/particles/magic.black.persist.xml | 18 +++ graphics/particles/magic.green.persist.xml | 18 +++ graphics/sprites/equipment/weapons/null.png | Bin 0 -> 923 bytes graphics/sprites/equipment/weapons/null.xml | 84 ++++++++++++++ items/misc/item1700_magicblade.xml | 3 + items/misc/item1701_toxicdart.xml | 6 +- items/misc/item1703_wand.xml | 5 +- items/misc/item1704_flaredart.xml | 7 +- items/misc/item1705_wand_staff.xml | 5 +- items/misc/item1706_magicknuckles.xml | 8 +- items/misc/item1707_shear.xml | 1 + license.md | 29 +++++ sfx/magic/astral.ogg | Bin 0 -> 23036 bytes sfx/magic/betsanc-off.ogg | Bin 0 -> 11681 bytes sfx/magic/betsanc-on.ogg | Bin 0 -> 11550 bytes sfx/magic/chiza1.ogg | Bin 0 -> 14069 bytes sfx/magic/chiza2.ogg | Bin 0 -> 13614 bytes sfx/magic/chiza3.ogg | Bin 0 -> 13350 bytes sfx/magic/confringo1.ogg | Bin 0 -> 12960 bytes sfx/magic/confringo2.ogg | Bin 0 -> 12359 bytes sfx/magic/confringo3.ogg | Bin 0 -> 11826 bytes sfx/magic/default_magic.ogg | Bin 0 -> 40445 bytes sfx/magic/detect_magic.ogg | Bin 0 -> 77602 bytes sfx/magic/discharge.ogg | Bin 0 -> 23460 bytes sfx/magic/flar1.ogg | Bin 0 -> 9768 bytes sfx/magic/flar2.ogg | Bin 0 -> 9670 bytes sfx/magic/flar3.ogg | Bin 0 -> 9565 bytes sfx/magic/frillyar.ogg | Bin 0 -> 38005 bytes sfx/magic/generic.ogg | Bin 0 -> 38451 bytes sfx/magic/ingrav1.ogg | Bin 0 -> 47250 bytes sfx/magic/ingrav2.ogg | Bin 0 -> 45534 bytes sfx/magic/ingrav3.ogg | Bin 0 -> 44052 bytes sfx/magic/inma.ogg | Bin 0 -> 43517 bytes sfx/magic/itenplz-hit.ogg | Bin 0 -> 36348 bytes sfx/magic/nature.ogg | Bin 0 -> 23835 bytes sfx/magic/spawn_burst.ogg | Bin 0 -> 37215 bytes sfx/magic/transmute.ogg | Bin 0 -> 34077 bytes sfx/magic/war.ogg | Bin 0 -> 16685 bytes sfx/magic/warp.ogg | Bin 0 -> 37933 bytes 48 files changed, 325 insertions(+), 76 deletions(-) create mode 100644 graphics/particles/dart.particle.xml create mode 100644 graphics/particles/dart.png create mode 100644 graphics/particles/electricity.yellow.persist.xml create mode 100644 graphics/particles/electricity.yellow.xml create mode 100644 graphics/particles/magic.black.persist.xml create mode 100644 graphics/particles/magic.green.persist.xml create mode 100644 graphics/sprites/equipment/weapons/null.png create mode 100644 graphics/sprites/equipment/weapons/null.xml create mode 100644 sfx/magic/astral.ogg create mode 100644 sfx/magic/betsanc-off.ogg create mode 100644 sfx/magic/betsanc-on.ogg create mode 100644 sfx/magic/chiza1.ogg create mode 100644 sfx/magic/chiza2.ogg create mode 100644 sfx/magic/chiza3.ogg create mode 100644 sfx/magic/confringo1.ogg create mode 100644 sfx/magic/confringo2.ogg create mode 100644 sfx/magic/confringo3.ogg create mode 100644 sfx/magic/default_magic.ogg create mode 100644 sfx/magic/detect_magic.ogg create mode 100644 sfx/magic/discharge.ogg create mode 100644 sfx/magic/flar1.ogg create mode 100644 sfx/magic/flar2.ogg create mode 100644 sfx/magic/flar3.ogg create mode 100644 sfx/magic/frillyar.ogg create mode 100644 sfx/magic/generic.ogg create mode 100644 sfx/magic/ingrav1.ogg create mode 100644 sfx/magic/ingrav2.ogg create mode 100644 sfx/magic/ingrav3.ogg create mode 100644 sfx/magic/inma.ogg create mode 100644 sfx/magic/itenplz-hit.ogg create mode 100644 sfx/magic/nature.ogg create mode 100644 sfx/magic/spawn_burst.ogg create mode 100644 sfx/magic/transmute.ogg create mode 100644 sfx/magic/war.ogg create mode 100644 sfx/magic/warp.ogg diff --git a/effects.xml b/effects.xml index 01e00cf0..461d3617 100644 --- a/effects.xml +++ b/effects.xml @@ -39,41 +39,39 @@ - - + + - - - - - - + + + + - + - + - + - - + + @@ -92,7 +90,7 @@ - + @@ -110,111 +108,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/graphics/particles/dart.particle.xml b/graphics/particles/dart.particle.xml new file mode 100644 index 00000000..8b74e69c --- /dev/null +++ b/graphics/particles/dart.particle.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/graphics/particles/dart.png b/graphics/particles/dart.png new file mode 100644 index 00000000..afa27ca7 Binary files /dev/null and b/graphics/particles/dart.png differ diff --git a/graphics/particles/electricity.yellow.persist.xml b/graphics/particles/electricity.yellow.persist.xml new file mode 100644 index 00000000..f5534f0b --- /dev/null +++ b/graphics/particles/electricity.yellow.persist.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/graphics/particles/electricity.yellow.xml b/graphics/particles/electricity.yellow.xml new file mode 100644 index 00000000..67df5739 --- /dev/null +++ b/graphics/particles/electricity.yellow.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/graphics/particles/levelup.particle.xml b/graphics/particles/levelup.particle.xml index 17e10f82..ccdf9044 100644 --- a/graphics/particles/levelup.particle.xml +++ b/graphics/particles/levelup.particle.xml @@ -3,7 +3,7 @@ Red stars which are supposed to engulf a character --> - + diff --git a/graphics/particles/lightning1.xml b/graphics/particles/lightning1.xml index 0fe869b0..39071735 100644 --- a/graphics/particles/lightning1.xml +++ b/graphics/particles/lightning1.xml @@ -8,9 +8,22 @@ An explosion of white particles. - + + + + + + + + + + + + + + diff --git a/graphics/particles/lightning2.xml b/graphics/particles/lightning2.xml index 6f5d059d..09d20888 100644 --- a/graphics/particles/lightning2.xml +++ b/graphics/particles/lightning2.xml @@ -8,9 +8,22 @@ An explosion of white particles. - + + + + + + + + + + + + + + diff --git a/graphics/particles/lightning3.xml b/graphics/particles/lightning3.xml index 3734f1f8..50c478a4 100644 --- a/graphics/particles/lightning3.xml +++ b/graphics/particles/lightning3.xml @@ -8,9 +8,22 @@ An explosion of white particles. - + + + + + + + + + + + + + + diff --git a/graphics/particles/magic.black.persist.xml b/graphics/particles/magic.black.persist.xml new file mode 100644 index 00000000..842b33b6 --- /dev/null +++ b/graphics/particles/magic.black.persist.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/graphics/particles/magic.green.persist.xml b/graphics/particles/magic.green.persist.xml new file mode 100644 index 00000000..044911a2 --- /dev/null +++ b/graphics/particles/magic.green.persist.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/equipment/weapons/null.png b/graphics/sprites/equipment/weapons/null.png new file mode 100644 index 00000000..0906ec03 Binary files /dev/null and b/graphics/sprites/equipment/weapons/null.png differ diff --git a/graphics/sprites/equipment/weapons/null.xml b/graphics/sprites/equipment/weapons/null.xml new file mode 100644 index 00000000..c706c02b --- /dev/null +++ b/graphics/sprites/equipment/weapons/null.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/items/misc/item1700_magicblade.xml b/items/misc/item1700_magicblade.xml index 6c55157a..7d557464 100644 --- a/items/misc/item1700_magicblade.xml +++ b/items/misc/item1700_magicblade.xml @@ -8,5 +8,8 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + magic/chiza1.ogg + magic/chiza2.ogg + magic/chiza3.ogg diff --git a/items/misc/item1701_toxicdart.xml b/items/misc/item1701_toxicdart.xml index 1ba18381..ae581db4 100644 --- a/items/misc/item1701_toxicdart.xml +++ b/items/misc/item1701_toxicdart.xml @@ -6,5 +6,9 @@ - + + equipment/weapons/null.xml + magic/flar1.ogg + magic/flar2.ogg + magic/flar3.ogg diff --git a/items/misc/item1703_wand.xml b/items/misc/item1703_wand.xml index 72009700..4d9eb9dc 100644 --- a/items/misc/item1703_wand.xml +++ b/items/misc/item1703_wand.xml @@ -6,8 +6,11 @@ - + equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + magic/confringo1.ogg + magic/confringo2.ogg + magic/confringo3.ogg diff --git a/items/misc/item1704_flaredart.xml b/items/misc/item1704_flaredart.xml index e60fb9a6..2aa9fd17 100644 --- a/items/misc/item1704_flaredart.xml +++ b/items/misc/item1704_flaredart.xml @@ -6,5 +6,10 @@ - + + equipment/weapons/null.xml + magic/flar1.ogg + magic/flar2.ogg + magic/flar3.ogg + diff --git a/items/misc/item1705_wand_staff.xml b/items/misc/item1705_wand_staff.xml index 3c85661a..33e0c94b 100644 --- a/items/misc/item1705_wand_staff.xml +++ b/items/misc/item1705_wand_staff.xml @@ -6,8 +6,11 @@ - + equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d + magic/confringo1.ogg + magic/confringo2.ogg + magic/confringo3.ogg diff --git a/items/misc/item1706_magicknuckles.xml b/items/misc/item1706_magicknuckles.xml index df019e4e..1cf8db99 100644 --- a/items/misc/item1706_magicknuckles.xml +++ b/items/misc/item1706_magicknuckles.xml @@ -6,8 +6,10 @@ - - equipment/hands/bromenalgloves.xml - equipment/hands/bromenalgloves-female.xml + + + + equipment/weapons/null.xml + punch.ogg diff --git a/items/misc/item1707_shear.xml b/items/misc/item1707_shear.xml index bb48b004..f797369b 100644 --- a/items/misc/item1707_shear.xml +++ b/items/misc/item1707_shear.xml @@ -8,5 +8,6 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + monsters/scorpion/scorpion-hit1.ogg diff --git a/license.md b/license.md index d0f2fdf7..1e453f0c 100644 --- a/license.md +++ b/license.md @@ -594,6 +594,7 @@ File | Artists | Licenses `graphics/particles/bubble_12px.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2 +`graphics/particles/dart.png` | Ledmitz | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-a.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-b.png` | Crush | GPLv2, CC BY-SA 3.0 `graphics/particles/fog-medium-c.png` | Crush | GPLv2, CC BY-SA 3.0 @@ -676,6 +677,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/axe-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2 `graphics/sprites/equipment/weapons/bow-banshee.png` | V0id | GPLv2 `graphics/sprites/equipment/weapons/bow-slingshot.png` | Chef Chelios, wushin | GPLv2 +`graphics/sprites/equipment/weapons/null.png` | Ledmitz | CC0 `graphics/sprites/equipment/weapons/polearm-blunt.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2 @@ -1155,7 +1157,34 @@ File | Artists | Licenses `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2 `sfx/env/fart.ogg` | unknown | CC0 `sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/astral.ogg' | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/betsanc-off.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/chiza3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/confringo3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/default_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/detect_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/discharge.ogg` | Ledmitz (Plunger pop -12.wav / Quistard / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/flar3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/frillyar.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/generic.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/ingrav3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/inma.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/itenplz-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/nature.ogg` | Ledmitz (nord_analog_howling_wind_storm.wav / medialint / Sampling Plus 1.0) | GPLv2, CC BY-SA 3.0 +`sfx/magic/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/transmute.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/war.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/magic/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/bee/bee-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 diff --git a/sfx/magic/astral.ogg b/sfx/magic/astral.ogg new file mode 100644 index 00000000..2f9c8a00 Binary files /dev/null and b/sfx/magic/astral.ogg differ diff --git a/sfx/magic/betsanc-off.ogg b/sfx/magic/betsanc-off.ogg new file mode 100644 index 00000000..d8511d05 Binary files /dev/null and b/sfx/magic/betsanc-off.ogg differ diff --git a/sfx/magic/betsanc-on.ogg b/sfx/magic/betsanc-on.ogg new file mode 100644 index 00000000..63c12b33 Binary files /dev/null and b/sfx/magic/betsanc-on.ogg differ diff --git a/sfx/magic/chiza1.ogg b/sfx/magic/chiza1.ogg new file mode 100644 index 00000000..e8a7a254 Binary files /dev/null and b/sfx/magic/chiza1.ogg differ diff --git a/sfx/magic/chiza2.ogg b/sfx/magic/chiza2.ogg new file mode 100644 index 00000000..6cef4b67 Binary files /dev/null and b/sfx/magic/chiza2.ogg differ diff --git a/sfx/magic/chiza3.ogg b/sfx/magic/chiza3.ogg new file mode 100644 index 00000000..0db8a02d Binary files /dev/null and b/sfx/magic/chiza3.ogg differ diff --git a/sfx/magic/confringo1.ogg b/sfx/magic/confringo1.ogg new file mode 100644 index 00000000..ec918dff Binary files /dev/null and b/sfx/magic/confringo1.ogg differ diff --git a/sfx/magic/confringo2.ogg b/sfx/magic/confringo2.ogg new file mode 100644 index 00000000..4053fb19 Binary files /dev/null and b/sfx/magic/confringo2.ogg differ diff --git a/sfx/magic/confringo3.ogg b/sfx/magic/confringo3.ogg new file mode 100644 index 00000000..270e649d Binary files /dev/null and b/sfx/magic/confringo3.ogg differ diff --git a/sfx/magic/default_magic.ogg b/sfx/magic/default_magic.ogg new file mode 100644 index 00000000..96e0d01a Binary files /dev/null and b/sfx/magic/default_magic.ogg differ diff --git a/sfx/magic/detect_magic.ogg b/sfx/magic/detect_magic.ogg new file mode 100644 index 00000000..2fbbb7ca Binary files /dev/null and b/sfx/magic/detect_magic.ogg differ diff --git a/sfx/magic/discharge.ogg b/sfx/magic/discharge.ogg new file mode 100644 index 00000000..266008de Binary files /dev/null and b/sfx/magic/discharge.ogg differ diff --git a/sfx/magic/flar1.ogg b/sfx/magic/flar1.ogg new file mode 100644 index 00000000..1d01ff02 Binary files /dev/null and b/sfx/magic/flar1.ogg differ diff --git a/sfx/magic/flar2.ogg b/sfx/magic/flar2.ogg new file mode 100644 index 00000000..341ed30d Binary files /dev/null and b/sfx/magic/flar2.ogg differ diff --git a/sfx/magic/flar3.ogg b/sfx/magic/flar3.ogg new file mode 100644 index 00000000..f936681a Binary files /dev/null and b/sfx/magic/flar3.ogg differ diff --git a/sfx/magic/frillyar.ogg b/sfx/magic/frillyar.ogg new file mode 100644 index 00000000..353e5e39 Binary files /dev/null and b/sfx/magic/frillyar.ogg differ diff --git a/sfx/magic/generic.ogg b/sfx/magic/generic.ogg new file mode 100644 index 00000000..c2eb6b09 Binary files /dev/null and b/sfx/magic/generic.ogg differ diff --git a/sfx/magic/ingrav1.ogg b/sfx/magic/ingrav1.ogg new file mode 100644 index 00000000..7c4d31a0 Binary files /dev/null and b/sfx/magic/ingrav1.ogg differ diff --git a/sfx/magic/ingrav2.ogg b/sfx/magic/ingrav2.ogg new file mode 100644 index 00000000..3b2da47f Binary files /dev/null and b/sfx/magic/ingrav2.ogg differ diff --git a/sfx/magic/ingrav3.ogg b/sfx/magic/ingrav3.ogg new file mode 100644 index 00000000..9b1d317b Binary files /dev/null and b/sfx/magic/ingrav3.ogg differ diff --git a/sfx/magic/inma.ogg b/sfx/magic/inma.ogg new file mode 100644 index 00000000..41e5772f Binary files /dev/null and b/sfx/magic/inma.ogg differ diff --git a/sfx/magic/itenplz-hit.ogg b/sfx/magic/itenplz-hit.ogg new file mode 100644 index 00000000..dac1bfd8 Binary files /dev/null and b/sfx/magic/itenplz-hit.ogg differ diff --git a/sfx/magic/nature.ogg b/sfx/magic/nature.ogg new file mode 100644 index 00000000..5b48ab73 Binary files /dev/null and b/sfx/magic/nature.ogg differ diff --git a/sfx/magic/spawn_burst.ogg b/sfx/magic/spawn_burst.ogg new file mode 100644 index 00000000..74390fe1 Binary files /dev/null and b/sfx/magic/spawn_burst.ogg differ diff --git a/sfx/magic/transmute.ogg b/sfx/magic/transmute.ogg new file mode 100644 index 00000000..27234be2 Binary files /dev/null and b/sfx/magic/transmute.ogg differ diff --git a/sfx/magic/war.ogg b/sfx/magic/war.ogg new file mode 100644 index 00000000..43f4c683 Binary files /dev/null and b/sfx/magic/war.ogg differ diff --git a/sfx/magic/warp.ogg b/sfx/magic/warp.ogg new file mode 100644 index 00000000..e94e9371 Binary files /dev/null and b/sfx/magic/warp.ogg differ -- cgit v1.2.3-60-g2f50