FILES ----- items\active\weapons\bossdrop\dragonhead\dragonhead.activeitem items\active\weapons\bossdrop\dragonhead\dragonhead.animation items\active\weapons\bossdrop\kluexstaff\kluexstaff.activeitem items\active\weapons\bossdrop\kluexstaff\kluexstaff.animation items\active\weapons\protectorate\feroziumstaff\feroziumstaff.activeitem items\active\weapons\staff\staff.animation items\active\weapons\staff\abilities\effectzone\effectzone.lua items\active\weapons\staff\generated\generatedstaff.animation items\active\weapons\wand\wand.animation items\active\weapons\wand\generated\generatedwand.animation monsters\fishing\fishingmonster.animation monsters\fishing\hookedState.lua monsters\fishing\landedState.lua monsters\fishing\large\chuckle\fishingchuckle.monstertype monsters\fishing\large\hoop\fishinghoop.monstertype monsters\fishing\large\sunbeam\fishingsunbeam.monstertype monsters\fishing\medium\chomp\fishingchomp.monstertype monsters\fishing\medium\funny\fishingfunny.monstertype monsters\fishing\medium\jaw\fishingjaw.monstertype [NEW] monsters\fishing\medium\redeye\fishingredeye.monsterpart [NEW] monsters\fishing\medium\redeye\fishingredeye.monstertype [NEW] monsters\fishing\medium\redeye\fishingredeye.png monsters\fishing\medium\square\fishingsquare.monstertype monsters\fishing\medium\tongue\fishingtongue.monstertype monsters\fishing\small\dirt\fishingdirt.monstertype monsters\fishing\small\frill\fishingfrill.monstertype monsters\fishing\small\jerk\fishingjerk.monstertype monsters\fishing\small\worm\fishingworm.monstertype monsters\walkers\nutmidge\nutmidge.animation projectiles\activeitems\dragonfire\dragonfirelarge.projectile projectiles\activeitems\dragonfire\dragonfiresmall.projectile projectiles\activeitems\staff\energyzone\energyzone.projectile projectiles\activeitems\staff\forcecage\forcecage.projectile projectiles\activeitems\staff\healingzone\healingzone.projectile projectiles\activeitems\staff\kluexzone\kluexzone.projectile projectiles\activeitems\staff\lowgravzone\lowgravzone.projectile projectiles\activeitems\staff\pullzone\pullzone.projectile projectiles\activeitems\staff\pushzone\pushzone.projectile projectiles\activeitems\staff\slowzone\slowzone.projectile scripts\fishing\fishingspawner.config scripts\fishing\fishingspawner.lua [NEW] sfx\gun\dragonhead_charge1.ogg [NEW] sfx\gun\dragonhead_charge2.ogg [NEW] sfx\gun\dragonhead_charged_fire1.ogg [NEW] sfx\gun\dragonhead_charged_fire2.ogg [NEW] sfx\gun\dragonhead_charged_fire3.ogg [NEW] sfx\gun\dragonhead_charged_fire4.ogg [NEW] sfx\gun\dragonhead_fire1.ogg [NEW] sfx\melee\staff_aura_activate.ogg [NEW] sfx\projectiles\forcecage_loop.ogg [NEW] sfx\projectiles\zone_energy_loop.ogg [NEW] sfx\projectiles\zone_healing_loop.ogg [NEW] sfx\projectiles\zone_lowgrav_loop.ogg [NEW] sfx\projectiles\zone_power_loop.ogg [NEW] sfx\projectiles\zone_pull_loop.ogg [NEW] sfx\projectiles\zone_push_loop.ogg [NEW] sfx\projectiles\zone_slow_loop.ogg [NEW] sfx\tech\vehicle_disappear2.ogg sfx\tools\rod_unreel_loop.ogg stats\effects\lowgrav\lowgrav.animation stats\effects\lowgrav\lowgrav.lua stats\effects\rage\enemyrage.lua stats\effects\rage\rage.animation stats\effects\rage\rage.lua DIFFS ----- items\active\weapons\bossdrop\dragonhead\dragonhead.activeitem 48c48 < "baseDamage" : 12, --- > "baseDamage" : 9, items\active\weapons\bossdrop\dragonhead\dragonhead.animation 12c12,16 < "transition" : "fullcharge" --- > "transition" : "fullcharge", > "properties" : { > "persistentSound" : "/sfx/gun/dragonhead_charge2.ogg", > "persistentSoundStopTime" : 0.5 > } 105,106c109,110 < "fire" : ["/sfx/projectiles/fireball_poof.ogg"], < "fire2" : ["/sfx/projectiles/fireball_spit.ogg"] --- > "fire" : [ "/sfx/gun/dragonhead_fire1.ogg" ], > "fire2" : [ "/sfx/gun/dragonhead_charged_fire1.ogg", "/sfx/gun/dragonhead_charged_fire1.ogg", "/sfx/gun/dragonhead_charged_fire1.ogg", "/sfx/gun/dragonhead_charged_fire2.ogg", "/sfx/gun/dragonhead_charged_fire3.ogg", "/sfx/gun/dragonhead_charged_fire4.ogg" ] items\active\weapons\bossdrop\kluexstaff\kluexstaff.activeitem 39c39 < "physicalactivate" : ["/sfx/npc/boss/cultistboss_recharge.ogg"] --- > "physicalactivate" : ["/sfx/melee/staff_aura_activate.ogg"] items\active\weapons\bossdrop\kluexstaff\kluexstaff.animation 126c126,128 < "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"] --- > "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"], > > "zoneactivate" : ["/sfx/melee/staff_aura_activate.ogg"] items\active\weapons\protectorate\feroziumstaff\feroziumstaff.activeitem 28c28,29 < "physicalactivate" : ["/sfx/npc/boss/cultistboss_recharge.ogg"] --- > "physicalactivate" : ["/sfx/npc/boss/cultistboss_recharge.ogg"], > "zoneactivate" : ["/sfx/melee/giantsword_charge_full.ogg"] items\active\weapons\staff\staff.animation 192c192,194 < "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"] --- > "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"], > > "zoneactivate" : ["/sfx/melee/staff_aura_activate.ogg"] items\active\weapons\staff\abilities\effectzone\effectzone.lua 89c89 < animator.playSound(self.elementalType.."activate") --- > animator.playSound("zoneactivate") items\active\weapons\staff\generated\generatedstaff.animation 202c202,204 < "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"] --- > "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"], > > "zoneactivate" : ["/sfx/melee/staff_aura_activate.ogg"] items\active\weapons\wand\wand.animation 192c192,194 < "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"] --- > "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"], > > "zoneactivate" : ["/sfx/melee/staff_aura_activate.ogg"] items\active\weapons\wand\generated\generatedwand.animation 205c205,207 < "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"] --- > "poisonactivate" : ["/sfx/melee/travelingslash_poison3.ogg"], > > "zoneactivate" : ["/sfx/melee/staff_aura_activate.ogg"] monsters\fishing\fishingmonster.animation 13c13 < "panic" : { --- > "panicFast" : { 17a18,22 > "panicSlow" : { > "frames" : 4, > "cycle" : 0.4, > "mode" : "loop" > }, 47c52,57 < "panic" : { --- > "panicFast" : { > "properties" : { > "image" : ":panic." > } > }, > "panicSlow" : { monsters\fishing\hookedState.lua 8a9 > fight = false, 15c16 < animator.setAnimationState("movement", "panic") --- > animator.setAnimationState("movement", "panicFast") 25,26c26,27 < stateData.struggleTimer = util.randomInRange(config.getParameter("struggleTimeRange", {0.4, 1.2})) < stateData.struggleDirection = {util.randomDirection(), -math.random()} --- > stateData.struggleTimer = util.randomInRange(config.getParameter("struggleTimeRange", {0.7, 1.2})) > stateData.struggleAngle = vec2.angle(toRod) + math.pi + (math.random() - 0.5) * 1 28d28 < move(stateData.struggleDirection, true, "panic") 30,33c30,37 < if self.controls.reel then < mcontroller.controlApproachVelocityAlongAngle(vec2.angle(toRod), self.reelParameters.reelSpeed, self.swimForce * 1.15) < elseif not self.controls.down then < mcontroller.controlApproachVelocityAlongAngle(vec2.angle(toRod), 0, self.swimForce * 0.95) --- > local rodAngle = vec2.angle(toRod) > local diff = util.angleDiff(stateData.struggleAngle, rodAngle) > local moveAngle = rodAngle + diff * (self.controls.reel and 0.4 or 0.7) > > local samplePoint = vec2.add(mcontroller.position(), vec2.withAngle(moveAngle, 3)) > world.debugPoint(samplePoint, "blue") > if not world.liquidAt(samplePoint) then > stateData.struggleAngle = (stateData.struggleAngle + 2 * diff) % (2 * math.pi) 34a39,40 > > move(vec2.withAngle(moveAngle), true, "panicFast") monsters\fishing\landedState.lua 16c16 < animator.setAnimationState("movement", "panic") --- > animator.setAnimationState("movement", "panicSlow") monsters\fishing\large\chuckle\fishingchuckle.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\large\hoop\fishinghoop.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\large\sunbeam\fishingsunbeam.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\medium\chomp\fishingchomp.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\medium\funny\fishingfunny.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\medium\jaw\fishingjaw.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\medium\square\fishingsquare.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\medium\tongue\fishingtongue.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\small\dirt\fishingdirt.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\small\frill\fishingfrill.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\small\jerk\fishingjerk.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\fishing\small\worm\fishingworm.monstertype 72c72 < "minimumLiquidStatusEffectPercentage" : 0.1, --- > "minimumLiquidStatusEffectPercentage" : 1.1, monsters\walkers\nutmidge\nutmidge.animation 209c209 < "deathPuff" : [ "/sfx/melee/kill_wood1.ogg" ], --- > "deathPuff" : [ "/sfx/melee/fist_stronghit_wood1.ogg", "/sfx/melee/fist_stronghit_wood2.ogg", "/sfx/melee/fist_stronghit_wood3.ogg" ], projectiles\activeitems\dragonfire\dragonfirelarge.projectile 7,8c7,14 < "lightColor" : [218, 83, 2], < "actionOnReap" : [], --- > "damagePoly" : [ [-9, 0], [-6, -6], [0, -9], [6, -6], [9, 0], [6, 6], [0, 9], [-6, 6] ], > "lightColor" : [235, 126, 2], > "actionOnReap" : [ > { > "action" : "config", > "file" : "/projectiles/explosions/vsmallregularexplosion/vsmallregularexplosionnodamage.config" > } > ], 12c18,25 < "damageKind" : "fireplasma" --- > "damageKind" : "fireplasma", > "damageKindImage" : "/interface/statuses/fire.png", > "statusEffects" : [ > "burning" > ], > "hydrophobic" : true, > "persistentAudio" : "/sfx/projectiles/dragonprojectile_loop.ogg", > "emitters" : [ "fireplasma", "smoke", "flames" ] projectiles\activeitems\dragonfire\dragonfiresmall.projectile 7,8c7,13 < "lightColor" : [128, 48, 1], < "actionOnReap" : [], --- > "lightColor" : [153, 82, 2], > "actionOnReap" : [ > { > "action" : "config", > "file" : "/projectiles/explosions/plasmabulletexplosion/plasmabulletexplosion.config" > } > ], 12c17,18 < "damageKind" : "fireplasma" --- > "damageKind" : "fireplasma", > "emitters" : [ "fireplasma" ] projectiles\activeitems\staff\energyzone\energyzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 27c34,36 < "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"] --- > "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"], > > "persistentAudio" : "/sfx/projectiles/zone_energy_loop.ogg" projectiles\activeitems\staff\forcecage\forcecage.projectile 10c10,17 < "periodicActions" : [ ], --- > "periodicActions" : [ > { > "time" : 4.8, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear2.ogg" ] > } > ], 49c56,58 < "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ] --- > "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ], > > "persistentAudio" : "/sfx/projectiles/forcecage_loop.ogg" projectiles\activeitems\staff\healingzone\healingzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 27,28c34,37 < "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"] < } --- > "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"], > > "persistentAudio" : "/sfx/projectiles/zone_healing_loop.ogg" > } \ No newline at end of file projectiles\activeitems\staff\kluexzone\kluexzone.projectile 4c4 < "timeToLive" : 8, --- > "timeToLive" : 10, 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 27c34,36 < "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"] --- > "scripts" : ["/projectiles/activeitems/staff/staffprojectile.lua"], > > "persistentAudio" : "/sfx/projectiles/zone_power_loop.ogg" projectiles\activeitems\staff\lowgravzone\lowgravzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 27c34,36 < "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ] --- > "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ], > > "persistentAudio" : "/sfx/projectiles/zone_lowgrav_loop.ogg" projectiles\activeitems\staff\pullzone\pullzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 35c42,44 < "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ] --- > "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ], > > "persistentAudio" : "/sfx/projectiles/zone_pull_loop.ogg" projectiles\activeitems\staff\pushzone\pushzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 35c42,44 < "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ] --- > "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ], > > "persistentAudio" : "/sfx/projectiles/zone_push_loop.ogg" projectiles\activeitems\staff\slowzone\slowzone.projectile 10c10,17 < "periodicActions" : [], --- > "periodicActions" : [ > { > "time" : 9.7, > "repeat" : false, > "action" : "sound", > "options" : [ "/sfx/tech/vehicle_disappear1.ogg" ] > } > ], 27c34,36 < "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ] --- > "scripts" : [ "/projectiles/activeitems/staff/staffprojectile.lua" ], > > "persistentAudio" : "/sfx/projectiles/zone_slow_loop.ogg" scripts\fishing\fishingspawner.config 15c15 < "deepDepth" : 25, --- > "deepDepth" : 20, 24c24 < "deep" : true --- > "deep" : false 37c37 < "shallow" : true, --- > "shallow" : false, 47c47 < "deep" : true --- > "deep" : false 61c61 < "deep" : true --- > "deep" : false 67c67 < "shallow" : true, --- > "shallow" : false, 77c77 < "deep" : true --- > "deep" : false 83c83 < "shallow" : true, --- > "shallow" : false, 108a109,156 > ] > }, > "arctic" : { > "common" : [ > > ], > "uncommon" : [ > > ], > "rare" : [ > > ], > "legendary" : [ > > ] > }, > "toxic" : { > "common" : [ > { > "monster" : "fishingredeye", > "day" : true, > "night" : true, > "shallow" : true, > "deep" : true > } > ], > "uncommon" : [ > > ], > "rare" : [ > > ], > "legendary" : [ > > ] > }, > "magma" : { > "common" : [ > > ], > "uncommon" : [ > > ], > "rare" : [ > > ], > "legendary" : [ > scripts\fishing\fishingspawner.lua 33,35c33,40 < local function getSpawnType() < local shallow = true -- TODO < local deep = true -- TODO --- > local function getSpawnType(pos) > local shallow, deep > local deepLevel = world.oceanLevel(pos) - spawnerConfig.deepDepth > if pos[2] < deepLevel then > shallow, deep = false, true > else > shallow, deep = true, false > end 41c46 < local biome = "ocean" -- TODO --- > local biome = world.type() 63c68 < local spawnType = getSpawnType() --- > local spawnType = getSpawnType(spawnPosition) stats\effects\lowgrav\lowgrav.animation 26c26,27 < }, --- > } > /* 51a53 > */ stats\effects\lowgrav\lowgrav.lua 19,23d18 < < local statusTextRegion = { 0, 1, 0, 1 } < animator.setParticleEmitterOffsetRegion("statustext", statusTextRegion) < animator.burstParticleEmitter("statustext") < stats\effects\rage\enemyrage.lua 12,15d11 < < local statusTextRegion = { 0, 1, 0, 1 } < animator.setParticleEmitterOffsetRegion("statustext", statusTextRegion) < animator.burstParticleEmitter("statustext") stats\effects\rage\rage.animation 26c26,27 < }, --- > } > /* 51a53 > */ stats\effects\rage\rage.lua 9,14d8 < < local statusTextRegion = { 0, 1, 0, 1 } < animator.setParticleEmitterOffsetRegion("statustext", statusTextRegion) < if enableParticles then < animator.burstParticleEmitter("statustext") < end