-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
---Props--- - Added Turret Chair Tram. - Added Small Yellow Alarm. - Added Small Red Alarm. - Added Knightfall Bar Set. - Added Aquarium. - Added Snail Terrarium. - Added 3 Munitions Crate types. - Added 4 Placed Ammunition props. - Added HE Shell front and back facing props. - Large ammunition props can now be placed in an upright position. - Sprite adjustments to the Reinforced and Hazard crate types. - Slight adjustments to the Glass Door sprite. - Slight adjustments to the Weapons Locker. - Numerous icon changes. ---Weapons--- - Added Justicar Zweihander. - Vortex Shotgun is now available in the Weapons Assembler. - Removed Swarmguider, Havoc, Hailstorm, Firestarter, and Duskcloud recipes from their respective crafting tables. - Added Ravage ability to the Ravager. - Added alt-fire abilities to the Raven, Tomahawk, Foxhound, Snapback, Skyross, Thumper, Shellbourne, Fragmenter, Firestarter, Hoplite, Spitfire, and Orion. - Buffed Comet base damage. - Transferred Medicframe Aeroscorn, Bishop, Nebulizer, Medic's Axe, and Medic's Dagger. ---Augments--- - Increased Augmented, Drone, and Berserker thresholds from 25% to 35% health. ---Armor--- - Transferred Medicframe Armor. ---Monsters--- - Added Knightfall Augmented Mother Poptop ---Items--- - Nanite Injector has been renamed to Healing Stims. Heals for 125 health on use. - Medicframe Grenades now heal for 125 health on detonation. Heals ALL entities in the area.
- Loading branch information
1 parent
575f3ce
commit 157f300
Showing
389 changed files
with
8,022 additions
and
287 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
...active/vehiclecontroller/knightfall_turretchairtram/knightfall_turretchairtram.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,23 @@ | ||
{ | ||
"itemName" : "knightfall_turretchairtram", | ||
"level" : 1, | ||
"price" : 1000, | ||
"rarity" : "Rare", | ||
"category" : "railPlatform", | ||
"description" : "A chair mounted on a tram used to get operators to a turret's interface.", | ||
"shortdescription" : "Turret Chair", | ||
"twoHanded" : true, | ||
"maxStack" : 10, | ||
|
||
"inventoryIcon" : "icon.png", | ||
|
||
"scripts" : ["/items/active/unsorted/railplatform/railplatform.lua"], | ||
"animationScripts" : ["/items/active/unsorted/railplatform/placementpreview.lua"], | ||
|
||
"placementRange" : 15, | ||
"placementBounds" : [-2.5, -0.25, 2.5, 3.75], | ||
"placementPreviewImage" : "/items/active/vehiclecontroller/knightfall_turretchairtram/knightfall_turretchairtrampreview.png", | ||
"previewOffset" : [0, 2.0], | ||
|
||
"platformType" : "knightfall_turretchairtram" | ||
} |
Binary file added
BIN
+650 Bytes
...iclecontroller/knightfall_turretchairtram/knightfall_turretchairtrampreview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions
77
items/active/weapons/melee/abilities/axe/ravage/ravage-old.lua
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,77 @@ | ||
require "/scripts/util.lua" | ||
require "/items/active/weapons/weapon.lua" | ||
|
||
BladeCharge = WeaponAbility:new() | ||
|
||
function BladeCharge:init() | ||
BladeCharge:reset() | ||
|
||
self.cooldownTimer = 0 | ||
end | ||
|
||
function BladeCharge:update(dt, fireMode, shiftHeld) | ||
WeaponAbility.update(self, dt, fireMode, shiftHeld) | ||
|
||
self.cooldownTimer = math.max(0, self.cooldownTimer - self.dt) | ||
|
||
if self.cooldownTimer == 0 and not self.weapon.currentAbility and not status.resourceLocked("energy") and self.fireMode == "alt" then | ||
self:setState(self.windup) | ||
end | ||
end | ||
|
||
function BladeCharge:windup() | ||
self.weapon:setStance(self.stances.windup) | ||
|
||
animator.setAnimationState("bladeCharge", "charge") | ||
animator.setParticleEmitterActive("bladeCharge", true) | ||
|
||
local chargeTimer = self.chargeTime | ||
while self.fireMode == "alt" do | ||
|
||
if not animator.animationState("blade"):find("empowered-") then | ||
animator.setAnimationState("blade", "empowered-extend") -- dirtyfix.jayson.mp4 | ||
end | ||
|
||
chargeTimer = math.max(0, chargeTimer - self.dt) | ||
if chargeTimer == 0 then | ||
animator.setGlobalTag("bladeDirectives", "border=1;"..self.chargeBorder..";00000000") | ||
end | ||
|
||
-- stop it from rotating around endlessly | ||
if self.stances.windup.maxArmRotation then | ||
self.weapon.relativeArmRotation = math.min(self.weapon.relativeArmRotation, math.rad(self.stances.windup.maxArmRotation)) | ||
end | ||
coroutine.yield() | ||
end | ||
|
||
if chargeTimer == 0 and status.overConsumeResource("energy", self.energyUsage) then | ||
self:setState(self.slash) | ||
end | ||
end | ||
|
||
function BladeCharge:slash() | ||
self.weapon:setStance(self.stances.slash) | ||
self.weapon:updateAim() | ||
|
||
animator.setAnimationState("bladeCharge", "idle") | ||
animator.setParticleEmitterActive("bladeCharge", false) | ||
animator.setAnimationState("swoosh", "slash") | ||
animator.playSound("swing") | ||
|
||
util.wait(self.stances.slash.duration, function() | ||
local damageArea = partDamageArea("swoosh") | ||
self.weapon:setDamage(self.damageConfig, damageArea) | ||
end) | ||
|
||
self.cooldownTimer = self.cooldownTime | ||
end | ||
|
||
function BladeCharge:reset() | ||
animator.setGlobalTag("bladeDirectives", "") | ||
animator.setParticleEmitterActive("bladeCharge", false) | ||
animator.setAnimationState("bladeCharge", "idle") | ||
end | ||
|
||
function BladeCharge:uninit() | ||
self:reset() | ||
end |
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
Oops, something went wrong.