Skip to content

Commit: Added console weapon commands, added Machete, Cannon, Melee, Elephantgun #844

Merged
merged 8 commits into from Mar 12, 2012

5 participants

@Tipaa
Tipaa commented Mar 7, 2012

Basics for a melee system, and two (somewhat whimsical) guns that could be niche weapons - Cannon is a bomb launcher, and elephant gun is great for the pharaoh.

I have also added weapon and cash /give to the console, and fixed a transparency issue.

@master-lincoln
Collaborator

Please remove the Thumbs.db files

@master-lincoln
Collaborator

Otherwise the pull request looks nice.
+1

@danielduner

This seems to do many things at the same time and add weapons that have not been discussed?

@master-lincoln
Collaborator

Yeah we have to discuss about it. We would also need a way to buy these weapons.They could be enabled if you reach a certain XP Level.
And it only includes the weapons and a few new console commands.
4 of them are unrelated and could be externalized to a new pull request which we could merge now.

EDIT
I just tried it and like the ideas.
We would need some kind of indication while a weapon is loading.
Also an extra animation for the machete needs to be done...

@master-lincoln master-lincoln commented on the diff Mar 9, 2012
res/constants/constants.txt
@@ -56,3 +56,17 @@ com.mojang.mojam.entity.weapon.Shotgun.shootDelay=35
com.mojang.mojam.entity.weapon.VenomShooter.bulletDamage=0.5
com.mojang.mojam.entity.weapon.VenomShooter.accuracy=0.15
com.mojang.mojam.entity.weapon.VenomShooter.shootDelay=5
+
+com.mojang.mojam.entity.weapon.Cannon.bulletDamage=30
+com.mojang.mojam.entity.weapon.Cannon.accuracy=0.0
+com.mojang.mojam.entity.weapon.Cannon.shootDelay=900
+
+com.mojang.mojam.entity.weapon.ElephantGun.bulletDamage=15
+com.mojang.mojam.entity.weapon.ElephantGun.accuracy=0.05
+com.mojang.mojam.entity.weapon.ElephantGun.shootDelay=120
+
+com.mojang.mojam.entity.weapon.Machete.bulletDamage=2
+com.mojang.mojam.entity.weapon.Machete.attackDelay=35
+
+com.mojang.mojam.entity.weapon.Melee.bulletDamage=1.5
+com.mojang.mojam.entity.weapon.Melee.attackDelay=30
@master-lincoln
Collaborator

This is not used. instead I get an error because shootDelay is not defined. Why not leave this shootDelay

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@Tipaa
Tipaa commented Mar 9, 2012

I have fixed the constants with the latest commit - I just wanted to have a good animation before spamming commits.

@Maescool
Owner

@Tipaa sync up :)

@master-lincoln
Collaborator

What do the others think about this pull request?
This doesn't change current gameplay unless you use the console. It's good to have some new weapons ready if someone comes up with a good integration in the game...

@Flet
Collaborator
Flet commented Mar 12, 2012

go for it

@Maescool Maescool merged commit 569b638 into Maescool:develop Mar 12, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.