-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #109 from sayterdarkwynd/master
csvdbfngm,hj.
- Loading branch information
Showing
67 changed files
with
2,814 additions
and
1,142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
1,782 changes: 977 additions & 805 deletions
1,782
dungeons/missions/ancienttemple/ancienttemple.json
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
items/active/weapons/ranged/unique/pistoleffigiumfu.activeitem
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
items/active/weapons/ranged/unique/rifleaegisaltfu.activeitem
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| { | ||
| "itemName" : "rifleaegisaltfu", | ||
| "price" : 360, | ||
| "inventoryIcon" : "rifleaegisaltfu.png", | ||
| "maxStack" : 1, | ||
| "rarity" : "rare", | ||
| "description" : "Reliable and accurate, and cheap to produce.", | ||
| "shortdescription" : "Aegisalt Rifle", | ||
| "category" : "sniperRifle", | ||
| "level" : 5, | ||
| "tooltipKind" : "gun2", | ||
| "weaponType" : "Sniper Rifle", | ||
| "itemTags" : ["weapon","ranged","sniperrifle","upgradeableWeapon"], | ||
| "twoHanded" : true, | ||
|
|
||
| "animation" : "/items/active/weapons/ranged/gun.animation", | ||
| "animationParts" : { | ||
| "butt" : "", | ||
| "middle" : "rifleaegisaltfu.png", | ||
| "barrel" : "", | ||
| "muzzleFlash" : "/animations/muzzleflash/muzzleflash2.png" | ||
| }, | ||
| "animationCustom" : { | ||
| "sounds" : { | ||
| "fire" : [ "/sfx/gun/rifle2.ogg" ] | ||
| }, | ||
| "particleEmitters" : { | ||
| "muzzleFlash" : { | ||
| "particles" : [ | ||
| { "particle" : "fushellcasing", "offset" : [-2.5, 0.0] }, | ||
| { "particle" : "dust2", "offset" : [0.4, -0.4] } | ||
| ] | ||
| } | ||
| }, | ||
| "lights" : { "muzzleFlash" : {"color" : [77, 77, 77] } } | ||
| }, | ||
|
|
||
| "baseOffset" : [1, 0.4], | ||
| "muzzleOffset" : [2.8, -0.1], | ||
|
|
||
| "scripts" : ["/items/active/weapons/ranged/gun.lua"], | ||
|
|
||
| "elementalType" : "physical", | ||
|
|
||
| "primaryAbility" : { | ||
| "scripts" : ["/items/active/weapons/ranged/gunfire.lua"], | ||
| "class" : "GunFire", | ||
| "fireTime" : 2, | ||
| "baseDps" : 5.6, | ||
| "energyUsage" : 40.0, | ||
| "inaccuracy" : 0, | ||
|
|
||
| "projectileCount" : 1, | ||
| "fireType" : "auto", | ||
|
|
||
| "projectileType" : "bullet-1", | ||
| "projectileParameters" : { | ||
| "speed" : 90, | ||
| "knockback" : 15, | ||
| "damageKind" : "bow" | ||
| }, | ||
| "stances" : { | ||
| "idle" : { | ||
| "armRotation" : 0, | ||
| "weaponRotation" : 0, | ||
| "twoHanded" : true, | ||
|
|
||
| "allowRotate" : true, | ||
| "allowFlip" : true | ||
| }, | ||
| "fire" : { | ||
| "duration" : 0, | ||
| "armRotation" : 5, | ||
| "weaponRotation" : 5, | ||
| "twoHanded" : true, | ||
|
|
||
| "allowRotate" : false, | ||
| "allowFlip" : false | ||
| }, | ||
| "cooldown" : { | ||
| "duration" : 0.075, | ||
| "armRotation" : 5, | ||
| "weaponRotation" : 5, | ||
| "twoHanded" : true, | ||
|
|
||
| "allowRotate" : false, | ||
| "allowFlip" : false | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "critChance" : 1, | ||
| "critBonus" : 25, | ||
| "isSniper" : 1, | ||
| "isAmmoBased" : 1, | ||
| "magazineSize" : 7, | ||
| "reloadTime" : 1.8, | ||
| "altAbilityType" : "hailstrikealt", | ||
|
|
||
| "builder" : "/items/buildscripts/buildunrandweapon.lua" | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.