diff --git a/dist/ba_data/python/bastd/actor/playerspaz.py b/dist/ba_data/python/bastd/actor/playerspaz.py index dd187cb..11f38ed 100644 --- a/dist/ba_data/python/bastd/actor/playerspaz.py +++ b/dist/ba_data/python/bastd/actor/playerspaz.py @@ -71,7 +71,7 @@ class PlayerSpaz(Spaz): self._player = player self._drive_player_position() from spazmod import modifyspaz - modifyspaz.main(self.node,self._player) + modifyspaz.main(self, self.node, self._player) # Overloads to tell the type system our return type based on doraise val. diff --git a/dist/ba_root/mods/changelogs.txt b/dist/ba_root/mods/changelogs.txt index 304952b..7e6b2de 100644 --- a/dist/ba_root/mods/changelogs.txt +++ b/dist/ba_root/mods/changelogs.txt @@ -1,3 +1,7 @@ +#01-05-2021 - FireFighter + - Added HitPoints Visualisation using Tag + - Added Effects to players + Renamed Folder names by Constant Style __Date__ = 19 Apr diff --git a/dist/ba_root/mods/setting.json b/dist/ba_root/mods/setting.json index 935d8b9..75a012d 100644 --- a/dist/ba_root/mods/setting.json +++ b/dist/ba_root/mods/setting.json @@ -26,6 +26,9 @@ "enabletags": true, + "enablehptag": true, "enablerank": true, - "enableeffects": false + "enablestats": true, + "enableeffects": false, + "enableTop5effects": false } \ No newline at end of file diff --git a/dist/ba_root/mods/spazmod/effects.py b/dist/ba_root/mods/spazmod/effects.py index e69de29..525c6b9 100644 --- a/dist/ba_root/mods/spazmod/effects.py +++ b/dist/ba_root/mods/spazmod/effects.py @@ -0,0 +1,337 @@ +# -*- coding: utf-8 -*- +# Released under the MIT License. See LICENSE for details. +# +"""Functionality related to player-controlled Spazzes.""" + +from __future__ import annotations +from typing import TYPE_CHECKING, TypeVar, overload +from bastd.actor.spaz import * +from bastd.gameutils import SharedObjects +from typing import Any, Sequence, Optional, Dict, List, Union, Callable, Tuple, Set, Type, Literal +from bastd.actor import playerspaz +from bastd.actor.playerspaz import * +from bastd.actor.spazfactory import SpazFactory +from bastd.actor.popuptext import PopupText +from bastd.actor import spaz,spazappearance +from bastd.actor import bomb as stdbomb +from bastd.actor.powerupbox import PowerupBoxFactory +import ba,_ba,bastd,weakref,random,math,time,base64,os,json,setting +from playersData import pdata +from stats import mystats +from tools import globalvars as gvar +PlayerType = TypeVar('PlayerType', bound=ba.Player) +TeamType = TypeVar('TeamType', bound=ba.Team) +tt = ba.TimeType.SIM +tf = ba.TimeFormat.MILLISECONDS + +#some stuff for character_changer powerup... +cList = ['neoSpaz','mel','ninja','kronk','jack','frosty','santa','bones','bear','penguin','ali','cyborg','agent','wizard','pixie','bunny'] +nList = {'neoSpaz':'Spaz','zoe':'Zoe','ninja':'Snake Shadow','kronk':'Kronk','mel':'Mel','jack':'Jack Morgan','santa':'Santa Claus','frosty':'Frosty','bones':'Bones','bear':'Bernard','penguin':'Pascal','ali':'Taobao Mascot','cyborg':'B-9000','agent':'Agent Johnson','wizard':'Grumbledorf','pixie':'Pixel','bunny':'Easter Bunny'} +mymedia = {} +def add_mychar_media(): + global mymedia + for k,v in nList.items(): + v_media = SpazFactory.get().get_media(v) + mymedia[v] = v_media + +class SurroundBallFactory(object): + def __init__(self): + self.bonesTex = ba.gettexture("powerupCurse") + self.bonesModel = ba.getmodel("bonesHead") + self.bearTex = ba.gettexture("bearColor") + self.bearModel = ba.getmodel("bearHead") + self.aliTex = ba.gettexture("aliColor") + self.aliModel = ba.getmodel("aliHead") + self.b9000Tex = ba.gettexture("cyborgColor") + self.b9000Model = ba.getmodel("cyborgHead") + self.frostyTex = ba.gettexture("frostyColor") + self.frostyModel = ba.getmodel("frostyHead") + self.cubeTex = ba.gettexture("crossOutMask") + self.cubeModel = ba.getmodel("powerup") + try: + self.mikuModel = ba.getmodel("operaSingerHead") + self.mikuTex = ba.gettexture("operaSingerColor") + except:ba.print_exception() + self.ballMaterial = ba.Material() + self.impactSound = ba.getsound("impactMedium") + self.ballMaterial.add_actions(actions=("modify_node_collision", "collide", False)) + +class SurroundBall(ba.Actor): + def __init__(self, spaz, shape="bones"): + if spaz is None or not spaz.is_alive(): return + ba.Actor.__init__(self) + self.spazRef = weakref.ref(spaz) + factory = self.getFactory() + s_model, s_texture = { + "bones": (factory.bonesModel, factory.bonesTex), + "bear": (factory.bearModel, factory.bearTex), + "ali": (factory.aliModel, factory.aliTex), + "b9000": (factory.b9000Model, factory.b9000Tex), + "miku": (factory.mikuModel, factory.mikuTex), + "frosty": (factory.frostyModel, factory.frostyTex), + "RedCube": (factory.cubeModel, factory.cubeTex) + }.get(shape, (factory.bonesModel, factory.bonesTex)) + self.node = ba.newnode("prop", attrs={"model": s_model, "body": "sphere", "color_texture": s_texture, "reflection": "soft", "model_scale": 0.5, "body_scale": 0.1, "density": 0.1, "reflection_scale": [0.15], "shadow_size": 0.6, "position": spaz.node.position, "velocity": (0, 0, 0), "materials": [SharedObjects.get().object_material, factory.ballMaterial] }, delegate=self) + self.surroundTimer = None + self.surroundRadius = 1.0 + self.angleDelta = math.pi / 12.0 + self.curAngle = random.random() * math.pi * 2.0 + self.curHeight = 0.0 + self.curHeightDir = 1 + self.heightDelta = 0.2 + self.heightMax = 1.0 + self.heightMin = 0.1 + self.initTimer(spaz.node.position) + + def getTargetPosition(self, spazPos): + p = spazPos + pt = (p[0] + self.surroundRadius * math.cos(self.curAngle), p[1] + self.curHeight, p[2] + self.surroundRadius * math.sin(self.curAngle)) + self.curAngle += self.angleDelta + self.curHeight += self.heightDelta * self.curHeightDir + if (self.curHeight > self.heightMax) or (self.curHeight < self.heightMin): self.curHeightDir = -self.curHeightDir + return pt + + def initTimer(self, p): + self.node.position = self.getTargetPosition(p) + self.surroundTimer = ba.Timer(30, ba.WeakCall(self.circleMove), repeat=True, timetype=tt, timeformat=tf) + + def circleMove(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + p = spaz.node.position + pt = self.getTargetPosition(p) + pn = self.node.position + d = [pt[0] - pn[0], pt[1] - pn[1], pt[2] - pn[2]] + speed = self.getMaxSpeedByDir(d) + self.node.velocity = speed + + @staticmethod + def getMaxSpeedByDir(direction): + k = 7.0 / max((abs(x) for x in direction)) + return tuple(x * k for x in direction) + + def handlemessage(self, m): + ba.Actor.handlemessage(self, m) + if isinstance(m, ba.DieMessage): + if self.surroundTimer is not None: self.surroundTimer = None + self.node.delete() + elif isinstance(m, ba.OutOfBoundsMessage): + self.handlemessage(ba.DieMessage()) + + def getFactory(cls): + activity = ba.getactivity() + if activity is None: raise Exception("no current activity") + try: + return activity._sharedSurroundBallFactory + except Exception: + f = activity._sharedSurroundBallFactory = SurroundBallFactory() + return f + +class Effect(ba.Actor): + def __init__(self, spaz, player): + ba.Actor.__init__(self) + _settings = setting.get_settings_data() + custom_tag = pdata.get_custom()['customtag'] + custom_effects = pdata.get_custom()['customeffects'] + self.source_player = player + self.spazRef = weakref.ref(spaz) + self.spazNormalColor = spaz.node.color + self.Decorations = [] + self.Enhancements = [] + self._powerScale = 1.0 + self._armorScale = 1.0 + self._lifeDrainScale = None + self._damageBounceScale = None + self._remoteMagicDamge = False + self._MulitPunch = None + self._AntiFreeze = 1.0 + self.fallWings = 0 + self.checkDeadTimer = None + self._hasDead = False + self.light = None + flag = 0 + node_id = self.source_player.node.playerID + cl_str = None + clID = None + for c in _ba.get_foreground_host_session().sessionplayers: + if (c.activityplayer) and (c.activityplayer.node.playerID == node_id): + profiles = c.inputdevice.get_player_profiles() + clID = c.inputdevice.client_id + cl_str = c.get_account_id() + try: + if cl_str in custom_effects: + effect = custom_effects[cl_str] + if effect == 'ice': + self.snowTimer = ba.Timer(500, ba.WeakCall(self.emitIce), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'sweat': + self.smokeTimer = ba.Timer(40, ba.WeakCall(self.emitSmoke), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'scorch': + self.scorchTimer = ba.Timer(500, ba.WeakCall(self.update_Scorch), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'glow': + self.addLightColor((1, 0.6, 0.4)) + self.checkDeadTimer = ba.Timer(150, ba.WeakCall(self.checkPlayerifDead), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'distortion': + self.DistortionTimer = ba.Timer(1000, ba.WeakCall(self.emitDistortion), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'slime': + self.slimeTimer = ba.Timer(250, ba.WeakCall(self.emitSlime), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'metal': + self.metalTimer = ba.Timer(500, ba.WeakCall(self.emitMetal), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + elif effect == 'surrounder': + self.surround = SurroundBall(spaz, shape="bones") + flag = 1 + elif effect == 'spark': + self.sparkTimer = ba.Timer(100, ba.WeakCall(self.emitSpark), repeat=True, timetype=tt, timeformat=tf) + flag = 1 + except: + pass + + if _settings['enablestats']: + pats = mystats.get_all_stats() + if aid in pats: + rank = pats[aid]["rank"] + if int(rank) < 6: + if rank == '1': + if flag == 0 and _settings['enableTop5effects']: self.add_multicolor_effect() #self.neroLightTimer = ba.Timer(500, ba.WeakCall(self.neonLightSwitch,("shine" in self.Decorations),("extra_Highlight" in self.Decorations),("extra_NameColor" in self.Decorations)),repeat = True, timetype=tt, timeformat=tf) + elif rank == '2': + if flag == 0 and _settings['enableTop5effects']: self.smokeTimer = ba.Timer(40, ba.WeakCall(self.emitSmoke), repeat=True, timetype=tt, timeformat=tf) + elif rank == '3': + if flag == 0 and _settings['enableTop5effects']: self.addLightColor((1, 0.6, 0.4));self.scorchTimer = ba.Timer(500, ba.WeakCall(self.update_Scorch), repeat=True, timetype=tt, timeformat=tf) + elif rank == '4': + if flag == 0 and _settings['enableTop5effects']: self.metalTimer = ba.Timer(500, ba.WeakCall(self.emitMetal), repeat=True, timetype=tt, timeformat=tf) + else: + if flag == 0 and _settings['enableTop5effects']: self.addLightColor((1, 0.6, 0.4));self.checkDeadTimer = ba.Timer(150, ba.WeakCall(self.checkPlayerifDead), repeat=True, timetype=tt, timeformat=tf) + + if "smoke" and "spark" and "snowDrops" and "slimeDrops" and "metalDrops" and "Distortion" and "neroLight" and "scorch" and "HealTimer" and "KamikazeCheck" not in self.Decorations: + #self.checkDeadTimer = ba.Timer(150, ba.WeakCall(self.checkPlayerifDead), repeat=True, timetype=tt, timeformat=tf) + if self.source_player.is_alive() and self.source_player.actor.node.exists(): + #print("OK") + self.source_player.actor.node.addDeathAction(ba.Call(self.handlemessage,ba.DieMessage())) + + def add_multicolor_effect(self): + if spaz.node: ba.animate_array(spaz.node, 'color', 3, gvar.multicolor, True, timetype=tt, timeformat=tf) + + def checkPlayerifDead(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.checkDeadTimer = None + self.handlemessage(ba.DieMessage()) + return + + def update_Scorch(self): + spaz = self.spazRef() + if spaz is not None and spaz.is_alive() and spaz.node.exists(): + color = (random.random(),random.random(),random.random()) + if not hasattr(self,"scorchNode") or self.scorchNode == None: + self.scorchNode = None + self.scorchNode = ba.newnode("scorch",attrs={"position":(spaz.node.position),"size":1.17,"big":True}) + spaz.node.connectattr("position",self.scorchNode,"position") + ba.animate_array(self.scorchNode,"color",3,{0:self.scorchNode.color,500:color}, timetype=tt, timeformat=tf) + else: + self.scorchTimer = None + self.scorchNode.delete() + self.handlemessage(ba.DieMessage()) + + def neonLightSwitch(self,shine,Highlight,NameColor): + spaz = self.spazRef() + if spaz is not None and spaz.is_alive() and spaz.node.exists(): + color = (random.random(),random.random(),random.random()) + if NameColor: ba.animate_array(spaz.node,"nameColor",3,{0:spaz.node.nameColor,500:ba.safecolor(color)}, timetype=tt, timeformat=tf) + if shine:color = tuple([min(10., 10 * x) for x in color]) + ba.animate_array(spaz.node,"color",3,{0:spaz.node.color,500:color}, timetype=tt, timeformat=tf) + if Highlight: + #print spaz.node.highlight + color = (random.random(),random.random(),random.random()) + if shine:color = tuple([min(10., 10 * x) for x in color]) + ba.animate_array(spaz.node,"highlight",3,{0:spaz.node.highlight,500:color}, timetype=tt, timeformat=tf) + else: + self.neroLightTimer = None + self.handlemessage(ba.DieMessage()) + + def addLightColor(self, color): + self.light = ba.newnode("light", attrs={"color": color, "height_attenuated": False, "radius": 0.4}) + self.spazRef().node.connectattr("position", self.light, "position") + ba.animate(self.light, "intensity", {0: 0.1, 250: 0.3, 500: 0.1}, loop=True, timetype=tt, timeformat=tf) + + def emitDistortion(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position,emit_type="distortion",spread=1.0) + ba.emitfx(position=spaz.node.position, velocity=spaz.node.velocity,count=random.randint(1,5),emit_type="tendrils",tendril_type="smoke") + + def emitSpark(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position, velocity=spaz.node.velocity, count=random.randint(1,10), scale=2, spread=0.2, chunk_type="spark") + + def emitIce(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position , velocity=spaz.node.velocity, count=random.randint(2,8), scale=0.4, spread=0.2, chunk_type="ice") + + def emitSmoke(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position, velocity=spaz.node.velocity, count=random.randint(1,10), scale=2, spread=0.2, chunk_type="sweat") + + def emitSlime(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position , velocity=spaz.node.velocity, count=random.randint(1,10), scale=0.4, spread=0.2, chunk_type="slime") + + def emitMetal(self): + spaz = self.spazRef() + if spaz is None or not spaz.is_alive() or not spaz.node.exists(): + self.handlemessage(ba.DieMessage()) + return + ba.emitfx(position=spaz.node.position, velocity=spaz.node.velocity, count=random.randint(2,8), scale=0.4, spread=0.2, chunk_type="metal") + + def handlemessage(self, m): + #self._handlemessageSanityCheck() + if isinstance(m, ba.OutOfBoundsMessage): self.handlemessage(ba.DieMessage()) + elif isinstance(m, ba.DieMessage): + if hasattr(self,"light") and self.light is not None:self.light.delete() + if hasattr(self,"smokeTimer"):self.smokeTimer = None + if hasattr(self,"surround"):self.surround = None + if hasattr(self,"sparkTimer"):self.sparkTimer = None + if hasattr(self,"snowTimer"):self.snowTimer = None + if hasattr(self,"metalTimer"):self.metalTimer = None + if hasattr(self,"DistortionTimer"):self.DistortionTimer = None + if hasattr(self,"slimeTimer"):self.slimeTimer = None + if hasattr(self,"KamikazeCheck"):self.KamikazeCheck = None + if hasattr(self,"neroLightTimer"):self.neroLightTimer = None + if hasattr(self,"checkDeadTimer"):self.checkDeadTimer = None + if hasattr(self,"HealTimer"):self.HealTimer = None + if hasattr(self,"scorchTimer"):self.scorchTimer = None + if hasattr(self,"scorchNode"):self.scorchNode = None + if not self._hasDead: + spaz = self.spazRef() + #print str(spaz) + "Spaz" + if spaz is not None and spaz.is_alive() and spaz.node.exists(): spaz.node.color = self.spazNormalColor + killer = spaz.last_player_attacked_by if spaz is not None else None + try: + if killer in (None,ba.Player(None)) or killer.actor is None or not killer.actor.exists() or killer.actor.hitPoints <= 0:killer = None + except: + killer = None + #if hasattr(self,"hasDead") and not self.hasDead: + self._hasDead = True + + ba.Actor.handlemessage(self, m) \ No newline at end of file diff --git a/dist/ba_root/mods/spazmod/modifyspaz.py b/dist/ba_root/mods/spazmod/modifyspaz.py index c94fecf..d903355 100644 --- a/dist/ba_root/mods/spazmod/modifyspaz.py +++ b/dist/ba_root/mods/spazmod/modifyspaz.py @@ -3,7 +3,7 @@ from spazmod import effects import setting # all activites related to modify spaz by any how will be here -def main(node,player): +def main(spaz, node, player): _setting=setting.get_settings_data() if _setting['enabletags']: @@ -11,11 +11,6 @@ def main(node,player): if _setting['enablerank']: tag.addrank(node,player) if _setting['enableeffects']: - effects.addeffect(node,player) - - - - - - - + effects.Effect(spaz,player) + #HP should be called on each 0.1 sec, [check on settings in done in tag.addhp()] + tag.addhp(node) \ No newline at end of file diff --git a/dist/ba_root/mods/spazmod/tag.py b/dist/ba_root/mods/spazmod/tag.py index 00b6f18..3da696a 100644 --- a/dist/ba_root/mods/spazmod/tag.py +++ b/dist/ba_root/mods/spazmod/tag.py @@ -1,6 +1,6 @@ from playersData import pdata -import ba +import ba, setting def addtag(node,player): session_player=player.sessionplayer account_id=session_player.get_account_id() @@ -25,6 +25,13 @@ def addrank(node,player): if rank: Rank(node,rank) +def addhp(node): + hp = node.hitpoints + _set = setting.get_settings_data() + def showHP(): + HitPoint(owner=node,prefix=str(int(hp)),position=(0,0.75,0),shad = 1.4) + if hp: t = ba.Timer(100,ba.Call(showHP),repeat = True, timetype=ba.TimeType.SIM, timeformat=ba.TimeFormat.MILLISECONDS) + class Tag(object): def __init__(self,owner=None,tag="somthing"): self.node=owner @@ -71,8 +78,28 @@ class Rank(object): }) mnode.connectattr('output', self.rank_text, 'position') - - - - - +class HitPoint(object): + def __init__(self,position = (0,1.5,0),owner = None,prefix = 'ADMIN',shad = 1.2): + _set = setting.get_settings_data() + if not _set['enablehptag']: return + self.position = position + self.owner = owner + m = ba.newnode('math', owner=self.owner, attrs={'input1': self.position, 'operation': 'add'}) + self.owner.connectattr('position', m, 'input2') + prefix = int(prefix) / 10 + preFix = u"\ue047" + str(prefix) + u"\ue047" + self._Text = ba.newnode('text', + owner=self.owner, + attrs={ + 'text':preFix, + 'in_world':True, + 'shadow':shad, + 'flatness':1.0, + 'color':(1,1,1) if int(prefix) >= 20 else (1.0,0.2,0.2), + 'scale':0.01, + 'h_align':'center'}) + m.connectattr('output', self._Text, 'position') + def a(): + self._Text.delete() + m.delete() + self.timer = ba.Timer(100, ba.Call(a), timetype=ba.TimeType.SIM, timeformat=ba.TimeFormat.MILLISECONDS) \ No newline at end of file diff --git a/dist/ba_root/mods/stats/mystats.py b/dist/ba_root/mods/stats/mystats.py index 8e52ca5..6653cfe 100644 --- a/dist/ba_root/mods/stats/mystats.py +++ b/dist/ba_root/mods/stats/mystats.py @@ -16,6 +16,8 @@ from typing import Any, Dict, Optional from ba._lobby import JoinInfo from ba import _activitytypes as ba_actypes from ba._activitytypes import * + +#variables our_settings = setting.get_settings_data() # where our stats file and pretty html output will go base_path = os.path.join(_ba.env()['python_directory_user'],"stats" + os.sep) @@ -43,20 +45,40 @@ html_start = f''' ''' # Total Damage #removed this line as it isn't crt data + +#useful functions +def get_all_stats(): + if os.path.exists(statsfile): + with open(statsfile, 'r') as f: + return json.loads(f.read()) + else: print('Stats file not found!') + +def dump_stats(s: dict): + if os.path.exists(statsfile): + with open(statsfile, 'w') as f: + f.write(json.dumps(s, indent=4)) + f.close() + else: print('Stats file not found!') + +def get_stats_by_id(ID: str): + a = get_all_stats() + if ID in a: + return a[ID] + else: + print(f"'{ID}' not found in stats, returning None") + return None + def refreshStats(): # lastly, write a pretty html version. # our stats url could point at something like this... - f=open(statsfile) - stats = json.loads(f.read()) - + pStats = get_all_stats() f=open(htmlfile, 'w') f.write(html_start) - entries = [(a['scores'], a['kills'], a['deaths'], a['games'], a['name_html'], a['aid']) for a in stats.values()] + entries = [(a['scores'], a['kills'], a['deaths'], a['games'], a['name_html'], a['aid']) for a in pStats.values()] # this gives us a list of kills/names sorted high-to-low entries.sort(reverse=True) rank = 0 toppers = {} - pStats = stats toppersIDs=[] _ranks=[] for entry in entries: @@ -119,9 +141,7 @@ def refreshStats(): global ranks ranks=_ranks - f2 = open(statsfile, "w") - f2.write(json.dumps(pStats, indent=4)) - f2.close() + dump_stats(pStats) from playersData import pdata pdata.update_toppers(toppersIDs) @@ -208,8 +228,7 @@ class UpdateThread(threading.Thread): # dump our stats back to disk tempppp = None from datetime import datetime - with open(statsfile, 'w') as f: - f.write(json.dumps(stats)) + dump_stats(stats) # aaand that's it! There IS no step 27! now = datetime.now() update_time = now.strftime("%S:%M:%H - %d %b %y")