*READ DESCRIPTION*#1288
Open
Mesagoppinmypants wants to merge 12 commits intoProjectSWGCore:masterfrom
Open
Conversation
Contributor
Mesagoppinmypants
commented
Nov 13, 2014
Mesagoppinmypants
commented
- Added a fizz instrument to the entertainer starter profession box.
- Added LightsaberColors datatable to lightsaber color crystals.
- Added level 10 zombie/deathtrooper spawn place holder.
- Added more instruments to the frog to test.
- Removed un-needed imports for quarantine static spawns.
- Fixed small typos in gate keeper conversation script. (still needs Waverunner to do the final fix)
- Simplified invulnerable option to quarantine NPCs.
fork update
There's still one error left to be fixed: Traceback (most recent call last): File "scripts/commands/npcconversationstop.py", line 8, in run core.conversationService.handleEndConversation(actor, actor.getConversingNpc()) File "scripts/conversation/outbreak_imperial_officer_gate_keeper.py", line 29 convSvc.sendConversationOptions(actor, npc, options, handleOptionsTwo) ^ SyntaxError: no viable alternative at input 'convSvc'
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.