Commit Graph
538 Commits
Author SHA1 Message Date
CharonInferar d848e89edb Script integration
A few example .py scripts
Improvements on the lootservice design
2014-04-08 04:08:52 +02:00
CharonInferar 9526eee9d6 Object-orientated approach to storing the loot info 2014-04-08 02:12:36 +02:00
CharonInferar 0eedd5cc5f Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-08 00:00:57 +02:00
CharonInferar 06fe72e647 Implementation of LootService
First steps
2014-04-07 23:49:51 +02:00
Waverunner d5c9d226e3 Fixed #255: Evasion not exiting combat 2014-04-07 16:22:36 -04:00
LevarrishawkandCharonInferar f7bcd6416d More unnecessary distractive Content Development 2014-04-07 18:56:33 +02:00
TreekuandCharonInferar 9a141802b9 Script syntax error 2014-04-07 18:56:32 +02:00
TreekuandCharonInferar 4b11146f78 Added example conversation script
Made a simpler script that uses less code, so it's easier to grasp.

In most cases there will only be one ProsePackage.

Copy-paste friendly.
2014-04-07 18:56:31 +02:00
ZiggehandCharonInferar c99e7c4bff Revert "Jedi - Fixed Force Throw and Spark"
This reverts commit e05a5b4bf5.
2014-04-07 18:56:31 +02:00
TreekuandCharonInferar 3bff39bd2e Added alias "afk" for "toggleawayfromkeyboard" 2014-04-07 18:56:29 +02:00
Bronco69andCharonInferar 5516a55762 fix in Medic expertise
realized that the health buff is linked to the stamina box in expertise
http://i.imgur.com/hW0L0zp.jpg
ive chosen CL48 for mark 2 because you get initially mark 1 at CL48 too.
2014-04-07 18:56:22 +02:00
Bronco69andCharonInferar 01fedd5cdb fixes in Jedi expertise
multi expertise commands fixed
2014-04-07 18:56:21 +02:00
ZiggehandCharonInferar 29b6738852 Jedi - Fixed Force Throw and Spark 2014-04-07 18:56:20 +02:00
Levarrishawk 7216987f13 More unnecessary distractive Content Development 2014-04-07 05:50:42 -04:00
Treeku 2a9988847f Script syntax error 2014-04-07 10:37:11 +01:00
Treeku e4d676f43d Added example conversation script
Made a simpler script that uses less code, so it's easier to grasp.

In most cases there will only be one ProsePackage.

Copy-paste friendly.
2014-04-07 10:08:41 +01:00
Treeku b6045f85dc Added alias "afk" for "toggleawayfromkeyboard" 2014-04-07 09:29:19 +01:00
Bronco69 97dfb85bd7 fix in Medic expertise
realized that the health buff is linked to the stamina box in expertise
http://i.imgur.com/hW0L0zp.jpg
ive chosen CL48 for mark 2 because you get initially mark 1 at CL48 too.
2014-04-07 04:25:56 +02:00
Bronco69 1f981fa388 fixes in Jedi expertise
multi expertise commands fixed
2014-04-07 03:18:46 +02:00
Waverunner 494bd4a8ad GMs can now get the accountId of the target (getplayerid) 2014-04-06 17:42:08 -04:00
Seefo 584380503c Changed buff for Elder Jedi Oppressor Robe 2014-04-06 16:31:34 -04:00
Waverunner 730b446f02 Change holoemote cooldown to seconds 2014-04-06 14:42:02 -04:00
Seefo 5c34a3644e Updated some Jedi robe scripts and fixed a concurrency error 2014-04-06 12:01:32 -04:00
CharonInferar c6836dead9 Clean up
SurveyCommand is now done fully over the Jython interface consistent to
client command handling
2014-04-06 14:49:22 +02:00
CharonInferar a5ba92cbf1 Bug fix
Picking up sampling a previously sampled resource, will add the stack to
the according container.
2014-04-06 14:27:55 +02:00
CharonInferar 348b6b7f55 Cleanup of options.cfg
Used kneel py for spawning tools, replaced it with original
2014-04-06 04:44:40 +02:00
CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java
2014-04-06 03:59:55 +02:00
CharonInferar 065fe79945 Clean up of code
Cleaned up some classes
Moved functionalities into more appropriate methods/classes
2014-04-06 02:08:55 +02:00
Seefo d74bfae9c1 Fixed #378 2014-04-05 18:57:24 -04:00
Waverunner fe340f5930 Fixed #378: Drillmaster applied to target. 2014-04-05 18:45:16 -04:00
Waverunner 36be2c9b37 Merge pull request #381 from Ziggeh/master
Fixed Nutrient Injection
2014-04-05 18:18:33 -04:00
Seefo 01a7852936 Added the ability to add items to a bonus set via STF Name, added Heroism Bonus Set, added Heroism Jewlery set to frog 2014-04-05 12:40:51 -04:00
Bronco69 357106fa06 Spy - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 11:53:34 +02:00
Bronco69 6751042fa2 Smuggler - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 09:35:44 +02:00
Bronco69 bcc37d325a Officer - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 09:23:37 +02:00
Levarrishawk 038f9a30ce Added Miscellanous Kaas Statics 2014-04-05 03:22:44 -04:00
Bronco69 b8a8e170c7 Jedi - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 08:59:57 +02:00
Bronco69 51e6d027ef Medic - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 08:33:59 +02:00
Ziggeh 710632fb87 Medic - Nutrient Injection mk. 1 now grants the correct buff 2014-04-05 08:02:24 +02:00
Bronco69 e426a0c499 Entertainer - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 07:57:22 +02:00
Ziggeh fbd3a3adeb Merge remote-tracking branch 'upstream/master' 2014-04-05 07:53:43 +02:00
Bronco69 acd709f9ce Trader - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 06:42:36 +02:00
Bronco69 10896fe4e1 Structure - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 05:30:43 +02:00
Bronco69 1da76d500b Munition - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 05:28:59 +02:00
Bronco69 85d8f53702 Engineering - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 05:26:54 +02:00
Bronco69 c380188070 Domestic + Cybernetic - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 05:24:18 +02:00
Bronco69 a6168e1572 Commando - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 05:17:12 +02:00
Bronco69 d7756e185b Beast Master - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 04:12:22 +02:00
Bronco69 9341998385 Bounty Hunter - expertise scripts reworked
All commands and skills for expertise changed and checked
2014-04-05 03:59:20 +02:00
Waverunner 9e80b5eeae Added basis for server-side cooldown checks, added warmup checks, closed #273
Note that cooldown check is currently used only for the holoemote
command. To add a cooldown to any command, all you have to do is
CreatureObject.addCooldown(name). In this commit I also moved some
cooldown variables from CombatCommand to BaseSWGCommand since many
non-combat commands had cooldowns (Wookie Roar, Holo-Emotes). I also put
in a warmup cooldown (time before command is called) for non-combat
commands.
2014-04-03 19:23:31 -04:00