projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from ProjectSWGCore/master

Browse Source 
Update my branch
This commit is contained in:
Undercova
2014-04-19 13:21:24 +02:00
parent 55a3350f34 ed78dd459b
commit fdfd077958
196 changed files with 2595 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/object/tangible/deed/harvester_deed/harvester_flora_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_elite.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_elite.iff')
object.setLotRequirement(3)
scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_heavy.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_heavy.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_flora_deed_medium.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
object.setStructureTemplate('object/installation/mining_organic/shared_mining_organic_flora_farm_medium.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_gas_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_1.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_elite.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_4.iff')
object.setLotRequirement(3)
scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_heavy.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_3.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_gas_deed_medium.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
object.setStructureTemplate('object/installation/mining_gas/shared_mining_gas_harvester_style_2.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_1.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_elite.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_4.iff')
object.setLotRequirement(3)
scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_heavy.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_3.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_liquid_deed_medium.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_harvester_style_2.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_elite.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_elite.iff')
object.setLotRequirement(3)
scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_heavy.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_heavy.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_moisture_deed_medium.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
object.setStructureTemplate('object/installation/mining_liquid/shared_mining_liquid_moisture_harvester_medium.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_ore_deed_elite.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_elite.iff')
object.setLotRequirement(3)
scripts/object/tangible/deed/harvester_deed/harvester_ore_heavy_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_heavy.iff')
object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_heavy.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_ore_s1_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_1.iff')
object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_style_1.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/harvester_deed/harvester_ore_s2_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'harvesterDeed')
object.setAttachment('radial_filename', 'deeds/harvesterDeed')
object.setConstructorTemplate('object/installation/mining_ore/construction/shared_construction_mining_ore_harvester_style_2.iff')
object.setStructureTemplate('object/installation/mining_ore/shared_mining_ore_harvester_style_2.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structureDeed')
object.setAttachment('radial_filename', 'deeds/structureDeed')
object.setConstructorTemplate('object/building/player/construction/shared_construction_player_house_corellia_small_style_01.iff')
object.setStructureTemplate('object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff')
object.setLotRequirement(1)
scripts/object/tangible/deed/vehicle_deed/speederbike_swoop_deed.py
+2 -17
View File
@@ -1,24 +1,9 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'vehicleDeed')
object.setAttachment('radial_filename', 'deeds/vehicleDeed')
return
def use(core, actor, object):
datapad = actor.getSlottedObject('datapad')
pcd = core.objectService.createObject('object/intangible/vehicle/shared_speederbike_swoop_pcd.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
if datapad and pcd:
datapad.add(pcd)
core.objectService.destroyObject(object)
vehicleId = actor.getAttachment('activeVehicleID')
if vehicleId == None:
vehicle = core.objectService.createObject('object/mobile/vehicle/shared_speederbike_swoop.iff', actor.getPlanet(), actor.getPosition().x, actor.getPosition().z,actor.getPosition().y)
vehicle.setOwnerId(actor.getObjectID())
core.simulationService.add(vehicle, vehicle.getPosition().x, vehicle.getPosition().z, True)
actor.setAttachment('activeVehicleID', vehicle.getObjectID())
core.mountService.generateVehicle(actor, object, 'object/mobile/vehicle/shared_speederbike_swoop.iff', 'object/intangible/vehicle/shared_speederbike_swoop_pcd.iff')
return
scripts/object/tangible/holiday/life_day/main_lifeday_tree.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'main_lifeday_tree')
object.setAttachment('radial_filename', 'holidays/lifeday/main_lifeday_tree')
return
scripts/object/tangible/item/rare_loot_chest_1.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'lootchest')
object.setAttachment('radial_filename', 'item/lootchest')
return
scripts/object/tangible/item/rare_loot_chest_2.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'lootchest')
object.setAttachment('radial_filename', 'item/lootchest')
return
scripts/object/tangible/item/rare_loot_chest_3.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'lootchest')
object.setAttachment('radial_filename', 'item/lootchest')
return
scripts/object/tangible/loot/creature_loot/collections/item_lifeday_gift_other_01_01.py
+1 -1
View File
@@ -6,5 +6,5 @@ def setup(core, object):
object.setCustomName('Life Day Gift Box For A Friend')
object.setIntAttribute('volume', 1)
object.setIntAttribute('tier', 2)
object.setAttachment('radial_filename', 'lifeday_gift')
object.setAttachment('radial_filename', 'holidays/lifeday/lifeday_gift')
return
scripts/object/tangible/loot/creature_loot/collections/item_lifeday_gift_self_01_01.py
+1 -1
View File
@@ -7,5 +7,5 @@ def setup(core, object):
object.setIntAttribute('volume', 1)
object.setIntAttribute('no_trade', 1)
object.setIntAttribute('tier', 2)
object.setAttachment('radial_filename', 'lifeday_gift')
object.setAttachment('radial_filename', 'holidays/lifeday/lifeday_gift')
return
scripts/object/tangible/loot/generic_usable/stim_syringe_generic.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'usable')
object.setAttachment('radial_filename', 'object/usable')
return
scripts/object/tangible/quest/heroic/heroic_exar_kun_entrance.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'exar_kun_brazier')
object.setAttachment('radial_filename', 'instances/exar_kun/exar_kun_brazier')
return
def use(core, actor, object):
scripts/object/tangible/survey_tool/survey_tool_all.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_gas.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_geo_thermal.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_inorganic.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_liquid.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_lumber.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_mineral.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_moisture.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_organic.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_solar.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/survey_tool/survey_tool_wind.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'survey_tool')
object.setAttachment('radial_filename', 'item/survey_tool')
return
scripts/object/tangible/terminal/terminal_character_builder.py
+1 -1
View File
@@ -1,7 +1,7 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'usable')
object.setAttachment('radial_filename', 'object/usable')
return
def use(core, owner, target):
scripts/object/tangible/terminal/terminal_player_structure.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structure_management_terminal')
object.setAttachment('radial_filename', 'structure/structure_management_terminal')
return
scripts/object/tangible/terminal/terminal_player_structure_new.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structure_management_terminal')
object.setAttachment('radial_filename', 'structure/structure_management_terminal')
return
scripts/object/tangible/terminal/terminal_player_structure_nosnap.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structure_management_terminal')
object.setAttachment('radial_filename', 'structure/structure_management_terminal')
return
scripts/object/tangible/terminal/terminal_player_structure_nosnap_mini.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structure_management_terminal')
object.setAttachment('radial_filename', 'structure/structure_management_terminal')
return
scripts/object/tangible/travel/travel_ticket/base/base_travel_ticket.py
+1 -1
View File
@@ -1,5 +1,5 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'travel_ticket')
object.setAttachment('radial_filename', 'item/travel_ticket')
return