diff --git a/Dungeoneer/assets/data/animations.dat b/Dungeoneer/assets/data/animations.dat index 87703ee1..147cfd9d 100644 --- a/Dungeoneer/assets/data/animations.dat +++ b/Dungeoneer/assets/data/animations.dat @@ -201,6 +201,52 @@ { transform: {x:0.0000, y:0.0173, z:-0.0214}, rotation: {x:-12.9373, y:15.8612, z:-6.6304}, length: 3.00}, { transform: {x:0.0000, y:0.0000, z:0.0000}, rotation: {x:-15.6840, y:13.1533, z:4.3002}, length: 0.00} ] - } + }, + "gunFire":{ + "class":"com.interrupt.dungeoneer.gfx.animation.lerp3d.LerpedAnimation", + "actionTime":10, + "endTexOffset":1, + "frames":[ + { + "transform":{ + "x":0.12, + "y":-0.250, + "z":0.4000 + }, + "rotation":{ + "x":0.0000, + "y":80.0, + "z":0.0000 + }, + length: 0.0 + }, + { + "transform":{ + "x":0.12, + "y":-0.1200, + "z":-0.150 + }, + "rotation":{ + "x":0.0000, + "y":80.0, + "z":0.0000 + }, + length: 1.2 + }, + { + "transform":{ + "x":0.12, + "y":-0.250, + "z":0.4000 + }, + "rotation":{ + "x":0.0000, + "y":80.0, + "z":0.0000 + }, + length: 0 + } + ] + } } } \ No newline at end of file diff --git a/Dungeoneer/assets/data/items.dat b/Dungeoneer/assets/data/items.dat index 8b2a701c..459f6fda 100644 --- a/Dungeoneer/assets/data/items.dat +++ b/Dungeoneer/assets/data/items.dat @@ -79,7 +79,55 @@ count:4, yOffset:-0.11, cost:10 - } + }, + { + "class":"com.interrupt.dungeoneer.entities.items.Gun", + "roll":45, + "tex":0, + "heldTex":1, + "spriteAtlas":"item-guns", + "name":"Handgun", + "attackAnimation":"gunFire", + "attackStrongAnimation":"gunFire", + "automatic":false, + "projectileNum":1, + "projectileSpreadX":3, + "projectileSpreadY":3, + "cycleTime":7, + "ammoType":"BULLET", + "twoHanded":true, + "baseDamage":10, + "randDamage":0, + "roll":45, + "fireSound": "pistol-shot.mp3", + "hitEffect": { + "shakeAmount": 2.0, + "shakeDistance": 2.0, + "lightMod": 0.2, + "explosionLightLifetime": 6.0, + "particleCount": 0, + "damage": 0, + "tex": 18, + "explosionStartTex": 18, + "explosionEndTex": 23, + "explosionAnimSpeed": 22, + "hasHalo": false, + "explodeSound": null, + "fullbrite": false, + "impulseAmount": 0 + } + }, + { + class:com.interrupt.dungeoneer.entities.items.ItemStack, + itemType:stack, + stackType:"BULLET", + tex:3, + spriteAtlas:"item-guns", + name:"Bullets", + count:100, + yOffset:-0.11, + cost:10 + } ] }, diff --git a/Dungeoneer/assets/data/spritesheets.dat b/Dungeoneer/assets/data/spritesheets.dat index 4474b238..c2bd7879 100644 --- a/Dungeoneer/assets/data/spritesheets.dat +++ b/Dungeoneer/assets/data/spritesheets.dat @@ -24,6 +24,13 @@ "name": "item", "y_offset": 0.25 }, + { + "columns": 4, + "filename": "items-guns.png", + "scale": 0.5, + "name": "item-guns", + "y_offset": 0.25 + }, { "columns": 4, "filename": "particles.png", diff --git a/Dungeoneer/assets/items-guns.png b/Dungeoneer/assets/items-guns.png new file mode 100644 index 00000000..be6da166 Binary files /dev/null and b/Dungeoneer/assets/items-guns.png differ diff --git a/Dungeoneer/assets/levels/test-level.bin b/Dungeoneer/assets/levels/test-level.bin index 8b5cf940..33003c35 100644 Binary files a/Dungeoneer/assets/levels/test-level.bin and b/Dungeoneer/assets/levels/test-level.bin differ