From 9fddc4784703c29d4d6364f852918fef0acf2064 Mon Sep 17 00:00:00 2001 From: SilverSokolova Date: Wed, 21 Feb 2024 16:21:16 -0600 Subject: [PATCH] tech fix + modded weapon support --- sb_abilitymods.config | 120 +++++++++++++++----------- xrc/deployment/versioning/0018z.lua | 2 +- xrc/deployment/versioning/0018z_2.lua | 5 ++ 3 files changed, 77 insertions(+), 50 deletions(-) diff --git a/sb_abilitymods.config b/sb_abilitymods.config index 6cf4d03b..f9658503 100644 --- a/sb_abilitymods.config +++ b/sb_abilitymods.config @@ -1,3 +1,25 @@ +/* +836238594 + club + greataxe + greatsword + greatmace + quarterstaff + spellbook + +1632807184 + katana + +1967748482 + stolte_smg + stolte_pulserifle + stolte_machinegun + stolte_leveractionrifle + stolte_handcannon + grenadeLauncher + stolte_autoshotgun + stolte_bullpup +*/ { "weaponNames": { "assaultrifle": "A. Rifle", @@ -9,129 +31,129 @@ "abilities": { //Melee "bladecharge": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "club", "greatsword"], "weaponName": "sword" }, "downstab": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "katana", "club", "greatsword"], "weaponName": "sword" }, "parry": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "club", "greatsword"], "weaponName": "sword" }, "risingslash": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "club", "greatsword"], "weaponName": "sword" }, "spinslash": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "katana", "club", "greatsword"], "weaponName": "sword" }, "superspinslash": { "icon": "spinslash.png", - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "katana", "club", "greatsword"], "weaponName": "sword" }, "giantsword": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "katana", "club", "greatsword"], "weaponName": "sword" }, "travelingslash": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "katana", "club", "greatsword"], "weaponName": "sword" }, "blinkexplosion": { - "weaponTypes": ["broadsword", "hammer", "spear", "longsword", "quarterstaff", "greataxe"], + "weaponTypes": ["broadsword", "hammer", "spear", "longsword", "quarterstaff", "greataxe", "club", "greatsword", "greatmace"], "weaponName": "melee" }, "blinkslash": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "club", "greatsword"], "weaponName": "sword" }, "traildash": { - "weaponTypes": ["broadsword", "longsword"], + "weaponTypes": ["broadsword", "longsword", "club", "greatsword"], "weaponName": "sword" }, "uppercut": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], "weaponName": "hammer" }, "physicalshockwave": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], - "acceptedElements": ["physical"],//this ability only works on physical weapons + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], + "acceptedElements": ["physical"], //this ability only works on physical weapons "weaponName": "hammer" }, "shockwave": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], "weaponName": "hammer" }, "groundslam": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], "weaponName": "hammer" }, "elementalaura": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], "weaponName": "hammer" }, "elementalpillar": { - "weaponTypes": ["hammer", "quarterstaff", "greataxe"], + "weaponTypes": ["hammer", "quarterstaff", "greataxe", "greatmace"], "weaponName": "hammer" }, "flurry": { - "weaponTypes": ["spear"], + "weaponTypes": ["spear", "quarterstaff"], "weaponName": "spear" }, "spearspin": { - "weaponTypes": ["spear"], + "weaponTypes": ["spear", "quarterstaff"], "weaponName": "spear" }, "elementalspin": { - "weaponTypes": ["spear"], + "weaponTypes": ["spear", "quarterstaff"], "weaponName": "spear" }, "barrier": { - "weaponTypes": ["spear"], + "weaponTypes": ["spear", "quarterstaff"], "weaponName": "spear" }, "rocketspear": { - "weaponTypes": ["spear"], + "weaponTypes": ["spear", "quarterstaff"], "weaponName": "spear" }, //Guns "explosiveshot": { - "weaponTypes": ["assaultrifle", "battlerifle", "sniperrifle"], + "weaponTypes": ["assaultrifle", "battlerifle", "sniperrifle", "stolte_smg", "stolte_pulserifle", "stolte_machinegun", "stolte_leveractionrifle", "stolte_bullpup"], "weaponName": "rifle" }, "bouncingshot": { - "weaponTypes": ["assaultrifle", "battlerifle", "sniperrifle"], + "weaponTypes": ["assaultrifle", "battlerifle", "sniperrifle", "stolte_smg", "stolte_leveractionrifle", "stolte_handcannon", "stolte_autoshotgun", "stolte_bullpup"], "weaponName": "rifle" }, "flashlight": { - "weaponTypes": ["assaultrifle", "shotgun", "sniperrifle", "battlerifle"], + "weaponTypes": ["assaultrifle", "shotgun", "sniperrifle", "battlerifle", "stolte_smg", "stolte_pulserifle", "stolte_handcannon", "stolte_bullpup"], "weaponName": "firearm" }, "grenadelauncher": { - "weaponTypes": ["assaultrifle", "shotgun", "sniperrifle", "battlerifle"], + "weaponTypes": ["assaultrifle", "shotgun", "sniperrifle", "battlerifle", "stolte_pulserifle", "stolte_autoshotgun", "stolte_bullpup"], "weaponName": "firearm" }, "spray": { - "weaponTypes": ["assaultrifle", "battlerifle"], + "weaponTypes": ["assaultrifle", "battlerifle", "stolte_smg", "stolte_pulserifle", "stolte_bullpup"], "icon": "sb_spring.png", "weaponName": "assaultrifle" }, "sb_physicallance": { - "weaponTypes": ["assaultrifle", "battlerifle"], - "acceptedElements": ["physical"],//this ability only works on physical weapons + "weaponTypes": ["assaultrifle", "battlerifle", "stolte_pulserifle", "stolte_machinegun", "stolte_leveractionrifle", "stolte_handcannon", "stolte_autoshotgun", "stolte_bullpup"], + "acceptedElements": ["physical"], //this ability only works on physical weapons "weaponName": "assaultrifle" }, "lance": { - "weaponTypes": ["assaultrifle", "battlerifle"], + "weaponTypes": ["assaultrifle", "battlerifle", "stolte_pulserifle", "stolte_machinegun", "stolte_leveractionrifle", "stolte_handcannon", "stolte_autoshotgun", "stolte_bullpup"], "weaponName": "assaultrifle" }, "explosiveburst": { - "weaponTypes": ["assaultrifle"], + "weaponTypes": ["assaultrifle", "stolte_pulserifle", "stolte_machinegun", "stolte_handcannon", "grenadeLauncher", "stolte_autoshotgun", "stolte_bullpup"], "weaponName": "assaultrifle" }, "homingrocket": { @@ -148,23 +170,23 @@ "weaponName": "rocketlauncher" }, "shrapnelbomb": { - "weaponTypes": ["shotgun"], + "weaponTypes": ["shotgun", "grenadeLauncher"], "weaponName": "shotgun" }, "burstshot": { - "weaponTypes": ["shotgun"], + "weaponTypes": ["shotgun", "stolte_pulserifle", "stolte_handcannon", "stolte_autoshotgun"], "weaponName": "shotgun" }, "stickyshot": { - "weaponTypes": ["shotgun"], + "weaponTypes": ["shotgun", "grenadeLauncher"], "weaponName": "shotgun" }, "piercingshot": { - "weaponTypes": ["sniperrifle"], + "weaponTypes": ["sniperrifle", "stolte_pulserifle", "stolte_machinegun", "stolte_leveractionrifle", "stolte_handcannon", "stolte_bullpup"], "weaponName": "sniperrifle" }, "markedshot": { - "weaponTypes": ["sniperrifle"], + "weaponTypes": ["sniperrifle", "stolte_leveractionrifle"], "icon": "/items/active/weapons/ranged/abilities/markedshot/targetoverlay.png", "weaponName": "sniperrifle" }, @@ -175,57 +197,57 @@ //staves "elementbouncer": { - "weaponTypes": ["staff", "wand"], + "weaponTypes": ["staff", "wand", "spellbook"], "slot": "primary", "weaponName": "wand" }, "elementorb": { - "weaponTypes": ["staff", "wand"], + "weaponTypes": ["staff", "wand", "spellbook"], "slot": "primary", "weaponName": "wand" }, "elementportal": { - "weaponTypes": ["staff", "wand"], + "weaponTypes": ["staff", "wand", "spellbook"], "slot": "primary", "weaponName": "wand" }, "elementrain": { - "weaponTypes": ["staff", "wand"], + "weaponTypes": ["staff", "wand", "spellbook"], "slot": "primary", "icon": "/interface/cockpit/weather/rain.png", "weaponName": "wand" }, "elementswarm": { - "weaponTypes": ["staff", "wand"], + "weaponTypes": ["staff", "wand", "spellbook"], "slot": "primary", "weaponName": "wand" }, "energyzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "forcecage": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "healingzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "lowgravzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "pullzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "pushzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" }, "slowzone": { - "weaponTypes": ["staff"], + "weaponTypes": ["staff", "spellbook"], "weaponName": "staff" } } diff --git a/xrc/deployment/versioning/0018z.lua b/xrc/deployment/versioning/0018z.lua index ef319051..09154f21 100644 --- a/xrc/deployment/versioning/0018z.lua +++ b/xrc/deployment/versioning/0018z.lua @@ -1,6 +1,6 @@ local ini = init or function() end function init() ini() - local currentVersion = 28 + local currentVersion = 29 if player.introComplete() then if status.statusProperty("xrc_0018z") == nil then status.setStatusProperty("xrc_0018z",0) end local yv = status.statusProperty("xrc_0018z") diff --git a/xrc/deployment/versioning/0018z_2.lua b/xrc/deployment/versioning/0018z_2.lua index c1a9a156..f851b6d5 100644 --- a/xrc/deployment/versioning/0018z_2.lua +++ b/xrc/deployment/versioning/0018z_2.lua @@ -209,6 +209,11 @@ xrc0018[28]=function() player.giveItem({"sb_musicsheet",1,{music="impact-event"}}) end end +xrc0018[29]=function() + if not player.getProperty("sb_bioimplants") then + player.setProperty("sb_bioimplants", {}) + end +end function xrc0018z_2(cv,yv) newPlayer = yv == 0