Skip to content

Commit 61367e8

Browse files
blueUserRedblueUserRed
authored
Merge pull request #142 from blueUserRed/w7
last few weeklys
2 parents 73a05df + 4fbf2d6 commit 61367e8

29 files changed

Lines changed: 910 additions & 145 deletions

‎assets/config/assets.onj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,10 @@ textures: [
10141014
name: "npc_witch",
10151015
file: "textures/npcs/witch.png",
10161016
},
1017+
{
1018+
name: "npc_traveler",
1019+
file: "textures/npcs/traveler.png",
1020+
},
10171021
{
10181022
name: "enemy_selector",
10191023
file: "textures/enemies/enemy_selector.png",
@@ -1061,12 +1065,12 @@ textures: [
10611065
},
10621066
{
10631067
name: "card_symbol_text_i_equals",
1064-
file: "textures/cards/symbols/text/a_equals.png",
1068+
file: "textures/cards/symbols/text/i_equals.png",
10651069
useMipMaps: true,
10661070
},
10671071
{
10681072
name: "card_symbol_text_t_equals",
1069-
file: "textures/cards/symbols/text/a_equals.png",
1073+
file: "textures/cards/symbols/text/t_equals.png",
10701074
useMipMaps: true,
10711075
},
10721076
],

‎assets/config/cards.onj‎

Lines changed: 186 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ var bSelects = {
1616
targetOptionalNotSelf: bSelectTarget(false, true),
1717
neighbors: bSelectNeighbors(),
1818
self: bSelectSelf(),
19-
sourceBullet: bSelectSourceBullet()
19+
sourceBullet: bSelectSourceBullet(),
20+
cachedBullets: bSelectCachedBullets(),
2021
};
2122

