Skip to content

Commit

Permalink
4 alpha
Browse files Browse the repository at this point in the history 
lul
  • Loading branch information
@Kenshut
Kenshut authored May 14, 2023
1 parent 464aaf3 commit b13b157
Show file tree
Hide file tree
Showing 29 changed files with 3,374 additions and 78 deletions.
2 changes: 1 addition & 1 deletion NPC/classes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"common": false,
"bonus_str": { "rng": [ 20, 30 ] },
"job_description": "Даже странно такой вопрос слышать... Ты вроде в Зоне не первый день, а про меня спрашиваешь. Да меня каждая собака в Зоне знает! я самый авторитетный «купи-продай». Если я что-то достать не могу, значит, это вообще нереально..",
"traits": [{ "trait": "NIGHTVISION2" }],
"traits": [{ "trait": "NIGHTVISION2" },{ "trait": "FACIAL_HAIR_HORSESHOE" },{ "trait": "HAIR_BALD" },{ "trait": "SKIN_LIGHT" }],
"weapon_override": "Оружие_монолита",
"worn_override": "сидор",
"carry_override": "вещи_монолита",
Expand Down
2 changes: 1 addition & 1 deletion NPC/factions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{ "power_min": 0, "id": "epilogue_faction_hells_raiders_0" },
{ "power_max": 150, "id": "epilogue_faction_hells_raiders_150" }
],
"description": "Их разум поврежден слишком сильно поврежден."
"description": "Их разум поврежден, слишком сильно поврежден..."
},
{
"type": "faction",
Expand Down
195 changes: 195 additions & 0 deletions NPC/mis.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
[
{
"id": "убитьбандитов",
"type": "mission_definition",
"name": { "str": "КОНТРАКТ - Убить бандитов" },
"description": "Сидорович послал меня <color_red>убить бандитов</color>. ну а мне что? деньги не пахнут.",
"goal": "MGOAL_ASSASSINATE",
"difficulty": 5,
"value": 5000,
"start": {
"assign_mission_target": { "om_terrain": "field","z": 0, "reveal_radius": 1, "random": true, "search_range": 80 },
"update_mapgen": {
"rows": [
" ",
" ",
" ",
" ggggggggggggg ",
" ggggggggggggg ",
" gg....R...ggg ",
" gg........ggg ",
" gg.......Rggg ",
" gg.F..a...ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" ggggggggggggg ",
" ggggggggggggg ",
" ",
" ",
" ",
" b b ",
" b bb ",
" b ",
" ",
" "
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"terrain": {
"g": "t_region_groundcover",
".": "t_region_groundcover_barren",
"a": "t_region_groundcover_barren",
"b": "t_region_groundcover_barren",
"R": "t_region_groundcover_barren",
"F": "t_region_groundcover_barren"
},
"furniture": { "a": "f_ash" },
"traps": { "F": "tr_fur_rollmat", "R": "tr_rollmat" },
"fields": { "b": { "field": "fd_blood", "intensity": 1 } },
"place_loot": [
{ "group": "cannedfood", "x": [ 6, 18 ], "y": [ 3, 15 ], "chance": 100 },
{ "group": "alcohol_bottled_canned", "x": [ 6, 18 ], "y": [ 3, 15 ], "repeat": 5, "chance": 75 },
{ "group": "trash_forest", "x": [ 6, 18 ], "y": [ 3, 15 ], "repeat": 2, "chance": 75 },
{ "group": "stash_drugs", "x": [ 6, 18 ], "y": [ 3, 15 ], "chance": 75 },
{ "group": "dresser", "x": [ 9, 10 ], "y": [ 10, 14 ], "chance": 75 },
{ "group": "softdrugs", "x": [ 9, 10 ], "y": [ 10, 14 ], "chance": 50 },
{ "group": "camping", "x": [ 9, 10 ], "y": [ 10, 14 ], "chance": 75 },
{ "group": "casings", "x": [ 10, 15 ], "y": [ 15, 18 ], "repeat": 5, "chance": 100 }

],
"place_npcs": [
{ "class": "bandit", "x": 15, "y": 7 },
{ "class": "thug", "x": 12, "y": 5 },
{ "class": "bandit", "x": 9, "y": 8, "target": true }
]
}
},
"end": {
"effect": [
{ "u_spawn_item": "деньги", "count": 2000 },
{ "arithmetic": [ { "npc_val": "npc_trust" }, "++" ] },
{ "u_add_var": "убитьсталкера", "type": "mission", "context": "flag", "value": "yes" }
]
},
"origins": [ "ORIGIN_SECONDARY" ],
"followup": "убитьмонолитовца",
"dialogue": {
"describe": "Надо устранить бандитов.",
"offer": "недалеко от меня остановились бандиты и они мешают моей торговле. За их устранение дам 2000 моей валюты ",
"accepted": "Давай побыстрее",
"rejected": "Ну как хочешь.",
"advice": "Ты сам должен с этим разобраться.",
"inquire": "Ты уже порешал их?",
"success": "Отлично, вот твои деньги ",
"success_lie": "ТЫ МНЕ ВРЕШЬ?!",
"failure": "НУ ПИЗДЕЦ! ТЫ КАК ВООБЩЕ УМУДРИЛСЯ?!"
}
},
{
"id": "достать_5_голов_тушкана",
"type": "mission_definition",
"name": { "str": "КОНТРАКТ - Принести 5 голов тушканов" },
"description": "Сидоровичу понадобилось целых <color_light_blue>5 голов тушканов</color>, давольно не обычный заказ.",
"goal": "MGOAL_FIND_ITEM",
"difficulty": 2,
"value": 50000,
"item": "ks_head_tushkan",
"count": 5,
"end": {
"effect": [
{ "u_spawn_item": "деньги", "count": 1000 },
{ "arithmetic": [ { "npc_val": "npc_trust" }, "++" ] },
{ "u_sell_item": "ks_head_tushkan", "count": 5 },
{ "u_add_var": "тушкан5", "type": "mission", "context": "flag", "value": "yes" }
]
},
"origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
"describe": "Головы тушканов",
"offer": "Мне тут понадобилось 5 голов тушканов, заплачу тебе 1000 моей валюты.",
"accepted": "Давай только побыстрее.",
"rejected": "Ну как хочешь.",
"advice": "просто отрежь им головы, окей?",
"inquire": "Ну как, принес?",
"success": "Отлично, вот твои деньги.",
"success_lie": "ТЫ ЧТО ПИЗДИШЬ МНЕ ТУТ?!",
"failure": "КАК ТЫ БЛЯТЬ УМУДРИЛСЯ?!"
}
},
{
"id": "убитьмонолитовца",
"type": "mission_definition",
"name": { "str": "КОНТРАКТ - Убить монолитовца" },
"description": "На этот раз Сидор послал меня <color_red>убить монолитовца</color>. Интересно, почему же монолит все еще действует?",
"goal": "MGOAL_ASSASSINATE",
"difficulty": 5,
"value": 5000,
"start": {
"assign_mission_target": { "om_terrain": "field","z": 0, "reveal_radius": 1, "random": true, "search_range": 80 },
"update_mapgen": {
"rows": [
" ",
" ",
" ",
" ggggggggggggg ",
" ggggggggggggg ",
" gg....R...ggg ",
" gg........ggg ",
" gg.......Rggg ",
" gg.F..a...ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" gg........ggg ",
" ggggggggggggg ",
" ggggggggggggg ",
" ",
" ",
" ",
" b b ",
" b bb ",
" b ",
" ",
" "
],
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"terrain": {
"g": "t_region_groundcover",
".": "t_region_groundcover_barren",
"a": "t_region_groundcover_barren",
"b": "t_region_groundcover_barren",
"R": "t_region_groundcover_barren",
"F": "t_region_groundcover_barren"
},
"furniture": { "a": "f_ash" },
"traps": { "F": "tr_fur_rollmat", "R": "tr_rollmat" },
"fields": { "b": { "field": "fd_blood", "intensity": 1 } },
"place_npcs": [
{ "class": "NC_монолит", "x": 9, "y": 8, "target": true }
]
}
},
"end": {
"effect": [
{ "u_spawn_item": "деньги", "count": 4000 },
{ "arithmetic": [ { "npc_val": "npc_trust" }, "++" ] },
{ "u_add_var": "убитьмонолитовца", "type": "mission", "context": "flag", "value": "yes" }
]
},
"origins": [ "ORIGIN_SECONDARY" ],
"dialogue": {
"describe": "Надо убить монолитовца.",
"offer": "Тут недавно появился монолитовец, и он давольно сильно мешает мне. За его устранение дам 4000 моей валюты ",
"accepted": "Давай побыстрее",
"rejected": "Ну как хочешь.",
"advice": "Говорят у него есть оружие на 50 калибр.",
"inquire": "Ты уже порешал его?",
"success": "Отлично, вот твои деньги ",
"success_lie": "ТЫ МНЕ ВРЕШЬ?!",
"failure": "НУ ПИЗДЕЦ! ТЫ КАК ВООБЩЕ УМУДРИЛСЯ?!"
}
}
]
52 changes: 52 additions & 0 deletions NPC/shi.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"type": "talk_topic",
"id": "сидор",
"dynamic_line":{
"npc_has_var": "lol_l",
"type": "dialogue",
"context": "first_meeting",
"value": "yes",
"yes": "Ну привет",
"no": "О! новое лицо"
},
"speaker_effect": { "effect": { "npc_add_var": "lol_l", "type": "dialogue", "context": "first_meeting", "value": "yes" } },
"responses": [
{
"text": "Сидоровичь? Ты как вообще здесь оказался?",
"topic": "сидороб",
"condition": { "not": { "npc_has_var": "knows_u", "type": "dialogue", "context": "first_meeting", "value": "yes" } }
},
{ "text": "ПОТАРГУЕМ?!", "topic": "TALK_NONE","effect": "start_trade" },
{ "text": "А у тебя все еще есть какие нибудь заказы?", "topic": "TALK_MISSION_LIST"},
{ "text": "ну я это, пошел.", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "сидороб",
"dynamic_line": "Ты не представляешь как я был удивлен, как только начался выброс меня выкинуло из моего бункера, в вот этот незнакомый мне бункер.",
"speaker_effect": { "effect": { "npc_add_var": "knows_u", "type": "dialogue", "context": "first_meeting", "value": "yes" } },
"responses": [
{ "text": "И что? Ты что ли сидишь тут с момента выброса?", "topic": "сидороб1" },
{ "text": "Ясно.", "topic": "TALK_NONE" }
]
},
{
"type": "talk_topic",
"id": "сидороб1",
"dynamic_line": "В этом бункере на удивление много провизии и мне её на долго хватит.",
"responses": [
{ "text": "Ясно.", "topic": "сидор" }
]
},
{
"type": "talk_topic",
"id": "задания",
"dynamic_line": "Вот какие заказы у меня сейчас есть.",
"responses": [
{ "text": "лол", "topic": "TALK_DONE" },
{ "text": "Ясно.", "topic": "TALK_NONE" }
]
}
]
Binary file added img/80.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions img/img.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[
{
"type": "mod_tileset",
"compatibility": [ "UltimateCataclysm", "UltimateCataclysmDemo","UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE", "MshockXottoplus","Cuteclysm","Chibi_Ultica"],
"tiles-new": [
{
"file": "img/img.png",
"tiles": [
{ "id": "af_electra_dummy", "fg": 0 },
{ "id": "af_dummy_dummy", "fg": 1 },
{ "id": "ks_Batar", "fg": 2 },
{ "id": "af_balvanka", "fg": 3 },
{ "id": "af_electra_sparkler", "fg": 4 },
{ "id": "af_eye", "fg": 5 },
{ "id": "af_drops", "fg": 6 },
{ "id": "af_dummy_glassbead", "fg": 7 },
{ "id": "af_dummy_glassbeads", "fg": 8 },
{ "id": "af_fireball", "fg": 9 },
{ "id": "af_fireballs", "fg": 10 },
{ "id": "af_fire", "fg": 11 },
{ "id": "af_cristall", "fg": 12 },
{ "id": "af_cristalls", "fg": 13 },
{ "id": "af_ameba_mica", "fg": 14 },
{ "id": "af_baloon", "fg": 15 },
{ "id": "af_electra_flash", "fg": 16 },
{ "id": "ks_af_glass", "fg": 17 },
{ "id": "af_ameba_slime", "fg": 18 },
{ "id": "кровосос", "fg": 19 },
{ "id": "кровосос1", "fg": 20 },
{ "id": "снорк", "fg": 21 },
{ "id": "снорклюд", "fg": 22 }
],
"sprite_width": 32,
"sprite_height": 32
},
{
"file": "img/80.png",
"tiles": [
{ "id": "mon_stalker_horse", "fg": 56, "rotates": false }
],
"sprite_width": 64,
"sprite_height": 64,
"sprite_offset_x": 0,
"sprite_offset_y": -25
}
]
}
]
Binary file added img/img.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion items/bionics item.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"name": { "str": "abstract bionic module" },
"weight": "2041 g",
"volume": "2500 ml",
"bashing": 8,
"material": [ "Металючька", "plastic" ],
"symbol": ":",
"color": "yellow",
Expand Down
Loading

0 comments on commit b13b157

Please sign in to comment.