swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

fix badgeRestricted ship chassis

Browse Source
This commit is contained in:
AconiteX
2021-07-25 21:52:15 -04:00
parent baf25fa0a1
commit 420d32d72d
7 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_deed.tpf
View File

@@ -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 ]

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/advanced_xwing_reward_deed.tpf
View File

@@ -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 ]

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starfighter_reward_deed.tpf
View File

@@ -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 ]

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/grievous_starship_deed.tpf
View File

@@ -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 ]

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_deed.tpf
View File

@@ -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 ]

2
sku.0/sys.server/compiled/game/object/tangible/ship/crafted/chassis/tieinterceptor_imperial_guard_reward_deed.tpf
View File

@@ -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 ]

4
sku.0/sys.server/compiled/game/script/library/space_crafting.java
View File

@@ -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);