diff --git a/sku.0/sys.server/compiled/game/datatables/admin/command_permissions.tab b/sku.0/sys.server/compiled/game/datatables/admin/command_permissions.tab index 35fabc0c6..109a02f58 100755 --- a/sku.0/sys.server/compiled/game/datatables/admin/command_permissions.tab +++ b/sku.0/sys.server/compiled/game/datatables/admin/command_permissions.tab @@ -1,171 +1,415 @@ Command Level s i{50} -server.shutdown 50 -server.error 50 -server.who 50 -server.getMissionBoardId 50 -server.getPlanetId 50 -server.memUsage 50 -server.clock 50 -server.releaseAuth 50 -server.showObjectSpheres 50 -server.showTriggerSpheres 50 -server.listenForMessage 50 -server.snapAllObjectsToTerrain 50 -server.getSceneId 50 -server.setGodMode 5 -server.reloadCommandTable 50 -server.reloadAdminTable 50 -server.reloadTable 50 -server.dataTableGetString 50 -server.reloadTerrain 50 -server.listRegions 50 -server.messageCount 50 -server.setPublic 50 -server.profiler 50 -server.setFrameRateLimit 50 -server.testStructurePlacement 50 -server.setDebugFlag 50 -server.validateWorld 50 -server.setUniverseProcess 50 -server.getRegionsAt 50 -server.enableNewJedi 50 -server.startSave 50 -server.saveBuildoutArea 50 -server.clientSaveBuildoutArea 50 -server.destroyPersistedBuildoutAreaDuplicates 50 -server.dumpCreatures 50 -script.attach 50 -script.detach 50 -script.list 50 -script.pause 50 -script.reload 50 -script.triggerAll 50 -script.triggerOne 50 -script.scriptingEnabled 50 -script.enableLogging 50 +ai.debug 50 +ai.debugTest 50 +ai.hatelist 50 +ai.info 50 +ai.kill 50 +ai.killall 50 +ai.log 50 +ai.retreat 50 +ai.runspeed 50 +ai.walkspeed 50 +city.listByCitizenCount 50 +city.listByCreationTime 50 +city.listById 50 +city.listByName 50 +city.listByPlanet 50 +city.listByRank 50 +city.listByStructureCount 50 +city.listCitiesWithIllegalShuttleport 50 +city.setCityCreationTime 50 +city.showCityDetails 50 +city.showCityGcwRegionDefender 50 +city.showCityRetroactiveCreationTime 50 +collection.addServerFirst 50 +collection.adjustSlotValue 50 +collection.displayCollections 50 +collection.displayServerFirst 50 +collection.grantAllSlotsForBook 50 +collection.grantAllSlotsForCollection 50 +collection.grantAllSlotsForPage 50 +collection.removeServerFirst 50 +collection.revokeAllSlotsForBook 50 +collection.revokeAllSlotsForCollection 50 +collection.revokeAllSlotsForPage 50 +collection.setServerFirstTime 50 +craft.customize 50 +craft.disableSchematicFilter 50 +craft.draft 50 +craft.enableSchematicFilter 50 +craft.experiment 50 +craft.fillslot 50 +craft.makeprototype 50 +craft.makeschematic 50 +craft.nextstage 50 +craft.stop 50 +guild.findGuildLeaderMismatch 50 +guild.findGuildLeaderPermissionMismatch 50 +guild.findGuildMemberNameMismatch 50 +guild.findLeaderlessGuild 50 +guild.findOrphanedGuild 50 +guild.listByAbbrev 50 +guild.listById 50 +guild.listByLeaderId 50 +guild.listByLeaderName 50 +guild.listByMemberActiveSize 50 +guild.listByMemberInactiveSize 50 +guild.listByMemberSize 50 +guild.listByName 50 +guild.listBySponsoredActiveSize 50 +guild.listBySponsoredInactiveSize 50 +guild.listBySponsoredSize 50 +guild.listByTotalActiveSize 50 +guild.listByTotalInactiveSize 50 +guild.listByTotalSize 50 +guild.setGuildAbbrev 50 +guild.setGuildLeader 50 +guild.setGuildName 50 +guild.showGuildDetails 50 +guild.showGuildGcwRegionDefender 50 +manufacture.addIngredient 50 +manufacture.addSchematic 50 +manufacture.getObjects 50 +manufacture.listIngredients 50 +manufacture.listObjects 50 +manufacture.listSchematic 50 +manufacture.removeIngredient 50 +manufacture.removeSchematic 50 +manufacture.start 50 +manufacture.stop 50 +money.balance 50 +money.bankTransfer 50 +money.cashTransfer 50 +money.deposit 50 +money.namedTransfer 50 +money.setGalacticReserve 50 +money.withdraw 50 +npc.goodbye 50 +npc.hail 50 +npc.respond 50 +object.addJediSlot 50 +object.addLocationTarget 50 +object.addPassiveReveal 50 +object.adjustAge 50 +object.adjustSwgAccountFeatureId 50 +object.askConsent 50 +object.attribs 50 +object.authority 50 +object.canMove 50 +object.cellCreate 50 +object.cellCreateTranslateRotate 50 +object.clearPassiveReveal 50 +object.count 50 +object.create 50 +object.createAt 50 +object.createIn 50 +object.createManyAt 50 +object.createPathNodes 50 +object.createTranslateRotate 50 +object.createTriggerVolume 50 +object.debugFar 50 +object.deleteAuctionLocation 50 +object.deletePersistedContents 50 +object.destroy 50 +object.destroyAllMobsExcept 50 +object.destroyAllWorldMobs 50 +object.destroyPathNodes 50 +object.disableCharacter 50 +object.enableCharacter 50 +object.enqueueCommand 50 +object.find 50 +object.findCreature 50 +object.findRelative_w 50 +object.findTemplate 50 +object.fixHouseItemLimit 50 +object.fixLoadWith 50 +object.getAge 50 +object.getAttributes 50 +object.getBadge 50 +object.getBattlefieldMarkerRegionName 50 +object.getBehavior 50 +object.getBroadcastInfo 50 +object.getChatStatistics 50 +object.getDatapadId 50 +object.getExposedProxyList 50 +object.getHeight 50 +object.getHibernating 50 +object.getInventoryId 50 +object.getInvulnerabilityTimer 50 +object.getJediSlotInfo 50 +object.getLoadWith 50 +object.getObservers 50 +object.getObserving 50 +object.getObservingDetailed 50 +object.getObservingPvpSync 50 +object.getObservingPvpSyncDetailed 50 +object.getOpenedContainers 50 +object.getOwner 50 +object.getPassiveReveal 50 +object.getPower 50 +object.getPowerRate 50 +object.getPrivateProxyList 50 +object.getServerTemplate 50 +object.getStandingOn 50 +object.getStaticInfo 50 +object.getVolume 50 +object.gotoObject 50 +object.hide 50 +object.isIncapacitated 50 +object.isOnSolidFloor 50 +object.isProxy 50 +object.listContainer 50 +object.loadContents 50 +object.loadStructure 50 +object.loginCharacter 50 +object.makeSpectral 50 +object.markCityEntrance 50 +object.move 50 +object.moveItemInHouseToMe 50 +object.moveSimClear 50 +object.moveSimStart 50 +object.moveToMe 50 +object.moveToPlayer 50 +object.moveToPlayerAndUnload 50 +object.pathAutoCleanup 50 +object.pathAutoGenerate 50 +object.persist 50 +object.playUiEffect 50 +object.regionList 50 +object.reinitializeVendor 50 +object.relinkPathGraph 50 +object.reloadPathNodes 50 +object.reloadServerTemplate 50 +object.reloadSwgAccountFeatureId 50 +object.reloadSwgTcgAccountFeatureId 50 +object.removeLocationTarget 50 +object.removePassiveReveal 50 +object.removeTriggerVolume 50 +object.renamePlayer 50 +object.resetStats 50 +object.restoreCharacter 50 +object.restoreHouse 50 +object.rollupStructure 50 +object.rotate 50 +object.scaleMovement 50 +object.scaleSize 50 +object.setAdminTitle 50 +object.setBattlefieldMarkerRegionName 50 +object.setCoverVisibility 50 +object.setName 50 +object.setOwner 50 +object.setPathLinkDistance 50 +object.setPower 50 +object.setPowerRate 50 +object.snap 50 +object.spawn 50 +object.spewCommandQueue 50 +object.stopWatching 50 +object.testVendorStatus 50 +object.triggerVolumes 50 +object.undeleteItem 50 +object.unload 50 +object.unloadBuildingContents 50 +object.unmarkCityEntrance 50 +object.unstick 50 +object.watch 50 +object.watchAIPath 50 +object.watchPathMap 50 +objvar.get 50 +objvar.list 50 +objvar.listWithPacking 50 +objvar.remove 50 +objvar.set 50 +objvar.setlist 50 +pvp.adjustCurrentGcwPoint 50 +pvp.adjustCurrentGcwRating 50 +pvp.adjustCurrentPvpKill 50 +pvp.adjustLifetimeGcwPoint 50 +pvp.adjustLifetimePvpKill 50 +pvp.adjustMaxGcwImperialRating 50 +pvp.adjustMaxGcwRebelRating 50 +pvp.adjustNextGcwRatingCalcTime 50 +pvp.getCombatSpamFilter 50 +pvp.getGcwInfo 50 +pvp.getMaster 50 +pvp.makeCovertImperialMercenary 50 +pvp.makeCovertRebelMercenary 50 +pvp.makeMercenaryNone 50 +pvp.makeOvertImperialMercenary 50 +pvp.makeOvertRebelMercenary 50 +pvp.pvpAttackPerformed 50 +pvp.pvpCanAttack 50 +pvp.showGcwFormulasTable 50 +pvp.showGcwRankDecayExclusionTimeTable 50 +pvp.showGcwRankTable 50 +pvp.spaceClearOvert 50 +pvp.spaceMakeOvert 50 +pvp.testGcwPointToRatingConversion 50 resource.activate 50 resource.addtocontainer 50 -resource.fillcontainer 50 -resource.checktree 50 resource.deactivate 50 +resource.deplete 50 resource.discardHopper 50 +resource.fillcontainer 50 resource.getSurveyList 50 resource.harvest 50 resource.name 50 resource.pools 50 +resource.recycle 50 resource.removefromcontainer 50 -resource.spawntree 50 resource.survey 50 resource.tree 50 resource.viewcontainer 50 -objvar.set 50 -objvar.setlist 50 -objvar.get 50 -objvar.list 50 -objvar.remove 50 -object.addLocationTarget 50 -object.authority 50 -object.create 50 -object.cellCreate 50 -object.count 50 -object.createAt 50 -object.createManyAt 50 -object.createIn 50 -object.createTranslateRotate 50 -object.cellCreateTranslateRotate 50 -object.setInterestRadius 50 -object.createTriggerVolume 50 -object.destroy 50 -object.find 50 -object.fixHouseItemLimit 50 -object.getHeight 50 -object.getInventoryId 50 -object.getDatapadId 50 -object.getServerTemplate 50 -object.getProxyList 50 -object.gotoObject 50 -object.isIncapacitated 50 -object.isProxy 50 -object.listVolumeContainer 50 -object.loadContents 50 -object.move 50 -object.moveToMe 50 -object.persist 50 -object.planetWarp 50 -object.reloadServerTemplate 50 -object.removeLocationTarget 50 -object.removeTriggerVolume 50 -object.renamePlayer 50 -object.rotate 50 -object.scaleMovement 50 -object.scaleSize 50 -object.setName 50 -object.snap 50 -object.spawn 50 -object.stopWatching 50 -object.triggerVolumes 50 -object.watch 50 -object.watchAIPath 50 -object.watchPathMap 50 -object.unstick 50 -object.attribs 50 -object.enqueueCommand 50 -object.hide 50 -object.getAttributes 50 -object.createPathNodes 50 -object.destroyPathNodes 50 -object.reloadPathNodes 50 -object.setPathLinkDistance 50 -object.markCityEntrance 50 -object.unmarkCityEntrance 50 -object.setOwner 50 -object.getOwner 50 -object.askConsent 50 -object.debugFar 50 -object.buildingObserve 50 -object.addJediSlot 50 -object.makeSpectral 50 -object.getHibernating 50 -object.getBehavior 50 -object.getStandingOn 50 -object.getBattlefieldMarkerRegionName 50 -object.setBattlefieldMarkerRegionName 50 -object.unload 50 -object.moveToPlayerAndUnload 50 -object.restoreHouse 50 -object.restoreCharacter 50 -object.deletePersistedContents 50 -object.moveHouseItemToMe 50 -object.reinitializevendor 50 -object.setAdminTitle 50 -npc.hail 50 -npc.goodbye 50 -npc.respond 50 -bank.balance 50 -bank.bankTransfer 50 -bank.cashTransfer 50 -bank.deposit 50 -bank.namedTransfer 50 -bank.withdraw 50 -manufacture.addIngredient 50 -manufacture.removeIngredient 50 -manufacture.listIngredients 50 -manufacture.addSchematic 50 -manufacture.removeSchematic 50 -manufacture.listSchematic 50 -manufacture.start 50 -manufacture.stop 50 -manufacture.getObjects 50 -manufacture.listObjects 50 -default.serverhelp 50 -craft.draft 50 -craft.fillslot 50 -craft.nextstage 50 -craft.experiment 50 -craft.customize 50 -craft.makeprototype 50 -craft.makeschematic 50 -craft.stop 50 -craft.enableSchematicFilter 50 -craft.disableSchematicFilter 50 +script.attach 50 +script.detach 50 +script.enableLogging 50 +script.list 50 +script.pause 50 +script.reload 50 +script.scriptingEnabled 50 +script.triggerAll 50 +script.triggerOne 50 +server.abortShutdown 50 +server.adjustGcwImperialScore 50 +server.adjustGcwRebelScore 50 +server.clientSaveBuildoutArea 50 +server.clock 50 +server.dataTableGetString 50 +server.decayGcwScore 50 +server.destroyPersistedBuildoutAreaDuplicates 50 +server.displayTerrain 50 +server.dumpCreatures 50 +server.dumpMemToFile 50 +server.editBuildoutArea 50 +server.enableNewJedi 50 +server.enablePlayerSanityChecker 50 +server.error 50 +server.freeCtsInfo 50 +server.freeCtsTest 50 +server.generateTerrain 50 +server.getCharacterInfo 50 +server.getCommoditiesAuctionLocationPriorityQueue 50 +server.getCommoditiesItemAttribute 50 +server.getCommoditiesItemAttributeData 50 +server.getCommoditiesItemAttributeDataValues 50 +server.getCommoditiesItemTypeMap 50 +server.getNameList 50 +server.getNumberOfMoveObjectLists 50 +server.getPlanetaryTimeFromAllGameServers 50 +server.getPlanetId 50 +server.getRegionsAt 50 +server.getSceneId 50 +server.getSystemClockTimeFromAllGameServers 50 +server.hasGcwFactionalPresence 50 +server.hasGcwRegionDefenderBonus 50 +server.isFreeCtsSourceCluster 50 +server.kill 50 +server.listCharacterCreateTimeAfterBrief 50 +server.listCharacterCreateTimeAfterDetailed 50 +server.listCharacterCreateTimeBeforeBrief 50 +server.listCharacterCreateTimeBeforeDetailed 50 +server.listCharacterCreateTimeBetweenBrief 50 +server.listCharacterCreateTimeBetweenDetailed 50 +server.listCharacterCreateTimeBrief 50 +server.listCharacterCreateTimeDetailed 50 +server.listCharacterLastLoginTimeAfterBrief 50 +server.listCharacterLastLoginTimeAfterDetailed 50 +server.listCharacterLastLoginTimeBeforeBrief 50 +server.listCharacterLastLoginTimeBeforeDetailed 50 +server.listCharacterLastLoginTimeBetweenBrief 50 +server.listCharacterLastLoginTimeBetweenDetailed 50 +server.listCharacterLastLoginTimeBrief 50 +server.listCharacterLastLoginTimeDetailed 50 +server.listConnectedCharacterData 50 +server.listConnectedCharacters 50 +server.listRegions 50 +server.listRetroactiveCtsHistory 50 +server.listTravelPoints 50 +server.memUsage 50 +server.messageCount 50 +server.profiler 50 +server.purgeTerrain 50 +server.releaseAuth 50 +server.reloadAdminTable 50 +server.reloadCommandTable 50 +server.reloadForms 50 +server.reloadQuests 50 +server.reloadTable 50 +server.reloadTerrain 50 +server.requestSameServer 50 +server.restartPlanet 50 +server.restartServer 50 +server.saveBuildoutArea 50 +server.sendMailToCharacterCreateTime 50 +server.sendMailToCharacterCreateTimeAfter 50 +server.sendMailToCharacterCreateTimeBefore 50 +server.sendMailToCharacterCreateTimeBetween 50 +server.sendMailToCharacterLastLoginTime 50 +server.sendMailToCharacterLastLoginTimeAfter 50 +server.sendMailToCharacterLastLoginTimeBefore 50 +server.sendMailToCharacterLastLoginTimeBetween 50 +server.serverinfo 50 +server.setAiCombatPulseQueueMaxWaitTimeMs 50 +server.setAiCombatPulseQueueNumber 50 +server.setCompletedTutorial 50 +server.setDebugFlag 50 +server.setExtraDelayPerFrameMs 50 +server.setFrameRateLimit 50 +server.setGodMode 5 +server.setMessageToBacklogThreshold 50 +server.setMessageToTimeLimit 50 +server.setNumberOfMoveObjectLists 50 +server.setPublic 50 +server.setQuestDebugging 50 +server.setUniverseProcess 50 +server.showGcwFactionalPresence 50 +server.showGcwScore 50 +server.showObjectSpheres 50 +server.showTriggerSpheres 50 +server.shutdown 50 +server.snapAllObjectsToTerrain 50 +server.startSave 50 +server.testStructurePlacement 50 +server.transferCharacter 50 +server.validateWorld 50 +ship.getComponentDescriptor 50 +ship.getSlotList 50 +ship.idotList 50 +ship.idotRemove 50 +ship.idotSet 50 +ship.install 50 +ship.pseudoDamageShip 50 +ship.pseudoInstall 50 +ship.purge 50 +ship.uninstall 50 +skill.getCommandList 50 +skill.getLevel 50 +skill.getSchematics 50 +skill.getSkillList 50 +skill.getSkillMods 50 +skill.grantCommand 50 +skill.grantExperience 50 +skill.grantSchematic 50 +skill.grantSchematicGroup 50 +skill.grantSkill 50 +skill.grantSkillMod 50 +skill.revokeSchematic 50 +skill.revokeSchematicGroup 50 +skill.revokeSkill 50 +skill.revokeSkillMod 50 +spaceai.clientdebug 50 +spaceai.clientdebugtext 50 +spaceai.fastaxis 50 +spaceai.maneuver 50 +spaceai.path 50 +spaceai.peace 50 +spaceai.reloaddata 50 +spaceai.serverdebug 50 +spaceai.war 50 +spawner.showcreatures 50 +spawner.showqueue 50 +veteran.claimReward 50 +veteran.getRewardInfo 50 +veteran.launchBrowser 50 +veteran.setOverrideAccountAge 50 diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab index 2e873af0f..c54ba3ba8 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2.tab @@ -268,14 +268,12 @@ i i h i f f f f f f f s p -821719718 0 object/tangible/ground_spawning/area_spawner.iff 0 2017.96 5.87111 960.343 0.903515 0 -0.428556 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troemans_lackeys_01|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -803565936 0 object/tangible/quest/corellia_murmur_shipment_datapad.iff 0 2014.15 28.588 1723.33 -0.507741 0.512436 -0.487439 -0.491946 quest.task.ground.retrieve_item_on_item $| -765763558 0 object/tangible/quest/u13_vengeance_archive_terminal.iff 0 1875.9 28 1700.32 1 0 0 0 quest.task.ground.retrieve_item_on_item $| --741107008 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -736617077 0 object/tangible/collection/rock_bubbling_03.iff 0 286.198 -0.348493 547.608 1 0 0 0 systems.collections.consume_click collection.slotName|4|col_rock_bubbling:bubbling_rock_03|$| -723865718 0 object/static/structure/general/data_terminal_s1.iff 0 1918.21 28 1387.08 -0.181293 0 0.983429 0 $| -702515714 0 object/tangible/ground_spawning/area_spawner.iff 0 1805.94 18.043 829.437 0.963058 0 -0.269295 0 systems.spawning.spawner_area fltMaxSpawnTime|2|420.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|10.000000|intDefaultBehavior|0|0|intGoodLocationSpawner|0|0|intSpawnCount|0|5|intSpawnSystem|0|1|registerWithController|0|1|strName|4|rogue3|strSpawnerType|4|area|strSpawns|4|corellia/murmur_rogue_corsec|$| -691727981 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1522.66 28 1680.94 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_3|registerWithController|0|1|$| -658546056 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1523.84 28 1679.44 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|smuggler_enemy_patrol_10064775_1|registerWithController|0|1|$| -600580134 0 object/tangible/ground_spawning/area_spawner.iff 0 1875.68 28 1707.18 -0.279448 0 0.960161 0 systems.spawning.spawner_area fltMaxSpawnTime|2|5.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|mtp_corellia_times_vendor|strSpawnerType|4|area|strSpawns|4|mtp_corellia_times_vendor|$| --575435076 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1914.64 28 1433.23 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -549090885 0 object/static/structure/corellia/corl_tent_small.iff 0 1919.09 28.2923 1385.18 0.998988 0 0 0.0449848 $| -530910864 0 object/tangible/ground_spawning/area_spawner.iff 0 2018.29 3.88241 898.71 0.95755 0 -0.288267 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|5.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|troeman_lackeys_06|strSpawnerType|4|area|strSpawns|4|corellia/troeman_lackey|$| -491828361 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1521.85 28 1585.31 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|100.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|smuggler_enemy_patrol|strPatrolPointNames|5|smuggler_enemy_patrol_10064712_1:smuggler_enemy_patrol_10064712_2:smuggler_enemy_patrol_10064712_3:smuggler_enemy_patrol_10064712_4:|strSpawnerType|4|patrol|strSpawns|4|corellia/smuggler_patrol_5|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2_ws.tab index 886537729..c28c5b393 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_2_ws.tab @@ -1158,7 +1158,7 @@ i i h i f f f f f f f s p 9766882 8105502 object/tangible/poi/spawnegg/interior_spawnegg.iff 9 -6.8 -0.9 22.4 1 0 0 0 intRandomYaw|0|1|$| 8105503 8105493 object/cell/cell.iff 10 0 0 0 1 0 0 0 $| 8105504 8105493 object/cell/cell.iff 11 0 0 0 1 0 0 0 $| --11 8105504 object/tangible/npc/rebel_recruiter_spawner.iff 11 -28.5 -0.9 -1.3 0.707107 0 0.707106 0 $| +-14 8105504 object/tangible/npc/rebel_recruiter_spawner.iff 11 -28.5 -0.9 -1.3 0.707107 0 0.707106 0 $| 1487877 8105504 object/tangible/terminal/terminal_mission_rebel.iff 11 -28.83578 -0.894985 -2.352153 1 0 0 0 $| 1487879 8105504 object/tangible/terminal/terminal_mission_rebel.iff 11 -28.77948 -0.894984 3.342379 -0.000000032 0 1 0 $| 8105505 8105493 object/cell/cell.iff 12 0 0 0 1 0 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab index 4b13e5526..6d0ad5bdb 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_2_7.tab @@ -154,7 +154,6 @@ i i h i f f f f f f f s p -1885810115 0 object/tangible/quest/naboo_theed_xharnoh_plant.iff 0 15.3193 -207.162 722.72 -0.620572 -0.0504755 0.777105 -0.0919225 quest.task.ground.retrieve_item_on_item $| -1876026501 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 812.828 6 268.495 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_enemy_patrol_10020833_3|registerWithController|0|1|$| -1875877557 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1379.48 -196.436 784.068 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|naboo_skaak_bruiser_11_12341383_2|registerWithController|0|1|$| --1873243646 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1237 6 47 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1872834889 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 828.453 6 447.561 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_4_10003339_5|registerWithController|0|1|$| -1870666513 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1114.56 6 140.893 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|theed_imp_patrol_2_10003142_3|registerWithController|0|1|$| -1859404836 0 object/tangible/collection/rare_melee_grooved_2h_sword.iff 0 1216.42 6.78291 133.377 0.703839 0.00344458 -0.00362418 0.710341 systems.collections.consume_click collection.slotName|4|col_rare_melee_01:grooved_sword_01|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab index 0ca29dda7..c272b8901 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_6_3_ws.tab @@ -4,9 +4,9 @@ i i h i f f f f f f f s p 1418872 1418871 object/cell/cell.iff 1 0 0 0 1 1.401298E-45 0 0 $| 1418873 1418871 object/cell/cell.iff 2 0 0 0 1 2.802597E-45 0 0 $| 1418874 1418871 object/cell/cell.iff 3 0 0 0 1 4.203895E-45 0 0 $| -5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| -5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| -5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 0 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| +5775509 1418874 object/tangible/terminal/terminal_mission_imperial.iff 1 12.95271 0.2 -15.19417 0.0003987961 0 1 0 $| +5775511 1418874 object/tangible/terminal/terminal_mission_imperial.iff 2 3.501986 0.2 -17.76742 0.2815403 0 0.9595497 0 $| +5775513 1418874 object/tangible/terminal/terminal_mission_imperial.iff 3 22.29844 0.2 -17.65716 -0.2559252 0 0.9666967 0 $| 1418875 1418871 object/cell/cell.iff 4 0 0 0 1 5.605194E-45 0 0 $| 4295592 1418875 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 22.33858 0.2 -42.56847 0.38268 0 -0.92388 0 $| 1418876 1418871 object/cell/cell.iff 5 0 0 0 1 7.006492E-45 0 0 $| @@ -16,12 +16,12 @@ i i h i f f f f f f f s p 1418880 1418871 object/cell/cell.iff 9 0 0 0 1 1.261169E-44 0 0 $| 1418881 1418871 object/cell/cell.iff 10 0 0 0 1 1.401298E-44 0 0 $| 1418882 1418871 object/cell/cell.iff 11 0 0 0 1 1.541428E-44 0 0 $| -8865510 1418882 object/tangible/terminal/terminal_space.iff 11 -16.0263 0.200001 -33.2646 1 0 0 0 $| -8865511 1418882 object/tangible/terminal/terminal_space.iff 11 -13.1755 0.200001 -33.2581 1 0 0 0 $| -8865518 1418882 object/tangible/terminal/terminal_space.iff 11 -18.946 0.2 -33.2894 1 0 0 0 $| +8865510 1418882 object/tangible/terminal/terminal_space.iff 1 -16.0263 0.200001 -33.2646 1 0 0 0 $| +8865511 1418882 object/tangible/terminal/terminal_space.iff 2 -13.1755 0.200001 -33.2581 1 0 0 0 $| +8865518 1418882 object/tangible/terminal/terminal_space.iff 3 -18.946 0.2 -33.2894 1 0 0 0 $| 1418883 1418871 object/cell/cell.iff 12 0 0 0 1 1.681558E-44 0 0 $| 1418884 1418871 object/cell/cell.iff 13 0 0 0 1 1.821688E-44 0 0 $| -7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 13 -44.5 0.2 -31.0 1 0 0 0 $| +7825987 1418884 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 1 -44.5 0.2 -31.0 1 0 0 0 $| 1418885 1418871 object/cell/cell.iff 14 0 0 0 1 1.961818E-44 0 0 $| 1418886 1418871 object/cell/cell.iff 15 0 0 0 1 2.101948E-44 0 0 $| 1418887 1418871 object/cell/cell.iff 16 0 0 0 1 2.242078E-44 0 0 $| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab index d560694e2..665759a92 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_3.tab @@ -2,7 +2,6 @@ objid container server_template_crc cell_index px py pz qw qx qy qz scripts objv i i h i f f f f f f f s p -2065830620 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1005.8 35.6222 102.531 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_7|registerWithController|0|1|$| -2014919809 0 object/tangible/ground_spawning/area_spawner.iff 0 1267.14 20.8576 41.8259 0.578749 0 0.815506 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| --1947770479 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1905547180 0 object/tangible/ground_spawning/area_spawner.iff 0 245.622 11.646 246.255 0.982156 0 0.188067 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1866569792 0 object/tangible/ground_spawning/area_spawner.iff 0 602.853 10 345.521 0.766702 0 0.642003 0 systems.spawning.spawner_area fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|beast_master_trainer_tatooine_bestine|strSpawnerType|4|area|strSpawns|4|trainer_beast_master|$| -1826810507 0 object/tangible/ground_spawning/area_spawner.iff 0 202.3 8.88664 220.3 0.95283 0 -0.303503 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| @@ -13,7 +12,6 @@ i i h i f f f f f f f s p -1733406107 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 203.633 9.32885 225.993 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_1|registerWithController|0|1|$| -1628819013 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1032.2 28.8904 93.1309 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_6|registerWithController|0|1|$| -1614337274 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 679.806 12 446.737 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_1|registerWithController|0|1|$| --1561383607 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1534702832 0 object/tangible/ground_spawning/area_spawner.iff 0 212.705 8.27512 179.58 -0.55929 0 0.828972 0 systems.spawning.spawner_area fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|75.000000|fltRadius|2|20.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|4|intSpawnSystem|0|1|registerWithController|0|1|strName|4|dune_bantha|strSpawnerType|4|area|strSpawns|4|dune_bantha|$| -1503650413 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 246.826 7.64266 180.808 0.640997 0 0.767543 0 quest.task.ground.retrieve_item_on_item $| -1501410464 0 object/tangible/ground_spawning/patrol_spawner.iff 0 700.962 12 431.981 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|90.000000|fltMinSpawnTime|2|60.000000|fltRadius|2|1.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|patrolPathType|4|cycle|registerWithController|0|1|strName|4|Smuggler_Enemy_Patrol|strPatrolPointNames|5|Smuggler_Enemy_Patrol_10028545_1:Smuggler_Enemy_Patrol_10028545_2:Smuggler_Enemy_Patrol_10028545_3:|strSpawnerType|4|patrol|strSpawns|4|tatooine/smuggler_patrol_bh_2|$| @@ -29,7 +27,6 @@ i i h i f f f f f f f s p -1215847131 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 210.79 8.43133 178.803 1 0 0 0 quest.task.ground.retrieve_item_on_item $| -1194217681 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1095.56 20.5278 82.0183 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_commando_10826018_2|registerWithController|0|1|$| -1189182743 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 987.378 42.6961 115.614 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_8|registerWithController|0|1|$| --1138262739 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1126463617 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1118.9 19.254 74.9883 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|anchorjobs_legplus_merc_recon_10825751_2|registerWithController|0|1|$| -1114884077 0 object/tangible/ground_spawning/area_spawner.iff 0 1303 16.3169 34 -0.0479312 0 0.998851 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_bantha|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_bantha|$| -1109089490 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 199.077 8.51831 214.935 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|roaming_dune_bantha_12621479_9|registerWithController|0|1|$| @@ -62,7 +59,6 @@ i i h i f f f f f f f s p -182208727 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 671.32 12 456.355 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10028545_2|registerWithController|0|1|$| -180762470 0 object/tangible/quest/ac_rotting_dune_bramble.iff 0 201.446 9.00667 222.212 0.999343 -0.0353187 -0.000288859 0.00817327 quest.task.ground.retrieve_item_on_item $| -161984126 0 object/tangible/ground_spawning/area_spawner.iff 0 845.708 12 483.491 0.99158 0 0.129493 0 systems.spawning.spawner_area fltMaxSpawnTime|2|2.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|1.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|fs_reward|strSpawnerType|4|area|strSpawns|4|tatooine/fs_11_reward|$| --156539612 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 772.241 12 505.011 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -76802086 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 680.746 12 448.936 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10027959_2|registerWithController|0|1|$| -26400255 0 object/tangible/theme_park/invisible_object.iff 0 772.241 12 505.011 0.862807 0 -0.505533 0 theme_park.controller_initialize scriptString|4|theme_park.restuss_event.stage_two_crier|$| -599 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 292.1 31.4761 772.685 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_head_hauler_10112410_6|registerWithController|0|1|$| diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab index 5887585a7..22f16b828 100755 --- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab +++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2.tab @@ -282,7 +282,6 @@ i i h i f f f f f f f s p -1147174879 0 object/tangible/furniture/tatooine/frn_tato_table_small_style_01.iff 0 1221.59 5 1322.23 1 0 0 0 $| -1144708641 0 object/static/structure/tatooine/debris_tatt_drum_storage_1.iff 0 806.862 7.59167 1028.47 0.56848 0.364378 0.62099 0.398035 $| -1141460083 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1432.73 5 1137.62 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_Patrol_10043732_1|registerWithController|0|1|$| --1141197897 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -1116958851 0 object/tangible/furniture/jedi/frn_all_light_chair_s02.iff 0 1219.67 5 1325.67 -0.557023 0 0.830497 0 occupied.limit|0|1|$| -1115558886 0 object/tangible/ground_spawning/patrol_spawner.iff 0 1139.53 5 1483.5 1 0 0 0 systems.spawning.spawner_patrol fltMaxSpawnTime|2|270.000000|fltMinSpawnTime|2|90.000000|fltRadius|2|0.000000|intDefaultBehavior|0|3|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|patrolPathType|4|oscillate|registerWithController|0|1|strName|4|legacy_niko_thugs|strPatrolPointNames|5|legacy_niko_thugs_10024124_1:legacy_niko_thugs_10024124_2:legacy_niko_thugs_10024124_3:legacy_niko_thugs_10024124_4:legacy_niko_thugs_10024124_5:legacy_niko_thugs_10024124_6:legacy_niko_thugs_10024124_7:legacy_niko_thugs_10024124_8:legacy_niko_thugs_10024124_9:legacy_niko_thugs_10024124_10:|strSpawnerType|4|patrol|strSpawns|4|tatooine/tat_smuggler_15|$| -1107715798 0 object/tangible/collection/publish_gift_comlink_component_07.iff 0 1126.27 7.16043 1109.54 -0.0408745 0.0354367 0.685125 0.726414 systems.collections.consume_click collection.slotName|4|col_publish_com_link_component_01:publish_com_link_component_07|$| @@ -591,7 +590,6 @@ i i h i f f f f f f f s p -124994259 0 object/tangible/ground_spawning/area_spawner.iff 0 734.943 7.39358 1858 0.955494 0 -0.295012 0 systems.spawning.spawner_area fltMaxSpawnTime|2|200.000000|fltMinSpawnTime|2|180.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_gunrunner_05|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_newbie_gunrunner_sentry|$| -118803310 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1174.94 4.56121 1484.43 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|Smuggler_Enemy_patrol_10029562_4|registerWithController|0|1|$| -117774221 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1066.6 8.95239 1381 1 0 0 0 systems.spawning.patrol_point_setup ignoreInBuildoutArray|0|1|pointName|4|legacy_nikos_thugs_10021354_6|registerWithController|0|1|$| --117732858 0 object/tangible/ground_spawning/patrol_waypoint.iff 0 1470.97 4 1332.37 1 0 0 0 theme_park.restuss_event.stage_two_crier ignoreInBuildoutArray|0|1|registerWithController|0|1|$| -106832518 0 object/tangible/ground_spawning/area_spawner.iff 0 1635.8 5 1520.04 -0.65728 0 0.753646 0 systems.spawning.spawner_area fltMaxSpawnTime|2|60.000000|fltMinSpawnTime|2|30.000000|fltRadius|2|2.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|3|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_rockmites|strSpawnerType|4|area|strSpawns|4|tatooine/tatooine_rockmites|$| -104803512 0 object/tangible/ground_spawning/area_spawner.iff 0 1053.49 10.0046 1215.65 0.548112 0 0.836405 0 systems.spawning.spawner_area fltMaxSpawnTime|2|120.000000|fltMinSpawnTime|2|80.000000|fltRadius|2|6.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|2|intSpawnSystem|0|1|registerWithController|0|1|strName|4|tatooine_newbie_scavenger_04|strSpawnerType|4|area|strSpawns|4|tatooine/scavenger|$| -91363171 0 object/tangible/furniture/tatooine/frn_tato_chair_cafe_style_01.iff 0 1222.61 5 1322.52 -0.609791 0 0.792563 0 occupied.limit|0|1|$| diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab index ef5358657..b4d9c1cc9 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab @@ -1104,6 +1104,7 @@ item_color_crystal_02_09 int:jedi.crystal.stats.color=9,int:jedi.crystal.stats item_color_crystal_02_10 int:jedi.crystal.stats.color=10,int:jedi.crystal.stats.level=-1 index_color_1=10 item_color_crystal_02_11 int:jedi.crystal.stats.color=11,int:jedi.crystal.stats.level=-1 index_color_1=11 item_color_crystal_02_12 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=12 +item_crystal_allyas_exile_01 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=0 item_color_crystal_02_13 int:jedi.crystal.stats.color=13,int:jedi.crystal.stats.level=-1 index_color_1=13 item_color_crystal_02_14 int:jedi.crystal.stats.color=14,int:jedi.crystal.stats.level=-1 index_color_1=14 item_color_crystal_02_15 int:jedi.crystal.stats.color=15,int:jedi.crystal.stats.level=-1 index_color_1=15 @@ -1119,12 +1120,13 @@ item_color_crystal_02_24 int:jedi.crystal.stats.color=24,int:jedi.crystal.stat item_color_crystal_02_25 int:jedi.crystal.stats.color=25,int:jedi.crystal.stats.level=-1 index_color_1=25 item_color_crystal_02_26 int:jedi.crystal.stats.color=26,int:jedi.crystal.stats.level=-1 index_color_1=26 item_color_crystal_02_27 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 +item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 item_color_crystal_02_28 int:jedi.crystal.stats.color=28,int:jedi.crystal.stats.level=-1 index_color_1=28 item_color_crystal_02_29 int:jedi.crystal.stats.color=29,int:jedi.crystal.stats.level=-1 index_color_1=29 item_color_crystal_02_30 int:jedi.crystal.stats.color=30,int:jedi.crystal.stats.level=-1 index_color_1=30 -item_crystal_tyranus_cunning_01 int:jedi.crystal.stats.color=31,int:jedi.crystal.stats.level=-1 index_color_1=1 -item_crystal_allyas_exile_01 int:jedi.crystal.stats.color=12,int:jedi.crystal.stats.level=-1 index_color_1=0 -item_crystal_allyas_redemption_01 int:jedi.crystal.stats.color=27,int:jedi.crystal.stats.level=-1 index_color_1=27 +item_crystal_tyranus_cunning_01 int:jedi.crystal.stats.color=32,int:jedi.crystal.stats.level=-1 index_color_1=1 +item_crystal_mauls_vengeance_01 int:jedi.crystal.stats.color=33,int:jedi.crystal.stats.level=-1 index_color_1=33 +item_crystal_quigons_devotion_01 int:jedi.crystal.stats.color=34,int:jedi.crystal.stats.level=-1 index_color_1=34 item_power_crystal_04_01 int:jedi.crystal.stats.min_dmg=1,int:jedi.crystal.stats.max_dmg=2,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_02 int:jedi.crystal.stats.min_dmg=2,int:jedi.crystal.stats.max_dmg=3,int:jedi.crystal.stats.quality=0,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_03 int:jedi.crystal.stats.min_dmg=3,int:jedi.crystal.stats.max_dmg=4,int:jedi.crystal.stats.quality=1,int:jedi.crystal.stats.level=-1 index_color_1=31 @@ -1134,7 +1136,7 @@ item_power_crystal_04_06 int:jedi.crystal.stats.min_dmg=6,int:jedi.crystal.sta item_power_crystal_04_07 int:jedi.crystal.stats.min_dmg=7,int:jedi.crystal.stats.max_dmg=8,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_08 int:jedi.crystal.stats.min_dmg=8,int:jedi.crystal.stats.max_dmg=9,int:jedi.crystal.stats.quality=2,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_09 int:jedi.crystal.stats.min_dmg=9,int:jedi.crystal.stats.max_dmg=10,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 -item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 +item_power_crystal_04_10 int:jedi.crystal.stats.min_dmg=10,int:jedi.crystal.stats.max_dmg=11,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_11 int:jedi.crystal.stats.min_dmg=11,int:jedi.crystal.stats.max_dmg=12,int:jedi.crystal.stats.quality=3,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_12 int:jedi.crystal.stats.min_dmg=12,int:jedi.crystal.stats.max_dmg=13,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31 item_power_crystal_04_13 int:jedi.crystal.stats.min_dmg=13,int:jedi.crystal.stats.max_dmg=14,int:jedi.crystal.stats.quality=4,int:jedi.crystal.stats.level=-1 index_color_1=31 diff --git a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab index e6096e90d..de64f22f9 100755 --- a/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab +++ b/sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab @@ -8300,7 +8300,7 @@ item_schematic_gcw2_survey_tool_all object/tangible/loot/loot_schematic/generic_ rare_loot_chest_quality_1 object/tangible/item/rare_loot_chest_1.iff systems.loot.rare_loot_chest Rare Loot Chest Rare Loot Chest... Open it up! rare_loot_chest_quality_2 object/tangible/item/rare_loot_chest_2.iff systems.loot.rare_loot_chest Exceptional Loot Chest Exceptional Loot Chest... Open it up! rare_loot_chest_quality_3 object/tangible/item/rare_loot_chest_3.iff systems.loot.rare_loot_chest Legendary Loot Chest Legen-wait for it-dary Loot Chest... Open it up! -item_player_house_deed_jabbas_sail_barge object/tangible/deed/player_house_deed/jabbas_sail_barge_deed.iff 4 item.special.nomove,item.structure_deed.player_structure_deed cloud city house a cloud city house +item_player_house_deed_jabbas_sail_barge object/tangible/deed/player_house_deed/jabbas_sail_barge_deed.iff 4 item.special.nomove,item.structure_deed.player_structure_deed Replica Jabba's Sail Barge House a replica of Jabba's sail barge for use as a house. item_tcg_loot_reward_series8_glass_sculpture object/tangible/tcg/series8/decorative_bespin_glass_sculpture.iff 4 item.special.nomove Glass Helix Sculpture From the skilled artisans of the Cloud City, this showy piece beautifies your home, creating an opulent diffusion of light in even the most humble of dwellings. item_tcg_loot_reward_series8_bespin_lamp_off object/tangible/tcg/series8/combine_decorative_bespin_lamp_off.iff 4 item.special.nomove,systems.tcg.tcg_bespin_lights,systems.tcg.tcg_combine_tcg_items_generic Cloud City Lamp Build-An-Item Object #2: This elegant lamp is patterned after the decorative illumination units found in the Cloud city on Bespin. item_tcg_loot_reward_series8_bespin_lamp_on object/tangible/tcg/series8/combine_decorative_bespin_lamp_on.iff 4 item.special.nomove,systems.tcg.tcg_bespin_lights,systems.tcg.tcg_combine_tcg_items_generic Cloud City Lamp Build-An-Item Object #2: This elegant lamp is patterned after the decorative illumination units found in the Cloud city on Bespin. @@ -8535,3 +8535,8 @@ armor_mandalorian_dwb_helmet object/tangible/wearables/armor/mandalorian/armor_m armor_mandalorian_dwb_leggings object/tangible/wearables/armor/mandalorian/armor_mandalorian_leggings.iff armor 90 4 item.special.nomove 2 1 Mandalorian Armor Leggings Mandalorian Armor Leggings item_tcg_loot_reward_series9_ep9d object/tangible/tcg/series9/painting_posters_ep9d.iff 4 item.special.nomove The Rise Of Skywalker The theatrical poster for Star Wars - The Rise Of Skywalker item_tcg_loot_reward_series9_ep9e object/tangible/tcg/series9/painting_posters_ep9e.iff 4 item.special.nomove The Rise Of Skywalker The IMAX movie poster for Star Wars - The Rise Of Skywalker +item_power_crystal_04_21 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 4 systems.jedi.jedi_saber_component 1 Power Crystal A Force Crystal, used by Jedi in their lightsabers.||This crystal must be tuned by a Jedi before use. Once tuned this crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_crystal_mauls_vengeance_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Maul's Vengeance A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_crystal_quigons_devotion_01 object/tangible/component/weapon/lightsaber/lightsaber_module_force_crystal.iff 2 systems.jedi.jedi_saber_component 1 Qui-Gon's Devotion A Force Color Crystal, used by Jedi in their lightsabers.||This color crystal must be tuned by a Jedi before use. Once tuned this color crystal becomes a focusing crystal and can only be used in a lightsaber by the Jedi who tuned it. +item_player_house_deed_tree_house_01 object/tangible/deed/player_house_deed/tree_house_01_deed.iff 4 item.special.nomove,item.structure_deed.player_structure_deed Kashyyyk Tree House a kashyyyk tree house. +item_player_house_deed_tree_house_02 object/tangible/deed/player_house_deed/tree_house_02_deed.iff 4 item.special.nomove,item.structure_deed.player_structure_deed Kashyyyk Tree House (Tall) a tall kashyyyk tree house. diff --git a/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab b/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab index 9b41bcf10..78f97a97f 100755 --- a/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab +++ b/sku.0/sys.server/compiled/game/datatables/jedi/crystal_color_damage.tab @@ -12,7 +12,7 @@ i "e(none=0,cold=64,heat=32,acid=128,electric=256)[none]" f c 9 electric 0.02 10 heat 0.02 11 heat 0.02 -12 heat 0.05 Maul's Vengence +12 heat 0.05 Allya's Exile 13 heat 0.04 Kun's Blood 14 acid 0.06 Bondara's Folly 15 acid 0.04 Ulric's Redemption @@ -27,8 +27,25 @@ i "e(none=0,cold=64,heat=32,acid=128,electric=256)[none]" f c 24 electric 0.04 Quintessence of the Force 25 acid 0.04 Dawn of Dagobah 26 electric 0.04 Horn's Future -27 heat 0.06 Qui-gon's Devotion +27 acid 0.04 Allya's Redemption 28 cold 0.06 Kenobi's Legacy 29 heat 0.06 Sunrider's Destiny 30 acid 0.04 Kit's Ferocity -31 heat 0.06 Cunning of Tyranus +32 heat 0.06 Cunning of Tyranus +33 heat 0.05 Maul's Vengeance +34 acid 0.04 Qui-gon's Devotion +35 cold 0.01 unused +36 cold 0.01 unused +37 cold 0.01 unused +38 cold 0.01 unused +39 cold 0.01 unused +40 cold 0.01 unused +41 cold 0.01 unused +42 cold 0.01 unused +43 cold 0.01 unused +44 cold 0.01 unused +45 cold 0.01 unused +46 cold 0.01 unused +47 cold 0.01 unused +48 cold 0.01 unused + diff --git a/sku.0/sys.server/compiled/game/datatables/mob/creatures.tab b/sku.0/sys.server/compiled/game/datatables/mob/creatures.tab index e1744eab4..5d8c30c84 100755 --- a/sku.0/sys.server/compiled/game/datatables/mob/creatures.tab +++ b/sku.0/sys.server/compiled/game/datatables/mob/creatures.tab @@ -3586,7 +3586,7 @@ naboo_muskeg_reactionary 29 0 0 0 1 NORMAL quest NPC naboo muskeg gungan_outc naboo_muskeg_zealot 25 0 0 0 1 NORMAL quest NPC naboo muskeg gungan_outcast.iff 1 1.1 0 0 0 0 0 0 0 0 0 2 npc/npc_21_30 generic_npc_3 npc pirate slang pirate_carbine_low_level pirate_pistol_low_level medic_2 medic_2 6 6 1 yes naboo_narglatch_rabid 26 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 0.9 1 3 0 0 0 0 0 15 0 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 1 yes naboo_narglatch_rabid_grizzlefur 29 0 0 0 0 NORMAL named quest NPC naboo narglatch narglatch_hue.iff 1.4 1.5 3 30 25 0 -1 0 65 -1 -1 2 1 80 meat_carnivore 50 hide_bristley 50 bone_mammal defaultProfile 1 100 creature/creature_21_30 elite_creature_3 6 18 narglatch carnivore predatory_cat_2 predatory_cat_2 3 3 1 yes -naboo_narglatch_rabid_matriarch 27 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.2 3 30 25 0 -1 0 65 -1 -1 2 1 70 meat_carnivore 40 hide_bristley 40 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 1 +naboo_narglatch_rabid_matriarch 27 0 0 0 0 NORMAL naboo narglatch narglatch_female_hue.iff 1.1 1.2 3 30 25 0 -1 0 65 -1 -1 2 1 70 meat_carnivore 40 hide_bristley 40 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 1 naboo_nightspider_bloodsipper 25 1 -1 0 0 NORMAL naboo nightspider hermit_spider_hue.iff 1.2 1.3 3 0 0 0 0 0 0 15 -1 2 1 7 meat_insect defaultProfile creature/insect_21_30 generic_creature_3 0.1 lowAttackSpeedWeak carnivore spider_2 spider_2 6 6 1 1 naboo_nightspider_fleshrender 24 1 -1 0 0 NORMAL naboo nightspider hermit_spider_hue.iff 1 1.1 3 0 0 0 0 0 0 15 -1 2 1 7 meat_insect defaultProfile creature/insect_21_30 generic_creature_3 0.1 lowAttackSpeedWeak carnivore spider_2 spider_2 6 6 1 yes naboo_nightspider_nocturlan 21 1 -1 0 0 NORMAL naboo nightspider hermit_spider_hue.iff 2.5 2.5 3 0 0 0 0 0 0 0 -1 2 1 10 meat_insect defaultProfile 1 100 npc/elite_npc:elite_npc_21_30 elite_creature_3 col_dejarik_holomonster,col_dejarik_table 0.1 lowAttackUtilityWeak carnivore object/weapon/ranged/creature/creature_spit_small_toxicgreen.iff object/weapon/ranged/creature/creature_spit_small_toxicgreen.iff spider_2 spider_2 3 3 @@ -3671,10 +3671,10 @@ naive_jinda_workling 64 0 0 0 0 NORMAL endor jinda_tribe jinda_tribe species_ naive_panshee_workling 70 0 0 0 0 NORMAL endor panshee_tribe panshee_tribe species_choices_ewok 0.5 0.5 0 20 20 0 0 0 0 0 -1 2 0 0 npc/npc_61_70 generic_npc_7 col_story_count_dooku_set_1,col_story_count_dooku_set_2,col_aurebesh_tiles,col_shattered_shard_03,col_glass_shelving_02 18 panshee npc ewok_melee ewok_ranged melee_6 spy_7 0 12 1 narglatch 21 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 0.8 1.2 1 25 0 0 -1 0 50 -1 -1 2 1 75 meat_carnivore 45 hide_bristley 40 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch 0.15 medAttackDamageWeak carnivore predatory_cat_2 predatory_cat_2 6 6 1 narglatch_cub 20 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 0.3 0.6 1 0 0 0 0 0 0 0 -1 2 1 30 meat_carnivore 25 hide_bristley 20 bone_mammal defaultProfile creature/creature_11_20 generic_creature_2 4 18 narglatch 0.15 lowAttackSpeedWeak carnivore predatory_cat_2 predatory_cat_2 0 2 1 yes -narglatch_female 22 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 25 0 0 0 -1 -1 0 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch 0.15 medAttackDamageWeak carnivore predatory_cat_2 predatory_cat_2 6 6 1 yes +narglatch_female 22 0 0 0 0 NORMAL naboo narglatch narglatch_female_hue.iff 1.1 1.4 4 25 0 0 0 -1 -1 0 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch 0.15 medAttackDamageWeak carnivore predatory_cat_2 predatory_cat_2 6 6 1 yes narglatch_guardian 26 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 10 20 0 -1 0 50 -1 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile 1 100 creature/narglatch_guardian_loot generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 3 3 1 yes narglatch_hunter 25 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 0 0 0 0 0 15 0 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile 1 100 creature/elite_creature:elite_creature_21_30 generic_creature_3 6 col_dejarik_holomonster,col_dejarik_table 18 narglatch carnivore predatory_cat_2 predatory_cat_2 3 3 1 yes -narglatch_matriarch 25 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 30 25 0 -1 0 65 -1 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 yes +narglatch_matriarch 25 0 0 0 0 NORMAL naboo narglatch narglatch_female_hue.iff 1.1 1.4 4 30 25 0 -1 0 65 -1 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 yes narglatch_protector 28 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 30 25 0 -1 0 65 -1 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 6 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 yes narglatch_scavenger 26 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 4 30 25 0 -1 0 65 -1 -1 2 1 65 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_3 18 narglatch carnivore predatory_cat_2 predatory_cat_2 6 6 1 narglatch_sick 25 0 0 0 0 NORMAL naboo narglatch narglatch_hue.iff 1.1 1.4 14 25 0 0 0 -1 -1 0 -1 2 1 100 meat_carnivore 35 hide_bristley 35 bone_mammal defaultProfile creature/creature_21_30 generic_creature_2 4 medAttackDamageWeak carnivore predatory_cat_2 predatory_cat_2 2 2 1 diff --git a/sku.0/sys.server/compiled/game/datatables/structure/cell_height.tab b/sku.0/sys.server/compiled/game/datatables/structure/cell_height.tab index 1e1462c6c..8c187170e 100755 --- a/sku.0/sys.server/compiled/game/datatables/structure/cell_height.tab +++ b/sku.0/sys.server/compiled/game/datatables/structure/cell_height.tab @@ -445,3 +445,4 @@ object/building/player/player_guildhall_tatooine_style_01.iff basement -2.01732 object/building/player/player_guildhall_tatooine_style_01.iff meeting2 -3.85144 -8.5 object/building/player/player_guildhall_tatooine_style_01.iff meeting4 -4.00956 -8.5 object/building/player/player_guildhall_tatooine_style_01.iff meeting5 -4.13606 -8.5 +object/building/player/player_house_tree_house_02.iff entry 100 0.1 diff --git a/sku.0/sys.server/compiled/game/datatables/structure/player_structure.tab b/sku.0/sys.server/compiled/game/datatables/structure/player_structure.tab index 56abc0f6d..b737bff81 100755 --- a/sku.0/sys.server/compiled/game/datatables/structure/player_structure.tab +++ b/sku.0/sys.server/compiled/game/datatables/structure/player_structure.tab @@ -1,413 +1,416 @@ -STRUCTURE TEMP_STRUCTURE FOOTPRINT_TEMPLATE NO_LOT_REQUIREMENT LOT_REDUCTION EJECT_RANGE CIVIC CITY_RANK CITY_COST SHUTTLEPORT CLONE_FACILITY GARAGE CAN_RECLAIM MAINT_RATE DECAY_RATE CONDITION REDEED_COST HAS_SIGN POWER_RATE SKILLMOD SKILLMODVALUE SKILLMOD_MESSAGE VERSION OBJECT X Y Z CELL HEADING COMMENTS -s s s i I f[0] I I I I I I b[1] i i i i[0] I[0] f[0] s i s i s f f f s f c -object/building/player/player_house_tcg_relaxation_pool.iff object/building/player/construction/construction_player_tcg_relaxation_pool.iff 0 32 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 7.25 4 0 entry -90 -object/building/player/player_house_jedi_meditation_room.iff object/building/player/construction/construction_player_jedi_meditation_room.iff 0 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.2 4 -1.1 entry -91 -object/building/player/player_house_sith_meditation_room.iff object/building/player/construction/construction_player_sith_meditation_room.iff 0 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 4 4 1.85 entry 180 -object/building/player/player_house_corellia_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -5 0.74 -2.76 entry -90 -object/building/player/player_house_corellia_small_style_01_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 -object/building/player/player_house_corellia_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.5 0.63 3.77 entry 90 -object/building/player/player_house_corellia_small_style_02_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.7 0.62 3.55 entry 90 -object/building/player/player_house_corellia_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 3 0.62 6.4 public 180 -object/building/player/player_house_corellia_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff -7.15 0.88 5.59 middleroom 180 -object/building/player/player_house_corellia_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.17 4.59 -4.4 mainhall1 0 -object/building/player/player_house_corellia_large_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 -object/building/player/player_house_generic_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -5 0.74 -2.76 entry -90 -object/building/player/player_house_generic_small_style_01_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 -object/building/player/player_house_generic_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.5 0.63 3.77 entry 90 -object/building/player/player_house_generic_small_style_02_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.69 0.62 3.55 entry 90 -object/building/player/player_house_generic_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 3 0.62 6.4 public 180 -object/building/player/player_house_generic_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff -7.15 0.88 5.59 middleroom 180 -object/building/player/player_house_generic_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.17 4.59 -4.4 mainhall1 0 -object/building/player/player_house_generic_large_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 -object/building/player/player_house_naboo_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.1 0.7 5.31 foyer -90 -object/building/player/player_house_naboo_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 0.6 0.7 6.15 hall 180 -object/building/player/player_house_naboo_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 9.89 1.1 -10.75 foyerdown 0 -object/building/player/player_house_naboo_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 5.62 1.06 7.98 foyer 180 -object/building/player/player_house_naboo_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff 14.85 4.7 -1.76 hall1 -90 -object/building/player/player_house_tatooine_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 -object/building/player/player_house_tatooine_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 -object/building/player/player_house_tatooine_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 6.94 1.06 7.98 foyer 180 -object/building/player/player_house_tatooine_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff 8.16 1.06 11.24 public 180 -object/installation/manufacture/clothing_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 -object/installation/manufacture/food_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 -object/installation/manufacture/weapon_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 -object/installation/manufacture/structure_factory.iff object/installation/base/construction_installation_base.iff 1 13 6 1000 2500 50 4 -object/installation/generators/power_generator_fusion_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 -object/installation/generators/power_generator_photo_bio_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 -object/installation/generators/power_generator_solar_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 -object/installation/generators/power_generator_geothermal_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 -object/installation/generators/power_generator_wind_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 -object/installation/mining_gas/mining_gas_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 -object/installation/mining_gas/mining_gas_harvester_style_2.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 -object/installation/mining_gas/mining_gas_harvester_style_3.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 -object/installation/mining_gas/mining_gas_harvester_style_4.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 -object/installation/mining_liquid/mining_liquid_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 -object/installation/mining_liquid/mining_liquid_harvester_style_2.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 -object/installation/mining_liquid/mining_liquid_harvester_style_3.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 -object/installation/mining_liquid/mining_liquid_harvester_style_4.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 -object/installation/mining_liquid/mining_liquid_moisture_harvester.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 -object/installation/mining_liquid/mining_liquid_moisture_harvester_medium.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 -object/installation/mining_liquid/mining_liquid_moisture_harvester_heavy.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 -object/installation/mining_liquid/mining_liquid_moisture_harvester_elite.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 -object/installation/mining_ore/mining_ore_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 20 4 -object/installation/mining_ore/mining_ore_harvester_style_2.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_2.iff -1 15 6 1000 3000 50 4 -object/installation/mining_ore/mining_ore_harvester_heavy.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_heavy.iff -1 23 6 1000 4500 75 10 4 -object/installation/mining_ore/mining_ore_harvester_elite.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_heavy.iff -3 63 6 1000 12375 206 4 -object/installation/mining_organic/mining_organic_creature_farm.iff object/installation/base/construction_installation_base.iff 1 13 6 1000 2500 50 4 -object/installation/mining_organic/mining_organic_flora_farm.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 -object/installation/mining_organic/mining_organic_flora_farm_medium.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 -object/installation/mining_organic/mining_organic_flora_farm_heavy.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 -object/installation/mining_organic/mining_organic_flora_farm_elite.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 -object/building/player/player_guildhall_corellia_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 - object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 -object/building/player/player_guildhall_generic_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 - object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 -object/building/player/player_guildhall_naboo_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 - object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 -object/building/player/player_guildhall_tatooine_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 - object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 -object/building/player/player_guildhall_tatooine_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 2 25 5 7200 5000 1 4 - object/tangible/terminal/terminal_player_structure.iff 9.13 1 6.36 lobby 90 -object/installation/turret/turret_block_large.iff object/installation/base/construction_installation_base.iff 0 0 15 6 3000 -object/installation/turret/turret_block_med.iff object/installation/base/construction_installation_base.iff 0 0 10 6 2000 -object/installation/turret/turret_block_sm.iff object/installation/base/construction_installation_base.iff 0 0 5 6 1000 - -object/installation/faction_perk/covert_detector/detector_32m.iff object/installation/base/construction_installation_base.iff 1 0 0 8 6 10000 1500 4 -object/installation/faction_perk/turret/block_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 -object/installation/faction_perk/turret/block_med.iff object/installation/base/construction_installation_base.iff 1 0 0 10 6 200000 2000 4 -object/installation/faction_perk/turret/block_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 -object/installation/faction_perk/turret/dish_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 -object/installation/faction_perk/turret/dish_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 -object/installation/faction_perk/turret/tower_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 -object/installation/faction_perk/turret/tower_med.iff object/installation/base/construction_installation_base.iff 1 0 0 10 6 200000 2000 4 -object/installation/faction_perk/turret/tower_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 - 1 -object/installation/faction_perk/minefield/field_1x1.iff object/installation/base/construction_installation_base.iff -1 0 0 0 1000 4 - -object/building/faction_perk/hq/hq_s01_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0 -6 mainhall 0 -object/building/faction_perk/hq/hq_s01_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0 -6 mainhall 0 -object/building/faction_perk/hq/hq_s02_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s02_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s03_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s03_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s04_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s04_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s05_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 1 12.5 mainhall 180 -object/building/faction_perk/hq/hq_s05_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 1 12.5 mainhall 180 -object/building/player/player_merchant_tent_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 - object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 -object/building/player/player_merchant_tent_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 - object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 -object/building/player/player_merchant_tent_style_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 - object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 -object/building/player/city/cityhall_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 - object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 - object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 - object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 -object/building/player/city/cityhall_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 - object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 - object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 - object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 -object/building/player/city/cityhall_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 - object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 - object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 - object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 -object/building/player/city/bank_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 - object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 - object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 - object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 - object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 -object/building/player/city/bank_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 - object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 - object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 - object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 - object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 -object/building/player/city/bank_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 - object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 - object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 - object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 - object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 -object/building/player/city/barn_no_planet_restriction.iff object/building/player/construction/construction_player_barn.iff 0 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 3 1.8 3 entry 180 -object/building/player/city/cantina_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 - object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 -object/building/player/city/cantina_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 - object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 -object/building/player/city/cantina_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 - object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 -object/building/player/city/cloning_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 -5 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 - object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 - object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 - object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 -object/building/player/city/cloning_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 - object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 - object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 - object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 -object/building/player/city/cloning_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 - object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 - object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 - object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 -object/building/player/city/diner_no_planet_restriction.iff object/building/player/construction/construction_player_diner.iff 1 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 -object/building/player/city/hospital_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 - object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 -object/building/player/city/hospital_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 - object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 -object/building/player/city/hospital_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 - object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 -object/building/player/city/theater_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 - object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 -object/building/player/city/theater_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 - object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 -object/building/player/city/theater_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 - object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 -object/building/player/city/shuttleport_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 -object/building/player/city/shuttleport_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 -object/building/player/city/shuttleport_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 -object/building/player/city/garden_corellia_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_corellia_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_corellia_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_corellia_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_corellia_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_corellia_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_corellia_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_corellia_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_corellia_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_corellia_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_corellia_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_corellia_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_corellia_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_corellia_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_corellia_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_naboo_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_naboo_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_naboo_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_naboo_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_naboo_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_naboo_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_naboo_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_naboo_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_naboo_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_naboo_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_naboo_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_naboo_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_naboo_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_naboo_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_naboo_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_tatooine_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_dantooine_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_dantooine_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_dantooine_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_dathomir_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_dathomir_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_dathomir_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/city/garden_endor_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 -object/building/player/city/garden_endor_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 -object/building/player/city/garden_endor_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 -object/building/player/player_garage_tatooine_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 -object/building/player/player_garage_naboo_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 -object/building/player/player_garage_corellia_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 -object/building/faction_perk/hq/hq_s01_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0 -6 mainhall 0 -object/building/faction_perk/hq/hq_s01_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0 -6 mainhall 0 -object/building/faction_perk/hq/hq_s02_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s02_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s03_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s03_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s04_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s04_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 -object/building/faction_perk/hq/hq_s05_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_rebel.iff 0 1 12.5 mainhall 180 -object/building/faction_perk/hq/hq_s05_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 - object/tangible/terminal/terminal_hq_imperial.iff 0 1 12.5 mainhall 180 -object/building/player/player_house_mustafar_lg.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff -1 8 13 5 7200 0 1 4 - object/tangible/terminal/terminal_player_structure.iff -4.5 0.46 6.33 entrance 90 - object/tangible/terminal/terminal_elevator_up.iff -1.19 -33 1.61 elevator 160 - object/tangible/terminal/terminal_elevator_down.iff 1.18 -26 1.65 elevator -166 - object/tangible/terminal/terminal_elevator_down.iff 1.18 0.47 1.65 elevator -166 - object/tangible/terminal/terminal_elevator_up.iff -1.19 -26 1.61 elevator 160 -object/building/player/city/garden_imperial_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 1.5 -0.9 -3.5 WORLD_DELTA 0 -object/building/player/city/garden_rebel_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 - object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 2.85 -0.9 -4 WORLD_DELTA 0 -object/building/player/player_house_tatooine_small_window_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 -object/building/player/player_house_naboo_small_window_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff -1 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.1 0.7 5.31 foyer -90 -object/building/player/player_house_generic_small_windowed.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 -object/building/player/player_house_generic_medium_windowed.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 5 0.62 6.4 public -180 -object/building/player/player_house_generic_small_window_style_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure.iff -1.8 3 4.3 entry -180 -object/building/player/player_house_generic_medium_windowed_s02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 - object/tangible/terminal/terminal_player_structure.iff 5 -2 6 entryway -180 -object/building/player/player_house_generic_large_window_s01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 Z = FORWARD/BACK -object/building/player/player_house_generic_large_window_s02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 Y = UP/DOWN - object/tangible/terminal/terminal_player_structure.iff 8 0 -8.5 entry 0 X = right/left -object/building/player/player_house_hangar.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 5 13 5 7200 0 1 4 Y = UP/DOWN - object/tangible/terminal/terminal_player_structure.iff 8.9 0 -6.5 entry -90 X = right/left - object/tangible/terminal/terminal_player_hangar_structure.iff 8.9 0 -12.6 entry -90 -object/building/player/player_house_atat.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 9 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.8 1.06 10.5 body 180 -object/building/player/player_house_tcg_emperors_spire.iff object/building/player/construction/construction_player_tcg_emperors_spire.iff 8 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff -2.6 25.6 0 tower -91 - object/tangible/terminal/terminal_elevator_up.iff -0.76 1.69 -1.1 elevator 0 - object/tangible/terminal/terminal_elevator_down.iff 0.74 26.7 -1.1 elevator 0 -object/building/player/player_house_tcg_rebel_spire.iff object/building/player/construction/construction_player_tcg_rebel_spire.iff 8 32 4 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff -1.24 25.4 -1.59 tower 180 - object/tangible/terminal/terminal_elevator_up.iff -0.75 1.59 -1.1 elevator 0 - object/tangible/terminal/terminal_elevator_down.iff 0.74 25.1 -1.1 elevator 0 -object/building/player/player_house_sandcrawler.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 9 13 5 7200 2500 1 4 - object/tangible/terminal/terminal_player_structure.iff -4.46 8.81 -13.52 foyer 90 -object/building/player/player_pgc_merchant_tent_s01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 4 - object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 -object/building/player/player_house_tcg_commando_bunker.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 8 13 5 7200 0 1 4 - object/tangible/terminal/terminal_player_structure.iff 3.2 0.4 3.16 entry 180 -object/building/player/player_house_tcg_vehicle_garage.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 6 8 13 5 7200 0 1 4 - object/tangible/terminal/terminal_player_structure.iff 14.56 0.53 12.79 entry 180 - object/tangible/terminal/terminal_player_vehicle_garage.iff -1.1 0.84 -9.95 entry 0 -object/building/player/player_house_tcg_vip_bunker.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 8 13 5 7200 0 1 4 - object/tangible/terminal/terminal_player_structure.iff -4.5 0.46 6.33 entrance 90 - - -object/building/player/player_house_tcg_8_bespin_house.iff object/building/player/construction/construction_player_house_tcg_8_bespin_house.iff 10 32 13 5 7200 0 1 - object/tangible/terminal/terminal_player_structure.iff 2.2 88.9 -5.9 entry 156 - object/tangible/terminal/terminal_elevator_up.iff 0.75 1 2 elevator -146 - object/tangible/terminal/terminal_elevator_down.iff 0.75 90 2 elevator -146 -object/building/player/player_house_tcg_8_yoda_house.iff object/building/player/construction/construction_player_house_tcg_8_yoda_house.iff 4 32 13 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 -object/building/player/player_house_yt1300.iff object/building/player/construction/construction_player_house_yt1300.iff 5 32 13 5 7200 0 1 - object/tangible/terminal/terminal_player_structure.iff -3.5 5.2 -2.3 storage5 180 - object/tangible/terminal/terminal_elevator_up.iff -1.7 -0.8 0 elevator -90 - object/tangible/terminal/terminal_elevator_down.iff -1.7 5.4 0 elevator -90 -object/building/player/player_house_tree_house_01.iff object/building/player/construction/construction_player_house_tree_house_01.iff 4 32 13 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 -object/building/player/player_house_wod_ns_hut.iff object/building/player/construction/construction_player_house_wod_ns_hut.iff 0 32 13 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 3.3 0.79 0.61 r1 -91 -object/building/player/player_house_wod_sm_hut.iff object/building/player/construction/construction_player_house_wod_sm_hut.iff 0 32 13 3 4320 800 1 4 - object/tangible/terminal/terminal_player_structure_nosnap.iff 3.3 0.79 0.61 r1 -91 -object/building/player/player_house_jabbas_sail_barge.iff object/building/player/construction/construction_player_house_jabbas_sail_barge.iff 10 32 13 5 7200 0 1 - object/tangible/terminal/terminal_player_structure.iff -2.9 16.5 4.5 interior 0 - object/tangible/terminal/terminal_elevator_up.iff 0 -5.4 0 interior 180 - object/tangible/terminal/terminal_elevator_down.iff -1.65 11.5 -2 interior 90 +STRUCTURE TEMP_STRUCTURE FOOTPRINT_TEMPLATE NO_LOT_REQUIREMENT LOT_REDUCTION EJECT_RANGE CIVIC CITY_RANK CITY_COST SHUTTLEPORT CLONE_FACILITY GARAGE CAN_RECLAIM MAINT_RATE DECAY_RATE CONDITION REDEED_COST HAS_SIGN POWER_RATE SKILLMOD SKILLMODVALUE SKILLMOD_MESSAGE VERSION OBJECT X Y Z CELL HEADING COMMENTS +s s s i I f[0] I I I I I I b[1] i i i i[0] I[0] f[0] s i s i s f f f s f c +object/building/player/player_house_tcg_relaxation_pool.iff object/building/player/construction/construction_player_tcg_relaxation_pool.iff 0 32 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 7.25 4 0 entry -90 +object/building/player/player_house_jedi_meditation_room.iff object/building/player/construction/construction_player_jedi_meditation_room.iff 0 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.2 4 -1.1 entry -91 +object/building/player/player_house_sith_meditation_room.iff object/building/player/construction/construction_player_sith_meditation_room.iff 0 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 4 4 1.85 entry 180 +object/building/player/player_house_corellia_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -5 0.74 -2.76 entry -90 +object/building/player/player_house_corellia_small_style_01_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 +object/building/player/player_house_corellia_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.5 0.63 3.77 entry 90 +object/building/player/player_house_corellia_small_style_02_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.7 0.62 3.55 entry 90 +object/building/player/player_house_corellia_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 3 0.62 6.4 public 180 +object/building/player/player_house_corellia_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff -7.15 0.88 5.59 middleroom 180 +object/building/player/player_house_corellia_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.17 4.59 -4.4 mainhall1 0 +object/building/player/player_house_corellia_large_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 +object/building/player/player_house_generic_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -5 0.74 -2.76 entry -90 +object/building/player/player_house_generic_small_style_01_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 +object/building/player/player_house_generic_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.5 0.63 3.77 entry 90 +object/building/player/player_house_generic_small_style_02_floorplan_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.69 0.62 3.55 entry 90 +object/building/player/player_house_generic_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 3 0.62 6.4 public 180 +object/building/player/player_house_generic_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff -7.15 0.88 5.59 middleroom 180 +object/building/player/player_house_generic_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.17 4.59 -4.4 mainhall1 0 +object/building/player/player_house_generic_large_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 +object/building/player/player_house_naboo_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.1 0.7 5.31 foyer -90 +object/building/player/player_house_naboo_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 0.6 0.7 6.15 hall 180 +object/building/player/player_house_naboo_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 9.89 1.1 -10.75 foyerdown 0 +object/building/player/player_house_naboo_medium_style_02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 5.62 1.06 7.98 foyer 180 +object/building/player/player_house_naboo_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff 14.85 4.7 -1.76 hall1 -90 +object/building/player/player_house_tatooine_small_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 +object/building/player/player_house_tatooine_small_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 +object/building/player/player_house_tatooine_medium_style_01.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 6.94 1.06 7.98 foyer 180 +object/building/player/player_house_tatooine_large_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff 8.16 1.06 11.24 public 180 +object/installation/manufacture/clothing_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 +object/installation/manufacture/food_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 +object/installation/manufacture/weapon_factory.iff object/installation/base/construction_installation_base.iff -1 13 6 1000 2500 50 4 +object/installation/manufacture/structure_factory.iff object/installation/base/construction_installation_base.iff 1 13 6 1000 2500 50 4 +object/installation/generators/power_generator_fusion_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 +object/installation/generators/power_generator_photo_bio_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 +object/installation/generators/power_generator_solar_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 +object/installation/generators/power_generator_geothermal_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 +object/installation/generators/power_generator_wind_style_1.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 0 4 +object/installation/mining_gas/mining_gas_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 +object/installation/mining_gas/mining_gas_harvester_style_2.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 +object/installation/mining_gas/mining_gas_harvester_style_3.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 +object/installation/mining_gas/mining_gas_harvester_style_4.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 +object/installation/mining_liquid/mining_liquid_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 +object/installation/mining_liquid/mining_liquid_harvester_style_2.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 +object/installation/mining_liquid/mining_liquid_harvester_style_3.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 +object/installation/mining_liquid/mining_liquid_harvester_style_4.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 +object/installation/mining_liquid/mining_liquid_moisture_harvester.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 +object/installation/mining_liquid/mining_liquid_moisture_harvester_medium.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 +object/installation/mining_liquid/mining_liquid_moisture_harvester_heavy.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 +object/installation/mining_liquid/mining_liquid_moisture_harvester_elite.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 +object/installation/mining_ore/mining_ore_harvester_style_1.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 20 4 +object/installation/mining_ore/mining_ore_harvester_style_2.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_2.iff -1 15 6 1000 3000 50 4 +object/installation/mining_ore/mining_ore_harvester_heavy.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_heavy.iff -1 23 6 1000 4500 75 10 4 +object/installation/mining_ore/mining_ore_harvester_elite.iff object/installation/mining_ore/construction/construction_mining_ore_harvester_style_heavy.iff -3 63 6 1000 12375 206 4 +object/installation/mining_organic/mining_organic_creature_farm.iff object/installation/base/construction_installation_base.iff 1 13 6 1000 2500 50 4 +object/installation/mining_organic/mining_organic_flora_farm.iff object/installation/base/construction_installation_base.iff -1 8 6 1000 1500 25 4 +object/installation/mining_organic/mining_organic_flora_farm_medium.iff object/installation/base/construction_installation_base.iff -1 15 6 1000 3000 50 4 +object/installation/mining_organic/mining_organic_flora_farm_heavy.iff object/installation/base/construction_installation_base.iff -1 23 6 1000 4500 75 4 +object/installation/mining_organic/mining_organic_flora_farm_elite.iff object/installation/base/construction_installation_base.iff -3 63 6 1000 12375 206 4 +object/building/player/player_guildhall_corellia_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 + object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 +object/building/player/player_guildhall_generic_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 + object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 +object/building/player/player_guildhall_naboo_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 + object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 +object/building/player/player_guildhall_tatooine_style_01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 4 25 5 7200 5000 1 4 + object/tangible/terminal/terminal_player_structure.iff 17.88 2.25 10.45 closeta 90 +object/building/player/player_guildhall_tatooine_style_02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 2 25 5 7200 5000 1 4 + object/tangible/terminal/terminal_player_structure.iff 9.13 1 6.36 lobby 90 +object/installation/turret/turret_block_large.iff object/installation/base/construction_installation_base.iff 0 0 15 6 3000 +object/installation/turret/turret_block_med.iff object/installation/base/construction_installation_base.iff 0 0 10 6 2000 +object/installation/turret/turret_block_sm.iff object/installation/base/construction_installation_base.iff 0 0 5 6 1000 + +object/installation/faction_perk/covert_detector/detector_32m.iff object/installation/base/construction_installation_base.iff 1 0 0 8 6 10000 1500 4 +object/installation/faction_perk/turret/block_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 +object/installation/faction_perk/turret/block_med.iff object/installation/base/construction_installation_base.iff 1 0 0 10 6 200000 2000 4 +object/installation/faction_perk/turret/block_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 +object/installation/faction_perk/turret/dish_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 +object/installation/faction_perk/turret/dish_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 +object/installation/faction_perk/turret/tower_lg.iff object/installation/base/construction_installation_base.iff 1 0 0 15 6 300000 3000 4 +object/installation/faction_perk/turret/tower_med.iff object/installation/base/construction_installation_base.iff 1 0 0 10 6 200000 2000 4 +object/installation/faction_perk/turret/tower_sm.iff object/installation/base/construction_installation_base.iff 1 0 0 5 6 75000 1000 4 + 1 +object/installation/faction_perk/minefield/field_1x1.iff object/installation/base/construction_installation_base.iff -1 0 0 0 1000 4 + +object/building/faction_perk/hq/hq_s01_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0 -6 mainhall 0 +object/building/faction_perk/hq/hq_s01_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0 -6 mainhall 0 +object/building/faction_perk/hq/hq_s02_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s02_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s03_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s03_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s04_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s04_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s05_rebel.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 1 12.5 mainhall 180 +object/building/faction_perk/hq/hq_s05_imp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 1 12.5 mainhall 180 +object/building/player/player_merchant_tent_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 + object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 +object/building/player/player_merchant_tent_style_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 + object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 +object/building/player/player_merchant_tent_style_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 private_place_merchant_tent 100 place_merchant_tent 4 + object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 +object/building/player/city/cityhall_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 + object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 + object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 + object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 +object/building/player/city/cityhall_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 + object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 + object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 + object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 +object/building/player/city/cityhall_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 1 0 0 0 1000 1 private_place_cityhall 100 place_cityhall 4 + object/tangible/terminal/terminal_player_structure.iff -16.78 2 7.9 mayoroffice 180 + object/tangible/terminal/terminal_city_vote.iff 0.25 2 -9.65 grandhall 0 + object/tangible/terminal/terminal_city.iff 17.07 2 -8.7 library 0 +object/building/player/city/bank_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 + object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 + object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 + object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 + object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 +object/building/player/city/bank_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 + object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 + object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 + object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 + object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 +object/building/player/city/bank_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 2 4 0 0 1000 1 private_place_bank 100 place_bank 4 + object/tangible/terminal/terminal_bank.iff -1 -0.25 0 WORLD_DELTA 90 + object/tangible/terminal/terminal_bank.iff 1 -0.25 0 WORLD_DELTA -90 + object/tangible/terminal/terminal_bank.iff 0 -0.25 -1 WORLD_DELTA 0 + object/tangible/terminal/terminal_player_structure_nosnap.iff 0 -0.25 1 WORLD_DELTA 180 +object/building/player/city/barn_no_planet_restriction.iff object/building/player/construction/construction_player_barn.iff 0 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 3 1.8 3 entry 180 +object/building/player/city/cantina_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 + object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 +object/building/player/city/cantina_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 + object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 +object/building/player/city/cantina_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 2 13 5 7200 2500 1 private_place_cantina 100 place_cantina 4 + object/tangible/terminal/terminal_player_structure.iff -4.1 2 6.19 cantina 157 +object/building/player/city/cloning_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 -5 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 + object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 + object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 + object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 +object/building/player/city/cloning_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 + object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 + object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 + object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 +object/building/player/city/cloning_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 3 3 1 0 0 1000 1 private_place_cloning 100 place_cloning 4 + object/tangible/terminal/terminal_player_structure.iff -13.5 1 -6.4 cloninglab 90 + object/tangible/terminal/terminal_cloning.iff -14 1 3.1 cloninglab 90 + object/tangible/terminal/terminal_insurance.iff 6.3 1 -6.69 cloninglab -90 +object/building/player/city/diner_no_planet_restriction.iff object/building/player/construction/construction_player_diner.iff 1 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 +object/building/player/city/hospital_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 + object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 +object/building/player/city/hospital_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 + object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 +object/building/player/city/hospital_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 3 13 5 7200 2500 1 private_place_hospital 100 place_hospital 4 + object/tangible/terminal/terminal_player_structure.iff 7.48 2 1.5 mainroom -90 +object/building/player/city/theater_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 + object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 +object/building/player/city/theater_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 + object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 +object/building/player/city/theater_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 4 13 5 7200 2500 1 private_place_theater 100 place_theater 4 + object/tangible/terminal/terminal_player_structure.iff -7 2 -14.2 backstage 90 +object/building/player/city/shuttleport_tatooine.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 +object/building/player/city/shuttleport_naboo.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 +object/building/player/city/shuttleport_corellia.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 1 4 2 1 0 0 1000 1 private_place_shuttleport 100 place_shuttleport 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.4 -1 -14.5 WORLD_DELTA 90 +object/building/player/city/garden_corellia_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_corellia_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_corellia_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_corellia_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_corellia_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_corellia_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_corellia_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_corellia_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_corellia_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_corellia_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_corellia_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_corellia_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_corellia_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_corellia_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_corellia_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_naboo_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_naboo_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_naboo_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_naboo_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_naboo_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_naboo_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_naboo_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_naboo_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_naboo_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_naboo_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_naboo_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_naboo_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_naboo_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_naboo_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_naboo_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_lrg_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_lrg_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_lrg_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_lrg_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_large_garden 100 place_large_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_med_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_med_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_med_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_med_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_medium_garden 100 place_medium_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_sml_02.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_sml_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_sml_04.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_tatooine_sml_05.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_dantooine_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_dantooine_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_dantooine_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_dathomir_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_dathomir_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_dathomir_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/city/garden_endor_lrg_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 3 6 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 12 -1 -12 WORLD_DELTA 0 +object/building/player/city/garden_endor_med_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 8 -1 -8 WORLD_DELTA 0 +object/building/player/city/garden_endor_sml_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_exotic_garden 100 place_exotic_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 4.5 -1 -4.5 WORLD_DELTA 0 +object/building/player/player_garage_tatooine_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 +object/building/player/player_garage_naboo_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 +object/building/player/player_garage_corellia_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 2 3 1 0 0 1000 private_place_garage 100 place_garage 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff -3 -1 -3 WORLD_DELTA 0 +object/building/faction_perk/hq/hq_s01_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0 -6 mainhall 0 +object/building/faction_perk/hq/hq_s01_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s01_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0 -6 mainhall 0 +object/building/faction_perk/hq/hq_s02_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s02_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s02_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s03_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s03_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s03_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s04_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s04_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s04_fp.iff 4 8 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 0.25 1.86 hall1 0 +object/building/faction_perk/hq/hq_s05_rebel_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_rebel.iff 0 1 12.5 mainhall 180 +object/building/faction_perk/hq/hq_s05_imp_pvp.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff object/building/faction_perk/hq/hq_s05_fp.iff 7 32 0 0 200 100000 1 4 + object/tangible/terminal/terminal_hq_imperial.iff 0 1 12.5 mainhall 180 +object/building/player/player_house_mustafar_lg.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff -1 8 13 5 7200 0 1 4 + object/tangible/terminal/terminal_player_structure.iff -4.5 0.46 6.33 entrance 90 + object/tangible/terminal/terminal_elevator_up.iff -1.19 -33 1.61 elevator 160 + object/tangible/terminal/terminal_elevator_down.iff 1.18 -26 1.65 elevator -166 + object/tangible/terminal/terminal_elevator_down.iff 1.18 0.47 1.65 elevator -166 + object/tangible/terminal/terminal_elevator_up.iff -1.19 -26 1.61 elevator 160 +object/building/player/city/garden_imperial_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 1.5 -0.9 -3.5 WORLD_DELTA 0 +object/building/player/city/garden_rebel_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 1 1 1 5 0 0 1000 1 private_place_small_garden 100 place_small_garden 4 + object/tangible/terminal/terminal_player_structure_nosnap_mini.iff 2.85 -0.9 -4 WORLD_DELTA 0 +object/building/player/player_house_tatooine_small_window_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.79 1.06 6.02 foyer 180 +object/building/player/player_house_naboo_small_window_style_01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff -1 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.1 0.7 5.31 foyer -90 +object/building/player/player_house_generic_small_windowed.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -5 0.74 -1.81 entry -90 +object/building/player/player_house_generic_medium_windowed.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 5 0.62 6.4 public -180 +object/building/player/player_house_generic_small_window_style_03.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure.iff -1.8 3 4.3 entry -180 +object/building/player/player_house_generic_medium_windowed_s02.iff object/building/player/construction/construction_player_house_tatooine_medium_style_01.iff -1 9 4 5760 1700 1 4 + object/tangible/terminal/terminal_player_structure.iff 5 -2 6 entryway -180 +object/building/player/player_house_generic_large_window_s01.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff -6.22 4.71 -3.85 hallway 180 Z = FORWARD/BACK +object/building/player/player_house_generic_large_window_s02.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 1 13 5 7200 2500 1 4 Y = UP/DOWN + object/tangible/terminal/terminal_player_structure.iff 8 0 -8.5 entry 0 X = right/left +object/building/player/player_house_hangar.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 5 13 5 7200 0 1 4 Y = UP/DOWN + object/tangible/terminal/terminal_player_structure.iff 8.9 0 -6.5 entry -90 X = right/left + object/tangible/terminal/terminal_player_hangar_structure.iff 8.9 0 -12.6 entry -90 +object/building/player/player_house_atat.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 9 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.8 1.06 10.5 body 180 +object/building/player/player_house_tcg_emperors_spire.iff object/building/player/construction/construction_player_tcg_emperors_spire.iff 8 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff -2.6 25.6 0 tower -91 + object/tangible/terminal/terminal_elevator_up.iff -0.76 1.69 -1.1 elevator 0 + object/tangible/terminal/terminal_elevator_down.iff 0.74 26.7 -1.1 elevator 0 +object/building/player/player_house_tcg_rebel_spire.iff object/building/player/construction/construction_player_tcg_rebel_spire.iff 8 32 4 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff -1.24 25.4 -1.59 tower 180 + object/tangible/terminal/terminal_elevator_up.iff -0.75 1.59 -1.1 elevator 0 + object/tangible/terminal/terminal_elevator_down.iff 0.74 25.1 -1.1 elevator 0 +object/building/player/player_house_sandcrawler.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 9 13 5 7200 2500 1 4 + object/tangible/terminal/terminal_player_structure.iff -4.46 8.81 -13.52 foyer 90 +object/building/player/player_pgc_merchant_tent_s01.iff object/building/player/construction/construction_player_house_tatooine_small_style_01.iff 0 3 3 4320 600 1 4 + object/tangible/terminal/terminal_player_structure.iff -0.15 0.27 -2.76 r1 0 +object/building/player/player_house_tcg_commando_bunker.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 8 13 5 7200 0 1 4 + object/tangible/terminal/terminal_player_structure.iff 3.2 0.4 3.16 entry 180 +object/building/player/player_house_tcg_vehicle_garage.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 6 8 13 5 7200 0 1 4 + object/tangible/terminal/terminal_player_structure.iff 14.56 0.53 12.79 entry 180 + object/tangible/terminal/terminal_player_vehicle_garage.iff -1.1 0.84 -9.95 entry 0 +object/building/player/player_house_tcg_vip_bunker.iff object/building/player/construction/construction_player_house_tatooine_large_style_01.iff 0 8 13 5 7200 0 1 4 + object/tangible/terminal/terminal_player_structure.iff -4.5 0.46 6.33 entrance 90 + + +object/building/player/player_house_tcg_8_bespin_house.iff object/building/player/construction/construction_player_house_tcg_8_bespin_house.iff 10 32 13 5 7200 0 1 + object/tangible/terminal/terminal_player_structure.iff 2.2 88.9 -5.9 entry 156 + object/tangible/terminal/terminal_elevator_up.iff 0.75 1 2 elevator -146 + object/tangible/terminal/terminal_elevator_down.iff 0.75 90 2 elevator -146 +object/building/player/player_house_tcg_8_yoda_house.iff object/building/player/construction/construction_player_house_tcg_8_yoda_house.iff 4 32 13 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 +object/building/player/player_house_yt1300.iff object/building/player/construction/construction_player_house_yt1300.iff 5 32 13 5 7200 0 1 + object/tangible/terminal/terminal_player_structure.iff -3.5 5.2 -2.3 storage5 180 + object/tangible/terminal/terminal_elevator_up.iff -1.7 -0.8 0 elevator -90 + object/tangible/terminal/terminal_elevator_down.iff -1.7 5.4 0 elevator -90 +object/building/player/player_house_tree_house_01.iff object/building/player/construction/construction_player_house_tree_house_01.iff 4 32 13 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 +object/building/player/player_house_wod_ns_hut.iff object/building/player/construction/construction_player_house_wod_ns_hut.iff 0 32 13 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 3.3 0.79 0.61 r1 -91 +object/building/player/player_house_wod_sm_hut.iff object/building/player/construction/construction_player_house_wod_sm_hut.iff 0 32 13 3 4320 800 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 3.3 0.79 0.61 r1 -91 +object/building/player/player_house_jabbas_sail_barge.iff object/building/player/construction/construction_player_house_jabbas_sail_barge.iff 10 32 13 5 7200 0 1 + object/tangible/terminal/terminal_player_structure.iff -2.9 16.5 4.5 interior 0 + object/tangible/terminal/terminal_elevator_up.iff 0 -5.4 0 interior 180 + object/tangible/terminal/terminal_elevator_down.iff -1.65 11.5 -2 interior 90 + +object/building/player/player_house_tree_house_02.iff object/building/player/construction/construction_player_house_tree_house_02.iff 3 32 13 3 4320 1700 1 4 + object/tangible/terminal/terminal_player_structure_nosnap.iff 8.8 1.1 1.73 entry -91 diff --git a/sku.0/sys.server/compiled/game/datatables/structure/player_structure_sign.tab b/sku.0/sys.server/compiled/game/datatables/structure/player_structure_sign.tab index 6da0c317e..b62abbb56 100755 --- a/sku.0/sys.server/compiled/game/datatables/structure/player_structure_sign.tab +++ b/sku.0/sys.server/compiled/game/datatables/structure/player_structure_sign.tab @@ -77,3 +77,4 @@ object/building/player/player_house_tree_house_01.iff -6.5 5 12.5 180 9.75 0.7 object/building/player/player_house_wod_ns_hut.iff -1.5 3 6.3 180 9 0.5 6.2 180 object/building/player/player_house_wod_sm_hut.iff -1.9 3 5.4 180 9 0.5 6.2 180 object/building/player/player_house_jabbas_sail_barge.iff 1 3.3 -3.4 0 1.65 0.1 -4.8 0 +object/building/player/player_house_tree_house_02.iff -6.5 5 12.5 180 9.75 0.7 7.3 0 diff --git a/sku.0/sys.server/compiled/game/object/building/player/construction/construction_player_house_tree_house_02.tpf b/sku.0/sys.server/compiled/game/object/building/player/construction/construction_player_house_tree_house_02.tpf new file mode 100755 index 000000000..732a2de9c --- /dev/null +++ b/sku.0/sys.server/compiled/game/object/building/player/construction/construction_player_house_tree_house_02.tpf @@ -0,0 +1,11 @@ +@base object/installation/base/installation_base.iff +@class installation_object_template 0 +@class tangible_object_template 0 +@class object_template 2 + +sharedTemplate = "object/building/player/construction/shared_construction_player_house_tree_house_02.iff" + +tintIndex = 0 +invulnerable = true + +scripts = +["structure.temporary_structure" ] \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/object/building/player/player_house_tree_house_02.tpf b/sku.0/sys.server/compiled/game/object/building/player/player_house_tree_house_02.tpf new file mode 100755 index 000000000..e346f4993 --- /dev/null +++ b/sku.0/sys.server/compiled/game/object/building/player/player_house_tree_house_02.tpf @@ -0,0 +1,6 @@ +@base object/building/base/base_player_building.iff +@class building_object_template 1 +@class tangible_object_template 1 +@class object_template 3 + +sharedTemplate = "object/building/player/shared_player_house_tree_house_02.iff" \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/object/tangible/deed/player_house_deed/tree_house_02_deed.tpf b/sku.0/sys.server/compiled/game/object/tangible/deed/player_house_deed/tree_house_02_deed.tpf new file mode 100755 index 000000000..60ce46674 --- /dev/null +++ b/sku.0/sys.server/compiled/game/object/tangible/deed/player_house_deed/tree_house_02_deed.tpf @@ -0,0 +1,13 @@ +@base object/tangible/deed/base/base_deed.iff +@class tangible_object_template 0 +@class object_template 7 + +sharedTemplate = "object/tangible/deed/player_house_deed/shared_tree_house_02_deed.iff" + +objvars = +[ + "player_structure.deed.template" = "object/building/player/player_house_tree_house_02.iff", + "player_structure.deed.buildtime" = 90, + "player_structure.deed.scene" = "corellia,talus,naboo,dantooine,rori"] + +scripts = +[ + "item.structure_deed.player_structure_deed"] \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/.gitignore b/sku.0/sys.server/compiled/game/script/.gitignore deleted file mode 100755 index 7553a6411..000000000 --- a/sku.0/sys.server/compiled/game/script/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -base_script.java -*.class \ No newline at end of file diff --git a/sku.0/sys.server/compiled/game/script/ai/.gitignore b/sku.0/sys.server/compiled/game/script/ai/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/ai/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/ai/beast.java b/sku.0/sys.server/compiled/game/script/ai/beast.java index 348bc92f2..2da012809 100755 --- a/sku.0/sys.server/compiled/game/script/ai/beast.java +++ b/sku.0/sys.server/compiled/game/script/ai/beast.java @@ -95,7 +95,7 @@ public class beast extends script.base_script experiencePercentage = (int)(((float)experienceProgress / experienceNeeded) * 100); } names[idx] = "level_progress"; - attribs[idx] = "" + experiencePercentage + "%"; + attribs[idx] = String.valueOf(experiencePercentage) + "%"; idx++; } if (beast_lib.getBeastCanLevel(self)) @@ -114,7 +114,7 @@ public class beast extends script.base_script String currentHappiness = utils.packStringId(beast_lib.convertHappinessString(beastBCD)); if (currentHappiness != null) { - attribs[idx] = "" + currentHappiness; + attribs[idx] = String.valueOf(currentHappiness); idx++; if (idx >= names.length) { @@ -125,7 +125,7 @@ public class beast extends script.base_script String currentLoyalty = utils.packStringId(beast_lib.convertLoyaltyString(beastBCD)); if (currentLoyalty != null) { - attribs[idx] = "" + currentLoyalty; + attribs[idx] = String.valueOf(currentLoyalty); idx++; if (idx >= names.length) { @@ -136,7 +136,7 @@ public class beast extends script.base_script if (loyaltyPercentage >= 0) { names[idx] = beast_lib.BEAST_LOYALTY_PERCENTAGE_TITLE; - attribs[idx] = "" + loyaltyPercentage + "%"; + attribs[idx] = String.valueOf(loyaltyPercentage) + "%"; idx++; if (idx >= names.length) { @@ -148,29 +148,29 @@ public class beast extends script.base_script if (!abilityList[3].equals("") && slotsAvalable >= 0 && !abilityList[3].equals("empty") && !abilityList[3].equals("disabled")) { names[idx] = "bm_ability_1"; - attribs[idx] = "" + utils.packStringId(new string_id("cmd_n", abilityList[3])); + attribs[idx] = String.valueOf(utils.packStringId(new string_id("cmd_n", abilityList[3]))); idx++; } if (!abilityList[4].equals("") && slotsAvalable >= 1 && !abilityList[4].equals("empty") && !abilityList[4].equals("disabled")) { names[idx] = "bm_ability_2"; - attribs[idx] = "" + utils.packStringId(new string_id("cmd_n", abilityList[4])); + attribs[idx] = String.valueOf(utils.packStringId(new string_id("cmd_n", abilityList[4]))); idx++; } if (!abilityList[5].equals("") && slotsAvalable >= 2 && !abilityList[5].equals("empty") && !abilityList[5].equals("disabled")) { names[idx] = "bm_ability_3"; - attribs[idx] = "" + utils.packStringId(new string_id("cmd_n", abilityList[5])); + attribs[idx] = String.valueOf(utils.packStringId(new string_id("cmd_n", abilityList[5]))); idx++; } if (!abilityList[6].equals("") && slotsAvalable >= 3 && !abilityList[6].equals("empty") && !abilityList[6].equals("disabled")) { names[idx] = "bm_ability_4"; - attribs[idx] = "" + utils.packStringId(new string_id("cmd_n", abilityList[6])); + attribs[idx] = String.valueOf(utils.packStringId(new string_id("cmd_n", abilityList[6]))); idx++; } names[idx] = "armorhpmax"; - attribs[idx] = "" + (utils.getIntScriptVar(self, "beast.display.armor") + getEnhancedSkillStatisticModifier(self, "private_armor_bonus")); + attribs[idx] = String.valueOf((utils.getIntScriptVar(self, "beast.display.armor") + getEnhancedSkillStatisticModifier(self, "private_armor_bonus"))); idx++; obj_id beastWeapon = getCurrentWeapon(self); if (isIdValid(beastWeapon)) @@ -182,14 +182,14 @@ public class beast extends script.base_script maxDamage = (int)(maxDamage * (1.0f + (expertiseDamageBonus / 100.0f))); float weaponSpeed = getWeaponAttackSpeed(beastWeapon); names[idx] = "damage"; - attribs[idx] = "" + minDamage + " - " + maxDamage; + attribs[idx] = minDamage + " - " + maxDamage; idx++; names[idx] = "attackspeed"; - attribs[idx] = "" + weaponSpeed; + attribs[idx] = String.valueOf(weaponSpeed); idx++; float beastDPS = utils.roundFloatByDecimal((minDamage + maxDamage) / weaponSpeed / 2); names[idx] = "basedps"; - attribs[idx] = "" + beastDPS; + attribs[idx] = String.valueOf(beastDPS); idx++; } else @@ -204,14 +204,14 @@ public class beast extends script.base_script minDamage = (int)(minDamage * (1.0f + (expertiseDamageBonus / 100.0f))); maxDamage = (int)(maxDamage * (1.0f + (expertiseDamageBonus / 100.0f))); names[idx] = "damage"; - attribs[idx] = "" + minDamage + " - " + maxDamage; + attribs[idx] = minDamage + " - " + maxDamage; idx++; names[idx] = "attackspeed"; - attribs[idx] = "" + weaponSpeed; + attribs[idx] = String.valueOf(weaponSpeed); idx++; float beastDPS = utils.roundFloatByDecimal((minDamage + maxDamage) / weaponSpeed / 2); names[idx] = "basedps"; - attribs[idx] = "" + beastDPS; + attribs[idx] = String.valueOf(beastDPS); idx++; } } @@ -225,13 +225,13 @@ public class beast extends script.base_script if (!name.equals("block_value_bonus")) { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + utils.roundFloatByDecimal((utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i]) * beast_lib.DISPLAY_CONVERSION_RATES[i])) + "%"; + attribs[idx] = String.valueOf(utils.roundFloatByDecimal((utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i]) * beast_lib.DISPLAY_CONVERSION_RATES[i]))) + "%"; idx++; } else { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + utils.roundFloatByDecimal(utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i])); + attribs[idx] = String.valueOf(utils.roundFloatByDecimal(utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i]))); idx++; } continue; @@ -239,7 +239,7 @@ public class beast extends script.base_script else { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + utils.roundFloatByDecimal(utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i])); + attribs[idx] = String.valueOf(utils.roundFloatByDecimal(utils.getFloatScriptVar(self, beast_lib.ARRAY_BEAST_INCUBATION_STATS[i]))); idx++; continue; } @@ -249,7 +249,7 @@ public class beast extends script.base_script if (glanceReduct > 0) { names[idx] = "bm_glance_reduct"; - attribs[idx] = "" + glanceReduct + "%"; + attribs[idx] = String.valueOf(glanceReduct) + "%"; idx++; if (idx >= names.length) { @@ -260,7 +260,7 @@ public class beast extends script.base_script if (damageReduct > 0) { names[idx] = "bm_damage_reduct"; - attribs[idx] = "" + damageReduct + "%"; + attribs[idx] = String.valueOf(damageReduct) + "%"; idx++; if (idx >= names.length) { @@ -271,7 +271,7 @@ public class beast extends script.base_script if (punishReduct > 0) { names[idx] = "bm_punish_reduct"; - attribs[idx] = "" + punishReduct + "%"; + attribs[idx] = String.valueOf(punishReduct) + "%"; idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/ai/beast_control_device.java b/sku.0/sys.server/compiled/game/script/ai/beast_control_device.java index 8de19fb4e..cab7e72a7 100755 --- a/sku.0/sys.server/compiled/game/script/ai/beast_control_device.java +++ b/sku.0/sys.server/compiled/game/script/ai/beast_control_device.java @@ -260,7 +260,7 @@ public class beast_control_device extends script.base_script String currentHappiness = utils.packStringId(beast_lib.convertHappinessString(self)); if (currentHappiness != null) { - attribs[idx] = "" + currentHappiness; + attribs[idx] = String.valueOf(currentHappiness); idx++; if (idx >= names.length) { @@ -271,7 +271,7 @@ public class beast_control_device extends script.base_script String currentLoyalty = utils.packStringId(beast_lib.convertLoyaltyString(self)); if (currentLoyalty != null) { - attribs[idx] = "" + currentLoyalty; + attribs[idx] = String.valueOf(currentLoyalty); idx++; if (idx >= names.length) { @@ -283,7 +283,7 @@ public class beast_control_device extends script.base_script if (trainingPoints > 0) { names[idx] = "bm_single_max_training_points"; - attribs[idx] = "" + trainingPoints; + attribs[idx] = String.valueOf(trainingPoints); idx++; if (idx >= names.length) { @@ -294,7 +294,7 @@ public class beast_control_device extends script.base_script if (pointsSpent > 0) { names[idx] = "bm_points_spent"; - attribs[idx] = "" + pointsSpent; + attribs[idx] = String.valueOf(pointsSpent); idx++; if (idx >= names.length) { @@ -305,7 +305,7 @@ public class beast_control_device extends script.base_script if (maxAvailableTrainingPoints > 0) { names[idx] = "bm_points_available"; - attribs[idx] = "" + maxAvailableTrainingPoints; + attribs[idx] = String.valueOf(maxAvailableTrainingPoints); idx++; if (idx >= names.length) { @@ -325,13 +325,13 @@ public class beast_control_device extends script.base_script if (!name.equals("block_value_bonus")) { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + utils.roundFloatByDecimal(incubationBonuses[i] * beast_lib.DISPLAY_OBJVAR_CONVERSION_RATES[i]) + "%"; + attribs[idx] = String.valueOf(utils.roundFloatByDecimal(incubationBonuses[i] * beast_lib.DISPLAY_OBJVAR_CONVERSION_RATES[i])) + "%"; idx++; } else { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + incubationBonuses[i]; + attribs[idx] = String.valueOf(incubationBonuses[i]); idx++; } continue; @@ -339,7 +339,7 @@ public class beast_control_device extends script.base_script else { names[idx] = beast_lib.DISPLAY_NAMES[i]; - attribs[idx] = "" + incubationBonuses[i]; + attribs[idx] = String.valueOf(incubationBonuses[i]); idx++; continue; } diff --git a/sku.0/sys.server/compiled/game/script/ai/pet.java b/sku.0/sys.server/compiled/game/script/ai/pet.java index e4c098744..ea3e40227 100755 --- a/sku.0/sys.server/compiled/game/script/ai/pet.java +++ b/sku.0/sys.server/compiled/game/script/ai/pet.java @@ -78,7 +78,7 @@ public class pet extends script.base_script location[] newPath = new location[oldPath.getNumItems()]; for (int i = 0; i < newPath.length; ++i) { - location point = oldPath.getLocationObjVar("" + i); + location point = oldPath.getLocationObjVar(String.valueOf(i)); newPath[i] = point; } setObjVar(self, pet_lib.OBJVAR_PET_PATROL_POINTS, newPath); @@ -109,7 +109,7 @@ public class pet extends script.base_script if (pet_lib.isDroidPet(self)) { names[idx] = "pet_stats.level"; - attribs[idx] = "" + getLevel(self); + attribs[idx] = String.valueOf(getLevel(self)); idx++; if (idx >= names.length) { @@ -131,7 +131,7 @@ public class pet extends script.base_script { int general_protection = getIntObjVar(petControlDevice, "creature_attribs.general_protection"); names[idx] = "pet_stats.dna_comp_armor_effectiveness"; - attribs[idx] = "" + general_protection; + attribs[idx] = String.valueOf(general_protection); idx++; if (idx >= names.length) { @@ -150,7 +150,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_tohit"; int value = getIntObjVar(petControlDevice, "creature_attribs.toHitChance"); - attribs[idx] = "" + value; + attribs[idx] = String.valueOf(value); idx++; if (idx >= names.length) { @@ -161,7 +161,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_defense"; int value = getIntObjVar(petControlDevice, "creature_attribs.defenseValue"); - attribs[idx] = "" + value; + attribs[idx] = String.valueOf(value); idx++; if (idx >= names.length) { @@ -172,7 +172,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_state_resist"; float value = getFloatObjVar(petControlDevice, "creature_attribs.stateResist"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -183,7 +183,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_crit_chance"; float value = getFloatObjVar(petControlDevice, "creature_attribs.critChance"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -194,7 +194,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_crit_save"; float value = getFloatObjVar(petControlDevice, "creature_attribs.critSave"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -205,7 +205,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.creature_aggro_bonus"; float value = getFloatObjVar(petControlDevice, "creature_attribs.aggroBonus"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -221,7 +221,7 @@ public class pet extends script.base_script int[] dmgBonus = pet_lib.getPetAbilityDamageBonus(petControlDevice, min, max); min += dmgBonus[0]; max += dmgBonus[1]; - attribs[idx] = "" + min + " - " + max; + attribs[idx] = min + " - " + max; idx++; if (idx >= names.length) { @@ -263,7 +263,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.storage_module_rating"; int storage = getIntObjVar(petControlDevice, "storageModuleRating"); - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -274,7 +274,7 @@ public class pet extends script.base_script { names[idx] = "pet_stats.storage_module_rating"; int storage = getIntObjVar(petControlDevice, "ai.pet.hasContainer"); - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -287,7 +287,7 @@ public class pet extends script.base_script if (storage > 0) { names[idx] = "pet_stats.inventory_capacity"; - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -356,7 +356,7 @@ public class pet extends script.base_script return SCRIPT_CONTINUE; } names[idx] = "pet_stats.data_module_rating"; - attribs[idx] = "" + datastorage; + attribs[idx] = String.valueOf(datastorage); idx++; if (idx >= names.length) { @@ -369,7 +369,7 @@ public class pet extends script.base_script if (storage > 0) { names[idx] = "pet_stats.datapad_slots"; - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java b/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java index cb7891324..ea06478f5 100755 --- a/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java +++ b/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java @@ -722,7 +722,7 @@ public class pet_control_device extends script.base_script names[idx] = "rideables_current_of_max"; int currentRideables = callable.getNumStoredCDByType(player, callable.CALLABLE_TYPE_RIDEABLE); int maxRideables = callable.getMaxAllowedStoredRideables(player); - attribs[idx] = "" + target_dummy.BLUE + currentRideables + " of " + maxRideables; + attribs[idx] = target_dummy.BLUE + currentRideables + " of " + maxRideables; idx++; if (idx >= names.length) { @@ -763,7 +763,7 @@ public class pet_control_device extends script.base_script } else { - attribs[idx] = "" + available; + attribs[idx] = String.valueOf(available); idx++; if (idx >= names.length) { @@ -771,7 +771,7 @@ public class pet_control_device extends script.base_script } int trainingPts = getIntObjVar(self, "ai.petAbility.trainingPts"); names[idx] = "ability_points"; - attribs[idx] = "" + trainingPts; + attribs[idx] = String.valueOf(trainingPts); idx++; if (idx >= names.length) { @@ -780,7 +780,7 @@ public class pet_control_device extends script.base_script int xpEarned = getIntObjVar(self, "ai.petAdvance.xpEarned"); int xpToLevel = pet_lib.getPcdXpForNextLevel(self); names[idx] = "ability_xp"; - attribs[idx] = "" + xpEarned + "/" + xpToLevel; + attribs[idx] = xpEarned + "/" + xpToLevel; } idx++; if (idx >= names.length) @@ -801,7 +801,7 @@ public class pet_control_device extends script.base_script vitality = 0; } names[idx] = "creature_vitality"; - attribs[idx] = "" + vitality + "/" + maxVitality; + attribs[idx] = vitality + "/" + maxVitality; idx++; if (idx >= names.length) { @@ -816,13 +816,13 @@ public class pet_control_device extends script.base_script health += pet_lib.getPetAbilityHealthBonus(self, health); if (vitality < pet_lib.MAX_VITALITY_LOSS) { - attribs[idx] = "" + pet_lib.getReducedStatValue(health, vitality) + "/"; + attribs[idx] = pet_lib.getReducedStatValue(health, vitality) + "/"; } else { attribs[idx] = ""; } - attribs[idx] += "" + health; + attribs[idx] += String.valueOf(health); idx++; if (idx >= names.length) { @@ -836,13 +836,13 @@ public class pet_control_device extends script.base_script regen += pet_lib.getPetAbilityRegenBonus(self, regen); if (vitality < pet_lib.MAX_VITALITY_LOSS) { - attribs[idx] = "" + pet_lib.getReducedStatValue(regen, vitality) + "/"; + attribs[idx] = pet_lib.getReducedStatValue(regen, vitality) + "/"; } else { attribs[idx] = ""; } - attribs[idx] += "" + regen; + attribs[idx] += String.valueOf(regen); idx++; if (idx >= names.length) { @@ -853,7 +853,7 @@ public class pet_control_device extends script.base_script { int general_protection = getIntObjVar(self, "creature_attribs.general_protection"); names[idx] = "pet_stats.dna_comp_armor_effectiveness"; - attribs[idx] = "" + general_protection; + attribs[idx] = String.valueOf(general_protection); idx++; if (idx >= names.length) { @@ -867,7 +867,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_tohit"; int value = getIntObjVar(self, "creature_attribs.toHitChance"); - attribs[idx] = "" + value; + attribs[idx] = String.valueOf(value); idx++; if (idx >= names.length) { @@ -878,7 +878,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_defense"; int value = getIntObjVar(self, "creature_attribs.defenseValue"); - attribs[idx] = "" + value; + attribs[idx] = String.valueOf(value); idx++; if (idx >= names.length) { @@ -889,7 +889,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_state_resist"; float value = getFloatObjVar(self, "creature_attribs.stateResist"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -900,7 +900,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_crit_chance"; float value = getFloatObjVar(self, "creature_attribs.critChance"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -911,7 +911,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_crit_save"; float value = getFloatObjVar(self, "creature_attribs.critSave"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -922,7 +922,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.creature_aggro_bonus"; float value = getFloatObjVar(self, "creature_attribs.aggroBonus"); - attribs[idx] = "" + value * 100 + "%"; + attribs[idx] = String.valueOf(value * 100) + "%"; idx++; if (idx >= names.length) { @@ -937,7 +937,7 @@ public class pet_control_device extends script.base_script int[] dmgBonus = pet_lib.getPetAbilityDamageBonus(self, min, max); min += dmgBonus[0]; max += dmgBonus[1]; - attribs[idx] = "" + min + " - " + max; + attribs[idx] = min + " - " + max; idx++; if (idx >= names.length) { @@ -1003,7 +1003,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.storage_module_rating"; int storage = getIntObjVar(self, "storageModuleRating"); - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -1014,7 +1014,7 @@ public class pet_control_device extends script.base_script { names[idx] = "pet_stats.storage_module_rating"; int storage = getIntObjVar(self, "ai.pet.hasContainer"); - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -1027,7 +1027,7 @@ public class pet_control_device extends script.base_script if (storage > 0) { names[idx] = "pet_stats.inventory_capacity"; - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -1096,7 +1096,7 @@ public class pet_control_device extends script.base_script return SCRIPT_CONTINUE; } names[idx] = "pet_stats.data_module_rating"; - attribs[idx] = "" + datastorage; + attribs[idx] = String.valueOf(datastorage); idx++; if (idx >= names.length) { @@ -1109,7 +1109,7 @@ public class pet_control_device extends script.base_script if (storage > 0) { names[idx] = "pet_stats.datapad_slots"; - attribs[idx] = "" + storage; + attribs[idx] = String.valueOf(storage); idx++; if (idx >= names.length) { @@ -1475,13 +1475,13 @@ public class pet_control_device extends script.base_script myHealth += pet_lib.getPetAbilityHealthBonus(self, myHealth); if (vitality < pet_lib.MAX_VITALITY_LOSS) { - attribs[idx] = "" + pet_lib.getReducedStatValue(myHealth, vitality) + "/"; + attribs[idx] = pet_lib.getReducedStatValue(myHealth, vitality) + "/"; } else { attribs[idx] = ""; } - attribs[idx] += "" + myHealth; + attribs[idx] += String.valueOf(myHealth); idx++; if (idx >= names.length) { @@ -1490,7 +1490,7 @@ public class pet_control_device extends script.base_script names[idx] = "pet_stats.creature_attack"; float attackSpeed = creatureDict.getInt("attackSpeed"); attackSpeed = (float)((int)(attackSpeed * 100) / 100.0f); - attribs[idx] = "" + attackSpeed; + attribs[idx] = String.valueOf(attackSpeed); idx++; if (idx >= names.length) { @@ -1498,7 +1498,7 @@ public class pet_control_device extends script.base_script } names[idx] = "pet_stats.creature_tohit"; int toHit = dataTableGetInt(create.STAT_BALANCE_TABLE, toHitLevel - 1, "ToHit"); - attribs[idx] = "" + toHit; + attribs[idx] = String.valueOf(toHit); idx++; if (idx >= names.length) { @@ -1506,7 +1506,7 @@ public class pet_control_device extends script.base_script } names[idx] = "pet_stats.creature_defense"; int defenseValue = dataTableGetInt(create.STAT_BALANCE_TABLE, toHitLevel - 1, "Def"); - attribs[idx] = "" + defenseValue; + attribs[idx] = String.valueOf(defenseValue); idx++; if (idx >= names.length) { @@ -1519,7 +1519,7 @@ public class pet_control_device extends script.base_script minDamage += dmgBonus[0]; maxDamage += dmgBonus[1]; names[idx] = "pet_stats.creature_damage"; - attribs[idx] = "" + minDamage + " - " + maxDamage; + attribs[idx] = minDamage + " - " + maxDamage; idx++; if (idx >= names.length) { @@ -1641,38 +1641,37 @@ public class pet_control_device extends script.base_script float fltBaseWalkSpeed = dctMountInfo.getFloat("fltBaseWalkSpeed"); float fltBurstRunSpeed = dctMountInfo.getFloat("fltBaseRunSpeed"); names[idx] = "mount"; - attribs[idx++] = "" + pet_lib.isMountPcd(self); + attribs[idx++] = Boolean.toString(pet_lib.isMountPcd(self)); if (hasObjVar(self, "mount_type")) { int mountType = getIntObjVar(self, "mount_type"); - if (mountType == 0) - { - names[idx] = "walkspeed"; - attribs[idx++] = "" + fltBaseWalkSpeed; - names[idx] = "runspeed"; - attribs[idx++] = "" + fltBurstRunSpeed; - } - else if (mountType == 1) - { - names[idx] = "glide_speed"; - attribs[idx++] = "" + fltBaseWalkSpeed; - names[idx] = "fly_speed"; - attribs[idx++] = "" + fltBurstRunSpeed; - } - else - { - names[idx] = "walkspeed"; - attribs[idx++] = "" + fltBaseWalkSpeed; - names[idx] = "runspeed"; - attribs[idx++] = "" + fltBurstRunSpeed; + switch (mountType) { + case 0: + names[idx] = "walkspeed"; + attribs[idx++] = Float.toString(fltBaseWalkSpeed); + names[idx] = "runspeed"; + attribs[idx++] = Float.toString(fltBurstRunSpeed); + break; + case 1: + names[idx] = "glide_speed"; + attribs[idx++] = Float.toString(fltBaseWalkSpeed); + names[idx] = "fly_speed"; + attribs[idx++] = Float.toString(fltBurstRunSpeed); + break; + default: + names[idx] = "walkspeed"; + attribs[idx++] = Float.toString(fltBaseWalkSpeed); + names[idx] = "runspeed"; + attribs[idx++] = Float.toString(fltBurstRunSpeed); + break; } } else { names[idx] = "walkspeed"; - attribs[idx++] = "" + fltBaseWalkSpeed; + attribs[idx++] = Float.toString(fltBaseWalkSpeed); names[idx] = "runspeed"; - attribs[idx++] = "" + fltBurstRunSpeed; + attribs[idx++] = Float.toString(fltBurstRunSpeed); } idx++; if (idx >= names.length) diff --git a/sku.0/sys.server/compiled/game/script/base/.gitignore b/sku.0/sys.server/compiled/game/script/base/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/base/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/beta/.gitignore b/sku.0/sys.server/compiled/game/script/beta/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/beta/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/city/.gitignore b/sku.0/sys.server/compiled/game/script/city/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/city/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/city/city_pathing_npc.java b/sku.0/sys.server/compiled/game/script/city/city_pathing_npc.java index e6c851a51..cac34d220 100755 --- a/sku.0/sys.server/compiled/game/script/city/city_pathing_npc.java +++ b/sku.0/sys.server/compiled/game/script/city/city_pathing_npc.java @@ -80,7 +80,7 @@ public class city_pathing_npc extends script.base_script } public void doFacingAction(obj_id npc, obj_id currentStop) throws InterruptedException { - obj_id objThingToFace = utils.stringToObjId("" + getIntObjVar(currentStop, "faceto")); + obj_id objThingToFace = utils.stringToObjId(Integer.toString(getIntObjVar(currentStop, "faceto"))); if (isIdValid(objThingToFace)) { faceTo(npc, objThingToFace); @@ -109,7 +109,7 @@ public class city_pathing_npc extends script.base_script { if (hasObjVar(currentStop, "destination")) { - obj_id dest = utils.stringToObjId("" + getIntObjVar(currentStop, "destination")); + obj_id dest = utils.stringToObjId(Integer.toString(getIntObjVar(currentStop, "destination"))); utils.setScriptVar(npc, "pathing.currentStop", dest); pathTo(npc, getLocation(dest)); } diff --git a/sku.0/sys.server/compiled/game/script/combat_engine.java b/sku.0/sys.server/compiled/game/script/combat_engine.java index 820cf26d0..1148a85e2 100755 --- a/sku.0/sys.server/compiled/game/script/combat_engine.java +++ b/sku.0/sys.server/compiled/game/script/combat_engine.java @@ -7,10 +7,11 @@ package script; +import java.util.HashMap; import script.library.combat_consts; import script.library.utils; -import java.util.Hashtable; +import java.util.Map; public class combat_engine { @@ -18,12 +19,12 @@ public class combat_engine * Combat constants */ - private static Hashtable m_CombatDataCache = new Hashtable(); - private static Hashtable m_BuffDataCache = new Hashtable(); - + private static final Map m_CombatDataCache = new HashMap<>(); + private static final Map m_BuffDataCache = new HashMap<>(); + public static final int OUT_OF_RANGE = Integer.MIN_VALUE; private static float MAX_MELEE_TARGET_RANGE = -1.0f; - private static float DEFAULT_MAX_MELEE_TARGET_RANGE = 24.0f; + private static final float DEFAULT_MAX_MELEE_TARGET_RANGE = 24.0f; private static float MAX_COMBAT_RANGE = -1.0f; @@ -629,17 +630,17 @@ public class combat_engine // Buff data public static buff_data getBuffData(int buffNameCrc) - { - if(m_BuffDataCache.containsKey("" + buffNameCrc)) + { + if(m_BuffDataCache.containsKey(Integer.toString(buffNameCrc))) { - return buff_data.clone((buff_data)m_BuffDataCache.get("" + buffNameCrc)); + return buff_data.clone((buff_data)m_BuffDataCache.get(Integer.toString(buffNameCrc))); } buff_data dat = loadBuffData(buffNameCrc); if(dat != null) { - m_BuffDataCache.put("" + buffNameCrc, dat); + m_BuffDataCache.put(Integer.toString(buffNameCrc), dat); } else { diff --git a/sku.0/sys.server/compiled/game/script/content_tools/.gitignore b/sku.0/sys.server/compiled/game/script/content_tools/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/content_tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/content_tools/spawn_generation_tool.java b/sku.0/sys.server/compiled/game/script/content_tools/spawn_generation_tool.java index a27c9a3eb..c99e91ba8 100755 --- a/sku.0/sys.server/compiled/game/script/content_tools/spawn_generation_tool.java +++ b/sku.0/sys.server/compiled/game/script/content_tools/spawn_generation_tool.java @@ -206,29 +206,27 @@ public class spawn_generation_tool extends script.base_script clearSUIDataSource(pid, sui.LISTBOX_DATASOURCE); if (!isIdValid(mso) || ast.equals(NOT_ASSIGNED)) { - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 0); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "0"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 0, sui.PROP_TEXT, "Create New Spawn Data"); - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 1); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "1"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 1, sui.PROP_TEXT, "Load Existing Spawn Data"); subscribeToSUIProperty(pid, sui.LISTBOX_LIST, sui.PROP_SELECTEDROW); subscribeToSUIProperty(pid, sui.LISTBOX_TITLE, sui.PROP_TEXT); showSUIPage(pid); flushSUIPage(pid); - return; } else { - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 0); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "0"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 0, sui.PROP_TEXT, "Use Existing Data"); - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 1); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "1"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 1, sui.PROP_TEXT, "Create New Spawn Data"); - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 2); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "2"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 2, sui.PROP_TEXT, "Load Existing Spawn Data"); subscribeToSUIProperty(pid, sui.LISTBOX_LIST, sui.PROP_SELECTEDROW); subscribeToSUIProperty(pid, sui.LISTBOX_TITLE, sui.PROP_TEXT); showSUIPage(pid); flushSUIPage(pid); - return; } } public void setMasterSpawnObject(obj_id player) throws InterruptedException @@ -249,14 +247,14 @@ public class spawn_generation_tool extends script.base_script clearSUIDataSource(pid, sui.LISTBOX_DATASOURCE); if (sortedList == null || sortedList.length == 0) { - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 0); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "0"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 0, sui.PROP_TEXT, "No Available Objects In Range"); } else { for (int i = 0; i < sortedList.length; i++) { - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + i); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, Integer.toString(i)); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + i, sui.PROP_TEXT, sortedList[i]); } } @@ -281,9 +279,9 @@ public class spawn_generation_tool extends script.base_script setSUIProperty(pid, sui.LISTBOX_BTN_OK, sui.PROP_TEXT, "@ok"); setSUIProperty(pid, sui.LISTBOX_BTN_CANCEL, sui.PROP_TEXT, "@cancel"); clearSUIDataSource(pid, sui.LISTBOX_DATASOURCE); - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 0); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "0"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 0, sui.PROP_TEXT, "Create New Associated Spawn Table"); - addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "" + 1); + addSUIDataItem(pid, sui.LISTBOX_DATASOURCE, "1"); setSUIProperty(pid, sui.LISTBOX_DATASOURCE + "." + 1, sui.PROP_TEXT, "Load Exisisting Associated Spawn Table"); subscribeToSUIEvent(pid, sui_event_type.SET_onGenericSelection, sui.LISTBOX_LIST, "createSpawnGenerationSui"); subscribeToSUIPropertyForEvent(pid, sui_event_type.SET_onGenericSelection, sui.LISTBOX_LIST, sui.LISTBOX_LIST, sui.PROP_SELECTEDROW); diff --git a/sku.0/sys.server/compiled/game/script/conversation/.gitignore b/sku.0/sys.server/compiled/game/script/conversation/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/conversation/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_imperial.java b/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_imperial.java index c6534ead8..7f400fbd1 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_imperial.java +++ b/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_imperial.java @@ -163,7 +163,6 @@ public class faction_recruiter_imperial extends script.base_script int faction_id = pvpGetAlignedFaction(player); String playerGcwFaction = factions.getFactionNameByHashCode(faction_id); faction_perk.displayAvailableFactionItemRanks(player, npc, playerGcwRank, playerGcwFaction); - return; } public String faction_recruiter_imperial_tokenTO_getFactionRankName(obj_id player, obj_id npc) throws InterruptedException { @@ -189,7 +188,7 @@ public class faction_recruiter_imperial extends script.base_script public String faction_recruiter_imperial_tokenTO_getRebelScoreString(obj_id player, obj_id npc) throws InterruptedException { int intTest = getIntObjVar(npc, "Rebel.controlScore"); - return "" + intTest; + return Integer.toString(intTest); } public int faction_recruiter_imperial_tokenDI_getImperialScore(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_rebel.java b/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_rebel.java index 291287bbf..fa96cf565 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_rebel.java +++ b/sku.0/sys.server/compiled/game/script/conversation/faction_recruiter_rebel.java @@ -158,7 +158,6 @@ public class faction_recruiter_rebel extends script.base_script int faction_id = pvpGetAlignedFaction(player); String playerGcwFaction = factions.getFactionNameByHashCode(faction_id); faction_perk.displayAvailableFactionItemRanks(player, npc, playerGcwRank, playerGcwFaction); - return; } public String faction_recruiter_rebel_tokenTO_getFactionRankName(obj_id player, obj_id npc) throws InterruptedException { @@ -173,7 +172,7 @@ public class faction_recruiter_rebel extends script.base_script } public String faction_recruiter_rebel_tokenTO_getRebelScoreString(obj_id player, obj_id npc) throws InterruptedException { - return "" + getIntObjVar(npc, "Rebel.controlScore"); + return getStringObjVar(npc, "Rebel.controlScore"); } public int faction_recruiter_rebel_tokenDI_getImperialScore(obj_id player, obj_id npc) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/conversation/fs_medic_puzzle_head_medic.java b/sku.0/sys.server/compiled/game/script/conversation/fs_medic_puzzle_head_medic.java index 36d5f5064..26cf09c4a 100755 --- a/sku.0/sys.server/compiled/game/script/conversation/fs_medic_puzzle_head_medic.java +++ b/sku.0/sys.server/compiled/game/script/conversation/fs_medic_puzzle_head_medic.java @@ -23,25 +23,11 @@ public class fs_medic_puzzle_head_medic extends script.base_script } public boolean fs_medic_puzzle_head_medic_condition_hasCompleted1(obj_id player, obj_id npc) throws InterruptedException { - if (quests.canActivate(MEDIC_QUEST_NAME_TWO, player) && quests.isComplete(MEDIC_QUEST_NAME_ONE, player)) - { - return true; - } - else - { - return false; - } + return quests.canActivate(MEDIC_QUEST_NAME_TWO, player) && quests.isComplete(MEDIC_QUEST_NAME_ONE, player); } public boolean fs_medic_puzzle_head_medic_condition_hasCompleted2(obj_id player, obj_id npc) throws InterruptedException { - if (quests.canActivate(MEDIC_QUEST_NAME_THREE, player) && quests.isComplete(MEDIC_QUEST_NAME_TWO, player)) - { - return true; - } - else - { - return false; - } + return quests.canActivate(MEDIC_QUEST_NAME_THREE, player) && quests.isComplete(MEDIC_QUEST_NAME_TWO, player); } public boolean fs_medic_puzzle_head_medic_condition_Finished(obj_id player, obj_id npc) throws InterruptedException { @@ -180,7 +166,7 @@ public class fs_medic_puzzle_head_medic extends script.base_script peopleHealed = peopleHealed - 5; } peopleHealed = 5 - peopleHealed; - return "" + peopleHealed; + return Integer.toString(peopleHealed); } public static final String MEDIC_QUEST_NAME_ONE = "fs_medic_puzzle_quest_01"; public static final String MEDIC_QUEST_NAME_TWO = "fs_medic_puzzle_quest_02"; diff --git a/sku.0/sys.server/compiled/game/script/corpse/.gitignore b/sku.0/sys.server/compiled/game/script/corpse/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/corpse/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/creature/.gitignore b/sku.0/sys.server/compiled/game/script/creature/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/creature/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/creature_spawner/.gitignore b/sku.0/sys.server/compiled/game/script/creature_spawner/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/creature_spawner/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/csr/.gitignore b/sku.0/sys.server/compiled/game/script/csr/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/csr/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/cureward/.gitignore b/sku.0/sys.server/compiled/game/script/cureward/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/cureward/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/cybernetic/.gitignore b/sku.0/sys.server/compiled/game/script/cybernetic/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/cybernetic/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_crafted_item.java b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_crafted_item.java index 66e23aba8..2d14f8abf 100755 --- a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_crafted_item.java +++ b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_crafted_item.java @@ -117,7 +117,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("throwRangeMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("throwRangeMod")); } } if (cyberRow.getInt("rangedRangeMod") != 0) @@ -129,7 +129,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("rangedRangeMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("rangedRangeMod")); } } if (cyberRow.getInt("healingMod") != 0) @@ -141,7 +141,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("healingMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("healingMod")); } } if (cyberRow.getInt("rangedAccuracyMod") != 0) @@ -153,7 +153,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("rangedAccuracyMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("rangedAccuracyMod")); } } if (cyberRow.getInt("meleeDefMod") != 0) @@ -165,7 +165,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("meleeDefMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("meleeDefMod")); } } if (cyberRow.getInt("meleeAccuracyMod") != 0) @@ -177,7 +177,7 @@ public class cybernetic_crafted_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("meleeAccuracyMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("meleeAccuracyMod")); } } if (cyberRow.getInt("commandoLegs") != 0) diff --git a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java index e8108046a..adcde8c25 100755 --- a/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java +++ b/sku.0/sys.server/compiled/game/script/cybernetic/cybernetic_item.java @@ -138,7 +138,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("throwRangeMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("throwRangeMod")); } } if (cyberRow.getInt("rangedRangeMod") != 0) @@ -150,7 +150,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("rangedRangeMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("rangedRangeMod")); } } if (cyberRow.getInt("healingMod") != 0) @@ -162,7 +162,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("healingMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("healingMod")); } } if (cyberRow.getInt("rangedAccuracyMod") != 0) @@ -174,7 +174,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("rangedAccuracyMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("rangedAccuracyMod")); } } if (cyberRow.getInt("meleeDefMod") != 0) @@ -186,7 +186,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("meleeDefMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("meleeDefMod")); } } if (cyberRow.getInt("meleeAccuracyMod") != 0) @@ -198,7 +198,7 @@ public class cybernetic_item extends script.base_script } else { - attribs[free++] = "" + cyberRow.getInt("meleeAccuracyMod"); + attribs[free++] = Integer.toString(cyberRow.getInt("meleeAccuracyMod")); } } if (cyberRow.getInt("commandoLegs") != 0) diff --git a/sku.0/sys.server/compiled/game/script/data_item/.gitignore b/sku.0/sys.server/compiled/game/script/data_item/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/data_item/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/debug/.gitignore b/sku.0/sys.server/compiled/game/script/debug/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/debug/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/demo/.gitignore b/sku.0/sys.server/compiled/game/script/demo/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/demo/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/developer/.gitignore b/sku.0/sys.server/compiled/game/script/developer/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/developer/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/e3demo/.gitignore b/sku.0/sys.server/compiled/game/script/e3demo/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/e3demo/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/event/.gitignore b/sku.0/sys.server/compiled/game/script/event/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/event/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.java b/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.java index 8d584845b..7f377be27 100755 --- a/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.java +++ b/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.java @@ -264,21 +264,20 @@ public class dianoga_dumpster extends script.base_script if (succesFeeds > 0) { names[idx] = "times_fed"; - attribs[idx] = "" + succesFeeds; + attribs[idx] = Integer.toString(succesFeeds); idx++; } names[idx] = "next_feed"; - if (currentStatus == 0) - { - attribs[idx] = getCalendarTimeStringLocal(lastFed + house_pet.getUpdateWeekly(self)); - } - else if (currentStatus == 1) - { - attribs[idx] = "Now"; - } - else - { - attribs[idx] = "Hopefully Soon"; + switch (currentStatus) { + case 0: + attribs[idx] = getCalendarTimeStringLocal(lastFed + house_pet.getUpdateWeekly(self)); + break; + case 1: + attribs[idx] = "Now"; + break; + default: + attribs[idx] = "Hopefully Soon"; + break; } idx++; names[idx] = "time_now"; diff --git a/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.java b/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.java index 842fb6c2b..9df1e9207 100755 --- a/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.java +++ b/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.java @@ -291,21 +291,20 @@ public class sarlacc_furniture_terminal extends script.base_script if (succesFeeds > 0) { names[idx] = "times_fed"; - attribs[idx] = "" + succesFeeds; + attribs[idx] = Integer.toString(succesFeeds); idx++; } names[idx] = "next_feed"; - if (currentStatus == 0) - { - attribs[idx] = getCalendarTimeStringLocal(lastFed + house_pet.getUpdateWeekly(self)); - } - else if (currentStatus == 1) - { - attribs[idx] = "Now"; - } - else - { - attribs[idx] = "Hopefully Soon"; + switch (currentStatus) { + case 0: + attribs[idx] = getCalendarTimeStringLocal(lastFed + house_pet.getUpdateWeekly(self)); + break; + case 1: + attribs[idx] = "Now"; + break; + default: + attribs[idx] = "Hopefully Soon"; + break; } idx++; names[idx] = "time_now"; @@ -505,7 +504,7 @@ public class sarlacc_furniture_terminal extends script.base_script { return SCRIPT_CONTINUE; } - if (params == null || params.equals("")) + if (params == null || params.isEmpty()) { return SCRIPT_CONTINUE; } @@ -527,7 +526,7 @@ public class sarlacc_furniture_terminal extends script.base_script { return SCRIPT_CONTINUE; } - if (params == null || params.equals("")) + if (params == null || params.isEmpty()) { return SCRIPT_CONTINUE; } @@ -553,7 +552,7 @@ public class sarlacc_furniture_terminal extends script.base_script { return SCRIPT_CONTINUE; } - if (params == null || params.equals("")) + if (params == null || params.isEmpty()) { return SCRIPT_CONTINUE; } @@ -646,21 +645,21 @@ public class sarlacc_furniture_terminal extends script.base_script CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " has a feeding iteration, continuing debug procedures."); } int currentPhase = getIntObjVar(sarlacc, house_pet.SARLACC_CURRENT_PHASE); - if (currentPhase == house_pet.SARLACC_DEATH) - { - CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently DEAD."); - } - else if (currentPhase == house_pet.SARLACC_STARVING) - { - CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently STARVING."); - } - else if (currentPhase == house_pet.SARLACC_HUNGRY) - { - CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently HUNGRY."); - } - else if (currentPhase == house_pet.SARLACC_FED) - { - CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently FED."); + switch (currentPhase) { + case house_pet.SARLACC_DEATH: + CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently DEAD."); + break; + case house_pet.SARLACC_STARVING: + CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently STARVING."); + break; + case house_pet.SARLACC_HUNGRY: + CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently HUNGRY."); + break; + case house_pet.SARLACC_FED: + CustomerServiceLog("sarlacc_minigame: ", "updateSarlaccPet - Sarlacc: " + sarlacc + " we haven't even started updating yet and the Sarlacc is currently FED."); + break; + default: + break; } if (getIntObjVar(sarlacc, house_pet.SARLACC_FEEDING_ITERATION) >= house_pet.SARLACC_PHASE_WEEKS) { @@ -842,7 +841,7 @@ public class sarlacc_furniture_terminal extends script.base_script for (int i = 0; i < edibleItems.length; i++) { String name = getAssignedName(edibleItems[i]); - if (name.equals("") || name == null) + if (name.isEmpty() || name == null) { name = getString(getNameStringId(edibleItems[i])); } @@ -1328,7 +1327,7 @@ public class sarlacc_furniture_terminal extends script.base_script { logData += " No Sarlacc Penalty Variable."; } - if (logData == null || logData.equals("")) + if (logData.isEmpty() || logData.isBlank()) { return false; } diff --git a/sku.0/sys.server/compiled/game/script/faction_perk/.gitignore b/sku.0/sys.server/compiled/game/script/faction_perk/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/faction_perk/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/fishing/.gitignore b/sku.0/sys.server/compiled/game/script/fishing/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/fishing/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/fishing/fish.java b/sku.0/sys.server/compiled/game/script/fishing/fish.java index 256e25b13..c10344164 100755 --- a/sku.0/sys.server/compiled/game/script/fishing/fish.java +++ b/sku.0/sys.server/compiled/game/script/fishing/fish.java @@ -89,7 +89,7 @@ public class fish extends script.base_script if (length > 0.0f) { names[line] = "length"; - attribs[line] = "" + length + "m"; + attribs[line] = length + "m"; line++; if (line > names.length) { diff --git a/sku.0/sys.server/compiled/game/script/fishing/pole.java b/sku.0/sys.server/compiled/game/script/fishing/pole.java index 4faa1c61e..8e8ef1ed2 100755 --- a/sku.0/sys.server/compiled/game/script/fishing/pole.java +++ b/sku.0/sys.server/compiled/game/script/fishing/pole.java @@ -115,7 +115,7 @@ public class pole extends script.base_script { names[idx] = "useModifier"; float attrib = getIntObjVar(self, "useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Float.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/gambling/.gitignore b/sku.0/sys.server/compiled/game/script/gambling/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/gambling/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/gcw_score.java b/sku.0/sys.server/compiled/game/script/gcw_score.java index 8d0256270..7d1b19197 100755 --- a/sku.0/sys.server/compiled/game/script/gcw_score.java +++ b/sku.0/sys.server/compiled/game/script/gcw_score.java @@ -48,13 +48,13 @@ public class gcw_score allData[i][0] = playerGcwData.playerName; allData[i][1] = playerGcwData.playerFaction; allData[i][2] = playerGcwData.playerProfession; - allData[i][3] = "" + playerGcwData.playerLevel; - allData[i][4] = "" + playerGcwData.playerGCW; - allData[i][5] = "" + playerGcwData.playerPvpKills; - allData[i][6] = "" + playerGcwData.playerKills; - allData[i][7] = "" + playerGcwData.playerAssists; - allData[i][8] = "" + playerGcwData.playerCraftedItems; - allData[i][9] = "" + playerGcwData.playerDestroyedItems; + allData[i][3] = Integer.toString(playerGcwData.playerLevel); + allData[i][4] = Integer.toString(playerGcwData.playerGCW); + allData[i][5] = Integer.toString(playerGcwData.playerPvpKills); + allData[i][6] = Integer.toString(playerGcwData.playerKills); + allData[i][7] = Integer.toString(playerGcwData.playerAssists); + allData[i][8] = Integer.toString(playerGcwData.playerCraftedItems); + allData[i][9] = Integer.toString(playerGcwData.playerDestroyedItems); } } diff --git a/sku.0/sys.server/compiled/game/script/gm/.gitignore b/sku.0/sys.server/compiled/game/script/gm/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/gm/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/grouping/.gitignore b/sku.0/sys.server/compiled/game/script/grouping/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/grouping/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/guild/.gitignore b/sku.0/sys.server/compiled/game/script/guild/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/guild/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/harvesting/.gitignore b/sku.0/sys.server/compiled/game/script/harvesting/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/harvesting/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/holocron/.gitignore b/sku.0/sys.server/compiled/game/script/holocron/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/holocron/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/item/.gitignore b/sku.0/sys.server/compiled/game/script/item/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/item/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java b/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java index 4a4e27e95..c10dfc9e4 100755 --- a/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java +++ b/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java @@ -132,7 +132,7 @@ public class dynamic_armor extends script.base_script if (requiredLevelToEquip != 0) { names[free] = utils.packStringId(new string_id("proc/proc", "required_combat_level")); - attribs[free++] = "" + requiredLevelToEquip; + attribs[free++] = Integer.toString(requiredLevelToEquip); } String requiredSkillToEquip = getStringObjVar(self, "dynamic_item.required_skill"); if (requiredSkillToEquip != null && !requiredSkillToEquip.equals("")) diff --git a/sku.0/sys.server/compiled/game/script/item/comestible/crafted.java b/sku.0/sys.server/compiled/game/script/item/comestible/crafted.java index 846bfbdc4..1642a4941 100755 --- a/sku.0/sys.server/compiled/game/script/item/comestible/crafted.java +++ b/sku.0/sys.server/compiled/game/script/item/comestible/crafted.java @@ -70,7 +70,7 @@ public class crafted extends script.item.comestible.comestible else { int numMods = am.length; - attribs[n] = "" + numMods; + attribs[n] = Integer.toString(numMods); n++; if (n > names.length) { @@ -84,7 +84,7 @@ public class crafted extends script.item.comestible.comestible if (val > 0) { sVal = "+" + val; } else if (val < 0) { - sVal = "" + val; + sVal = Integer.toString(val); } int minutes = duration / 60; int seconds = duration - (minutes * 60); diff --git a/sku.0/sys.server/compiled/game/script/item/comestible/dead_eye.java b/sku.0/sys.server/compiled/game/script/item/comestible/dead_eye.java index 82ce1157b..2a70b7373 100755 --- a/sku.0/sys.server/compiled/game/script/item/comestible/dead_eye.java +++ b/sku.0/sys.server/compiled/game/script/item/comestible/dead_eye.java @@ -74,7 +74,7 @@ public class dead_eye extends script.base_script if (hasObjVar(self, "deadeye_eff")) { names[idx] = "examine_dot_apply_power"; - attribs[idx] = "" + getIntObjVar(self, "deadeye_eff") + "%"; + attribs[idx] = getIntObjVar(self, "deadeye_eff") + "%"; idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/comestible/foraged.java b/sku.0/sys.server/compiled/game/script/item/comestible/foraged.java index f93f888d1..f8f7f2540 100755 --- a/sku.0/sys.server/compiled/game/script/item/comestible/foraged.java +++ b/sku.0/sys.server/compiled/game/script/item/comestible/foraged.java @@ -32,7 +32,7 @@ public class foraged extends script.item.comestible.comestible else { int numMods = am.length; - attribs[n] = "" + numMods; + attribs[n] = Integer.toString(numMods); n++; if (n > names.length) { @@ -47,7 +47,7 @@ public class foraged extends script.item.comestible.comestible if (newVal > 0) { sVal = "+" + newVal; } else if (newVal < 0) { - sVal = "" + newVal; + sVal = Integer.toString(newVal); } names[n] = toLower(consumable.STAT_NAME[attrib]); attribs[n] = sVal + "%, " + duration + "s"; diff --git a/sku.0/sys.server/compiled/game/script/item/comestible/spice.java b/sku.0/sys.server/compiled/game/script/item/comestible/spice.java index 9d28de211..29d06b131 100755 --- a/sku.0/sys.server/compiled/game/script/item/comestible/spice.java +++ b/sku.0/sys.server/compiled/game/script/item/comestible/spice.java @@ -152,7 +152,7 @@ public class spice extends script.base_script } else { - attribs[idx] = "" + numMods; + attribs[idx] = Integer.toString(numMods); } } return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/item/component/component_attribs.java b/sku.0/sys.server/compiled/game/script/item/component/component_attribs.java index d0e32763d..3ce2a2581 100755 --- a/sku.0/sys.server/compiled/game/script/item/component/component_attribs.java +++ b/sku.0/sys.server/compiled/game/script/item/component/component_attribs.java @@ -24,7 +24,7 @@ public class component_attribs extends script.base_script if (complexity >= 0) { names[i] = "@crafting:complexity"; - attribs[i] = "" + complexity; + attribs[i] = Float.toString(complexity); ++i; } obj_var_list componentData = getObjVarList(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME); diff --git a/sku.0/sys.server/compiled/game/script/item/component/reverse_engineer_component.java b/sku.0/sys.server/compiled/game/script/item/component/reverse_engineer_component.java index e5a17f503..f631db039 100755 --- a/sku.0/sys.server/compiled/game/script/item/component/reverse_engineer_component.java +++ b/sku.0/sys.server/compiled/game/script/item/component/reverse_engineer_component.java @@ -20,7 +20,7 @@ public class reverse_engineer_component extends script.base_script { int powerModPower = getIntObjVar(self, "reverse_engineering.reverse_engineering_power"); names[i] = "@crafting:power_bit_power"; - attribs[i] = "" + powerModPower; + attribs[i] = Integer.toString(powerModPower); ++i; } if (hasObjVar(self, "reverse_engineering.reverse_engineering_modifier")) @@ -34,7 +34,7 @@ public class reverse_engineer_component extends script.base_script { int modBitRatio = getIntObjVar(self, "reverse_engineering.reverse_engineering_ratio"); names[i] = "@crafting:mod_bit_ratio"; - attribs[i] = "" + modBitRatio; + attribs[i] = Integer.toString(modBitRatio); ++i; } } diff --git a/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.java b/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.java index c0b88829a..b1c7a0c8f 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/chance_cube.java @@ -55,7 +55,7 @@ public class chance_cube extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.java b/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.java index 8250954a2..278aff807 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/configurable_group_dice.java @@ -76,7 +76,7 @@ public class configurable_group_dice extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.java b/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.java index 472ddeebd..83fd4df16 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/one_hundred_sided_dice_set.java @@ -59,7 +59,7 @@ public class one_hundred_sided_dice_set extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.java b/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.java index 30e52f784..461597fd6 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/six_sided_dice_set.java @@ -66,7 +66,7 @@ public class six_sided_dice_set extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.java b/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.java index ba6acea20..a141235d6 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/ten_sided_dice_set.java @@ -59,7 +59,7 @@ public class ten_sided_dice_set extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.java b/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.java index 3c8549346..50bbfe97a 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/twelve_sided_dice_set.java @@ -59,7 +59,7 @@ public class twelve_sided_dice_set extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.java b/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.java index 064be5b0f..320fe6935 100755 --- a/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.java +++ b/sku.0/sys.server/compiled/game/script/item/dice/twenty_sided_dice_set.java @@ -59,7 +59,7 @@ public class twenty_sided_dice_set extends script.item.dice.base.base_dice { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/food.java b/sku.0/sys.server/compiled/game/script/item/food.java index 930a62f4e..d6221c328 100755 --- a/sku.0/sys.server/compiled/game/script/item/food.java +++ b/sku.0/sys.server/compiled/game/script/item/food.java @@ -63,7 +63,7 @@ public class food extends script.base_script float duration = buff.getDuration(buff_name); duration *= dur; String durString = formatTime((int)duration); - attribs[idx] = "" + durString + "\n"; + attribs[idx] = durString + "\n"; attribs[idx] += "\n" + "The duration of the buff from this item can be increased cumulatively by eating more of the same food " + "as long as the resulting duration does not exceed 2 hours. \n\n" + "Note that the value of primary buffed modifier of the last one eaten will be the one used by the buff."; idx++; if (idx >= names.length) @@ -98,7 +98,7 @@ public class food extends script.base_script { value *= eff; } - attribs[idx] = "" + value; + attribs[idx] = Float.toString(value); switch (buff_name) { case "drink_ruby_bliel": names[idx] = "food_stimpack_roundtime"; @@ -144,7 +144,7 @@ public class food extends script.base_script { attribs[idx] = "+"; } - attribs[idx] += "" + value; + attribs[idx] += Float.toString(value); if (param.contains("percent")) { attribs[idx] += "%"; @@ -384,7 +384,7 @@ public class food extends script.base_script seconds -= (minutes * 60); if (hours > 0) { - result += "" + hours + ":"; + result += hours + ":"; } if (minutes > 0 || hours > 0) { @@ -392,13 +392,13 @@ public class food extends script.base_script { result += "0"; } - result += "" + minutes + ":"; + result += minutes + ":"; } if (minutes > 0 && seconds < 10) { result += "0"; } - result += "" + seconds; + result += seconds; return result; } public boolean isClickyCombatNerfed(String buff_name) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/heroic_token_box.java b/sku.0/sys.server/compiled/game/script/item/heroic_token_box.java index b79debbe7..7420efda7 100755 --- a/sku.0/sys.server/compiled/game/script/item/heroic_token_box.java +++ b/sku.0/sys.server/compiled/game/script/item/heroic_token_box.java @@ -51,7 +51,7 @@ public class heroic_token_box extends script.base_script for (int i = 0; i < tokenTypes.length; i++) { names[free] = utils.packStringId(new string_id("static_item_n", trial.HEROIC_TOKENS[i])); - attribs[free++] = "" + tokenTypes[i]; + attribs[free++] = Integer.toString(tokenTypes[i]); } } return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/fryer.java b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/fryer.java index bc13c15b8..d7b6a3206 100755 --- a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/fryer.java +++ b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/fryer.java @@ -159,7 +159,7 @@ public class fryer extends script.base_script } int currentStatus = getIntObjVar(self, DECAY); names[idx] = "fryer_status"; - attribs[idx] = "" + currentStatus + "%"; + attribs[idx] = currentStatus + "%"; idx++; return SCRIPT_CONTINUE; } @@ -338,7 +338,7 @@ public class fryer extends script.base_script while (randomRows.size() < (collection.ICE_CREAM_BUFF_ARRAY.length - 2)) { int randomNum = rand(BASIC_BUFF_ROWS, datatableLength); - randomRows.add("" + randomNum); + randomRows.add(Integer.toString(randomNum)); blog("getRandomRowNumbersWithoutDuplicates - adding this to hash: " + randomNum); } String[] allNumbers = new String[randomRows.size()]; diff --git a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_fail.java b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_fail.java index 21ca71647..48ee7910c 100755 --- a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_fail.java +++ b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_fail.java @@ -170,7 +170,7 @@ public class ice_cream_fail extends script.base_script seconds -= (minutes * 60); if (hours > 0) { - result += "" + hours + ":"; + result += hours + ":"; } if (minutes > 0 || hours > 0) { @@ -178,13 +178,13 @@ public class ice_cream_fail extends script.base_script { result += "0"; } - result += "" + minutes + ":"; + result += minutes + ":"; } if (minutes > 0 && seconds < 10) { result += "0"; } - result += "" + seconds; + result += seconds; return result; } public int removeItemFoodScript(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_nobuff.java b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_nobuff.java index cb12afaa5..2bcb3004b 100755 --- a/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_nobuff.java +++ b/sku.0/sys.server/compiled/game/script/item/ice_cream_fryer/ice_cream_nobuff.java @@ -170,7 +170,7 @@ public class ice_cream_nobuff extends script.base_script seconds -= (minutes * 60); if (hours > 0) { - result += "" + hours + ":"; + result += hours + ":"; } if (minutes > 0 || hours > 0) { @@ -178,13 +178,13 @@ public class ice_cream_nobuff extends script.base_script { result += "0"; } - result += "" + minutes + ":"; + result += minutes + ":"; } if (minutes > 0 && seconds < 10) { result += "0"; } - result += "" + seconds; + result += seconds; return result; } public int removeItemFoodScript(obj_id self, dictionary params) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/instance_reset.java b/sku.0/sys.server/compiled/game/script/item/instance_reset.java index 813929faf..5e5a77452 100755 --- a/sku.0/sys.server/compiled/game/script/item/instance_reset.java +++ b/sku.0/sys.server/compiled/game/script/item/instance_reset.java @@ -194,7 +194,7 @@ public class instance_reset extends script.base_script obj_id owner = instance_data.getObjId("owner"); int startTime = instance_data.getInt("start_time"); int resetAt = getCalendarTime(); - setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, "" + resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime); + setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime); instance_data = instance.getLockoutData(player, instanceToRemove); if (instance_data != null && !instance_data.isEmpty()) { diff --git a/sku.0/sys.server/compiled/game/script/item/medicine/enhancer.java b/sku.0/sys.server/compiled/game/script/item/medicine/enhancer.java index bed99ab78..b69cd51ff 100755 --- a/sku.0/sys.server/compiled/game/script/item/medicine/enhancer.java +++ b/sku.0/sys.server/compiled/game/script/item/medicine/enhancer.java @@ -51,7 +51,7 @@ public class enhancer extends script.base_script if (hasObjVar(self, "healing.enhancement")) { names[idx] = "enhancer_power"; - attribs[idx] = "" + Math.floor(getFloatObjVar(self, "healing.enhancement")); + attribs[idx] = Double.toString(Math.floor(getFloatObjVar(self, "healing.enhancement"))); } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack.java b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack.java index 509aefc4f..eca5c9af1 100755 --- a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack.java +++ b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack.java @@ -22,7 +22,7 @@ public class stimpack extends script.base_script { names[idx] = "healing_power"; int value = getIntObjVar(self, "healing.power"); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); idx++; if (idx >= names.length) { @@ -33,7 +33,7 @@ public class stimpack extends script.base_script { names[idx] = "healing_combat_level_required"; int value = getIntObjVar(self, "healing.combat_level_required"); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); idx++; if (idx >= names.length) { @@ -42,7 +42,7 @@ public class stimpack extends script.base_script } names[idx] = "count"; int value = getCount(self); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); return SCRIPT_CONTINUE; } public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_crafted.java b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_crafted.java index 2fa7ea65d..59ba6e961 100755 --- a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_crafted.java +++ b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_crafted.java @@ -23,7 +23,7 @@ public class stimpack_crafted extends script.base_script { names[idx] = "healing_power"; int value = getIntObjVar(self, "healing.power"); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); idx++; if (idx >= names.length) { @@ -34,7 +34,7 @@ public class stimpack_crafted extends script.base_script { names[idx] = "healing_combat_level_required"; int value = getIntObjVar(self, "healing.combat_level_required"); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); idx++; if (idx >= names.length) { @@ -43,7 +43,7 @@ public class stimpack_crafted extends script.base_script } names[idx] = "count"; int value = getCount(self); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); return SCRIPT_CONTINUE; } public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_pet.java b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_pet.java index 10d7f0b6c..027cb917c 100755 --- a/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_pet.java +++ b/sku.0/sys.server/compiled/game/script/item/medicine/stimpack_pet.java @@ -24,7 +24,7 @@ public class stimpack_pet extends script.base_script { names[idx] = "healing_power"; float value = getIntObjVar(self, "healing.power"); - attribs[idx] = "" + value; + attribs[idx] = Float.toString(value); idx++; if (idx >= names.length) { @@ -33,7 +33,7 @@ public class stimpack_pet extends script.base_script } names[idx] = "count"; int value = getCount(self); - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); return SCRIPT_CONTINUE; } public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException diff --git a/sku.0/sys.server/compiled/game/script/item/parrot_cage/parrot_cage.java b/sku.0/sys.server/compiled/game/script/item/parrot_cage/parrot_cage.java index bede5fdfe..4f0b89948 100755 --- a/sku.0/sys.server/compiled/game/script/item/parrot_cage/parrot_cage.java +++ b/sku.0/sys.server/compiled/game/script/item/parrot_cage/parrot_cage.java @@ -201,7 +201,7 @@ public class parrot_cage extends script.base_script { names[idx] = "usemodifier"; int attrib = (int)getFloatObjVar(self, craftinglib.COMPONENT_ATTRIBUTE_OBJVAR_NAME + ".useModifier"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { diff --git a/sku.0/sys.server/compiled/game/script/item/skill_buff/base.java b/sku.0/sys.server/compiled/game/script/item/skill_buff/base.java index 16726d792..af701cf4a 100755 --- a/sku.0/sys.server/compiled/game/script/item/skill_buff/base.java +++ b/sku.0/sys.server/compiled/game/script/item/skill_buff/base.java @@ -150,7 +150,7 @@ public class base extends script.base_script return SCRIPT_CONTINUE; } names[idx] = "skill_modifier_amount"; - attribs[idx] = "" + value; + attribs[idx] = Integer.toString(value); idx++; if (idx >= names.length) { @@ -243,7 +243,7 @@ public class base extends script.base_script seconds -= (minutes * 60); if (hours > 0) { - result += "" + hours + ":"; + result += hours + ":"; } if (minutes > 0 || hours > 0) { @@ -251,13 +251,13 @@ public class base extends script.base_script { result += "0"; } - result += "" + minutes + ":"; + result += minutes + ":"; } if (minutes > 0 && seconds < 10) { result += "0"; } - result += "" + seconds; + result += seconds; return result; } } diff --git a/sku.0/sys.server/compiled/game/script/item/spice.java b/sku.0/sys.server/compiled/game/script/item/spice.java index b311e774e..25d0007bd 100755 --- a/sku.0/sys.server/compiled/game/script/item/spice.java +++ b/sku.0/sys.server/compiled/game/script/item/spice.java @@ -29,7 +29,7 @@ public class spice extends script.base_script float duration = buff.getDuration(buff_name); String durString = formatTime((int)duration); names[idx] = "duration"; - attribs[idx] = "" + durString + "\n"; + attribs[idx] = durString + "\n"; idx++; if (idx >= names.length) { @@ -176,7 +176,7 @@ public class spice extends script.base_script seconds -= (minutes * 60); if (hours > 0) { - result += "" + hours + ":"; + result += hours + ":"; } if (minutes > 0 || hours > 0) { @@ -184,13 +184,13 @@ public class spice extends script.base_script { result += "0"; } - result += "" + minutes + ":"; + result += minutes + ":"; } if (minutes > 0 && seconds < 10) { result += "0"; } - result += "" + seconds; + result += seconds; return result; } } diff --git a/sku.0/sys.server/compiled/game/script/item/static_item_base.java b/sku.0/sys.server/compiled/game/script/item/static_item_base.java index 2621dc18f..3f6f5a18d 100755 --- a/sku.0/sys.server/compiled/game/script/item/static_item_base.java +++ b/sku.0/sys.server/compiled/game/script/item/static_item_base.java @@ -177,7 +177,7 @@ public class static_item_base extends script.base_script if (requiredLevelToEquip != 0 && !hasScript(self, "systems.combat.combat_weapon")) { names[free] = utils.packStringId(new string_id("proc/proc", "required_combat_level")); - attribs[free++] = "" + requiredLevelToEquip; + attribs[free++] = Integer.toString(requiredLevelToEquip); } String requiredSkillToEquip = itemData.getString("required_skill"); if (requiredSkillToEquip != null && !requiredSkillToEquip.equals("") && !hasScript(self, "systems.combat.combat_weapon")) @@ -230,7 +230,7 @@ public class static_item_base extends script.base_script if (requiredLevelForEffect != 0) { names[free] = utils.packStringId(new string_id("proc/proc", "effect_level")); - attribs[free++] = "" + requiredLevelForEffect; + attribs[free++] = Integer.toString(requiredLevelForEffect); } String buffName = typeData.getString("buff_name"); if (buffName != null && !buffName.equals("") && buffIdentity == 0) @@ -316,9 +316,9 @@ public class static_item_base extends script.base_script } int tier = itemData.getInt("tier"); names[free] = "tier"; - attribs[free++] = "" + tier; + attribs[free++] = Integer.toString(tier); names[free] = "tooltip.tier"; - attribs[free++] = "" + tier; + attribs[free++] = Integer.toString(tier); if (static_item.isUniqueStaticItem(self)) { names[free] = "unique"; diff --git a/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java b/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java index b42bd8afa..5a8c9b0e8 100755 --- a/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java +++ b/sku.0/sys.server/compiled/game/script/item/texture_kit/texture_kit.java @@ -95,7 +95,7 @@ public class texture_kit extends script.base_script return SCRIPT_CONTINUE; } names[idx] = "charges"; - attribs[idx] = "" + getCount(self); + attribs[idx] = Integer.toString(getCount(self)); idx++; return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/item/tool/medikit.java b/sku.0/sys.server/compiled/game/script/item/tool/medikit.java index c4ad9791a..41330f6b1 100755 --- a/sku.0/sys.server/compiled/game/script/item/tool/medikit.java +++ b/sku.0/sys.server/compiled/game/script/item/tool/medikit.java @@ -54,7 +54,7 @@ public class medikit extends script.base_script { names[idx] = "useModifier"; int attrib = getIntObjVar(self, "medikit.quality"); - attribs[idx] = "" + attrib; + attribs[idx] = Integer.toString(attrib); idx++; if (idx >= names.length) { @@ -197,14 +197,7 @@ public class medikit extends script.base_script } public boolean haveChargedMedTool(obj_id player, obj_id medikitTool) throws InterruptedException { - if ((getCount(medikitTool) > 0) && (utils.isNestedWithin(medikitTool, player))) - { - return true; - } - else - { - return false; - } + return (getCount(medikitTool) > 0) && (utils.isNestedWithin(medikitTool, player)); } public void clearTrackingScriptVars(obj_id self) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_poweredup_item.java b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_poweredup_item.java index 125723224..a937e2748 100755 --- a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_poweredup_item.java +++ b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_poweredup_item.java @@ -143,13 +143,13 @@ public class reverse_engineering_poweredup_item extends script.base_script attribs[i] = "@stat_n:" + mod; i++; names[i] = "@spam:pup_power"; - attribs[i] = "" + (power / ratio); + attribs[i] = Integer.toString((power / ratio)); i++; } float expiration = reverse_engineering.getDieTime(reverse_engineering.EXPIRATION_TIME, self); float timeInMinutes = expiration / 60; names[i] = "@spam:pup_expire_time"; - attribs[i] = "" + (int)timeInMinutes; + attribs[i] = Float.toString(timeInMinutes); } return SCRIPT_CONTINUE; } diff --git a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_powerup.java b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_powerup.java index 66ebc69e6..c3879666a 100755 --- a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_powerup.java +++ b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_powerup.java @@ -53,7 +53,7 @@ public class reverse_engineering_powerup extends script.base_script String mod = getStringObjVar(self, reverse_engineering.ENGINEERING_MODIFIER); int ratio = getIntObjVar(self, reverse_engineering.ENGINEERING_RATIO); names[i] = "@stat_n:" + mod; - attribs[i] = "" + power / ratio; + attribs[i] = Integer.toString(power / ratio); } } return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.java b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.java index 67607bd50..2d4937e0a 100755 --- a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.java +++ b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.java @@ -498,7 +498,6 @@ public class reverse_engineering_tool extends script.base_script { sendSystemMessage(player, new string_id("spam", "powerup_wrong_components")); } - return; } public void generatePowerBit(obj_id self, obj_id player) throws InterruptedException { @@ -612,7 +611,6 @@ public class reverse_engineering_tool extends script.base_script setName(powerBit, finalName); } } - return; } public void generateModifierBit(obj_id self, obj_id player) throws InterruptedException { @@ -668,7 +666,6 @@ public class reverse_engineering_tool extends script.base_script } prependModNameToObject(powerBit, modName); } - return; } public boolean isJunk(obj_id item) throws InterruptedException { @@ -697,11 +694,7 @@ public class reverse_engineering_tool extends script.base_script { return false; } - if (hasObjVar(item, "skillmod.bonus")) - { - return true; - } - return false; + return hasObjVar(item, "skillmod.bonus"); } public int getPowerBitType(obj_id item) throws InterruptedException { @@ -723,19 +716,11 @@ public class reverse_engineering_tool extends script.base_script return false; } String templateName = getTemplateName(item); - if (templateName.equals("object/tangible/component/reverse_engineering/enhancement_module.iff")) - { - return true; - } - return false; + return templateName.equals("object/tangible/component/reverse_engineering/enhancement_module.iff"); } public boolean isModifierBit(obj_id item) throws InterruptedException { - if (hasObjVar(item, "reverse_engineering.reverse_engineering_modifier") && hasObjVar(item, "reverse_engineering.reverse_engineering_ratio") && !hasScript(item, "item.tool.reverse_engineering_powerup") && !hasScript(item, "item.tool.reverse_engineering_poweredup_item")) - { - return true; - } - return false; + return hasObjVar(item, "reverse_engineering.reverse_engineering_modifier") && hasObjVar(item, "reverse_engineering.reverse_engineering_ratio") && !hasScript(item, "item.tool.reverse_engineering_powerup") && !hasScript(item, "item.tool.reverse_engineering_poweredup_item"); } public int getFinalAttachmentLevel(obj_id item) throws InterruptedException { @@ -759,11 +744,7 @@ public class reverse_engineering_tool extends script.base_script public boolean canUpgradeAttachment(obj_id player) throws InterruptedException { float skillMod = getEnhancedSkillStatisticModifierUncapped(player, "expertise_attachment_upgrade"); - if (skillMod > 0) - { - return true; - } - return false; + return skillMod > 0; } public String getGemTemplateByClass(obj_id player, int ratio, int type) throws InterruptedException { @@ -805,13 +786,13 @@ public class reverse_engineering_tool extends script.base_script { float power = getFloatObjVar(self, "crafting.stationMod"); names[idx] = "@obj_attr_n:experiment_bonus_eff"; - attribs[idx] = "" + power; + attribs[idx] = Float.toString(power); idx++; } if (hasObjVar(self, "res_quality")) { names[idx] = "quality_bonus"; - attribs[idx] = "" + getFloatObjVar(self, "res_quality"); + attribs[idx] = Float.toString(getFloatObjVar(self, "res_quality")); idx++; } return SCRIPT_CONTINUE; @@ -830,7 +811,6 @@ public class reverse_engineering_tool extends script.base_script String newName = modName + " " + stringName; setName(object, newName); } - return; } public float getReverseEngineeringBonusMultiplier() throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/item/vet_instance_reset.java b/sku.0/sys.server/compiled/game/script/item/vet_instance_reset.java index 55898d6ec..534b1d498 100755 --- a/sku.0/sys.server/compiled/game/script/item/vet_instance_reset.java +++ b/sku.0/sys.server/compiled/game/script/item/vet_instance_reset.java @@ -247,7 +247,7 @@ public class vet_instance_reset extends script.base_script obj_id owner = instance_data.getObjId("owner"); int startTime = instance_data.getInt("start_time"); int resetAt = getCalendarTime(); - setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, "" + resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime); + setObjVar(player, instance.PLAYER_INSTANCE + "." + instanceToRemove, resetAt + "_" + instance_id + "_" + owner + "_" + newStartTime); instance_data = instance.getLockoutData(player, instanceToRemove); if (instance_data != null && !instance_data.isEmpty()) { diff --git a/sku.0/sys.server/compiled/game/script/library/.gitignore b/sku.0/sys.server/compiled/game/script/library/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/library/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/library/advanced_turret.java b/sku.0/sys.server/compiled/game/script/library/advanced_turret.java index f053e90ef..6bb24ab8b 100755 --- a/sku.0/sys.server/compiled/game/script/library/advanced_turret.java +++ b/sku.0/sys.server/compiled/game/script/library/advanced_turret.java @@ -134,7 +134,6 @@ public class advanced_turret extends script.base_script dictionary dict = new dictionary(); dict.put("range", range); messageTo(turret, "createTriggerVolume", dict, 0.0f, false); - return; } public static void deactivateTurret(obj_id turret) throws InterruptedException { @@ -146,7 +145,6 @@ public class advanced_turret extends script.base_script stopTrackingTarget(turret); utils.removeScriptVar(turret, IS_ACTIVE); setInvulnerable(turret, true); - return; } public static boolean isActive(obj_id turret) throws InterruptedException { @@ -175,7 +173,6 @@ public class advanced_turret extends script.base_script return; } utils.setScriptVar(turret, IS_ENGAGED, target); - return; } public static void stopTrackingTarget(obj_id turret) throws InterruptedException { @@ -185,7 +182,6 @@ public class advanced_turret extends script.base_script return; } utils.removeScriptVar(turret, IS_ENGAGED); - return; } public static boolean isEngaged(obj_id turret) throws InterruptedException { @@ -193,11 +189,7 @@ public class advanced_turret extends script.base_script { return false; } - if (utils.hasScriptVar(turret, IS_ENGAGED)) - { - return true; - } - return false; + return utils.hasScriptVar(turret, IS_ENGAGED); } public static obj_id getCurrentTarget(obj_id turret) throws InterruptedException { @@ -276,7 +268,6 @@ public class advanced_turret extends script.base_script ri.maxRange = range; setWeaponRangeInfo(objWeapon, ri); activateTurret(turret); - return; } public static boolean isValidTarget(obj_id turret, obj_id target) throws InterruptedException { @@ -367,7 +358,7 @@ public class advanced_turret extends script.base_script { if (!isValidTarget(turret, target)) { - doLogging("addTarget", "" + getName(target) + "/" + target + " was invalid"); + doLogging("addTarget", getName(target) + "/" + target + " was invalid"); return; } Vector targets = null; @@ -391,7 +382,6 @@ public class advanced_turret extends script.base_script attackPulse(turret); } } - return; } public static void addTargets(obj_id turret, obj_id[] newTargets) throws InterruptedException { @@ -406,7 +396,7 @@ public class advanced_turret extends script.base_script } for (obj_id newTarget : newTargets) { if (!isValidTarget(turret, newTarget) || targets.indexOf(newTarget) != -1) { - doLogging("addTargets", "" + getName(newTarget) + "/" + newTarget + " was invalid or already in my target array"); + doLogging("addTargets", getName(newTarget) + "/" + newTarget + " was invalid or already in my target array"); continue; } targets.add(newTarget); @@ -419,7 +409,6 @@ public class advanced_turret extends script.base_script messageTo(turret, "handleTurretAttack", null, 1, false); } } - return; } public static void removeTarget(obj_id turret, obj_id target) throws InterruptedException { @@ -451,7 +440,6 @@ public class advanced_turret extends script.base_script utils.setBatchScriptVar(turret, TARGETS, targets); } } - return; } public static boolean handleTurretDamage(obj_id turret, obj_id attacker, obj_id weapon, int dmgAmount) throws InterruptedException { @@ -505,7 +493,6 @@ public class advanced_turret extends script.base_script deactivateTurret(turret); playClientEffectLoc(turret, "clienteffect/combat_explosion_lair_large.cef", death, 0); messageTo(turret, "handleDestroyTurret", null, 2, false); - return; } public static obj_id getGoodTurretTarget(obj_id turret) throws InterruptedException { @@ -583,7 +570,6 @@ public class advanced_turret extends script.base_script dictionary params = new dictionary(); params.put("target", target); messageTo(turret, "turretShot", params, getWeaponAttackSpeed(weapon), false); - return; } public static void doLogging(String section, String message) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/library/beast_lib.java b/sku.0/sys.server/compiled/game/script/library/beast_lib.java index 07fc6f7ac..f48c1071a 100755 --- a/sku.0/sys.server/compiled/game/script/library/beast_lib.java +++ b/sku.0/sys.server/compiled/game/script/library/beast_lib.java @@ -329,11 +329,7 @@ public class beast_lib extends script.base_script { return false; } - if (hasScript(beast, "ai.beast")) - { - return true; - } - return false; + return hasScript(beast, "ai.beast"); } public static boolean isBeastMaster(obj_id player) throws InterruptedException { @@ -366,11 +362,7 @@ public class beast_lib extends script.base_script { return false; } - if (!hasObjVar(bcd, OBJVAR_BEAST_TYPE)) - { - return false; - } - return true; + return hasObjVar(bcd, OBJVAR_BEAST_TYPE); } public static boolean isValidPlayer(obj_id player) throws InterruptedException { @@ -536,11 +528,7 @@ public class beast_lib extends script.base_script } public static boolean hasBCDBeastName(obj_id bcd) throws InterruptedException { - if (hasObjVar(bcd, "beast.beastName")) - { - return true; - } - return false; + return hasObjVar(bcd, "beast.beastName"); } public static String getBCDBeastName(obj_id bcd) throws InterruptedException { @@ -632,7 +620,7 @@ public class beast_lib extends script.base_script return ""; } String template = getTemplateName(beast); - String[] templateSplit = split(template, '/'); + String[] templateSplit = template.split("/"); template = templateSplit[templateSplit.length - 1]; int row = dataTableSearchColumnForString(template, "template", BEASTS_TABLE); dictionary dict = dataTableGetRow(BEASTS_TABLE, row); @@ -990,11 +978,7 @@ public class beast_lib extends script.base_script { return false; } - if (hasObjVar(bcd, OBJVAR_BEAST_HAPPINESS)) - { - return true; - } - return false; + return hasObjVar(bcd, OBJVAR_BEAST_HAPPINESS); } public static int getBeastHappiness(obj_id beast) throws InterruptedException { @@ -1039,11 +1023,7 @@ public class beast_lib extends script.base_script { return false; } - if (hasObjVar(bcd, PET_LOYALTY_OBJVAR)) - { - return true; - } - return false; + return hasObjVar(bcd, PET_LOYALTY_OBJVAR); } public static float getBeastLoyalty(obj_id beast) throws InterruptedException { @@ -1206,11 +1186,7 @@ public class beast_lib extends script.base_script { return false; } - if (hasObjVar(bcd, PET_LOYALTY_LEVEL_OBJVAR)) - { - return true; - } - return false; + return hasObjVar(bcd, PET_LOYALTY_LEVEL_OBJVAR); } public static int getBeastLoyaltyLevel(obj_id beast) throws InterruptedException { @@ -1308,11 +1284,7 @@ public class beast_lib extends script.base_script { return false; } - if (hasObjVar(bcd, OBJVAR_BEAST_FOOD)) - { - return true; - } - return false; + return hasObjVar(bcd, OBJVAR_BEAST_FOOD); } public static int[] getBeastFood(obj_id beast) throws InterruptedException { @@ -2012,11 +1984,7 @@ public class beast_lib extends script.base_script return false; } int experience = (int)beastStatsDict.getInt("XP"); - if (experience > 0 && getBeastExperience(beast) >= experience) - { - return true; - } - return false; + return experience > 0 && getBeastExperience(beast) >= experience; } public static void grantBeastExperience(obj_id beast) throws InterruptedException { @@ -2144,7 +2112,6 @@ public class beast_lib extends script.base_script messageTo(beast, "checkMovementSpeed", params, 1, false); return; } - return; } public static void doConfusedEmote(obj_id beast) throws InterruptedException { @@ -2281,7 +2248,6 @@ public class beast_lib extends script.base_script { doAnimationAction(beast, "trick_" + trickNumber); } - return; } public static void setupHappinessLoyalty(obj_id beastBCD) throws InterruptedException { @@ -3215,11 +3181,7 @@ public class beast_lib extends script.base_script { return false; } - if (!isValidBeastSkillForCreature(getBeastOnPlayer(player), actionName)) - { - return false; - } - return true; + return isValidBeastSkillForCreature(getBeastOnPlayer(player), actionName); } public static void doBmProvokeCommand(obj_id self, obj_id target, int provokeLevel) throws InterruptedException { @@ -3273,7 +3235,6 @@ public class beast_lib extends script.base_script return; } initializeBeastStats(BCD, beast); - return; } public static void removeAttentionPenaltyDebuff(obj_id player) throws InterruptedException { @@ -3420,7 +3381,6 @@ public class beast_lib extends script.base_script if (currentHappiness >= 0) { buff.applyBuff(beast, "bm_happiness_content"); - return; } } public static string_id convertLoyaltyString(obj_id beastBCD) throws InterruptedException @@ -3636,14 +3596,7 @@ public class beast_lib extends script.base_script } public static boolean isChargeAttack(String actionName) throws InterruptedException { - if (actionName.startsWith("bm_charge") || actionName.startsWith("bm_trample")) - { - return true; - } - else - { - return false; - } + return actionName.startsWith("bm_charge") || actionName.startsWith("bm_trample"); } public static boolean setBCDBeastHueFromEgg(obj_id bcd, obj_id egg) throws InterruptedException { @@ -3940,19 +3893,19 @@ public class beast_lib extends script.base_script dictionary creatureDict = dataTableGetRow("datatables/mob/creatures.iff", creatureName); if (ck_skill > -1) { - if (creatureDict.getString("hideType") != "none") + if (!creatureDict.getString("hideType").equalsIgnoreCase("none")) { names[idx] = "creature_resource_hide"; attribs[idx] = utils.packStringId(new string_id("obj_attr_n", creatureDict.getString("hideType"))); idx++; } - if (creatureDict.getString("meatType") != "none") + if (!creatureDict.getString("meatType").equalsIgnoreCase("none")) { names[idx] = "creature_resource_meat"; attribs[idx] = utils.packStringId(new string_id("obj_attr_n", creatureDict.getString("meatType"))); idx++; } - if (creatureDict.getString("boneType") != "none") + if (!creatureDict.getString("boneType").equalsIgnoreCase("none")) { names[idx] = "creature_resource_bone"; attribs[idx] = utils.packStringId(new string_id("obj_attr_n", creatureDict.getString("boneType"))); @@ -3962,10 +3915,10 @@ public class beast_lib extends script.base_script if (ck_skill > 0) { names[idx] = "aggro"; - attribs[idx] = "" + creatureDict.getFloat("aggressive"); + attribs[idx] = Float.toString(creatureDict.getFloat("aggressive")); idx++; names[idx] = "assist_range"; - attribs[idx] = "" + creatureDict.getFloat("assist"); + attribs[idx] = Float.toString(creatureDict.getFloat("assist")); idx++; names[idx] = "deathblow"; boolean deathBlow = (creatureDict.getInt("death_blow") > 0); @@ -3993,22 +3946,22 @@ public class beast_lib extends script.base_script int minDamage = Math.round((dps * attackSpeed) * 0.5f); int maxDamage = Math.round((dps * attackSpeed) * 1.5f); names[idx] = "damage_min"; - attribs[idx] = "" + minDamage; + attribs[idx] = Integer.toString(minDamage); idx++; names[idx] = "damage_max"; - attribs[idx] = "" + maxDamage; + attribs[idx] = Integer.toString(maxDamage); idx++; names[idx] = "attackspeed"; - attribs[idx] = "" + attackSpeed; + attribs[idx] = Float.toString(attackSpeed); idx++; names[idx] = "damage_dps"; - attribs[idx] = "" + dps; + attribs[idx] = Float.toString(dps); idx++; } if (ck_skill > 5) { names[idx] = "armor_rating"; - attribs[idx] = "" + statDict.getInt(prefix + "Armor"); + attribs[idx] = Integer.toString(statDict.getInt(prefix + "Armor")); idx++; } if (ck_skill > 7) @@ -4676,14 +4629,7 @@ public class beast_lib extends script.base_script exp = 1; } } - if (exp > 1) - { - return true; - } - else - { - return false; - } + return exp > 1; } public static int useBeastInjector(obj_id player, obj_id injector, obj_id beast, String beastFamily, String[] injectorFamilies, int mark) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/library/factions.java b/sku.0/sys.server/compiled/game/script/library/factions.java index a6595d851..92851b4b0 100755 --- a/sku.0/sys.server/compiled/game/script/library/factions.java +++ b/sku.0/sys.server/compiled/game/script/library/factions.java @@ -147,7 +147,6 @@ public class factions extends script.base_script setObjVar(objPlayer, "intChangingFactionStatus", 1); pvpPrepareToBeCovert(objPlayer); messageTo(objPlayer, "msgGoCovert", null, fltDelay, true); - return; } public static void goCovert(obj_id objPlayer) throws InterruptedException { @@ -165,14 +164,12 @@ public class factions extends script.base_script buff.removeAllAuraBuffs(objPlayer); pvpMakeCovert(objPlayer); CustomerServiceLog("player_faction", "PLAYER-FACTION ALTERED|TIME:" + getGameTime() + "|PLAYER:" + objPlayer + "|PLAYER NAME:" + getName(objPlayer) + "|ZONE:" + getCurrentSceneName() + "|Player has been set to covert"); - return; } public static void goOvertWithDelay(obj_id objPlayer, float fltDelay) throws InterruptedException { setObjVar(objPlayer, "intChangingFactionStatus", 1); pvpPrepareToBeDeclared(objPlayer); messageTo(objPlayer, "msgGoOvert", null, fltDelay, true); - return; } public static void goOvert(obj_id objPlayer) throws InterruptedException { @@ -186,7 +183,6 @@ public class factions extends script.base_script buff.removeAllAuraBuffs(objPlayer); pvpMakeDeclared(objPlayer); CustomerServiceLog("player_faction", "PLAYER-FACTION ALTERED|TIME:" + getGameTime() + "|PLAYER:" + objPlayer + "|PLAYER NAME:" + getName(objPlayer) + "|ZONE:" + getCurrentSceneName() + "|Player has been set to overt"); - return; } public static void goOnLeaveWithDelay(obj_id objPlayer, float fltDelay) throws InterruptedException { @@ -197,7 +193,6 @@ public class factions extends script.base_script setObjVar(objPlayer, "intChangingFactionStatus", 1); pvpPrepareToBeNeutral(objPlayer); messageTo(objPlayer, "msgGoOnLeave", null, fltDelay, true); - return; } public static void goOnLeave(obj_id objPlayer) throws InterruptedException { @@ -254,7 +249,6 @@ public class factions extends script.base_script } } } - return; } public static boolean isDeclared(obj_id target) throws InterruptedException { @@ -322,11 +316,7 @@ public class factions extends script.base_script { return false; } - if ((370444368) == currentMercenaryFaction) - { - return true; - } - return false; + return (370444368) == currentMercenaryFaction; } public static boolean isImperialHelper(obj_id target) throws InterruptedException { @@ -339,11 +329,7 @@ public class factions extends script.base_script { return false; } - if ((-615855020) == currentMercenaryFaction) - { - return true; - } - return false; + return (-615855020) == currentMercenaryFaction; } public static boolean isRebelorRebelHelper(obj_id target) throws InterruptedException { @@ -351,11 +337,7 @@ public class factions extends script.base_script { return false; } - if (isRebelHelper(target) || getFactionFlag(target) == FACTION_FLAG_REBEL) - { - return true; - } - return false; + return isRebelHelper(target) || getFactionFlag(target) == FACTION_FLAG_REBEL; } public static boolean isImperialorImperialHelper(obj_id target) throws InterruptedException { @@ -363,11 +345,7 @@ public class factions extends script.base_script { return false; } - if (isImperialHelper(target) || getFactionFlag(target) == FACTION_FLAG_IMPERIAL) - { - return true; - } - return false; + return isImperialHelper(target) || getFactionFlag(target) == FACTION_FLAG_IMPERIAL; } public static boolean isSameFactionorFactionHelper(obj_id target, obj_id target2) throws InterruptedException { @@ -375,11 +353,7 @@ public class factions extends script.base_script { return false; } - if ((isImperialorImperialHelper(target) && isImperialorImperialHelper(target2)) || (isRebelorRebelHelper(target) && isRebelorRebelHelper(target2))) - { - return true; - } - return false; + return (isImperialorImperialHelper(target) && isImperialorImperialHelper(target2)) || (isRebelorRebelHelper(target) && isRebelorRebelHelper(target2)); } public static float getFactionStanding(obj_id target, int intFaction) throws InterruptedException { @@ -393,7 +367,7 @@ public class factions extends script.base_script } if (!isPlayer(target)) { - if (getFaction(target) == factionName) + if (getFaction(target).equals(factionName)) { return FACTION_RATING_MAX; } @@ -529,7 +503,7 @@ public class factions extends script.base_script String title = utils.packStringId(SID_SUI_DELEGATE_FACTION); prose_package ppSuiTitle = prose.getPackage(SID_SUI_DELEGATE_FACTION_TEXT); prose.setTT(ppSuiTitle, getRankNameStringId(rank, faction)); - prose.setTO(ppSuiTitle, "" + ratioFrom + ":" + ratioTo); + prose.setTO(ppSuiTitle, ratioFrom + ":" + ratioTo); prose.setDI(ppSuiTitle, available); String prompt = " \0" + packOutOfBandProsePackage(null, ppSuiTitle); int pid = sui.transfer(self, self, prompt, title, utils.packStringId(SID_SUI_DELEGATE_FACTION_TITLE), available, utils.packStringId(SID_SUI_DELEGATE_FACTION_CAT), 0, "handleDelegateSui", ratioFrom, ratioTo); @@ -552,7 +526,7 @@ public class factions extends script.base_script { prose_package ppLackPointsToGive = prose.getPackage(SID_FACTION_LACK_POINTS_TO_GIVE); prose.setTT(ppLackPointsToGive, target); - prose.setTO(ppLackPointsToGive, "" + amt); + prose.setTO(ppLackPointsToGive, Integer.toString(amt)); prose.setDI(ppLackPointsToGive, required); sendSystemMessageProse(self, ppLackPointsToGive); } @@ -582,7 +556,7 @@ public class factions extends script.base_script prose_package ppDelegate = prose.getPackage(SID_FACTION_DELEGATE_X_TO_TARGET); prose.setTT(ppDelegate, target); prose.setDI(ppDelegate, amt); - prose.setTO(ppDelegate, "" + required); + prose.setTO(ppDelegate, Integer.toString(required)); sendSystemMessageProse(self, ppDelegate); CustomerServiceLog("faction_perk", getFirstName(self) + "(" + self + ") delegated " + amt + " points to " + getFirstName(target) + " for a cost of " + required + " points."); } @@ -753,11 +727,7 @@ public class factions extends script.base_script } public static boolean grantFactionBonus(obj_id target, String factionName, float value) throws InterruptedException { - if (!isIdValid(target) || factionName == null || factionName.equals("") || value == 0.0f) - { - return false; - } - return true; + return !(!isIdValid(target) || factionName == null || factionName.equals("") || value == 0.0f); } public static float getFactionStoryReward(obj_id target, String factionName, float value) throws InterruptedException { @@ -854,13 +824,12 @@ public class factions extends script.base_script { return; } - boolean pvp_only = pvpOnly == 1 ? true : false; if (factionName.equals(FACTION_IMPERIAL)) { setAttributeAttained(target, attrib.IMPERIAL); setAttributeInterested(target, attrib.REBEL); ai_lib.setDefaultCalmMood(target, "npc_imperial"); - if (pvp_only) + if (pvpOnly == 1) { setObjVar(target, "huysMagicSpecialForcesOnlyObjvar", true); } @@ -869,7 +838,7 @@ public class factions extends script.base_script { setAttributeAttained(target, attrib.REBEL); setAttributeInterested(target, attrib.IMPERIAL); - if (pvp_only) + if (pvpOnly == 1) { setObjVar(target, "huysMagicSpecialForcesOnlyObjvar", true); } @@ -908,11 +877,7 @@ public class factions extends script.base_script { return true; } - if (pvpGetType(target) == PVPTYPE_NEUTRAL) - { - return true; - } - return false; + return pvpGetType(target) == PVPTYPE_NEUTRAL; } public static String getFactionNameByHashCode(int hashCode) throws InterruptedException { @@ -1115,11 +1080,7 @@ public class factions extends script.base_script value += bonus; } } - if (addFactionStanding(player, factionName, value)) - { - return true; - } - return false; + return addFactionStanding(player, factionName, value); } public static void grantCombatFaction(obj_id killer, obj_id target, double percentDamage) throws InterruptedException { @@ -1332,7 +1293,6 @@ public class factions extends script.base_script changeFactionPoints(factions.FACTION_REBEL, intPoints); changeFactionPoints(factions.FACTION_IMPERIAL, intPoints * -1); } - return; } public static boolean isFactionWinning(String strFaction) throws InterruptedException { @@ -1343,11 +1303,7 @@ public class factions extends script.base_script int intImperial = getIntObjVar(objParent, "gcw." + strImperial); if (strFaction.equals(strRebel)) { - if (intRebel > intImperial) - { - return true; - } - return false; + return intRebel > intImperial; } if (strFaction.equals(strImperial)) { @@ -1388,14 +1344,7 @@ public class factions extends script.base_script { return false; } - if (utils.hasScriptVar(player, VAR_NEWLY_DECLARED)) - { - return true; - } - else - { - return false; - } + return utils.hasScriptVar(player, VAR_NEWLY_DECLARED); } public static boolean canUseFactionItem(obj_id player, obj_id item) throws InterruptedException { @@ -1460,7 +1409,6 @@ public class factions extends script.base_script ammount *= -1; pp = prose.getPackage(PROSE_LOSE_FACTION, getLocalizedFactionName(HSSKOR), (int)ammount); sendSystemMessageProse(player, pp); - return; } public static void awardHsskorFaction(obj_id player, int ammount) throws InterruptedException { @@ -1488,7 +1436,6 @@ public class factions extends script.base_script ammount *= -1; pp = prose.getPackage(PROSE_LOSE_FACTION, getLocalizedFactionName(KASHYYYK), (int)ammount); sendSystemMessageProse(player, pp); - return; } public static void validateBalance(obj_id player, String faction) throws InterruptedException { @@ -1523,7 +1470,6 @@ public class factions extends script.base_script setObjVar(player, checkHsskor, -1 * getFactionStanding(player, KASHYYYK)); } } - return; } public static boolean isUnaligned(obj_id player) throws InterruptedException { @@ -1534,11 +1480,7 @@ public class factions extends script.base_script { return true; } - if (getFloatObjVar(player, hsskor) != 0) - { - return false; - } - return true; + return getFloatObjVar(player, hsskor) == 0; } public static boolean isAlignedKashyyyk(obj_id player) throws InterruptedException { @@ -1559,11 +1501,7 @@ public class factions extends script.base_script public static boolean isImperial(obj_id objPlayer) throws InterruptedException { int intPlayerFaction = pvpGetAlignedFaction(objPlayer); - if (intPlayerFaction == (-615855020)) - { - return true; - } - return false; + return intPlayerFaction == (-615855020); } public static boolean isRebel(obj_id objPlayer) throws InterruptedException { @@ -1577,11 +1515,7 @@ public class factions extends script.base_script public static boolean isOnLeave(obj_id objPlayer) throws InterruptedException { int intFaction = pvpGetAlignedFaction(objPlayer); - if ((intFaction != 0) && pvpGetType(objPlayer) == PVPTYPE_NEUTRAL) - { - return true; - } - return false; + return (intFaction != 0) && pvpGetType(objPlayer) == PVPTYPE_NEUTRAL; } public static boolean isActiveImperial(obj_id objPlayer) throws InterruptedException { @@ -1669,14 +1603,7 @@ public class factions extends script.base_script { return false; } - if (player_faction_id == npc_faction_id) - { - return true; - } - else - { - return false; - } + return player_faction_id == npc_faction_id; } public static boolean joinFaction(obj_id player, int faction_id, boolean returnFromReserves) throws InterruptedException { @@ -1712,11 +1639,7 @@ public class factions extends script.base_script } public static boolean isOnLeaveFromFriendlyFaction(obj_id objPlayer, obj_id objNPC) throws InterruptedException { - if (pvpGetAlignedFaction(objPlayer) == pvpGetAlignedFaction(objNPC) && (pvpGetType(objPlayer) == PVPTYPE_NEUTRAL)) - { - return true; - } - return false; + return pvpGetAlignedFaction(objPlayer) == pvpGetAlignedFaction(objNPC) && (pvpGetType(objPlayer) == PVPTYPE_NEUTRAL); } public static boolean isInEnemyFaction(obj_id objPlayer, obj_id objNPC) throws InterruptedException { @@ -1729,11 +1652,7 @@ public class factions extends script.base_script } public static boolean isInFriendlyFaction(obj_id objPlayer, obj_id objNPC) throws InterruptedException { - if (pvpGetAlignedFaction(objPlayer) == pvpGetAlignedFaction(objNPC)) - { - return true; - } - return false; + return pvpGetAlignedFaction(objPlayer) == pvpGetAlignedFaction(objNPC); } public static boolean isOnLeaveFromEnemyFaction(obj_id objPlayer, obj_id objNPC) throws InterruptedException { @@ -1758,11 +1677,7 @@ public class factions extends script.base_script } int cost = factions.getRankCost(current_rank + 1); int faction_standing = (int)factions.getFactionStanding(objPlayer, intFaction); - if (faction_standing >= cost) - { - return true; - } - return false; + return faction_standing >= cost; } public static void applyPromotion(obj_id objPlayer, int intFaction) throws InterruptedException { @@ -1777,7 +1692,6 @@ public class factions extends script.base_script factions.setRank(objPlayer, current_rank + 1); } } - return; } public static boolean isSmuggler(obj_id player) throws InterruptedException { @@ -1956,48 +1870,46 @@ public class factions extends script.base_script int intYourPVPType = pvpGetType(objTarget); string_id strTitleId = new string_id("gcw", "gcw_status_change"); String strTitle = utils.packStringId(strTitleId); - if (intMyPVPType == PVPTYPE_NEUTRAL) - { - if (intYourPVPType == PVPTYPE_COVERT) - { - string_id strSpam = new string_id("gcw", "gcw_status_change_covert"); - String strPrompt = utils.packStringId(strSpam); - int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoCovert", ""); - return; - } - else if (intYourPVPType == PVPTYPE_DECLARED) - { - string_id strSpam = new string_id("gcw", "gcw_status_change_overt"); - String strPrompt = utils.packStringId(strSpam); - int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoOvert", ""); - return; - } - else - { - sendSystemMessageTestingOnly(objPlayer, "Error # 4 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); - } - } - else if (intMyPVPType == PVPTYPE_COVERT) - { - if (intYourPVPType == PVPTYPE_COVERT) - { - sendSystemMessageTestingOnly(objPlayer, "Error # 1 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); - } - else if (intYourPVPType == PVPTYPE_DECLARED) - { - string_id strSpam = new string_id("gcw", "gcw_status_change_overt"); - String strPrompt = utils.packStringId(strSpam); - int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoOvert", ""); - return; - } - else - { - sendSystemMessageTestingOnly(objPlayer, "Error # 3 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); - } - } - else - { - sendSystemMessageTestingOnly(objPlayer, "Error # 2 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); + switch (intMyPVPType) { + case PVPTYPE_NEUTRAL: + switch (intYourPVPType) { + case PVPTYPE_COVERT: + { + string_id strSpam = new string_id("gcw", "gcw_status_change_covert"); + String strPrompt = utils.packStringId(strSpam); + int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoCovert", ""); + return; + } + case PVPTYPE_DECLARED: + { + string_id strSpam = new string_id("gcw", "gcw_status_change_overt"); + String strPrompt = utils.packStringId(strSpam); + int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoOvert", ""); + return; + } + default: + sendSystemMessageTestingOnly(objPlayer, "Error # 4 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); + break; + } + break; + case PVPTYPE_COVERT: + switch (intYourPVPType) { + case PVPTYPE_COVERT: + sendSystemMessageTestingOnly(objPlayer, "Error # 1 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); + break; + case PVPTYPE_DECLARED: + string_id strSpam = new string_id("gcw", "gcw_status_change_overt"); + String strPrompt = utils.packStringId(strSpam); + int pid = sui.inputbox(objPlayer, objPlayer, strPrompt, strTitle, "handleGoOvert", ""); + return; + default: + sendSystemMessageTestingOnly(objPlayer, "Error # 3 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); + break; + } + break; + default: + sendSystemMessageTestingOnly(objPlayer, "Error # 2 : You got a PVP error message. Your PVP Type is " + intMyPVPType + ". Your faction is" + pvpGetAlignedFaction(objPlayer) + ". Your target is " + objTarget + " their pvp type is " + pvpGetType(objTarget) + " and their faction is " + pvpGetAlignedFaction(objTarget)); + break; } } public static boolean pvpDoAllowedHelpCheck(obj_id objPlayer, obj_id objTarget) throws InterruptedException @@ -2045,11 +1957,7 @@ public class factions extends script.base_script } public static boolean canGoOnLeave(obj_id objPlayer) throws InterruptedException { - if (isInAdhocPvpArea(objPlayer)) - { - return false; - } - return true; + return !isInAdhocPvpArea(objPlayer); } public static boolean canGoCovert(obj_id objPlayer) throws InterruptedException { @@ -2131,7 +2039,6 @@ public class factions extends script.base_script skill.revokeSkill(player, "pvp_rebel_last_man_ability"); skill.revokeSkill(player, "pvp_rebel_aura_buff_self"); skill.revokeSkill(player, "pvp_rebel_airstrike_ability"); - return; } public static boolean shareSocialGroup(obj_id creatureOne, obj_id creatureTwo) throws InterruptedException { diff --git a/sku.0/sys.server/compiled/game/script/library/jedi.java b/sku.0/sys.server/compiled/game/script/library/jedi.java index 625ea224c..59441848b 100755 --- a/sku.0/sys.server/compiled/game/script/library/jedi.java +++ b/sku.0/sys.server/compiled/game/script/library/jedi.java @@ -1393,7 +1393,7 @@ public class jedi extends script.base_script { int color = getIntObjVar(saber, VAR_SABER_BASE + "." + VAR_COLOR); int colorRow = dataTableSearchColumnForInt(color, "color", JEDI_CRYSTAL_COLOR_TABLE); - if (color > 31 || colorRow < 0) + if (color == 31 || colorRow < 0) { setWeaponElementalType(saber, DAMAGE_NONE); setWeaponElementalValue(saber, 0); diff --git a/sku.0/sys.server/compiled/game/script/money/.gitignore b/sku.0/sys.server/compiled/game/script/money/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/money/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/name/.gitignore b/sku.0/sys.server/compiled/game/script/name/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/name/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/npc/.gitignore b/sku.0/sys.server/compiled/game/script/npc/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/npc/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/npe/.gitignore b/sku.0/sys.server/compiled/game/script/npe/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/npe/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/object/.gitignore b/sku.0/sys.server/compiled/game/script/object/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/object/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/planet/.gitignore b/sku.0/sys.server/compiled/game/script/planet/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/planet/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/planet_map/.gitignore b/sku.0/sys.server/compiled/game/script/planet_map/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/planet_map/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/player/.gitignore b/sku.0/sys.server/compiled/game/script/player/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/player/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/poi/.gitignore b/sku.0/sys.server/compiled/game/script/poi/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/poi/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/powerup/.gitignore b/sku.0/sys.server/compiled/game/script/powerup/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/powerup/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/qa/.gitignore b/sku.0/sys.server/compiled/game/script/qa/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/qa/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/quest/.gitignore b/sku.0/sys.server/compiled/game/script/quest/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/quest/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/simulator/.gitignore b/sku.0/sys.server/compiled/game/script/simulator/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/simulator/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/space/.gitignore b/sku.0/sys.server/compiled/game/script/space/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/space/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/space_mining/.gitignore b/sku.0/sys.server/compiled/game/script/space_mining/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/space_mining/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/structure/.gitignore b/sku.0/sys.server/compiled/game/script/structure/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/structure/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/sui/.gitignore b/sku.0/sys.server/compiled/game/script/sui/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/sui/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/systems/.gitignore b/sku.0/sys.server/compiled/game/script/systems/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/systems/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/terminal/.gitignore b/sku.0/sys.server/compiled/game/script/terminal/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/terminal/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/test/.gitignore b/sku.0/sys.server/compiled/game/script/test/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/test/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/theme_park/.gitignore b/sku.0/sys.server/compiled/game/script/theme_park/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/theme_park/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java index cf0e367dc..b6d0dcfdc 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_controller.java @@ -36,6 +36,7 @@ public class stage_two_controller extends script.base_script if(restussEvent != null && (restussEvent.equals("1") || restussEvent.equals("true"))){ LOG("events", "Restuss Event - Event is on."); String phaseVal = getConfigSetting("EventTeam", "restussPhase"); + doMessageTo("messageTo:broadcastMessage:10:beginEventNotification:0"); if(phaseVal != null && !phaseVal.equals("")){ int phase = Integer.parseInt(phaseVal); if(phase > 2) phase = 2; diff --git a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java index faa0acdf2..cf3c5aca2 100755 --- a/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java +++ b/sku.0/sys.server/compiled/game/script/theme_park/restuss_event/stage_two_crier.java @@ -90,6 +90,7 @@ public class stage_two_crier extends script.base_script public int warningLoop(obj_id self, dictionary params) throws InterruptedException { obj_id herald = utils.getObjIdScriptVar(self, HERALD_ID); + if(!isValidId(herald) || !isValidId(self)) return SCRIPT_CONTINUE; chat.chat(herald, WARNING); messageTo(self, "warningLoop", null, 30.0f, false); return SCRIPT_CONTINUE; diff --git a/sku.0/sys.server/compiled/game/script/turnstile/.gitignore b/sku.0/sys.server/compiled/game/script/turnstile/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/turnstile/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/vendor/.gitignore b/sku.0/sys.server/compiled/game/script/vendor/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/vendor/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.server/compiled/game/script/waypoint/.gitignore b/sku.0/sys.server/compiled/game/script/waypoint/.gitignore deleted file mode 100755 index d3f5a12fa..000000000 --- a/sku.0/sys.server/compiled/game/script/waypoint/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/sku.0/sys.shared/compiled/game/customization/force_add_variable_usage.dat b/sku.0/sys.shared/compiled/game/customization/force_add_variable_usage.dat index 6c0b6af63..e5a079f6f 100755 --- a/sku.0/sys.shared/compiled/game/customization/force_add_variable_usage.dat +++ b/sku.0/sys.shared/compiled/game/customization/force_add_variable_usage.dat @@ -1,16 +1,27 @@ -# FIX -# -# The fix for Wookiee wearables: skin-shader-related customization variables -# must be named /shared_owner/ for the stitched-in skin to have access to -# the customization variables. Artists adjusted the following assets but -# we need to still fake that these assets have a /private/index_texture_1 -# so that the data from the database gets loaded into this 'erroneous' variable. -# If we didn't do this, we wouldn't be able to preserve the Wookiee settings -# for existing Wookiee players who log in after the fix to the art assets -# is applied. -# -I shader/wke_alpha_hacsa28.sht:/private/index_texture_1:0:25:0 -I shader/wke_f_body.sht:/private/index_texture_1:0:25:0 -I shader/wke_f_body_sm.sht:/private/index_texture_1:0:25:0 -I shader/wke_m_body.sht:/private/index_texture_1:0:25:0 -I shader/wke_m_body_sm.sht:/private/index_texture_1:0:25:0 +# FIX +# +# The fix for Wookiee wearables: skin-shader-related customization variables +# must be named /shared_owner/ for the stitched-in skin to have access to +# the customization variables. Artists adjusted the following assets but +# we need to still fake that these assets have a /private/index_texture_1 +# so that the data from the database gets loaded into this 'erroneous' variable. +# If we didn't do this, we wouldn't be able to preserve the Wookiee settings +# for existing Wookiee players who log in after the fix to the art assets +# is applied. +# +I shader/wke_alpha_hacsa28.sht:/private/index_texture_1:0:25:0 +I shader/wke_f_body.sht:/private/index_texture_1:0:25:0 +I shader/wke_f_body_sm.sht:/private/index_texture_1:0:25:0 +I shader/wke_m_body.sht:/private/index_texture_1:0:25:0 +I shader/wke_m_body_sm.sht:/private/index_texture_1:0:25:0 + +#spaceship fix +L appearance/ply_all_house_m_window_s01_hue.pob:appearance/ply_all_house_m_window_s01_hue_r0_exterior.apt +L appearance/ply_all_house_m_window_s02_hue.pob:appearance/ply_all_house_m_window_s02_hue_r0_exterior.apt +L appearance/ply_all_house_sm_s01_window_hue.pob:appearance/ply_all_house_sm_s01_window_hue_r0_exterior.apt +L appearance/ply_house_med_s03_hue.pob:appearance/ply_house_med_s03_hue_r0_exterior.apt +L appearance/ply_house_sm_s03_hue.pob:appearance/ply_house_sm_s03_hue_r0_exterior.apt +L appearance/sorosuub_space_yacht.pob:appearance/sorosuub_space_yacht_r0.apt +L appearance/ykl37r.pob:appearance/ykl37r_r0.apt +L appearance/yt1300.pob:appearance/yt1300_r0.apt +L appearance/yt2400.pob:appearance/yt2400_r0.apt diff --git a/sku.0/sys.shared/compiled/game/footprint/building/player/shared_player_house_tree_house_02.mif b/sku.0/sys.shared/compiled/game/footprint/building/player/shared_player_house_tree_house_02.mif new file mode 100755 index 000000000..3a29e66b0 --- /dev/null +++ b/sku.0/sys.shared/compiled/game/footprint/building/player/shared_player_house_tree_house_02.mif @@ -0,0 +1,24 @@ +FORM "FOOT" +{ + FORM "0000" + { + CHUNK "INFO" + { + int32 6 // width + int32 10 // height + int32 3 // pivot x + int32 1 // pivot z + float 8.0 // hard reservation height tolerance + float 8.0 // structure reservation height tolerance + } + + CHUNK "PRNT" + { + cstring "HHFFFFHHH" + cstring "HHFFFFFHHH" + cstring "HHFFFFFFHH" + cstring "HHFFFFFFHH" + cstring "HHFFFFFFHH" + } + } +} \ No newline at end of file diff --git a/sku.0/sys.shared/compiled/game/object/building/player/construction/shared_construction_player_house_tree_house_02.tpf b/sku.0/sys.shared/compiled/game/object/building/player/construction/shared_construction_player_house_tree_house_02.tpf new file mode 100755 index 000000000..35835059f --- /dev/null +++ b/sku.0/sys.shared/compiled/game/object/building/player/construction/shared_construction_player_house_tree_house_02.tpf @@ -0,0 +1,23 @@ +@base object/tangible/base/shared_tangible_craftable.iff +@class installation_object_template 0 +@class tangible_object_template 5 + +structureFootprintFileName = "footprint/building/player/shared_player_house_tree_house_02.sfp" +useStructureFootprintOutline = true + +targetable = true + +@class object_template 6 +clearFloraRadius = 15 + +objectName = "player_structure" "temporary_structure" +detailedDescription = "" "" +lookAtText = "player_structure" "temporary_structure" + +snapToTerrain = true +containerType = CT_none + +appearanceFilename = "appearance\ply_all_construction_sign.apt" +portalLayoutFilename = "" + +gameObjectType = GOT_installation_factory \ No newline at end of file diff --git a/sku.0/sys.shared/compiled/game/object/building/player/shared_player_house_tree_house_02.tpf b/sku.0/sys.shared/compiled/game/object/building/player/shared_player_house_tree_house_02.tpf new file mode 100755 index 000000000..f212178d6 --- /dev/null +++ b/sku.0/sys.shared/compiled/game/object/building/player/shared_player_house_tree_house_02.tpf @@ -0,0 +1,16 @@ +@base object/building/base/shared_base_player_building.iff +@class building_object_template 1 +@class tangible_object_template 5 + +structureFootprintFileName = "footprint/building/player/shared_player_house_tree_house_02.sfp" + +@class object_template 6 +clearFloraRadius = 36 + +objectName = "building_name" "player_house_tree_house_02_n" +detailedDescription = "building_detail" "player_house_tree_house_02_d" +lookAtText = "building_name" "player_house_tree_house_02_n" + +appearanceFilename = "" +portalLayoutFilename = "appearance/ply_all_tree_house_tall.pob" +clientDataFile = "clientdata/building/shared_player_house_tatooine_small_style_01.cdf" \ No newline at end of file diff --git a/sku.0/sys.shared/compiled/game/object/tangible/deed/player_house_deed/shared_tree_house_02_deed.tpf b/sku.0/sys.shared/compiled/game/object/tangible/deed/player_house_deed/shared_tree_house_02_deed.tpf new file mode 100755 index 000000000..771a35fa7 --- /dev/null +++ b/sku.0/sys.shared/compiled/game/object/tangible/deed/player_house_deed/shared_tree_house_02_deed.tpf @@ -0,0 +1,14 @@ + +@base object/tangible/deed/base/shared_deed_building_base.iff + +@class tangible_object_template 6 + +@class object_template 5 + + +objectName = "deed" "tree_house_02_deed_n" + +detailedDescription = "deed_detail" "tree_house_02_deed_d" +lookAtText = "" "" + +appearanceFilename = "appearance/frn_tree_house.apt" diff --git a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s44.tpf b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s44.tpf index 1f29026ca..8e5a03e80 100755 --- a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s44.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s44.tpf @@ -1,5 +1,5 @@ @base object/tangible/hair/human/base/shared_hair_human_female_base.iff @class tangible_object_template 3 @class object_template 0 -appearanceFilename = "appearance/sing_mt_clan_hair_s01.sat" +appearanceFilename = "appearance/sing_mt_clan_hair_s01_hue.sat" portalLayoutFilename = "" \ No newline at end of file diff --git a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s45.tpf b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s45.tpf index 96b384509..69a3fe672 100755 --- a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s45.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s45.tpf @@ -1,5 +1,5 @@ @base object/tangible/hair/human/base/shared_hair_human_female_base.iff @class tangible_object_template 3 @class object_template 0 -appearanceFilename = "appearance/sing_mt_clan_hair_s02.sat" +appearanceFilename = "appearance/sing_mt_clan_hair_s02_hue.sat" portalLayoutFilename = "" \ No newline at end of file diff --git a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s46.tpf b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s46.tpf index 9f9cceb3b..2a947dfdb 100755 --- a/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s46.tpf +++ b/sku.0/sys.shared/compiled/game/object/tangible/hair/human/shared_hair_human_female_s46.tpf @@ -1,5 +1,5 @@ @base object/tangible/hair/human/base/shared_hair_human_female_base.iff @class tangible_object_template 3 @class object_template 0 -appearanceFilename = "appearance/sing_mt_clan_hair_s03.sat" +appearanceFilename = "appearance/sing_mt_clan_hair_s03_hue.sat" portalLayoutFilename = "" \ No newline at end of file