Merge branch 'CleverRaven:master' into solid-fog-wall

.github/workflows/matrix.yml

@@ -92,6 +92,7 @@ jobs:
             pch: 1
             archive-success: basic-build
             dont_skip_data_only_changes: 1
+            mods: --mods=magiclysm
             title: Basic Build and Test (Clang 10, Ubuntu, Curses)
             # ~190MB in a clean build
             # ~30MB compressed
@@ -141,7 +142,6 @@ jobs:
             pch: 1
             sanitize: address
             cxxflags: --gcc-toolchain=/opt/mock-gcc-11
-            mods: --mods=magiclysm
             dont_skip_data_only_changes: 1
             title: Clang 12, Ubuntu, Tiles, ASan
             # ~390MB in a clean build

.github/workflows/stale.yml

@@ -4,6 +4,7 @@ on:
   schedule:
     - cron: '30 * * * *'
 permissions:
+  actions: write
   contents: write
   issues: write
   pull-requests: write

data/json/damage_types.json

@@ -140,6 +140,51 @@
     "melee_combat_info": { "order": 600, "show_type": false },
     "ablative_info": { "order": 600, "show_type": false }
   },
+  {
+    "id": "genetic_damage_pierce",
+    "type": "damage_type",
+    "physical": true,
+    "edged": true,
+    "melee_only": true,
+    "magic_color": "light_green",
+    "name": "genetic pierce",
+    "skill": "stabbing",
+    "derived_from": [ "stab", 1 ],
+    "immune_flags": { "character": [ "STAB_IMMUNE" ] },
+    "ondamage_eocs": [ "EOC_random_mutate" ]
+  },
+  {
+    "id": "genetic_damage_pierce",
+    "type": "damage_info_order",
+    "info_display": "detailed",
+    "verb": "shocking",
+    "bionic_info": { "order": 601, "show_type": true },
+    "protection_info": { "order": 701, "show_type": true },
+    "pet_prot_info": { "order": 701, "show_type": false },
+    "melee_combat_info": { "order": 601, "show_type": false },
+    "ablative_info": { "order": 601, "show_type": false }
+  },
+  {
+    "id": "genetic_damage_ballistic",
+    "type": "damage_type",
+    "physical": true,
+    "magic_color": "light_green",
+    "name": "genetic ballistic",
+    "derived_from": [ "bullet", 1 ],
+    "immune_flags": { "character": [ "BULLET_IMMUNE" ] },
+    "ondamage_eocs": [ "EOC_random_mutate" ]
+  },
+  {
+    "id": "genetic_damage_ballistic",
+    "type": "damage_info_order",
+    "info_display": "detailed",
+    "verb": "shocking",
+    "bionic_info": { "order": 601, "show_type": true },
+    "protection_info": { "order": 701, "show_type": true },
+    "pet_prot_info": { "order": 701, "show_type": false },
+    "melee_combat_info": { "order": 601, "show_type": false },
+    "ablative_info": { "order": 601, "show_type": false }
+  },
   {
     "//": "e.g. fire, plasma",
     "id": "heat",

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

@@ -138,7 +138,7 @@
   {
     "type": "effect_on_condition",
     "id": "self_shout",
-    "effect": { "u_make_sound": "schizo_self_shout", "volume": 20, "snippet": true, "type": "speech" }
+    "effect": { "u_make_sound": "schizo_self_shout", "volume": 20, "snippet": true }
   },
   {
     "type": "effect_on_condition",
@@ -176,7 +176,8 @@
     "id": "creature_hallucinations",
     "//TODO": "ideally checks is the tile visible, and then spawns hallu where player can't see it",
     "//": "If monsters are nearby, 3/4 chance to spawn some hallucinations of random monsters nearby and run again half the time, 1/4 chance to spawn some of YOUR_FEARS. If not, spawns some of YOUR_FEARS",
-    "condition": { "and": [ { "math": [ "rand(3)", "<", "3" ] }, { "math": [ "u_monsters_nearby()", ">", "0" ] } ] },
+    "//2": "avatar check to prevent NPCs from spawning hallucinations, that player can see",
+    "condition": { "and": [ { "math": [ "rand(3)", "<", "3" ] }, { "math": [ "u_monsters_nearby()", ">", "0" ] }, "u_is_avatar" ] },
     "effect": [
       {
         "u_spawn_monster": "",
@@ -192,6 +193,7 @@
     "type": "effect_on_condition",
     "id": "creature_hallucinations_fears",
     "//TODO": "ideally checks is the tile visible, and then spawns hallu where player can't see it",
+    "condition": "u_is_avatar",
     "effect": {
       "u_spawn_monster": "GROUP_YOUR_FEARS",
       "group": true,

data/json/items/ammo/barb.json

@@ -18,5 +18,24 @@
     "show_stats": true,
     "effects": [ "PARALYZEPOISON" ],
     "melee_damage": { "bash": 6, "cut": 2 }
+  },
+  {
+    "type": "AMMO",
+    "id": "gene_sting_barb",
+    "price": "4 USD",
+    "name": { "str": "gene sting barb" },
+    "symbol": "=",
+    "color": "cyan",
+    "description": "Tiny droplets of cyan venom trickle out of the sponge-like tissue of this sharp barb.",
+    "material": [ "bone" ],
+    "volume": "250 ml",
+    "weight": "30 g",
+    "ammo_type": "gene_sting",
+    "damage": { "damage_type": "genetic_damage_ballistic", "amount": 5, "armor_penetration": 5 },
+    "dispersion": 120,
+    "loudness": 0,
+    "count": 10,
+    "show_stats": true,
+    "melee_damage": { "bash": 6, "cut": 2 }
   }
 ]

data/json/items/ammo_types.json

@@ -71,6 +71,12 @@
     "name": "barb",
     "default": "barb_paralysis"
   },
+  {
+    "type": "ammunition_type",
+    "id": "gene_sting",
+    "name": "yugg stinger",
+    "default": "gene_sting_barb"
+  },
   {
     "type": "ammunition_type",
     "id": "BB",

data/json/mapgen/house/house_detatched5.json

@@ -88,8 +88,8 @@
       "fill_ter": "t_shingle_flat_roof",
       "rows": [
         "                        ",
-        " ---------------------- ",
-        " -....................- ",
+        " ------------    ------ ",
+        " -..........------....- ",
         " -..............X.....5 ",
         " -....................- ",
         " -....................- ",
@@ -124,21 +124,21 @@
       "fill_ter": "t_thconc_floor",
       "rows": [
         "                        ",
-        "  ||||||||||||||||||||| ",
-        "  |2........1.........| ",
-        "  |...................| ",
-        "  |...................| ",
-        " ||...................| ",
-        " |z...................| ",
+        " ||||||||||||    |||||| ",
+        " |1.........||||||zFz.| ",
+        " |..........2.........| ",
+        " |....................| ",
+        " |....................| ",
+        " |...................<| ",
+        " |....................| ",
         " |....................| ",
-        " |g...................| ",
         " |....................| ",
-        " |.....z..............| ",
-        " |<..zFz..............| ",
-        " |%%+%||||||||||||||||| ",
-        " |....|                 ",
-        " |JWZJ|                 ",
-        " ||||||                 ",
+        " |g..................z| ",
+        " |||||%%+%%|||||||||||| ",
+        "     |.....|            ",
+        "     |.....|            ",
+        "     |JWZJz|            ",
+        "     |||||||            ",
         "                        ",
         "                        ",
         "                        ",
@@ -155,22 +155,27 @@
             [ "null", 70 ],
             [ "room_6x6_guns_E", 2 ],
             [ "room_6x6_guns_S", 2 ],
+            [ "room_6x6_guns_W", 2 ],
             [ "room_6x6_junk_E", 30 ],
             [ "room_6x6_junk_S", 30 ],
+            [ "room_6x6_junk_W", 30 ],
             [ "room_6x6_office_E", 30 ],
             [ "room_6x6_office_S", 30 ],
+            [ "room_6x6_office_W", 30 ],
             [ "room_6x6_brewer_E", 10 ],
-            [ "room_6x6_brewer_S", 10 ]
+            [ "room_6x6_brewer_S", 10 ],
+            [ "room_6x6_brewer_W", 10 ]
           ]
         },
         "1": {
           "chunks": [
             [ "null", 70 ],
-            [ "room_10x10_woodworker_W", 20 ],
-            [ "room_10x10_guns_W", 7 ],
-            [ "room_10x10_pool_W", 2 ],
-            [ "room_10x10_junk_W", 30 ],
-            [ "room_10x10_recording_studio_W", 20 ]
+            [ "8x8_gym_E", 20 ],
+            [ "8x8_gym_S", 20 ],
+            [ "room_8x8_junk_E", 30 ],
+            [ "room_8x8_junk_S", 30 ],
+            [ "room_8x8_hobby_E", 20 ],
+            [ "room_8x8_hobby_S", 20 ]
           ]
         }
       }

data/json/monster_special_attacks/monster_gun.json

@@ -99,6 +99,39 @@
     "durability": 8,
     "melee_damage": { "bash": 2 }
   },
+  {
+    "id": "gene_sting_gun",
+    "type": "GUN",
+    "symbol": "%",
+    "color": "red",
+    "name": { "str": "viscous barb launcher" },
+    "description": "A mutated organ capable of launching bony barbs at great speed.",
+    "material": [ "hflesh" ],
+    "flags": [
+      "PRIMITIVE_RANGED_WEAPON",
+      "PSEUDO",
+      "NEVER_JAMS",
+      "NONCONDUCTIVE",
+      "NO_REPAIR",
+      "WATERPROOF_GUN",
+      "NO_SALVAGE",
+      "NO_UNLOAD",
+      "RELOAD_AND_SHOOT"
+    ],
+    "skill": "pistol",
+    "ammo": [ "gene_sting" ],
+    "clip_size": 1,
+    "weight": "540 g",
+    "volume": "750 ml",
+    "longest_side": "25 cm",
+    "reload_noise_volume": 2,
+    "loudness": 2,
+    "range": 12,
+    "dispersion": 100,
+    "durability": 8,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 100 } } ],
+    "melee_damage": { "bash": 2 }
+  },
   {
     "id": "feral_human_thrown_rock",
     "type": "GUN",

data/json/monster_special_attacks/spells.json

@@ -598,8 +598,7 @@
     "max_range": 24,
     "sound_description": "ssszziiipp",
     "damage_type": "biological",
-    "min_damage": 5,
-    "max_damage": 17,
+    "min_damage": 0,
     "extra_effects": [ { "id": "spell_gene_sting_selector" } ]
   },
   {
@@ -618,10 +617,10 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_random_mutate",
-    "condition": "u_is_character",
+    "condition": { "and": [ { "math": [ "_damage_taken", ">", "0" ] }, "u_is_npc" ] },
     "effect": [
       { "set_string_var": "<random_category>", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true },
-      { "u_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false }
+      { "npc_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false }
     ]
   },
   {

data/json/monsters/nether.json

@@ -1458,7 +1458,7 @@
     "description": "A huge, slimy worm-like creature.  Its pale, flattened head drips an oily mucus as it breaches the ground, searching for prey.  Its pinkish mouth opens and closes, revealing long fangs glistening with ropey strands of saliva, which leave smoldering stains wherever they drip.",
     "default_faction": "nether",
     "bodytype": "snake",
-    "species": [ "NETHER" ],
+    "species": [ "NETHER_BURROWING" ],
     "diff": 10,
     "volume": "600 L",
     "weight": "800 kg",
@@ -1474,11 +1474,23 @@
     "melee_dice_sides": 5,
     "melee_damage": [ { "damage_type": "cut", "amount": 8 } ],
     "bleed_rate": 50,
+    "starting_ammo": { "gene_sting_barb": 100 },
     "families": [ "prof_wp_netherium_abomination" ],
     "weakpoint_sets": [ "wps_netherium_abomination" ],
     "harvest": "exempt",
     "death_function": { "corpse_type": "NO_CORPSE", "eoc": "EOC_YUGG_DEATH" },
-    "special_attacks": [ { "type": "spell", "spell_data": { "id": "spell_gene_sting", "min_level": 5 }, "cooldown": 160 } ],
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 5,
+        "gun_type": "gene_sting_gun",
+        "ammo_type": "gene_sting_barb",
+        "no_ammo_sound": "SCREEE!!!!",
+        "require_targeting_player": false,
+        "ranges": [ [ 2, 18, "DEFAULT" ] ],
+        "description": "The yugg launches a viscous barb!"
+      }
+    ],
     "flags": [
       "SEES",
       "HEARS",

data/json/monsters/zed_fusion.json

@@ -277,6 +277,9 @@
         "type": "gun",
         "cooldown": 2,
         "gun_type": "barb_launcher",
+        "ammo_type": "barb_paralysis",
+        "no_ammo_sound": "unch",
+        "require_targeting_player": false,
         "ranges": [ [ 2, 12, "DEFAULT" ] ],
         "description": "The impaler launches a barb!"
       },

data/json/species.json

@@ -60,6 +60,13 @@
     "description": "a nether creature",
     "flags": [ "DRACULIN_IMMUNE" ]
   },
