search

Maescool / Catacomb-Snatch

Mojang's Humble bundle source
Other
295 stars 99 forks source link

Rail droids carry #920

Closed Delvar closed 12 years ago

Delvar commented 12 years ago

Simply put it lets Rail Droids carry turrets and other buildings.

here is a youTube video of it in action: http://www.youtube.com/watch?v=RrET1sL1b6Y

still things i want to do,

  1. be able to buy rail droids in a shop instead of 'on the track'
  2. be able to pick up and carry rail droids
  3. make raildroids upgradable

Bugs:

  1. rail droids currently cant pick up treasure
  2. cant drop treasure at base
  3. when droid is destroyed so is the item they are carrying

im doign this pull request to see what other people think as i finish it off.. i hope thats ok?

Flet commented 12 years ago

Pretty neat :) Impressive post production work on the video too hehe.

I agree 100% with making rail drops "buyable" via picking them up like turrets and harvesters and placing them on the track. It makes them much more intuitive than "stand in this magic space and press a button". It also makes it possible to set up tracks that are not attached to the base for making "patrol" rail droids :)

as a side note, you may want to consider squashing all your commits together via a rebase (http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) and submitting a new pull request when things are closer to finished.

I think bugs 1 and 2 are definitely bugs. Bug 3 could be considered a "feature" :)

If the bugs can be fixed, I think this would be a great addition even without the "want to do" items you've listed... those can be added on as separate pull requests :) I like small bites :)

Delvar commented 12 years ago

ok cool, should be easy to fix the bugs, simply create a Treasure inherited from Building.. ill try to work on it tomorrow.

as for picking them up, will require more fiddly work as ill have to change Mob.carried from type Building to type Mob .. fancy picking up a mummy?! probably going to need an interface 'can be picked up by'

ill read that guide thanks, im still very new at this and keep making mistakes with GIT :(.

yeah my you tube skills are amazing! hehe

Delvar commented 12 years ago

I must point out that this was not originally my idea but it came from 'AngelDE98' on the forums. http://forum.catacombsnatch.net/thread-154-page-2.html

Delvar commented 12 years ago

also whenever i re-base my code i am unable to push some error about missing history. i have to force the push. is this normal? or am i doing something stupid again?

Maescool commented 12 years ago

Uhm, first you need to pull before you push else the changes that have happend in between could be compromised

Delvar commented 12 years ago

ah i see, i was just fetching then re-basing

ir git fetch upstream git cehckout develop git rebase upstream/develop cehckout RailDroidsCarry git rebase develop

when i should be doing,

git fetch upstream git cehckout develop git merge upstream/develop cehckout RailDroidsCarry git rebase develop

??

Maescool commented 12 years ago

exactly :)

Delvar commented 12 years ago

ok cool, hopefully me and GIT will get along better now lol.

thanks for your help guys i have had some real trouble understanding git.

Maescool commented 12 years ago

Maescool commented 12 years ago

ok, i just released new version of game, cause i wasn't sure if this should have been in that release.. I'm waiting for the others to confirm if they like this to be commited :) then it will be in the next release ;)

Flet commented 12 years ago

looks good to me :)

Delvar commented 12 years ago

let me fix the 'cant take treasure' bug. at least thats a quick fix. adding a shop and making droids carryable is a bit more work and probably worth a branch on its own.

Delvar commented 12 years ago

ok you can now win the game :) and no buggy push failures either!