Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[AFTERSHOCK] Basic Ballistic Weapons #47559

Merged
merged 20 commits into from
Feb 24, 2021
Merged

[AFTERSHOCK] Basic Ballistic Weapons #47559

merged 20 commits into from
Feb 24, 2021

Conversation

Mom-Bun
Copy link
Contributor

@Mom-Bun Mom-Bun commented Feb 16, 2021

Summary

Mods "Adding Basic Ballistic Weapons to Aftershock"

Purpose of change

Considering that Aftershock is set 500 years in the future, many of the guns currently in game wouldn't make much sense being used, and in general it is hard to make a general feel for combat balance with vanilla weapons and drastically different enemies.

This PR should add some 3 basic ammo typos and 4 guns to Aftershock that'll help provide stepping stones towards this, as well fill out the combat balance document for the AFS wiki.

Describe the solution

I added 4 basic weapons that fall under the umbrella of pistol, shotgun, rifle, and machine gun; and ammo types that should go along with these.

Guns

Gibson S86

This light grenade launcher should fulfill the criteria of being a heavy weapon for the combat balance document, it should use the 25mm ammo.

Seyfert 84K

This pistol should fulfill the criteria of being a light weapon for the combat balance document. It uses the 10mm ammo.

G&W SR-P9

This rifle should fulfill the criteria of being a medium weapon for the combat balance document. It uses the 6.5mm ammo.

Accipiter Hawk-00

This machine gun should fulfill the criteria of being a medium weapon for the combat balance document. It uses the 6.5mm ammo.

Ammo

One of the ideas in Aftershock is we want to both avoid the highly varied amount of ammo by using the same idea as generic guns ammo. The reason for this is both in-universe flavor, and game play reasons. Ammo in the Aftershock universe is very highly standardized and unified and one of the most common complaints is that the highly varied ammo in base game Cataclysm is very confusing.

25mm

This type of ammo should be saved for light grenade launchers, in general very hard hitting, but not the top tier weapons. Heavy grenade launchers should not use this.

These are not powerful enough to actually make a substantial explosion except to damage a mob.

10mm

This is the basic ammo for all modern earth-made pistols, and every pistol that is modern and earth-made, unless it is high tier or specialized pistols should use this type of ammo.

7.50mm

This is the basic ammo for all modern earth-made rifles and machine guns, the idea being that they are an intermediary bullet. These should be used with every rifle and machine gun that is modern and earth-made, unless it is exceptionally special or high-tier to call for unique ammo.

TBD:

- [x] Add gun bases for the rifle, machine gun, and pistol Unnecessary

  • Fill in description and add flavor
  • Add JHP variant of 10mm
  • Add turret mount for the Hawk and s140
  • Test balance to make sure they fall in the ranges that is needed for the combat balance
  • Add ammo and guns to gun store drops.

Describe alternatives you've considered

Still using the same ammo and guns as in base Cataclysm.

Testing

Game boots up, guns work in the intended ranges I wanted them to; no errors and items drop.

I welcome that if other the other aftershock maintainers want to test the balance for the guns, it would be greatly appreciated.

Additional context

To note this isn't exhaustive as a PR, and merely here to help fill in the combat balance document by filling in ballistic weapons for Aftershock. For reference in the future we'd need ammo for shotguns, regular grenade launchers, and sub machine guns.

Another note is not all ammo is caseless, in the future there can be variants of ammo that can have cases; but they should have reason for this, either because they were handloaded by PrepNet Phyle, or it is very extraordinary/high tier as a bullet.

@Mom-Bun Mom-Bun added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Aftershock Anything to do with the Aftershock mod labels Feb 16, 2021
@Mom-Bun Mom-Bun marked this pull request as ready for review February 17, 2021 17:42
@Mom-Bun Mom-Bun requested a review from Maleclypse as a code owner February 17, 2021 17:42
@Mom-Bun Mom-Bun changed the title [WIP] [AFTERSHOCK] Basic Ballistic Weapons [AFTERSHOCK] Basic Ballistic Weapons Feb 17, 2021
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what direction we should take on some of these items but I wanted us to come up with a consistent application.

data/mods/Aftershock/items/ammo/10mm.json Outdated Show resolved Hide resolved
"volume": "117 ml",
"price": 400,
"price_postapoc": 800,
"material": [ "brass", "powder" ],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"material": [ "brass", "powder" ],
"material": [ "brass" ],

We can ignore whatever combustible adhesive we are using in place of powder for now? Or we can create the material and allow it to be scraped off and turned into makeshift explosives?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably best to ignore it for now; and in the future maybe allow it to be scraped off?

data/mods/Aftershock/items/ammo/10mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/ammo/25mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/ammo/6.5mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/ammo/6.5mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/magazine/25mm.json Show resolved Hide resolved
data/mods/Aftershock/items/ammo/25mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/25mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/10mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/ammo/6.5mm.json Outdated Show resolved Hide resolved
data/mods/Aftershock/items/gun/25mm.json Outdated Show resolved Hide resolved
@actual-nh
Copy link
Contributor

