SWGEMU-522 Grenade Implementation

Details
Objectives
General Comments 2 (0)

grenades.patch (4 months and 8 days ago) 0 (0)
- workspace/MMOCoreORB-Testing 0 (0)
  - bin/scripts 0 (0)
    - commands 0 (0)
      - throwGrenade.lua 0 (0) x
    - object/weapon/ranged/grenade 0 (0)
      - grenade_cryoban.lua 0 (0) x
      - grenade_fragmentation.lua 0 (0) x
      - grenade_fragmentation_light.lua 0 (0) x
      - grenade_glop.lua 0 (0) x
      - grenade_imperial_detonator.lua 0 (0) x
      - grenade_proton.lua 0 (0) x
      - grenade_thermal_detonator.lua 0 (0) x
  - src/server/zone 0 (0)
    - managers 0 (0)
      - combat 0 (0)
        
        CombatManager.cpp 3 (0) x
        
        CombatManager.h 0 (0) x
        
        CreatureAttackData.cpp 0 (0) x
        
        CreatureAttackData.h 0 (0) x
      - components 0 (0)
        
        ComponentManager.cpp 0 (0) x
      - object 0 (0)
        
        ObjectManager.cpp 0 (0) x
      - objectcontroller 0 (0)
        
        ObjectControllerImplementation.cpp 2 (0) x
    - objects 0 (0)
      - creature/commands 0 (0)
        
        CombatQueueCommand.h 0 (0) x
        
        ThrowGrenadeCommand.h 0 (0) x
      - scene 0 (0)
        
        SceneObject.cpp 0 (0) x
        
        SceneObject.h 0 (0) x
        
        SceneObject.idl 0 (0) x
      - tangible 0 (0)
        
        components 0 (0)
        
        ThrowGrenadeMenuComponent.cpp 0 (0) x
        
        ThrowGrenadeMenuComponent.h 0 (0) x
        
        weapon 0 (0)
        
        WeaponObject.cpp 0 (0) x
        
        WeaponObject.h 0 (0) x
        
        WeaponObject.idl 0 (0) x
        
        WeaponObjectImplementation.cpp 0 (0) x
    - templates/tangible 0 (0)
      - SharedWeaponObjectTemplate.cpp 0 (0) x
      - SharedWeaponObjectTemplate.h 0 (0) x
