adapt objects and scenarios to new component implementation

qteditor
Maikel de Vries 2016-04-30 22:46:10 +02:00
parent 4833f839d2
commit 1df322b7ff
234 changed files with 147 additions and 201 deletions

View File

@ -12,6 +12,5 @@ VertexCNAT=1,2,16
VertexFriction=30,30,30
Value=8
Mass=12
Components=Ice=2
Rotate=1
Picture=0,20,64,64

View File

@ -5,5 +5,4 @@ Category=C4D_StaticBack
Width=55
Height=17
Offset=-27,-8
Mass=1000
Components=GoldBar=20
Mass=1000

View File

@ -11,6 +11,5 @@ VertexY=-3,3
VertexFriction=50,50
Value=1
Mass=2
Components=Wood=1
Rotate=1
StretchGrowth=1

View File

@ -11,6 +11,5 @@ VertexY=-5,-4,-5,5,5
VertexFriction=50,50,50,50,50
Value=2
Mass=6
Components=Wood=1
Rotate=1
StretchGrowth=1

View File

@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0,0
VertexY=40,38,30,20,10,0,-10,-20,-30,-35
VertexCNAT=8,16,16,16,16,16,16,16,16,4
VertexFriction=50,50,25,25,25,25,25,50,50,50
Components=Wood=5
Mass=120
StretchGrowth=1
Oversize=1

View File

@ -10,7 +10,6 @@ VertexX=0,0,0,0,0,0,0,0,0,0
VertexY=40,38,30,20,10,0,-10,-20,-30,-35
VertexCNAT=8,16,16,16,16,16,16,16,16,4
VertexFriction=50,50,25,25,25,25,25,50,50,50
Components=Wood=5
Mass=150
StretchGrowth=1
Oversize=1

View File

@ -18,4 +18,5 @@ local Name = "$Name$";
local Touchable = 0;
local BlastIncinerate = 2;
local ContactIncinerate = 6;
local NoBurnDecay = 1;
local NoBurnDecay = 1;
local Components = [[Wood, 5]];

View File

@ -10,7 +10,6 @@ VertexX=0,0,0,0,0
VertexY=20,10,0,-10,-20
VertexCNAT=8,16,16,16,4
VertexFriction=50,25,25,25,50
Components=Wood=5
Mass=150
StretchGrowth=1
Oversize=1

View File

@ -10,7 +10,6 @@ VertexX=0,0,0,0,0
VertexY=20,10,0,-10,-20
VertexCNAT=8,16,16,16,4
VertexFriction=50,25,25,25,50
Components=Wood=4
Mass=110
StretchGrowth=1
Oversize=1

View File

@ -18,4 +18,5 @@ local Name = "$Name$";
local Touchable = 0;
local BlastIncinerate = 2;
local ContactIncinerate = 6;
local NoBurnDecay = 1;
local NoBurnDecay = 1;
local Components = [[Wood, 4]];

View File

@ -11,7 +11,6 @@ VertexY=1,-1,-1
VertexFriction=20
Value=1
Mass=10
Components=EnvPack_ManaAltar=1
Projectile=1
Rotate=1

View File

@ -11,6 +11,5 @@ VertexY=0,0,0,6,6
VertexFriction=100,100,100,100,100
VertexCNAT=64,1,2,1,2
SolidMask=0,0,20,20,0,0
Components=Wood=4;
Construction=1
Mass=10

View File

@ -10,6 +10,5 @@ VertexX=-11,11,-11,11
VertexY=-10,-10,58,58
VertexFriction=50,50,100,100
Mass=4500
Components=Metal=2;Wood=4;
Exclusive=1
Construction=1

View File

@ -11,5 +11,4 @@ VertexY=1,-1,-1
VertexFriction=50,50,50
Value=10
Mass=15
Components=Metal=1
Picture=0,6,64,64

View File

@ -11,6 +11,5 @@ VertexY=-9,0,12,12,12
VertexFriction=50,50,100,100,100
Value=40
Mass=5
#Components=Metal=1
Exclusive=1
Construction=1

View File

@ -11,5 +11,4 @@ VertexY=-6,-5,-5,7,7
VertexCNAT=5,6,9,10
VertexFriction=50,80,80,30,30
Value=20
Mass=150
Components=Metal=1
Mass=150

View File

@ -12,7 +12,6 @@ VertexCNAT=5,6,9,10
VertexFriction=80,80,10,10
Value=20
Mass=75
Components=Metal=2;Wood=1;
Collection=-12,-8,24,10
GrabPutGet=C4D_GrabGet|C4D_GrabPut
Rotate=30

View File

