[MSX] Bookstuff and some miscellaneous stuff (#2061)

* Fix #2060 * Fix #2060 * Create .gitkeep * Add files via upload * Delete .gitkeep * Add files via upload * Add files via upload * Delete overlay_worn_ballistic_vest_esapi.png * Add files via upload * Add files via upload * Delete gfx/MShockXotto+/pngs_tiles_32x32/item/Books directory * Add files via upload * Add files via upload
I-am-Erk · Jul 14, 2023 · 7faa20e · 7faa20e
1 parent 7a6e143
commit 7faa20e
Show file tree

Hide file tree

Showing 100 changed files with 6 additions and 1 deletion.
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/SICP.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/SICP.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/book_fict_soft_ya_rwya.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/book_fict_soft_ya_rwya.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/book_ruined.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/book_ruined.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_binder.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_binder.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_book.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_book.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_cookbook.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_cookbook.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_magazine.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_magazine.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_manual.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_manual.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_pocketguide.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_pocketguide.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_recipebook.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_recipebook.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_schematics.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_schematics.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_textbook.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/generic_textbook.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/manual_first_aid.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/manual_first_aid.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_adventure.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_adventure.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_buddy.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_buddy.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_coa.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_coa.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_coa2.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_coa2.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_crime.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_crime.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_crime2.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_crime2.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_drama.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_drama.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_erotic.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_erotic.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_experimental.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_experimental.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_fantasy.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_fantasy.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_horror.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_horror.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_mystery.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_mystery.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_pulp.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_pulp.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_road.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_road.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_romance.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_romance.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_samurai.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_samurai.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_satire.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_satire.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_scifi.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_scifi.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_sports.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_sports.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_spy.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_spy.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_swash.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_swash.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_thriller.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_thriller.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_tragedy.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_tragedy.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_war.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_war.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_war2.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_war2.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_western.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/novel_western.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/paperback_novel.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/paperback_novel.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/phonebook.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/phonebook.png
diff --git a/...o+/pngs_tiles_32x32/item/Books/texts.json → ...+/pngs_small_20x20/items/books/texts.json b/...o+/pngs_tiles_32x32/item/Books/texts.json → ...+/pngs_small_20x20/items/books/texts.json
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/books/winemaking_beginner.png b/gfx/MShockXotto+/pngs_small_20x20/items/books/winemaking_beginner.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sheet_leather.png b/gfx/MShockXotto+/pngs_small_20x20/items/sheet_leather.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/stand_flyer.png b/gfx/MShockXotto+/pngs_small_20x20/items/stand_flyer.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/wooden_post_short.png b/gfx/MShockXotto+/pngs_small_20x20/items/wooden_post_short.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_m4a1_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_m4a1_0.json
@@ -1 +1 @@
-{"id": "overlay_wielded_m4a1", "fg": ["3958_overlay_wielded_h&k416a5_0"], "rotates": false, "bg": []}
+{"id": "overlay_wielded_modular_m4_carbine_var_modular_m4a1", "fg": ["3958_overlay_wielded_h&k416a5_0"], "rotates": false, "bg": []}
diff --git a/...les_32x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post.png b/...les_32x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post.png
diff --git a/...2x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post_long.png b/...2x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post_long.png
diff --git a/...x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post_short.png b/...x32/character/overlay/wielded/wooden_post/overlay_wielded_wooden_post_short.png
diff --git a/...r/overlay/worn/ballistic_vest/overlay_worn_level_3_vest_var_fema_armor_vest.png b/...r/overlay/worn/ballistic_vest/overlay_worn_level_3_vest_var_fema_armor_vest.png
diff --git a/...worn/ballistic_vest/overlay_worn_level_3_vest_var_national_guard_armor_vest.png b/...worn/ballistic_vest/overlay_worn_level_3_vest_var_national_guard_armor_vest.png
diff --git a/...overlay/worn/ballistic_vest/overlay_worn_level_3_vest_var_police_armor_vest.png b/...overlay/worn/ballistic_vest/overlay_worn_level_3_vest_var_police_armor_vest.png
diff --git a/...ay/worn/overlay_worn_ballistic_vest_esapi/overlay_worn_ballistic_vest_esapi.png b/...ay/worn/overlay_worn_ballistic_vest_esapi/overlay_worn_ballistic_vest_esapi.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/SICP.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/SICP.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/book_fict_soft_ya_rwya.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/book_fict_soft_ya_rwya.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/book_template.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/book_template.xcf
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_binder.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_binder.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_book.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_book.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_cookbook.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_cookbook.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_magazine.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_magazine.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_manual.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_manual.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_pocketguide.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_pocketguide.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_recipebook.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_recipebook.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_schematics.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_schematics.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_textbook.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/generic_textbook.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/manual_first_aid.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/manual_first_aid.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_adventure.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_adventure.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_buddy.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_buddy.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_coa.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_coa.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_coa2.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_coa2.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_crime.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_crime.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_crime2.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_crime2.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_drama.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_drama.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_erotic.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_erotic.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_experimental.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_experimental.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_fantasy.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_fantasy.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_horror.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_horror.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_mystery.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_mystery.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_pulp.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_pulp.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_road.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_road.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_romance.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_romance.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_samurai.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_samurai.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_satire.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_satire.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_scifi.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_scifi.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_sports.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_sports.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_spy.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_spy.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_swash.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_swash.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_thriller.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_thriller.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_tragedy.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_tragedy.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_war.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_war.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_war2.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_war2.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_western.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/novel_western.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/paperback_novel.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/paperback_novel.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/thick_book_template.xcf b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/thick_book_template.xcf
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/winemaking_beginner.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Books/winemaking_beginner.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/aunt_su_guns/aunt_su_guns.json b/gfx/MShockXotto+/pngs_tiles_32x32/item/aunt_su_guns/aunt_su_guns.json
@@ -3,5 +3,10 @@
    "id": "modular_ar15",
    "fg": "ar15",
    "bg": []
+  },
+  {
+   "id": "modular_m4_carbine_var_modular_m4a1",
+   "fg": "m4_carbine_var_m4a1",
+   "bg": []
   }
 ]
diff --git a/...gs_tiles_32x32/item/Books/book_pieces.png → ...to+/pngs_tiles_32x32/item/book_pieces.png b/...gs_tiles_32x32/item/Books/book_pieces.png → ...to+/pngs_tiles_32x32/item/book_pieces.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/wooden_post.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/wooden_post.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/wooden_post_long.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/wooden_post_long.png
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"id": "overlay_wielded_m4a1", "fg": ["3958_overlay_wielded_h&k416a5_0"], "rotates": false, "bg": []}
		{"id": "overlay_wielded_modular_m4_carbine_var_modular_m4a1", "fg": ["3958_overlay_wielded_h&k416a5_0"], "rotates": false, "bg": []}