Crystal Gun Troubleshooting sayterdarkwynd#1

Changed the ability and the projectile to not use the same name Passed the gun's image through ECT just to be sure
ParrotParrot · Nov 18, 2017 · e3fe2c8 · e3fe2c8
1 parent b449783
commit e3fe2c8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/items/active/weapons/other/skittlegun/skittlegun.activeitem b/items/active/weapons/other/skittlegun/skittlegun.activeitem
@@ -38,7 +38,7 @@
 	"projectileData": {
 		"primary": {
 			"common": ["proximitymine", "<element>proximityminestatus", "stickygrenade", "<element>stickygrenadestatus", "acidgrenade", "bouncyclustergrenade", "<element>cloudgrenade", "clustergrenade", "gravitybomb", "erchiuscluster", "<element>plasmaimpactgrenade", "impactgrenade", "marioball", "mouse", "nailbomb", "pig", "pill", "shockbomb", "shrapnelbomb", "spikeball", "splitter", "thorngrenade", "cultistmolotov"],
-			"rare": ["copperbomb", "ironbomb", "silverbomb", "goldbomb", "diamondbomb", "hivebomb", "crystalbomb", "bellamortebomb", "gravbomb", "antigravbomb", "nailbomb", "stickblastingdynamite","kheraegrenade"]
+			"rare": ["copperbomb", "ironbomb", "silverbomb", "goldbomb", "diamondbomb", "hivebomb", "crystalbombp", "bellamortebomb", "gravbomb", "antigravbomb", "nailbomb", "stickblastingdynamite","kheraegrenade"]
 		},
 		"alt": {
 			"common": ["magnorb", "magnorbatropus", "magnorbatropus2", "magnorbfrost", "magnorblunari", "magnorbmoonstone", "magnorbneutron", "magnorbproto", "magnorbshadow", "magnorbshadow2", "magnorbshadow3", "magnorbshadow4", "magnorbslime"],

diff --git a/items/active/weapons/ranged/abilities/crystalbomb.weaponability b/items/active/weapons/ranged/abilities/crystalbomb.weaponability
@@ -12,7 +12,7 @@
     "scripts" : ["/items/active/weapons/ranged/abilities/altfire.lua"],
     "class" : "AltFireAttack",
 
-    "projectileType" : "crystalbomb",
+    "projectileType" : "crystalbombp",
     "projectileParameters" : { },
 
     "baseDamage" : 3,

diff --git a/items/active/weapons/ranged/unique/crystalgun.activeitem b/items/active/weapons/ranged/unique/crystalgun.activeitem
@@ -9,8 +9,8 @@
   "category" : "shotgun",
   "level" : 3,
   "tooltipKind" : "gun2",
-  "weaponType" : "Crystalline",
-  "itemTags" : ["weapon","ranged","shotgun", "upgradeableWeapon"],
+  "weaponType" : "Crystal Weapon",
+  "itemTags" : ["weapon", "ranged", "shotgun", "upgradeableWeapon"],
   "twoHanded" : true,
 
   "animation" : "/items/active/weapons/ranged/gun.animation",
@@ -52,27 +52,27 @@
     },
     "stances" : {
       "idle":{  
-        "armRotation":0,
-        "weaponRotation":0,
-        "twoHanded":true,
-        "allowRotate":true,
-        "allowFlip":true
+        "armRotation": 0,
+        "weaponRotation": 0,
+        "twoHanded": true,
+        "allowRotate": true,
+        "allowFlip": true
       },
       "fire":{  
-        "duration":0.1,
-        "armRotation":3,
-        "weaponRotation":8,
-        "twoHanded":true,
-        "allowRotate":false,
-        "allowFlip":true
+        "duration": 0.1,
+        "armRotation": 3,
+        "weaponRotation": 8,
+        "twoHanded": true,
+        "allowRotate": false,
+        "allowFlip": true
       },
       "cooldown":{  
-        "duration":0.3,
-        "armRotation":-7,
-        "weaponRotation":-360,
-        "twoHanded":true,
-        "allowRotate":false,
-        "allowFlip":true
+        "duration": 0.3,
+        "armRotation": -7,
+        "weaponRotation": -355,
+        "twoHanded": true,
+        "allowRotate": false,
+        "allowFlip": true
       }
     }
   },

diff --git a/items/active/weapons/ranged/unique/crystalgun.png b/items/active/weapons/ranged/unique/crystalgun.png
diff --git a/projectiles/guns/crystalbomb/crystalbomb.png b/projectiles/guns/crystalbomb/crystalbomb.png
diff --git a/...tiles/guns/crystalbomb/crystalbomb.frames → ...iles/guns/crystalbomb/crystalbombp.frames b/...tiles/guns/crystalbomb/crystalbomb.frames → ...iles/guns/crystalbomb/crystalbombp.frames
diff --git a/projectiles/guns/crystalbomb/crystalbombp.png b/projectiles/guns/crystalbomb/crystalbombp.png
diff --git a/...s/guns/crystalbomb/crystalbomb.projectile → .../guns/crystalbomb/crystalbombp.projectile b/...s/guns/crystalbomb/crystalbomb.projectile → .../guns/crystalbomb/crystalbombp.projectile
@@ -1,11 +1,11 @@
 {
-  "projectileName" : "crystalbomb",
+  "projectileName" : "crystalbombp",
   "physics" : "grenade",
   "bounces" : 0,
   "timeToLive" : 3,
   "speed" : 50,
   "damageKindImage" : "icon.png",
-  "image" : "crystalbomb.png",
+  "image" : "crystalbombp.png",
   "animationCycle" : 0.1,
   "frameNumber" : 2,
   "actionOnReap" : [