@ -11,6 +11,5 @@ VertexY=-2,2
VertexFriction=25,25
Timer=1
TimerCall=WatchUpdate
Components=Metal=1;
Value=6
Mass=3

View File

@ -11,7 +11,6 @@ VertexY=0
VertexFriction=100
Value=50
Mass=50
Components=Metal=2
Picture=0,0,32,32
Exclusive=1
Construction=1

View File

@ -10,6 +10,5 @@ VertexX=-5,12
VertexY=32,32
VertexFriction=100,100
Mass=300
Components=Rock=10;Metal=5;
Rotate=0

View File

@ -10,5 +10,4 @@ VertexX=-6,-4,0,6,8,2,-2
VertexY=0,-7,-8,-8,0,8,6
VertexFriction=50,50,50,50,50,50,50
Mass=150
Components=Rock=3;Metal=1;
Rotate=1

View File

@ -10,6 +10,5 @@ VertexX=-40,40
VertexY=34,34
VertexFriction=100,100
Mass=300
Components=Ruby=6;Amethyst=6;Metal=6;
Rotate=0
Construction=1

View File

@ -18,7 +18,7 @@ public func SetConstructionSiteOverlay(object site, int dir, object stick, objec
// Play component-specific sound for adding stuff to the site
if (component_obj && !component_obj->GetDefFragile()) component_obj->~Hit();
// Construction site graphics by provided metal
var metal_completion = site->ContentsCount(Metal) * 3 / Max(GetComponent(Metal, nil, nil, this), 1);
var metal_completion = site->ContentsCount(Metal) * 3 / Max(GetComponent(Metal, nil), 1);
site->SetGraphics(["Site0", "Site1", "Site2", nil][metal_completion], CrystalCommunicator, 1, GFXOV_MODE_Base);
site->SetGraphics(nil, nil, 2);
// Add graphics of contained gems
@ -355,3 +355,4 @@ local Name = "$Name$";
local Description = "$Description$";
local Touchable = 0;
local Plane = 280;
local Components = [[Ruby, 6], [Amethyst, 6], [Metal, 6]];

View File

@ -10,5 +10,4 @@ VertexX=-2,3,2,-3
VertexY=-2,1,2,-1
Value=15
Mass=4
Components=Metal=1
Rotate=1

View File

@ -11,6 +11,5 @@ VertexX=-22,-22,0,0,20,20
VertexY=7,-7,7,-7,-8,1
VertexFriction=30,60,30,60,60,30
Mass=100
Components=Wood=3;Metal=2;
Rotate=1
Float=1

View File

@ -11,6 +11,5 @@ VertexY=14,14
VertexFriction=100,100
Value=200
Mass=4000
Components=Airplane_Propeller=1;Airplane_Chassis=1;Airplane_Skids=1;Airplane_Engine=1;Airplane_Wings=1;
Construction=0
Rotate=0

View File

@ -10,6 +10,5 @@ VertexX=-3,-3,5,5
VertexY=-3,3,-3,3
VertexFriction=60,60,60,60
Mass=20
Components=Metal=10;
Rotate=1
Float=1

View File

@ -24,3 +24,4 @@ local Collectible = true;
local Name = "$Name$";
local Description = "$Description$";
local HitPoints = 20;
local Components = [[Metal, 10]];

View File

@ -10,6 +10,5 @@ VertexX=-4,3,3
VertexY=0,-4,4
VertexFriction=60,60,60
Mass=20
Components=Wood=1;Metal=1;
Rotate=1
Float=1

View File

@ -11,7 +11,6 @@ VertexY=1,1,7,7
VertexCNAT=5,6,9,10
VertexFriction=80,80,10,10
Mass=20
Components=Metal=2;
Rotate=1
Float=0
UprightAttach=8

View File

@ -11,7 +11,6 @@ VertexY=-16,-16,16,16
VertexCNAT=5,6,9,10
VertexFriction=60,60,60,60
Mass=50
Components=Wood=2;Metal=1;
Rotate=1
Float=0
UprightAttach=8

View File

@ -10,7 +10,6 @@ VertexX=-15,15,-15,15
VertexY=-15,-15,15,15
VertexFriction=50,50,100,100
Mass=1000
Components=Wood=1
Exclusive=1
Construction=1
IncompleteActivity=1

View File

@ -243,3 +243,4 @@ local ContainBlast = true;
local BlastIncinerate = 100;
local HitPoints = 30;
local Plane = 120;
local Components = [[Wood, 1]];

View File

@ -7,4 +7,3 @@ Height=32
Offset=0,0
Vertices=1
Mass=100
Components=Wood=1

View File

@ -11,5 +11,4 @@ VertexY=0,-4,0,4
VertexFriction=70,70,70,70
Value=250
Mass=16
Components=Ruby=3;Amethyst=3
Rotate=1

View File

@ -12,7 +12,6 @@ VertexFriction=20, 20, 20, 20
VertexCNAT=0, 15, 15, 15
Value=1
Mass=10
Components=Chippie_Egg=1
Projectile=1
Rotate=1
IncompleteActivity=1

View File

@ -7,4 +7,3 @@ Height=8
Offset=-20,-4
SolidMask=0,0,40,8,0,0
Mass=10
Components=Rock=2;

View File

@ -6,6 +6,5 @@ Width=512
Height=350
Offset=-256,-175
Picture=0,0,220,110
Components=Cloud=1
Oversize=1
StretchGrowth=1

View File

@ -10,7 +10,6 @@ VertexX=0
VertexY=0
VertexFriction=50
Mass=90
Components=Rock=7;
Construction=1
Rotate=1
Float=1

View File

@ -37,3 +37,4 @@ protected func Damage()
}
local Name = "$Name$";
local Plane = 200;
local Components = [[Rock, 7]];

