diff options
author | Ledmitz <smoothshifter@tuta.io> | 2024-04-11 10:00:51 -0300 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2024-04-11 13:27:55 +0000 |
commit | 484cb8212f6895997f2ea0cdf02b3c41b6794c50 (patch) | |
tree | cb59a0d0408a8d4b8fc4eeb21a1969bc3c7af329 | |
parent | b9f70100f6f3ccbfac62793ea406d958b3b6fc8e (diff) | |
download | clientdata-484cb8212f6895997f2ea0cdf02b3c41b6794c50.tar.gz clientdata-484cb8212f6895997f2ea0cdf02b3c41b6794c50.tar.bz2 clientdata-484cb8212f6895997f2ea0cdf02b3c41b6794c50.tar.xz clientdata-484cb8212f6895997f2ea0cdf02b3c41b6794c50.zip |
Flinlock, not Revolver or gunstaff. Added bullet GFX
-rw-r--r-- | graphics/items/equipment/weapon/flintlock.png (renamed from graphics/items/equipment/weapon/revolver.png) | bin | 792 -> 792 bytes | |||
-rw-r--r-- | graphics/particles/bullet.xml | 26 | ||||
-rw-r--r-- | graphics/sprites/equipment/weapons/flintlock.png (renamed from graphics/sprites/equipment/weapons/gun.png) | bin | 2207 -> 2207 bytes | |||
-rw-r--r-- | graphics/sprites/equipment/weapons/flintlock.xml (renamed from graphics/sprites/equipment/weapons/gun.xml) | 2 | ||||
-rw-r--r-- | items/equip-1hand/_include.xml | 3 | ||||
-rw-r--r-- | items/equip-1hand/item5284_Flintlock.xml (renamed from items/equip-1hand/item5284_Revolver.xml) | 12 | ||||
-rw-r--r-- | items/equip-head/_include.xml | 1 | ||||
-rw-r--r-- | license.md | 4 |
8 files changed, 38 insertions, 10 deletions
diff --git a/graphics/items/equipment/weapon/revolver.png b/graphics/items/equipment/weapon/flintlock.png Binary files differindex 34ce5859..34ce5859 100644 --- a/graphics/items/equipment/weapon/revolver.png +++ b/graphics/items/equipment/weapon/flintlock.png diff --git a/graphics/particles/bullet.xml b/graphics/particles/bullet.xml new file mode 100644 index 00000000..244e3909 --- /dev/null +++ b/graphics/particles/bullet.xml @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<!-- Author: Ledmitz. For use with Flintlock/Blanc --> +<effect> + <particle position-x="0" position-y="0" position-z="32" lifetime="128"> + <emitter> + <property name="image" value="graphics/particles/orb-small.png|W:#000000"/> + <property name="output" value="1"/> + <property name="lifetime" value="1"/> + <emitter> + <property name="position-x" value="-5"/> + <property name="position-y" min="-4" max="-4"/> + <property name="horizontal-angle" min="0" max="360"/> + <property name="vertical-angle" min="0" max="90"/> + <property name="power" min="0" max="0.05"/> + <property name="gravity" value="0"/> + <property name="lifetime" value="30"/> + <property name="output" value="1"/> + <property name="fade-out" value="100"/> + <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8"> + <sequence start="0" end="14" delay="30"/> + <frame index="14" delay="30"/> + </animation> + </emitter> + </emitter> + </particle> +</effect> diff --git a/graphics/sprites/equipment/weapons/gun.png b/graphics/sprites/equipment/weapons/flintlock.png Binary files differindex 70bc5b44..70bc5b44 100644 --- a/graphics/sprites/equipment/weapons/gun.png +++ b/graphics/sprites/equipment/weapons/flintlock.png diff --git a/graphics/sprites/equipment/weapons/gun.xml b/graphics/sprites/equipment/weapons/flintlock.xml index e1417c18..a1002741 100644 --- a/graphics/sprites/equipment/weapons/gun.xml +++ b/graphics/sprites/equipment/weapons/flintlock.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <sprite> - <imageset name="weapon" src="graphics/sprites/equipment/weapons/gun.png" width="64" height="64" /> + <imageset name="weapon" src="graphics/sprites/equipment/weapons/flintlock.png" width="64" height="64" /> <action name="default" imageset="weapon"> </action> diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml index e334c70c..105c7907 100644 --- a/items/equip-1hand/_include.xml +++ b/items/equip-1hand/_include.xml @@ -15,9 +15,10 @@ <include name="items/equip-1hand/item0590_DragonSword.xml"/> <include name="items/equip-1hand/item0599_FireSword.xml"/> <include name="items/equip-1hand/item0867_IceGladius.xml"/> + <include name="items/equip-1hand/item0910_Rainerang.xml"/> <include name="items/equip-1hand/item1171_Wand.xml"/> <include name="items/equip-1hand/item1201_Knife.xml"/> <include name="items/equip-1hand/item1215_ToySabre.xml"/> <include name="items/equip-1hand/item5261_Launcher.xml"/> - <include name="items/equip-1hand/item5284_Revolver.xml"/> + <include name="items/equip-1hand/item5284_Flintlock.xml"/> </items> diff --git a/items/equip-1hand/item5284_Revolver.xml b/items/equip-1hand/item5284_Flintlock.xml index 3a72610d..dfb341c9 100644 --- a/items/equip-1hand/item5284_Revolver.xml +++ b/items/equip-1hand/item5284_Flintlock.xml @@ -1,22 +1,22 @@ <?xml version="1.0"?> <items> <item id="5284" - image="equipment/weapon/revolver.png" - name="Short Gunstaff" - description="A gunstaff, which is not produced in The Mana World. Brought from the Mirror Lake." + image="equipment/weapon/flintlock.png" + name="Flintlock Pistol" + description="Brought by Blanc to The Mana World from Mirror Lake." effect="Unobtainable. / Weapon Level 1" attack="120" attack-range="5" - missile-particle="graphics/particles/flame.particle.xml" + missile-particle="graphics/particles/bullet.xml" missile-z="32" missile-lifetime="500" missile-speed="5" - missile-diedistance="3" + missile-diedistance="5" type="equip-1hand" attack-action="attack_bow" weight="3000" sellProtected="true"> - <sprite>equipment/weapons/gun.xml</sprite> + <sprite>equipment/weapons/flintlock.xml</sprite> <sound event="hit">weapons/gun/gun-hit1.ogg</sound> <sound event="miss">weapons/gun/gun-miss1.ogg</sound> <sound event="miss">weapons/gun/gun-miss2.ogg</sound> diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml index 709c3bb1..447e89b2 100644 --- a/items/equip-head/_include.xml +++ b/items/equip-head/_include.xml @@ -73,6 +73,7 @@ <include name="items/equip-head/item0901_OrangeRoseHat.xml"/> <include name="items/equip-head/item0902_BlueRoseHat.xml"/> <include name="items/equip-head/item0905_BucketHat.xml"/> + <include name="items/equip-head/item0909_LeprechaunHead.xml"/> <include name="items/equip-head/item1173_TamOShanter.xml"/> <include name="items/equip-head/item1174_CashiersShade.xml"/> <include name="items/equip-head/item1175_AutumnMask.xml"/> @@ -371,7 +371,7 @@ File | Artists | Licenses `graphics/items/equipment/weapon/slingshot-icon.png` | wushin | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/sword-dead.png` | Wombat, wushin | GPLv2, CC BY-SA 3.0 `graphics/items/equipment/weapon/wand.png` | wushin | GPLv2, CC BY-SA 3.0 -`graphics/items/equipment/weapons/revolver.png` | Skipy, Micksha | GPLv2 +`graphics/items/equipment/weapons/flintlock.png` | Skipy, Micksha | GPLv2 #### Generic File | Artists | Licenses @@ -726,7 +726,7 @@ File | Artists | Licenses `graphics/sprites/equipment/weapons/sword-short.png` | ChefChelios, Wushin | GPLv2, CC BY-SA 3.0 `graphics/sprites/equipment/weapons/wand-deathshand.png` | :grey_question:, Wombat, Wushin | GPLv2 `graphics/sprites/equipment/weapons/wand.png` | :grey_question:, Wushin | GPLv2 -`graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2 +`graphics/sprites/equipment/weapons/flintlock.png` | Skipy, Jesusalva | GPLv2 #### Chest File | Artists | Licenses |