grenades2.patch (4 months and 4 days ago) 0 (0)
- workspace/MMOCoreORB-Testing 0 (0)
  - bin/scripts 0 (0)
    - commands 0 (0)
      - throwGrenade.lua 0 (0) x
    - object/weapon/ranged/grenade 0 (0)
      - grenade_cryoban.lua 0 (0) x
      - grenade_fragmentation.lua 0 (0) x
      - grenade_fragmentation_light.lua 0 (0) x
      - grenade_glop.lua 0 (0) x
      - grenade_imperial_detonator.lua 0 (0) x
      - grenade_proton.lua 0 (0) x
      - grenade_thermal_detonator.lua 0 (0) x
  - src/server/zone 0 (0)
    - managers 0 (0)
      - combat 0 (0)
        
        CombatManager.cpp 0 (0) x
        
        CombatManager.h 0 (0) x
        
        CreatureAttackData.cpp 0 (0) x
        
        CreatureAttackData.h 0 (0) x
      - components 0 (0)
        
        ComponentManager.cpp 0 (0) x
      - object 0 (0)
        
        ObjectManager.cpp 0 (0) x
      - objectcontroller 0 (0)
        
        ObjectControllerImplementation.cpp 0 (0) x
    - objects 0 (0)
      - creature 0 (0)
        
        commands 0 (0)
        
        ChannelForceCommand.h 0 (0) x
        
        CombatQueueCommand.h 0 (0) x
        
        DrainForceCommand.h 0 (0) x
        
        FlourishCommand.h 0 (0) x
        
        ForcePowersQueueCommand.h 0 (0) x
        
        HealActionSelf1Command.h 0 (0) x
        
        HealActionSelf2Command.h 0 (0) x
        
        HealActionWoundSelf1Command.h 0 (0) x
        
        HealActionWoundSelf2Command.h 0 (0) x
        
        HealAllSelf1Command.h 0 (0) x
        
        HealAllSelf2Command.h 0 (0) x
        
        HealBattleFatigueSelf1Command.h 0 (0) x
        
        HealBattleFatigueSelf2Command.h 0 (0) x
        
        HealHealthSelf1Command.h 0 (0) x
        
        HealHealthSelf2Command.h 0 (0) x
        
        HealHealthWoundSelf1Command.h 0 (0) x
        
        HealHealthWoundSelf2Command.h 0 (0) x
        
        HealMindSelf1Command.h 0 (0) x
        
        HealMindSelf2Command.h 0 (0) x
        
        HealMindWoundSelf1Command.h 0 (0) x
        
        HealMindWoundSelf2Command.h 0 (0) x
        
        HealStatesSelfCommand.h 0 (0) x
        
        HeavyWeaponQueueCommand.h 0 (0) x
        
        QueueCommand.h 0 (0) x
        
        ThrowGrenadeCommand.h 0 (0) x
        
        TransferForceCommand.h 0 (0) x
        
        CreatureObject.cpp 0 (0) x
        
        CreatureObject.h 0 (0) x
        
        CreatureObject.idl 0 (0) x
        
        CreatureObjectImplementation.cpp 0 (0) x
      - scene 0 (0)
        
        SceneObject.cpp 0 (0) x
        
        SceneObject.h 0 (0) x
        
        SceneObject.idl 0 (0) x
      - tangible 0 (0)
        
        components 0 (0)
        
        ThrowGrenadeMenuComponent.cpp 0 (0) x
        
        ThrowGrenadeMenuComponent.h 0 (0) x
        
        weapon 0 (0)
        
        WeaponObject.cpp 0 (0) x
        
        WeaponObject.h 0 (0) x
        
        WeaponObject.idl 0 (0) x
        
        WeaponObjectImplementation.cpp 0 (0) x
        
        TangibleObject.cpp 0 (0) x
        
        TangibleObject.h 0 (0) x
        
        TangibleObject.idl 0 (0) x
    - templates/tangible 0 (0)
      - SharedWeaponObjectTemplate.cpp 0 (0) x
      - SharedWeaponObjectTemplate.h 0 (0) x

#permalink

Details

Warning: no files are visible, they have all been filtered.

Participant	Role	Time Spent	Comments	Latest Comment
Ivojedi	Author	3h 49m	4	This patch is in need of updating. Rather than resubmitti...
TheAnswer	Moderator	19m	2	this is just a hacky solution. I think you should refact...
Itac	Reviewer - 0% complete
Loshult	Reviewer - 2% complete	2m
cRush	Reviewer - 0% complete
dannuic	Reviewer - 32% complete	13m
oru	Reviewer - 0% complete
Kyle	Reviewer - 0% complete
elpete	Reviewer - 39% complete	24m	1	I added those versions to support the option of a non cre...
Total		4h 48m	7

Files: 87
Patches:
- grenades.patch: (anchored to swgemu : core3/branches/unstable/MMOCoreORB/ )
- grenades2.patch: (anchored to swgemu : core3/branches/unstable/MMOCoreORB/ )

#permalink

Objectives

[Added] Grenades are now craftable and usable

I believe that I've implemented everything for grenades to be fully functional. Radial menu, damage, damage type, armor piercing, thrown weapon skill mods, speed, certification, and xp should all be working right on them now.

I did not touch the experimental values in the .lua files, so it's possible that those number will need adjusting, but that was beyond the scope of this patch.

Patch #2 Update:

I refactored getCommandDuration() of QueueCommand to add the command arguments as a parameter as instructed. ThrowGrenadeCommand now has a version of it that uses the grenade to calculate the duration, rather than the equipped weapon.