View File

@ -9,6 +9,5 @@ Vertices=1
VertexX=0
VertexY=0
VertexFriction=100
Components=Wood=30
Mass=150
SolidMask=0,0,264,73,0,0

View File

@ -11,5 +11,4 @@ VertexY=0,1,1
VertexFriction=50,100,100
Value=10
Mass=2
Components=Flour=1;Water=50;
Picture=32,0,64,64

View File

@ -19,4 +19,5 @@ public func GetFuelNeed() { return 50; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local Collectible = 1;
local Components = [[Flour, 1], [Water, 50]];

View File

@ -10,5 +10,4 @@ VertexX=0,0
VertexY=1,4
VertexCNAT=16,8
VertexFriction=10,100
Components=Mushroom=1
Mass=6

View File

@ -26,4 +26,5 @@ public func GetFuelNeed() { return 50; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local Collectible = true;
local Components = [[Mushroom, 1]];

View File

@ -10,5 +10,4 @@ VertexX=0,3,-3
VertexY=0,3,3
VertexFriction=50,100,100
Value=5
Mass=2
Components=Seeds=1
Mass=2

View File

@ -9,4 +9,5 @@ public func IsWindmillProduct() { return true; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local Collectible = 1;
local Components = [[Seeds, 1]];

View File

@ -11,5 +11,4 @@ VertexY=4,-4,4,-4
VertexFriction=100,100,100,100
Value=10
Mass=1
Components=CottonSeed=1
Rotate=1

View File

@ -25,4 +25,5 @@ private func Definition(def)
local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local Plane = 470;
local Plane = 470;
local Components = [[CottonSeed, 1]];

View File

@ -12,5 +12,4 @@ VertexY=1,-1,-1
VertexFriction=75,75
Value=4
Mass=9
Components=Coal=1;
Rotate=1

View File

@ -10,6 +10,5 @@ VertexX=0,3,-3
VertexY=3,-2,-2
VertexFriction=100
Mass=12
Components=Earth=1
Fragile=1
Rotate=1

View File

@ -13,5 +13,4 @@ VertexFriction=30,30,30
Value=25
Mass=16
Picture=0,20,64,64
Components=Nugget=3
Rotate=1

View File

@ -14,4 +14,5 @@ public func QueryRebuy(){ return true; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local Plane = 480;
local Plane = 480;
local Components = [[Nugget, 3]];

View File

@ -11,7 +11,6 @@ VertexX=0,2,-2
VertexY=1,-1,-1
VertexFriction=40,40
Mass=14
Components=Ice=1;
StretchGrowth=1
Float=1
Rotate=1

View File

@ -10,7 +10,6 @@ Vertices=2
VertexX=0,0
VertexY=3,-3
VertexFriction=40,40
Components=Earth=2;Water=60;
Value=5
Mass=10
Rotate=1

View File

@ -253,4 +253,5 @@ local Collectible = 1;
local Name = "$Name$";
local Description = "$Description$";
local BridgeLength = 37; // bridge length in pixels
local Plane = 470;
local Plane = 470;
local Components = [[Earth, 2], [Water, 60]];

View File

@ -12,6 +12,5 @@ VertexCNAT=1,2,16
VertexFriction=30,30,30
Value=8
Mass=12
Components=Ore=1
Rotate=1
Picture=0,20,64,64

View File

@ -18,4 +18,5 @@ public func GetFuelNeed() { return 100; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local Plane = 470;
local Plane = 470;
local Components = [[Ore, 1]];

View File

@ -11,6 +11,5 @@ VertexY=1,-1,-1
VertexFriction=75,75,75
Value=1
Mass=1
Components=Moss=1
Rotate=1
Float=1

View File

@ -11,5 +11,4 @@ VertexY=1,-1,-1
VertexFriction=40,40,40
Value=5
Mass=12
Components=Nugget=1
Rotate=1

View File

@ -11,7 +11,6 @@ VertexY=1,-1,-1
VertexFriction=40,40,40
Value=2
Mass=10
Components=Rock=1
Projectile=1
Rotate=1

View File

@ -11,7 +11,6 @@ VertexX=0,2,-2
VertexY=1,-1,-1
VertexFriction=40,40
Mass=6
Components=Snow=1;
StretchGrowth=1
Float=1
Rotate=1

View File

@ -12,7 +12,6 @@ VertexCNAT=1,2
VertexFriction=50,50
Value=2
Mass=6
Components=Wood=1
Picture=0,24,60,60
Rotate=1
Float=1

View File

@ -11,6 +11,5 @@ VertexY=0,3,-3
VertexFriction=50,50,50
Value=10
Mass=12
Components=Wood=1;Metal=1;
Rotate=1

View File

@ -403,3 +403,4 @@ local Description = "$Description$";
local ChopStrength = 10;
// Damage dealt to living beings when hit with an axe.
local WeaponStrength = 6;
local Components = [[Wood, 1], [Metal, 1]];

View File

@ -11,6 +11,5 @@ VertexY=3,-3,-3,3
VertexFriction=50,50,50,50
Value=20
Mass=1
Components=Cloth=2
Float=1
Rotate=1

View File

@ -55,3 +55,4 @@ public func IsInventorProduct() { return true; }
local Collectible = true;
local Name = "$Name$";
local Description = "$Description$";
local Components = [[Cloth, 2]];

View File

@ -11,6 +11,5 @@ VertexY=-6,-6,6,6,0,0
VertexFriction=60,60,60,60,60,60
Value=12
Mass=20
Components=Wood=2;Metal=1;
Rotate=1
Float=1

View File

@ -11,5 +11,4 @@ VertexY=-6,-6,6,6,0,0
VertexFriction=60,60,60,60,60,60
Value=16
Mass=50
Components=Metal=2;
Rotate=1

View File

@ -33,4 +33,5 @@ local LiquidNames = {
local Name = "$Name$";
local Description = "$Description$";
local ContactIncinerate = 0;
local ContactIncinerate = 0;
local Components = [[Metal, 2]];

View File

@ -297,3 +297,4 @@ local Name = "$Name$";
local Description = "$Description$";
local ContactIncinerate = 2;
local BarrelIntakeY = 3;
local Components = [[Wood, 2], [Metal, 1]];

View File

@ -11,7 +11,6 @@ VertexY=3,-6,10,10
VertexFriction=80,60,60
Value=20
Mass=20
Components=PowderKeg=1;Firestone=1;Wood=1;
Rotate=1
ColorByOwner=1
NoStabilize=1

View File

@ -298,3 +298,4 @@ local Name = "$Name$";
local Description = "$Description$";
local BlastIncinerate = 1;
local ContactIncinerate = 1;
local Components = [[Wood, 1], [Firestone, 1], [PowderKeg, 1]];

View File

@ -10,5 +10,4 @@ VertexX=0,2,-2
VertexY=3,-3,-3
VertexFriction=75,100,100
Value=12
Mass=5
Components=Metal=1;Wood=1;
Mass=5

View File

@ -153,4 +153,5 @@ protected func Definition(def)
local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local ForceFreeHands = true;
local ForceFreeHands = true;
local Components = [[Wood, 1], [Metal, 1]];

View File

@ -10,7 +10,6 @@ VertexX=-4,-4,5,5
VertexY=-2,5,-2,5
VertexCNAT=5,9,6,10
VertexFriction=25,25,25,25
Components=Wood=3;
Construction=1
Value=6
Mass=12

View File

@ -70,3 +70,4 @@ local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local ContainBlast = true;
local Components = [[Wood, 3]];

View File

@ -13,4 +13,3 @@ VertexFriction=90,90,90
Value=6
Mass=6
Rotate=1
Components=Coal=1;Firestone=1

View File

@ -181,7 +181,6 @@ public func IsDroppedOnDeath(object clonk)
}
/*-- Properties --*/
local ActMap = {
@ -212,3 +211,4 @@ local Collectible = 1;
local BlastIncinerate = 1;
local ContactIncinerate = 1;
local Components = [[Coal, 1], [Firestone, 1]];

View File

@ -12,5 +12,4 @@ VertexFriction=50,50,50,50
Picture=0,0,64,64
Value=20
Mass=30
Components=Wood=1;Coal=2;Firestone=2
Rotate=1

View File

@ -216,3 +216,4 @@ local Name = "$Name$";
local Description = "$Description$";
local BlastIncinerate = 1;
local ContactIncinerate = 2;
local Components = [[Wood, 1], [Coal, 2], [Firestone, 2]];

View File

@ -11,6 +11,5 @@ VertexY=0,0
VertexFriction=80,80
Value=16
Mass=10
Components=Wood=2;Metal=1;Rope=1;
Rotate=1
Float=2

View File

@ -268,4 +268,5 @@ local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local BlastIncinerate = 30;
local ContactIncinerate = 0;
local ContactIncinerate = 0;
local Components = [[Wood, 2], [Metal, 1]/*, [Rope, 1]*/];

View File

@ -11,6 +11,5 @@ VertexY=1,5,-2,-2
VertexFriction=80,80,80,80
Value=8
Mass=15
Components=Wood=1;Rock=1;
Rotate=1

View File

@ -26,3 +26,4 @@ func Definition(def)
local Collectible = 1;
local Name = "$Name$";
local Description = "$Description$";
local Components = [[Wood, 1], [Rock, 1]];

View File

@ -11,5 +11,4 @@ VertexY=3,-3
VertexFriction=75,100
Value=20
Mass=4
Rotate=1
Components=Firestone=1;Coal=1;Metal=1;
Rotate=1

View File

@ -75,3 +75,4 @@ public func IsToolProduct() { return true; }
local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local Components = [[Firestone, 1], [Metal, 1], [Coal, 1]];

View File

@ -11,6 +11,5 @@ VertexY=-6,-5,-5,4
VertexFriction=50,100,100,40
Value=10
Mass=20
Components=Wood=1;Metal=1;
Rotate=1

View File

@ -228,3 +228,4 @@ local Name = "$Name$";
local Description = "$Description$";
local MaxPickDensity = 70; // can't pick granite
local ForceFreeHands = true;
local Components = [[Wood, 1], [Metal, 1]];

View File

@ -11,5 +11,4 @@ VertexY=3,0
VertexFriction=50,50
Value=10
Mass=15
Components=Metal=1
Picture=64,0,64,64

View File

@ -325,3 +325,4 @@ local Name = "$Name$";
local Description = "$Description$";
local Collectible = 1;
local PipeState = nil;
local Components = [[Metal, 1]];

View File

@ -11,6 +11,5 @@ VertexY=-6,-6,6,6,0,0
VertexFriction=60,60,60,60,60,60
Value=20
Mass=20
Components=Barrel=1;Coal=1;
NoMassFromContents=1
Rotate=1

View File

@ -149,3 +149,4 @@ local Description = "$Description$";
local BlastIncinerate = 1;
local NoBurnDecay = 1;
local ContactIncinerate = 2;
local Components = [[Barrel, 1], [Coal, 1]];

View File

@ -10,9 +10,7 @@ VertexX=-1,1,0,0
VertexY=0,0,-2,2
VertexCNAT=1,2
VertexFriction=30,30
Value=0
Mass=6
Components=Wood=1
Rotate=1
Float=1
StretchGrowth=1

View File

@ -11,6 +11,5 @@ VertexY=4,-3,-3
VertexFriction=100,100,100
Value=25
Mass=10
Components=Wood=2;Rope=2;
Rotate=1
NoStabilize=1

View File

@ -380,3 +380,4 @@ local ActMap = {
local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local Components = [[Wood, 2]/*, [Rope, 2]*/];

View File

@ -11,6 +11,5 @@ VertexY=4,-3,-3
VertexFriction=100,100,100
Value=20
Mass=10
Components=Wood=2;Rope=1;
Rotate=1
NoStabilize=1

View File

@ -501,3 +501,4 @@ local ActMap = {
local Name = "$Name$";
local Description = "$Description$";
local Collectible = true;
local Components = [[Wood, 2]/*, [Rope, 1]*/];

View File

@ -11,5 +11,4 @@ VertexY=-7,9,0
VertexFriction=50,50,50
Value=10
Mass=20
Components=Wood=1;Metal=1;
Rotate=1

View File

@ -231,3 +231,4 @@ public func Definition(proplist def)
local Collectible = true;
local Name = "$Name$";
local Description = "$Description$";
local Components = [[Wood, 1], [Metal, 1]];

Some files were not shown because too many files have changed in this diff Show More