diff --git a/main.lua b/main.lua index 2ae2448..2ac867e 100644 --- a/main.lua +++ b/main.lua @@ -238,40 +238,40 @@ function init() class_colors = { ['warrior'] = yellow[0], - ['ranger'] = green[0], + ['ranger'] = green2[0], ['healer'] = green[0], ['conjurer'] = orange[0], ['mage'] = blue[0], ['nuker'] = red[0], - ['rogue'] = red[0], - ['enchanter'] = blue[0], + ['rogue'] = red2[0], + ['enchanter'] = blue3[0], ['psyker'] = fg[0], ['curser'] = purple[0], - ['forcer'] = yellow[0], - ['swarmer'] = orange[0], - ['voider'] = purple[0], + ['forcer'] = brown[0], + ['swarmer'] = brown2[0], + ['voider'] = purple2[0], ['sorcerer'] = blue2[0], ['mercenary'] = yellow2[0], - ['explorer'] = fg[0], + ['explorer'] = fg_alt[0], } class_color_strings = { ['warrior'] = 'yellow', - ['ranger'] = 'green', + ['ranger'] = 'green2', ['healer'] = 'green', ['conjurer'] = 'orange', ['mage'] = 'blue', ['nuker'] = 'red', - ['rogue'] = 'red', - ['enchanter'] = 'blue', + ['rogue'] = 'red2', + ['enchanter'] = 'blue3', ['psyker'] = 'fg', ['curser'] = 'purple', - ['forcer'] = 'yellow', - ['swarmer'] = 'orange', - ['voider'] = 'purple', + ['forcer'] = 'brown', + ['swarmer'] = 'brown2', + ['voider'] = 'purple2', ['sorcerer'] = 'blue2', ['mercenary'] = 'yellow2', - ['explorer'] = 'fg', + ['explorer'] = 'fg_alt', } character_names = { @@ -335,123 +335,123 @@ function init() } character_colors = { - ['vagrant'] = fg[0], + ['vagrant'] = fg_alt[0], ['swordsman'] = yellow[0], ['wizard'] = blue[0], ['magician'] = blue[0], - ['archer'] = green[0], - ['scout'] = red[0], + ['archer'] = green2[0], + ['scout'] = red2[0], ['cleric'] = green[0], - ['outlaw'] = red[0], + ['outlaw'] = red2[0], ['blade'] = yellow[0], ['elementor'] = blue[0], ['saboteur'] = orange[0], ['bomber'] = orange[0], - ['stormweaver'] = blue[0], - ['sage'] = purple[0], - ['squire'] = yellow[0], - ['cannoneer'] = orange[0], - ['dual_gunner'] = green[0], - ['hunter'] = green[0], - ['sentry'] = green[0], - ['chronomancer'] = blue[0], + ['stormweaver'] = blue3[0], + ['sage'] = brown[0], + ['squire'] = blue3[0], + ['cannoneer'] = red[0], + ['dual_gunner'] = green2[0], + ['hunter'] = green2[0], + ['sentry'] = green2[0], + ['chronomancer'] = blue3[0], ['spellblade'] = blue[0], ['psykeeper'] = fg[0], ['engineer'] = orange[0], - ['plague_doctor'] = purple[0], + ['plague_doctor'] = purple2[0], ['barbarian'] = yellow[0], - ['juggernaut'] = yellow[0], + ['juggernaut'] = brown[0], ['lich'] = blue[0], ['cryomancer'] = blue[0], ['pyromancer'] = red[0], - ['corruptor'] = orange[0], - ['beastmaster'] = red[0], - ['launcher'] = yellow[0], - ['jester'] = red[0], - ['assassin'] = purple[0], - ['host'] = orange[0], + ['corruptor'] = brown2[0], + ['beastmaster'] = brown2[0], + ['launcher'] = brown[0], + ['jester'] = red2[0], + ['assassin'] = purple2[0], + ['host'] = brown2[0], ['carver'] = green[0], - ['bane'] = purple[0], + ['bane'] = purple2[0], ['psykino'] = fg[0], - ['barrager'] = green[0], + ['barrager'] = green2[0], ['highlander'] = yellow[0], ['fairy'] = green[0], ['priest'] = green[0], - ['infestor'] = orange[0], + ['infestor'] = brown2[0], ['flagellant'] = fg[0], ['arcanist'] = blue2[0], ['illusionist'] = blue2[0], ['artificer'] = blue2[0], - ['witch'] = purple[0], + ['witch'] = purple2[0], ['silencer'] = blue2[0], ['vulcanist'] = red[0], - ['warden'] = yellow[0], + ['warden'] = brown[0], ['psychic'] = fg[0], ['miner'] = yellow2[0], ['merchant'] = yellow2[0], - ['usurer'] = purple[0], + ['usurer'] = purple2[0], ['gambler'] = yellow2[0], - ['thief'] = red[0], + ['thief'] = red2[0], } character_color_strings = { - ['vagrant'] = 'fg', + ['vagrant'] = 'fg_alt', ['swordsman'] = 'yellow', ['wizard'] = 'blue', ['magician'] = 'blue', - ['archer'] = 'green', - ['scout'] = 'red', + ['archer'] = 'green2', + ['scout'] = 'red2', ['cleric'] = 'green', - ['outlaw'] = 'red', + ['outlaw'] = 'red2', ['blade'] = 'yellow', ['elementor'] = 'blue', ['saboteur'] = 'orange', ['bomber'] = 'orange', - ['stormweaver'] = 'blue', - ['sage'] = 'purple', - ['squire'] = 'yellow', - ['cannoneer'] = 'orange', - ['dual_gunner'] = 'green', - ['hunter'] = 'green', - ['sentry'] = 'green', - ['chronomancer'] = 'blue', + ['stormweaver'] = 'blue3', + ['sage'] = 'brown', + ['squire'] = 'blue3', + ['cannoneer'] = 'red', + ['dual_gunner'] = 'green2', + ['hunter'] = 'green2', + ['sentry'] = 'green2', + ['chronomancer'] = 'blue3', ['spellblade'] = 'blue', ['psykeeper'] = 'fg', ['engineer'] = 'orange', - ['plague_doctor'] = 'purple', + ['plague_doctor'] = 'purple2', ['barbarian'] = 'yellow', - ['juggernaut'] = 'yellow', + ['juggernaut'] = 'brown', ['lich'] = 'blue', ['cryomancer'] = 'blue', ['pyromancer'] = 'red', - ['corruptor'] = 'orange', - ['beastmaster'] = 'red', - ['launcher'] = 'yellow', - ['jester'] = 'red', - ['assassin'] = 'purple', - ['host'] = 'orange', + ['corruptor'] = 'brown2', + ['beastmaster'] = 'brown2', + ['launcher'] = 'brown', + ['jester'] = 'red2', + ['assassin'] = 'purple2', + ['host'] = 'brown2', ['carver'] = 'green', - ['bane'] = 'purple', + ['bane'] = 'purple2', ['psykino'] = 'fg', - ['barrager'] = 'green', + ['barrager'] = 'green2', ['highlander'] = 'yellow', ['fairy'] = 'green', ['priest'] = 'green', - ['infestor'] = 'orange', + ['infestor'] = 'brown2', ['flagellant'] = 'fg', ['arcanist'] = 'blue2', ['illusionist'] = 'blue2', ['artificer'] = 'blue2', - ['witch'] = 'purple', + ['witch'] = 'purple2', ['silencer'] = 'blue2', ['vulcanist'] = 'red', - ['warden'] = 'yellow', + ['warden'] = 'brown', ['psychic'] = 'fg', ['miner'] = 'yellow2', ['merchant'] = 'yellow2', - ['usurer'] = 'purple', + ['usurer'] = 'purple2', ['gambler'] = 'yellow2', - ['thief'] = 'red', + ['thief'] = 'red2', } character_classes = { @@ -514,64 +514,65 @@ function init() ['thief'] = {'rogue', 'mercenary'}, } + character_class_strings = { - ['vagrant'] = '[fg]Explorer, Psyker', + ['vagrant'] = '[fg_alt]Explorer, [fg]Psyker', ['swordsman'] = '[yellow]Warrior', ['wizard'] = '[blue]Mage, [red]Nuker', ['magician'] = '[blue]Mage', - ['archer'] = '[green]Ranger', - ['scout'] = '[red]Rogue', + ['archer'] = '[green2]Ranger', + ['scout'] = '[red2]Rogue', ['cleric'] = '[green]Healer', - ['outlaw'] = '[yellow]Warrior, [red]Rogue', + ['outlaw'] = '[yellow]Warrior, [red2]Rogue', ['blade'] = '[yellow]Warrior, [red]Nuker', ['elementor'] = '[blue]Mage, [red]Nuker', - -- ['saboteur'] = '[red]Rogue, [orange]Conjurer, [red]Nuker', + -- ['saboteur'] = '[red2]Rogue, [orange]Conjurer, [red]Nuker', ['bomber'] = '[red]Nuker, [orange]Builder', - ['stormweaver'] = '[blue]Enchanter', - ['sage'] = '[red]Nuker, [yellow]Forcer', - ['squire'] = '[yellow]Warrior, [blue]Enchanter', - ['cannoneer'] = '[green]Ranger, [red]Nuker', - ['dual_gunner'] = '[green]Ranger, [red]Rogue', - -- ['hunter'] = '[green]Ranger, [orange]Conjurer, [yellow]Forcer', - ['sentry'] = '[green]Ranger, [orange]Builder', - ['chronomancer'] = '[blue]Mage, Enchanter', - ['spellblade'] = '[blue]Mage, [red]Rogue', + ['stormweaver'] = '[blue3]Enchanter', + ['sage'] = '[red]Nuker, [brown]Forcer', + ['squire'] = '[yellow]Warrior, [blue3]Enchanter', + ['cannoneer'] = '[green2]Ranger, [red]Nuker', + ['dual_gunner'] = '[green2]Ranger, [red]Rogue', + -- ['hunter'] = '[green2]Ranger, [orange]Conjurer, [brown]Forcer', + ['sentry'] = '[green2]Ranger, [orange]Builder', + ['chronomancer'] = '[blue]Mage, [blue3]Enchanter', + ['spellblade'] = '[blue]Mage, [red2]Rogue', ['psykeeper'] = '[green]Healer, [fg]Psyker', ['engineer'] = '[orange]Builder', - ['plague_doctor'] = '[red]Nuker, [purple]Voider', + ['plague_doctor'] = '[red]Nuker, [purple2]Voider', ['barbarian'] = '[purple]Curser, [yellow]Warrior', - ['juggernaut'] = '[yellow]Forcer, Warrior', + ['juggernaut'] = '[brown]Forcer, [yellow]Warrior', ['lich'] = '[blue]Mage', - ['cryomancer'] = '[blue]Mage, [purple]Voider', - ['pyromancer'] = '[blue]Mage, [red]Nuker, [purple]Voider', - ['corruptor'] = '[green]Ranger, [orange]Swarmer', - ['beastmaster'] = '[red]Rogue, [orange]Swarmer', - ['launcher'] = '[yellow]Forcer, [purple]Curser', - ['jester'] = '[purple]Curser, [red]Rogue', - ['assassin'] = '[red]Rogue, [purple]Voider', - ['host'] = '[orange]Swarmer', + ['cryomancer'] = '[blue]Mage, [purple2]Voider', + ['pyromancer'] = '[blue]Mage, [red]Nuker, [purple2]Voider', + ['corruptor'] = '[green2]Ranger, [brown2]Swarmer', + ['beastmaster'] = '[red2]Rogue, [brown2]Swarmer', + ['launcher'] = '[brown]Forcer, [purple]Curser', + ['jester'] = '[purple]Curser, [red2]Rogue', + ['assassin'] = '[red2]Rogue, [purple2]Voider', + ['host'] = '[brown2]Swarmer', ['carver'] = '[orange]Builder, [green]Healer', - ['bane'] = '[purple]Curser, Voider', - ['psykino'] = '[blue]Mage, [fg]Psyker, [yellow]Forcer', - ['barrager'] = '[green]Ranger, [yellow]Forcer', + ['bane'] = '[purple]Curser, [purple2]Voider', + ['psykino'] = '[blue]Mage, [fg]Psyker, [brown]Forcer', + ['barrager'] = '[green2]Ranger, [brown]Forcer', ['highlander'] = '[yellow]Warrior', - ['fairy'] = '[blue]Enchanter, [green]Healer', + ['fairy'] = '[blue3]Enchanter, [green]Healer', ['priest'] = '[green]Healer', - ['infestor'] = '[purple]Curser, [orange]Swarmer', - ['flagellant'] = '[fg]Psyker, [blue]Enchanter', + ['infestor'] = '[purple]Curser, [brown2]Swarmer', + ['flagellant'] = '[fg]Psyker, [blue3]Enchanter', ['arcanist'] = '[blue2]Sorcerer', -- ['illusionist'] = '[blue2]Sorcerer, [orange]Conjurer', ['artificer'] = '[blue2]Sorcerer, [orange]Builder', - ['witch'] = '[blue2]Sorcerer, [purple]Voider', + ['witch'] = '[blue2]Sorcerer, [purple2]Voider', ['silencer'] = '[blue2]Sorcerer, [purple]Curser', ['vulcanist'] = '[blue2]Sorcerer, [red]Nuker', - ['warden'] = '[blue2]Sorcerer, [yellow]Forcer', + ['warden'] = '[blue2]Sorcerer, [brown]Forcer', ['psychic'] = '[blue2]Sorcerer, [fg]Psyker', ['miner'] = '[yellow2]Mercenary', ['merchant'] = '[yellow2]Mercenary', - ['usurer'] = '[purple]Curser, [yellow2]Mercenary, [purple]Voider', + ['usurer'] = '[purple]Curser, [yellow2]Mercenary, [purple2]Voider', ['gambler'] = '[yellow2]Mercenary, [blue2]Sorcerer', - ['thief'] = '[red]Rogue, [yellow2]Mercenary', + ['thief'] = '[red2]Rogue, [yellow2]Mercenary', } get_character_stat_string = function(character, level) @@ -655,8 +656,8 @@ function init() ['vagrant'] = '[fg]Experience', ['swordsman'] = '[yellow]Cleave', ['wizard'] = '[blue]Magic Missile', - ['magician'] = '[blue]Ethereal Form', - ['archer'] = '[green]Bounce Shot', + ['magician'] = '[blue]Quick Cast', + ['archer'] = '[green2]Bounce Shot', ['scout'] = '[red]Dagger Resonance', ['cleric'] = '[green]Mass Heal', ['outlaw'] = '[red]Flying Daggers', @@ -664,49 +665,49 @@ function init() ['elementor'] = '[blue]Windfield', ['saboteur'] = '[orange]Demoman', ['bomber'] = '[orange]Demoman', - ['stormweaver'] = '[blue]Wide Lightning', - ['sage'] = '[purple]Dimension Compression', - ['squire'] = '[yellow]Shiny Gear', - ['cannoneer'] = '[orange]Cannon Barrage', - ['dual_gunner'] = '[green]Gun Kata', - ['hunter'] = '[green]Feral Pack', - ['sentry'] = '[green]Sentry Barrage', - ['chronomancer'] = '[blue]Quicken', + ['stormweaver'] = '[blue3]Wide Lightning', + ['sage'] = '[brown]Dimension Compression', + ['squire'] = '[blue3]Shiny Gear', + ['cannoneer'] = '[red]Cannon Barrage', + ['dual_gunner'] = '[green2]Gun Kata', + ['hunter'] = '[green2]Feral Pack', + ['sentry'] = '[green2]Sentry Barrage', + ['chronomancer'] = '[blue3]Quicken', ['spellblade'] = '[blue]Spiralism', ['psykeeper'] = '[fg]Crucio', ['engineer'] = '[orange]Upgrade!!!', - ['plague_doctor'] = '[purple]Black Death Steam', + ['plague_doctor'] = '[purple2]Black Death Steam', ['barbarian'] = '[yellow]Seism', - ['juggernaut'] = '[yellow]Brutal Impact', + ['juggernaut'] = '[brown]Brutal Impact', ['lich'] = '[blue]Chain Frost', ['cryomancer'] = '[blue]Frostbite', ['pyromancer'] = '[red]Ignite', - ['corruptor'] = '[orange]Corruption', - ['beastmaster'] = '[red]Call of the Wild', - ['launcher'] = '[orange]Kineticism', + ['corruptor'] = '[brown2]Corruption', + ['beastmaster'] = '[brown2]Call of the Wild', + ['launcher'] = '[brown]Kineticism', ['jester'] = "[red]Pandemonium", - ['assassin'] = '[purple]Toxic Delivery', - ['host'] = '[orange]Invasion', + ['assassin'] = '[purple2]Toxic Delivery', + ['host'] = '[brown2]Invasion', ['carver'] = '[green]World Tree', - ['bane'] = '[purple]Nightmare', + ['bane'] = '[purple2]Nightmare', ['psykino'] = '[fg]Magnetic Force', - ['barrager'] = '[green]Barrage', + ['barrager'] = '[green2]Barrage', ['highlander'] = '[yellow]Moulinet', ['fairy'] = '[green]Whimsy', ['priest'] = '[green]Divine Intervention', - ['infestor'] = '[orange]Infestation', + ['infestor'] = '[brown2]Infestation', ['flagellant'] = '[red]Zealotry', ['arcanist'] = '[blue2]Arcane Orb', ['illusionist'] = '[blue2]Mirror Image', ['artificer'] = '[blue2]Spell Formula Efficiency', - ['witch'] = '[purple]Death Pool', + ['witch'] = '[purple2]Death Pool', ['silencer'] = '[blue2]Arcane Curse', ['vulcanist'] = '[red]Lava Burst', - ['warden'] = '[yellow]Magnetic Field', + ['warden'] = '[brown]Magnetic Field', ['psychic'] = '[fg]Mental Strike', ['miner'] = '[yellow2]Golden Bolts', ['merchant'] = '[yellow2]Item Shop', - ['usurer'] = '[purple]Bankruptcy', + ['usurer'] = '[purple2]Bankruptcy', ['gambler'] = '[yellow2]Multicast', ['thief'] = '[red]Ultrakill', } @@ -715,7 +716,7 @@ function init() ['vagrant'] = '[light_bg]Experience', ['swordsman'] = '[light_bg]Cleave', ['wizard'] = '[light_bg]Magic Missile', - ['magician'] = '[light_bg]Ethereal Form', + ['magician'] = '[light_bg]Quick Cast', ['archer'] = '[light_bg]Bounce Shot', ['scout'] = '[light_bg]Dagger Resonance', ['cleric'] = '[light_bg]Mass Heal ', diff --git a/player.lua b/player.lua index f27bf0d..5283428 100644 --- a/player.lua +++ b/player.lua @@ -514,8 +514,8 @@ function Player:init(args) local resonance_dmg = 0 if self.resonance then resonance_dmg = (self.level == 3 and 6*self.dmg*0.05*#enemies or 2*self.dmg*0.05*#enemies) end enemy:curse('launcher', 4*(self.hex_duration_m or 1), (self.level == 3 and 6*self.dmg or 2*self.dmg) + resonance_dmg, self) - HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = yellow[0], duration = 0.1} - LightningLine{group = main.current.effects, src = self, dst = enemy, color = yellow[0]} + HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = brown[0], duration = 0.1} + LightningLine{group = main.current.effects, src = self, dst = enemy, color = brown[0]} end end end, nil, nil, 'attack') @@ -530,8 +530,8 @@ function Player:init(args) for _, enemy in ipairs(enemies) do if self:distance_to_object(enemy) < 128 then enemy:curse('jester', 6*(self.hex_duration_m or 1), self.level == 3, self) - HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = red[0], duration = 0.1} - LightningLine{group = main.current.effects, src = self, dst = enemy, color = red[0]} + HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = red2[0], duration = 0.1} + LightningLine{group = main.current.effects, src = self, dst = enemy, color = red2[0]} end end end, nil, nil, 'attack') @@ -546,8 +546,8 @@ function Player:init(args) for _, enemy in ipairs(enemies) do enemy:curse('usurer', 10000, self.level == 3, self) enemy:apply_dot(self.dmg*(self.dot_dmg_m or 1)*(main.current.chronomancer_dot or 1), 10000) - HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = purple[0], duration = 0.1} - LightningLine{group = main.current.effects, src = self, dst = enemy, color = purple[0]} + HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = purple2[0], duration = 0.1} + LightningLine{group = main.current.effects, src = self, dst = enemy, color = purple2[0]} end end, nil, nil, 'attack') @@ -596,13 +596,13 @@ function Player:init(args) self.t:every(1, function() critter1:play{pitch = random:float(0.95, 1.05), volume = 0.35} for i = 1, 2 do - Critter{group = main.current.main, x = self.x, y = self.y, color = orange[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} + Critter{group = main.current.main, x = self.x, y = self.y, color = brown2[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} end end, nil, nil, 'spawn') else self.t:every(2, function() critter1:play{pitch = random:float(0.95, 1.05), volume = 0.35} - Critter{group = main.current.main, x = self.x, y = self.y, color = orange[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} + Critter{group = main.current.main, x = self.x, y = self.y, color = brown2[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} end, nil, nil, 'spawn') end @@ -625,8 +625,8 @@ function Player:init(args) 6 + ((self.malediction == 1 and 1) or (self.malediction == 2 and 3) or (self.malediction == 3 and 5) or 0) + ((main.current.curser_level == 2 and 3) or (main.current.curser_level == 1 and 1) or 0)) for _, enemy in ipairs(enemies) do enemy:curse('bane', 6*(self.hex_duration_m or 1), self.level == 3, self) - HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = purple[0], duration = 0.1} - LightningLine{group = main.current.effects, src = self, dst = enemy, color = purple[0]} + HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = purple2[0], duration = 0.1} + LightningLine{group = main.current.effects, src = self, dst = enemy, color = purple2[0]} end end, nil, nil, 'attack') @@ -826,8 +826,8 @@ function Player:init(args) 8 + ((self.malediction == 1 and 1) or (self.malediction == 2 and 3) or (self.malediction == 3 and 5) or 0) + ((main.current.curser_level == 2 and 3) or (main.current.curser_level == 1 and 1) or 0)) for _, enemy in ipairs(enemies) do enemy:curse('infestor', 6*(self.hex_duration_m or 1), (self.level == 3 and 6 or 2), self.dmg, self) - HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = orange[0], duration = 0.1} - LightningLine{group = main.current.effects, src = self, dst = enemy, color = orange[0]} + HitCircle{group = main.current.effects, x = self.x, y = self.y, rs = 6, color = brown2[0], duration = 0.1} + LightningLine{group = main.current.effects, src = self, dst = enemy, color = brown2[0]} end end, nil, nil, 'attack') @@ -1510,7 +1510,7 @@ function Player:hit(damage, from_undead) critter1:play{pitch = random:float(0.95, 1.05), volume = 0.5} trigger:after(0.01, function() for i = 1, 4 do - Critter{group = main.current.main, x = self.x, y = self.y, color = orange[0], r = random:float(0, 2*math.pi), v = 20, dmg = self.dmg, parent = self} + Critter{group = main.current.main, x = self.x, y = self.y, color = brown2[0], r = random:float(0, 2*math.pi), v = 20, dmg = self.dmg, parent = self} end end) end @@ -1763,7 +1763,7 @@ function Player:shoot(r, mods) critter1:play{pitch = random:float(0.95, 1.05), volume = 0.5} trigger:after(0.01, function() for i = 1, mods.spawn_critters_on_crit do - Critter{group = main.current.main, x = self.x, y = self.y, color = orange[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} + Critter{group = main.current.main, x = self.x, y = self.y, color = brown2[0], r = random:float(0, 2*math.pi), v = 10, dmg = self.dmg, parent = self} end end) end @@ -2285,7 +2285,7 @@ function Projectile:on_trigger_enter(other, contact) trigger:after(0.01, function() if self.level == 3 then local r = self.parent:angle_to_object(other) - SpawnEffect{group = main.current.effects, x = self.parent.x, y = self.parent.y, color = green[0], action = function(x, y) + SpawnEffect{group = main.current.effects, x = self.parent.x, y = self.parent.y, color = green2[0], action = function(x, y) Pet{group = main.current.main, x = x, y = y, r = r, v = 150, parent = self.parent, conjurer_buff_m = self.conjurer_buff_m or 1} Pet{group = main.current.main, x = x + 12*math.cos(r + math.pi/2), y = y + 12*math.sin(r + math.pi/2), r = r, v = 150, parent = self.parent, conjurer_buff_m = self.conjurer_buff_m or 1} Pet{group = main.current.main, x = x + 12*math.cos(r - math.pi/2), y = y + 12*math.sin(r - math.pi/2), r = r, v = 150, parent = self.parent, conjurer_buff_m = self.conjurer_buff_m or 1} @@ -2930,11 +2930,11 @@ function ForceField:init(args) self.hfx:add('hit', 1) self.color = fg[0] - self.color_transparent = Color(yellow[0].r, yellow[0].g, yellow[0].b, 0.08) + self.color_transparent = Color(brown[0].r, brown[0].g, brown[0].b, 0.08) self.rs = 0 self.hidden = false self.t:tween(0.05, self, {rs = args.rs}, math.cubic_in_out, function() self.spring:pull(0.15) end) - self.t:after(0.2, function() self.color = yellow[0] end) + self.t:after(0.2, function() self.color = brown[0] end) self.t:after(6, function() self.t:every_immediate(0.05, function() self.hidden = not self.hidden end, 7, function() self.dead = true end) @@ -3801,7 +3801,7 @@ function Critter:init(args) self:set_restitution(0.5) self.classes = {'enemy_critter'} - self.color = orange[0] + self.color = brown2[0] self:calculate_stats(true) self:set_as_steerable(self.v, 400, math.pi, 1) self:push(args.v, args.r) diff --git a/shared.lua b/shared.lua index f703803..ad50604 100644 --- a/shared.lua +++ b/shared.lua @@ -1,19 +1,25 @@ -- Shared functions and classes for projects using JUGGLRX's visual style. function shared_init() local colors = { + red = ColorRamp(Color'#e91d39', 0.025), + red2 = ColorRamp(Color'#b3172d', 0.025), white = ColorRamp(Color(1, 1, 1, 1), 0.025), black = ColorRamp(Color(0, 0, 0, 1), 0.025), bg = ColorRamp(Color'#303030', 0.025), fg = ColorRamp(Color'#dadada', 0.025), fg_alt = ColorRamp(Color'#b0a89f', 0.025), yellow = ColorRamp(Color'#facf00', 0.025), + yellow2 = ColorRamp(Color'#f59f10', 0.025), + brown = ColorRamp(Color'#bb6f07', 0.025), + brown2 = ColorRamp(Color'#7e5419', 0.025), orange = ColorRamp(Color'#f07021', 0.025), blue = ColorRamp(Color'#019bd6', 0.025), + blue2 = ColorRamp(Color'#4778ba', 0.025), + blue3 = ColorRamp(Color'#7aa0ca', 0.025), green = ColorRamp(Color'#8bbf40', 0.025), - red = ColorRamp(Color'#e91d39', 0.025), + green2 = ColorRamp(Color'#598718', 0.025), purple = ColorRamp(Color'#8e559e', 0.025), - blue2 = ColorRamp(Color'#4778ba', 0.025), - yellow2 = ColorRamp(Color'#f59f10', 0.025), + purple2 = ColorRamp(Color'#63428c', 0.025), } for name, color in pairs(colors) do _G[name] = color @@ -494,13 +500,19 @@ end local invisible = Color(1, 1, 1, 0) global_text_tags = { red = TextTag{draw = function(c, i, text) graphics.set_color(red[0]) end}, + red2 = TextTag{draw = function(c, i, text) graphics.set_color(red2[0]) end}, orange = TextTag{draw = function(c, i, text) graphics.set_color(orange[0]) end}, yellow = TextTag{draw = function(c, i, text) graphics.set_color(yellow[0]) end}, yellow2 = TextTag{draw = function(c, i, text) graphics.set_color(yellow2[0]) end}, green = TextTag{draw = function(c, i, text) graphics.set_color(green[0]) end}, + green2 = TextTag{draw = function(c, i, text) graphics.set_color(green2[0]) end}, purple = TextTag{draw = function(c, i, text) graphics.set_color(purple[0]) end}, + purple2 = TextTag{draw = function(c, i, text) graphics.set_color(purple2[0]) end}, + brown = TextTag{draw = function(c, i, text) graphics.set_color(brown[0]) end}, + brown2 = TextTag{draw = function(c, i, text) graphics.set_color(brown2[0]) end}, blue = TextTag{draw = function(c, i, text) graphics.set_color(blue[0]) end}, blue2 = TextTag{draw = function(c, i, text) graphics.set_color(blue2[0]) end}, + blue3 = TextTag{draw = function(c, i, text) graphics.set_color(blue3[0]) end}, bg = TextTag{draw = function(c, i, text) graphics.set_color(bg[0]) end}, bg3 = TextTag{draw = function(c, i, text) graphics.set_color(bg[3]) end}, bg10 = TextTag{draw = function(c, i, text) graphics.set_color(bg[10]) end}, @@ -517,15 +529,30 @@ global_text_tags = { fgm8 = TextTag{draw = function(c, i, text) graphics.set_color(fg[-8]) end}, fgm9 = TextTag{draw = function(c, i, text) graphics.set_color(fg[-9]) end}, fgm10 = TextTag{draw = function(c, i, text) graphics.set_color(fg[-10]) end}, + purple5 = TextTag{draw = function(c, i, text) graphics.set_color(purple[5]) end}, + purplem5 = TextTag{draw = function(c, i, text) graphics.set_color(purple[-5]) end}, + purple25 = TextTag{draw = function(c, i, text) graphics.set_color(purple2[5]) end}, + purplem25 = TextTag{draw = function(c, i, text) graphics.set_color(purple2[-5]) end}, greenm5 = TextTag{draw = function(c, i, text) graphics.set_color(green[-5]) end}, + green2m5 = TextTag{draw = function(c, i, text) graphics.set_color(green2[-5]) end}, green5 = TextTag{draw = function(c, i, text) graphics.set_color(green[5]) end}, + green25 = TextTag{draw = function(c, i, text) graphics.set_color(green2[5]) end}, blue5 = TextTag{draw = function(c, i, text) graphics.set_color(blue[5]) end}, bluem5 = TextTag{draw = function(c, i, text) graphics.set_color(blue[-5]) end}, blue25 = TextTag{draw = function(c, i, text) graphics.set_color(blue2[5]) end}, blue2m5 = TextTag{draw = function(c, i, text) graphics.set_color(blue2[-5]) end}, + blue35 = TextTag{draw = function(c, i, text) graphics.set_color(blue3[5]) end}, + blue3m5 = TextTag{draw = function(c, i, text) graphics.set_color(blue3[-5]) end}, yellow25 = TextTag{draw = function(c, i, text) graphics.set_color(yellow2[5]) end}, yellow2m5 = TextTag{draw = function(c, i, text) graphics.set_color(yellow2[-5]) end}, + brown5 = TextTag{draw = function(c, i, text) graphics.set_color(brown[5]) end}, + brownm5 = TextTag{draw = function(c, i, text) graphics.set_color(brown[-5]) end}, + brown25 = TextTag{draw = function(c, i, text) graphics.set_color(brown2[5]) end}, + brown2m5 = TextTag{draw = function(c, i, text) graphics.set_color(brown2[-5]) end}, + red5 = TextTag{draw = function(c, i, text) graphics.set_color(red[5]) end}, redm5 = TextTag{draw = function(c, i, text) graphics.set_color(red[-5]) end}, + red25 = TextTag{draw = function(c, i, text) graphics.set_color(red2[5]) end}, + red2m5 = TextTag{draw = function(c, i, text) graphics.set_color(red2[-5]) end}, orangem5 = TextTag{draw = function(c, i, text) graphics.set_color(orange[-5]) end}, purplem5 = TextTag{draw = function(c, i, text) graphics.set_color(purple[-5]) end}, yellowm5 = TextTag{draw = function(c, i, text) graphics.set_color(yellow[-5]) end},