Rather than add a weapon member to CreatureAttackData as suggested, I ended up changing many of the methods in the combat manager to accept a weapon object as a parameter. I now have logic in CombatQueueCommand to get the correct weapon object and pass it into the combat manager. This allowed me to merge some of the redundant code in the combat manager, some from my previous patch, and some that was existing.

I also went ahead and changed some of the methods where it made sense to me to accept a Tangible object attacker instead of a creature object. This allowed me to merge ElPete's recent turret code into the main methods as well and clean up some of the other redundant code. I probably got a little carried away... though I'm pretty sure that I retained all of the functionality and calculations as they were, just changed the structure of the combat manager somewhat.

I also added a new version of isAttackableBy() to TangibleObject and CreatureObject that accept a tangible object as a parameter rather than a creature object. They are in use by some of the methods I altered in the combat manager.

#permalink

Issues Raised From Comments

Key	Summary	State	Assignee

#permalink

General Comments

12 Jan

Ivojedi says:

Patch updated. Feedback is welcome.

#permalink

03 Feb

Ivojedi says:

This patch is in need of updating. Rather than resubmitting a large patch, I'm going to abandon this review and resubmit it in smaller chunks, starting with the parts that can stand alone. Hopefully that'll make it easier to review.

#permalink

/workspace/.../commands/throwGrenade.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_cryoban.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_fragmentation.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_fragmentation_light.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_glop.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_imperial_detonator.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_proton.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_thermal_detonator.lua Changed #permalink
Click to load diff

/workspace/.../combat/CombatManager.cpp Changed 3 (0) #permalink
Click to load diff

/workspace/.../combat/CombatManager.h Changed #permalink
Click to load diff

/workspace/.../combat/CreatureAttackData.cpp Changed #permalink
Click to load diff

/workspace/.../combat/CreatureAttackData.h Changed #permalink
Click to load diff

/workspace/.../components/ComponentManager.cpp Changed #permalink
Click to load diff

/workspace/.../object/ObjectManager.cpp Changed #permalink
Click to load diff

/workspace/.../objectcontroller/ObjectControllerImplementation.cpp Changed 2 (0) #permalink
Click to load diff

/workspace/.../commands/CombatQueueCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/ThrowGrenadeCommand.h Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.cpp Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.h Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.idl Changed #permalink
Click to load diff

/workspace/.../components/ThrowGrenadeMenuComponent.cpp Changed #permalink
Click to load diff

/workspace/.../components/ThrowGrenadeMenuComponent.h Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.cpp Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.h Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.idl Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObjectImplementation.cpp Changed #permalink
Click to load diff

/workspace/.../tangible/SharedWeaponObjectTemplate.cpp Changed #permalink
Click to load diff

/workspace/.../tangible/SharedWeaponObjectTemplate.h Changed #permalink
Click to load diff

/workspace/.../commands/throwGrenade.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_cryoban.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_fragmentation.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_fragmentation_light.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_glop.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_imperial_detonator.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_proton.lua Changed #permalink
Click to load diff

/workspace/.../grenade/grenade_thermal_detonator.lua Changed #permalink
Click to load diff

/workspace/.../combat/CombatManager.cpp Changed #permalink
Click to load diff

/workspace/.../combat/CombatManager.h Changed #permalink
Click to load diff

/workspace/.../combat/CreatureAttackData.cpp Changed #permalink
Click to load diff

/workspace/.../combat/CreatureAttackData.h Changed #permalink
Click to load diff

/workspace/.../components/ComponentManager.cpp Changed #permalink
Click to load diff

/workspace/.../object/ObjectManager.cpp Changed #permalink
Click to load diff

/workspace/.../objectcontroller/ObjectControllerImplementation.cpp Changed #permalink
Click to load diff

/workspace/.../commands/ChannelForceCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/CombatQueueCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/DrainForceCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/FlourishCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/ForcePowersQueueCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/HealActionSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealActionSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealActionWoundSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealActionWoundSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealAllSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealAllSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealBattleFatigueSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealBattleFatigueSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealHealthSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealHealthSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealHealthWoundSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealHealthWoundSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealMindSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealMindSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealMindWoundSelf1Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealMindWoundSelf2Command.h Changed #permalink
Click to load diff

