Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MShock Tileset Modded fix and additions #13398

Merged
merged 4 commits into from Aug 25, 2015

Conversation

Projects
None yet
4 participants
@chaosvolt
Copy link
Contributor

commented Aug 24, 2015

Major fix: I screwed up some sprite assignment, causing things like tubas pretending to be trees, spiral stones pretending to be random chunks of explosion, etc. Also didn't assign military seats properly in the 32x32 version.

Vanilla Spritework:

Sprite changes:

  • Made the makeshift macuahuitl use the stone version's sprites

Sprite Assignments:

  • Light plate armor
  • Armored gauntlets
  • Armored boots

Sprite additions:

  • Barbute (whaaat, I'm amazed MShock missed that one)
  • Kabuto
  • Lobster helmet
  • Chainmail (vest, coif, sleeves, leggings, armor)
  • Sharksuit and faradary shark suit
  • New trees (birch, maple, and willow)
  • Suitcases
  • Harmonica
  • Acoustic guitar
  • Bagpipes (massive pain in the ass to sprite that)
  • Tuba
  • Hickory trees (normal, harvested, and dead)
  • Harvested birch and willow trees
  • Birchbark and willowbark

Mod-related stuff:

Sprite changes:

  • Made Kadian's debug-only gift consistent with the new longsword sprites.

Sprite assignments:

  • Halberd (real and fake)
  • Glaive
  • Naginata
  • Lamellar armor
  • Arms and Armor of Imperial China

Sprite additions:

  • Arming sword (real and fake)
  • Longsword (real and fake)
  • Estoc (real and fake)
  • Xiphos
  • Khopesh
  • Jian
  • Dao
  • Ji (real and fake)
  • Dory
  • Qiang
  • Fire lance, and ammo
  • Bronze
  • Corinthian helm
  • Galea
  • Nasal helm
  • Conical helm
  • Tunic, rag tunic, sleeveless tunic
  • Gambeson
  • Chainmail hauberk
  • Bronze greaves
  • Bell cuirass
  • Lorica segmentata

Spritework for content currently only available on Dropbox:

Sprite Assignments:

  • The Medieval Warrior
  • The Modern Pankratiast

Sprite assignments that will be important later:

  • 30mm autocannon (vehicle part)
  • Mounted ATGM launcher (vehicle part)
  • ATGM turret (vehicle part)
chaosvolt
MShock Tileset Modded fix and additions
Major fix: I screwed up some sprite assignment, causing things like
tubas pretending to be trees, sprial stones pretending to be random
chunks of explosion, etc.

-

Vanilla Spritework:

Sprite changes:
* Made the makeshift macuahuitl use the stone version's sprites

Sprite Assignments:
* Light plate armor
* Armored gauntlets
* Armored boots

Sprite additions:
* Barbute (whaaat, I'm amazed MShock missed that one)
* Kabuto
* Lobster helmet
* Chainmail (vest, coif, sleeves, leggings, armor)
* Sharksuit and faradary shark suit
* New trees (birch, maple, and willow)
* Suitcases
* Harmonica
* Acoustic guitar
* Bagpipes (massive pain in the ass to sprite that)
* Tuba
* Hickory trees (normal, harvested, and dead)
* Harvested birch and willow trees
* Birchbark and willowbark

-

Mod-related stuff:

Sprite changes:
* Made Kadian's debug-only gift consistent with the new longsword
sprites.

Sprite assignments:
* Halberd (real and fake)
* Glaive
* Naginata
* Lamellar armor
* Arms and Armor of Imperial China

Sprite additions:
* Arming sword (real and fake)
* Longsword (real and fake)
* Estoc (real and fake)
* Xiphos
* Khopesh
* Jian
* Dao
* Ji (real and fake)
* Dory
* Qiang
* Fire lance, and ammo
* Bronze
* Corinthian helm
* Galea
* Nasal helm
* Conical helm
* Tunic, rag tunic, sleeveless tunic
* Gambeson
* Chainmail hauberk
* Bronze greaves
* Bell cuirass
* Lorica segmentata

-

Spritework for content currently only available on Dropbox:

Sprite Assignments:
* The Medieval Warrior
* The Modern Pankratiast
@kevingranade

This comment has been minimized.

Copy link
Member

commented Aug 24, 2015

@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Aug 24, 2015

Epic fail on my part. :V

@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Aug 24, 2015

Also fail, looks like I've got explosions disguised as cigarette packs too. Lemme fix that real quick. ._.

chaosvolt added some commits Aug 24, 2015

chaosvolt
Fix for explosion effect in 24 version
1. Bad explosion, stop pretending to be a cigarette box.
chaosvolt
Fixed failure in 32 version, other additions
1. Aaand we have a seat improperly assigned.
2. Sprite assignments for some parts to be added in a later PR.
chaosvolt
1 extra sprite assignment
1. This will be relevant later.
@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2015

There we go, done mucking about. I was GOING to finish adding Medieval Mod content and spriting instruments, but discovering sprite assignment bugs interrupted that.

Rivet-the-Zombie added a commit that referenced this pull request Aug 25, 2015

@Rivet-the-Zombie Rivet-the-Zombie merged commit 97b13ff into CleverRaven:master Aug 25, 2015

1 check passed

default
Details
@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Aug 25, 2015

And thank you for the merge.

@chaosvolt chaosvolt deleted the chaosvolt:mshock-modded-fix-and-additions branch Aug 25, 2015

@vipches

This comment has been minimized.

Copy link

commented Aug 26, 2015

Make sure don't forgot about the diamond weapons on those new cold weapons, sir?

@chaosvolt

This comment has been minimized.

Copy link
Contributor Author

commented Aug 26, 2015

Also on my to-do list for sprites. Weird, MShock already sprited flaming weapons, so I'm guessing diamond weapons were added later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.