libre.patch 26 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841
  1. diff -Naurp1 a/docs/copying.rst b/docs/copying.rst
  2. --- a/docs/copying.rst 2020-06-03 15:09:59.000000000 +0600
  3. +++ b/docs/copying.rst 2020-10-27 21:23:08.383730390 +0600
  4. @@ -27,22 +27,2 @@ With the following exceptions:
  5. -* Shockbolt's (64x64) graphics are distributed under the following licence:
  6. -
  7. - The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes 2012. It can be found in the file lib/tiles/shockbolt/64x64.png.
  8. -
  9. - Permission is granted to:
  10. -
  11. - * use the tileset with in-development and released versions of Angband
  12. - * distribute and make copies of the tileset with in-development and released versions of Angband, as long as no fee is charged for it
  13. - * incorporate tiles designed by the author for variants of Angband and use and distribute them with Angband under the terms above
  14. -
  15. - Permission is not granted to:
  16. -
  17. - * modify the tileset without the author's permission.
  18. - * incorporate tiles designed for ToME that do not appear in the Angband tileset.
  19. - * use or distribute the tileset with other games or projects. If you want to use and distribute the tileset with other games or projects, you must obtain explicit permission from the author. Non-commercial games or projects may be granted permission to use them, and if so, use will be allowed as long as the game or project remains non-commercial. To use them in commercial games, a non-exclusive licence must be acquired from the author.
  20. -
  21. - Currently some of the tiles in the 64x64.png tilesheet were resized from tiles made by David Gervais for the 32x32 set.
  22. -
  23. -* The sounds are licenced under the Creative Commons Attribution-NonCommercial-Sharealike licence. They were created by Dubtrain <angband@dubtrain.com>. You can find them in Wave format at http://www.dubtrain.com/angband/.
  24. -
  25. * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick McConnell, all of whom have agreed to their Angband work being released under the GPL.
  26. diff -Naurp1 a/docs/hacking/modifying.rst b/docs/hacking/modifying.rst
  27. --- a/docs/hacking/modifying.rst 2020-06-03 15:09:59.000000000 +0600
  28. +++ b/docs/hacking/modifying.rst 2020-10-27 21:30:32.902709753 +0600
  29. @@ -229,7 +229,3 @@ there. Once the directory has been creat
  30. the tiles will be in pixels and then create a blank PNG image large enough to
  31. -hold all of the tiles (be sure to enable alpha transparency). As an example,
  32. -Shockbolt's tileset uses 64x64 pixel tiles. It also uses the special alpha
  33. -blending flag so it can use double-height tiles (64x128) for large or tall
  34. -monsters. Its dimensions are 8192x2048 but the tileset is not completely
  35. -full. More tiles can be added without increasing the size of the image as new
  36. +hold all of the tiles (be sure to enable alpha transparency). More tiles can be added without increasing the size of the image as new
  37. objects are added to future releases of Angband. This should be kept in mind as
  38. @@ -335,4 +331,3 @@ file to also be read. It is also possibl
  39. files to help you keep track of where different kinds of objects are
  40. -mapped. Any text on a line after a ``#`` symbol is ignored. Shockbolt's tiles
  41. -make great use of this and define a well organized set of mappings using three
  42. +mapped. Any text on a line after a ``#`` symbol is ignored. For example, to define a well organized set of mappings using three
  43. files with comments for each logical section of objects to be mapped::
  44. @@ -349,7 +344,2 @@ match the filenames you chose for your t
  45. -Once you have a working tileset and functional understanding of how tilesets
  46. -are managed and organized, it would be a good idea to study Shockbolt's tileset
  47. -and follow the examples there in order to produce a high-quality tileset that
  48. -you will be proud to share with others.
  49. -
  50. Larger changes
  51. diff -Naurp1 a/lib/sounds/Makefile b/lib/sounds/Makefile
  52. --- a/lib/sounds/Makefile 2020-06-03 15:09:59.000000000 +0600
  53. +++ b/lib/sounds/Makefile 2020-10-27 21:43:49.367672775 +0600
  54. @@ -3,75 +3,2 @@ include $(MKPATH)buildsys.mk
  55. -DATA = sound.cfg \
  56. - amb_bell_metal1.mp3 mco_scurry_dry.mp3 plm_drop_boot.mp3 \
  57. - amb_bell_metal2.mp3 mco_shake_roll.mp3 plm_eat_bite.mp3 \
  58. - amb_bell_tibet1.mp3 mco_snarl_short.mp3 plm_floor_creak.mp3 \
  59. - amb_bell_tibet2.mp3 mco_spray_long.mp3 plm_floor_creak2.mp3 \
  60. - amb_bell_tibet3.mp3 mco_squish_hit.mp3 plm_glass_break.mp3 \
  61. - amb_door_doom.mp3 mco_squish_snap.mp3 plm_glass_breaking.mp3 \
  62. - amb_door_iron.mp3 mco_strange_music.mp3 plm_glass_smashing.mp3 \
  63. - amb_dungeon_echo.mp3 mco_strange_thwoink.mp3 plm_jar_ding.mp3 \
  64. - amb_dungeon_echowet.mp3 mco_thoing_backwards.mp3 plm_levelup.mp3 \
  65. - amb_gong_chinese.mp3 mco_thoing_deep.mp3 plm_lock_case.mp3 \
  66. - amb_gong_low.mp3 mco_thud_crash.mp3 plm_lock_distant.mp3 \
  67. - amb_gong_strike.mp3 mco_tube_hit.mp3 plm_metal_clank.mp3 \
  68. - amb_gong_undertone.mp3 plc_bell_warn.mp3 plm_metal_sharpen.mp3 \
  69. - amb_guitar_chord.mp3 plc_die_laugh.mp3 plm_open_case.mp3 \
  70. - amb_pulse_low.mp3 plc_hit_anvil.mp3 plm_spell1.mp3 \
  71. - amb_thunder_rain.mp3 plc_hit_anvil2.mp3 plm_spell2.mp3 \
  72. - amb_thunder_roll.mp3 plc_hit_arrow.mp3 plm_spell3.mp3 \
  73. - id_bad_aww.mp3 plc_hit_body.mp3 plm_use_staff.mp3 \
  74. - id_bad_dang.mp3 plc_hit_groan.mp3 plm_wood_thud.mp3 \
  75. - id_bad_hmm.mp3 plc_hit_grunt.mp3 plm_zap_rod.mp3 \
  76. - id_bad_hmph.mp3 plc_hit_grunt2.mp3 pls_bell_bowl.mp3 \
  77. - id_bad_ohh.mp3 plc_hit_hay.mp3 pls_bell_chime_new.mp3 \
  78. - id_ego_whoa.mp3 plc_miss_arrow.mp3 pls_bell_glass.mp3 \
  79. - id_ego_woohoo.mp3 plc_miss_arrow2.mp3 pls_bell_hibell_soft.mp3 \
  80. - id_ego_yeah.mp3 plc_miss_swish.mp3 pls_bell_mute.mp3 \
  81. - id_ego_yeah2.mp3 plm_aim_wand.mp3 pls_bell_sustain.mp3 \
  82. - id_ego_yes.mp3 plm_bang_ceramic.mp3 pls_breathe_in.mp3 \
  83. - id_good_hey.mp3 plm_bang_dumpster.mp3 pls_man_argoh.mp3 \
  84. - id_good_hey2.mp3 plm_bang_metal.mp3 pls_man_gulp_new.mp3 \
  85. - id_good_hmm.mp3 plm_book_pageturn.mp3 pls_man_oooh.mp3 \
  86. - id_good_huh.mp3 plm_bottle_clinks.mp3 pls_man_scream2.mp3 \
  87. - id_good_ooh.mp3 plm_break_canister.mp3 pls_man_sigh.mp3 \
  88. - id_good_ooo.mp3 plm_break_glass.mp3 pls_man_sniff.mp3 \
  89. - id_good_wow.mp3 plm_break_glass2.mp3 pls_man_sob.mp3 \
  90. - mco_attack_breath.mp3 plm_break_plates.mp3 pls_man_spit.mp3 \
  91. - mco_attack_spray.mp3 plm_break_shatter.mp3 pls_man_ugh.mp3 \
  92. - mco_bite_chew.mp3 plm_break_smash.mp3 pls_man_yell.mp3 \
  93. - mco_bite_chomp.mp3 plm_break_wood.mp3 pls_tone_blurk.mp3 \
  94. - mco_bite_dainty.mp3 plm_cabinet_open.mp3 pls_tone_clave6.mp3 \
  95. - mco_bite_gnash.mp3 plm_cabinet_shut.mp3 pls_tone_clavelo8.mp3 \
  96. - mco_bite_hard.mp3 plm_chain_light.mp3 pls_tone_conk.mp3 \
  97. - mco_bite_long.mp3 plm_chest_latch.mp3 pls_tone_elec.mp3 \
  98. - mco_bite_munch.mp3 plm_chest_unlatch.mp3 pls_tone_goblet.mp3 \
  99. - mco_bite_regular.mp3 plm_chimes_jangle.mp3 pls_tone_guiro.mp3 \
  100. - mco_bite_short.mp3 plm_click_dry.mp3 pls_tone_headstock.mp3 \
  101. - mco_bite_small.mp3 plm_click_switch.mp3 pls_tone_scrape.mp3 \
  102. - mco_bite_soft.mp3 plm_click_switch2.mp3 pls_tone_stick.mp3 \
  103. - mco_card_shuffle.mp3 plm_click_switch3.mp3 sto_bell_desk.mp3 \
  104. - mco_castanet_trill.mp3 plm_click_wood.mp3 sto_bell_ding.mp3 \
  105. - mco_ceramic_trill.mp3 plm_close_hatch.mp3 sto_bell_dingaling.mp3 \
  106. - mco_click_vibra.mp3 plm_coins_dump.mp3 sto_bell_jingles.mp3 \
  107. - mco_creature_choking.mp3 plm_coins_light.mp3 sto_bell_register1.mp3 \
  108. - mco_creature_groan.mp3 plm_coins_pour.mp3 sto_bell_register2.mp3 \
  109. - mco_creature_yelp.mp3 plm_coins_shake.mp3 sto_bell_ringing.mp3 \
  110. - mco_cuica_rubbing.mp3 plm_cork_pop.mp3 sto_bell_shop.mp3 \
  111. - mco_dino_low.mp3 plm_cork_squeak.mp3 sto_coins_countertop.mp3 \
  112. - mco_dino_slur.mp3 plm_door_bolt.mp3 sto_man_haha.mp3 \
  113. - mco_dino_talk.mp3 plm_door_creak.mp3 sto_man_hey.mp3 \
  114. - mco_dino_yawn.mp3 plm_door_creakshut.mp3 sto_man_whoohaha.mp3 \
  115. - mco_dub_wobble.mp3 plm_door_dungeon.mp3 sum_angel_song.mp3 \
  116. - mco_frog_trill.mp3 plm_door_echolock.mp3 sum_bell_crystal.mp3 \
  117. - mco_hit_whip.mp3 plm_door_entrance.mp3 sum_bell_hand.mp3 \
  118. - mco_howl_croak.mp3 plm_door_knob.mp3 sum_bell_tone.mp3 \
  119. - mco_howl_deep.mp3 plm_door_latch.mp3 sum_chime_jangle.mp3 \
  120. - mco_howl_distressed.mp3 plm_door_open.mp3 sum_ghost_moan.mp3 \
  121. - mco_howl_high.mp3 plm_door_opening.mp3 sum_ghost_oooo.mp3 \
  122. - mco_howl_long.mp3 plm_door_rusty.mp3 sum_ghost_wail.mp3 \
  123. - mco_liquid_squirt.mp3 plm_door_shut.mp3 sum_gong_temple.mp3 \
  124. - mco_man_mumble.mp3 plm_door_slam.mp3 sum_laugh_evil2.mp3 \
  125. - mco_mouse_squeaks.mp3 plm_door_squeaky.mp3 sum_lion_growl.mp3 \
  126. - mco_rubber_thud.mp3 plm_door_wooden.mp3 sum_piano_scrape.mp3
  127. -
  128. PACKAGE = sounds
  129. diff -Naurp1 a/lib/sounds/sound.cfg b/lib/sounds/sound.cfg
  130. --- a/lib/sounds/sound.cfg 2020-06-03 15:09:59.000000000 +0600
  131. +++ b/lib/sounds/sound.cfg 2020-10-27 21:51:56.324650167 +0600
  132. @@ -33,21 +33,21 @@
  133. # Town during the day.
  134. -ambient_day = amb_thunder_rain.mp3
  135. +ambient_day =
  136. # Town during the night.
  137. -ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3
  138. +ambient_nite =
  139. # Dungeon levels 1-20 (50'-1000')
  140. -ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3
  141. +ambient_dng1 =
  142. # Dungeon levels 21-40 (1050'-2000')
  143. -ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3
  144. +ambient_dng2 =
  145. # Dungeon levels 41-60 (2050'-3000')
  146. -ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3
  147. +ambient_dng3 =
  148. # Dungeon levels 61-80 (3050'-4000')
  149. -ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3
  150. +ambient_dng4 =
  151. # Dungeon levels 81 and beyond (4050'-)
  152. -ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3
  153. +ambient_dng5 =
  154. @@ -58,24 +58,24 @@ ambient_dng5 = amb_door_doom.mp3 amb_gon
  155. # The shopkeep bought a worthless item.
  156. -store1 = sto_man_hey.mp3
  157. +store1 =
  158. # The shopkeep paid too much for an item.
  159. -store2 = id_bad_dang.mp3
  160. +store2 =
  161. # The shopkeep got away with a good bargain.
  162. -store3 = sto_man_haha.mp3
  163. +store3 =
  164. # The shopkeep got away with a great bargain.
  165. -store4 = sto_man_whoohaha.mp3
  166. +store4 =
  167. # You make a normal transaction (buying or selling).
  168. -store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3
  169. +store5 =
  170. # You enter a store.
  171. -store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3
  172. +store_enter =
  173. # You enter your home.
  174. -store_home = plm_door_entrance.mp3
  175. +store_home =
  176. # You leave a store.
  177. -store_leave = plm_door_bolt.mp3
  178. +store_leave =
  179. @@ -86,33 +86,33 @@ store_leave = plm_door_bolt.mp3
  180. # You succeed in a melee attack against a monster.
  181. -hit = plc_hit_hay.mp3 plc_hit_body.mp3
  182. +hit =
  183. # It was a good hit!
  184. -hit_good = plc_hit_anvil.mp3
  185. +hit_good =
  186. # It was a great hit!
  187. -hit_great = plc_hit_groan.mp3
  188. +hit_great =
  189. # It was a superb hit!
  190. -hit_superb = plc_hit_grunt.mp3
  191. +hit_superb =
  192. # It was a *GREAT* hit!
  193. -hit_hi_great = plc_hit_grunt2.mp3
  194. +hit_hi_great =
  195. # It was a *SUPERB* hit!
  196. -hit_hi_superb = plc_hit_anvil2.mp3
  197. +hit_hi_superb =
  198. # You miss a melee attack against a monster.
  199. -miss = plc_miss_arrow2.mp3
  200. +miss =
  201. # You fire a missile.
  202. -shoot = plc_miss_arrow.mp3
  203. +shoot =
  204. # You hit something with a missile.
  205. -shoot_hit = plc_hit_arrow.mp3
  206. +shoot_hit =
  207. # You receive a hitpoint warning.
  208. -hitpoint_warn = plc_bell_warn.mp3
  209. +hitpoint_warn =
  210. # You die.
  211. -death = plc_die_laugh.mp3
  212. +death =
  213. @@ -123,81 +123,81 @@ death = plc_die_laugh.mp3
  214. # You become blind.
  215. -blind = pls_tone_conk.mp3
  216. +blind =
  217. # You become confused.
  218. -confused = pls_man_ugh.mp3
  219. +confused =
  220. # You become poisoned.
  221. -poisoned = pls_tone_guiro.mp3
  222. +poisoned =
  223. # You become afraid.
  224. -afraid = pls_man_yell.mp3
  225. +afraid =
  226. # You become paralyzed.
  227. -paralyzed = pls_man_gulp_new.mp3
  228. +paralyzed =
  229. # You feel drugged (chaos effects).
  230. -drugged = pls_breathe_in.mp3
  231. +drugged =
  232. # You become slower.
  233. -slow = pls_man_sigh.mp3
  234. +slow =
  235. # You become stunned.
  236. -stun = pls_bell_mute.mp3
  237. +stun =
  238. # You suffer a cut.
  239. -cut = pls_man_argoh.mp3
  240. +cut =
  241. # A stat is drained
  242. -drain_stat = pls_tone_headstock.mp3
  243. +drain_stat =
  244. # You recover from a condition (blind, confused, etc.)
  245. -recover = pls_bell_chime_new.mp3
  246. +recover =
  247. # You become faster.
  248. -speed = pls_bell_sustain.mp3
  249. +speed =
  250. # You attain a mystic shield.
  251. -shield = pls_bell_bowl.mp3
  252. +shield =
  253. # You become blessed.
  254. -blessed = sum_angel_song.mp3
  255. +blessed =
  256. # You feel heroic.
  257. -hero = pls_tone_goblet.mp3
  258. +hero =
  259. # You are bold.
  260. -bold = pls_bell_hibell_soft.mp3
  261. +bold =
  262. # You become berserk.
  263. -berserk = pls_man_scream2.mp3
  264. +berserk =
  265. # You feel protected from evil.
  266. -prot_evil = pls_bell_glass.mp3
  267. +prot_evil =
  268. # You feel invulnerable. (does any item/spell do this anymore?)
  269. -invuln = pls_tone_blurk.mp3
  270. +invuln =
  271. # You can see invisible things.
  272. -see_invis = pls_tone_clave6.mp3
  273. +see_invis =
  274. # You can see the infrared spectrum
  275. -infrared = pls_tone_clavelo8.mp3
  276. +infrared =
  277. # You become resistant to acid.
  278. -res_acid = pls_man_sniff.mp3
  279. +res_acid =
  280. # You become resistant to electricity.
  281. -res_elec = pls_tone_elec.mp3
  282. +res_elec =
  283. # You become resistant to fire.
  284. -res_fire = pls_tone_scrape.mp3
  285. +res_fire =
  286. # You become resistant to cold.
  287. -res_cold = pls_tone_stick.mp3
  288. +res_cold =
  289. # You become resistant to poison.
  290. -res_pois = pls_man_spit.mp3
  291. +res_pois =
  292. # You become hungry.
  293. -hungry = pls_man_sob.mp3
  294. +hungry =
  295. @@ -208,27 +208,27 @@ hungry = pls_man_sob.mp3
  296. # You pick up money worth less than 200 au.
  297. -money1 = plm_coins_light.mp3 plm_coins_shake.mp3
  298. +money1 =
  299. # You pick up money worth between 200 and 600 au.
  300. -money2 = plm_chain_light.mp3 plm_coins_pour.mp3
  301. +money2 =
  302. # You pick up money worth 600 au or more.
  303. -money3 = plm_coins_dump.mp3
  304. +money3 =
  305. # You (or a monster) drop something on the ground.
  306. -drop = plm_drop_boot.mp3
  307. +drop =
  308. # You gain (or regain) a level.
  309. -level = plm_levelup.mp3
  310. +level =
  311. # You successfully study a spell or prayer.
  312. -study = plm_book_pageturn.mp3
  313. +study =
  314. # You teleport or phase door.
  315. -teleport = plm_chimes_jangle.mp3
  316. +teleport =
  317. # You quaff a potion.
  318. -quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3
  319. +quaff =
  320. # You zap a rod.
  321. -zap_rod = plm_zap_rod.mp3
  322. +zap_rod =
  323. @@ -238,72 +238,72 @@ walk =
  324. # You teleport someone else away.
  325. -tpother = plm_chimes_jangle.mp3
  326. +tpother =
  327. # You bump into a wall or door.
  328. -hitwall = plm_wood_thud.mp3
  329. +hitwall =
  330. # You eat something.
  331. -eat = plm_eat_bite.mp3
  332. +eat =
  333. # You successfully dig through something.
  334. -dig = plm_metal_clank.mp3
  335. +dig =
  336. # You open a door.
  337. -opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3
  338. +opendoor =
  339. # You shut a door.
  340. -shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3
  341. +shutdoor =
  342. # You teleport from a level (including via recall).
  343. -tplevel = sum_bell_crystal.mp3
  344. +tplevel =
  345. # Default "bell" sound for system messages.
  346. -bell = plm_jar_ding.mp3
  347. +bell =
  348. # You try to open something that's not a door.
  349. -nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3
  350. +nothing_to_open =
  351. # You fail to pick a lock.
  352. -lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3
  353. +lockpick_fail =
  354. # You pick a lock.
  355. -lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3
  356. +lockpick =
  357. # You disarm a trap.
  358. -disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3
  359. +disarm =
  360. # You go up stairs.
  361. -stairs_up = plm_floor_creak2.mp3
  362. +stairs_up =
  363. # You go down stairs.
  364. -stairs_down = plm_floor_creak.mp3
  365. +stairs_down =
  366. # You activate an artifact.
  367. -act_artifact = plm_aim_wand.mp3
  368. +act_artifact =
  369. # You use a staff.
  370. -use_staff = plm_use_staff.mp3
  371. +use_staff =
  372. # An object is destroyed.
  373. -destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3
  374. +destroy =
  375. # You wield or take off something.
  376. -wield = plm_metal_sharpen.mp3
  377. +wield =
  378. # You take something in or out of your quiver.
  379. -quiver = plc_miss_swish.mp3
  380. +quiver =
  381. # You wield a cursed item.
  382. -cursed = pls_man_oooh.mp3
  383. +cursed =
  384. # You notice something (generic notice)
  385. -notice = id_bad_hmm.mp3
  386. +notice =
  387. # You learn a rune.
  388. -rune = id_good_hmm.mp3
  389. +rune =
  390. # You successfully cast a spell.
  391. -cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3
  392. +cast_spell =
  393. # You successfully pray a prayer.
  394. -pray_prayer = sum_angel_song.mp3
  395. +pray_prayer =
  396. @@ -314,81 +314,81 @@ pray_prayer = sum_angel_song.mp3
  397. # A monster flees in terror.
  398. -flee = mco_creature_yelp.mp3
  399. +flee =
  400. # A monster is killed.
  401. -kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3
  402. +kill =
  403. # A unique is killed.
  404. -kill_unique = sum_ghost_wail.mp3
  405. +kill_unique =
  406. # Morgoth, Lord of Darkness is killed.
  407. -kill_king = amb_guitar_chord.mp3
  408. +kill_king =
  409. # Attack - hit
  410. -mon_hit = mco_hit_whip.mp3
  411. +mon_hit =
  412. # Attack - touch
  413. -mon_touch = mco_click_vibra.mp3
  414. +mon_touch =
  415. # Attack - punch
  416. -mon_punch = mco_squish_snap.mp3
  417. +mon_punch =
  418. # Attack - kick
  419. -mon_kick = mco_rubber_thud.mp3
  420. +mon_kick =
  421. # Attack - claw
  422. -mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3
  423. +mon_claw =
  424. # Attack - bite
  425. -mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3 mco_bite_munch.mp3 mco_bite_long.mp3 mco_bite_short.mp3 mco_bite_gnash.mp3 mco_bite_chomp.mp3 mco_bite_regular.mp3 mco_bite_small.mp3 mco_bite_dainty.mp3 mco_bite_hard.mp3 mco_bite_chew.mp3
  426. +mon_bite =
  427. # Attack - sting
  428. -mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3
  429. +mon_sting =
  430. # Attack - butt
  431. -mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3
  432. +mon_butt =
  433. # Attack - crush
  434. -mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3
  435. +mon_crush =
  436. # Attack - engulf
  437. -mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3
  438. +mon_engulf =
  439. # Attack - crawl
  440. -mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3
  441. +mon_crawl =
  442. # Attack - drool
  443. -mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3
  444. +mon_drool =
  445. # Attack - spit
  446. -mon_spit = mco_attack_spray.mp3
  447. +mon_spit =
  448. # Attack - gaze
  449. -mon_gaze = mco_thoing_backwards.mp3
  450. +mon_gaze =
  451. # Attack - wail
  452. -mon_wail = mco_dino_low.mp3
  453. +mon_wail =
  454. # Attack - release spores
  455. -mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3
  456. +mon_spore =
  457. # Attack - beg for money
  458. -mon_beg = mco_man_mumble.mp3
  459. +mon_beg =
  460. # Attack - insult
  461. -mon_insult = mco_strange_thwoink.mp3
  462. +mon_insult =
  463. # Attack - moan
  464. -mon_moan = mco_strange_music.mp3
  465. +mon_moan =
  466. # Attack - shriek
  467. -mon_shriek = mco_mouse_squeaks.mp3
  468. +mon_shriek =
  469. # Spell - create traps
  470. -mon_create_trap = mco_thoing_deep.mp3
  471. +mon_create_trap =
  472. # Spell - cause fear
  473. -mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3
  474. +mon_cast_fear =
  475. # Multiply (breed explosively)
  476. -multiply = mco_frog_trill.mp3
  477. +multiply =
  478. @@ -399,42 +399,42 @@ multiply = mco_frog_trill.mp3
  479. # Summon one or more monsters.
  480. -summon_monster = sum_chime_jangle.mp3
  481. +summon_monster =
  482. # Summon angels.
  483. -summon_ainu = sum_angel_song.mp3
  484. +summon_ainu =
  485. # Summon undead.
  486. -summon_undead = sum_ghost_oooo.mp3
  487. +summon_undead =
  488. # Summon animals.
  489. -summon_animal = sum_lion_growl.mp3
  490. +summon_animal =
  491. # Summon spiders.
  492. -summon_spider = sum_piano_scrape.mp3
  493. +summon_spider =
  494. # Summon hounds.
  495. -summon_hound = sum_lion_growl.mp3
  496. +summon_hound =
  497. # Summon hydras.
  498. -summon_hydra = sum_piano_scrape.mp3
  499. +summon_hydra =
  500. # Summon demons.
  501. -summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3
  502. +summon_demon =
  503. # Summon dragon.
  504. -summon_dragon = sum_piano_scrape.mp3
  505. +summon_dragon =
  506. # Summon greater undead.
  507. -summon_gr_undead = sum_ghost_moan.mp3
  508. +summon_gr_undead =
  509. # Summon greater dragons.
  510. -summon_gr_dragon = sum_gong_temple.mp3
  511. +summon_gr_dragon =
  512. # Summon greater demons.
  513. -summon_gr_demon = sum_ghost_moan.mp3
  514. +summon_gr_demon =
  515. # Summon Ringwraiths.
  516. -summon_ringwraith = sum_bell_hand.mp3
  517. +summon_ringwraith =
  518. # Summon uniques.
  519. -summon_unique = sum_bell_tone.mp3
  520. +summon_unique =
  521. @@ -445,57 +445,57 @@ summon_unique = sum_bell_tone.mp3
  522. # Breathe frost.
  523. -breathe_frost = mco_attack_breath.mp3
  524. +breathe_frost =
  525. # Breathe electricity.
  526. -breathe_elec = mco_attack_breath.mp3
  527. +breathe_elec =
  528. # Breathe acid.
  529. -breathe_acid = mco_attack_breath.mp3
  530. +breathe_acid =
  531. # Breathe gas.
  532. -breathe_gas = mco_attack_breath.mp3
  533. +breathe_gas =
  534. # Breathe fire.
  535. -breathe_fire = mco_attack_breath.mp3
  536. +breathe_fire =
  537. # Breathe disenchantment.
  538. -breathe_disenchant = mco_attack_breath.mp3
  539. +breathe_disenchant =
  540. # Breathe chaos.
  541. -breathe_chaos = mco_attack_breath.mp3
  542. +breathe_chaos =
  543. # Breathe shards.
  544. -breathe_shards = mco_attack_breath.mp3
  545. +breathe_shards =
  546. # Breathe sound.
  547. -breathe_sound = mco_attack_breath.mp3
  548. +breathe_sound =
  549. # Breathe light.
  550. -breathe_light = mco_attack_breath.mp3
  551. +breathe_light =
  552. # Breathe darkness.
  553. -breathe_dark = mco_attack_breath.mp3
  554. +breathe_dark =
  555. # Breathe nether.
  556. -breathe_nether = mco_attack_breath.mp3
  557. +breathe_nether =
  558. # Breathe nexus.
  559. -breathe_nexus = mco_attack_breath.mp3
  560. +breathe_nexus =
  561. # Breathe time.
  562. -breathe_time = mco_attack_breath.mp3
  563. +breathe_time =
  564. # Breathe inertia.
  565. -breathe_inertia = mco_attack_breath.mp3
  566. +breathe_inertia =
  567. # Breathe gravity.
  568. -breathe_gravity = mco_attack_breath.mp3
  569. +breathe_gravity =
  570. # Breathe plasma.
  571. -breathe_plasma = mco_attack_breath.mp3
  572. +breathe_plasma =
  573. # Breathe force.
  574. -breathe_force = mco_attack_breath.mp3
  575. +breathe_force =
  576. # Breathe the elements (power dragon scale mail).
  577. -breathe_elements = mco_attack_breath.mp3
  578. +breathe_elements =
  579. @@ -506,9 +506,9 @@ breathe_elements = mco_attack_breath.mp3
  580. # Identify a bad item (including bad ego items and artifacts).
  581. -identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3
  582. +identify_bad =
  583. # Identify a good ego item.
  584. -identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3
  585. +identify_ego =
  586. # Identify a good artifact.
  587. -identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3
  588. +identify_art =
  589. diff -Naurp1 a/lib/tiles/list.txt b/lib/tiles/list.txt
  590. --- a/lib/tiles/list.txt 2020-06-03 15:09:59.000000000 +0600
  591. +++ b/lib/tiles/list.txt 2020-10-27 21:40:40.031681565 +0600
  592. @@ -56,13 +56 @@ pref:graf-nmd.prf
  593. extra:0:0:0
  594. -
  595. -name:5:Shockbolt Dark
  596. -directory:shockbolt
  597. -size:64:64:64x64.png
  598. -pref:graf-shb-dark.prf
  599. -extra:1:29:31
  600. -
  601. -name:6:Shockbolt Light
  602. -directory:shockbolt
  603. -size:64:64:64x64.png
  604. -pref:graf-shb-light.prf
  605. -extra:1:29:31
  606. diff -Naurp1 a/lib/tiles/shockbolt/Makefile b/lib/tiles/shockbolt/Makefile
  607. --- a/lib/tiles/shockbolt/Makefile 2020-06-03 15:09:59.000000000 +0600
  608. +++ b/lib/tiles/shockbolt/Makefile 2020-10-27 21:53:25.158646042 +0600
  609. @@ -3,3 +3,3 @@ include $(MKPATH)buildsys.mk
  610. -DATA = 64x64.png flvr-shb.prf graf-shb-dark.prf graf-shb-light.prf \
  611. +DATA = flvr-shb.prf \
  612. xtra-shb.prf
  613. diff -Naurp1 a/scripts/pkg_deb b/scripts/pkg_deb
  614. --- a/scripts/pkg_deb 2020-06-03 15:09:59.000000000 +0600
  615. +++ b/scripts/pkg_deb 2020-10-27 21:37:11.802691233 +0600
  616. @@ -39,3 +39,3 @@ git checkout-index --prefix=$TAG1/ -a &&
  617. cd .. &&
  618. - tar --exclude .gitignore --exclude *.dll --exclude *.mp3 --exclude lib/tiles/shockbolt/64x64.png -czvf ../$OUT $TAG1 &&
  619. + tar --exclude .gitignore --exclude *.dll --exclude *.mp3 -czvf ../$OUT $TAG1 &&
  620. rm -rf $TAG1
  621. diff -Naurp1 a/scripts/pkg_win b/scripts/pkg_win
  622. --- a/scripts/pkg_win 2020-06-03 15:09:59.000000000 +0600
  623. +++ b/scripts/pkg_win 2020-10-27 21:37:35.008690155 +0600
  624. @@ -46,3 +46,2 @@ mkdir lib/tiles/nomad
  625. mkdir lib/tiles/old
  626. -mkdir lib/tiles/shockbolt
  627. mkdir lib/sounds
  628. @@ -80,3 +79,2 @@ cp ../lib/tiles/nomad/* lib/tiles/nomad
  629. cp ../lib/tiles/old/* lib/tiles/old
  630. -cp ../lib/tiles/shockbolt/* lib/tiles/shockbolt
  631. rm lib/tiles/*/Makefile
  632. diff -Naurp1 a/src/main-cocoa.m b/src/main-cocoa.m
  633. --- a/src/main-cocoa.m 2020-06-03 15:09:59.000000000 +0600
  634. +++ b/src/main-cocoa.m 2020-10-27 21:32:47.856703487 +0600
  635. @@ -366,3 +366,3 @@ static __strong AngbandSoundCatalog* gSh
  636. * that tiles do not overlap with each other (excepting the double-height
  637. - * tiles, i.e. from the Shockbolt set; that's handled as a special case).
  638. + * tiles, that's handled as a special case).
  639. * Characters can overlap horizontally: that is for handling fonts that
  640. diff -Naurp1 a/src/main-sdl2.c b/src/main-sdl2.c
  641. --- a/src/main-sdl2.c 2020-06-03 15:09:59.000000000 +0600
  642. +++ b/src/main-sdl2.c 2020-10-27 21:35:28.385696034 +0600
  643. @@ -169,3 +169,3 @@
  644. -/* shockbolt's tiles are 64x64; dungeon is 198 tiles long;
  645. +/* dungeon is 198 tiles long;
  646. * 64 * 198 is 12672 which is bigger than any possible texture! */
  647. diff -Naurp1 a/src/win/vs2019/Angband.vcxproj b/src/win/vs2019/Angband.vcxproj
  648. --- a/src/win/vs2019/Angband.vcxproj 2020-06-03 15:09:59.000000000 +0600
  649. +++ b/src/win/vs2019/Angband.vcxproj 2020-10-27 21:34:10.650699643 +0600
  650. @@ -488,3 +488,2 @@ xcopy $(MSBuildProjectDirectory)\lib\* $
  651. <Image Include="lib\tiles\old\8x8.png" />
  652. - <Image Include="lib\tiles\shockbolt\64x64.png" />
  653. <Image Include="src\win\angband.ico" />
  654. @@ -541,5 +540,2 @@ xcopy $(MSBuildProjectDirectory)\lib\* $
  655. <None Include="lib\tiles\old\xtra-xxx.prf" />
  656. - <None Include="lib\tiles\shockbolt\flvr-shb.prf" />
  657. - <None Include="lib\tiles\shockbolt\graf-shb.prf" />
  658. - <None Include="lib\tiles\shockbolt\xtra-shb.prf" />
  659. </ItemGroup>
  660. diff -Naurp1 a/src/win/vs2019/Angband.vcxproj.filters b/src/win/vs2019/Angband.vcxproj.filters
  661. --- a/src/win/vs2019/Angband.vcxproj.filters 2020-06-03 15:09:59.000000000 +0600
  662. +++ b/src/win/vs2019/Angband.vcxproj.filters 2020-10-27 21:34:41.305698220 +0600
  663. @@ -39,5 +39,2 @@
  664. </Filter>
  665. - <Filter Include="Resource Files\tiles\shockbolt">
  666. - <UniqueIdentifier>{17f9ff36-5291-48d6-ab97-aa69c0796699}</UniqueIdentifier>
  667. - </Filter>
  668. <Filter Include="Resource Files\tiles\old">
  669. @@ -1017,5 +1014,2 @@
  670. </Image>
  671. - <Image Include="lib\tiles\shockbolt\64x64.png">
  672. - <Filter>Resource Files\tiles\shockbolt</Filter>
  673. - </Image>
  674. </ItemGroup>
  675. @@ -1165,11 +1159,2 @@
  676. </None>
  677. - <None Include="lib\tiles\shockbolt\flvr-shb.prf">
  678. - <Filter>Resource Files\tiles\shockbolt</Filter>
  679. - </None>
  680. - <None Include="lib\tiles\shockbolt\graf-shb.prf">
  681. - <Filter>Resource Files\tiles\shockbolt</Filter>
  682. - </None>
  683. - <None Include="lib\tiles\shockbolt\xtra-shb.prf">
  684. - <Filter>Resource Files\tiles\shockbolt</Filter>
  685. - </None>
  686. </ItemGroup>