/workspace/.../commands/HealStatesSelfCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/HeavyWeaponQueueCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/QueueCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/ThrowGrenadeCommand.h Changed #permalink
Click to load diff

/workspace/.../commands/TransferForceCommand.h Changed #permalink
Click to load diff

/workspace/.../creature/CreatureObject.cpp Changed #permalink
Click to load diff

/workspace/.../creature/CreatureObject.h Changed #permalink
Click to load diff

/workspace/.../creature/CreatureObject.idl Changed #permalink
Click to load diff

/workspace/.../creature/CreatureObjectImplementation.cpp Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.cpp Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.h Changed #permalink
Click to load diff

/workspace/.../scene/SceneObject.idl Changed #permalink
Click to load diff

/workspace/.../components/ThrowGrenadeMenuComponent.cpp Changed #permalink
Click to load diff

/workspace/.../components/ThrowGrenadeMenuComponent.h Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.cpp Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.h Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObject.idl Changed #permalink
Click to load diff

/workspace/.../weapon/WeaponObjectImplementation.cpp Changed #permalink
Click to load diff

/workspace/.../tangible/TangibleObject.cpp Changed #permalink
Click to load diff

/workspace/.../tangible/TangibleObject.h Changed #permalink
Click to load diff

/workspace/.../tangible/TangibleObject.idl Changed #permalink
Click to load diff

/workspace/.../tangible/SharedWeaponObjectTemplate.cpp Changed #permalink
Click to load diff

/workspace/.../tangible/SharedWeaponObjectTemplate.h Changed #permalink
Click to load diff

Review updated: Reload | Ignore | Collapse

You cannot reload the review while writing a comment.

Notation	Description
[Crucible Review CR-1\|CR-1]	Creates a link to a Crucible review or FishEye artifact using the internal key reference for the item. Example: Crucible Review CR-1
[Atlassian Crucible\|http://atlassian.com/crucible]	Creates a link to an external resource, special characters that come after the URL and are not part of it must be separated with a space. External links are denoted with an arrow icon. Example: Atlassian Crucible
{cs:id=1\|rep=FE}	Render a link to the changeset Example: 1
bold	Makes text appear bold.
_italic_	Makes text appear in italics.
+underline+	Makes text appear underlined.
??citation??	Makes text appear in citation form.
-strikethrough-	Makes text appear ~~struck through~~.
^superscript^	Makes text appear in ^superscript.
~subscript~	Makes text appear in _subscript.
{{ monospaced }}	Placing double curly-brackets around text makes it appear `monospaced`.
{code} // Some comments here public String getFoo() { return foo; } {code}	The code macro displays a preformatted block for showing code with syntax highlighting. Example: // Some comments here public String getFoo() { return foo; }
bq. Block Quote	To make an entire paragraph into a block quotation, place "bq. " before it. Example: Block Quote
{quote} here is quoteable content to be quoted {quote}	Quote a block of text that's longer than one paragraph. Example: here is quoteable content to be quoted
{color:red} look ma, red text!{color}	Changes the color of a block of text. Example: look ma, red text!
* A list with bullets * Second item ** Indented item	Example: A list with bullets Second item Indented item
# A list with numbers # Second item ## Indented item	Example: A list with numbers Second item Indented item

SWGEmu SWGEMU-522

Grenade Implementation

Abandoned on 03 Feb

Author

Moderator

Reviewers

SWGEMU-522 7 (0)

Details

Objectives

Issues Raised From Comments

General Comments

Ivojedi says:

Ivojedi says:

Create Issue

Log time against

Current Project

SWGEmu SWGEMU-522

Grenade Implementation

Abandoned on 03 Feb

Author

Moderator

Reviewers

SWGEMU-522 7 (0)

Summarize the review outcomes (optional)

Details

Objectives

Issues Raised From Comments

General Comments

Ivojedi says:

Ivojedi says:

Create Issue

Log time against