From c39ea8b59eb5a9adb5e0849fc36c11ea54453174 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Thu, 7 Dec 2023 23:04:06 +0000 Subject: mobs --- graphics/items/equipment/head/assassin-mask.png | Bin 760 -> 650 bytes .../sprites/equipment/weapons/sword-jackal.xml | 4 + graphics/sprites/equipment/weapons/sword-lider.xml | 10 +- .../sprites/monsters/accessories/ratto-tail.png | Bin 0 -> 592 bytes .../sprites/monsters/accessories/ratto-tail.xml | 228 +++++++++++++++ graphics/sprites/monsters/beehive.png | Bin 0 -> 5469 bytes graphics/sprites/monsters/beehive.xml | 9 + graphics/sprites/monsters/bobone.png | Bin 0 -> 44681 bytes graphics/sprites/monsters/bobone.xml | 83 ++++++ graphics/sprites/monsters/croc.png | Bin 0 -> 9856 bytes graphics/sprites/monsters/croc.xml | 242 ++++++++++++++++ graphics/sprites/monsters/darkduck.png | Bin 0 -> 14610 bytes graphics/sprites/monsters/darkduck.xml | 64 +++++ graphics/sprites/monsters/ent.png | Bin 0 -> 63539 bytes graphics/sprites/monsters/ent.xml | 57 ++++ graphics/sprites/monsters/frog-big.png | Bin 0 -> 141250 bytes graphics/sprites/monsters/frog-big.xml | 120 ++++++++ graphics/sprites/monsters/frog-small.png | Bin 0 -> 44691 bytes graphics/sprites/monsters/frog-small.xml | 120 ++++++++ graphics/sprites/monsters/junglefowl.png | Bin 0 -> 31017 bytes graphics/sprites/monsters/junglefowl.xml | 107 +++++++ graphics/sprites/monsters/mananatree.png | Bin 0 -> 72680 bytes graphics/sprites/monsters/mananatree.xml | 89 ++++++ graphics/sprites/monsters/mister-prickel.png | Bin 0 -> 561159 bytes graphics/sprites/monsters/mister-prickel.xml | 223 +++++++++++++++ graphics/sprites/monsters/moubootaur.png | Bin 0 -> 3041390 bytes graphics/sprites/monsters/moubootaur.xml | 243 ++++++++++++++++ graphics/sprites/monsters/piou-king.png | Bin 0 -> 1994183 bytes graphics/sprites/monsters/piou-king.xml | 271 ++++++++++++++++++ graphics/sprites/monsters/ratto.png | Bin 0 -> 15750 bytes graphics/sprites/monsters/ratto.xml | 199 +++++++++++++ graphics/sprites/monsters/tortuga.png | Bin 0 -> 12541 bytes graphics/sprites/monsters/tortuga.xml | 310 +++++++++++++++++++++ items/equip-head/item5130_Phylactery.xml | 2 +- items/equip-head/item5202_PilotHat.xml | 2 +- items/equip-head/item5203_MoonshroomHat.xml | 2 +- items/equip-head/item5205_EskimoHat.xml | 2 +- items/generic/_include.xml | 1 + items/generic/item5218_RedTicket.xml | 2 +- items/generic/item5219_YellowTicket.xml | 2 +- items/generic/item5220_GoldTicket.xml | 2 +- items/generic/item5221_GreenTicket.xml | 2 +- items/generic/item5222_AquaTicket.xml | 2 +- items/generic/item5223_BlueTicket.xml | 2 +- items/generic/item5224_PurpleTicket.xml | 2 +- items/generic/item5225_PinkTicket.xml | 2 +- items/generic/item5311_ShadowHerb.xml | 10 + items/usable/_include.xml | 3 +- items/usable/item1258_GlutenFreeHoney.xml | 4 + items/usable/item1258_Honey.xml | 4 - items/usable/item5214_LactoseFreeAcorn.xml | 2 +- items/usable/item5309_ManaDust.xml | 2 +- items/usable/item5312_Honey.xml | 13 + license.md | 63 ++++- maps/007-1.tmx | 32 ++- maps/008-1.tmx | 20 +- maps/010-1.tmx | 20 +- maps/011-1.tmx | 18 +- maps/012-1.tmx | 42 ++- maps/013-1.tmx | 18 +- maps/015-1.tmx | 18 +- maps/016-1.tmx | 38 ++- maps/017-1.tmx | 34 ++- maps/018-1.tmx | 50 ++-- maps/025-1.tmx | 38 ++- maps/026-1.tmx | 76 +++-- maps/027-1.tmx | 56 ++-- maps/055-1.tmx | 42 ++- maps/057-1.tmx | 68 +++-- maps/099-7.tmx | 22 +- monsters.xml | 118 +++++++- sfx/monsters/croc/hit1.ogg | Bin 0 -> 12279 bytes sfx/monsters/croc/hit2.ogg | Bin 0 -> 13017 bytes sfx/monsters/croc/hurt1.ogg | Bin 0 -> 7574 bytes sfx/monsters/croc/hurt2.ogg | Bin 0 -> 6820 bytes sfx/monsters/croc/hurt3.ogg | Bin 0 -> 6840 bytes sfx/monsters/croc/miss1.ogg | Bin 0 -> 12259 bytes sfx/monsters/croc/spawn1.ogg | Bin 0 -> 67760 bytes sfx/monsters/crocotree/die1.ogg | Bin 0 -> 13414 bytes sfx/monsters/crocotree/hurt1.ogg | Bin 0 -> 5395 bytes sfx/monsters/crocotree/hurt2.ogg | Bin 0 -> 5553 bytes sfx/monsters/crocotree/hurt3.ogg | Bin 0 -> 5882 bytes sfx/monsters/frostiana/hit1.ogg | Bin 0 -> 8102 bytes sfx/monsters/ratto/die1.ogg | Bin 0 -> 17984 bytes sfx/monsters/ratto/hit1.ogg | Bin 0 -> 10142 bytes sfx/monsters/ratto/hit2.ogg | Bin 0 -> 15163 bytes sfx/monsters/ratto/hurt1.ogg | Bin 0 -> 15731 bytes sfx/monsters/ratto/spawn1.ogg | Bin 0 -> 43264 bytes sfx/monsters/tortuga/die1.ogg | Bin 0 -> 23069 bytes sfx/monsters/tortuga/hit1.ogg | Bin 0 -> 11520 bytes sfx/monsters/tortuga/hit2.ogg | Bin 0 -> 10985 bytes sfx/monsters/tortuga/hurt1.ogg | Bin 0 -> 16736 bytes sfx/monsters/tortuga/miss1.ogg | Bin 0 -> 10379 bytes sfx/monsters/tortuga/spawn1.ogg | Bin 0 -> 41679 bytes sfx/weapons/lightsaber/crit.ogg | Bin 0 -> 6398 bytes sfx/weapons/lightsaber/hit1.ogg | Bin 0 -> 17408 bytes sfx/weapons/lightsaber/hit2.ogg | Bin 0 -> 13135 bytes sfx/weapons/lightsaber/hit3.ogg | Bin 0 -> 10986 bytes sfx/weapons/lightsaber/miss.ogg | Bin 0 -> 11065 bytes 99 files changed, 3003 insertions(+), 212 deletions(-) create mode 100644 graphics/sprites/monsters/accessories/ratto-tail.png create mode 100644 graphics/sprites/monsters/accessories/ratto-tail.xml create mode 100644 graphics/sprites/monsters/beehive.png create mode 100644 graphics/sprites/monsters/beehive.xml create mode 100644 graphics/sprites/monsters/bobone.png create mode 100644 graphics/sprites/monsters/bobone.xml create mode 100644 graphics/sprites/monsters/croc.png create mode 100644 graphics/sprites/monsters/croc.xml create mode 100644 graphics/sprites/monsters/darkduck.png create mode 100644 graphics/sprites/monsters/darkduck.xml create mode 100644 graphics/sprites/monsters/ent.png create mode 100644 graphics/sprites/monsters/ent.xml create mode 100644 graphics/sprites/monsters/frog-big.png create mode 100644 graphics/sprites/monsters/frog-big.xml create mode 100644 graphics/sprites/monsters/frog-small.png create mode 100644 graphics/sprites/monsters/frog-small.xml create mode 100644 graphics/sprites/monsters/junglefowl.png create mode 100644 graphics/sprites/monsters/junglefowl.xml create mode 100644 graphics/sprites/monsters/mananatree.png create mode 100644 graphics/sprites/monsters/mananatree.xml create mode 100644 graphics/sprites/monsters/mister-prickel.png create mode 100644 graphics/sprites/monsters/mister-prickel.xml create mode 100644 graphics/sprites/monsters/moubootaur.png create mode 100644 graphics/sprites/monsters/moubootaur.xml create mode 100644 graphics/sprites/monsters/piou-king.png create mode 100644 graphics/sprites/monsters/piou-king.xml create mode 100644 graphics/sprites/monsters/ratto.png create mode 100644 graphics/sprites/monsters/ratto.xml create mode 100644 graphics/sprites/monsters/tortuga.png create mode 100644 graphics/sprites/monsters/tortuga.xml create mode 100644 items/generic/item5311_ShadowHerb.xml create mode 100644 items/usable/item1258_GlutenFreeHoney.xml delete mode 100644 items/usable/item1258_Honey.xml create mode 100644 items/usable/item5312_Honey.xml create mode 100644 sfx/monsters/croc/hit1.ogg create mode 100644 sfx/monsters/croc/hit2.ogg create mode 100644 sfx/monsters/croc/hurt1.ogg create mode 100644 sfx/monsters/croc/hurt2.ogg create mode 100644 sfx/monsters/croc/hurt3.ogg create mode 100644 sfx/monsters/croc/miss1.ogg create mode 100644 sfx/monsters/croc/spawn1.ogg create mode 100644 sfx/monsters/crocotree/die1.ogg create mode 100644 sfx/monsters/crocotree/hurt1.ogg create mode 100644 sfx/monsters/crocotree/hurt2.ogg create mode 100644 sfx/monsters/crocotree/hurt3.ogg create mode 100644 sfx/monsters/frostiana/hit1.ogg create mode 100644 sfx/monsters/ratto/die1.ogg create mode 100644 sfx/monsters/ratto/hit1.ogg create mode 100644 sfx/monsters/ratto/hit2.ogg create mode 100644 sfx/monsters/ratto/hurt1.ogg create mode 100644 sfx/monsters/ratto/spawn1.ogg create mode 100644 sfx/monsters/tortuga/die1.ogg create mode 100644 sfx/monsters/tortuga/hit1.ogg create mode 100644 sfx/monsters/tortuga/hit2.ogg create mode 100644 sfx/monsters/tortuga/hurt1.ogg create mode 100644 sfx/monsters/tortuga/miss1.ogg create mode 100644 sfx/monsters/tortuga/spawn1.ogg create mode 100644 sfx/weapons/lightsaber/crit.ogg create mode 100644 sfx/weapons/lightsaber/hit1.ogg create mode 100644 sfx/weapons/lightsaber/hit2.ogg create mode 100644 sfx/weapons/lightsaber/hit3.ogg create mode 100644 sfx/weapons/lightsaber/miss.ogg diff --git a/graphics/items/equipment/head/assassin-mask.png b/graphics/items/equipment/head/assassin-mask.png index e2ed73b2..16b76617 100644 Binary files a/graphics/items/equipment/head/assassin-mask.png and b/graphics/items/equipment/head/assassin-mask.png differ diff --git a/graphics/sprites/equipment/weapons/sword-jackal.xml b/graphics/sprites/equipment/weapons/sword-jackal.xml index 9360042d..60c6fdb4 100644 --- a/graphics/sprites/equipment/weapons/sword-jackal.xml +++ b/graphics/sprites/equipment/weapons/sword-jackal.xml @@ -69,15 +69,19 @@ + + + + diff --git a/graphics/sprites/equipment/weapons/sword-lider.xml b/graphics/sprites/equipment/weapons/sword-lider.xml index 7581c078..528dcb9d 100644 --- a/graphics/sprites/equipment/weapons/sword-lider.xml +++ b/graphics/sprites/equipment/weapons/sword-lider.xml @@ -34,23 +34,23 @@ - + - + - + - + - + diff --git a/graphics/sprites/monsters/accessories/ratto-tail.png b/graphics/sprites/monsters/accessories/ratto-tail.png new file mode 100644 index 00000000..331e0f5e Binary files /dev/null and b/graphics/sprites/monsters/accessories/ratto-tail.png differ diff --git a/graphics/sprites/monsters/accessories/ratto-tail.xml b/graphics/sprites/monsters/accessories/ratto-tail.xml new file mode 100644 index 00000000..31859b91 --- /dev/null +++ b/graphics/sprites/monsters/accessories/ratto-tail.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/beehive.png b/graphics/sprites/monsters/beehive.png new file mode 100644 index 00000000..c906b7a6 Binary files /dev/null and b/graphics/sprites/monsters/beehive.png differ diff --git a/graphics/sprites/monsters/beehive.xml b/graphics/sprites/monsters/beehive.xml new file mode 100644 index 00000000..d234b2cc --- /dev/null +++ b/graphics/sprites/monsters/beehive.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/graphics/sprites/monsters/bobone.png b/graphics/sprites/monsters/bobone.png new file mode 100644 index 00000000..aba90f13 Binary files /dev/null and b/graphics/sprites/monsters/bobone.png differ diff --git a/graphics/sprites/monsters/bobone.xml b/graphics/sprites/monsters/bobone.xml new file mode 100644 index 00000000..4eb13698 --- /dev/null +++ b/graphics/sprites/monsters/bobone.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/croc.png b/graphics/sprites/monsters/croc.png new file mode 100644 index 00000000..aa81a7aa Binary files /dev/null and b/graphics/sprites/monsters/croc.png differ diff --git a/graphics/sprites/monsters/croc.xml b/graphics/sprites/monsters/croc.xml new file mode 100644 index 00000000..292fa837 --- /dev/null +++ b/graphics/sprites/monsters/croc.xml @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/darkduck.png b/graphics/sprites/monsters/darkduck.png new file mode 100644 index 00000000..38881433 Binary files /dev/null and b/graphics/sprites/monsters/darkduck.png differ diff --git a/graphics/sprites/monsters/darkduck.xml b/graphics/sprites/monsters/darkduck.xml new file mode 100644 index 00000000..1d378113 --- /dev/null +++ b/graphics/sprites/monsters/darkduck.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/ent.png b/graphics/sprites/monsters/ent.png new file mode 100644 index 00000000..07287e54 Binary files /dev/null and b/graphics/sprites/monsters/ent.png differ diff --git a/graphics/sprites/monsters/ent.xml b/graphics/sprites/monsters/ent.xml new file mode 100644 index 00000000..8569c99c --- /dev/null +++ b/graphics/sprites/monsters/ent.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/frog-big.png b/graphics/sprites/monsters/frog-big.png new file mode 100644 index 00000000..f98d3aef Binary files /dev/null and b/graphics/sprites/monsters/frog-big.png differ diff --git a/graphics/sprites/monsters/frog-big.xml b/graphics/sprites/monsters/frog-big.xml new file mode 100644 index 00000000..0455f4bb --- /dev/null +++ b/graphics/sprites/monsters/frog-big.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/frog-small.png b/graphics/sprites/monsters/frog-small.png new file mode 100644 index 00000000..dc8f6fb4 Binary files /dev/null and b/graphics/sprites/monsters/frog-small.png differ diff --git a/graphics/sprites/monsters/frog-small.xml b/graphics/sprites/monsters/frog-small.xml new file mode 100644 index 00000000..ca06f34c --- /dev/null +++ b/graphics/sprites/monsters/frog-small.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/junglefowl.png b/graphics/sprites/monsters/junglefowl.png new file mode 100644 index 00000000..15eebc56 Binary files /dev/null and b/graphics/sprites/monsters/junglefowl.png differ diff --git a/graphics/sprites/monsters/junglefowl.xml b/graphics/sprites/monsters/junglefowl.xml new file mode 100644 index 00000000..fb3fc81b --- /dev/null +++ b/graphics/sprites/monsters/junglefowl.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/mananatree.png b/graphics/sprites/monsters/mananatree.png new file mode 100644 index 00000000..b2b5e143 Binary files /dev/null and b/graphics/sprites/monsters/mananatree.png differ diff --git a/graphics/sprites/monsters/mananatree.xml b/graphics/sprites/monsters/mananatree.xml new file mode 100644 index 00000000..477eb614 --- /dev/null +++ b/graphics/sprites/monsters/mananatree.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/mister-prickel.png b/graphics/sprites/monsters/mister-prickel.png new file mode 100644 index 00000000..1b5e40e1 Binary files /dev/null and b/graphics/sprites/monsters/mister-prickel.png differ diff --git a/graphics/sprites/monsters/mister-prickel.xml b/graphics/sprites/monsters/mister-prickel.xml new file mode 100644 index 00000000..c8276010 --- /dev/null +++ b/graphics/sprites/monsters/mister-prickel.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/moubootaur.png b/graphics/sprites/monsters/moubootaur.png new file mode 100644 index 00000000..b901e7e1 Binary files /dev/null and b/graphics/sprites/monsters/moubootaur.png differ diff --git a/graphics/sprites/monsters/moubootaur.xml b/graphics/sprites/monsters/moubootaur.xml new file mode 100644 index 00000000..48d720dd --- /dev/null +++ b/graphics/sprites/monsters/moubootaur.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/piou-king.png b/graphics/sprites/monsters/piou-king.png new file mode 100644 index 00000000..47f2cc2c Binary files /dev/null and b/graphics/sprites/monsters/piou-king.png differ diff --git a/graphics/sprites/monsters/piou-king.xml b/graphics/sprites/monsters/piou-king.xml new file mode 100644 index 00000000..5e3d8e09 --- /dev/null +++ b/graphics/sprites/monsters/piou-king.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/ratto.png b/graphics/sprites/monsters/ratto.png new file mode 100644 index 00000000..fb5bded3 Binary files /dev/null and b/graphics/sprites/monsters/ratto.png differ diff --git a/graphics/sprites/monsters/ratto.xml b/graphics/sprites/monsters/ratto.xml new file mode 100644 index 00000000..9572a8ba --- /dev/null +++ b/graphics/sprites/monsters/ratto.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/sprites/monsters/tortuga.png b/graphics/sprites/monsters/tortuga.png new file mode 100644 index 00000000..570a0615 Binary files /dev/null and b/graphics/sprites/monsters/tortuga.png differ diff --git a/graphics/sprites/monsters/tortuga.xml b/graphics/sprites/monsters/tortuga.xml new file mode 100644 index 00000000..8da52685 --- /dev/null +++ b/graphics/sprites/monsters/tortuga.xml @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/items/equip-head/item5130_Phylactery.xml b/items/equip-head/item5130_Phylactery.xml index b27baf18..84a752d8 100644 --- a/items/equip-head/item5130_Phylactery.xml +++ b/items/equip-head/item5130_Phylactery.xml @@ -1,6 +1,6 @@ - + equipment/head/phylactery.xml equipment/head/phylactery-female.xml diff --git a/items/equip-head/item5202_PilotHat.xml b/items/equip-head/item5202_PilotHat.xml index f6d84669..713ee67c 100644 --- a/items/equip-head/item5202_PilotHat.xml +++ b/items/equip-head/item5202_PilotHat.xml @@ -1,6 +1,6 @@ - + equipment/head/pilot-hat.xml equipment/head/pilot-hat-female.xml diff --git a/items/equip-head/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml index 670df756..02786a16 100644 --- a/items/equip-head/item5203_MoonshroomHat.xml +++ b/items/equip-head/item5203_MoonshroomHat.xml @@ -1,6 +1,6 @@ - + equipment/head/moonshroomhat.xml equipment/head/moonshroomhat-female.xml diff --git a/items/equip-head/item5205_EskimoHat.xml b/items/equip-head/item5205_EskimoHat.xml index 549ba20c..9ad4f32a 100644 --- a/items/equip-head/item5205_EskimoHat.xml +++ b/items/equip-head/item5205_EskimoHat.xml @@ -1,6 +1,6 @@ - + equipment/head/eskimohat.xml equipment/head/eskimohat-female.xml diff --git a/items/generic/_include.xml b/items/generic/_include.xml index 915d00ea..8e28c004 100644 --- a/items/generic/_include.xml +++ b/items/generic/_include.xml @@ -258,4 +258,5 @@ + diff --git a/items/generic/item5218_RedTicket.xml b/items/generic/item5218_RedTicket.xml index 98897d84..bb8bf5c1 100644 --- a/items/generic/item5218_RedTicket.xml +++ b/items/generic/item5218_RedTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5219_YellowTicket.xml b/items/generic/item5219_YellowTicket.xml index 70b1708a..2bc02fe4 100644 --- a/items/generic/item5219_YellowTicket.xml +++ b/items/generic/item5219_YellowTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5220_GoldTicket.xml b/items/generic/item5220_GoldTicket.xml index c1d4f0ef..455c281d 100644 --- a/items/generic/item5220_GoldTicket.xml +++ b/items/generic/item5220_GoldTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5221_GreenTicket.xml b/items/generic/item5221_GreenTicket.xml index f09044f2..7618fd3e 100644 --- a/items/generic/item5221_GreenTicket.xml +++ b/items/generic/item5221_GreenTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5222_AquaTicket.xml b/items/generic/item5222_AquaTicket.xml index 48a87ce0..47c09188 100644 --- a/items/generic/item5222_AquaTicket.xml +++ b/items/generic/item5222_AquaTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5223_BlueTicket.xml b/items/generic/item5223_BlueTicket.xml index fc5c460a..5ca5dc23 100644 --- a/items/generic/item5223_BlueTicket.xml +++ b/items/generic/item5223_BlueTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5224_PurpleTicket.xml b/items/generic/item5224_PurpleTicket.xml index f3b9c32e..a907718c 100644 --- a/items/generic/item5224_PurpleTicket.xml +++ b/items/generic/item5224_PurpleTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5225_PinkTicket.xml b/items/generic/item5225_PinkTicket.xml index f352b535..9d8da2fa 100644 --- a/items/generic/item5225_PinkTicket.xml +++ b/items/generic/item5225_PinkTicket.xml @@ -1,4 +1,4 @@ - + diff --git a/items/generic/item5311_ShadowHerb.xml b/items/generic/item5311_ShadowHerb.xml new file mode 100644 index 00000000..d8027ac6 --- /dev/null +++ b/items/generic/item5311_ShadowHerb.xml @@ -0,0 +1,10 @@ + + + + diff --git a/items/usable/_include.xml b/items/usable/_include.xml index 6ecb32c7..adb13516 100644 --- a/items/usable/_include.xml +++ b/items/usable/_include.xml @@ -81,7 +81,7 @@ - + @@ -107,4 +107,5 @@ + diff --git a/items/usable/item1258_GlutenFreeHoney.xml b/items/usable/item1258_GlutenFreeHoney.xml new file mode 100644 index 00000000..163c9ad5 --- /dev/null +++ b/items/usable/item1258_GlutenFreeHoney.xml @@ -0,0 +1,4 @@ + + + + diff --git a/items/usable/item1258_Honey.xml b/items/usable/item1258_Honey.xml deleted file mode 100644 index 163c9ad5..00000000 --- a/items/usable/item1258_Honey.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/items/usable/item5214_LactoseFreeAcorn.xml b/items/usable/item5214_LactoseFreeAcorn.xml index 35390de7..20cb2842 100644 --- a/items/usable/item5214_LactoseFreeAcorn.xml +++ b/items/usable/item5214_LactoseFreeAcorn.xml @@ -1,4 +1,4 @@ - + diff --git a/items/usable/item5309_ManaDust.xml b/items/usable/item5309_ManaDust.xml index c35c765c..1a1e459e 100644 --- a/items/usable/item5309_ManaDust.xml +++ b/items/usable/item5309_ManaDust.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/items/usable/item5312_Honey.xml b/items/usable/item5312_Honey.xml new file mode 100644 index 00000000..e1a252a6 --- /dev/null +++ b/items/usable/item5312_Honey.xml @@ -0,0 +1,13 @@ + + + + diff --git a/license.md b/license.md index 7475c743..f9cb040d 100644 --- a/license.md +++ b/license.md @@ -933,16 +933,23 @@ File | Artists | Licenses `graphics/sprites/monsters/bandit-lord.png` | Alige, Skipy, Wombat | GPLv2 `graphics/sprites/monsters/bandit.png` | Alige, Skipy, Wombat | GPLv2 `graphics/sprites/monsters/bat.png` | neoriceisgood | GPLv2 +`graphics/sprites/monsters/beehive.png` | Len, TMW.org | CC BY-SA 4.0 `graphics/sprites/monsters/bluepar.png` | Crush, Meway | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/bobone.png` | Pateame, HoraK-FDF | GPLv2 `graphics/sprites/monsters/butterfly.png` | Meway | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/cave-maggot-giant.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/cave-maggot.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/christmas-mouboo.png` | Cassy, Yuuki | GPLv2 `graphics/sprites/monsters/clover.png` | 5t3v3 | GPLv2 +`graphics/sprites/monsters/croc.png` | Reid, Coolkid782, Enchilado | CC BY-SA 3.0 +`graphics/sprites/monsters/darkduck.png` | Meway, ?, TMW-Br, dangerDuck | CC BY-SA 3.0 `graphics/sprites/monsters/demon.png` | FotherJ, V0id | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/dragon.png` | Lunovox, Jesusalva | GPLv2 `graphics/sprites/monsters/duck.png` | Meway | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/element-ball.png` | Reid | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/ent.png` | macmanmatty, jesusalva | CC BY-SA 4.0 +`graphics/sprites/monsters/frog-big.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/frog-small.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/ghost-pumpkin.png` | :grey_question:, Modanung | GPLv2 `graphics/sprites/monsters/goblin-fire.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/goblin-ice.png` | :grey_question:, Neoriceisgood | GPLv2 @@ -950,16 +957,20 @@ File | Artists | Licenses `graphics/sprites/monsters/golem-red.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/golem-blackcrystal.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/golem-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/junglefowl.png` | Pateame, Virtual Reality | GPLv2 `graphics/sprites/monsters/larvespa.png` | Arikel | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/lizard.png` | Len, Pateame | GPLv2 `graphics/sprites/monsters/logmonster.png` | FotherJ | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/maggot-giant.png` | :grey_question:, Neoriceisgood | GPLv2 `graphics/sprites/monsters/maggot.png` | Neoriceisgood | GPLv2 +`graphics/sprites/monsters/mananatree.png` | Len, Saphy, Reid | CC BY-SA 3.0 `graphics/sprites/monsters/mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/mega-mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/mister-prickles.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/moggun.png` | Modanung, Pateame | GPLv2 `graphics/sprites/monsters/mouboo.png` | Yuuki | GPLv2 `graphics/sprites/monsters/mouboo-demonic.png` | Cassy, Yuuki | GPLv2 +`graphics/sprites/monsters/moubootaur.png` | Hocus | MIT `graphics/sprites/monsters/montblanc.png` | KokoroReflections | CC BY 4.0 `graphics/sprites/monsters/mushroom-red.png` | Yuuki | GPLv2 `graphics/sprites/monsters/mushroom-spiky.png` | Yuuki | GPLv2 @@ -969,7 +980,9 @@ File | Artists | Licenses `graphics/sprites/monsters/nutcracker.png` | Chayenne, :grey_question:, Alige, Lizandra, Salmondine | GPLv2 `graphics/sprites/monsters/penguin.png` | Fother | GPLv2 `graphics/sprites/monsters/pinkie.png` | Crush | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/piou-king.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/plant.png` | Crush, Seradest | GPLv2 +`graphics/sprites/monsters/ratto.png` | Coolkid782 | CC BY-SA 3.0 `graphics/sprites/monsters/reaper.png` | Alige, Len, Reid, Skipy | GPLv2 `graphics/sprites/monsters/rot.png` | Ledmitz | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/rotter.png` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -988,12 +1001,15 @@ File | Artists | Licenses `graphics/sprites/monsters/snowflower.png` | Salmondine | GPLv2 `graphics/sprites/monsters/spider.png` | FotherJ | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/spider-crystal.png` | FotherJ, HoraK-FDF | GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/spider-queen.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0 +`graphics/sprites/monsters/spider-queen-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/spinning-scythe.png` | Nmaligec, Skipy | GPLv2 `graphics/sprites/monsters/spirit-demonic.png` | :grey_question:, Neoriceisgood, V0id | GPLv2 `graphics/sprites/monsters/squirrel.png` | FotherJ, Wombat | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/terranite-mask.png` | Kr0n05931 | GPLv2 `graphics/sprites/monsters/tengu.png` | Hocus | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/terranite.png` | Kr0n05931 | GPLv2 +`graphics/sprites/monsters/tortuga.png` | Coolkid782, Reid | CC BY-SA 3.0 `graphics/sprites/monsters/troll.png` | FotherJ | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/vampire-bat.png` | Meway | GPLv2 `graphics/sprites/monsters/vespa.png` | Arikel | GPLv2, CC BY-SA 3.0 @@ -1011,6 +1027,7 @@ File | Artists | Licenses `graphics/sprites/monsters/accessories/mouboo-red-saddle.png` | Cassy | GPLv2 `graphics/sprites/monsters/accessories/mouboo-red-shoes.png` | Cassy | GPLv2 `graphics/sprites/monsters/accessories/mouboo-santa-hat.png` | Cassy | GPLv2 +`graphics/sprites/monsters/accessories/ratto-tail.png` | Coolkid782 | CC BY-SA 3.0 `graphics/sprites/monsters/accessories/slime-bubble.png` | Fother | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/accessories/slime-littleslime.png` | Wombat | GPLv2, CC BY-SA 3.0 `graphics/sprites/monsters/accessories/slime-seajelly.png` | FotherJ | GPLv2, CC BY-SA 3.0 @@ -1233,6 +1250,17 @@ File | Artists | Licenses `sfx/monsters/bee/bee-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/casket-monster/casket-monster.ogg` | Dariuna | GPLv2 `sfx/monsters/cavesnake/cavesnake-hit1.ogg` | Krazyjakee | GPLv2 +`sfx/monsters/croc/hit1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/hit2.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/hurt1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/hurt2.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/hurt3.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/miss1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/croc/spawn1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/crocotree/die1.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/crocotree/hurt1.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/crocotree/hurt2.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0 +`sfx/monsters/crocotree/hurt3.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0 `sfx/monsters/fallen/fallen-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/fallen/fallen-die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/fallen/fallen-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1257,6 +1285,7 @@ File | Artists | Licenses `sfx/monsters/fluffy/fluffy-hit3.ogg` | Cosmostrator | GPLv2 `sfx/monsters/fluffy/fluffy-hurt1.ogg` | Cosmostrator | GPLv2 `sfx/monsters/fluffy/fluffy-miss1.ogg` | Cosmostrator | GPLv2 +`sfx/monsters/frostiana/hit1.ogg` | Cosmostrator | CC BY-SA 3.0 `sfx/monsters/golem/die.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/golem/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/golem/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1288,6 +1317,11 @@ File | Artists | Licenses `sfx/monsters/pollett/pollett-hurt5.ogg` | clort | GPLv2, CC BY-SA 3.0 `sfx/monsters/pollett/pollett-hurt6.ogg` | clort | GPLv2, CC BY-SA 3.0 `sfx/monsters/pumpkin/pumpkin-explosion.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0 +`sfx/monsters/ratto/die1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/ratto/hit1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/ratto/hit2.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/ratto/hurt1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/ratto/spawn1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 `sfx/monsters/reaper/reaper-die1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0 `sfx/monsters/reaper/reaper-hit1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0 `sfx/monsters/reaper/reaper-hurt1.ogg` | nmaligec | GPLv2 @@ -1343,15 +1377,15 @@ File | Artists | Licenses `sfx/monsters/snail/snail-hurt2.ogg` | alpha [Ledmitz] | GPLv2 `sfx/monsters/snowman_boss/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/snowman_boss/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 -`sfx/monsters/spider/spider-die1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-hit3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move4.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` -`sfx/monsters/spider/spider-move5.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0` +`sfx/monsters/spider/spider-die1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-hit1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-hit3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-move1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-move2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-move3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-move4.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 +`sfx/monsters/spider/spider-move5.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0 `sfx/monsters/squirrel/squirrel-die1.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-die2.ogg` | Krazyjakee | GPLv2 `sfx/monsters/squirrel/squirrel-hurt1.ogg` | Krazyjakee | GPLv2 @@ -1374,6 +1408,12 @@ File | Artists | Licenses `sfx/monsters/tengu/hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/tengu/hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/monsters/tengu/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/monsters/tortuga/die1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/tortuga/hit1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/tortuga/hit2.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/tortuga/hurt1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/tortuga/miss1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 +`sfx/monsters/tortuga/spawn1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0 `sfx/monsters/wolvern/wolvern-dying1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0 `sfx/monsters/wolvern/wolvern-hit1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0 `sfx/monsters/wolvern/wolvern-hit2.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0 @@ -1449,6 +1489,11 @@ File | Artists | Licenses `sfx/weapons/knives/setzer/setzer-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/knives/setzer/setzer-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/knives/sharpknife-miss1.ogg` | Krazyjakee | GPLv2 +`sfx/weapons/lightsaber/crit.ogg` | ?, FreedroidRPG | GPL v2) +`sfx/weapons/lightsaber/hit1.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0) +`sfx/weapons/lightsaber/hit2.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0) +`sfx/weapons/lightsaber/hit3.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0) +`sfx/weapons/lightsaber/miss.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0) `sfx/weapons/projectiles/snowball/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/projectiles/snowball/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/punch1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 diff --git a/maps/007-1.tmx b/maps/007-1.tmx index 9d3942de..e6053190 100644 --- a/maps/007-1.tmx +++ b/maps/007-1.tmx @@ -1,5 +1,5 @@ - + @@ -1007,6 +1007,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1016,12 +1039,5 @@ - - - - - - - diff --git a/maps/008-1.tmx b/maps/008-1.tmx index a782124b..a6c60841 100644 --- a/maps/008-1.tmx +++ b/maps/008-1.tmx @@ -1,5 +1,5 @@ - + @@ -761,7 +761,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 - + @@ -892,5 +892,21 @@ + + + + + + + + + + + + + + + + diff --git a/maps/010-1.tmx b/maps/010-1.tmx index de8ef336..bfcaf392 100644 --- a/maps/010-1.tmx +++ b/maps/010-1.tmx @@ -1,5 +1,5 @@ - + @@ -758,7 +758,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 - + @@ -890,5 +890,21 @@ + + + + + + + + + + + + + + + + diff --git a/maps/011-1.tmx b/maps/011-1.tmx index 8d31b017..0eabe66e 100644 --- a/maps/011-1.tmx +++ b/maps/011-1.tmx @@ -1,5 +1,5 @@ - + @@ -814,5 +814,21 @@ + + + + + + + + + + + + + + + + diff --git a/maps/012-1.tmx b/maps/012-1.tmx index d764ebad..ea07d330 100644 --- a/maps/012-1.tmx +++ b/maps/012-1.tmx @@ -1,5 +1,5 @@ - + @@ -952,14 +952,6 @@ - - - - - - - - @@ -968,10 +960,14 @@ - - - - + + + + + + + + @@ -1000,5 +996,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/maps/013-1.tmx b/maps/013-1.tmx index 414bccbc..b011e26b 100644 --- a/maps/013-1.tmx +++ b/maps/013-1.tmx @@ -1,5 +1,5 @@ - + @@ -937,6 +937,22 @@ + + + + + + + + + + + + + + + + diff --git a/maps/015-1.tmx b/maps/015-1.tmx index 4ebe6151..77590b67 100644 --- a/maps/015-1.tmx +++ b/maps/015-1.tmx @@ -1,5 +1,5 @@ - + @@ -744,5 +744,21 @@ + + + + + + + + + + + + + + + + diff --git a/maps/016-1.tmx b/maps/016-1.tmx index c0c6ce81..6f5380a5 100644 --- a/maps/016-1.tmx +++ b/maps/016-1.tmx @@ -1,5 +1,5 @@ - + @@ -647,9 +647,9 @@ - + @@ -662,65 +662,81 @@ - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + diff --git a/maps/017-1.tmx b/maps/017-1.tmx index 63d61cc6..2ec6eb3c 100644 --- a/maps/017-1.tmx +++ b/maps/017-1.tmx @@ -1,5 +1,5 @@ - + @@ -659,7 +659,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,171,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -975,6 +975,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -996,12 +1019,5 @@ - - - - - - - diff --git a/maps/018-1.tmx b/maps/018-1.tmx index da99bd6e..8fbb58d2 100644 --- a/maps/018-1.tmx +++ b/maps/018-1.tmx @@ -1,5 +1,5 @@ - + @@ -767,7 +767,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 - + @@ -1065,7 +1065,6 @@ - @@ -1081,6 +1080,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1096,19 +1126,5 @@ - - - - - - - - - - - - - - diff --git a/maps/025-1.tmx b/maps/025-1.tmx index fa3ad2e5..6b20cab5 100644 --- a/maps/025-1.tmx +++ b/maps/025-1.tmx @@ -1,5 +1,5 @@ - + @@ -786,81 +786,97 @@ - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + diff --git a/maps/026-1.tmx b/maps/026-1.tmx index b1cdaed1..90680ff1 100644 --- a/maps/026-1.tmx +++ b/maps/026-1.tmx @@ -1,5 +1,5 @@ - + @@ -1015,7 +1015,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 - + @@ -1033,41 +1033,41 @@ - + - + - + - + - + @@ -1080,87 +1080,103 @@ - + - + - + - + - + - - - - - - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maps/027-1.tmx b/maps/027-1.tmx index d5ab79da..72cb70c2 100644 --- a/maps/027-1.tmx +++ b/maps/027-1.tmx @@ -1,5 +1,5 @@ - + @@ -1020,7 +1020,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 - + @@ -1038,145 +1038,161 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + diff --git a/maps/055-1.tmx b/maps/055-1.tmx index 0370627b..86524deb 100644 --- a/maps/055-1.tmx +++ b/maps/055-1.tmx @@ -1,5 +1,5 @@ - + @@ -932,6 +932,21 @@ + + + + + + + + + + + + + + + @@ -953,14 +968,6 @@ - - - - - - - - @@ -971,11 +978,20 @@ - + - - - + + + + + + + + + + + + diff --git a/maps/057-1.tmx b/maps/057-1.tmx index f9e73099..11ddf041 100644 --- a/maps/057-1.tmx +++ b/maps/057-1.tmx @@ -1,5 +1,5 @@ - + @@ -916,152 +916,168 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/maps/099-7.tmx b/maps/099-7.tmx index ce6aca02..95fefd38 100644 --- a/maps/099-7.tmx +++ b/maps/099-7.tmx @@ -1,5 +1,5 @@ - + @@ -1720,7 +1720,23 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - + + + + + + + + + + + + + + + + + @@ -1734,7 +1750,7 @@ - + diff --git a/monsters.xml b/monsters.xml index 1f36f1e8..522a0570 100644 --- a/monsters.xml +++ b/monsters.xml @@ -1303,7 +1303,7 @@ equipment/angel-wings.xml equipment/head/aureole.xml - equipment/weapons/sandcutter.xml + equipment/weapons/sword-sandcutter.xml weapons/knives/rock/rock-hit1.ogg weapons/knives/rock/rock-hit2.ogg weapons/miss1.ogg @@ -1633,20 +1633,116 @@ monsters/spider-queen.xml - monsters/scorpion/scorpionhit1.ogg - monsters/scorpion/scorpionhit2.ogg - monsters/scorpion/scorpionhit3.ogg - monsters/scorpion/scorpionhit4.ogg - monsters/scorpion/scorpionmiss1.ogg + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg monsters/spider-queen-crystal.xml - monsters/scorpion/scorpionhit1.ogg - monsters/scorpion/scorpionhit2.ogg - monsters/scorpion/scorpionhit3.ogg - monsters/scorpion/scorpionhit4.ogg - monsters/scorpion/scorpionmiss1.ogg + monsters/scorpion/scorpion-hit1.ogg + monsters/scorpion/scorpion-hit2.ogg + monsters/scorpion/scorpion-hit3.ogg + monsters/scorpion/scorpion-hit4.ogg + monsters/scorpion/scorpion-miss1.ogg + + + + monsters/mister-prickel.xml + + + + + monsters/frog-small.xml + + + + monsters/frog-big.xml + + + + monsters/moubootaur.xml + monsters/frostiana/hit1.ogg + + + + monsters/bobone.xml + + + + monsters/ent.xml + monsters/crocotree/die1.ogg + monsters/frostiana/hit1.ogg + monsters/shroom/shroom-hit1.ogg + monsters/crocotree/die1.ogg + + + + monsters/mananatree.xml + monsters/crocotree/die1.ogg + monsters/crocotree/hurt1.ogg + monsters/crocotree/hurt2.ogg + monsters/crocotree/hurt3.ogg + + + + monsters/darkduck.xml + weapons/lightsaber/hit1.ogg + weapons/lightsaber/hit2.ogg + weapons/lightsaber/hit3.ogg + weapons/lightsaber/crit.ogg + weapons/lightsaber/miss.ogg + + + + monsters/junglefowl.xml + + + + monsters/plant.xml|#332636 + + + + monsters/beehive.xml + monsters/bee/bee-hit1.ogg + monsters/bee/bee-miss1.ogg + + + + monsters/tortuga.xml + monsters/tortuga/die1.ogg + monsters/tortuga/hit1.ogg + monsters/tortuga/hit2.ogg + monsters/tortuga/hurt1.ogg + monsters/tortuga/miss1.ogg + monsters/tortuga/spawn1.ogg + + + + monsters/ratto.xml + monsters/accessories/ratto-tail.xml + monsters/ratto/die1.ogg + monsters/ratto/hit1.ogg + monsters/ratto/hit2.ogg + monsters/ratto/hurt1.ogg + monsters/ratto/spawn1.ogg + + + + monsters/croc.xml + monsters/croc/hit1.ogg + monsters/croc/hit2.ogg + monsters/croc/hurt1.ogg + monsters/croc/hurt2.ogg + monsters/croc/hurt3.ogg + monsters/croc/miss1.ogg + monsters/croc/spawn1.ogg + + + + monsters/piou-king.xml diff --git a/sfx/monsters/croc/hit1.ogg b/sfx/monsters/croc/hit1.ogg new file mode 100644 index 00000000..65d1ed78 Binary files /dev/null and b/sfx/monsters/croc/hit1.ogg differ diff --git a/sfx/monsters/croc/hit2.ogg b/sfx/monsters/croc/hit2.ogg new file mode 100644 index 00000000..1eed597e Binary files /dev/null and b/sfx/monsters/croc/hit2.ogg differ diff --git a/sfx/monsters/croc/hurt1.ogg b/sfx/monsters/croc/hurt1.ogg new file mode 100644 index 00000000..286ded94 Binary files /dev/null and b/sfx/monsters/croc/hurt1.ogg differ diff --git a/sfx/monsters/croc/hurt2.ogg b/sfx/monsters/croc/hurt2.ogg new file mode 100644 index 00000000..4844760c Binary files /dev/null and b/sfx/monsters/croc/hurt2.ogg differ diff --git a/sfx/monsters/croc/hurt3.ogg b/sfx/monsters/croc/hurt3.ogg new file mode 100644 index 00000000..bde96535 Binary files /dev/null and b/sfx/monsters/croc/hurt3.ogg differ diff --git a/sfx/monsters/croc/miss1.ogg b/sfx/monsters/croc/miss1.ogg new file mode 100644 index 00000000..05d74eee Binary files /dev/null and b/sfx/monsters/croc/miss1.ogg differ diff --git a/sfx/monsters/croc/spawn1.ogg b/sfx/monsters/croc/spawn1.ogg new file mode 100644 index 00000000..b8fde2e8 Binary files /dev/null and b/sfx/monsters/croc/spawn1.ogg differ diff --git a/sfx/monsters/crocotree/die1.ogg b/sfx/monsters/crocotree/die1.ogg new file mode 100644 index 00000000..a2f63baf Binary files /dev/null and b/sfx/monsters/crocotree/die1.ogg differ diff --git a/sfx/monsters/crocotree/hurt1.ogg b/sfx/monsters/crocotree/hurt1.ogg new file mode 100644 index 00000000..915231f3 Binary files /dev/null and b/sfx/monsters/crocotree/hurt1.ogg differ diff --git a/sfx/monsters/crocotree/hurt2.ogg b/sfx/monsters/crocotree/hurt2.ogg new file mode 100644 index 00000000..9140fb34 Binary files /dev/null and b/sfx/monsters/crocotree/hurt2.ogg differ diff --git a/sfx/monsters/crocotree/hurt3.ogg b/sfx/monsters/crocotree/hurt3.ogg new file mode 100644 index 00000000..fce65e66 Binary files /dev/null and b/sfx/monsters/crocotree/hurt3.ogg differ diff --git a/sfx/monsters/frostiana/hit1.ogg b/sfx/monsters/frostiana/hit1.ogg new file mode 100644 index 00000000..e316f7d1 Binary files /dev/null and b/sfx/monsters/frostiana/hit1.ogg differ diff --git a/sfx/monsters/ratto/die1.ogg b/sfx/monsters/ratto/die1.ogg new file mode 100644 index 00000000..2ba94f8b Binary files /dev/null and b/sfx/monsters/ratto/die1.ogg differ diff --git a/sfx/monsters/ratto/hit1.ogg b/sfx/monsters/ratto/hit1.ogg new file mode 100644 index 00000000..fd0d05f9 Binary files /dev/null and b/sfx/monsters/ratto/hit1.ogg differ diff --git a/sfx/monsters/ratto/hit2.ogg b/sfx/monsters/ratto/hit2.ogg new file mode 100644 index 00000000..27e61dbd Binary files /dev/null and b/sfx/monsters/ratto/hit2.ogg differ diff --git a/sfx/monsters/ratto/hurt1.ogg b/sfx/monsters/ratto/hurt1.ogg new file mode 100644 index 00000000..8b0f6d6c Binary files /dev/null and b/sfx/monsters/ratto/hurt1.ogg differ diff --git a/sfx/monsters/ratto/spawn1.ogg b/sfx/monsters/ratto/spawn1.ogg new file mode 100644 index 00000000..9104b862 Binary files /dev/null and b/sfx/monsters/ratto/spawn1.ogg differ diff --git a/sfx/monsters/tortuga/die1.ogg b/sfx/monsters/tortuga/die1.ogg new file mode 100644 index 00000000..c4554839 Binary files /dev/null and b/sfx/monsters/tortuga/die1.ogg differ diff --git a/sfx/monsters/tortuga/hit1.ogg b/sfx/monsters/tortuga/hit1.ogg new file mode 100644 index 00000000..70d1fd2d Binary files /dev/null and b/sfx/monsters/tortuga/hit1.ogg differ diff --git a/sfx/monsters/tortuga/hit2.ogg b/sfx/monsters/tortuga/hit2.ogg new file mode 100644 index 00000000..37ff5898 Binary files /dev/null and b/sfx/monsters/tortuga/hit2.ogg differ diff --git a/sfx/monsters/tortuga/hurt1.ogg b/sfx/monsters/tortuga/hurt1.ogg new file mode 100644 index 00000000..e6705a95 Binary files /dev/null and b/sfx/monsters/tortuga/hurt1.ogg differ diff --git a/sfx/monsters/tortuga/miss1.ogg b/sfx/monsters/tortuga/miss1.ogg new file mode 100644 index 00000000..cb53f16b Binary files /dev/null and b/sfx/monsters/tortuga/miss1.ogg differ diff --git a/sfx/monsters/tortuga/spawn1.ogg b/sfx/monsters/tortuga/spawn1.ogg new file mode 100644 index 00000000..7eb63dd8 Binary files /dev/null and b/sfx/monsters/tortuga/spawn1.ogg differ diff --git a/sfx/weapons/lightsaber/crit.ogg b/sfx/weapons/lightsaber/crit.ogg new file mode 100644 index 00000000..5a629089 Binary files /dev/null and b/sfx/weapons/lightsaber/crit.ogg differ diff --git a/sfx/weapons/lightsaber/hit1.ogg b/sfx/weapons/lightsaber/hit1.ogg new file mode 100644 index 00000000..d4b04290 Binary files /dev/null and b/sfx/weapons/lightsaber/hit1.ogg differ diff --git a/sfx/weapons/lightsaber/hit2.ogg b/sfx/weapons/lightsaber/hit2.ogg new file mode 100644 index 00000000..ab892334 Binary files /dev/null and b/sfx/weapons/lightsaber/hit2.ogg differ diff --git a/sfx/weapons/lightsaber/hit3.ogg b/sfx/weapons/lightsaber/hit3.ogg new file mode 100644 index 00000000..5a2bb7c5 Binary files /dev/null and b/sfx/weapons/lightsaber/hit3.ogg differ diff --git a/sfx/weapons/lightsaber/miss.ogg b/sfx/weapons/lightsaber/miss.ogg new file mode 100644 index 00000000..01d95700 Binary files /dev/null and b/sfx/weapons/lightsaber/miss.ogg differ -- cgit v1.2.3-60-g2f50