2223
var iconPrefix = "§§";
@@ -1133,7 +1134,7 @@ cards: [
11331134
name: "viperBullet",
11341135
title: "Viper Bullet",
11351136
flavourText: "",
1136-
description: "$trigger$On-Leave:$trigger$\n$trait$DISCHARGE POISON$trait$ (2)",
1137+
description: "$trigger$On-Leave:$trigger$\n$keyword$DISCHARGE POISON$keyword$ (2)",
11371138
baseDamage: 0,
11381139
coverValue: 0,
11391140
traitEffects: [],
@@ -1316,7 +1317,7 @@ cards: [
13161317
name: "bulletPointBullet",
13171318
title: "Bullet Point Bullet",
13181319
flavourText: "",
1319-
description: "$trigger$While in revolver:$trigger$\n$trigger$Whenever a Bullet enters the revolver:$trigger$\nThe Bullet that entered gets +4 dmg",
1320+
description: "$trigger$While in revolver:$trigger$\n$trigger$Whenever a bullet enters the revolver:$trigger$\nThe bullet that entered gets +4 dmg",
13201321
baseDamage: 7,
13211322
coverValue: 0,
13221323
traitEffects: [],
@@ -1332,6 +1333,188 @@ cards: [
13321333
tags: ["pool1", "rarity1"],
13331334
price: 50,
13341335
},
1336+
{
1337+
name: "supportBullet",
1338+
title: "Support Bullet",
1339+
flavourText: "\"Support is on the way, be at ease little sister, the Onathahans will not go down without a fight. Take care TENYA. May the blessings of the gods find you. Yours, URIKA\" -Letter to Salem",
1340+
description: "$trigger$On Enter:$trigger$\nChose a bullet in a slot.\n$trigger$While in revolver:$trigger$\nThe chosen bullet gets +10 dmg",
1341+
baseDamage: 5,
1342+
coverValue: 0,
1343+
traitEffects: [],
1344+
rotation: $Right { amount: 1 },
1345+
highlightType: "standard",
1346+
effects: [
1347+
buffDmg("enter", bSelects.targetRequiredNotSelf, 10#val)
1348+
],
1349+
forceLoadCards: [],
1350+
dark: false,
1351+
cost: 1,
1352+
type: $Bullet { },
1353+
tags: ["pool1", "rarity2", "unobtainable", "not used"],
1354+
price: 50,
1355+
},
1356+
{
1357+
name: "doodleBullet",
1358+
title: "Doodle Bullet",
1359+
flavourText: "A great activity when taking breaks from shooting people! Doodling!",
1360+
description: "$trigger$On-Placedown:$trigger$\n$keyword$SEARCH$keyword$ for a 0 cost bullet in your deck. It gets +7 dmg.",
1361+
baseDamage: 4,
1362+
coverValue: 0,
1363+
traitEffects: [],
1364+
rotation: $Right { amount: 1 },
1365+
highlightType: "standard",
1366+
effects: [
1367+
search("enter", 1, cardsWithCost(0))#cacheAffectedCards,
1368+
giftDmg("enter", bSelects.cachedBullets, 7#val)
1369+
],
1370+
forceLoadCards: [],
1371+
dark: false,
1372+
cost: 1,
1373+
type: $Bullet { },
1374+
tags: ["pool1", "rarity2"],
1375+
price: 50,
1376+
},
1377+
{
1378+
name: "sheriffsBullet",
1379+
title: "Sheriffs Bullet",
1380+
flavourText: "",
1381+
description: "$trigger$While in revolver:$trigger$\n$trigger$On-Turn-Begin:$trigger$\nReturn target bullet to your hand",
1382+
baseDamage: 10,
1383+
coverValue: 0,
1384+
traitEffects: [],
1385+
rotation: $Right { amount: 1 },
1386+
highlightType: "standard",
1387+
effects: [
1388+
bounce("round start", bSelects.targetRequiredNotSelf)
1389+
],
1390+
forceLoadCards: [],
1391+
dark: false,
1392+
cost: 2,
1393+
type: $Bullet { },
1394+
tags: ["pool2", "rarity1"],
1395+
price: 50,
1396+
},
1397+
{
1398+
name: "longLostBullet",
1399+
title: "Long Lost Bullet",
1400+
flavourText: "I guess we should rename it now since the name dosen’t really fit anymore. Finally Found Bullet or something like that.",
1401+
description: "$trigger$While in Revolver:$trigger$\nAs long as the enemy has the Statuseffekt $status$POISON$status$:\n$trigger$On-Turn-Begin:$trigger$\nYou gain 1 reserve and draw 1 card",
1402+
baseDamage: 3,
1403+
coverValue: 0,
1404+
traitEffects: [],
1405+
rotation: $Right { amount: 1 },
1406+
highlightType: "standard",
1407+
effects: [
1408+
effectWithCondition(reserveGain("round start", 1#val), $AnyEnemyHasStatusEffect { value: poison(0#val, 0#val) }),
1409+
effectWithCondition(draw("round start", 1#val), $AnyEnemyHasStatusEffect { value: poison(0#val, 0#val) }),
1410+
],
1411+
forceLoadCards: [],
1412+
dark: false,
1413+
cost: 1,
1414+
type: $Bullet { },
1415+
tags: ["pool1", "rarity2"],
1416+
price: 50,
1417+
},
1418+
{
1419+
name: "heirloomBullet",
1420+
title: "Heirloom Bullet",
1421+
flavourText: "",
1422+
description: "If this card enters your hand in any other way than drawing cards from top of your deck:\nThis Bullet gets +9",
1423+
baseDamage: 2,
1424+
coverValue: 0,
1425+
traitEffects: [],
1426+
rotation: $Right { amount: 1 },
1427+
highlightType: "standard",
1428+
effects: [
1429+
giftDmg("special self drawn", bSelects.self, 9#val)#canTriggerInHand
1430+
],
1431+
forceLoadCards: [],
1432+
dark: false,
1433+
cost: 1,
1434+
type: $Bullet { },
1435+
tags: ["pool2", "rarity1", "not used", "unobtainable"],
1436+
price: 50,
1437+
},
1438+
{
1439+
name: "watercolorBullet",
1440+
title: "Watercolored Bullet",
1441+
flavourText: "",
1442+
description: "If this bullet enters your hand except through drawing cards:\nGain 1 reserve",
1443+
baseDamage: 2,
1444+
coverValue: 0,
1445+
traitEffects: [],
1446+
rotation: $Right { amount: 1 },
1447+
highlightType: "standard",
1448+
effects: [
1449+
reserveGain("special self drawn not from bottom", 1#val)#canTriggerInHand
1450+
],
1451+
forceLoadCards: [],
1452+
dark: false,
1453+
cost: 0,
1454+
type: $Bullet { },
1455+
tags: ["pool2", "rarity2", "not used", "unobtainable"],
1456+
price: 50,
1457+
},
1458+
{
1459+
name: "poisonDartBullet",
1460+
title: "Poison Dart Bullet",
1461+
flavourText: "Look how cute it is! Don't pet it tho.",
1462+
description: "$trigger$While in revolver:$trigger$\n$trigger$On-Right-Click:$trigger$\nPay 1 reserve and $keyword$DISCHARGE POISON$keyword$ (1)",
1463+
baseDamage: 4,
1464+
coverValue: 0,
1465+
traitEffects: [],
1466+
rotation: $Right { amount: 1 },
1467+
highlightType: "standard",
1468+
rightClickCost: 1,
1469+
effects: [
1470+
discharge("right clicked", 1#val)
1471+
],
1472+
forceLoadCards: [],
1473+
dark: false,
1474+
cost: 1,
1475+
type: $Bullet { },
1476+
tags: ["pool1", "rarity1", "not used", "unobtainable"],
1477+
price: 50,
1478+
},
1479+
{
1480+
name: "brokenArrow",
1481+
title: "Broken Arrow",
1482+
flavourText: "Maybe loading an arrow into a revolver wasn't that good of an idea after all...",
1483+
description: "$trait$DISINTEGRATION$trait$\n$trait$EVERLASTING$trait$",
1484+
baseDamage: 8,
1485+
coverValue: 0,
1486+
traitEffects: [ "rotten", "everlasting" ],
1487+
rotation: $Right { amount: 1 },
1488+
highlightType: "standard",
1489+
effects: [
1490+
],
1491+
forceLoadCards: [],
1492+
dark: false,
1493+
cost: 2,
1494+
type: $Bullet { },
1495+
tags: ["pool2", "rarity1"],
1496+
price: 50,
1497+
},
1498+
{
1499+
name: "propellerBullet",
1500+
title: "Propeller Bullet",
1501+
flavourText: "Try hard enough and the damn gun might just fly away",
1502+
description: "$trigger$On-Rotate:$trigger$\nEvery other bullet in the revolver gets +1 dmg",
1503+
baseDamage: 4,
1504+
coverValue: 0,
1505+
traitEffects: [],
1506+
rotation: $Right { amount: 1 },
1507+
highlightType: "standard",
1508+
effects: [
1509+
giftDmg("rotation", bSelects.allExceptSelf, 1#val)
1510+
],
1511+
forceLoadCards: [],
1512+
dark: false,
1513+
cost: 1,
1514+
type: $Bullet { },
1515+
tags: ["pool1", "rarity2"],
1516+
price: 50,
1517+
},
13351518

13361519
],
13371520

‎assets/config/descriptions.onj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,14 @@ hoverDetailDescriptions: [
5555
},
5656
{
5757
keyword: "DISCHARGE POISON",
58-
groupName: "trait",
58+
groupName: "keyword",
5959
description: "$trait$DISCHARGE POISON (x)$trait$\nIf the enemy has $status$POISON$status$, resolve x turns worth of poison dmg all at once.",
6060
},
61+
{
62+
keyword: "SEARCH",
63+
groupName: "keyword",
64+
description: "$trait$SEARCH$trait$\nPuts a random card from the deck into the players hand, that matches the requirement.",
65+
},
6166
],
6267

6368
hoverDetailDescriptionGroups: [

‎assets/imports/colors.onj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ lightBrown: color("c6c0b2"),
2020
orange: color("DCA733"),
2121
microwaveStudiosBrown: color("53473B"),
2222
seljuk_blue: color("4588EE"),
23-
hemoglobin_red: color("C21B1B"),
23+
hemoglobin_red: color("C21B1B"),
24+
magenta: color("A945A1"),

‎assets/logging/log_config.onj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ logTargets: [
77
path: "logging/forty-five.log"
88
}
99
],
10-
versionTag: "dev",
10+
versionTag: "--dev--",
1111
logLevel: "debug"

‎assets/maps/area_definitions/salem.onj‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,33 @@ nodes: [
1010
x: -7.0,
1111
y: 93.0,
1212
edgesTo: [
13-
1
13+
2
1414
],
1515
nodeTexture: "map_node_exit",
1616
event: $EnterMapMapEvent {
1717
targetMap: "road_between_tabu_letter_outpost_and_salem",
1818
}
1919
},
20+
{
21+
x: 15.0,
22+
y: 120.0,
23+
edgesTo: [
24+
2
25+
],
26+
nodeTexture: "map_node_dialog",
27+
event: $NPCMapEvent {
28+
npc: "traveler_in_salem_npc",
29+
canOnlyBeStartedOnce: false,
30+
currentlyBlocks: false,
31+
canBeStarted: true,
32+
isCompleted: false
33+
}
34+
},
2035
{
2136
x: 20.0,
2237
y: 80.0,
2338
edgesTo: [
24-
0,2
39+
0, 1, 3
2540
],
2641
nodeTexture: "map_node_shop",
2742
event: $ShopMapEvent {
@@ -37,7 +52,7 @@ nodes: [
3752
x: 40.0,
3853
y: 110.0,
3954
edgesTo: [
40-
1, 3
55+
2, 4
4156
],
4257
nodeTexture: "map_node_heal",
4358
event: $AddMaxHPEvent {
@@ -54,7 +69,7 @@ nodes: [
5469
x: 65.0,
5570
y: 100.0,
5671
edgesTo: [
57-
2
72+
3
5873
],
5974
nodeTexture: "map_node_exit",
6075
event: $EnterMapMapEvent {

0 commit comments

Comments
 (0)