Update insect_spider.json #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevingranade
added a commit
that referenced
this pull request
Jul 23, 2021
commit d730317 Author: Kevin Granade <[email protected]> Date: Thu Jul 22 23:42:53 2021 -0700 JSON styling commit b1b40ff Merge: cb7f752 2d60945 Author: Kevin Granade <[email protected]> Date: Thu Jul 22 22:56:23 2021 -0700 Merge remote-tracking branch 'origin/pr/49170' * origin/pr/49170: (52 commits) Remove duplicated antlion egg Update egg.json Update data/json/monster_factions.json Update insect_spider.json Update insect_spider.json Update eggs.json add more eggs Update egg.json Update insect_spider.json aphids reproduction fix lint json Remove poison flag Fixed antlions factions Update mob description Commits Aphid reproduction Antlion harvest Antlion reproduction fixed striders swimming Apply suggestions from code review ... commit 2d60945 Merge: 2d32b3c a78bb5b Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:35:46 2021 +0300 Remove duplicated antlion egg commit a78bb5b Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:34:31 2021 +0300 Remove duplicated antlion egg commit 2d32b3c Merge: d1b95a6 959ca88 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:22:01 2021 +0300 small fixes remove duplications and fixed bugs commit 959ca88 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:20:26 2021 +0300 Update egg.json commit 37bea30 Merge: 17d3241 d1b95a6 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:18:55 2021 +0300 Merge branch 'eggs_fix' into small-fixes commit d1b95a6 Merge: 57e98bf b313d9a Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:01:39 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit 17d3241 Merge: 548860b d0fb1f3 Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 12:59:18 2021 +0300 Merge branch 'CleverRaven:master' into master commit 548860b Merge: 2b5e1ce 6ca1ebb Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 08:03:30 2021 +0300 Merge branch 'CleverRaven:master' into master commit 57e98bf Merge: aaa9801 6ca1ebb Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 07:49:37 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit aaa9801 Author: I-am-Erk <[email protected]> Date: Tue Jul 20 08:49:12 2021 -0700 Update data/json/monster_factions.json commit 181a3d2 Merge: 4376c55 fa71f58 Author: Kevin Granade <[email protected]> Date: Sun Jul 18 17:23:23 2021 -0700 Merge branch 'master' into eggs_fix commit 2b5e1ce Merge: 44a6982 e843920 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 11:22:45 2021 +0300 Aging insects insects age_gorw instead of half_life commit e843920 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 11:11:19 2021 +0300 Update insect_spider.json commit 73ab069 Merge: e2421bc 44a6982 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:19:10 2021 +0300 Merge pull request #25 from SuddenEyePuncture/master update brunch commit 44a6982 Merge: dd26c6f e2421bc Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:18:45 2021 +0300 Merge branch 'age-grow' into master commit dd26c6f Merge: 0321691 fdcbe01 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:03:28 2021 +0300 Merge pull request #24 from SuddenEyePuncture/more-eggs More eggs commit fdcbe01 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 06:55:59 2021 +0300 Update insect_spider.json commit 0321691 Merge: 7ca046b 10632a4 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 06:35:46 2021 +0300 Merge branch 'CleverRaven:master' into master commit e2421bc Merge: c7f2a12 c773f5d Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:45:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit efd2d37 Merge: 0bddfd3 69f8d66 Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:41:36 2021 +0300 Merge branch 'more-eggs' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into more-eggs commit 0bddfd3 Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:36:15 2021 +0300 Update eggs.json commit 7ca046b Merge: c4eaf46 c773f5d Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:34:36 2021 +0300 Merge branch 'CleverRaven:master' into master commit c4eaf46 Merge: 838d5f4 69f8d66 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 07:13:36 2021 +0300 Merge pull request #23 from SuddenEyePuncture/more-eggs More eggs commit 69f8d66 Merge: bc570f3 838d5f4 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 07:07:22 2021 +0300 Merge branch 'master' into more-eggs commit bc570f3 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 06:59:36 2021 +0300 add more eggs commit b1223eb Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 06:34:11 2021 +0300 Update egg.json commit c7f2a12 Merge: bbc316b 25cf01e Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 10 06:41:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit bbc316b Merge: 3d64cc3 6616372 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:12:42 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 838d5f4 Merge: 2559b22 4376c55 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:10:50 2021 +0300 Eggs fix Antlion egg no longer conflict with wasp egg commit 4376c55 Merge: 2559b22 6616372 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:05:26 2021 +0300 Merge branch 'master' into eggs_fix commit 3d64cc3 Merge: c303496 2559b22 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:22:37 2021 +0300 Merge branch 'new-bugs' commit c303496 Merge: 838538f aa471d6 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:21:55 2021 +0300 Merge branch 'rename-mole' commit 838538f Merge: eb2d82f 1d04305 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:11:39 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit eb2d82f Merge: 6d17494 ad69231 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:11:20 2021 +0300 Merge branch 'mantis-AP' commit 6d17494 Merge: 45348a5 add6f7d Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 06:05:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 45348a5 Merge: 4abed49 0f172bb Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 3 19:38:52 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 4abed49 Merge: 965567d 25f256e Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 3 11:37:43 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2559b22 Merge: eedd3b9 ad69231 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:49:38 2021 +0300 mantis AP fix Praying mantises now have AP for regular attacks commit ad69231 Merge: 3558ef5 eedd3b9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:48:58 2021 +0300 Merge branch 'master' into mantis-AP commit 965567d Merge: 16026af a5c3b7f Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:43:15 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 3558ef5 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:41:49 2021 +0300 Update insect_spider.json commit eedd3b9 Merge: 1e635c7 bde8edf Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:11:20 2021 +0300 Aphid reproduction fix Aphids give birth to small infertile aphids commit bde8edf Merge: ed67ee0 1e635c7 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:10:28 2021 +0300 Merge branch 'master' into aphid-reproduction-fix commit ed67ee0 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:06:14 2021 +0300 aphids reproduction fix aphids give birth to small aphids commit 16026af Merge: 8ab4eef 92e1507 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 16:53:56 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 1e635c7 Merge: f7434ac bf33676 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:50:04 2021 +0300 Merge pull request #17 from Tairesh/bugs_life lint json commit bf33676 Author: Ilya Agafonov <[email protected]> Date: Thu Jun 17 18:46:34 2021 +0500 lint json commit f7434ac Merge: 5081fc0 4cb3f3a Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:23:11 2021 +0300 Remove poison flag Remove obsolete POISON flag from some mobs commit 4cb3f3a Merge: 5110fea 5081fc0 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:22:41 2021 +0300 Merge branch 'master' into poison-remove commit 5110fea Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:13:47 2021 +0300 Remove poison flag commit 5081fc0 Merge: ac4d144 41209a3 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:06:45 2021 +0300 Antlion factions fix Antlion factions are apropriate commit 41209a3 Merge: 6a2d381 ac4d144 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:05:58 2021 +0300 Merge branch 'master' into antlion-fractions commit 6a2d381 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 15:53:12 2021 +0300 Fixed antlions factions commit aa471d6 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 15:05:41 2021 +0300 Update mob description commit ac4d144 Merge: e21179f 2c1eab2 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 14:50:19 2021 +0300 Merge branch 'CleverRaven:master' into master commit 8ab4eef Merge: f08ea6c 2c1eab2 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 14:47:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit e21179f Merge: 2af2bd9 8e7ddc9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:55:52 2021 +0300 Mantis and ladybug rebalance Implement Venera's comments commit 8e7ddc9 Merge: f115604 2af2bd9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:54:46 2021 +0300 Merge branch 'master' into mantis-morale commit f115604 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:34:46 2021 +0300 Commits Changed things according to venera's suggestion commit f08ea6c Merge: 5d6ae30 9a81a10 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 14:19:10 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2af2bd9 Merge: f39fd65 86e0827 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:20:46 2021 +0300 Aphid reproduction Aphid should reproduce at acceptable rate commit 86e0827 Merge: 7ff3f63 f39fd65 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:20:14 2021 +0300 Merge branch 'master' into aphid-reproduction commit 7ff3f63 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:11:55 2021 +0300 Aphid reproduction There are baby infertile aphids now commit 5d6ae30 Merge: 8ffdf63 ca3589f Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 11:16:18 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit f39fd65 Merge: 57cc68b 0109cdc Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:35:38 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 0109cdc Merge: 1bf9ea9 57cc68b Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:35:11 2021 +0300 Merge branch 'master' into antlion-harvest commit 1bf9ea9 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:29:32 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 57cc68b Merge: 54b035c 1df0fd0 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:21:32 2021 +0300 Antlion reproduction Added reproduction according to Venera's suggestion commit 1df0fd0 Merge: 4b8999f 54b035c Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:20:43 2021 +0300 Merge branch 'master' into antlion-agression commit 4b8999f Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:16:07 2021 +0300 Antlion reproduction Made antlions reproduce. Adult antlions are not predators. commit 54b035c Merge: b06e5d4 e06306a Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:08:39 2021 +0300 Merge pull request #9 from SuddenEyePuncture/strider-swim-fix Fixed striders swimming commit e06306a Merge: acb885d b06e5d4 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:07:51 2021 +0300 Merge branch 'master' into strider-swim-fix commit acb885d Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:05:55 2021 +0300 fixed striders swimming Lowered water striders speed to 50 and removed "aquatic" flag commit 8ffdf63 Merge: 10e8689 033a568 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 06:53:04 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit b06e5d4 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 06:51:26 2021 +0300 Apply suggestions from code review Added and removed some monster flags Co-authored-by: actual-nh <[email protected]> commit d98ee3e Merge: 59c0c7e 7078173 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:59:54 2021 +0300 Merge pull request #8 from SuddenEyePuncture/Strider-speed-fix Strider attack speed fix commit 7078173 Merge: 8265a0d 59c0c7e Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:59:34 2021 +0300 Merge branch 'master' into Strider-speed-fix commit 8265a0d Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:54:22 2021 +0300 Fix water striders behaviour Water striders can't walk on land and attack slower commit 10e8689 Merge: 58cd96e 25abf78 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:41:47 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 59c0c7e Merge: c750a83 25abf78 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:39:59 2021 +0300 Merge branch 'CleverRaven:master' into master commit c750a83 Merge: d6832f6 c3f63df Author: SuddenEyePuncture <[email protected]> Date: Wed Jun 9 20:38:36 2021 +0300 Merge pull request #7 from Tairesh/bugs_life lint json commit c3f63df Author: Ilya Agafonov <[email protected]> Date: Wed Jun 9 22:35:28 2021 +0500 lint json commit d6832f6 Merge: d6cda5d 58cd96e Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 8 07:20:10 2021 +0300 Merge pull request #6 from SuddenEyePuncture/aphid-agro-fix Aphids agro fix commit d6cda5d Merge: 2fafbc3 31837e9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 8 07:14:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 58cd96e Merge: 0fac78c 31837e9 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 7 13:12:11 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2fafbc3 Merge: f7b0ba9 68c327e Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:53:34 2021 +0300 Mob spawn fix Mob spawn fix commit 68c327e Merge: 60adaf1 f7b0ba9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:53:08 2021 +0300 Merge branch 'master' into mob-spawn-fix commit 60adaf1 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:22:16 2021 +0300 Changed spawn of insects removed mole crickets and ladybugs from some locations commit f7b0ba9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 12:59:00 2021 +0300 Apply suggestions from code review Removed some insects from spawn groups Co-authored-by: Venera3 <[email protected]> commit 0fac78c Merge: 91d4626 6b9918a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 11:15:55 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2640bc9 Merge: 6af3040 6b9918a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:30:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 6af3040 Merge: a7f512a 7f0e6ea Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:29:56 2021 +0300 Aphid rebalance Aphids can no longer be tamed. Aphids morale and agression are lowered. I'd given them the fear trigger PLAYER_CLOSE and set their morale regen to true. commit 7f0e6ea Merge: 52c2c3e a7f512a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:26:11 2021 +0300 Merge branch 'master' into aphids-fix commit 52c2c3e Merge: 3d53805 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:56:10 2021 +0300 Merge branch 'CleverRaven:master' into aphids-fix commit a7f512a Merge: 32f5d99 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:48:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 91d4626 Merge: 9855e30 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:45:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 9855e30 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 21:52:00 2021 +0300 description update commit 3d53805 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 21:36:41 2021 +0300 Update insect_spider.json commit aba883b Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:59:32 2021 +0300 Aphids taming fix You can't tame aphids. If you want to transport aphids try scaring them instead. Also, I've lowered aphid's agression and shortened description. commit f56767e Merge: 0b476f2 d3b1ed2 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:10:35 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 32f5d99 Merge: b19d9ed d3b1ed2 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:08:34 2021 +0300 Merge branch 'CleverRaven:master' into master commit b19d9ed Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 05:23:25 2021 +0300 Spelling Spelling fix Co-authored-by: chaohedgehogs <[email protected]> commit b6cdcce Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 05:21:03 2021 +0300 Spelling Spelling fixes Co-authored-by: chaohedgehogs <[email protected]> commit 2627d80 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:55:54 2021 +0300 Spelling fixes Thanks for fixing my spelling Co-authored-by: Anton Burmistrov <[email protected]> commit 40f0caf Merge: 586465b 31383d0 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:51:17 2021 +0300 Merge pull request #3 from SuddenEyePuncture/spelling Spelling fixes commit 31383d0 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:47:39 2021 +0300 Update insect_spider.json commit 586465b Merge: 72fc70b aa9ed43 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:21:06 2021 +0300 Merge branch 'CleverRaven:master' into master commit 72fc70b Merge: 351c299 33f6b30 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:20:24 2021 +0300 Merge pull request #2 from SuddenEyePuncture/bugs-fix-1 Update other.json commit 33f6b30 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:20:08 2021 +0300 Update other.json commit 351c299 Merge: 0b476f2 fb639cc Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:17:56 2021 +0300 Merge pull request #1 from SuddenEyePuncture/bugs-fixes Update insect_spider.json commit fb639cc Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:17:22 2021 +0300 Update insect_spider.json commit 0b476f2 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 08:04:09 2021 +0300 Revert "Revert "Revert "Revert "New chitinous creatures"""" This reverts commit bb5258f. commit c52a9ad Merge: bb5258f a1a1e77 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:45:27 2021 +0300 Merge branch 'master' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into new-bugs commit bb5258f Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:44:54 2021 +0300 Revert "Revert "Revert "New chitinous creatures""" This reverts commit 588ac57. commit 588ac57 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:24:06 2021 +0300 Revert "Revert "New chitinous creatures"" This reverts commit f626ac5. commit f626ac5 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:50 2021 +0300 Revert "New chitinous creatures" This reverts commit 7260fa5. commit d7f813f Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:36 2021 +0300 Revert "Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)"" This reverts commit 7ca7f34. commit 7ca7f34 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:11 2021 +0300 Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)" This reverts commit 7e62432. commit a1a1e77 Merge: 7260fa5 6ddf008 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:03:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 7260fa5 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:00:20 2021 +0300 New chitinous creatures I've added new mobs from my bug's life mod such as: -Aphids -Praying mantises in three sizes -Underground mole crickets -Lady bugs -Grasshoppers in two sizes -Antlion larvae and adult antlions -Water striders in two sizes commit 7e62432 Author: eso <[email protected]> Date: Thu Jun 3 01:18:03 2021 -0700 Revert "9x19mm +P and + prices" (CleverRaven#49155) commit c97f669 Merge: fc3689c 1d4c504 Author: Angela Graves <[email protected]> Date: Thu Jun 3 00:15:56 2021 -0500 Merge pull request CleverRaven#49149 from faefux/9mmP2-price 9x19mm +P and + prices commit 1d4c504 Author: faefux <[email protected]> Date: Wed Jun 2 22:14:50 2021 +0100 Update 9mm.json commit d561acb Author: faefux <[email protected]> Date: Wed Jun 2 22:12:43 2021 +0100 Update tool_armor.json commit 14c0928 Author: faefux <[email protected]> Date: Wed Jun 2 22:11:17 2021 +0100 Update suits_protection.json commit dc8197e Author: faefux <[email protected]> Date: Wed Jun 2 22:08:56 2021 +0100 Update 9mm.json 9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research. commit c7376e9 Author: faefux <[email protected]> Date: Tue Jun 1 22:20:27 2021 +0100 Update tool_armor.json Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched. commit 2bb3bc7 Author: faefux <[email protected]> Date: Tue Jun 1 14:45:42 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> commit 0c784b0 Author: faefux <[email protected]> Date: Tue Jun 1 14:23:01 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> commit 5897e7c Author: faefux <[email protected]> Date: Tue Jun 1 14:22:45 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> commit 80d0905 Author: faefux <[email protected]> Date: Tue Jun 1 13:44:49 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Anton Burmistrov <[email protected]> commit 2837517 Author: faefux <[email protected]> Date: Tue Jun 1 13:44:20 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> commit 3108432 Merge: 932a2bd bdc9d52 Author: faefux <[email protected]> Date: Tue Jun 1 01:51:57 2021 +0100 Merge pull request #12 from CleverRaven/master reset commit 932a2bd Author: fae <[email protected]> Date: Tue Jun 1 01:41:37 2021 +0100 Flight gear commit f673af3 Merge: d7dbb72 cae2be1 Author: faefux <[email protected]> Date: Wed May 19 18:50:19 2021 +0100 Merge pull request #11 from CleverRaven/master dggd commit d7dbb72 Merge: c449416 bb2b16f Author: faefux <[email protected]> Date: Sun Dec 20 21:51:17 2020 +0000 Merge pull request #10 from CleverRaven/master uptodate commit c449416 Merge: f537d93 9f82fd3 Author: faefux <[email protected]> Date: Wed Jul 15 17:31:27 2020 -0400 Merge pull request #9 from CleverRaven/master merge commit f537d93 Merge: 22867bd 53a0869 Author: faefux <[email protected]> Date: Tue Jun 30 16:37:52 2020 -0400 Merge pull request #8 from CleverRaven/master mergeee
kevingranade
added a commit
that referenced
this pull request
Jul 31, 2021
commit d730317 Author: Kevin Granade <[email protected]> Date: Thu Jul 22 23:42:53 2021 -0700 JSON styling commit b1b40ff Merge: cb7f752 2d60945 Author: Kevin Granade <[email protected]> Date: Thu Jul 22 22:56:23 2021 -0700 Merge remote-tracking branch 'origin/pr/49170' * origin/pr/49170: (52 commits) Remove duplicated antlion egg Update egg.json Update data/json/monster_factions.json Update insect_spider.json Update insect_spider.json Update eggs.json add more eggs Update egg.json Update insect_spider.json aphids reproduction fix lint json Remove poison flag Fixed antlions factions Update mob description Commits Aphid reproduction Antlion harvest Antlion reproduction fixed striders swimming Apply suggestions from code review ... commit 2d60945 Merge: 2d32b3c a78bb5b Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:35:46 2021 +0300 Remove duplicated antlion egg commit a78bb5b Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:34:31 2021 +0300 Remove duplicated antlion egg commit 2d32b3c Merge: d1b95a6 959ca88 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:22:01 2021 +0300 small fixes remove duplications and fixed bugs commit 959ca88 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:20:26 2021 +0300 Update egg.json commit 37bea30 Merge: 17d3241 d1b95a6 Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:18:55 2021 +0300 Merge branch 'eggs_fix' into small-fixes commit d1b95a6 Merge: 57e98bf b313d9a Author: SuddenEyePuncture <[email protected]> Date: Thu Jul 22 08:01:39 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit 17d3241 Merge: 548860b d0fb1f3 Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 12:59:18 2021 +0300 Merge branch 'CleverRaven:master' into master commit 548860b Merge: 2b5e1ce 6ca1ebb Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 08:03:30 2021 +0300 Merge branch 'CleverRaven:master' into master commit 57e98bf Merge: aaa9801 6ca1ebb Author: SuddenEyePuncture <[email protected]> Date: Wed Jul 21 07:49:37 2021 +0300 Merge branch 'CleverRaven:master' into eggs_fix commit aaa9801 Author: I-am-Erk <[email protected]> Date: Tue Jul 20 08:49:12 2021 -0700 Update data/json/monster_factions.json commit 181a3d2 Merge: 4376c55 fa71f58 Author: Kevin Granade <[email protected]> Date: Sun Jul 18 17:23:23 2021 -0700 Merge branch 'master' into eggs_fix commit 2b5e1ce Merge: 44a6982 e843920 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 11:22:45 2021 +0300 Aging insects insects age_gorw instead of half_life commit e843920 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 11:11:19 2021 +0300 Update insect_spider.json commit 73ab069 Merge: e2421bc 44a6982 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:19:10 2021 +0300 Merge pull request #25 from SuddenEyePuncture/master update brunch commit 44a6982 Merge: dd26c6f e2421bc Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:18:45 2021 +0300 Merge branch 'age-grow' into master commit dd26c6f Merge: 0321691 fdcbe01 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 07:03:28 2021 +0300 Merge pull request #24 from SuddenEyePuncture/more-eggs More eggs commit fdcbe01 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 06:55:59 2021 +0300 Update insect_spider.json commit 0321691 Merge: 7ca046b 10632a4 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 18 06:35:46 2021 +0300 Merge branch 'CleverRaven:master' into master commit e2421bc Merge: c7f2a12 c773f5d Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:45:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit efd2d37 Merge: 0bddfd3 69f8d66 Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:41:36 2021 +0300 Merge branch 'more-eggs' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into more-eggs commit 0bddfd3 Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:36:15 2021 +0300 Update eggs.json commit 7ca046b Merge: c4eaf46 c773f5d Author: SuddenEyePuncture <[email protected]> Date: Mon Jul 12 06:34:36 2021 +0300 Merge branch 'CleverRaven:master' into master commit c4eaf46 Merge: 838d5f4 69f8d66 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 07:13:36 2021 +0300 Merge pull request #23 from SuddenEyePuncture/more-eggs More eggs commit 69f8d66 Merge: bc570f3 838d5f4 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 07:07:22 2021 +0300 Merge branch 'master' into more-eggs commit bc570f3 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 06:59:36 2021 +0300 add more eggs commit b1223eb Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 11 06:34:11 2021 +0300 Update egg.json commit c7f2a12 Merge: bbc316b 25cf01e Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 10 06:41:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit bbc316b Merge: 3d64cc3 6616372 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:12:42 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 838d5f4 Merge: 2559b22 4376c55 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:10:50 2021 +0300 Eggs fix Antlion egg no longer conflict with wasp egg commit 4376c55 Merge: 2559b22 6616372 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 11:05:26 2021 +0300 Merge branch 'master' into eggs_fix commit 3d64cc3 Merge: c303496 2559b22 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:22:37 2021 +0300 Merge branch 'new-bugs' commit c303496 Merge: 838538f aa471d6 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:21:55 2021 +0300 Merge branch 'rename-mole' commit 838538f Merge: eb2d82f 1d04305 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:11:39 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit eb2d82f Merge: 6d17494 ad69231 Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 09:11:20 2021 +0300 Merge branch 'mantis-AP' commit 6d17494 Merge: 45348a5 add6f7d Author: SuddenEyePuncture <[email protected]> Date: Sun Jul 4 06:05:53 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 45348a5 Merge: 4abed49 0f172bb Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 3 19:38:52 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 4abed49 Merge: 965567d 25f256e Author: SuddenEyePuncture <[email protected]> Date: Sat Jul 3 11:37:43 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2559b22 Merge: eedd3b9 ad69231 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:49:38 2021 +0300 mantis AP fix Praying mantises now have AP for regular attacks commit ad69231 Merge: 3558ef5 eedd3b9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:48:58 2021 +0300 Merge branch 'master' into mantis-AP commit 965567d Merge: 16026af a5c3b7f Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:43:15 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 3558ef5 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 27 14:41:49 2021 +0300 Update insect_spider.json commit eedd3b9 Merge: 1e635c7 bde8edf Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:11:20 2021 +0300 Aphid reproduction fix Aphids give birth to small infertile aphids commit bde8edf Merge: ed67ee0 1e635c7 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:10:28 2021 +0300 Merge branch 'master' into aphid-reproduction-fix commit ed67ee0 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 17:06:14 2021 +0300 aphids reproduction fix aphids give birth to small aphids commit 16026af Merge: 8ab4eef 92e1507 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 21 16:53:56 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 1e635c7 Merge: f7434ac bf33676 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:50:04 2021 +0300 Merge pull request #17 from Tairesh/bugs_life lint json commit bf33676 Author: Ilya Agafonov <[email protected]> Date: Thu Jun 17 18:46:34 2021 +0500 lint json commit f7434ac Merge: 5081fc0 4cb3f3a Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:23:11 2021 +0300 Remove poison flag Remove obsolete POISON flag from some mobs commit 4cb3f3a Merge: 5110fea 5081fc0 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:22:41 2021 +0300 Merge branch 'master' into poison-remove commit 5110fea Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:13:47 2021 +0300 Remove poison flag commit 5081fc0 Merge: ac4d144 41209a3 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:06:45 2021 +0300 Antlion factions fix Antlion factions are apropriate commit 41209a3 Merge: 6a2d381 ac4d144 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 16:05:58 2021 +0300 Merge branch 'master' into antlion-fractions commit 6a2d381 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 15:53:12 2021 +0300 Fixed antlions factions commit aa471d6 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 15:05:41 2021 +0300 Update mob description commit ac4d144 Merge: e21179f 2c1eab2 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 14:50:19 2021 +0300 Merge branch 'CleverRaven:master' into master commit 8ab4eef Merge: f08ea6c 2c1eab2 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 17 14:47:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit e21179f Merge: 2af2bd9 8e7ddc9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:55:52 2021 +0300 Mantis and ladybug rebalance Implement Venera's comments commit 8e7ddc9 Merge: f115604 2af2bd9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:54:46 2021 +0300 Merge branch 'master' into mantis-morale commit f115604 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 17:34:46 2021 +0300 Commits Changed things according to venera's suggestion commit f08ea6c Merge: 5d6ae30 9a81a10 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 15 14:19:10 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2af2bd9 Merge: f39fd65 86e0827 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:20:46 2021 +0300 Aphid reproduction Aphid should reproduce at acceptable rate commit 86e0827 Merge: 7ff3f63 f39fd65 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:20:14 2021 +0300 Merge branch 'master' into aphid-reproduction commit 7ff3f63 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 12:11:55 2021 +0300 Aphid reproduction There are baby infertile aphids now commit 5d6ae30 Merge: 8ffdf63 ca3589f Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 11:16:18 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit f39fd65 Merge: 57cc68b 0109cdc Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:35:38 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 0109cdc Merge: 1bf9ea9 57cc68b Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:35:11 2021 +0300 Merge branch 'master' into antlion-harvest commit 1bf9ea9 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:29:32 2021 +0300 Antlion harvest Antlion harvest changed to "arachnid_flying" commit 57cc68b Merge: 54b035c 1df0fd0 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:21:32 2021 +0300 Antlion reproduction Added reproduction according to Venera's suggestion commit 1df0fd0 Merge: 4b8999f 54b035c Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:20:43 2021 +0300 Merge branch 'master' into antlion-agression commit 4b8999f Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 08:16:07 2021 +0300 Antlion reproduction Made antlions reproduce. Adult antlions are not predators. commit 54b035c Merge: b06e5d4 e06306a Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:08:39 2021 +0300 Merge pull request #9 from SuddenEyePuncture/strider-swim-fix Fixed striders swimming commit e06306a Merge: acb885d b06e5d4 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:07:51 2021 +0300 Merge branch 'master' into strider-swim-fix commit acb885d Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 07:05:55 2021 +0300 fixed striders swimming Lowered water striders speed to 50 and removed "aquatic" flag commit 8ffdf63 Merge: 10e8689 033a568 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 06:53:04 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit b06e5d4 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 14 06:51:26 2021 +0300 Apply suggestions from code review Added and removed some monster flags Co-authored-by: actual-nh <[email protected]> commit d98ee3e Merge: 59c0c7e 7078173 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:59:54 2021 +0300 Merge pull request #8 from SuddenEyePuncture/Strider-speed-fix Strider attack speed fix commit 7078173 Merge: 8265a0d 59c0c7e Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:59:34 2021 +0300 Merge branch 'master' into Strider-speed-fix commit 8265a0d Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:54:22 2021 +0300 Fix water striders behaviour Water striders can't walk on land and attack slower commit 10e8689 Merge: 58cd96e 25abf78 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:41:47 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 59c0c7e Merge: c750a83 25abf78 Author: SuddenEyePuncture <[email protected]> Date: Thu Jun 10 09:39:59 2021 +0300 Merge branch 'CleverRaven:master' into master commit c750a83 Merge: d6832f6 c3f63df Author: SuddenEyePuncture <[email protected]> Date: Wed Jun 9 20:38:36 2021 +0300 Merge pull request #7 from Tairesh/bugs_life lint json commit c3f63df Author: Ilya Agafonov <[email protected]> Date: Wed Jun 9 22:35:28 2021 +0500 lint json commit d6832f6 Merge: d6cda5d 58cd96e Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 8 07:20:10 2021 +0300 Merge pull request #6 from SuddenEyePuncture/aphid-agro-fix Aphids agro fix commit d6cda5d Merge: 2fafbc3 31837e9 Author: SuddenEyePuncture <[email protected]> Date: Tue Jun 8 07:14:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 58cd96e Merge: 0fac78c 31837e9 Author: SuddenEyePuncture <[email protected]> Date: Mon Jun 7 13:12:11 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2fafbc3 Merge: f7b0ba9 68c327e Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:53:34 2021 +0300 Mob spawn fix Mob spawn fix commit 68c327e Merge: 60adaf1 f7b0ba9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:53:08 2021 +0300 Merge branch 'master' into mob-spawn-fix commit 60adaf1 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 13:22:16 2021 +0300 Changed spawn of insects removed mole crickets and ladybugs from some locations commit f7b0ba9 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 12:59:00 2021 +0300 Apply suggestions from code review Removed some insects from spawn groups Co-authored-by: Venera3 <[email protected]> commit 0fac78c Merge: 91d4626 6b9918a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 11:15:55 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 2640bc9 Merge: 6af3040 6b9918a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:30:31 2021 +0300 Merge branch 'CleverRaven:master' into master commit 6af3040 Merge: a7f512a 7f0e6ea Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:29:56 2021 +0300 Aphid rebalance Aphids can no longer be tamed. Aphids morale and agression are lowered. I'd given them the fear trigger PLAYER_CLOSE and set their morale regen to true. commit 7f0e6ea Merge: 52c2c3e a7f512a Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 08:26:11 2021 +0300 Merge branch 'master' into aphids-fix commit 52c2c3e Merge: 3d53805 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:56:10 2021 +0300 Merge branch 'CleverRaven:master' into aphids-fix commit a7f512a Merge: 32f5d99 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:48:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 91d4626 Merge: 9855e30 b03c725 Author: SuddenEyePuncture <[email protected]> Date: Sun Jun 6 07:45:21 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 9855e30 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 21:52:00 2021 +0300 description update commit 3d53805 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 21:36:41 2021 +0300 Update insect_spider.json commit aba883b Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:59:32 2021 +0300 Aphids taming fix You can't tame aphids. If you want to transport aphids try scaring them instead. Also, I've lowered aphid's agression and shortened description. commit f56767e Merge: 0b476f2 d3b1ed2 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:10:35 2021 +0300 Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA commit 32f5d99 Merge: b19d9ed d3b1ed2 Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 20:08:34 2021 +0300 Merge branch 'CleverRaven:master' into master commit b19d9ed Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 05:23:25 2021 +0300 Spelling Spelling fix Co-authored-by: chaohedgehogs <[email protected]> commit b6cdcce Author: SuddenEyePuncture <[email protected]> Date: Sat Jun 5 05:21:03 2021 +0300 Spelling Spelling fixes Co-authored-by: chaohedgehogs <[email protected]> commit 2627d80 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:55:54 2021 +0300 Spelling fixes Thanks for fixing my spelling Co-authored-by: Anton Burmistrov <[email protected]> commit 40f0caf Merge: 586465b 31383d0 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:51:17 2021 +0300 Merge pull request #3 from SuddenEyePuncture/spelling Spelling fixes commit 31383d0 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 13:47:39 2021 +0300 Update insect_spider.json commit 586465b Merge: 72fc70b aa9ed43 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:21:06 2021 +0300 Merge branch 'CleverRaven:master' into master commit 72fc70b Merge: 351c299 33f6b30 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:20:24 2021 +0300 Merge pull request #2 from SuddenEyePuncture/bugs-fix-1 Update other.json commit 33f6b30 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:20:08 2021 +0300 Update other.json commit 351c299 Merge: 0b476f2 fb639cc Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:17:56 2021 +0300 Merge pull request #1 from SuddenEyePuncture/bugs-fixes Update insect_spider.json commit fb639cc Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 09:17:22 2021 +0300 Update insect_spider.json commit 0b476f2 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 08:04:09 2021 +0300 Revert "Revert "Revert "Revert "New chitinous creatures"""" This reverts commit bb5258f. commit c52a9ad Merge: bb5258f a1a1e77 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:45:27 2021 +0300 Merge branch 'master' of https://github.com/SuddenEyePuncture/Cataclysm-DDA into new-bugs commit bb5258f Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:44:54 2021 +0300 Revert "Revert "Revert "New chitinous creatures""" This reverts commit 588ac57. commit 588ac57 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:24:06 2021 +0300 Revert "Revert "New chitinous creatures"" This reverts commit f626ac5. commit f626ac5 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:50 2021 +0300 Revert "New chitinous creatures" This reverts commit 7260fa5. commit d7f813f Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:36 2021 +0300 Revert "Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)"" This reverts commit 7ca7f34. commit 7ca7f34 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:09:11 2021 +0300 Revert "Revert "9x19mm +P and + prices" (CleverRaven#49155)" This reverts commit 7e62432. commit a1a1e77 Merge: 7260fa5 6ddf008 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:03:09 2021 +0300 Merge branch 'CleverRaven:master' into master commit 7260fa5 Author: SuddenEyePuncture <[email protected]> Date: Fri Jun 4 07:00:20 2021 +0300 New chitinous creatures I've added new mobs from my bug's life mod such as: -Aphids -Praying mantises in three sizes -Underground mole crickets -Lady bugs -Grasshoppers in two sizes -Antlion larvae and adult antlions -Water striders in two sizes commit 7e62432 Author: eso <[email protected]> Date: Thu Jun 3 01:18:03 2021 -0700 Revert "9x19mm +P and + prices" (CleverRaven#49155) commit c97f669 Merge: fc3689c 1d4c504 Author: Angela Graves <[email protected]> Date: Thu Jun 3 00:15:56 2021 -0500 Merge pull request CleverRaven#49149 from faefux/9mmP2-price 9x19mm +P and + prices commit 1d4c504 Author: faefux <[email protected]> Date: Wed Jun 2 22:14:50 2021 +0100 Update 9mm.json commit d561acb Author: faefux <[email protected]> Date: Wed Jun 2 22:12:43 2021 +0100 Update tool_armor.json commit 14c0928 Author: faefux <[email protected]> Date: Wed Jun 2 22:11:17 2021 +0100 Update suits_protection.json commit dc8197e Author: faefux <[email protected]> Date: Wed Jun 2 22:08:56 2021 +0100 Update 9mm.json 9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research. commit c7376e9 Author: faefux <[email protected]> Date: Tue Jun 1 22:20:27 2021 +0100 Update tool_armor.json Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched. commit 2bb3bc7 Author: faefux <[email protected]> Date: Tue Jun 1 14:45:42 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> commit 0c784b0 Author: faefux <[email protected]> Date: Tue Jun 1 14:23:01 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> commit 5897e7c Author: faefux <[email protected]> Date: Tue Jun 1 14:22:45 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> commit 80d0905 Author: faefux <[email protected]> Date: Tue Jun 1 13:44:49 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Anton Burmistrov <[email protected]> commit 2837517 Author: faefux <[email protected]> Date: Tue Jun 1 13:44:20 2021 +0100 Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> commit 3108432 Merge: 932a2bd bdc9d52 Author: faefux <[email protected]> Date: Tue Jun 1 01:51:57 2021 +0100 Merge pull request #12 from CleverRaven/master reset commit 932a2bd Author: fae <[email protected]> Date: Tue Jun 1 01:41:37 2021 +0100 Flight gear commit f673af3 Merge: d7dbb72 cae2be1 Author: faefux <[email protected]> Date: Wed May 19 18:50:19 2021 +0100 Merge pull request #11 from CleverRaven/master dggd commit d7dbb72 Merge: c449416 bb2b16f Author: faefux <[email protected]> Date: Sun Dec 20 21:51:17 2020 +0000 Merge pull request #10 from CleverRaven/master uptodate commit c449416 Merge: f537d93 9f82fd3 Author: faefux <[email protected]> Date: Wed Jul 15 17:31:27 2020 -0400 Merge pull request #9 from CleverRaven/master merge commit f537d93 Merge: 22867bd 53a0869 Author: faefux <[email protected]> Date: Tue Jun 30 16:37:52 2020 -0400 Merge pull request #8 from CleverRaven/master mergeee
SuddenEyePuncture
pushed a commit
that referenced
this pull request
Aug 14, 2021
Perform two optimizations on Character::bodytemp 1. Store the items worn on each bodypart, and refer to that instead of iterating through all worn items and selecting the ones for the relevant body part multiple times. 2. Adjust some functions to run once, and return the data for all body parts. This optimization has a fair bit of overlap with #1, but I think both have value There should be no behavioural changes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context