From 420d32d72d2f43556cd909b663d583ca85134563 Mon Sep 17 00:00:00 2001 From: AconiteX <63141077+AconiteX@users.noreply.github.com> Date: Sun, 25 Jul 2021 21:52:15 -0400 Subject: [PATCH] fix badgeRestricted ship chassis --- .../tangible/ship/crafted/chassis/advanced_xwing_deed.tpf | 2 +- .../ship/crafted/chassis/advanced_xwing_reward_deed.tpf | 2 +- .../ship/crafted/chassis/grievous_starfighter_reward_deed.tpf | 2 +- .../tangible/ship/crafted/chassis/grievous_starship_deed.tpf | 2 +- .../crafted/chassis/tieinterceptor_imperial_guard_deed.tpf | 2 +- .../chassis/tieinterceptor_imperial_guard_reward_deed.tpf | 2 +- .../compiled/game/script/library/space_crafting.java | 4 +--- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_deed.tpf index eed090fc9..c3d4f84bd 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_advanced_xwing_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "146"] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_rebel_heavy_xwing"] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_reward_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_reward_deed.tpf index bbb463896..577ccdb10 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_reward_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_reward_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_advanced_xwing_reward_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "146", "ship_chassis.type" = "advanced_xwing", "ship_chassis.hp" = 2000.0, "ship_chassis.mass" = 180000.0 ] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_rebel_heavy_xwing", "ship_chassis.type" = "advanced_xwing", "ship_chassis.hp" = 2000.0, "ship_chassis.mass" = 180000.0 ] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starfighter_reward_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starfighter_reward_deed.tpf index c4876f158..f4bd7fdbd 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starfighter_reward_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starfighter_reward_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_grievous_starfighter_reward_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "143", "ship_chassis.type" = "grievous_starship", "ship_chassis.hp" = 1800.0, "ship_chassis.mass" = 90000.0 ] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_grievous", "ship_chassis.type" = "grievous_starship", "ship_chassis.hp" = 1800.0, "ship_chassis.mass" = 90000.0 ] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starship_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starship_deed.tpf index 70a70134e..f7b23ca7b 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starship_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starship_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_grievous_starship_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "143"] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_grievous"] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_deed.tpf index ec28e7e2c..c1e011914 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_tieinterceptor_imperial_guard_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "145"] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_imperial_red_tie"] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_reward_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_reward_deed.tpf index c775abfae..71cde1a7d 100755 --- a/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_reward_deed.tpf +++ b/sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_reward_deed.tpf @@ -6,7 +6,7 @@ sharedTemplate = "object/tangible/ship/crafted/chassis/shared_tieinterceptor_imperial_guard_reward_deed.iff" -objvars =+ [ "ship_chassis.badgeRestricted" = "145", "ship_chassis.type" = "tieinterceptor_imperial_guard", "ship_chassis.hp" = 2000.0, "ship_chassis.mass" = 80000.0 ] +objvars =+ [ "ship_chassis.badgeRestricted" = "bdg_kash_imperial_red_tie", "ship_chassis.type" = "tieinterceptor_imperial_guard", "ship_chassis.hp" = 2000.0, "ship_chassis.mass" = 80000.0 ] moveFlags = [ MF_player ] diff --git a/sku.0/sys.server/compiled/game/script/library/space_crafting.java b/sku.0/sys.server/compiled/game/script/library/space_crafting.java index 98f3fa9c7..59f158195 100755 --- a/sku.0/sys.server/compiled/game/script/library/space_crafting.java +++ b/sku.0/sys.server/compiled/game/script/library/space_crafting.java @@ -2165,9 +2165,7 @@ public class space_crafting extends script.base_script } if (hasObjVar(deed, "ship_chassis.badgeRestricted") && !isGod(player)) { - int badgeReq = getIntObjVar(deed, "ship_chassis.badgeRestricted"); - String badgeName = getCollectionSlotName(badgeReq); - if ((badgeName == null) || (badgeName.length() == 0) || (!badge.hasBadge(player, badgeName))) + if (!badge.hasBadge(player, getStringObjVar(deed, "ship_chassis.badgeRestricted"))) { destroyObject(ship); destroyObject(pcd);