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

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Waverunner
2014-08-09 13:06:44 -04:00
parent 4615f10537 a8a824b8a7
commit 90fc62ccff
20 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/character_builder_terminal.py
+8 -8
View File
@@ -382,13 +382,13 @@ def combatLevelDown(owner):
return
def rangedWeapons(owner, inventory):
#rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
#rifle.setDamageType('energy')
#rifle.setWeaponType(WeaponType.RIFLE)
#rifle.setAttackSpeed(0.8)
#rifle.setMinDamage(518)
#rifle.setMaxDamage(1035)
#rifle.setMaxRange(64)
rifle = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_e11.iff', owner.getPlanet())
rifle.setDamageType('energy')
rifle.setWeaponType(WeaponType.RIFLE)
rifle.setAttackSpeed(0.8)
rifle.setMinDamage(518)
rifle.setMaxDamage(1035)
rifle.setMaxRange(64)
pistol = core.objectService.createObject('object/weapon/ranged/pistol/shared_pistol_dl44.iff', owner.getPlanet())
pistol.setDamageType('energy')
@@ -416,7 +416,7 @@ def rangedWeapons(owner, inventory):
heavy.setStringAttribute('wpn_elemental_value', '50')
heavy.setMaxRange(64)
#inventory.add(rifle)
inventory.add(rifle)
inventory.add(pistol)
inventory.add(carbine)
inventory.add(heavy)
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
src/services/command/CommandService.java
+7 -4
View File
@@ -94,11 +94,14 @@ public class CommandService implements INetworkDispatch {
return false;
}
TangibleObject weapon = (TangibleObject) core.objectService.getObject(actor.getWeaponId());
// Causes this service method to return with false after equipping a rifle, not allowing to unequip it anymore
// because the client seems to consider rifles invalidweapons for an unkown reason
if (weapon != null && weapon instanceof WeaponObject && ((WeaponObject) weapon).getWeaponType() == command.getInvalidWeapon()) {
return false;
}
// TangibleObject weapon = (TangibleObject) core.objectService.getObject(actor.getWeaponId());
//
// if (weapon != null && weapon instanceof WeaponObject && ((WeaponObject) weapon).getWeaponType() == command.getInvalidWeapon()) {
// return false;
// }
for (long state : command.getInvalidStates()) {
if ((actor.getStateBitmask() & state) == state) {