Feature/weapons and inventory #779

Merged
merged 29 commits into from Mar 6, 2012

Projects

None yet

7 participants

@LordofMaps

Weapon inventory has been added with three weapon slots bound to the 1, 2 and 3 keys. The weapon inventory can be cycled using x and z and is shown in the top left corner. Right now the weapon art is a place holder.

Added the key bindings to the option menu.

Should be good to merge.

LordofMaps added some commits Mar 2, 2012
@LordofMaps LordofMaps Changed ShopItem to an abstract class. Each item (Turret, Harvester,
Bomb) is now a subclass of ShopItem. This should allow new items to be
more easily added in the future and for great flexibility with those
item.
8fa5d66
@LordofMaps LordofMaps Added three weapon purchases at the player base:
Rifle - default starting weapon.
Shotgun - Slow rate of fire, large shot spread and damage decreases with
distance.
Raygun - Shots bounce off of walls and increase in damage and speed with
each bounce.

Art for the shotgun and raygun shots but no other art assets or sounds.
de4553d
@LordofMaps LordofMaps Merge branch 'itemShop' into feature/weapons b53362e
@LordofMaps LordofMaps Fixed BulletRay not bouncing when hitting at right angles. 3cff9b6
@LordofMaps LordofMaps Changed the name of the Raygun to Energy Gun and changed the graphic to
a green "plasma ball".
3e8f8c2
@LordofMaps LordofMaps Merge branch 'master' into feature/weapons 2792083
@LordofMaps LordofMaps The tooltips for all of the weapon purchases now appear below the player
base. Before they appeared right below the item and where obstructed.
ac7b911
@LordofMaps LordofMaps Merge branch 'master' into feature/weapons d2ecc58
@LordofMaps LordofMaps Merge remote-tracking branch 'upstream/develop' into feature/weapons 3367dfe
@LordofMaps LordofMaps Changed the name of the Raygun to Energy Gun. The bullet for it now
displays a random image frame.
f3f1dee
@LordofMaps LordofMaps Merge remote-tracking branch 'upstream/develop' into feature/weapons c78b310
@LordofMaps LordofMaps Merged ShopItem. bf75b9e
@LordofMaps LordofMaps Merge branch 'develop' into feature/weapons and updated current added
weapons to reflect changes.
959033a
@LordofMaps LordofMaps Added a Player weapon inventory and key bindings of 1, 2 and 3 for the
first three slots.
0e308a4
@LordofMaps LordofMaps Merge branch 'develop' into feature/weapons d128dcd
@LordofMaps LordofMaps Added player weapon inventory and three weapon slots. The inventory is a
list of weapons that the current player has. The first three weapons are
bound to the 1, 2 and 3 keys. The weapons can be cycled using left and
right using x and z. Each weapon can only be in the inventory once.
The weapons slots are shown in the top left corner.

Right now the weapon art is a place holder (I'm happy with the
projectile art).
e97678d
@LordofMaps

Sorry for no pictures. It's almost 3:00 and I really need to sleep.

@master-lincoln
Collaborator

Is it your initiative or has there been a discussion anywhere before?

@danielduner

It seems to be a possible implementation of #736

@Ankkah
Collaborator

Overlap with pull request #766

@Maescool
Owner

@Ankkah yes, but #766 is a bit messy in my humble opinion..

@LordofMaps

Ah yes, I should have referenced #736. I had never seen #766. I'll be updating this latter today once I'm done working.

@xDreamCoding

+1 for this one over #766
its more thought-out

@Maescool
Owner

Any objections?
I'm ok to merge this.

@KBaluh

if i'm mergins this pull and my ? #766

@Maescool Maescool referenced this pull request Mar 5, 2012
Closed

New class weapons #766

@Maescool
Owner

@KBaluh your pull request has to much clutter in it :/ had to close it

LordofMaps added some commits Mar 5, 2012
@LordofMaps LordofMaps Fixed the behavior of the shotgun and raygun. Changed BULLET_DAMAGE from
static to non-static bulletDamage.
cc214be
@LordofMaps LordofMaps Because the player starts with it, removed ability to buy the Rifle at
the base. Until there is something that can remove weapons from the
player there is no need.
818497b
@LordofMaps

I'm done with all of my changes. Unless someone sees something that needs changing, should be good to merge.

@master-lincoln master-lincoln merged commit 04b5ebe into Maescool:develop Mar 6, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment