API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 6th, 2017
494
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 15.58 KB | None | 0 0
raw download clone embed print report
  1. diff -crB Catacompare/crafting.cpp BetterHomesAndGardens/crafting.cpp
  2. *** Catacompare/crafting.cpp 2011-08-21 15:34:02.000000000 -0400
  3. --- BetterHomesAndGardens/crafting.cpp 2011-08-21 18:18:44.000000000 -0400
  4. ***************
  5. *** 562,567 ****
  6. --- 561,574 ----
  7. COMP(itm_power_supply, 1, NULL);
  8. COMP(itm_battery, 500, itm_plut_cell, 1, NULL);
  9.  
  10. + //GlyphGryph's Recipes
  11. + RECIPE(itm_torch, CC_MISC, sk_null, sk_null, 0, 600);
  12. + COMP(itm_rag, 2, NULL);
  13. + COMP(itm_whiskey, 1, itm_vodka, 1, itm_rum, 1, itm_tequila, 1,
  14. + itm_gasoline, 1, NULL);
  15. + COMP(itm_2x4, 1, itm_bat, 1, itm_stick, 1, itm_mop, 1, NULL);
  16. + //End GlyphGryph's Recipes
  17. +
  18. }
  19.  
  20. void game::craft()
  21. diff -crB Catacompare/game.cpp BetterHomesAndGardens/game.cpp
  22. *** Catacompare/game.cpp 2011-08-21 15:34:02.000000000 -0400
  23. --- BetterHomesAndGardens/game.cpp 2011-08-21 17:33:58.000000000 -0400
  24. ***************
  25. *** 1983,1990 ****
  26. --- 1983,1998 ----
  27. if (ret > 10)
  28. ret = 10;
  29. }
  30. + int torch = u.active_item_charges(itm_lit_torch);
  31. + if (ret < 10 && torch > 0){
  32. + ret = torch/10-rand()%3;
  33. + if (ret > 10){
  34. + ret = 10;
  35. + }
  36. + }
  37. if (ret < 8 && u.has_active_bionic(bio_flashlight))
  38. ret = 8;
  39. + if (ret < 1) ret = 1;
  40. return ret;
  41. }
  42.  
  43. diff -crB Catacompare/.git/logs/HEAD BetterHomesAndGardens/.git/logs/HEAD
  44. *** Catacompare/.git/logs/HEAD 2011-08-21 15:34:02.000000000 -0400
  45. --- BetterHomesAndGardens/.git/logs/HEAD 2011-08-21 15:39:59.000000000 -0400
  46. ***************
  47. *** 1 ****
  48. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955242 -0400 clone: from git://github.com/Whales/Cataclysm
  49. --- 1 ----
  50. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955599 -0400 clone: from git://github.com/Whales/Cataclysm
  51. diff -crB Catacompare/.git/logs/refs/heads/master BetterHomesAndGardens/.git/logs/refs/heads/master
  52. *** Catacompare/.git/logs/refs/heads/master 2011-08-21 15:34:02.000000000 -0400
  53. --- BetterHomesAndGardens/.git/logs/refs/heads/master 2011-08-21 15:39:59.000000000 -0400
  54. ***************
  55. *** 1 ****
  56. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955242 -0400 clone: from git://github.com/Whales/Cataclysm
  57. --- 1 ----
  58. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955599 -0400 clone: from git://github.com/Whales/Cataclysm
  59. diff -crB Catacompare/.git/logs/refs/remotes/origin/HEAD BetterHomesAndGardens/.git/logs/refs/remotes/origin/HEAD
  60. *** Catacompare/.git/logs/refs/remotes/origin/HEAD 2011-08-21 15:34:02.000000000 -0400
  61. --- BetterHomesAndGardens/.git/logs/refs/remotes/origin/HEAD 2011-08-21 15:39:59.000000000 -0400
  62. ***************
  63. *** 1 ****
  64. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955242 -0400 clone: from git://github.com/Whales/Cataclysm
  65. --- 1 ----
  66. ! 0000000000000000000000000000000000000000 61b9e024ba13e078f87489e5c369aa5688b20f6f Kevin McKayven <glyphgryph@gmail.com> 1313955599 -0400 clone: from git://github.com/Whales/Cataclysm
  67. diff -crB Catacompare/itypedef.cpp BetterHomesAndGardens/itypedef.cpp
  68. *** Catacompare/itypedef.cpp 2011-08-21 15:34:02.000000000 -0400
  69. --- BetterHomesAndGardens/itypedef.cpp 2011-08-22 01:23:40.000000000 -0400
  70. ***************
  71. *** 651,657 ****
  72. for throwing at enemies.");
  73.  
  74. MELEE("heavy stick", 95, 0, '/', c_brown, WOOD, MNULL,
  75. ! 6, 10, 12, 0, 3, 0, "\
  76. A sturdy, heavy stick. Makes a decent melee weapon, and can be cut into two\n\
  77. by fours for crafting.");
  78.  
  79. --- 651,657 ----
  80. for throwing at enemies.");
  81.  
  82. MELEE("heavy stick", 95, 0, '/', c_brown, WOOD, MNULL,
  83. ! 6, 10, 12, 0, 1, 0, "\
  84. A sturdy, heavy stick. Makes a decent melee weapon, and can be cut into two\n\
  85. by fours for crafting.");
  86.  
  87. ***************
  88. *** 664,670 ****
  89. An unwieldy mop. Essentially useless.");
  90.  
  91. MELEE("screwdriver", 40, 65, ';', c_ltcyan, IRON, PLASTIC,
  92. ! 1, 1, 2, 8, 1, mfb(IF_SPEAR), "\
  93. A Philips-head screwdriver, important for almost all electronics crafting and\n\
  94. most mechanics crafting.");
  95.  
  96. --- 664,670 ----
  97. An unwieldy mop. Essentially useless.");
  98.  
  99. MELEE("screwdriver", 40, 65, ';', c_ltcyan, IRON, PLASTIC,
  100. ! 1, 1, 2, 8, -4, mfb(IF_SPEAR), "\
  101. A Philips-head screwdriver, important for almost all electronics crafting and\n\
  102. most mechanics crafting.");
  103.  
  104. ***************
  105. *** 802,810 ****
  106.  
  107. MELEE("gold bar", 10,3000,'/', c_yellow, STEEL, MNULL,
  108. 2, 60, 14, 0, -1, 0, "\
  109. ! A large bar of gold. Before the apocalypse, this wouldn't been worth a small\n\
  110. fortune; now its value is greatly diminished.");
  111.  
  112. // ARMOR
  113. #define ARMOR(name,rarity,price,color,mat1,mat2,volume,wgt,dam,to_hit,\
  114. encumber,dmg_resist,cut_resist,env,warmth,storage,covers,des)\
  115. --- 802,847 ----
  116.  
  117. MELEE("gold bar", 10,3000,'/', c_yellow, STEEL, MNULL,
  118. 2, 60, 14, 0, -1, 0, "\
  119. ! A large bar of gold. Before the apocalypse, this would have been worth a small\n\
  120. fortune; now its value is greatly diminished.");
  121.  
  122. + //GlyphGryph's Additions
  123. + MELEE("chair", 93, 15,'h', c_brown, WOOD, MNULL,
  124. + 90, 15, 20, 4, -3, mfb(IF_SPEAR), "\
  125. + A fairly sturdy four-legged wooden chair. Slow and unwiedly,\n\
  126. + but decent damage.");
  127. +
  128. + MELEE("burnt torch", 0, 10,';', c_brown, WOOD, MNULL,
  129. + 5, 5, 12, 0, 2, 0, "\
  130. + This is a burn-out torch. Useful as a club, maybe, but not much else.");
  131. +
  132. + MELEE("weight plate", 110, 15,'o', c_green, IRON, MNULL,
  133. + 16, 40, 44, 0, -5, 0, "\
  134. + This plate is big, heavy, and unwieldy. You could probably do a lot of damage\n\
  135. + if you hit something with it though.");
  136. +
  137. + MELEE("barbell", 80, 10,'/', c_green, STEEL, MNULL,
  138. + 16, 25, 32, 0, 3, 0, "\
  139. + A metal bar. It is heavy and quite sturdy. Built in grips to prevent slippage.");
  140. +
  141. + MELEE("dumbell", 90, 10,'H', c_green, STEEL, MNULL,
  142. + 5, 16, 22, 0, -2, 0, "\
  143. + A relatively hefty hand weight.");
  144. +
  145. + MELEE("cymbal", 50, 9,'o', c_yellow, STEEL, MNULL,
  146. + 10, 6, 6, 2, -2, mfb(IF_LOUD), "\
  147. + A thin plate of metal intended for use with a drumset. Makes a pleasant sound when run over a\n\
  148. + zombies head. Hard to keep a good grip on it, though.");
  149. +
  150. + MELEE("drumsticks", 50, 5,'/', c_yellow, WOOD, MNULL,
  151. + 2, 1, 6, 2, -2, 0, "\
  152. + A pair of small wooden stick. These aren't really built to be weapons, but you could probably do\n\
  153. + some damage by whacking someone in the head or shoving it an eye, though.");
  154. +
  155. + MELEE("guitar", 8, 10,'H', c_green, WOOD, MNULL,
  156. + 18, 6, 26, 0, 1, mfb(IF_LOUD), "\
  157. + A six-stringed musical instrument.");
  158. +
  159. // ARMOR
  160. #define ARMOR(name,rarity,price,color,mat1,mat2,volume,wgt,dam,to_hit,\
  161. encumber,dmg_resist,cut_resist,env,warmth,storage,covers,des)\
  162. ***************
  163. *** 2302,2307 ****
  164. --- 2339,2362 ----
  165. color,mat1,mat2,volume,wgt,melee_dam,melee_cut,to_hit,flags,max_charge,\
  166. def_charge,charge_per_use,charge_per_sec,fuel,revert,func))
  167.  
  168. + //GlyphGryphs Additions
  169. + // NAME RAR PRC SYM COLOR MAT1 MAT
  170. + TOOL("sewing machine", 5,300, 'm', c_red, PLASTIC,IRON,
  171. + // VOL WGT DAM CUT HIT MAX DEF USE SEC FUEL REVERT FUNCTION
  172. + 36, 60, 4, 0, -4, 500,200, 10, 0, AT_BATT, itm_null, &iuse::sew, 0, "\
  173. + This sewing machine is large, heavy, and battery powered. It comes with all the trimmings, and has enough extra thread and needles to last as long as you can keep it powered.");
  174. +
  175. + TOOL("torch", 0, 30,';', c_blue, WOOD, COTTON,
  176. + 5, 5, 9, 0, 2, 100,100, 0, 0, AT_NULL, itm_null, &iuse::light_torch,0,"\
  177. + This is an unlit torch.");
  178. +
  179. + TOOL("lit torch", 0, 30,';', c_blue, WOOD, COTTON,
  180. + 5, 5, 9, 0, 2, 100,100, 0, 12, AT_NULL, itm_torch, &iuse::douse_torch,mfb(IF_FLAMING),
  181. + "This torch burns steadily, giving off a good amount of light.");
  182. +
  183. + //End GlyphGryph's Additions
  184. +
  185. +
  186. // NAME RAR PRC SYM COLOR MAT1 MAT
  187. TOOL("lighter", 60, 35,',', c_blue, PLASTIC,IRON,
  188. // VOL WGT DAM CUT HIT MAX DEF USE SEC FUEL REVERT FUNCTION
  189. diff -crB Catacompare/itype.h BetterHomesAndGardens/itype.h
  190. *** Catacompare/itype.h 2011-08-21 15:34:02.000000000 -0400
  191. --- BetterHomesAndGardens/itype.h 2011-08-21 23:24:19.000000000 -0400
  192. ***************
  193. *** 55,60 ****
  194. --- 55,62 ----
  195. itm_knife_combat, itm_2x4, itm_muffler, itm_pipe, itm_bat, itm_machete,
  196. itm_katana, itm_spear_wood, itm_spear_knife, itm_baton, itm_bee_sting,
  197. itm_wasp_sting, itm_chitin_piece, itm_canister_empty, itm_gold,
  198. + //GlyphGryph's added stuff
  199. + itm_chair, itm_burnt_torch, itm_weight_plate, itm_barbell, itm_dumbell, itm_cymbal, itm_drumsticks, itm_guitar,
  200. // Footwear
  201. itm_sneakers, itm_boots, itm_boots_steel, itm_boots_winter, itm_mocassins,
  202. itm_flip_flops, itm_dress_shoes, itm_heels,
  203. ***************
  204. *** 121,127 ****
  205. itm_bag_plastic, itm_bottle_plastic, itm_bottle_glass,
  206. itm_can_drink, itm_can_food, itm_box_small,
  207. // Tools
  208. ! itm_lighter, itm_sewing_kit, itm_scissors, itm_hammer, itm_extinguisher,
  209. itm_flashlight, itm_flashlight_on, itm_hotplate, itm_soldering_iron,
  210. itm_water_purifier, itm_two_way_radio, itm_radio, itm_radio_on, itm_crowbar,
  211. itm_hoe, itm_shovel, itm_chainsaw_off, itm_chainsaw_on, itm_jackhammer,
  212. --- 123,132 ----
  213. itm_bag_plastic, itm_bottle_plastic, itm_bottle_glass,
  214. itm_can_drink, itm_can_food, itm_box_small,
  215. // Tools
  216. ! //GlyphGryph's Addition
  217. ! itm_sew_mach, itm_torch, itm_lit_torch,
  218. ! //End GlyphGryph's Addition
  219. ! itm_lighter, itm_sewing_kit, itm_scissors, itm_hammer, itm_extinguisher,
  220. itm_flashlight, itm_flashlight_on, itm_hotplate, itm_soldering_iron,
  221. itm_water_purifier, itm_two_way_radio, itm_radio, itm_radio_on, itm_crowbar,
  222. itm_hoe, itm_shovel, itm_chainsaw_off, itm_chainsaw_on, itm_jackhammer,
  223. ***************
  224. *** 179,184 ****
  225. --- 184,192 ----
  226. IF_MESSY, // Splatters blood, etc.
  227. IF_RELOAD_ONE, // Reload cartridge by cartridge (e.g. most shotguns)
  228. IF_STR_RELOAD, // Reloading time is reduced by Strength * 20
  229. + IF_LOUD, // This object makes a loud noise when striking things (not yet implemented)
  230. + IF_BALANCED, // This object is well balanced for fighting, allowing for faster strikes than its size and weight would imply.
  231. + IF_FLAMING, // This item is on fire and will light things it hits on fire as well.
  232.  
  233. IF_AMMO_FLAME, // Sets fire to terrain and monsters
  234. IF_AMMO_INCENDIARY, // Sparks explosive terrain
  235. diff -crB Catacompare/iuse.cpp BetterHomesAndGardens/iuse.cpp
  236. *** Catacompare/iuse.cpp 2011-08-21 15:34:02.000000000 -0400
  237. --- BetterHomesAndGardens/iuse.cpp 2011-08-21 15:45:57.000000000 -0400
  238. ***************
  239. *** 924,929 ****
  240. --- 924,953 ----
  241. }
  242. }
  243.  
  244. + void iuse::light_torch(game *g, player *p, item *it, bool t)
  245. + {
  246. + if (!p->has_amount(itm_lighter, 1)) {
  247. + g->add_msg("You need a lighter!");
  248. + return;
  249. + }
  250. + p->use_up(itm_lighter, 1);
  251. + g->add_msg("You light the torch.");
  252. + p->moves -= 150;
  253. + it->make(g->itypes[itm_lit_torch]);
  254. + it->active = true;
  255. + }
  256. +
  257. + void iuse::douse_torch(game *g, player *p, item *it, bool t)
  258. + {
  259. + if (t) {
  260. + } else {
  261. + g->add_msg("Your torch sputters and goes out.");
  262. + it->make(g->itypes[itm_torch]);
  263. + it->active = false;
  264. + }
  265. + }
  266. +
  267. +
  268. void iuse::water_purifier(game *g, player *p, item *it, bool t)
  269. {
  270. char ch = g->inv("Purify what?");
  271. diff -crB Catacompare/iuse.h BetterHomesAndGardens/iuse.h
  272. *** Catacompare/iuse.h 2011-08-21 15:34:02.000000000 -0400
  273. --- BetterHomesAndGardens/iuse.h 2011-08-21 15:46:56.000000000 -0400
  274. ***************
  275. *** 46,51 ****
  276. --- 46,55 ----
  277. void hammer (game *g, player *p, item *it, bool t);
  278. void light_off (game *g, player *p, item *it, bool t);
  279. void light_on (game *g, player *p, item *it, bool t);
  280. + //GlyphGryph's Additions
  281. + void light_torch (game *g, player *p, item *it, bool t);
  282. + void douse_torch (game *g, player *p, item *it, bool t);
  283. + //End GlyphGryph's Additions
  284. void water_purifier (game *g, player *p, item *it, bool t);
  285. void two_way_radio (game *g, player *p, item *it, bool t);
  286. void radio_off (game *g, player *p, item *it, bool t);
  287. diff -crB Catacompare/mapitemsdef.cpp BetterHomesAndGardens/mapitemsdef.cpp
  288. *** Catacompare/mapitemsdef.cpp 2011-08-21 15:34:02.000000000 -0400
  289. --- BetterHomesAndGardens/mapitemsdef.cpp 2011-08-22 00:03:24.000000000 -0400
  290. ***************
  291. *** 37,49 ****
  292. itm_gloves_winter, itm_gloves_leather, itm_gloves_fingerless,
  293. itm_bandana, itm_scarf, itm_hat_cotton, itm_hat_knit, itm_hat_fur,
  294. itm_helmet_bike, itm_helmet_motor, itm_mag_tv, itm_mag_news,
  295. ! itm_lighter, itm_extinguisher, itm_mp3, NULL);
  296.  
  297. setvector(
  298. mapitems[mi_kitchen],
  299. itm_pot, itm_pan, itm_knife_butter, itm_knife_steak, itm_knife_butcher,
  300. itm_cookbook, itm_rag, itm_hotplate, itm_flashlight, itm_extinguisher,
  301. ! itm_whiskey, itm_bleach, itm_ammonia, itm_flour, itm_sugar, itm_salt,
  302. NULL);
  303.  
  304. setvector(
  305. --- 37,49 ----
  306. itm_gloves_winter, itm_gloves_leather, itm_gloves_fingerless,
  307. itm_bandana, itm_scarf, itm_hat_cotton, itm_hat_knit, itm_hat_fur,
  308. itm_helmet_bike, itm_helmet_motor, itm_mag_tv, itm_mag_news,
  309. ! itm_lighter, itm_extinguisher, itm_mp3, itm_chair, itm_sew_mach, NULL);
  310.  
  311. setvector(
  312. mapitems[mi_kitchen],
  313. itm_pot, itm_pan, itm_knife_butter, itm_knife_steak, itm_knife_butcher,
  314. itm_cookbook, itm_rag, itm_hotplate, itm_flashlight, itm_extinguisher,
  315. ! itm_whiskey, itm_bleach, itm_ammonia, itm_flour, itm_sugar, itm_salt, itm_chair,
  316. NULL);
  317.  
  318. setvector(
  319. ***************
  320. *** 60,66 ****
  321. itm_hacksaw, itm_xacto, itm_gloves_leather, itm_mask_dust,
  322. itm_glasses_safety, itm_battery, itm_nail, itm_nailgun,
  323. itm_manual_mechanics, itm_hammer, itm_flashlight, itm_soldering_iron,
  324. ! itm_bubblewrap, NULL);
  325.  
  326. setvector(
  327. mapitems[mi_bedroom],
  328. --- 60,66 ----
  329. itm_hacksaw, itm_xacto, itm_gloves_leather, itm_mask_dust,
  330. itm_glasses_safety, itm_battery, itm_nail, itm_nailgun,
  331. itm_manual_mechanics, itm_hammer, itm_flashlight, itm_soldering_iron,
  332. ! itm_bubblewrap, itm_sew_mach, NULL);
  333.  
  334. setvector(
  335. mapitems[mi_bedroom],
  336. ***************
  337. *** 531,536 ****
  338. --- 531,545 ----
  339. mapitems[mi_stash_drugs],
  340. itm_pills_sleep, itm_oxycodone, itm_xanax, itm_adderall, itm_weed,
  341. itm_coke, itm_meth, itm_heroin, NULL);
  342. + // GlyphGryph's Additions
  343. + setvector(
  344. + mapitems[mi_weight_set],
  345. + itm_dumbell, itm_barbell, itm_weight_plate, NULL);
  346. +
  347. + setvector(
  348. + mapitems[mi_drum_kit],
  349. + itm_drumsticks, itm_cymbal, NULL);
  350. + // End GlyphGryph's Additions
  351.  
  352. // This one kind of an inverted list; what a traveling salesman will NOT carry
  353. setvector(
  354. diff -crB Catacompare/mapitems.h BetterHomesAndGardens/mapitems.h
  355. *** Catacompare/mapitems.h 2011-08-21 15:34:02.000000000 -0400
  356. --- BetterHomesAndGardens/mapitems.h 2011-08-21 23:52:29.000000000 -0400
  357. ***************
  358. *** 34,40 ****
  359. mi_stash_wood, mi_stash_drugs,
  360. // Shopkeeps &c
  361. mi_trader_avoid,
  362. ! num_itloc
  363. };
  364.  
  365. // This is used only for monsters; they get a list of items_locations, and
  366. --- 34,43 ----
  367. mi_stash_wood, mi_stash_drugs,
  368. // Shopkeeps &c
  369. mi_trader_avoid,
  370. ! num_itloc,
  371. ! // GlyphGryph's additions
  372. ! mi_weight_set,
  373. ! mi_drum_kit
  374. };
  375.  
  376. // This is used only for monsters; they get a list of items_locations, and
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!