projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1122 from tacef/master

Browse Source 
Changed Several Customtemplates to use Datatable for weapontype
This commit is contained in:
tacef
2014-08-09 17:57:49 +02:00
parent 311592d4b0 f50d0a394a
commit a8a824b8a7
18 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/object/weapon/ranged/carbine/carbine_pvp.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStringAttribute('tier', '6')
@@ -12,7 +13,7 @@ def setup(core, object):
object.setStringAttribute('faction_restriction', 'Rebel')
object.setStringAttribute('required_skill', 'None')
object.setDamageType("energy");
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
object.setAttackSpeed(0.6);
object.setMinDamage(389);
object.setMaxDamage(780);
scripts/object/weapon/ranged/carbine/weapon_acidbeam_commando_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -14,5 +15,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(109);
object.setMaxDamage(218);
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
return
scripts/object/weapon/ranged/carbine/weapon_carbine_bh_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -14,5 +15,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(109);
object.setMaxDamage(218);
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
return
scripts/object/weapon/ranged/carbine/weapon_carbine_sp_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -13,5 +14,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(195);
object.setMaxDamage(392);
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
return
scripts/object/weapon/ranged/carbine/weapon_npe_carbine_bh_03_01.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(17);
object.setMaxDamage(43);
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
return
scripts/object/weapon/ranged/carbine/weapon_npe_carbine_spy_03_01.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(17);
object.setMaxDamage(43);
object.setWeaponType(1);
object.setWeaponType(WeaponType.CARBINE);
return
scripts/object/weapon/ranged/carbine/weapon_npe_commando_carbine_03_01.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(20);
object.setMaxDamage(40);
object.setWeaponType(1);
object.setWeaponType(Weapon.Type.CARBINE);
return
scripts/object/weapon/ranged/heavy/heavy_pvp.py
+3 -2
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -9,10 +10,10 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10)
object.setStringAttribute('healing_combat_level_required', '75')
object.setStringAttribute('required_combat_level', '75')
object.setStringAttribute('required_skill', 'None')
object.setDamageType("energy");
object.setWeaponType(12);
object.setWeaponType(WeaponType.HEAVYWEAPON);
object.setAttackSpeed(1);
object.setMinDamage(850);
object.setMaxDamage(1350);
scripts/object/weapon/ranged/pistol/item_npe_officer_sidearm.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(15);
object.setMaxDamage(25);
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
return
scripts/object/weapon/ranged/pistol/item_npe_smuggler_han_solo_gun.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(13);
object.setMaxDamage(27);
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
return
scripts/object/weapon/ranged/pistol/pistol_pvp.py
+3 -2
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -9,10 +10,10 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10)
object.setStringAttribute('healing_combat_level_required', '75')
object.setStringAttribute('required_combat_level', '75')
object.setStringAttribute('required_skill', 'None')
object.setDamageType("energy");
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
object.setAttackSpeed(0.4);
object.setMinDamage(259);
object.setMaxDamage(518);
scripts/object/weapon/ranged/pistol/weapon_npe_medic_pistol_03_01.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(13);
object.setMaxDamage(27);
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
return
scripts/object/weapon/ranged/pistol/weapon_pistol_en_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -13,5 +14,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(131);
object.setMaxDamage(261);
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
return
scripts/object/weapon/ranged/pistol/weapon_pistol_sp_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -14,5 +15,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(73);
object.setMaxDamage(145);
object.setWeaponType(2);
object.setWeaponType(WeaponType.PISTOL);
return
scripts/object/weapon/ranged/pistol/weapon_pistol_trader_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -12,5 +13,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(250);
object.setMaxDamage(500);
object.setWeaponType(2);
object.setWeaponType(WeaponType.Pistol);
return
scripts/object/weapon/ranged/rifle/rifle_pvp.py
+3 -2
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -9,10 +10,10 @@ def setup(core, object):
object.setIntAttribute('no_trade', 1)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:constitution_modified', 10)
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:precision_modified', 10)
object.setStringAttribute('healing_combat_level_required', '75')
object.setStringAttribute('required_combat_level', '75')
object.setStringAttribute('required_skill', 'None')
object.setDamageType("energy");
object.setWeaponType(0);
object.setWeaponType(WeaponType.RIFLE);
object.setAttackSpeed(0.8);
object.setMinDamage(518);
object.setMaxDamage(1035);
scripts/object/weapon/ranged/rifle/weapon_lightningbeam_commando_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -14,5 +15,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(261);
object.setMaxDamage(522);
object.setWeaponType(2);
object.setWeaponType(WeaponType.RIFLE);
return
scripts/object/weapon/ranged/rifle/weapon_rifle_bh_roadmap_01_02.py
+2 -1
View File
@@ -1,4 +1,5 @@
import sys
from resources.datatables import WeaponType
def setup(core, object):
object.setStfFilename('static_item_n')
@@ -14,5 +15,5 @@ def setup(core, object):
object.setDamageType("energy");
object.setMinDamage(261);
object.setMaxDamage(522);
object.setWeaponType(2);
object.setWeaponType(WeaponType.RIFLE);
return