+  {
+    "type": "SPECIES",
+    "id": "NETHER_BURROWING",
+    "description": "a nether creature",
+    "footsteps": "rustling",
+    "flags": [ "DRACULIN_IMMUNE" ]
+  },
   {
     "type": "SPECIES",
     "id": "NETHER_EMANATION",

data/mods/Aftershock/ammo_effects.json

@@ -49,11 +49,13 @@
   {
     "id": "ELECTRIC_CHAIN",
     "type": "ammo_effect",
+    "always_cast_spell": true,
     "spell_data": { "id": "spell_electric_chain" }
   },
   {
     "id": "FUSION_FAN",
     "type": "ammo_effect",
+    "always_cast_spell": true,
     "spell_data": { "id": "spell_fusion_fan" }
   },
   {

data/mods/Magiclysm/enchantments/Gaias_Chosen.json

@@ -8,7 +8,7 @@
     "shape": "blast",
     "flags": [ "SILENT", "RANDOM_DAMAGE" ],
     "min_damage": 3,
-    "max_damage": 15,
+    "max_damage": 12,
     "valid_targets": [ "hostile" ],
     "damage_type": "cut",
     "min_range": 1,
@@ -19,8 +19,8 @@
     "id": "GAIAS_CHOSEN",
     "condition": "ALWAYS",
     "name": { "str": "Gaia's Champion" },
-    "description": "Your Gaia's Chosen abilities grant you a larger HP pool, and enemies have a chance to impale themselves upon your thorns when they attack you.",
-    "values": [ { "value": "MAX_HP", "multiply": 0.3 }, { "value": "PAIN", "multiply": 0.25 } ],
+    "description": "Your Gaia's Chosen abilities grant you a larger HP pool, and enemies have a chance to impale themselves upon your thorns when they attack you.  However, the thorns growing from your skin means you feel pain more acutely.",
+    "values": [ { "value": "MAX_HP", "multiply": 0.3 }, { "value": "PAIN", "multiply": 0.15 } ],
     "hit_me_effect": [
       {
         "id": "GAIAS_CHOSEN_THORNS",

data/mods/TEST_DATA/expected_dps_data/junk_dps.json

@@ -73,6 +73,7 @@
       "wizard_cane_on": 7.86,
       "modern_handguard": 7.94,
       "barb_paralysis": 6.12,
+      "gene_sting_barb": 6.37,
       "nitrogen_membrane_filter": 6.11,
       "pipe": 8.09,
       "sculpture_clay": 8.11,

doc/JSON_INFO.md

@@ -3588,6 +3588,9 @@ ammo_effects define what effect the projectile, that you shoot, would have. List
   "do_flashbang": false,     // Creates a one tile radius EMP explosion at the hit location; default false
   "do_emp_blast": false      // Creates a hardcoded flashbang explosion; default false
   "foamcrete_build": false   // Creates foamcrete fields and walls on the hit location, used in aftershock; default false
+  "spell_data": { "id": "bear_trap" } // Spell, that would be casted when projectile hits an enemy
+  "spell_data": { "id": "release_the_deltas", "hit_self": true, "min_level": 10 }, //another example
+  "always_cast_spell ": false // if spell_data is used, and this is true, spell would be casted even if projectile did not deal any damage. Default false.
 }
 ```