Skip to content

Commit

Permalink
Merge pull request #77455 from Procyonae/TutorialMod
Browse files Browse the repository at this point in the history
Shift towards making the tutorial work as a mod behind the scenes
  • Loading branch information
Maleclypse authored Nov 5, 2024
2 parents c878dbb + c93f3d5 commit ff36828
Show file tree
Hide file tree
Showing 22 changed files with 564 additions and 365 deletions.
6 changes: 4 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@
- data/mods/Isolation-Protocol/**/*

"Mods":
- any: [ 'data/mods/**' ]
all: [ '!data/mods/TEST_DATA/**' ]
- all: [ 'data/mods/**', '!data/mods/TEST_DATA/**', '!data/mods/dda/**', '!data/mods/dda_tutorial/**' ]

"Mechanics: Enchantments / Spells":
- "**/**enchantment**"
Expand All @@ -301,6 +300,9 @@
"Mods: Defense Mode":
- "data/mods/Defense_Mode/**"

"Tutorial":
- "data/mods/dda_tutorial/**"

"ImGui":
- "src/third-party/imgui/**"
- "src/third-party/imtui/**"
21 changes: 0 additions & 21 deletions data/json/monsters/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -403,26 +403,5 @@
"harvest": "exempt",
"revert_to_itype": "mannequin_decoy",
"flags": [ "IMMOBILE", "NO_BREATHE", "NOT_HALLUCINATION" ]
},
{
"id": "mon_dummy_tutorial",
"type": "MONSTER",
"name": { "str": "dummy", "str_pl": "dummies" },
"description": "This dummy serves for only one purpose - to teach players how to hit monsters.",
"looks_like": "f_mannequin",
"default_faction": "",
"species": [ "UNKNOWN" ],
"volume": "62500 ml",
"weight": "81500 g",
"hp": 50,
"speed": 100,
"material": [ "wood" ],
"symbol": "X",
"color": "white",
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"vision_day": 1,
"harvest": "exempt",
"death_function": { "corpse_type": "NO_CORPSE", "message": "The %s is destroyed." },
"flags": [ "IMMOBILE", "NOT_HALLUCINATION" ]
}
]
27 changes: 0 additions & 27 deletions data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,32 +181,5 @@
"see_cost": "opaque",
"travel_cost_type": "impassable",
"flags": [ "NO_ROTATE" ]
},
{
"type": "overmap_terrain",
"id": "tutorial",
"name": "tutorial room",
"sym": "O",
"color": "cyan",
"see_cost": "full_high",
"flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ]
},
{
"type": "overmap_terrain",
"id": "tutorial_roof",
"name": "tutorial room",
"sym": "O",
"color": "cyan",
"see_cost": "none",
"flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ]
},
{
"type": "overmap_terrain",
"id": "tutorial_underground",
"name": "tutorial room",
"sym": "O",
"color": "cyan",
"see_cost": "full_high",
"flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ]
}
]
195 changes: 0 additions & 195 deletions data/json/traps.json
Original file line number Diff line number Diff line change
Expand Up @@ -890,201 +890,6 @@
"benign": true,
"funnel_radius": 342
},
{
"type": "trap",
"id": "tr_tutorial_1",
"name": "look around tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_2",
"name": "movement modes tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_3",
"name": "melee tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_4",
"name": "reach attack tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_5",
"name": "wear items tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_6",
"name": "firearms tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_7",
"name": "inventory tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_8",
"name": "flashlight tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_9",
"name": "water container tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_10",
"name": "remote use tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_11",
"name": "crafting tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_12",
"name": "construction tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_13",
"name": "pain management tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_14",
"name": "throwing tutorial",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_tutorial_15",
"name": "tutorial finale",
"color": "white",
"symbol": "x",
"visibility": 99,
"avoidance": 99,
"difficulty": 99,
"action": "none",
"benign": true,
"always_invisible": true
},
{
"type": "trap",
"id": "tr_swirling_vortex",
Expand Down
8 changes: 0 additions & 8 deletions data/mods/alt_map_key/overmap_terrain.json
Original file line number Diff line number Diff line change
Expand Up @@ -2166,14 +2166,6 @@
"sym": "O",
"color": "red"
},
{
"type": "overmap_terrain",
"id": "tutorial",
"copy-from": "tutorial",
"name": "tutorial room",
"sym": "O",
"color": "cyan"
},
{
"type": "overmap_terrain",
"id": "mall_a_1",
Expand Down
65 changes: 65 additions & 0 deletions data/mods/dda_tutorial/external_options.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_POPULATE_OUTSIDE_CONNECTIONS_FROM_NEIGHBORS",
"info": "Allows to populate outside connections from neighbors.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_RIVERS",
"info": "Allows to place procgen rivers during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_LAKES",
"info": "Allows to place procgen lakes during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_FORESTS",
"info": "Allows to place procgen forests during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_SWAMPS",
"info": "Allows to place procgen swamps during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_RAVINES",
"info": "Allows to place procgen ravines during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_CITIES",
"info": "Allows to place cities during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_FOREST_TRAILS",
"info": "Allows to place procgen forest trails during overmap generation.",
"stype": "bool",
"value": false
},
{
"type": "EXTERNAL_OPTION",
"name": "OVERMAP_PLACE_ROADS",
"info": "Allows to place procgen roads during overmap generation.",
"stype": "bool",
"value": false
}
]
File renamed without changes.
11 changes: 11 additions & 0 deletions data/mods/dda_tutorial/modinfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"type": "MOD_INFO",
"id": "dda_tutorial",
"name": "Tutorial",
"description": "Tutorial for Cataclysm-DDA",
"category": "content",
"//": "Marked as obsolete so it doesn't appear in the mod selection list",
"obsolete": true
}
]
23 changes: 23 additions & 0 deletions data/mods/dda_tutorial/monsters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"id": "mon_dummy_tutorial",
"type": "MONSTER",
"name": { "str": "dummy", "str_pl": "dummies" },
"description": "This dummy serves for only one purpose - to teach players how to hit monsters.",
"looks_like": "f_mannequin",
"default_faction": "",
"species": [ "UNKNOWN" ],
"volume": "62500 ml",
"weight": "81500 g",
"hp": 50,
"speed": 100,
"material": [ "wood" ],
"symbol": "X",
"color": "white",
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"vision_day": 1,
"harvest": "exempt",
"death_function": { "corpse_type": "NO_CORPSE", "message": "The %s is destroyed." },
"flags": [ "IMMOBILE", "NOT_HALLUCINATION" ]
}
]
Loading

0 comments on commit ff36828

Please sign in to comment.