AFS wiki?

@Mom-Bun
Copy link
Contributor Author

Mom-Bun commented Feb 20, 2021

AFS wiki?

Something me and the other maintainers have been working on; once its polished and ready we will try to get it on the main repo

@actual-nh
Copy link
Contributor

AFS wiki?

Something me and the other maintainers have been working on; once its polished and ready we will try to get it on the main repo

I have been doing some work on the overall Cataclysm wiki - it could use (much more) material on Aftershock.

John-Candlebury pushed a commit to John-Candlebury/Cataclysm-DDA that referenced this pull request Mar 24, 2021
BrettDong pushed a commit that referenced this pull request Apr 5, 2021
anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021
KorGgenT pushed a commit to KorGgenT/Cataclysm-DDA that referenced this pull request Jul 4, 2021
I-am-Erk pushed a commit that referenced this pull request Jul 11, 2021
* Extend/Delete in requirements

* Revert "Extend/Delete in requirements"

This reverts commit 9da0eae.

* Valentine Cards (#47438)

* Add a proficiency for handloading, and a new profession (#47244)

* Drug Dealer Profession (#47255)

* Adds hallula, a type of bread popular in Bolivia and Chile

* Arm mounted pouch (#46946)

* Tazer drone iii (#47353)

* Added Gelatin and Several Gelatin Based Recipes (#47080)

* Content: bread in a can (#45680)

* New random mission (#44999)

* Mycus fruit Juice (#44952)

* Milleable corn (#46254)

* Talk Tag Additions (#47010)

* Fix typo in Valentines Card (#47583)

* (CrazyCataclysm) Crazy Hallucinations (#47386)

* Mealgurb (#47685)

* Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)

* Prepare npc, spell, character, and item for new ai (#47207)

* Make acetylene torch cut metal walls. (#46255)

* Added disassembly recipes for several items (#46316)

* Celsius temperature for freezing point (#47028)

* Stand up peek (#47257)

* [AFTERSHOCK] Basic Ballistic Weapons (#47559)

* makes glass walls and glass doors constructable (#47692)

* Crackers as bread and jam&cheese sandwich (#47649)

* [Aftershock] misc typograpical fixes (#47783)

* Tweaks for teas (#47848)

* Have travis run for 0.F-dev

Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.

* Tweakes to copper and metal pipes. (#47825)

* Fried eggs deluxe, sandwiches, and condiment list (#47786)

* Homemade toastems, buttercream frosting and recipes (#47696)

* Chocolate Cow don't drop "cow pies"

* Remove unused FATIGUE energy source from spells

* [Magiclysm] add owlbear origin snippet (#47752)

* [Magiclysm] add lesser banishment spell, buff greater banishment (#47537)

* Unhardcode bio_heatsink and bio_climate

* Hunting lodge Location (#44378)

* fungal evolution (#47247)

* Add book strap carrier (#47665)

* Partial mine jsonify; new zombie miner (#47790)

* Moved mine_entrance OMT from the list of hardcoded locations to industial locations

Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs.
Also added mine_entrance_roof OMT.

* Added mine_entrance and mine_shaft to the list of obsoleted terrains

* Added a zombie miner and its death drops

* Created a json-version of mine entrance and its roof

* Created a json-version of mine shaft (middle and lower variants)

* Changed overmap special definition of a mine to include new json chunks

* Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants

* Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT

Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen.

* Completely removed build_mine_room function as all mine rooms are now defined in json

Also removed hardcoded generation of mine entrance and mine shaft.

* Removed mentions of mine rooms from mapgen.h

* Updated alt_map_key mod

* Updated graphical overmap mod

* Added missing harvest

* Appease clang and constify

* Quickfix

* Appease clang one more time

* Add 0.F-dev to matrix.yml

(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.

* 0.F-dev workflows (#47875)

* Alter brown bread recipe to match canned version

Fixes #47874.

* Mine entrance expand (#47928)

* Added mine_materials item group

* Added Trolley vehicle

* Expanded and tweaked above-ground and underground levels of mine entrance

* [DinoMod] Mushroom Madness (#47907)

* misc typograpical fixes

* body pillow recipe makes makeshift body pillow now (#47917)

* Traffic Bollards and an example of deployment (#48017)

* add description for Uyen's missions

* JSONize some trap features, replace trap int_id externs with string_ids (#47933)

* JSONize trap sonar detectibility

Add trap flags - just the same as normal flags, but for traps! Stick
them in their own separate file to avoid confusion.

* JSONize trap memorial messages

light_snare and heavy_snare seem to no longer exist, or I couldn't find
any reference to them but this and tilesets.

Updated dissector trap message, and added a trap message to some traps
(the hallway ones, one or two of the similar-but-not-the-same variants
of existing traps).

* JSONize trap temperature convection

Not quite sure how to describe it, went the lazy route.

* Move traps externs from int to string ids

When loading the game without this content, these will now only give an
error on the use of these, instead of at the end data loading for traps.

Previously there were performance concerns with this, but this should be
fine since #44261 - see #44500.

tr_null must remain an int id, as it used in the string to int id
conversion. This is fine, as it will always be loaded (it's in
data/core).

Move the ledge trap over to data/core as well, because everything will
need the 'open space' trap.

* Clean up character mutation gain a bit

Reduce duplicated code.
I presume there's a reason that set_mutations didn't just call
set_mutation, and the only difference is that it doesn't do the cache
updates till the end, so preserve that behaviour.

* Allow CBMs to specify mutations that prevent installation. (#47822)

* Move CBM installation checks to Character

Reduce code duplication, encapsulate things better, and make this
available outside of the inventory menus.

* Allow mutations to prevent installing CBMs

Bionics can currently cancel mutations when installed, but can't have
mutations prevent installation.

* Spiral mine jsonify (#48003)

* prevent bell spam (#47987)

* Note that vat is required for fermentation in vinegar brewing

* Unhardcode ease of sleep

* whipped cream

remove aerosol whip cream

frosting requirement

Update slings.json

Update data/json/recipes/recipe_food.json

Update data/json/items/comestibles/dairy.json

Revert "remove aerosol whip cream"

This reverts commit b8570f6.

Update misc.json

Delete recipe_obsolete.json

Delete misc.json

Delete slings.json

Delete ammo_types.json

Delete enchantments.json

Revert "Delete recipe_obsolete.json"

This reverts commit 3119fdc.

Revert "Delete misc.json"

This reverts commit 71b811b.

Revert "Delete ammo_types.json"

This reverts commit 848c739.

Revert "Delete slings.json"

This reverts commit 7c91194.

fixes

Co-Authored-By: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-Authored-By: casswedson <58050969+casswedson@users.noreply.github.com>

* Update data/json/items/comestibles/dairy.json

Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>

* Update slings.json

* Update junkfood.json

Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: slimeboy460 <68845349+slimeboy460@users.noreply.github.com>
Co-authored-by: ToxiClay <ToxiClay@users.noreply.github.com>
Co-authored-by: Jamuro-g <76928284+Jamuro-g@users.noreply.github.com>
Co-authored-by: Xenomorph-III <sam1998may@gmail.com>
Co-authored-by: grawprog <77870049+grawprog@users.noreply.github.com>
Co-authored-by: Xaleth <countolaf17@gmail.com>
Co-authored-by: El-Jekozo <72350516+El-Jekozo@users.noreply.github.com>
Co-authored-by: RobertoVGoulart <robertovgoulart@yahoo.com.br>
Co-authored-by: Zukulini <dragon.fuego.yo@gmail.com>
Co-authored-by: klorpa <30924131+klorpa@users.noreply.github.com>
Co-authored-by: UmbralReaper <67179462+UmbralReaper@users.noreply.github.com>
Co-authored-by: SariusSkelrets <68650913+SariusSkelrets@users.noreply.github.com>
Co-authored-by: Fosheze <50811445+Fosheze@users.noreply.github.com>
Co-authored-by: Lamandus <33199510+Lamandus@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: NeviNovat <51816321+NeviNovat@users.noreply.github.com>
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Co-authored-by: Hirmuolio <22011552+Hirmuolio@users.noreply.github.com>
Co-authored-by: Charlie Gardai <32105250+Moltenhead@users.noreply.github.com>
Co-authored-by: Mom-Bun <43492737+Mom-Bun@users.noreply.github.com>
Co-authored-by: OromisElf <oromis.der.lehrer.eragons@freenet.de>
Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Fris0uman <sthapplz@gmail.com>
Co-authored-by: Ramza13 <52087122+Ramza13@users.noreply.github.com>
Co-authored-by: LyleSY <lyle.sollayates@Gmail.com>
Co-authored-by: FuelType-Memes <42695732+FuelType-Memes@users.noreply.github.com>
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: actual-nh <actual-nh@users.noreply.github.com>
Co-authored-by: casswedson <nelson1003403634@gmail.com>
Co-authored-by: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
kevingranade pushed a commit that referenced this pull request Sep 12, 2021
* Extend/Delete in requirements

* Revert "Extend/Delete in requirements"

This reverts commit 9da0eae.

* Valentine Cards (#47438)

* Add a proficiency for handloading, and a new profession (#47244)

* Drug Dealer Profession (#47255)

* Adds hallula, a type of bread popular in Bolivia and Chile

* Arm mounted pouch (#46946)

* Tazer drone iii (#47353)

* Added Gelatin and Several Gelatin Based Recipes (#47080)

* Content: bread in a can (#45680)

* New random mission (#44999)

* Mycus fruit Juice (#44952)

* Milleable corn (#46254)

* Talk Tag Additions (#47010)

* Fix typo in Valentines Card (#47583)

* (CrazyCataclysm) Crazy Hallucinations (#47386)

* Mealgurb (#47685)

* Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)

* Prepare npc, spell, character, and item for new ai (#47207)

* Make acetylene torch cut metal walls. (#46255)

* Added disassembly recipes for several items (#46316)

* Celsius temperature for freezing point (#47028)

* Stand up peek (#47257)

* [AFTERSHOCK] Basic Ballistic Weapons (#47559)

* makes glass walls and glass doors constructable (#47692)

* Crackers as bread and jam&cheese sandwich (#47649)

* [Aftershock] misc typograpical fixes (#47783)

* Tweaks for teas (#47848)

* Have travis run for 0.F-dev

Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.

* Tweakes to copper and metal pipes. (#47825)

* Fried eggs deluxe, sandwiches, and condiment list (#47786)

* Homemade toastems, buttercream frosting and recipes (#47696)

* Chocolate Cow don't drop "cow pies"

* Remove unused FATIGUE energy source from spells

* [Magiclysm] add owlbear origin snippet (#47752)

* [Magiclysm] add lesser banishment spell, buff greater banishment (#47537)

* Unhardcode bio_heatsink and bio_climate

* Hunting lodge Location (#44378)

* fungal evolution (#47247)

* Add book strap carrier (#47665)

* Partial mine jsonify; new zombie miner (#47790)

* Moved mine_entrance OMT from the list of hardcoded locations to industial locations

Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs.
Also added mine_entrance_roof OMT.

* Added mine_entrance and mine_shaft to the list of obsoleted terrains

* Added a zombie miner and its death drops

* Created a json-version of mine entrance and its roof

* Created a json-version of mine shaft (middle and lower variants)

* Changed overmap special definition of a mine to include new json chunks

* Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants

* Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT

Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen.

* Completely removed build_mine_room function as all mine rooms are now defined in json

Also removed hardcoded generation of mine entrance and mine shaft.

* Removed mentions of mine rooms from mapgen.h

* Updated alt_map_key mod

* Updated graphical overmap mod

* Added missing harvest

* Appease clang and constify

* Quickfix

* Appease clang one more time

* Add 0.F-dev to matrix.yml

(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.

* 0.F-dev workflows (#47875)

* Alter brown bread recipe to match canned version

Fixes #47874.

* Mine entrance expand (#47928)

* Added mine_materials item group

* Added Trolley vehicle

* Expanded and tweaked above-ground and underground levels of mine entrance

* [DinoMod] Mushroom Madness (#47907)

* misc typograpical fixes

* body pillow recipe makes makeshift body pillow now (#47917)

* Traffic Bollards and an example of deployment (#48017)

* add description for Uyen's missions

* JSONize some trap features, replace trap int_id externs with string_ids (#47933)

* JSONize trap sonar detectibility

Add trap flags - just the same as normal flags, but for traps! Stick
them in their own separate file to avoid confusion.

* JSONize trap memorial messages

light_snare and heavy_snare seem to no longer exist, or I couldn't find
any reference to them but this and tilesets.

Updated dissector trap message, and added a trap message to some traps
(the hallway ones, one or two of the similar-but-not-the-same variants
of existing traps).

* JSONize trap temperature convection

Not quite sure how to describe it, went the lazy route.

* Move traps externs from int to string ids

When loading the game without this content, these will now only give an
error on the use of these, instead of at the end data loading for traps.

Previously there were performance concerns with this, but this should be
fine since #44261 - see #44500.

tr_null must remain an int id, as it used in the string to int id
conversion. This is fine, as it will always be loaded (it's in
data/core).

Move the ledge trap over to data/core as well, because everything will
need the 'open space' trap.

* Clean up character mutation gain a bit

Reduce duplicated code.
I presume there's a reason that set_mutations didn't just call
set_mutation, and the only difference is that it doesn't do the cache
updates till the end, so preserve that behaviour.

* Allow CBMs to specify mutations that prevent installation. (#47822)

* Move CBM installation checks to Character

Reduce code duplication, encapsulate things better, and make this
available outside of the inventory menus.

* Allow mutations to prevent installing CBMs

Bionics can currently cancel mutations when installed, but can't have
mutations prevent installation.

* Spiral mine jsonify (#48003)

* prevent bell spam (#47987)

* Note that vat is required for fermentation in vinegar brewing

* Unhardcode ease of sleep

* calorie test

* Revert "calorie test"

This reverts commit e535575.

* Arcology Start

Adding windows and entrances

organization

more mapgen

organization and more overmaps

Update arcology_ground.json

Update arcology_ground.json

Last of the gates

Update arcology_gate_chunks.json

city special and terrain

chunks

Update arcology_ground.json

Update arcology_chunks.json

Update data/mods/Aftershock/itemgroups/arcology_groups.json

Update recipe_obsolete.json

chunkening

testing

fixes

Update arcology_ground.json

Update arcology_ground.json

fixes

neverending fixes

the lintening

Update arcology_gate_chunks.json

Update arcology_gate_chunks.json

Update arcology_gate_chunks.json

Can force spawn now but it is blank

Update arcology_chunks.json

15 tons and whadya get

reverses north and south

Ready for testing

Gates open

Open and Close gates using console

broken metal flooring

* Open and Close

* Lint

* Apply suggestions from code review

Co-authored-by: John Candlebury <johncandlebury@gmail.com>

Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: slimeboy460 <68845349+slimeboy460@users.noreply.github.com>
Co-authored-by: ToxiClay <ToxiClay@users.noreply.github.com>
Co-authored-by: Jamuro-g <76928284+Jamuro-g@users.noreply.github.com>
Co-authored-by: Xenomorph-III <sam1998may@gmail.com>
Co-authored-by: grawprog <77870049+grawprog@users.noreply.github.com>
Co-authored-by: Xaleth <countolaf17@gmail.com>
Co-authored-by: El-Jekozo <72350516+El-Jekozo@users.noreply.github.com>
Co-authored-by: RobertoVGoulart <robertovgoulart@yahoo.com.br>
Co-authored-by: Zukulini <dragon.fuego.yo@gmail.com>
Co-authored-by: klorpa <30924131+klorpa@users.noreply.github.com>
Co-authored-by: UmbralReaper <67179462+UmbralReaper@users.noreply.github.com>
Co-authored-by: SariusSkelrets <68650913+SariusSkelrets@users.noreply.github.com>
Co-authored-by: Fosheze <50811445+Fosheze@users.noreply.github.com>
Co-authored-by: Lamandus <33199510+Lamandus@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: NeviNovat <51816321+NeviNovat@users.noreply.github.com>
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Co-authored-by: Hirmuolio <22011552+Hirmuolio@users.noreply.github.com>
Co-authored-by: Charlie Gardai <32105250+Moltenhead@users.noreply.github.com>
Co-authored-by: Mom-Bun <43492737+Mom-Bun@users.noreply.github.com>
Co-authored-by: OromisElf <oromis.der.lehrer.eragons@freenet.de>
Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Fris0uman <sthapplz@gmail.com>
Co-authored-by: Ramza13 <52087122+Ramza13@users.noreply.github.com>
Co-authored-by: LyleSY <lyle.sollayates@Gmail.com>
Co-authored-by: FuelType-Memes <42695732+FuelType-Memes@users.noreply.github.com>
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: actual-nh <actual-nh@users.noreply.github.com>
Co-authored-by: casswedson <nelson1003403634@gmail.com>
Co-authored-by: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: John Candlebury <johncandlebury@gmail.com>
Venera3 pushed a commit to Venera3/Cataclysm-DDA that referenced this pull request Sep 21, 2021
* Extend/Delete in requirements

* Revert "Extend/Delete in requirements"

This reverts commit 9da0eae.

* Valentine Cards (CleverRaven#47438)

* Add a proficiency for handloading, and a new profession (CleverRaven#47244)

* Drug Dealer Profession (CleverRaven#47255)

* Adds hallula, a type of bread popular in Bolivia and Chile

* Arm mounted pouch (CleverRaven#46946)

* Tazer drone iii (CleverRaven#47353)

* Added Gelatin and Several Gelatin Based Recipes (CleverRaven#47080)

* Content: bread in a can (CleverRaven#45680)

* New random mission (CleverRaven#44999)

* Mycus fruit Juice (CleverRaven#44952)

* Milleable corn (CleverRaven#46254)

* Talk Tag Additions (CleverRaven#47010)

* Fix typo in Valentines Card (CleverRaven#47583)

* (CrazyCataclysm) Crazy Hallucinations (CleverRaven#47386)

* Mealgurb (CleverRaven#47685)

* Add duct tape blindfold for old reciepe plus tweaks for reciepe (CleverRaven#47527)

* Prepare npc, spell, character, and item for new ai (CleverRaven#47207)

* Make acetylene torch cut metal walls. (CleverRaven#46255)

* Added disassembly recipes for several items (CleverRaven#46316)

* Celsius temperature for freezing point (CleverRaven#47028)

* Stand up peek (CleverRaven#47257)

* [AFTERSHOCK] Basic Ballistic Weapons (CleverRaven#47559)

* makes glass walls and glass doors constructable (CleverRaven#47692)

* Crackers as bread and jam&cheese sandwich (CleverRaven#47649)

* [Aftershock] misc typograpical fixes (CleverRaven#47783)

* Tweaks for teas (CleverRaven#47848)

* Have travis run for 0.F-dev

Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.

* Tweakes to copper and metal pipes. (CleverRaven#47825)

* Fried eggs deluxe, sandwiches, and condiment list (CleverRaven#47786)

* Homemade toastems, buttercream frosting and recipes (CleverRaven#47696)

* Chocolate Cow don't drop "cow pies"

* Remove unused FATIGUE energy source from spells

* [Magiclysm] add owlbear origin snippet (CleverRaven#47752)

* [Magiclysm] add lesser banishment spell, buff greater banishment (CleverRaven#47537)

* Unhardcode bio_heatsink and bio_climate

* Hunting lodge Location (CleverRaven#44378)

* fungal evolution (CleverRaven#47247)

* Add book strap carrier (CleverRaven#47665)

* Partial mine jsonify; new zombie miner (CleverRaven#47790)

* Moved mine_entrance OMT from the list of hardcoded locations to industial locations

Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs.
Also added mine_entrance_roof OMT.

* Added mine_entrance and mine_shaft to the list of obsoleted terrains

* Added a zombie miner and its death drops

* Created a json-version of mine entrance and its roof

* Created a json-version of mine shaft (middle and lower variants)

* Changed overmap special definition of a mine to include new json chunks

* Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants

* Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT

Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen.

* Completely removed build_mine_room function as all mine rooms are now defined in json

Also removed hardcoded generation of mine entrance and mine shaft.

* Removed mentions of mine rooms from mapgen.h

* Updated alt_map_key mod

* Updated graphical overmap mod

* Added missing harvest

* Appease clang and constify

* Quickfix

* Appease clang one more time

* Add 0.F-dev to matrix.yml

(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.

* 0.F-dev workflows (CleverRaven#47875)

* Alter brown bread recipe to match canned version

Fixes CleverRaven#47874.

* Mine entrance expand (CleverRaven#47928)

* Added mine_materials item group

* Added Trolley vehicle

* Expanded and tweaked above-ground and underground levels of mine entrance

* [DinoMod] Mushroom Madness (CleverRaven#47907)

* misc typograpical fixes

* body pillow recipe makes makeshift body pillow now (CleverRaven#47917)

* Traffic Bollards and an example of deployment (CleverRaven#48017)

* add description for Uyen's missions

* JSONize some trap features, replace trap int_id externs with string_ids (CleverRaven#47933)

* JSONize trap sonar detectibility

Add trap flags - just the same as normal flags, but for traps! Stick
them in their own separate file to avoid confusion.

* JSONize trap memorial messages

light_snare and heavy_snare seem to no longer exist, or I couldn't find
any reference to them but this and tilesets.

Updated dissector trap message, and added a trap message to some traps
(the hallway ones, one or two of the similar-but-not-the-same variants
of existing traps).

* JSONize trap temperature convection

Not quite sure how to describe it, went the lazy route.

* Move traps externs from int to string ids

When loading the game without this content, these will now only give an
error on the use of these, instead of at the end data loading for traps.

Previously there were performance concerns with this, but this should be
fine since CleverRaven#44261 - see CleverRaven#44500.

tr_null must remain an int id, as it used in the string to int id
conversion. This is fine, as it will always be loaded (it's in
data/core).

Move the ledge trap over to data/core as well, because everything will
need the 'open space' trap.

* Clean up character mutation gain a bit

Reduce duplicated code.
I presume there's a reason that set_mutations didn't just call
set_mutation, and the only difference is that it doesn't do the cache
updates till the end, so preserve that behaviour.

* Allow CBMs to specify mutations that prevent installation. (CleverRaven#47822)

* Move CBM installation checks to Character

Reduce code duplication, encapsulate things better, and make this
available outside of the inventory menus.

* Allow mutations to prevent installing CBMs

Bionics can currently cancel mutations when installed, but can't have
mutations prevent installation.

* Spiral mine jsonify (CleverRaven#48003)

* prevent bell spam (CleverRaven#47987)

* Note that vat is required for fermentation in vinegar brewing

* Unhardcode ease of sleep

* calorie test

* Revert "calorie test"

This reverts commit e535575.

* Arcology Start

Adding windows and entrances

organization

more mapgen

organization and more overmaps

Update arcology_ground.json

Update arcology_ground.json

Last of the gates

Update arcology_gate_chunks.json

city special and terrain

chunks

Update arcology_ground.json

Update arcology_chunks.json

Update data/mods/Aftershock/itemgroups/arcology_groups.json

Update recipe_obsolete.json

chunkening

testing

fixes

Update arcology_ground.json

Update arcology_ground.json

fixes

neverending fixes

the lintening

Update arcology_gate_chunks.json

Update arcology_gate_chunks.json

Update arcology_gate_chunks.json

Can force spawn now but it is blank

Update arcology_chunks.json

15 tons and whadya get

reverses north and south

Ready for testing

Gates open

Open and Close gates using console

broken metal flooring

* Open and Close

* Lint

* Apply suggestions from code review

Co-authored-by: John Candlebury <johncandlebury@gmail.com>

Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: slimeboy460 <68845349+slimeboy460@users.noreply.github.com>
Co-authored-by: ToxiClay <ToxiClay@users.noreply.github.com>
Co-authored-by: Jamuro-g <76928284+Jamuro-g@users.noreply.github.com>
Co-authored-by: Xenomorph-III <sam1998may@gmail.com>
Co-authored-by: grawprog <77870049+grawprog@users.noreply.github.com>
Co-authored-by: Xaleth <countolaf17@gmail.com>
Co-authored-by: El-Jekozo <72350516+El-Jekozo@users.noreply.github.com>
Co-authored-by: RobertoVGoulart <robertovgoulart@yahoo.com.br>
Co-authored-by: Zukulini <dragon.fuego.yo@gmail.com>
Co-authored-by: klorpa <30924131+klorpa@users.noreply.github.com>
Co-authored-by: UmbralReaper <67179462+UmbralReaper@users.noreply.github.com>
Co-authored-by: SariusSkelrets <68650913+SariusSkelrets@users.noreply.github.com>
Co-authored-by: Fosheze <50811445+Fosheze@users.noreply.github.com>
Co-authored-by: Lamandus <33199510+Lamandus@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: NeviNovat <51816321+NeviNovat@users.noreply.github.com>
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Co-authored-by: Hirmuolio <22011552+Hirmuolio@users.noreply.github.com>
Co-authored-by: Charlie Gardai <32105250+Moltenhead@users.noreply.github.com>
Co-authored-by: Mom-Bun <43492737+Mom-Bun@users.noreply.github.com>
Co-authored-by: OromisElf <oromis.der.lehrer.eragons@freenet.de>
Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Fris0uman <sthapplz@gmail.com>
Co-authored-by: Ramza13 <52087122+Ramza13@users.noreply.github.com>
Co-authored-by: LyleSY <lyle.sollayates@Gmail.com>
Co-authored-by: FuelType-Memes <42695732+FuelType-Memes@users.noreply.github.com>
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: actual-nh <actual-nh@users.noreply.github.com>
Co-authored-by: casswedson <nelson1003403634@gmail.com>
Co-authored-by: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: John Candlebury <johncandlebury@gmail.com>
I-am-Erk pushed a commit that referenced this pull request Sep 27, 2021
* Extend/Delete in requirements

* Revert "Extend/Delete in requirements"

This reverts commit 9da0eae.

* Valentine Cards (#47438)

* Add a proficiency for handloading, and a new profession (#47244)

* Drug Dealer Profession (#47255)

* Adds hallula, a type of bread popular in Bolivia and Chile

* Arm mounted pouch (#46946)

* Tazer drone iii (#47353)

* Added Gelatin and Several Gelatin Based Recipes (#47080)

* Content: bread in a can (#45680)

* New random mission (#44999)

* Mycus fruit Juice (#44952)

* Milleable corn (#46254)

* Talk Tag Additions (#47010)

* Fix typo in Valentines Card (#47583)

* (CrazyCataclysm) Crazy Hallucinations (#47386)

* Mealgurb (#47685)

* Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)

* Prepare npc, spell, character, and item for new ai (#47207)

* Make acetylene torch cut metal walls. (#46255)

* Added disassembly recipes for several items (#46316)

* Celsius temperature for freezing point (#47028)

* Stand up peek (#47257)

* [AFTERSHOCK] Basic Ballistic Weapons (#47559)

* makes glass walls and glass doors constructable (#47692)

* Crackers as bread and jam&cheese sandwich (#47649)

* [Aftershock] misc typograpical fixes (#47783)

* Tweaks for teas (#47848)

* Have travis run for 0.F-dev

Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.

* Tweakes to copper and metal pipes. (#47825)

* Fried eggs deluxe, sandwiches, and condiment list (#47786)

* Homemade toastems, buttercream frosting and recipes (#47696)

* Chocolate Cow don't drop "cow pies"

* Remove unused FATIGUE energy source from spells

* [Magiclysm] add owlbear origin snippet (#47752)

* [Magiclysm] add lesser banishment spell, buff greater banishment (#47537)

* Unhardcode bio_heatsink and bio_climate

* Hunting lodge Location (#44378)

* fungal evolution (#47247)

* Add book strap carrier (#47665)

* Partial mine jsonify; new zombie miner (#47790)

* Moved mine_entrance OMT from the list of hardcoded locations to industial locations

Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs.
Also added mine_entrance_roof OMT.

* Added mine_entrance and mine_shaft to the list of obsoleted terrains

* Added a zombie miner and its death drops

* Created a json-version of mine entrance and its roof

* Created a json-version of mine shaft (middle and lower variants)

* Changed overmap special definition of a mine to include new json chunks

* Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants

* Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT

Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen.

* Completely removed build_mine_room function as all mine rooms are now defined in json

Also removed hardcoded generation of mine entrance and mine shaft.

* Removed mentions of mine rooms from mapgen.h

* Updated alt_map_key mod

* Updated graphical overmap mod

* Added missing harvest

* Appease clang and constify

* Quickfix

* Appease clang one more time

* Add 0.F-dev to matrix.yml

(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.

* 0.F-dev workflows (#47875)

* Alter brown bread recipe to match canned version

Fixes #47874.

* Mine entrance expand (#47928)

* Added mine_materials item group

* Added Trolley vehicle

* Expanded and tweaked above-ground and underground levels of mine entrance

* [DinoMod] Mushroom Madness (#47907)

* misc typograpical fixes

* body pillow recipe makes makeshift body pillow now (#47917)

* Traffic Bollards and an example of deployment (#48017)

* add description for Uyen's missions

* JSONize some trap features, replace trap int_id externs with string_ids (#47933)

* JSONize trap sonar detectibility

Add trap flags - just the same as normal flags, but for traps! Stick
them in their own separate file to avoid confusion.

* JSONize trap memorial messages

light_snare and heavy_snare seem to no longer exist, or I couldn't find
any reference to them but this and tilesets.

Updated dissector trap message, and added a trap message to some traps
(the hallway ones, one or two of the similar-but-not-the-same variants
of existing traps).

* JSONize trap temperature convection

Not quite sure how to describe it, went the lazy route.

* Move traps externs from int to string ids

When loading the game without this content, these will now only give an
error on the use of these, instead of at the end data loading for traps.

Previously there were performance concerns with this, but this should be
fine since #44261 - see #44500.

tr_null must remain an int id, as it used in the string to int id
conversion. This is fine, as it will always be loaded (it's in
data/core).

Move the ledge trap over to data/core as well, because everything will
need the 'open space' trap.

* Clean up character mutation gain a bit

Reduce duplicated code.
I presume there's a reason that set_mutations didn't just call
set_mutation, and the only difference is that it doesn't do the cache
updates till the end, so preserve that behaviour.

* Allow CBMs to specify mutations that prevent installation. (#47822)

* Move CBM installation checks to Character

Reduce code duplication, encapsulate things better, and make this
available outside of the inventory menus.

* Allow mutations to prevent installing CBMs

Bionics can currently cancel mutations when installed, but can't have
mutations prevent installation.

* Spiral mine jsonify (#48003)

* prevent bell spam (#47987)

* Note that vat is required for fermentation in vinegar brewing

* Unhardcode ease of sleep

* calorie test

* Revert "calorie test"

This reverts commit e535575.

* Reuben Sandwiches

* Update recipe_food.json

Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: slimeboy460 <68845349+slimeboy460@users.noreply.github.com>
Co-authored-by: ToxiClay <ToxiClay@users.noreply.github.com>
Co-authored-by: Jamuro-g <76928284+Jamuro-g@users.noreply.github.com>
Co-authored-by: Xenomorph-III <sam1998may@gmail.com>
Co-authored-by: grawprog <77870049+grawprog@users.noreply.github.com>
Co-authored-by: Xaleth <countolaf17@gmail.com>
Co-authored-by: El-Jekozo <72350516+El-Jekozo@users.noreply.github.com>
Co-authored-by: RobertoVGoulart <robertovgoulart@yahoo.com.br>
Co-authored-by: Zukulini <dragon.fuego.yo@gmail.com>
Co-authored-by: klorpa <30924131+klorpa@users.noreply.github.com>
Co-authored-by: UmbralReaper <67179462+UmbralReaper@users.noreply.github.com>
Co-authored-by: SariusSkelrets <68650913+SariusSkelrets@users.noreply.github.com>
Co-authored-by: Fosheze <50811445+Fosheze@users.noreply.github.com>
Co-authored-by: Lamandus <33199510+Lamandus@users.noreply.github.com>
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
Co-authored-by: NeviNovat <51816321+NeviNovat@users.noreply.github.com>
Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Co-authored-by: Hirmuolio <22011552+Hirmuolio@users.noreply.github.com>
Co-authored-by: Charlie Gardai <32105250+Moltenhead@users.noreply.github.com>
Co-authored-by: Mom-Bun <43492737+Mom-Bun@users.noreply.github.com>
Co-authored-by: OromisElf <oromis.der.lehrer.eragons@freenet.de>
Co-authored-by: casswedson <58050969+casswedson@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Fris0uman <sthapplz@gmail.com>
Co-authored-by: Ramza13 <52087122+Ramza13@users.noreply.github.com>
Co-authored-by: LyleSY <lyle.sollayates@Gmail.com>
Co-authored-by: FuelType-Memes <42695732+FuelType-Memes@users.noreply.github.com>
Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: actual-nh <actual-nh@users.noreply.github.com>
Co-authored-by: casswedson <nelson1003403634@gmail.com>
Co-authored-by: akirashirosawa <38557723+akirashirosawa@users.noreply.github.com>
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Mods: Aftershock Anything to do with the Aftershock mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants